Update to 0.5.14.

Many bugfixes and support for new features.

15 files changed, 114 insertions, 180 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index ff64de15128..ee090f44928 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2010/12/16 11:38:08 ahoka Exp $
+# $NetBSD: Makefile,v 1.49 2010/12/26 20:59:31 markd Exp $
 
-DISTNAME=		hal-0.5.11
-PKGREVISION=		28
+DISTNAME=		hal-0.5.14
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=		.tar.bz2
@@ -32,7 +31,6 @@ CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-pci-ids=${PREFIX}/share/pciids
 CONFIGURE_ARGS+=	--with-usb-ids=${PREFIX}/share/usbids
-CONFIGURE_ARGS+=	--without-os-type
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/hal/PLIST b/sysutils/hal/PLIST
index a1166f59d69..069709c6eaa 100644
--- a/sysutils/hal/PLIST
+++ b/sysutils/hal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/12/26 20:59:31 markd Exp $
 bin/hal-device
 bin/hal-disable-polling
 bin/hal-find-by-capability
@@ -11,24 +11,6 @@ bin/hal-set-property
 bin/lshal
 include/hal/libhal-storage.h
 include/hal/libhal.h
-lib/hal/scripts/hal-dockstation-undock
-lib/hal/scripts/hal-functions
-lib/hal/scripts/hal-luks-remove
-lib/hal/scripts/hal-luks-setup
-lib/hal/scripts/hal-luks-teardown
-lib/hal/scripts/hal-system-killswitch-get-power
-lib/hal/scripts/hal-system-killswitch-set-power
-lib/hal/scripts/hal-system-lcd-get-brightness
-lib/hal/scripts/hal-system-lcd-set-brightness
-lib/hal/scripts/hal-system-power-hibernate
-lib/hal/scripts/hal-system-power-reboot
-lib/hal/scripts/hal-system-power-set-power-save
-lib/hal/scripts/hal-system-power-shutdown
-lib/hal/scripts/hal-system-power-suspend
-lib/hal/scripts/hal-system-power-suspend-hybrid
-lib/hal/scripts/hal-system-wol-enable
-lib/hal/scripts/hal-system-wol-enabled
-lib/hal/scripts/hal-system-wol-supported
 lib/libhal-storage.la
 lib/libhal.la
 lib/pkgconfig/hal-storage.pc
@@ -43,6 +25,24 @@ libexec/hal-system-power-pm-is-supported
 libexec/hal-system-setserial
 libexec/hald-generate-fdi-cache
 libexec/hald-runner
+libexec/scripts/hal-dockstation-undock
+libexec/scripts/hal-functions
+libexec/scripts/hal-luks-remove
+libexec/scripts/hal-luks-setup
+libexec/scripts/hal-luks-teardown
+libexec/scripts/hal-system-killswitch-get-power
+libexec/scripts/hal-system-killswitch-set-power
+libexec/scripts/hal-system-lcd-get-brightness
+libexec/scripts/hal-system-lcd-set-brightness
+libexec/scripts/hal-system-power-hibernate
+libexec/scripts/hal-system-power-reboot
+libexec/scripts/hal-system-power-set-power-save
+libexec/scripts/hal-system-power-shutdown
+libexec/scripts/hal-system-power-suspend
+libexec/scripts/hal-system-power-suspend-hybrid
+libexec/scripts/hal-system-wol-enable
+libexec/scripts/hal-system-wol-enabled
+libexec/scripts/hal-system-wol-supported
 man/man1/hal-disable-polling.1
 man/man1/hal-find-by-capability.1
 man/man1/hal-find-by-property.1
@@ -54,6 +54,13 @@ man/man1/hal-set-property.1
 man/man1/lshal.1
 man/man8/hald.8
 sbin/hald
+share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
+share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
+share/PolicyKit/policy/org.freedesktop.hal.leds.policy
+share/PolicyKit/policy/org.freedesktop.hal.policy
+share/PolicyKit/policy/org.freedesktop.hal.power-management.policy
+share/PolicyKit/policy/org.freedesktop.hal.storage.policy
+share/PolicyKit/policy/org.freedesktop.hal.wol.policy
 share/examples/hal/hal.conf
 share/examples/rc.d/hal
 share/gtk-doc/html/libhal-storage/home.png
