Update to today's FreeBSD HAL snapshot. The most notable changes in this

release are:

* Fixed user volume mount point permissions
* hald can now be run in daemon mode and verbose messages will be written
  to syslog
* DVD+RW DL support has been added


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

5 files changed, 37 insertions, 43 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index d42ef2bd6..579f8820b 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.10 2006/05/07 05:44:35 marcus Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.11 2006/05/14 20:55:51 marcus Exp $
 #
 
 PORTNAME=	hal
 PORTVERSION=	${HALVERSION}.${SNAPVERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 
@@ -39,7 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 USE_RC_SUBR=	hald
 
 HALVERSION=	0.5.8
-SNAPVERSION=	20060505
+SNAPVERSION=	20060514
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${HALVERSION}
 PLIST_SUB=	VERSION=${HALVERSION}
@@ -57,6 +56,11 @@ DESKTOP_ENTRIES="Device Manager" \
 RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
+		${WRKSRC}/tools/Makefile.in \
+		${WRKSRC}/tools/freebsd/Makefile.in
+
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 921094463..44ff5169c 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.8.20060505.tar.bz2) = cfce87233aa359ec56c23b8dcb8fd59b
-SHA256 (hal-0.5.8.20060505.tar.bz2) = 047a771b0da4060a2a032137818f111c1bc405b2cb16454f70b0fb90d9a9d20a
-SIZE (hal-0.5.8.20060505.tar.bz2) = 1380908
+MD5 (hal-0.5.8.20060514.tar.bz2) = 3f498708f981610b977784b8eb45c710
+SHA256 (hal-0.5.8.20060514.tar.bz2) = 68b475245d9ee6a613f13d74e7d3e0d94b5977f0e3ae9b09aac5e37d6f63d117
+SIZE (hal-0.5.8.20060514.tar.bz2) = 1384185
diff --git a/sysutils/hal/files/patch-tools_Makefile.in b/sysutils/hal/files/patch-tools_Makefile.in
index 3c9aba59a..c5ce92827 100644
--- a/sysutils/hal/files/patch-tools_Makefile.in
+++ b/sysutils/hal/files/patch-tools_Makefile.in
@@ -4,8 +4,8 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = linux device-manager
-+SUBDIRS = device-manager
+-SUBDIRS = freebsd linux device-manager
++SUBDIRS = freebsd device-manager
  INCLUDES = \
  	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
  	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
diff --git a/sysutils/hal/files/patch-tools_hal-storage-mount.c b/sysutils/hal/files/patch-tools_hal-storage-mount.c
deleted file mode 100644
index 062a68a3f..000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-mount.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/hal-storage-mount.c.orig	Sun May 14 16:52:00 2006
-+++ tools/hal-storage-mount.c	Sun May 14 16:52:51 2006
-@@ -441,6 +441,7 @@ handle_mount (LibHalContext *hal_ctx, Li
- 	gboolean pol_change_uid;
- 	char *privilege;
- 	gboolean allowed_by_privilege;
-+	gboolean is_temporary_privilege;
- 	gboolean explicit_mount_point_given;
- 	const char *end;
- 
-@@ -673,7 +674,8 @@ handle_mount (LibHalContext *hal_ctx, Li
- 						    invoked_by_uid,
- 						    privilege,
- 						    udi,
--						    &allowed_by_privilege) != LIBPOLKIT_RESULT_OK) {
-+						    &allowed_by_privilege,
-+						    &is_temporary_privilege) != LIBPOLKIT_RESULT_OK) {
- 		printf ("cannot lookup privilege\n");
- 		unknown_error ();
- 	}
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 6ccfc4cb0..060ce895a 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -24,6 +24,29 @@ libdata/pkgconfig/hal-storage.pc
 libdata/pkgconfig/hal.pc
 libexec/hal-storage-mount
 libexec/hal-system-power-pmu
+libexec/hal/scripts/hal-luks-remove
+libexec/hal/scripts/hal-luks-setup
+libexec/hal/scripts/hal-luks-teardown
+libexec/hal/scripts/hal-system-lcd-get-brightness
+libexec/hal/scripts/hal-system-lcd-get-brightness-freebsd
+libexec/hal/scripts/hal-system-lcd-set-brightness
+libexec/hal/scripts/hal-system-lcd-set-brightness-freebsd
+libexec/hal/scripts/hal-system-power-hibernate
+libexec/hal/scripts/hal-system-power-reboot
+libexec/hal/scripts/hal-system-power-reboot-freebsd
+libexec/hal/scripts/hal-system-power-set-power-save
+libexec/hal/scripts/hal-system-power-set-power-save-freebsd
+libexec/hal/scripts/hal-system-power-shutdown
+libexec/hal/scripts/hal-system-power-shutdown-freebsd
+libexec/hal/scripts/hal-system-power-suspend
+libexec/hal/scripts/hal-system-power-suspend-freebsd
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoint
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoints
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoints-freebsd
+libexec/hal/scripts/hal-system-storage-eject
+libexec/hal/scripts/hal-system-storage-eject-freebsd
+libexec/hal/scripts/hal-system-storage-unmount
+libexec/hal/scripts/hal-system-storage-unmount-freebsd
 libexec/hald-addon-storage
 libexec/hald-probe-hiddev
 libexec/hald-probe-scsi
@@ -94,20 +117,6 @@ sbin/hald
 %%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
-%%DATADIR%%/scripts/hal-system-lcd-get-brightness
-%%DATADIR%%/scripts/hal-system-lcd-set-brightness
-%%DATADIR%%/scripts/hal-system-power-hibernate
-%%DATADIR%%/scripts/hal-system-power-reboot
-%%DATADIR%%/scripts/hal-system-power-set-power-save
-%%DATADIR%%/scripts/hal-system-power-shutdown
-%%DATADIR%%/scripts/hal-system-power-suspend
-%%DATADIR%%/scripts/hal-system-storage-cleanup-mountpoint
-%%DATADIR%%/scripts/hal-system-storage-cleanup-mountpoints
-%%DATADIR%%/scripts/hal-system-storage-eject
-%%DATADIR%%/scripts/hal-system-storage-unmount
 share/locale/cs/LC_MESSAGES/hal.mo
 share/locale/da/LC_MESSAGES/hal.mo
 share/locale/de/LC_MESSAGES/hal.mo
@@ -155,7 +164,6 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @dirrmtry share/locale/el
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
-@dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/fdi/preprobe/20thirdparty
 @dirrm %%DATADIR%%/fdi/preprobe/10osvendor
 @dirrm %%DATADIR%%/fdi/preprobe
@@ -170,6 +178,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/conf
 @dirrm %%DOCSDIR%%
+@dirrm libexec/hal/scripts
+@dirrm libexec/hal
 @dirrm include/hal
 @dirrm etc/hal/fdi/preprobe
 @dirrm etc/hal/fdi/policy