From ac0f80fdbf95714967d804df4a8cc6cdb83e0224 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 19 Jan 2008 21:16:04 +0000
Subject: Fix a problem that occurred when slave support was removed, and make
 sure the correct localstatedir is used.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10168 df743ca5-7f9a-e211-a948-0013205c9059
---
 sysutils/hal/Makefile             | 8 +++++---
 sysutils/hal/files/pkg-install.in | 2 ++
 sysutils/hal/pkg-plist            | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 0680d5344..219bd2426 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.28 2008/01/08 06:46:45 marcus Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.29 2008/01/08 06:50:34 marcus Exp $
 #
 
 PORTNAME=	hal
 PORTVERSION=	${HALVERSION}.${SNAPVERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 
@@ -40,7 +41,8 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 		--enable-console-kit \
 		--with-socket-dir=/var/run/hald \
 		--with-eject=/usr/sbin/cdcontrol \
-		--with-pid-file=/var/run/hald/hald.pid
+		--with-pid-file=/var/run/hald/hald.pid \
+		--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
@@ -104,11 +106,11 @@ post-install:
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(PACKAGE_BUILDING) && defined(NEEDS_MEDIA)
 	${MKDIR} /media
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
 		${DOCSDIR}/README.freebsd
 .endif
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in
index 2cfda5753..72b67ff95 100644
--- a/sysutils/hal/files/pkg-install.in
+++ b/sysutils/hal/files/pkg-install.in
@@ -34,6 +34,8 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
 	fi
 
 	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/lib/hal
 fi
 
 for pair in %%RC_FILES%%; do
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 75a3c60c9..eed16e41e 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -112,4 +112,8 @@ share/PolicyKit/policy/hal-wol.policy
 @unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
 @unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
 @unexec rmdir /var/run/hald 2>/dev/null || true
+@unexec rmdir /var/cache/hald 2>/dev/null || true
+@unexec rmdir /var/cache 2>/dev/null || true
+@unexec /var/lib/hal 2>/dev/null || true
+@unexec /var/lib 2>/dev/null || true
 %%MEDIA%%@unexec rmdir /media 2>/dev/null || true
-- 
cgit v1.2.3