Take a stab at the FIXME, and try to preserve the D-BUS hal.conf. It seems

to work okay.  After some more testing, this can be ported to policykit as
well.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6217 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 36 insertions, 4 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index e380e0ec4..b35df71b4 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.6 2006/05/03 05:59:59 marcus Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.7 2006/05/04 19:26:25 jylefort Exp $
 #
 
 PORTNAME=	hal
@@ -50,8 +50,6 @@ DESKTOP_ENTRIES="Device Manager" \
 		"Application;System;" \
 		true
 
-# FIXME preserve hal.conf changes (same for PolicyKit.conf in policykit)
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64"
@@ -66,5 +64,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
 		${DOCSDIR}/README.freebsd
 .endif
+	${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/hal.conf.dist
+	if [ ! -f ${PREFIX}/etc/dbus-1/system.d/hal.conf ]; then \
+		${MKDIR} ${PREFIX}/etc/dbus-1/system.d ; \
+		${INSTALL_DATA} ${WRKSRC}/hal.conf \
+			${PREFIX}/etc/dbus-1/system.d ; \
+	fi
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in
new file mode 100644
index 000000000..27219f54c
--- /dev/null
+++ b/sysutils/hal/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+--- Makefile.in.orig	Thu May  4 15:35:41 2006
++++ Makefile.in	Thu May  4 15:36:40 2006
+@@ -377,14 +377,14 @@ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+ install-dist_dbusDATA: $(dist_dbus_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
+-	@list='$(dist_dbus_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
+-	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
+-	done
++#	@$(NORMAL_INSTALL)
++#	test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
++#	@list='$(dist_dbus_DATA)'; for p in $$list; do \
++#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++#	  f=$(am__strip_dir) \
++#	  echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
++#	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
++#	done
+ 
+ uninstall-dist_dbusDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index adc4b6699..49d751da8 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -5,7 +5,7 @@ bin/hal-find-by-property
 bin/hal-get-property
 bin/hal-set-property
 bin/lshal
-etc/dbus-1/system.d/hal.conf
+@unexec if cmp -s %D/%%DATADIR%%/hal.conf.dist %D/etc/dbus-1/system.d/hal.conf; then rm -f %D/etc/dbus-1/system.d/hal.conf; fi
 include/hal/libhal-storage.h
 include/hal/libhal.h
 lib/libhal-storage.a
@@ -92,6 +92,8 @@ sbin/hald
 %%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi
 %%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
 %%DATADIR%%/fdi/preprobe/10osvendor/10-ide-drives.fdi
+%%DATADIR%%/hal.conf.dist
+@exec [ -f %D/etc/dbus-1/system.d/hal.conf ] || (mkdir -p %D/etc/dbus-1/system.d && cp %B/%f %D/etc/dbus-1/system.d/hal.conf)
 %%DATADIR%%/scripts/hal-luks-remove
 %%DATADIR%%/scripts/hal-luks-setup
 %%DATADIR%%/scripts/hal-luks-teardown
@@ -180,3 +182,4 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @cwd /tmp
 @unexec rm -rf %D/hald-local
 @unexec rm -rf %D/hald-runner
+@cwd %%PREFIX%%