@@ -87,6 +94,7 @@ share/hal/fdi/fdi.dtd
 share/hal/fdi/policy/10osvendor/10-dockstation.fdi
 share/hal/fdi/policy/10osvendor/10-input-policy.fdi
 share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+share/hal/fdi/policy/10osvendor/10-leds.fdi
 share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
 share/hal/fdi/policy/10osvendor/10-rfkill-switch.fdi
 share/hal/fdi/policy/10osvendor/10-tabletPCs.fdi
@@ -94,12 +102,6 @@ share/hal/fdi/policy/10osvendor/10-x11-input.fdi
 share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
 share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
 share/hal/fdi/policy/10osvendor/30-wol.fdi
-share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
-share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
-share/PolicyKit/policy/org.freedesktop.hal.policy
-share/PolicyKit/policy/org.freedesktop.hal.power-management.policy
-share/PolicyKit/policy/org.freedesktop.hal.storage.policy
-share/PolicyKit/policy/org.freedesktop.hal.wol.policy
 @exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/information
 @exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/policy
 @exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/preprobe
diff --git a/sysutils/hal/files/hald-netbsd/addons/addon-storage.c b/sysutils/hal/files/hald-netbsd/addons/addon-storage.c
index 5828d16912e..ed200197283 100644
--- a/sysutils/hal/files/hald-netbsd/addons/addon-storage.c
+++ b/sysutils/hal/files/hald-netbsd/addons/addon-storage.c
@@ -323,8 +323,8 @@ vid = NULL;
 
 	/* add volume properties (ignoring dbus errors) */
 	libhal_device_set_property_bool   (ctx, udi, "volume.ignore", FALSE, &error);		/* make visible */
-	libhal_device_set_property_bool   (ctx, udi, "volume.ismounted", FALSE, &error);	/* XXX fixme XXX */
-	libhal_device_set_property_bool   (ctx, udi, "volume.ismounted_readonly", FALSE, &error);	/* XXX fixme XXX */
+	libhal_device_set_property_bool   (ctx, udi, "volume.is_mounted", FALSE, &error);	/* XXX fixme XXX */
+	libhal_device_set_property_bool   (ctx, udi, "volume.is_mounted_readonly", FALSE, &error);	/* XXX fixme XXX */
 	libhal_device_set_property_string (ctx, udi, "volume.fsusage", "filesystem", &error);
 	libhal_device_set_property_string (ctx, udi, "volume.fstype",  disc_fstype, &error);
 	libhal_device_set_property_string (ctx, udi, "volume.label", disc_label, &error);
diff --git a/sysutils/hal/files/hald-netbsd/devinfo_mass.c b/sysutils/hal/files/hald-netbsd/devinfo_mass.c
index 1222f3a7adf..ee77206d322 100644
--- a/sysutils/hal/files/hald-netbsd/devinfo_mass.c
+++ b/sysutils/hal/files/hald-netbsd/devinfo_mass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: devinfo_mass.c,v 1.3 2009/10/15 00:30:39 jmcneill Exp $ */
+/* $NetBSD: devinfo_mass.c,v 1.4 2010/12/26 20:59:31 markd Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -110,6 +110,8 @@ devinfo_mass_get_fstype(uint8_t fstype)
 		return "ext2";
 	case FS_NTFS:
 		return "ntfs";
+	case FS_APPLEUFS:
+		return "ffs";
 	default:
 		return NULL;
 	}
@@ -127,6 +129,8 @@ devinfo_mass_get_mbrtype(uint8_t fstype)
 		return MBR_PTYPE_LNXEXT2;
 	case FS_NTFS:
 		return MBR_PTYPE_NTFS;
+	case FS_APPLEUFS:
+		return MBR_PTYPE_APPLE_UFS;
 	default:
 		return MBR_PTYPE_UNUSED;
 	}
@@ -394,7 +398,7 @@ devinfo_mass_disklabel_add(HalDevice *parent, const char *devnode, char *devfs_p
 				if (strcmp (type, "vfat") == 0) {
 					HAL_INFO (("%s disklabel reports %s but libvolume_id says it is "
 					    "%s, assuming disklabel is incorrect",
-					    devpath, devinfo_mass_get_fstype (part->p_fstype)));
+					    devpath, devinfo_mass_get_fstype (part->p_fstype), type));
 					hal_device_property_set_string (d, "volume.fstype", type);
 				}
 		}
diff --git a/sysutils/hal/files/hald-netbsd/devinfo_optical.c b/sysutils/hal/files/hald-netbsd/devinfo_optical.c
index 53abb029060..e435f322318 100644
--- a/sysutils/hal/files/hald-netbsd/devinfo_optical.c
+++ b/sysutils/hal/files/hald-netbsd/devinfo_optical.c
@@ -361,6 +361,7 @@ devinfo_optical_volume_add(HalDevice *parent, const char *devnode, char *devfs_p
 	hal_device_add_capability (d, "block");
 	hal_device_add_capability (d, "volume");
 	hal_device_add_capability (d, "volume.disc");
+	hal_device_property_set_string (d, "info.category", "volume");
 
 	/* block */
 	sprintf(devstr, "/dev/%s", devnode);
