Pullup ticket #2713 - requested by jmcneill

hal: bug fixes

Revisions pulled up:
- sysutils/hal/Makefile					1.31-1.38
- sysutils/hal/PLIST					1.4
- sysutils/hal/distinfo					1.12
- sysutils/hal/files/hald-netbsd/devinfo_optical.c	1.4
- sysutils/hal/files/hald-netbsd/envsys.c		1.5
- sysutils/hal/patches/patch-aq				1.1
---
Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sun Jan 18 13:53:33 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile
        pkgsrc/sysutils/hal/files/hald-netbsd: devinfo_optical.c

Log Message:
Optical media handling needs block.storage_device too; add this to
improve KDE4 compatibility. Bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   sketch
Date:           Fri Jan 23 11:13:38 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile distinfo
Added Files:
        pkgsrc/sysutils/hal/patches: patch-aq

Log Message:
Couple of hacks to get Sun Studio compile working.
---
Module Name:    pkgsrc
Committed By:   tron
Date:           Sun Jan 25 16:20:37 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile PLIST

Log Message:
Fix (de-)installation if "PKG_SYSCONFBASE" is set. Bump package revision
because of this package list change.

Reviewed by Jared McNeill.
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Sat Feb 28 14:00:23 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile
Added Files:
        pkgsrc/sysutils/hal: INSTALL

Log Message:
Create /media automatically, so hald mount actually works
without manual labour. Bump revision.
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Sat Feb 28 14:54:23 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile
Removed Files:
        pkgsrc/sysutils/hal: INSTALL

Log Message:
Use MAKE_DIRS and OWN_DIRS instead of INSTALL as suggested by Joerg.
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Sat Feb 28 15:54:29 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile

Log Message:
The OWN_DIRS shouldnt be there.
Thanks goes again to Joerg.
---
Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sun Mar  1 18:22:31 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile
        pkgsrc/sysutils/hal/files/hald-netbsd: envsys.c

Log Message:
Plug a memory leak in envsys_timeout; the caller of prop_dictionary_all_keys
is responsible for freeing allocated memory. Bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   tron
Date:           Mon Mar  2 11:36:33 UTC 2009

Modified Files:
        pkgsrc/sysutils/hal: Makefile

Log Message:
Actually substitute "PKG_SYSCONFBASE" in the package list. Bump package
revisions as this affects the binary package.

6 files changed, 38 insertions, 15 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 52afa33851f..df49f2b87e3 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2008/12/28 12:43:27 jmcneill Exp $
-#
+# $NetBSD: Makefile,v 1.30.2.1 2009/03/06 13:15:21 tron Exp $
 
 DISTNAME=		hal-0.5.11
-PKGREVISION=		18
+PKGREVISION=		23
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=		.tar.bz2
@@ -21,7 +20,8 @@ USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_TOOLS+=		autoconf automake autoreconf
 USE_LIBTOOL=		YES
 
