The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

11 files changed, 296 insertions, 181 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 32042dbb14b3..f757a5167fc7 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,25 +3,23 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.26 2006/10/13 10:00:57 ahze Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.43 2008/03/22 19:31:15 marcus Exp $
 #
 
 PORTNAME=	hal
-PORTVERSION=	${HALVERSION}.${SNAPVERSION}
-PORTREVISION?=	0
-CATEGORIES?=	sysutils
-MASTER_SITES=	http://www.marcuscom.com/downloads/
+DISTVERSION=	0.5.11rc2
+PORTREVISION=	3
+CATEGORIES=	sysutils
+MASTER_SITES=	http://hal.freedesktop.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	Hardware Abstraction Layer for simplifying device access
+COMMENT=	Hardware Abstraction Layer for simplifying device access
 
-.if !defined(HAL_SLAVE)
-LIB_DEPENDS=	polkit.0:${PORTSDIR}/sysutils/policykit \
-		volume_id.0:${PORTSDIR}/devel/libvolume_id
+LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit \
+		volume_id.0:${PORTSDIR}/devel/libvolume_id \
+		ck-connector.0:${PORTSDIR}/sysutils/consolekit
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-.endif
 
-USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget intlhack ltverhack
@@ -29,56 +27,47 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-hwdata=${LOCALBASE}/share/pciids \
 		--with-backend=freebsd \
 		--disable-docbook-docs \
+		--with-pci-ids=${LOCALBASE}/share/pciids \
+		--disable-usb-ids \
+		--without-libpci \
+		--disable-usb \
+		--disable-smbios \
+		--disable-apm \
+		--disable-pmu \
+		--enable-policy-kit \
+		--enable-console-kit \
 		--with-socket-dir=/var/run/hald \
-		--with-pid-file=/var/run/hald/hald.pid
+		--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.8
-SNAPVERSION=	20080203
+#HALVERSION=	0.5.10
+#SNAPVERSION=	20080218
 
-.if !defined(HAL_SLAVE)
 USE_RC_SUBR=	hald
 USE_GNOME_SUBR=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${HALVERSION}
 PLIST_SUB=	VERSION=${HALVERSION}
 
-PRIV_FILES=	hal-power-hibernate \
-		hal-power-poweroff \
-		hal-power-reboot \
-		hal-power-suspend \
-		hal-storage-fixed-mount-change-uid \
-		hal-storage-fixed-mount \
-		hal-storage-removable-mount-change-uid \
-		hal-storage-removable-mount
-PRIV_FILES:=	${PRIV_FILES:S|$|.privilege|}
-
-RC_FILES=	hal.conf:${PREFIX}/etc/dbus-1/system.d \
-		${PRIV_FILES:S|$|:${PREFIX}/etc/PolicyKit/privilege.d|}
+RC_FILES=	hal.conf:${PREFIX}/etc/dbus-1/system.d
 PLIST_FILES=	${PRIV_FILES:S|^|%%DATADIR%%/dist/|}
 
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	RC_FILES="${RC_FILES}"
 
+MAN1=		hal-disable-polling.1 hal-find-by-capability.1 \
+		hal-find-by-property.1 hal-get-property.1 \
+		hal-is-caller-locked-out.1 hal-is-caller-privileged.1 \
+		hal-lock.1 hal-set-property.1 lshal.1
+MAN8=		hald.8
+
 OPTIONS=	FIXED_MOUNTPOINTS "use fixed mountpoints" off
-.else # Slave port stuff
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-
-USE_GNOME+=	pygnome2
-DESKTOP_ENTRIES="Device Manager" \
-		"Examine your devices" \
-		"${DATADIR}/device-manager/hal-bus-pci.png" \
-		"hal-device-manager" \
-		"Application;System;" \
-		true
-BUILD_WRKSRC=	${WRKSRC}/tools/device-manager
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -86,7 +75,6 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 IGNORE=	not supported on FreeBSD prior to 5.5-RELEASE
 .endif
 
-.if !defined(HAL_SLAVE)
 .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
 RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 .endif
@@ -101,38 +89,28 @@ PLIST_SUB+=	MEDIA="@comment "
 .if defined(WITH_FIXED_MOUNTPOINTS)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-tools_hal-storage-mount.c
 .endif
-.endif
 
 post-patch:
-.if !defined(HAL_SLAVE)
-	@${REINPLACE_CMD} -e 's|device-manager||' \
-		${WRKSRC}/tools/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
 		${WRKSRC}/tools/Makefile.in \
 		${WRKSRC}/tools/freebsd/Makefile.in
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \
 		${WRKSRC}/hald/Makefile.in
