* Update to 0.5.13.

* Add support for ufsids in an attempt to prevent duplicate file system
  mounting


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

8 files changed, 133 insertions, 174 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 8361ee026..56fd03c2e 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.57 2009/05/23 21:27:00 marcus Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.58 2009/05/23 22:56:04 marcus Exp $
 #
 
 PORTNAME=	hal
-DISTVERSION=	0.5.12
-PORTREVISION=	2
+DISTVERSION=	0.5.13
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -23,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack ltverhack
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
@@ -86,11 +85,12 @@ PLIST_SUB+=	USB2="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
+	@${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
 		${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 's|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
+		${WRKSRC}/hald/Makefile.in \
+		${WRKSRC}/tools/Makefile.in
 	@${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
 		${WRKSRC}/hal.conf.in
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 585b1483a..5885af28a 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.12.tar.gz) = bb7c36e142437f7363f9a80ae8391926
-SHA256 (hal-0.5.12.tar.gz) = c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02
-SIZE (hal-0.5.12.tar.gz) = 1197445
+MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a
+SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af
+SIZE (hal-0.5.13.tar.gz) = 1199224
diff --git a/sysutils/hal/files/patch-configure b/sysutils/hal/files/patch-configure
index fec2eb698..bc4df6d96 100644
--- a/sysutils/hal/files/patch-configure
+++ b/sysutils/hal/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2009-05-17 00:54:41.000000000 -0400
-+++ configure	2009-05-17 00:56:13.000000000 -0400
+--- configure.orig	2009-07-18 21:14:47.000000000 -0400
++++ configure	2009-07-18 21:14:47.000000000 -0400
 @@ -818,6 +818,8 @@ XMLTO
  HALD_OS_LIBS
  BLKID_LIBS
@@ -39,7 +39,7 @@
    BLKID_CFLAGS
                C compiler flags for BLKID, overriding pkg-config
    BLKID_LIBS  linker flags for BLKID, overriding pkg-config
-@@ -2793,6 +2804,7 @@ fi
+@@ -2794,6 +2805,7 @@ fi
  glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
  dbus_module="dbus-1 >= 0.61"
  blkid_module="blkid >= 1.43"
@@ -47,149 +47,7 @@
  polkit_module="polkit >= 0.5"
  
  # libtool versioning - this applies to libhal and libhal-storage
-@@ -6517,13 +6529,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:6520: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6532: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6523: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6535: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6526: output\"" >&5)
-+  (eval echo "\"\$as_me:6538: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -7728,7 +7740,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 7731 "configure"' > conftest.$ac_ext
-+  echo '#line 7743 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -9885,11 +9897,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9888: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9900: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9892: \$? = $ac_status" >&5
-+   echo "$as_me:9904: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10224,11 +10236,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10227: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10239: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10231: \$? = $ac_status" >&5
-+   echo "$as_me:10243: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10329,11 +10341,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10332: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10344: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10336: \$? = $ac_status" >&5
-+   echo "$as_me:10348: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10384,11 +10396,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10387: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10399: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10391: \$? = $ac_status" >&5
-+   echo "$as_me:10403: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -13200,7 +13212,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13203 "configure"
-+#line 13215 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13296,7 +13308,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13299 "configure"
-+#line 13311 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15316,11 +15328,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15319: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15331: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15323: \$? = $ac_status" >&5
-+   echo "$as_me:15335: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -15415,11 +15427,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15418: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15430: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15422: \$? = $ac_status" >&5
-+   echo "$as_me:15434: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -15467,11 +15479,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15470: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15482: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15474: \$? = $ac_status" >&5
-+   echo "$as_me:15486: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -19128,6 +19140,9 @@ else
+@@ -19129,6 +19141,9 @@ else
  fi
  
  
@@ -199,7 +57,7 @@
  
  # Check whether --with-backend was given.
  if test "${with_backend+set}" = set; then
-@@ -19185,6 +19200,184 @@ else
+@@ -19186,6 +19201,184 @@ else
  fi
  
  
@@ -384,7 +242,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -19942,8 +20135,132 @@ fi
+@@ -19943,8 +20136,132 @@ fi
  { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5
  $as_echo "$have_glib_2_14" >&6; }
  
@@ -517,7 +375,7 @@
  *-*-solaris*)
  	;;
  *)
