Update to 0.5.11 RC1.

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

6 files changed, 150 insertions, 14 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 719c19f60..c1f832e5d 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,13 +3,13 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.36 2008/02/16 05:28:22 marcus Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.37 2008/02/18 22:01:37 marcus Exp $
 #
 
 PORTNAME=	hal
-PORTVERSION=	${HALVERSION}.${SNAPVERSION}
+DISTVERSION=	0.5.11rc1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.marcuscom.com/downloads/
+MASTER_SITES=	http://hal.freedesktop.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Hardware Abstraction Layer for simplifying device access
@@ -19,7 +19,6 @@ LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit \
 		ck-connector.0:${PORTSDIR}/sysutils/consolekit
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 
-USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget intlhack ltverhack
@@ -41,13 +40,14 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-socket-dir=/var/run/hald \
 		--with-eject=/usr/sbin/cdcontrol \
 		--with-pid-file=/var/run/hald/hald.pid \
+		--with-deprecated-keys \
 		--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
 
-HALVERSION=	0.5.10
-SNAPVERSION=	20080218
+#HALVERSION=	0.5.10
+#SNAPVERSION=	20080218
 
 USE_RC_SUBR=	hald
 USE_GNOME_SUBR=	yes
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 6943b93af..05cc45f22 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.10.20080218.tar.bz2) = 397118effddb5dda6b4be5e65d9ed261
-SHA256 (hal-0.5.10.20080218.tar.bz2) = 2f76f3f13a709ba09e68117655c92d3f81d003a422e4edc79b6c5f7b04884a15
-SIZE (hal-0.5.10.20080218.tar.bz2) = 919894
+MD5 (hal-0.5.11rc1.tar.gz) = cf985c31324f2480590de01599ac7b74
+SHA256 (hal-0.5.11rc1.tar.gz) = 3f12a68ce29eefe74341cf5e66839bd210da25aabc2fd454bacfa8d55743d475
+SIZE (hal-0.5.11rc1.tar.gz) = 1667460
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addone-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addone-storage.c
new file mode 100644
index 000000000..4c6ee8c11
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_addons_addone-storage.c
@@ -0,0 +1,89 @@
+--- addon-storage.c.orig	2008-03-15 14:26:23.000000000 -0400
++++ addon-storage.c	2008-03-15 14:26:25.000000000 -0400
+@@ -150,6 +150,15 @@ hf_addon_storage_update (void)
+   return has_media;
+ }
+ 
++static void
++update_proc_title (const char *device, boolean polling_enabled)
++{
++  if (polling_enabled)
++    setproctitle("%s", device);
++  else
++    setproctitle("no polling on %s because it is explicitly disabled", device);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -157,6 +166,7 @@ main (int argc, char **argv)
+   char *removable;
+   char *bus;
+   char *driver;
++  boolean should_poll;
+   DBusConnection *connection;
+ 
+   if (! hfp_init(argc, argv))
+@@ -186,9 +196,6 @@ main (int argc, char **argv)
+   if (! addon.parent)
+     goto end;
+ 
+-  /* give a meaningful process title for ps(1) */
+-  setproctitle("%s", addon.device_file);
+-
+   addon.is_cdrom = ! strcmp(drive_type, "cdrom");
+   addon.is_scsi_removable = (! strcmp(bus, "scsi") ||
+     (! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") ||
+@@ -226,23 +233,35 @@ main (int argc, char **argv)
+ 	    break;
+ 	}
+ 
+-      has_media = hf_addon_storage_update();
+-      if (has_media != addon.had_media)
+-	{
+-	  /*
+-	   * FIXME: if the media was removed, we should force-unmount
+-	   * all its child volumes (see linux2/addons/addon-storage.c).
+-	   * However, currently (FreeBSD 6.0) umount -f is broken and
+-	   * can cause kernel panics. When I tried to umount -f a
+-	   * flash card after removing it, it failed with EAGAIN. It
+-	   * continued to fail after I inserted the card. The system
+-	   * then hung while rebooting and did not unmount my other
+-	   * filesystems.
+-	   */
+-
+-	  libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
+-	  dbus_error_free(&hfp_error);
+-	  addon.had_media = has_media;
++      should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
++      dbus_error_free(&hfp_error);
++      update_proc_title(addon.device_file, should_poll);
++
++      if (should_poll)
++        {
++          has_media = hf_addon_storage_update();
++          if (has_media != addon.had_media)
++	    {
++	      /*
++	       * FIXME: if the media was removed, we should force-unmount
++	       * all its child volumes (see linux2/addons/addon-storage.c).
++	       * However, currently (FreeBSD 6.0) umount -f is broken and
++	       * can cause kernel panics. When I tried to umount -f a
++	       * flash card after removing it, it failed with EAGAIN. It
++	       * continued to fail after I inserted the card. The system
++	       * then hung while rebooting and did not unmount my other
++	       * filesystems.
++	       */
++
++	      libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
++	      dbus_error_free(&hfp_error);
++	      addon.had_media = has_media;
++	    }
++        }
++      else
++        {
++          hfp_gettimeofday(&addon.next_update);
++	  hfp_timevaladd(&addon.next_update, &addon.update_interval);
+ 	}
+     }
+ 
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-util.c b/sysutils/hal/files/patch-hald_freebsd_hf-util.c
new file mode 100644
index 000000000..0d09ad3ae
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-util.c
@@ -0,0 +1,32 @@
+--- hald/freebsd/hf-util.c.orig	2008-03-15 14:27:25.000000000 -0400
++++ hald/freebsd/hf-util.c	2008-03-15 14:27:29.000000000 -0400
+@@ -263,7 +263,7 @@ hf_device_set_udi (HalDevice *device, co
+   udi = g_strdup_vprintf(format, args);
+   va_end(args);
+ 
+-  safe_str = hf_str_no_slashes(udi);
++  safe_str = hf_str_escape(udi);
+   g_free(udi);
+ 
+   hf_device_set_full_udi(device, "/org/freedesktop/Hal/devices/%s", safe_str);
+@@ -675,14 +675,18 @@ hf_device_store_match (HalDeviceStore *s
+ }
+ 
+ char *
+-hf_str_no_slashes (const char *str)
++hf_str_escape (const char *str)
+ {
+   char *safe_str;
+ 
+   g_return_val_if_fail(str != NULL, NULL);
+ 
+   safe_str = g_strdup(str);
+-  safe_str = g_strdelimit(safe_str, "/", '_');
++  g_strcanon(safe_str,
++             "_"
++	     "abcdefghijklmnopqrstuvwxyz"
++	     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++	     "1234567890", '_');
+ 
+   return safe_str;
+ }
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-util.h b/sysutils/hal/files/patch-hald_freebsd_hf-util.h
new file mode 100644
index 000000000..1c54c262c
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-util.h
@@ -0,0 +1,11 @@
+--- hald/freebsd/hf-util.h.orig	2008-03-15 14:27:35.000000000 -0400
++++ hald/freebsd/hf-util.h	2008-03-15 14:27:46.000000000 -0400
+@@ -110,7 +110,7 @@ int hf_runner_run_sync (HalDevice *devic
+ 
+ int hf_strv_find (char **strv, const char *elem);
+ 
+-char *hf_str_no_slashes (const char *str);
++char *hf_str_escape (const char *str);
+ 
+ HalDevice *hf_device_store_match (HalDeviceStore *store, ...);
+ 
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index b18af8f42..3b60cfa41 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -36,6 +36,7 @@ libexec/hal-storage-eject
 libexec/hal-storage-mount
 libexec/hal-storage-unmount
 libexec/hal-system-power-pm-is-supported
+libexec/hal-system-setserial
 libexec/hal/scripts/freebsd/hal-system-lcd-get-brightness-freebsd
 libexec/hal/scripts/freebsd/hal-system-lcd-set-brightness-freebsd
 libexec/hal/scripts/freebsd/hal-system-power-reboot-freebsd
@@ -72,21 +73,24 @@ sbin/hald
 %%PORTDOCS%%%%DOCSDIR%%/README.freebsd
 %%DATADIR%%/dist/hal.conf
 %%DATADIR%%/fdi/fdi.dtd
+%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi
 @exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty
 %%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi
 %%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi
 %%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
 %%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
 %%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-tabletPCs.fdi
 %%DATADIR%%/fdi/policy/10osvendor/10-x11-input.fdi
 %%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi
 %%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
 %%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi
-share/PolicyKit/policy/hal-killswitch.policy
-share/PolicyKit/policy/hal-lock.policy
-share/PolicyKit/policy/hal-power.policy
-share/PolicyKit/policy/hal-storage.policy
-share/PolicyKit/policy/hal-wol.policy
+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 -p %D/%%DATADIR%%/fdi/policy/20thirdparty
 @exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty
 @dirrm %%DATADIR%%/fdi/preprobe/20thirdparty