Index: accountsservice/Makefile
===================================================================
--- accountsservice/Makefile	(revision 18404)
+++ accountsservice/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	accountsservice
 PORTVERSION=	0.6.24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
@@ -22,12 +22,17 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-systemd
+CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/gdm/custom.conf|${LOCALBASE}/etc/gdm/custom.conf|g' \
 		${WRKSRC}/src/daemon.c
+	@${REINPLACE_CMD} -e 's|/lib/AccountsService|/db/AccountsService|g' \
+		${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in
 
+post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.mk>
Index: accountsservice/pkg-install
===================================================================
--- accountsservice/pkg-install	(revision 0)
+++ accountsservice/pkg-install	(working copy)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	/bin/mkdir -p /var/db/AccountsService/users/
+	/bin/mkdir -p /var/db/AccountsService/icons/
+	exit 0
+	;;
+esac
Index: accountsservice/pkg-plist
===================================================================
--- accountsservice/pkg-plist	(revision 18404)
+++ accountsservice/pkg-plist	(working copy)
@@ -74,3 +74,7 @@
 @dirrmtry share/locale/bg_BG
 @dirrm include/accountsservice-1.0/act
 @dirrm include/accountsservice-1.0
+@cwd /
+@dirrmtry var/db/AccountsService/users
+@dirrmtry var/db/AccountsService
+@cwd