-MAKE_DIRS=		${VARBASE}/cache/hald
+MAKE_DIRS+=		/media
+MAKE_DIRS+=		${VARBASE}/cache/hald
 SPECIAL_PERMS+=		${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644
 
 EGDIR=			${PREFIX}/share/examples/hal
@@ -60,6 +60,8 @@ CONFIGURE_ARGS+=	--with-backend=dummy
 PLIST_SRC=		PLIST
 .endif
 
+CFLAGS.SunOS+=		-Du_int32_t=uint32_t
+
 .if ${OPSYS} == "Darwin"
 BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
 .endif
@@ -88,6 +90,8 @@ PKG_HOME.haldaemon=	${VARBASE}/run/hal
 FILES_SUBST+=		HAL_USER=${HAL_USER}
 FILES_SUBST+=		HAL_GROUP=${HAL_GROUP}
 
+PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+
 post-extract:
 	${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd
 	${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd
diff --git a/sysutils/hal/PLIST b/sysutils/hal/PLIST
index 975392f486d..dac61770bf3 100644
--- a/sysutils/hal/PLIST
+++ b/sysutils/hal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/12/20 21:11:05 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2009/03/06 13:15:21 tron Exp $
 bin/hal-device
 bin/hal-disable-polling
 bin/hal-find-by-capability
@@ -105,11 +105,11 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy
 @dirrm lib/hal/scripts
 @dirrm lib/hal
 @dirrm include/hal
-@exec ${MKDIR} %D/etc/hal/fdi/preprobe
-@dirrm etc/hal/fdi/preprobe
-@exec ${MKDIR} %D/etc/hal/fdi/policy
-@dirrm etc/hal/fdi/policy
-@exec ${MKDIR} %D/etc/hal/fdi/information
-@dirrm etc/hal/fdi/information
-@dirrm etc/hal/fdi
-@dirrm etc/hal
+@exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/information
+@exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/policy
+@exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/preprobe
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi/preprobe 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi/policy 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi/information 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal 2>/dev/null || ${TRUE}
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 16e9c5ceafe..74cb8acc88c 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/01/03 01:28:34 obache Exp $
+$NetBSD: distinfo,v 1.11.2.1 2009/03/06 13:15:21 tron Exp $
 
 SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
@@ -19,6 +19,7 @@ SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a
 SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
 SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34
 SHA1 (patch-ap) = 4846d30f51239cca5ea895c700d7a7b15efd948e
+SHA1 (patch-aq) = 7d0b224b4b1e6052983a6512217eee4f530e0720
 SHA1 (patch-na) = f4344e2aa02e67c968f9723495c533c3a9a199fd
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
 SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
diff --git a/sysutils/hal/files/hald-netbsd/devinfo_optical.c b/sysutils/hal/files/hald-netbsd/devinfo_optical.c
index 26a9ec81309..53abb029060 100644
--- a/sysutils/hal/files/hald-netbsd/devinfo_optical.c
+++ b/sysutils/hal/files/hald-netbsd/devinfo_optical.c
@@ -376,6 +376,8 @@ devinfo_optical_volume_add(HalDevice *parent, const char *devnode, char *devfs_p
         hal_device_property_set_bool (d, "block.is_volume", TRUE);
         hal_device_property_set_bool (d, "block.no_partitions", TRUE);
         hal_device_property_set_bool (d, "block.have_scanned", TRUE);
+        hal_device_property_set_string (d, "block.storage_device",
+            hal_device_property_get_string (parent, "info.udi"));
 
 	/* volume */
 	hal_device_property_set_bool  (d, "volume.ignore", FALSE);
diff --git a/sysutils/hal/files/hald-netbsd/envsys.c b/sysutils/hal/files/hald-netbsd/envsys.c
index 169535c8765..c05d9abb6fe 100644
--- a/sysutils/hal/files/hald-netbsd/envsys.c
+++ b/sysutils/hal/files/hald-netbsd/envsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: envsys.c,v 1.4 2008/12/04 03:35:59 jmcneill Exp $ */
+/* $NetBSD: envsys.c,v 1.4.2.1 2009/03/06 13:15:21 tron Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -122,6 +122,7 @@ envsys_timeout(gpointer user_data)
 	}
 	prop_object_iterator_release (iter);
 
+	prop_object_release (global_array);
 	prop_object_release (global_dict);
 	return TRUE;
 }
diff --git a/sysutils/hal/patches/patch-aq b/sysutils/hal/patches/patch-aq
new file mode 100644
index 00000000000..c7a7e3e5b17
--- /dev/null
+++ b/sysutils/hal/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1.2.2 2009/03/06 13:15:21 tron Exp $
+
+--- libhal/libhal.c.orig	Fri Jan 23 10:42:56 2009
++++ libhal/libhal.c	Fri Jan 23 11:08:11 2009
+@@ -4103,8 +4103,10 @@
+ static void
+ libhal_changeset_append (LibHalChangeSet *changeset, LibHalChangeSetElement *elem)
+ {
++#if !defined(__SUNPRO_C)
+ 	LIBHAL_CHECK_PARAM_VALID(changeset, "*changeset", (void) NULL );
+ 	LIBHAL_CHECK_PARAM_VALID(elem, "*elem", (void) NULL);
++#endif
+ 
+ 	if (changeset->head == NULL) {
+ 		changeset->head = elem;