-@@ -21440,6 +21757,20 @@ $as_echo "$as_me: error: conditional \"H
+@@ -21441,6 +21758,20 @@ $as_echo "$as_me: error: conditional \"H
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
index f3c0c6186..bb18f3310 100644
--- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
+++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
@@ -1,6 +1,6 @@
---- fdi/policy/10osvendor/10-x11-input.fdi.orig	2009-03-23 03:18:33.000000000 -0400
-+++ fdi/policy/10osvendor/10-x11-input.fdi	2009-05-17 00:41:26.000000000 -0400
-@@ -7,19 +7,10 @@
+--- fdi/policy/10osvendor/10-x11-input.fdi.orig	2009-06-26 03:28:39.000000000 -0400
++++ fdi/policy/10osvendor/10-x11-input.fdi	2009-07-18 21:19:15.000000000 -0400
+@@ -7,15 +7,6 @@
         <merge key="input.x11_driver" type="string">evdev</merge>
      </match>
  
@@ -13,6 +13,13 @@
 -      </match>
 -    </match>
 -
+     <match key="info.capabilities" contains="input.tablet">
+       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+              string="Linux">
+@@ -23,10 +14,10 @@
+       </match>
+     </match>
+ 
 -    <match key="info.capabilities" contains="input.keys">
 +    <match key="info.capabilities" contains="input.keyboard">
        <!-- If we're using Linux, we use evdev by default (falling back to
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c
new file mode 100644
index 000000000..e2921c58a
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c
@@ -0,0 +1,26 @@
+--- hald/freebsd/hf-computer.c.orig	2009-07-18 21:22:48.000000000 -0400
++++ hald/freebsd/hf-computer.c	2009-07-18 21:23:51.000000000 -0400
+@@ -26,6 +26,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <stdio.h>
+ #include <string.h>
+ #include <sys/utsname.h>
+ 
+@@ -133,11 +134,11 @@ hf_computer_device_add (void)
+   if (PACKAGE_VERSION) {
+       int major, minor, micro;
+ 
+-      hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
++      hal_device_property_set_string (device, "org.freedesktop.Hal.version", PACKAGE_VERSION);
+       if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
+-	hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
+-        hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
+-        hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
++	hal_device_property_set_int (device, "org.freedesktop.Hal.version.major", major);
++        hal_device_property_set_int (device, "org.freedesktop.Hal.version.minor", minor);
++        hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro);
+       }
+   }
+ 
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
index 405026cc6..091af3c1c 100644
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
+++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
@@ -1,5 +1,5 @@
---- hald/freebsd/probing/Makefile.am.orig	2008-05-07 19:24:08.000000000 -0400
-+++ hald/freebsd/probing/Makefile.am	2009-02-18 00:16:28.000000000 -0500
+--- hald/freebsd/probing/Makefile.am.orig	2008-08-10 09:50:10.000000000 -0400
++++ hald/freebsd/probing/Makefile.am	2009-07-17 02:31:02.000000000 -0400
 @@ -9,11 +9,18 @@ AM_CPPFLAGS = \
  
  if HALD_COMPILE_FREEBSD
@@ -49,3 +49,9 @@
  hald_probe_smbios_SOURCES = probe-smbios.c
  hald_probe_smbios_LDADD = \
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
+@@ -41,4 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA
+ hald_probe_volume_LDADD = \
+ 	@GLIB_LIBS@							\
+ 	@VOLUME_ID_LIBS@						\
++	-lufs								\
+ 	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
index 1a6e94927..4a8ea2f05 100644
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
+++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
@@ -1,5 +1,5 @@
---- hald/freebsd/probing/Makefile.in.orig	2009-05-17 00:44:58.000000000 -0400
-+++ hald/freebsd/probing/Makefile.in	2009-05-17 00:44:58.000000000 -0400
+--- hald/freebsd/probing/Makefile.in.orig	2009-07-16 22:17:53.000000000 -0400
++++ hald/freebsd/probing/Makefile.in	2009-07-17 02:32:09.000000000 -0400
 @@ -34,10 +34,16 @@ build_triplet = @build@
  host_triplet = @host@
  @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS =  \