-	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|txt||' \
-		${WRKSRC}/policy/Makefile.in
 	@${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
 		${WRKSRC}/hal.conf.in
-	@${TOUCH} ${WRKSRC}/doc/spec/hal-spec.html
 
 post-install:
-.if !defined(HAL_SLAVE)
 	${MKDIR} ${DATADIR}/dist
-	${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \
-		${DATADIR}/dist
+	${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/dist
 	@${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(PACKAGE_BUILDING) && defined(NEEDS_MEDIA)
 	${MKDIR} /media
 .endif
 .if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
 		${DOCSDIR}/README.freebsd
 .endif
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 8988c420cd0e..1c49bac643a4 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.8.20080203.tar.bz2) = 2bdd6f8dd009b8173808494c3e98b6f4
-SHA256 (hal-0.5.8.20080203.tar.bz2) = e189038d6406486534264957e0f68af32b80b36291873ed43ceb47c238513245
-SIZE (hal-0.5.8.20080203.tar.bz2) = 1366915
+MD5 (hal-0.5.11rc2.tar.gz) = ade962044a62e8f2dc4625a17f4a5c7e
+SHA256 (hal-0.5.11rc2.tar.gz) = 3937d2ab06c091d0b5d604f7615096be505455448cc13635ebdba169d29b4bdc
+SIZE (hal-0.5.11rc2.tar.gz) = 1665175
diff --git a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
index ce9895f941a4..82a7fb6070e0 100644
--- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
+++ b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
@@ -1,30 +1,30 @@
---- tools/hal-storage-mount.c.orig	Sun May 14 20:57:59 2006
-+++ tools/hal-storage-mount.c	Sat Apr  7 12:50:53 2007
-@@ -513,23 +513,11 @@
- 	explicit_mount_point_given = FALSE;
- 	if (strlen (mount_point) == 0) {
- 		char *p;
--		const char *label;
-+		char *basename;
- 
--		if (volume != NULL)
--			label = libhal_volume_get_label (volume);
--		else
--			label = NULL;
--
--		if (label != NULL) {
--			/* best - use label */
--			g_strlcpy (mount_point, label, sizeof (mount_point));
--
--			/* TODO: use drive type */
--
--		} else {
--			/* fallback - use "disk" */
--			g_snprintf (mount_point, sizeof (mount_point), "disk");
--		}
-+		basename = g_path_get_basename (device);
-+		g_strlcpy (mount_point, basename, sizeof (mount_point));
-+		g_free (basename);
- 
- 		/* sanitize computed mount point name, e.g. replace invalid chars with '-' */
- 		p = mount_point;
+--- tools/hal-storage-mount.c.orig	2008-01-03 21:10:54.000000000 -0500
++++ tools/hal-storage-mount.c	2008-01-04 09:29:10.000000000 -0500
+@@ -583,23 +583,11 @@ handle_mount (LibHalContext *hal_ctx, 
+ 		explicit_mount_point_given = FALSE;
+ 		if (strlen (mount_point) == 0) {
+ 			char *p;
+-			const char *label;
++			char *basename;
+ 			
+-			if (volume != NULL)
+-				label = libhal_volume_get_label (volume);
+-			else
+-				label = NULL;
+-			
+-			if (label != NULL) {
+-				/* best - use label */
+-				g_strlcpy (mount_point, label, sizeof (mount_point));
+-				
+-				/* TODO: use drive type */
+-				
+-			} else {
+-				/* fallback - use "disk" */
+-				g_snprintf (mount_point, sizeof (mount_point), "%s", "disk");
+-			}
++			basename = g_path_get_basename (device);
++			g_strlcpy (mount_point, basename, sizeof (mount_point));
++			g_free (basename);
+ 			
+ 			/* sanitize computed mount point name, e.g. replace invalid chars with '-' */
+ 			p = mount_point;
diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in
index ab906a516f30..7f8f2c659c86 100644
--- a/sysutils/hal/files/hald.in
+++ b/sysutils/hal/files/hald.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: hald
-# REQUIRE: DAEMON usbd devd dbus polkitd
+# REQUIRE: DAEMON usbd devd dbus
 #
 # Add the following line to /etc/rc.conf to enable the HAL daemon:
 #
@@ -24,6 +24,7 @@ pidfile="/var/run/${name}/${name}.pid"
 
 stop_postcmd="hald_postcmd"
 start_precmd="hald_precmd"
+start_cmd="hald_start"
 
 local_force_depend()
 {
@@ -46,10 +47,7 @@ hald_precmd()
 	local_force_depend dbus || return 1
     fi
 
-    if ! checkyesno polkitd_enable
-    then
-	local_force_depend polkitd || return 1
-    fi
+    chmod 0755 /var/cache
 
     mkdir -p $(dirname $pidfile)
 }
@@ -59,5 +57,23 @@ hald_postcmd()
     rm -f $pidfile
 }
 
+hald_start()
+{
+    if ! checkyesno hald_enable ; then
+	return 0
+    fi
+    echo "Starting ${name}."
+
+    ( iter=0
+    while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do
+	if [ ${iter} -eq 60 ]; then
+	    break
+	fi
+	sleep 1
+	iter=$(expr ${iter} + 1)
+    done
+    ${command} ${hald_flags} ) &
+}
+
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in
index 27219f54c076..17d23980f55c 100644
--- a/sysutils/hal/files/patch-Makefile.in
+++ b/sysutils/hal/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- 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:
+--- Makefile.in.orig	2008-01-03 21:28:32.000000000 -0500
++++ Makefile.in	2008-01-03 21:29:15.000000000 -0500
+@@ -311,14 +311,14 @@ clean-libtool:
+ distclean-libtool:
  	-rm -f libtool
- uninstall-info-am:
  install-dist_dbusDATA: $(dist_dbus_DATA)
 -	@$(NORMAL_INSTALL)
--	test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
+-	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) \
@@ -13,7 +13,7 @@
 -	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
 -	done
 +#	@$(NORMAL_INSTALL)
-+#	test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
++#	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) \
diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in
index d05f0136ccbf..9cd951720ede 100644
--- a/sysutils/hal/files/patch-doc_Makefile.in
+++ b/sysutils/hal/files/patch-doc_Makefile.in
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Tue May  2 01:04:31 2006
-+++ doc/Makefile.in	Tue May  2 01:04:42 2006
-@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- doc/Makefile.in.orig	2008-01-03 21:41:19.000000000 -0500
++++ doc/Makefile.in	2008-01-03 21:41:31.000000000 -0500
+@@ -203,7 +203,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  EXTRA_DIST = TODO
--SUBDIRS = api spec conf
-+SUBDIRS = spec conf
- all: all-recursive
- 
- .SUFFIXES:
+-SUBDIRS = api spec man
++SUBDIRS = spec man
+ MAINTAINERCLEANFILES = \
+ 	*~			\
+ 	Makefile.in
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
new file mode 100644
index 000000000000..ebeeb072c7af
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
@@ -0,0 +1,135 @@
+--- hald/freebsd/addons/addon-storage.c.orig	2008-03-17 17:25:16.000000000 -0400
++++ hald/freebsd/addons/addon-storage.c	2008-03-22 03:25:19.000000000 -0400
+@@ -150,6 +150,34 @@ hf_addon_storage_update (void)
+   return has_media;
+ }
+ 
++static boolean
++poll_for_media (void)
++{
++  boolean has_media;
++
++  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;
++
++      return TRUE;
++    }
++  return FALSE;
++}
++
+ static void
+ update_proc_title (const char *device, boolean polling_enabled)
+ {
+@@ -159,6 +187,29 @@ update_proc_title (const char *device, b
+     setproctitle("no polling on %s because it is explicitly disabled", device);
+ }
+ 
++static DBusHandlerResult
++filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
++{
++  if (dbus_message_is_method_call(message,
++			  	  "org.freedesktop.Hal.Device.Storage.Removable",
++				  "CheckForMedia"))
++    {
++      DBusMessage *reply;
++      dbus_bool_t had_effect;
++
++      hfp_info("Forcing poll for media becusse CheckForMedia() was called");
++
++      had_effect = poll_for_media();
++
++      reply = dbus_message_new_method_return (message);
++      dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID);
++      dbus_connection_send(connection, reply, NULL);
++      dbus_message_unref(reply);
++    }
++
++  return DBUS_HANDLER_RESULT_HANDLED;
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -202,13 +253,30 @@ main (int argc, char **argv)
+     ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
+   addon.had_media = hf_addon_storage_update();
+ 
++  if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
++    goto end;
++  dbus_error_free(&hfp_error);
++
+   connection = libhal_ctx_get_dbus_connection(hfp_ctx);
+   assert(connection != NULL);
++  dbus_connection_set_exit_on_disconnect(connection, 0);
++  dbus_connection_add_filter(connection, filter_function, NULL, NULL);
+ 
+-  while (TRUE)
++  if (! libhal_device_claim_interface(hfp_ctx,
++			 	      hfp_udi,
++				      "org.freedesktop.Hal.Device.Storage.Removable",
++				      "    <method name=\"CheckForMedia\">\n"
++				      "      <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
++				      "    </method>\n",
++				      &hfp_error))
+     {
+-      boolean has_media;
++      hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
++      goto end;
++    }
++  dbus_error_free(&hfp_error);
+ 
++  while (TRUE)
++    {
+       /* process dbus traffic until update interval has elapsed */
+       while (TRUE)
+ 	{
+@@ -225,7 +293,7 @@ main (int argc, char **argv)
+ 	      if (timeout.tv_sec < 0) /* current time went backwards */
+ 		timeout = addon.update_interval;
+ 
+-	      dbus_connection_read_write(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
++	      dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
+ 	      if (! dbus_connection_get_is_connected(connection))
+ 		goto end;
+ 	    }
+@@ -239,24 +307,7 @@ main (int argc, char **argv)
+ 
+       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;
+-	    }
++          poll_for_media();
+         }
+       else
+         {
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
new file mode 100644
index 000000000000..598ac6283341
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
@@ -0,0 +1,12 @@
+--- hald/freebsd/hf-scsi.c.orig	2008-03-18 15:58:59.000000000 -0400
++++ hald/freebsd/hf-scsi.c	2008-03-18 15:57:36.000000000 -0400
+@@ -409,8 +409,8 @@ hf_scsi_handle_pending_device (struct de
+ 		   */
+ 		  hf_block_device_complete(block_device, block_device, FALSE);
+ 
+-		  hf_storage_device_probe(block_device, FALSE);
+ 		  hf_device_add(block_device);
++		  hf_storage_device_probe(block_device, FALSE);
+ 		}
+ 	    }
+ 	}
diff --git a/sysutils/hal/files/patch-tools_Makefile.in b/sysutils/hal/files/patch-tools_Makefile.in
deleted file mode 100644
index c5ce9282732e..000000000000
--- a/sysutils/hal/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Tue May  2 20:23:05 2006
-+++ tools/Makefile.in	Tue May  2 20:23:22 2006
-@@ -325,7 +325,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = freebsd linux device-manager
-+SUBDIRS = freebsd device-manager
- INCLUDES = \
- 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
- 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in
index 2cfda5753d4c..72b67ff95936 100644
--- a/sysutils/hal/files/pkg-install.in
+++ b/sysutils/hal/files/pkg-install.in
@@ -34,6 +34,8 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
 	fi
 
 	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/lib/hal
 fi
 
 for pair in %%RC_FILES%%; do
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 6b0d1e7589aa..3b60cfa41a2f 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -1,9 +1,13 @@
 @unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true
 %%MEDIA%%@exec mkdir -p /media
 bin/hal-device
+bin/hal-disable-polling
 bin/hal-find-by-capability
 bin/hal-find-by-property
 bin/hal-get-property
+bin/hal-is-caller-locked-out
+bin/hal-is-caller-privileged
+bin/hal-lock
 bin/hal-set-property
 bin/lshal
 @exec mkdir -p %D/etc/hal/fdi/preprobe
@@ -25,32 +29,40 @@ lib/libhald_freebsd_probe.so
 lib/libhald_freebsd_probe.so.0
 libdata/pkgconfig/hal-storage.pc
 libdata/pkgconfig/hal.pc
+libexec/hal-storage-cleanup-all-mountpoints
+libexec/hal-storage-cleanup-mountpoint
+libexec/hal-storage-closetray
+libexec/hal-storage-eject
 libexec/hal-storage-mount
-libexec/hal-system-power-pmu
+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
+libexec/hal/scripts/freebsd/hal-system-power-set-power-save-freebsd
+libexec/hal/scripts/freebsd/hal-system-power-shutdown-freebsd
+libexec/hal/scripts/freebsd/hal-system-power-suspend-freebsd
+libexec/hal/scripts/hal-dockstation-undock
+libexec/hal/scripts/hal-functions
 libexec/hal/scripts/hal-luks-remove
 libexec/hal/scripts/hal-luks-setup
 libexec/hal/scripts/hal-luks-teardown
+libexec/hal/scripts/hal-system-killswitch-get-power
+libexec/hal/scripts/hal-system-killswitch-set-power
 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/hal/scripts/hal-system-power-suspend-hybrid
+libexec/hal/scripts/hal-system-wol-enable
+libexec/hal/scripts/hal-system-wol-enabled
+libexec/hal/scripts/hal-system-wol-supported
 libexec/hald-addon-storage
+libexec/hald-generate-fdi-cache
 libexec/hald-probe-hiddev
 libexec/hald-probe-scsi
 libexec/hald-probe-smbios
@@ -59,57 +71,28 @@ libexec/hald-probe-volume
 libexec/hald-runner
 sbin/hald
 %%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%DOCSDIR%%/conf/match-USB-camera.fdi
-%%DOCSDIR%%/conf/match-USB-mp3-player.fdi
-%%DOCSDIR%%/conf/match-cardreader.fdi
-%%DOCSDIR%%/conf/storage-non-fixed.fdi
-%%DOCSDIR%%/conf/storage-policy-examples.fdi
-%%DOCSDIR%%/conf/storage-skip-all.fdi
 %%DATADIR%%/dist/hal.conf
 %%DATADIR%%/fdi/fdi.dtd
-%%DATADIR%%/fdi/fdi.rng
-%%DATADIR%%/fdi/information/10freedesktop/10-camera-ptp.fdi
-%%DATADIR%%/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
-%%DATADIR%%/fdi/information/10freedesktop/10-usb-card-readers.fdi
-%%DATADIR%%/fdi/information/10freedesktop/10-usb-music-players.fdi
-%%DATADIR%%/fdi/information/10freedesktop/10-usb-pda.fdi
-%%DATADIR%%/fdi/information/10freedesktop/10-usb-zip-drives.fdi
-%%DATADIR%%/fdi/information/10freedesktop/10-wireless-mice.fdi
+%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi
 @exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty
-%%DATADIR%%/fdi/policy/10osvendor/10-keyboard-policy.fdi
+%%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-toshiba-buttons.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/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
-%%DATADIR%%/fdi/preprobe/10osvendor/10-ide-drives.fdi
 @exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty
-share/locale/cs/LC_MESSAGES/hal.mo
-share/locale/da/LC_MESSAGES/hal.mo
-share/locale/de/LC_MESSAGES/hal.mo
-share/locale/el/LC_MESSAGES/hal.mo
-share/locale/es/LC_MESSAGES/hal.mo
-share/locale/eu/LC_MESSAGES/hal.mo
-share/locale/fi/LC_MESSAGES/hal.mo
-share/locale/fr/LC_MESSAGES/hal.mo
-share/locale/hu/LC_MESSAGES/hal.mo
-share/locale/it/LC_MESSAGES/hal.mo
-share/locale/ja/LC_MESSAGES/hal.mo
-share/locale/km/LC_MESSAGES/hal.mo
-share/locale/ko/LC_MESSAGES/hal.mo
-share/locale/lt/LC_MESSAGES/hal.mo
-share/locale/nb/LC_MESSAGES/hal.mo
-share/locale/nl/LC_MESSAGES/hal.mo
-share/locale/pa/LC_MESSAGES/hal.mo
-share/locale/pl/LC_MESSAGES/hal.mo
-share/locale/pt/LC_MESSAGES/hal.mo
-share/locale/pt_BR/LC_MESSAGES/hal.mo
-share/locale/ru/LC_MESSAGES/hal.mo
-share/locale/sl_SI/LC_MESSAGES/hal.mo
-share/locale/uk/LC_MESSAGES/hal.mo
-share/locale/zh_CN/LC_MESSAGES/hal.mo
-share/locale/zh_TW/LC_MESSAGES/hal.mo
 @dirrm %%DATADIR%%/fdi/preprobe/20thirdparty
 @dirrm %%DATADIR%%/fdi/preprobe/10osvendor
 @dirrm %%DATADIR%%/fdi/preprobe
@@ -122,8 +105,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @dirrm %%DATADIR%%/fdi
 @dirrm %%DATADIR%%/dist
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/conf
 @dirrm %%DOCSDIR%%
+@dirrm libexec/hal/scripts/freebsd
 @dirrm libexec/hal/scripts
 @dirrm libexec/hal
 @dirrm include/hal
@@ -136,8 +119,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
 @unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
 @unexec rmdir /var/run/hald 2>/dev/null || true
-@dirrmtry share/locale/sl_SI/LC_MESSAGES
-@dirrmtry share/locale/sl_SI
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
+@unexec rmdir /var/cache/hald 2>/dev/null || true
+@unexec rmdir /var/cache 2>/dev/null || true
+@unexec /var/lib/hal 2>/dev/null || true
+@unexec /var/lib 2>/dev/null || true
 %%MEDIA%%@unexec rmdir /media 2>/dev/null || true