diff --git a/sysutils/hal/patches/patch-aa b/sysutils/hal/patches/patch-aa
index c0c8e6a2980..37dd4e7b1aa 100644
--- a/sysutils/hal/patches/patch-aa
+++ b/sysutils/hal/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2009/12/27 16:17:34 abs Exp $
+$NetBSD: patch-aa,v 1.6 2010/12/26 20:59:31 markd Exp $
 
---- tools/hal-storage-mount.c.orig	2008-05-07 23:24:23.000000000 +0000
+--- tools/hal-storage-mount.c.orig	2009-05-27 20:26:03.000000000 +0000
 +++ tools/hal-storage-mount.c
 @@ -31,7 +31,7 @@
  #include <string.h>
@@ -65,9 +65,9 @@ $NetBSD: patch-aa,v 1.5 2009/12/27 16:17:34 abs Exp $
  #elif sun
  	if (! strcmp (fstype, "iso9660"))
  		return "hsfs";
-@@ -470,11 +489,16 @@ handle_mount (LibHalContext *hal_ctx, 
- 	gboolean is_remount;
+@@ -471,11 +490,16 @@ handle_mount (LibHalContext *hal_ctx, 
  	gboolean explicit_mount_point_given;
+ 	gboolean found_alternative_fstype = FALSE;
  	const char *end;
 -#ifdef __FreeBSD__
 +#if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -83,21 +83,21 @@ $NetBSD: patch-aa,v 1.5 2009/12/27 16:17:34 abs Exp $
  	const char *label;
  	const char *uuid;
  
-@@ -731,7 +755,6 @@ handle_mount (LibHalContext *hal_ctx, 
+@@ -646,8 +670,6 @@ handle_mount (LibHalContext *hal_ctx, 
  	/* construct arguments to mount */
  	na = 0;
  	
 -	args[na++] = MOUNT;
+-
  	if (strlen (mount_fstype) > 0) {
  		mount_do_fstype = (char *) map_fstype (mount_fstype);
- 	} else if (volume == NULL) {
-@@ -742,8 +765,29 @@ handle_mount (LibHalContext *hal_ctx, 
- 	} else {
- 		mount_do_fstype = "auto";
+ 		if (volume && strcmp(mount_do_fstype, mount_fstype) == 0) {
+@@ -797,8 +819,28 @@ handle_mount (LibHalContext *hal_ctx, 
+ 		}
  	}
+ 
 -	args[na++] = MOUNT_TYPE_OPT;
 -	args[na++] = mount_do_fstype;
-+
 +#ifdef __NetBSD__
 +	rump_cmd = g_strdup_printf ("/usr/sbin/rump_%s", mount_do_fstype);
 +	if (stat (rump_cmd, &st) == 0) {
@@ -123,7 +123,7 @@ $NetBSD: patch-aa,v 1.5 2009/12/27 16:17:34 abs Exp $
  
  	args[na++] = "-o";
  #ifdef HAVE_UMOUNT_HAL
-@@ -814,7 +858,7 @@ handle_mount (LibHalContext *hal_ctx, 
+@@ -869,7 +911,7 @@ handle_mount (LibHalContext *hal_ctx, 
  			unknown_error ("Cannot create mount directory");
  		}
  		
diff --git a/sysutils/hal/patches/patch-ad b/sysutils/hal/patches/patch-ad
index d51e332d5ca..29f4c0d5213 100644
--- a/sysutils/hal/patches/patch-ad
+++ b/sysutils/hal/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2008/11/23 21:50:51 hasso Exp $
+$NetBSD: patch-ad,v 1.3 2010/12/26 20:59:31 markd Exp $
 
---- tools/hal-system-power-pmu.c.orig	2008-05-08 02:24:16 +0300
-+++ tools/hal-system-power-pmu.c	2008-11-23 13:42:54 +0200
+--- tools/hal-system-power-pmu.c.orig	2009-05-12 12:25:58.000000000 +0000
++++ tools/hal-system-power-pmu.c
 @@ -55,6 +55,10 @@ pmac_sleep (void)
  {
- #ifdef __FreeBSD__
+ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
  	return FALSE;			/* FIXME implement */
 +#elif __NetBSD__
 +	return FALSE;			/* FIXME implement */
@@ -15,7 +15,7 @@ $NetBSD: patch-ad,v 1.2 2008/11/23 21:50:51 hasso Exp $
  #elif __GNU__
 @@ -92,6 +96,10 @@ pmac_get_lcd_brightness (int *val)
  {
- #ifdef __FreeBSD__
+ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
  	return FALSE;			/* FIXME implement */
 +#elif __NetBSD__
 +	return FALSE;			/* FIXME implement */
@@ -26,7 +26,7 @@ $NetBSD: patch-ad,v 1.2 2008/11/23 21:50:51 hasso Exp $
  #elif __GNU__
 @@ -129,6 +137,10 @@ pmac_set_lcd_brightness (int val)
  {
- #ifdef __FreeBSD__
+ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
  	return FALSE;			/* FIXME implement */
 +#elif __NetBSD__
 +	return FALSE;			/* FIXME implement */
diff --git a/sysutils/hal/patches/patch-ai b/sysutils/hal/patches/patch-ai
deleted file mode 100644
index 08b6c5cd23e..00000000000
--- a/sysutils/hal/patches/patch-ai
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/11/24 01:23:12 jmcneill Exp $
-
---- hald/ck-tracker.c.orig	2008-11-23 19:28:23.000000000 -0500
-+++ hald/ck-tracker.c	2008-11-23 19:30:05.000000000 -0500
-@@ -256,7 +256,7 @@ ck_session_get_info (CKTracker *tracker,
- 		goto error;
- 	}
- 	if (!dbus_message_get_args (reply, NULL,
--				    DBUS_TYPE_INT32, &(session->user),
-+				    DBUS_TYPE_UINT32, &(session->user),
- 				    DBUS_TYPE_INVALID)) {
- 		HAL_ERROR (("Invalid GetUnixUser reply from CK"));
- 		goto error;
-@@ -531,7 +531,7 @@ ck_tracker_process_system_bus_message (C
- 		seat_objpath = dbus_message_get_path (message);
- 
- 		if (!dbus_message_get_args (message, NULL,
--					    DBUS_TYPE_STRING, &seat_objpath,
-+					    DBUS_TYPE_OBJECT_PATH, &seat_objpath,
- 					    DBUS_TYPE_INVALID)) {
- 			HAL_ERROR (("Invalid SeatAdded signal from CK"));
- 			goto out;
-@@ -558,7 +558,7 @@ ck_tracker_process_system_bus_message (C
- 		seat_objpath = dbus_message_get_path (message);
- 
- 		if (!dbus_message_get_args (message, NULL,
--					    DBUS_TYPE_STRING, &seat_objpath,
-+					    DBUS_TYPE_OBJECT_PATH, &seat_objpath,
- 					    DBUS_TYPE_INVALID)) {
- 			HAL_ERROR (("Invalid SeatRemoved signal from CK"));
- 			goto out;
-@@ -588,7 +588,7 @@ ck_tracker_process_system_bus_message (C
- 		seat_objpath = dbus_message_get_path (message);
- 
- 		if (!dbus_message_get_args (message, NULL,
--					    DBUS_TYPE_STRING, &session_objpath,
-+					    DBUS_TYPE_OBJECT_PATH, &session_objpath,
- 					    DBUS_TYPE_INVALID)) {
- 			HAL_ERROR (("Invalid SessionAdded signal from CK"));
- 			goto out;
-@@ -624,7 +624,7 @@ ck_tracker_process_system_bus_message (C
- 		seat_objpath = dbus_message_get_path (message);
- 
- 		if (!dbus_message_get_args (message, NULL,
--					    DBUS_TYPE_STRING, &session_objpath,
-+					    DBUS_TYPE_OBJECT_PATH, &session_objpath,
- 					    DBUS_TYPE_INVALID)) {
- 			HAL_ERROR (("Invalid SessionRemoved signal from CK"));
- 			goto out;
diff --git a/sysutils/hal/patches/patch-aj b/sysutils/hal/patches/patch-aj
index fd9e0ebb337..d2b3bc0050b 100644
--- a/sysutils/hal/patches/patch-aj
+++ b/sysutils/hal/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.1 2008/11/24 21:13:19 hasso Exp $
+$NetBSD: patch-aj,v 1.2 2010/12/26 20:59:31 markd Exp $
 
---- hald/freebsd/hf-storage.c.orig	2008-11-24 14:16:45 +0200
-+++ hald/freebsd/hf-storage.c	2008-11-24 07:16:09 +0200
-@@ -32,6 +32,9 @@
- #include <string.h>
+--- hald/freebsd/hf-storage.c.orig	2009-08-24 12:42:29.000000000 +0000
++++ hald/freebsd/hf-storage.c
+@@ -33,6 +33,9 @@
+ #include <sys/param.h>
  #include <sys/types.h>
  #include <sys/disklabel.h>
 +#ifdef __DragonFly__
diff --git a/sysutils/hal/patches/patch-ak b/sysutils/hal/patches/patch-ak
index 4d1040be5d0..227b9662590 100644
--- a/sysutils/hal/patches/patch-ak
+++ b/sysutils/hal/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2008/11/24 21:13:19 hasso Exp $
+$NetBSD: patch-ak,v 1.2 2010/12/26 20:59:31 markd Exp $
 
---- hald/freebsd/probing/probe-volume.c.orig	2008-05-08 02:24:07 +0300
-+++ hald/freebsd/probing/probe-volume.c	2008-11-24 21:30:08 +0200
+--- hald/freebsd/probing/probe-volume.c.orig	2009-09-17 13:45:09.000000000 +0000
++++ hald/freebsd/probing/probe-volume.c
 @@ -33,7 +33,9 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -11,8 +11,8 @@ $NetBSD: patch-ak,v 1.1 2008/11/24 21:13:19 hasso Exp $
 +#endif
  #include <sys/cdio.h>
  #include <sys/param.h>
- #include <sys/types.h>
-@@ -366,6 +368,7 @@ main (int argc, char **argv)
+ #include <sys/mount.h>
+@@ -371,6 +373,7 @@ main (int argc, char **argv)
        is_blank = (! has_audio && ! has_data);
      }
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ak,v 1.1 2008/11/24 21:13:19 hasso Exp $
    ioctl(fd, DIOCGMEDIASIZE, &media_size);
  
    /*
-@@ -391,6 +394,7 @@ main (int argc, char **argv)
+@@ -396,6 +399,7 @@ main (int argc, char **argv)
  	    }
  	}
      }
@@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.1 2008/11/24 21:13:19 hasso Exp $
  
    if (! has_children && ! is_swap && ! has_audio && ! has_data && ! is_blank)
      goto end;
-@@ -582,10 +586,12 @@ main (int argc, char **argv)
+@@ -628,10 +632,12 @@ main (int argc, char **argv)
  
    libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.uuid", vid ? vid->uuid : "", &hfp_error);
  
diff --git a/sysutils/hal/patches/patch-al b/sysutils/hal/patches/patch-al
index 8e0af6a1088..0ba7ba429fa 100644
--- a/sysutils/hal/patches/patch-al
+++ b/sysutils/hal/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.1 2008/11/24 21:13:19 hasso Exp $
+$NetBSD: patch-al,v 1.2 2010/12/26 20:59:31 markd Exp $
 
---- hald/freebsd/probing/probe-hiddev.c.orig	2008-11-24 14:22:45 +0200
-+++ hald/freebsd/probing/probe-hiddev.c	2008-11-24 14:21:24 +0200
-@@ -29,8 +29,13 @@
- #include <stdlib.h>
+--- hald/freebsd/probing/probe-hiddev.c.orig	2009-09-17 13:47:14.000000000 +0000
++++ hald/freebsd/probing/probe-hiddev.c
+@@ -31,8 +31,13 @@
  #include <fcntl.h>
+ #ifndef HAVE_LIBUSB20
  #include <sys/ioctl.h>
 +#ifdef __DragonFly__
 +#include <bus/usb/usb.h>
@@ -13,6 +13,6 @@ $NetBSD: patch-al,v 1.1 2008/11/24 21:13:19 hasso Exp $
  #include <dev/usb/usb.h>
  #include <dev/usb/usbhid.h>
 +#endif
- #include <usbhid.h>
- 
- #include "../libprobe/hfp.h"
+ #else
+ #if __FreeBSD_version >= 800064
+ #include <dev/usb/usbhid.h>
diff --git a/sysutils/hal/patches/patch-ao b/sysutils/hal/patches/patch-ao
index e814399381a..8f642217965 100644
--- a/sysutils/hal/patches/patch-ao
+++ b/sysutils/hal/patches/patch-ao
@@ -1,15 +1,17 @@
-$NetBSD: patch-ao,v 1.1 2008/11/24 21:13:19 hasso Exp $
+$NetBSD: patch-ao,v 1.2 2010/12/26 20:59:31 markd Exp $
 
---- hald/freebsd/hf-usb.c.orig	2008-11-24 14:15:42 +0200
-+++ hald/freebsd/hf-usb.c	2008-11-24 07:18:17 +0200
-@@ -31,7 +31,11 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
+--- hald/freebsd/hf-usb.c.orig	2009-09-17 13:49:46.000000000 +0000
++++ hald/freebsd/hf-usb.c
+@@ -36,9 +36,13 @@
+ #if __FreeBSD_version >= 800064
+ #include <legacy/dev/usb/usb.h>
+ #else
 +#ifdef __DragonFly__
 +#include <bus/usb/usb.h>
 +#else
  #include <dev/usb/usb.h>
+ #endif
+ #endif
 +#endif
  
  #include "../logger.h"
diff --git a/sysutils/hal/patches/patch-ap b/sysutils/hal/patches/patch-ap
index b3d2285c867..cfdd4e730ed 100644
--- a/sysutils/hal/patches/patch-ap
+++ b/sysutils/hal/patches/patch-ap
@@ -1,13 +1,13 @@
-$NetBSD: patch-ap,v 1.2 2008/12/22 11:06:16 jmcneill Exp $
+$NetBSD: patch-ap,v 1.3 2010/12/26 20:59:31 markd Exp $
 
 PR# pkg/40147: sysutils/hal fails to build on Linux
 
---- tools/linux/Makefile.am.orig	2008-12-21 08:52:45.000000000 -0500
-+++ tools/linux/Makefile.am	2008-12-21 08:53:31.000000000 -0500
+--- tools/linux/Makefile.am.orig	2009-07-15 06:52:51.000000000 +0000
++++ tools/linux/Makefile.am
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
--udevrulesdir = $(sysconfdir)/udev/rules.d
+-udevrulesdir = $(udev_prefix)/udev/rules.d
 +udevrulesdir = $(PREFIX)/share/examples/hal
  udevrules_DATA = 90-hal.rules
  
diff --git a/sysutils/hal/patches/patch-na b/sysutils/hal/patches/patch-na
index 827af3f7492..40990d229e9 100644
--- a/sysutils/hal/patches/patch-na
+++ b/sysutils/hal/patches/patch-na
@@ -1,17 +1,9 @@
-$NetBSD: patch-na,v 1.5 2009/09/14 15:18:36 joerg Exp $
+$NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $
 
---- configure.in.orig	2008-05-08 01:24:31.000000000 +0200
+--- configure.in.orig	2009-08-24 12:42:29.000000000 +0000
 +++ configure.in
-@@ -30,6 +30,7 @@ AC_SUBST(LT_AGE)
- AC_ISC_POSIX
- AC_PROG_CC
- AM_PROG_CC_C_O
-+AC_PROG_CXX
- AC_HEADER_STDC
- AC_PROG_LIBTOOL
- AC_PROG_MAKE_SET
-@@ -448,7 +449,7 @@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U
- 
+@@ -484,7 +484,7 @@ USE_LIBUSB=no
+ LIBUSB20_LIBS=""
  AC_ARG_WITH([backend],
  	    AS_HELP_STRING([--with-backend=<name>],
 -	                   [backend to use (linux/solaris/freebsd/dummy)]),
@@ -19,44 +11,43 @@ $NetBSD: patch-na,v 1.5 2009/09/14 15:18:36 joerg Exp $
  	    [backend=$withval])
  if ! test -z "$with_backend" ; then
      HALD_BACKEND="$with_backend"
-@@ -457,6 +458,9 @@ else
+@@ -493,6 +493,9 @@ else
          *-*-solaris*)
  		   HALD_BACKEND="solaris"
  		   ;;
 +        *-*-netbsd*)
-+                   HALD_BACKEND="netbsd"
++		   HALD_BACKEND="netbsd"
 +		   ;;
-         *-*-freebsd*)
+         *-*-freebsd* | *-*-kfreebsd*-gnu)
                     HALD_BACKEND="freebsd"
                     ;;
-@@ -472,6 +476,7 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test
+@@ -508,6 +511,7 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test
  AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux])
  AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD])
  AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
 +AM_CONDITIONAL(HALD_COMPILE_NETBSD, [test x$HALD_BACKEND = xnetbsd], [Compiling for NetBSD])
  AC_SUBST(HALD_BACKEND)
- 
- dnl DBUS API is subject to changes
-@@ -641,13 +646,14 @@ fi
+ if test "x$HALD_BACKEND" = "xfreebsd"; then
+     AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
+@@ -707,7 +711,7 @@ fi
  AC_MSG_RESULT($have_glib_2_14)
  
- # volume_id
--case "$host" in
--*-*-solaris*)
--	;;
--*)
-+case "$HALD_BACKEND" in
-+linux|freebsd|netbsd)
- 	PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
+ case "$host" in
+-    *-*-freebsd*)
++    *-*-freebsd* | *-*-netbsd*)
+         PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
  	AC_SUBST(VOLUME_ID_CFLAGS)
  	AC_SUBST(VOLUME_ID_LIBS)
-+	;;
-+*)
-+	;;
- esac
- 
- # OS specific libs
-@@ -1004,6 +1010,9 @@ hald/linux/addons/Makefile
+@@ -720,6 +724,8 @@ esac
+ case "$host" in
+ *-*-freebsd*)
+         ;;
++*-*-netbsd*)
++        ;;
+ *-*-solaris*)
+ 	;;
+ *)
+@@ -1086,6 +1092,9 @@ hald/linux/addons/Makefile
  hald/solaris/Makefile
  hald/solaris/probing/Makefile
  hald/solaris/addons/Makefile
@@ -66,7 +57,7 @@ $NetBSD: patch-na,v 1.5 2009/09/14 15:18:36 joerg Exp $
  hald/freebsd/Makefile
  hald/freebsd/probing/Makefile
  hald/freebsd/libprobe/Makefile
-@@ -1014,6 +1023,7 @@ libhal-storage/Makefile
+@@ -1096,6 +1105,7 @@ libhal-storage/Makefile
  tools/Makefile
  tools/freebsd/Makefile
  tools/linux/Makefile
diff --git a/sysutils/hal/patches/patch-nd b/sysutils/hal/patches/patch-nd
deleted file mode 100644
index 62ef059ee6f..00000000000
--- a/sysutils/hal/patches/patch-nd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-nd,v 1.1 2009/07/26 18:42:04 drochner Exp $
-
---- hald/netbsd/addons/addon-storage.c.orig	2009-06-18 20:21:21.000000000 +0200
-+++ hald/netbsd/addons/addon-storage.c
-@@ -323,8 +323,8 @@ vid = NULL;
- 
- 	/* add volume properties (ignoring dbus errors) */
- 	libhal_device_set_property_bool   (ctx, udi, "volume.ignore", FALSE, &error);		/* make visible */
--	libhal_device_set_property_bool   (ctx, udi, "volume.ismounted", FALSE, &error);	/* XXX fixme XXX */
--	libhal_device_set_property_bool   (ctx, udi, "volume.ismounted_readonly", FALSE, &error);	/* XXX fixme XXX */
-+	libhal_device_set_property_bool   (ctx, udi, "volume.is_mounted", FALSE, &error);	/* XXX fixme XXX */
-+	libhal_device_set_property_bool   (ctx, udi, "volume.is_mounted_readonly", FALSE, &error);	/* XXX fixme XXX */
- 	libhal_device_set_property_string (ctx, udi, "volume.fsusage", "filesystem", &error);
- 	libhal_device_set_property_string (ctx, udi, "volume.fstype",  disc_fstype, &error);
- 	libhal_device_set_property_string (ctx, udi, "volume.label", disc_label, &error);