@@ -99,7 +99,15 @@
  hald_probe_smbios_SOURCES = probe-smbios.c
  hald_probe_smbios_LDADD = \
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -349,6 +394,9 @@ clean-libexecPROGRAMS:
+@@ -283,6 +328,7 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA
+ hald_probe_volume_LDADD = \
+ 	@GLIB_LIBS@							\
+ 	@VOLUME_ID_LIBS@						\
++	-lufs								\
+ 	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
+ 
+ all: all-am
+@@ -349,6 +395,9 @@ clean-libexecPROGRAMS:
  hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES) 
  	@rm -f hald-probe-hiddev$(EXEEXT)
  	$(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS)
@@ -109,7 +117,7 @@
  hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES) 
  	@rm -f hald-probe-scsi$(EXEEXT)
  	$(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS)
-@@ -358,6 +406,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe
+@@ -358,6 +407,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe
  hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES) 
  	@rm -f hald-probe-storage$(EXEEXT)
  	$(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS)
@@ -122,7 +130,7 @@
  hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES) 
  	@rm -f hald-probe-volume$(EXEEXT)
  	$(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS)
-@@ -368,6 +422,7 @@ mostlyclean-compile:
+@@ -368,6 +423,7 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -130,7 +138,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-probe-storage.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@
-@@ -375,6 +430,8 @@ distclean-compile:
+@@ -375,6 +431,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-scsi.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-smbios.Po@am__quote@
@@ -139,7 +147,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -397,6 +454,20 @@ distclean-compile:
+@@ -397,6 +455,20 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
  
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
index b9dc099e6..4a0531f35 100644
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
+++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
@@ -1,6 +1,19 @@
---- hald/freebsd/probing/probe-volume.c.orig	2008-04-07 00:41:22.000000000 -0400
-+++ hald/freebsd/probing/probe-volume.c	2008-04-07 00:43:32.000000000 -0400
-@@ -502,7 +502,8 @@ main (int argc, char **argv)
+--- hald/freebsd/probing/probe-volume.c.orig	2008-08-10 09:50:10.000000000 -0400
++++ hald/freebsd/probing/probe-volume.c	2009-07-18 21:20:55.000000000 -0400
+@@ -36,7 +36,12 @@
+ #include <sys/disk.h>
+ #include <sys/cdio.h>
+ #include <sys/param.h>
++#include <sys/mount.h>
+ #include <sys/types.h>
++#include <ufs/ufs/ufsmount.h>
++#include <ufs/ufs/dinode.h>
++#include <ufs/ffs/fs.h>
++#include <libufs.h>
+ #include <isofs/cd9660/iso.h>
+ #include <glib.h>
+ #include <libvolume_id.h>
+@@ -502,7 +507,8 @@ main (int argc, char **argv)
  	  hfp_cdrom_free(cdrom);
  	}
  
@@ -10,3 +23,44 @@
          hf_probe_volume_advanced_disc_detect(fd);
      }
    else
+@@ -555,6 +561,40 @@ main (int argc, char **argv)
+ 
+   libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error);
+ 
++  if (vid && ! strcmp (vid->type, "ufs"))
++    {
++      struct uufsd ufsdisk;
++
++      if (ufs_disk_fillout(&ufsdisk, device_file) == 0)
++        {
++	  char ufsid[64];
++	  char **ufs_devs;
++	  int num_udis;
++	  int i;
++
++	  snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);
++	  libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);
++	  ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
++			  				     "volume.freebsd.ufsid",
++							     ufsid,
++							     &num_udis,
++							     &hfp_error);
++	  dbus_error_free(&hfp_error);
++	  for (i = 0; i < num_udis; i++)
++            {
++              if (ufs_devs[i] != NULL)
++                {
++                  gboolean mounted;
++
++		  mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);
++		  if (mounted)
++                    libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
++		}
++	    }
++	  ufs_disk_close(&ufsdisk);
++	}
++    }
++
+   if (has_children)
+     usage = "partitiontable";
+   else if (is_swap)