aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2021-02-08 09:54:15 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2021-02-08 09:54:15 +0000
commit1772fa1a6d3cb39d9844fcb434ef4ce60728864a (patch)
tree034532aaeb5a1a6cdae02bb4e9ed88d2e74d50b3
parentde47ffe65cfc8ee11610c6378e1d0a342c137916 (diff)
downloadports-1772fa1a6d3cb39d9844fcb434ef4ce60728864a.tar.gz
ports-1772fa1a6d3cb39d9844fcb434ef4ce60728864a.zip
Remove hal
Hal has been introduced as part of the Gnome2 desktop and used in many desktop application as an abstraction on the hardware layer, it has been quickly deprecated, but alternatives took time to land in freebsd. In most cases alternatives are now in place or upstreams dropped entirely support for HAL. As a result it is time to retire HAL
Notes
Notes: svn path=/head/; revision=564691
-rw-r--r--MOVED2
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/hal-info/Makefile24
-rw-r--r--sysutils/hal-info/distinfo2
-rw-r--r--sysutils/hal-info/files/patch-configure110
-rw-r--r--sysutils/hal-info/pkg-descr3
-rw-r--r--sysutils/hal-info/pkg-plist51
-rw-r--r--sysutils/hal/Makefile108
-rw-r--r--sysutils/hal/distinfo2
-rw-r--r--sysutils/hal/files/10-mouse-sysmouse.fdi8
-rw-r--r--sysutils/hal/files/README.fuse31
-rw-r--r--sysutils/hal/files/extra-patch-tools_hal-storage-mount.c25
-rw-r--r--sysutils/hal/files/hald.in120
-rw-r--r--sysutils/hal/files/mount-fuse153
-rw-r--r--sysutils/hal/files/patch-Makefile.in31
-rw-r--r--sysutils/hal/files/patch-doc_Makefile.in11
-rw-r--r--sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi13
-rw-r--r--sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi31
-rw-r--r--sysutils/hal/files/patch-hald-runner_runner.c11
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_Makefile.in36
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c105
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devd.c29
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devtree.c21
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-drm.c15
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-memcard.c109
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-memcard.h39
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-scsi.c37
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb.c20
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.c426
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-volume.c16
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c49
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am27
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in564
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c39
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c36
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c221
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c31
-rw-r--r--sysutils/hal/files/patch-hald_hf-storage.c107
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-eject.c11
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-mount.c91
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-shared.c45
-rw-r--r--sysutils/hal/files/pkg-deinstall.in17
-rw-r--r--sysutils/hal/files/pkg-install.in25
-rw-r--r--sysutils/hal/pkg-descr6
-rw-r--r--sysutils/hal/pkg-plist120
45 files changed, 2 insertions, 2978 deletions
diff --git a/MOVED b/MOVED
index 08e13308756e..4fd453ccdaa2 100644
--- a/MOVED
+++ b/MOVED
@@ -16150,3 +16150,5 @@ net/twitux||2021-02-06|Does not work with actually twitter
net-mgmt/ccnet-server||2021-02-07|Removed
x11-toolkits/c++-gtk-utils||2021-02-07|Abandoned library not depended on
textproc/xml-i18n-tools|textproc/intltool|2021-02-07|Has been replaced by intltools long ago
+sysutils/hal||2021-02-08|Has been abandonned upstream long ago, replacement have now hit the ports tree almost everywhere
+sysutils/hal-info||2021-02-08|Has no use without hal which has been removed
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 98c9e7324132..f90d1d18dc4c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -468,8 +468,6 @@
SUBDIR += gstopd
SUBDIR += gstreamer1-plugins-cdio
SUBDIR += gtk-imonc
- SUBDIR += hal
- SUBDIR += hal-info
SUBDIR += hardlink
SUBDIR += hare
SUBDIR += hared
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
deleted file mode 100644
index 3f92a5508c18..000000000000
--- a/sysutils/hal-info/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/sysutils/hal-info/Makefile,v 1.6 2010/03/16 19:33:11 mezz Exp $
-
-PORTNAME= hal-info
-PORTVERSION= 20091130
-CATEGORIES= sysutils
-MASTER_SITES= http://hal.freedesktop.org/releases/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Additional FDI files to further classify HAL devices
-
-LIB_PC_DEPENDS= hal.pc:sysutils/hal
-
-BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-
-USES= gmake
-GNU_CONFIGURE= yes
-NO_ARCH= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-.include <bsd.port.mk>
diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo
deleted file mode 100644
index 620d039f4a79..000000000000
--- a/sysutils/hal-info/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (hal-info-20091130.tar.gz) = 3b5a90eaea4359977d36c808a19b3f08835345a258c68b9c6c080ad5ef875224
-SIZE (hal-info-20091130.tar.gz) = 144859
diff --git a/sysutils/hal-info/files/patch-configure b/sysutils/hal-info/files/patch-configure
deleted file mode 100644
index 0a256b677af7..000000000000
--- a/sysutils/hal-info/files/patch-configure
+++ /dev/null
@@ -1,110 +0,0 @@
---- configure.orig 2009-12-25 12:13:27.000000000 -0500
-+++ configure 2009-12-25 12:14:19.000000000 -0500
-@@ -3397,7 +3397,7 @@ else
- enable_recall=yes
- fi
-
-- if test x$enable_recall == xyes; then
-+ if test x$enable_recall = xyes; then
- BUILD_RECALL_TRUE=
- BUILD_RECALL_FALSE='#'
- else
-@@ -3413,7 +3413,7 @@ else
- enable_video=yes
- fi
-
-- if test x$enable_video == xyes; then
-+ if test x$enable_video = xyes; then
- BUILD_VIDEO_TRUE=
- BUILD_VIDEO_FALSE='#'
- else
-@@ -3429,7 +3429,7 @@ else
- enable_video_nvidia_quirks=yes
- fi
-
-- if test x$enable_video_nvidia_quirks == xyes; then
-+ if test x$enable_video_nvidia_quirks = xyes; then
- BUILD_VIDEO_NVIDIA_QUIRKS_TRUE=
- BUILD_VIDEO_NVIDIA_QUIRKS_FALSE='#'
- else
-@@ -3445,7 +3445,7 @@ else
- enable_video_default_quirks=yes
- fi
-
-- if test x$enable_video_default_quirks == xyes; then
-+ if test x$enable_video_default_quirks = xyes; then
- BUILD_VIDEO_DEFAULT_QUIRKS_TRUE=
- BUILD_VIDEO_DEFAULT_QUIRKS_FALSE='#'
- else
-@@ -3461,7 +3461,7 @@ else
- enable_keymaps=yes
- fi
-
-- if test x$enable_keymaps == xyes; then
-+ if test x$enable_keymaps = xyes; then
- BUILD_KEYMAPS_TRUE=
- BUILD_KEYMAPS_FALSE='#'
- else
-@@ -3477,7 +3477,7 @@ else
- enable_killswitch_dell_wlan=yes
- fi
-
-- if test x$enable_killswitch_dell_wlan == xyes; then
-+ if test x$enable_killswitch_dell_wlan = xyes; then
- BUILD_KILLSWITCH_DELL_WLAN_TRUE=
- BUILD_KILLSWITCH_DELL_WLAN_FALSE='#'
- else
-@@ -3493,7 +3493,7 @@ else
- enable_killswitch_dell_bluetooth=yes
- fi
-
-- if test x$enable_killswitch_dell_bluetooth == xyes; then
-+ if test x$enable_killswitch_dell_bluetooth = xyes; then
- BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE=
- BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#'
- else
-@@ -3509,7 +3509,7 @@ else
- enable_killswitch_dell_wwan=yes
- fi
-
-- if test x$enable_killswitch_dell_wwan == xyes; then
-+ if test x$enable_killswitch_dell_wwan = xyes; then
- BUILD_KILLSWITCH_DELL_WWAN_TRUE=
- BUILD_KILLSWITCH_DELL_WWAN_FALSE='#'
- else
-@@ -3525,7 +3525,7 @@ else
- enable_killswitch_sony_bluetooth=yes
- fi
-
-- if test x$enable_killswitch_sony_bluetooth == xyes; then
-+ if test x$enable_killswitch_sony_bluetooth = xyes; then
- BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE=
- BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#'
- else
-@@ -3541,7 +3541,7 @@ else
- enable_killswitch_thinkpad_bluetooth=yes
- fi
-
-- if test x$enable_killswitch_thinkpad_bluetooth == xyes; then
-+ if test x$enable_killswitch_thinkpad_bluetooth = xyes; then
- BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE=
- BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#'
- else
-@@ -3557,7 +3557,7 @@ else
- enable_killswitch_ipw_wlan=yes
- fi
-
-- if test x$enable_killswitch_ipw_wlan == xyes; then
-+ if test x$enable_killswitch_ipw_wlan = xyes; then
- BUILD_KILLSWITCH_IPW_WLAN_TRUE=
- BUILD_KILLSWITCH_IPW_WLAN_FALSE='#'
- else
-@@ -3573,7 +3573,7 @@ else
- enable_killswitch_iwl_wlan=yes
- fi
-
-- if test x$enable_killswitch_iwl_wlan == xyes; then
-+ if test x$enable_killswitch_iwl_wlan = xyes; then
- BUILD_KILLSWITCH_IWL_WLAN_TRUE=
- BUILD_KILLSWITCH_IWL_WLAN_FALSE='#'
- else
diff --git a/sysutils/hal-info/pkg-descr b/sysutils/hal-info/pkg-descr
deleted file mode 100644
index dd42292fcc44..000000000000
--- a/sysutils/hal-info/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-hal-info contains device information for HAL.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/hal-info/pkg-plist b/sysutils/hal-info/pkg-plist
deleted file mode 100644
index 9352476740f7..000000000000
--- a/sysutils/hal-info/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-share/hal/fdi/information/10freedesktop/10-battery.fdi
-share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
-share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
-share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
-share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
-share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
-share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
-share/hal/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
-share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
-share/hal/fdi/information/10freedesktop/10-modem.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
-share/hal/fdi/information/10freedesktop/10-scanner.fdi
-share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
-share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
-share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
-share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
-share/hal/fdi/information/10freedesktop/10-usb-obex.fdi
-share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
-share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
-share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
-share/hal/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
-share/hal/fdi/information/10freedesktop/99-video-quirk-default.fdi
-share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
-share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
-@dir share/hal/fdi/preprobe/20thirdparty
-@dir share/hal/fdi/information/20thirdparty
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
deleted file mode 100644
index e2832397f241..000000000000
--- a/sysutils/hal/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.81 2010/04/13 02:49:07 mezz Exp $
-
-PORTNAME= hal
-DISTVERSION= 0.5.14
-PORTREVISION= 34
-CATEGORIES= sysutils
-MASTER_SITES= http://hal.freedesktop.org/releases/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Hardware Abstraction Layer for simplifying device access
-
-BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-# keep shlib version, to prevent confusion with polkit-* from sysutils/polkit
-LIB_DEPENDS= libpolkit.so.2:sysutils/policykit \
- libvolume_id.so:devel/libvolume_id \
- libck-connector.so:sysutils/consolekit2
-RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids
-
-USES= gettext gmake gnome libtool:keepla pathfix pkgconfig python \
- shebangfix
-USE_GNOME= intlhack
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-gtk-doc \
- --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-eject=/usr/sbin/cdcontrol \
- --with-pid-file=/var/run/hald/hald.pid \
- --with-deprecated-keys \
- --localstatedir=/var
-CONFIGURE_ENV= GTKDOC="false"
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-bash_CMD= ${SH}
-SHEBANG_FILES= tools/hal-*
-
-#HALVERSION= 0.5.10
-#SNAPVERSION= 20080218
-
-USERS= haldaemon
-GROUPS= haldaemon
-
-USE_RC_SUBR= hald
-USE_GNOME_SUBR= yes
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
-PLIST_SUB= VERSION=${DISTVERSION}
-
-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}"
-
-INSTALL_TARGET= install-strip
-
-OPTIONS_DEFINE= FIXED_MOUNTPOINTS DOCS
-FIXED_MOUNTPOINTS_DESC= use fixed mountpoints
-FIXED_MOUNTPOINTS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == amd64 || ${ARCH} == i386
-RUN_DEPENDS+= dmidecode:sysutils/dmidecode
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's/==/=/g' ${WRKSRC}/tools/hal-luks*
- @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
- ${WRKSRC}/tools/Makefile.in \
- ${WRKSRC}/tools/freebsd/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}|' \
- < ${FILESDIR}/README.fuse > ${WRKDIR}/README.fuse
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}/dist
- ${INSTALL_DATA} ${WRKSRC}/hal.conf ${STAGEDIR}${DATADIR}/dist
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_DATA} ${FILESDIR}/10-mouse-sysmouse.fdi \
- ${STAGEDIR}${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_SCRIPT} ${FILESDIR}/mount-fuse \
- ${STAGEDIR}${PREFIX}/share/hal/mount-fuse
- @${MKDIR} ${STAGEDIR}/var/lib/hal
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
- ${STAGEDIR}${DOCSDIR}/README.freebsd
- ${INSTALL_DATA} ${WRKDIR}/README.fuse \
- ${STAGEDIR}${DOCSDIR}/README.fuse
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
deleted file mode 100644
index 720acd14cd57..000000000000
--- a/sysutils/hal/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (hal-0.5.14.tar.gz) = 323aacfa52f12def3b0d1e76456e34f027c345adc344aad19a8cc0c59c1a8d02
-SIZE (hal-0.5.14.tar.gz) = 1238766
diff --git a/sysutils/hal/files/10-mouse-sysmouse.fdi b/sysutils/hal/files/10-mouse-sysmouse.fdi
deleted file mode 100644
index cffd4f624e18..000000000000
--- a/sysutils/hal/files/10-mouse-sysmouse.fdi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.mouse">
- <append key="info.addons" type="strlist">hald-addon-mouse-sysmouse</append>
- </match>
- </device>
-</deviceinfo>
diff --git a/sysutils/hal/files/README.fuse b/sysutils/hal/files/README.fuse
deleted file mode 100644
index 75adcab7d589..000000000000
--- a/sysutils/hal/files/README.fuse
+++ /dev/null
@@ -1,31 +0,0 @@
-Mounting Fuse File Systems with HAL
------------------------------------
-
-$FreeBSD$
-
-Hal supports mounting Fuse device-backed file systems (e.g. NTFS). To enable
-this feature, copy the included %%LOCALBASE%%/share/hal/mount-fuse script
-to /sbin. Make sure this script is executable. Edit the script, and change
-the FUSE_HELPER environment variable to the name of the executable which
-will actually mount the Fuse volume (e.g. for NTFS, this is ``ntfs-3g'').
-
-Finally, the script must be renamed to ``mount_FSNAME''. FSNAME is the name
-of the file system type (e.g. for NTFS, this is ``ntfs''). If there is
-already an executable in /sbin or /usr/sbin with this name, the
-existing executable must be renamed or deleted.
-
-As is stated in the examples above, overriding FreeBSD's existing NTFS
-support with Fuse's ntfs-3g is the most common use case for this. The
-ntfs-3g Fuse driver uses different mount options than FreeBSD's included
-mount_ntfs. GNOME transparently supports switching between ntfs and
-ntfs-3g. Simply edit the following GConf key in the GNOME
-Configuration Editor (i.e. gconf-editor):
-
-/system/storage/default_options/ntfs/fstype_override
-
-Set the value to ``ntfs-3g'', then add your desired ntfs-3g options to the
-following GConf key:
-
-/system/storage/default_options/ntfs-3g/mount_options
-
-Other desktop systems may have similar options.
diff --git a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
deleted file mode 100644
index f505709e1c50..000000000000
--- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- tools/hal-storage-mount.c.orig 2008-05-20 13:24:30.000000000 -0400
-+++ tools/hal-storage-mount.c 2008-05-20 13:30:14.000000000 -0400
-@@ -585,17 +585,11 @@ handle_mount (LibHalContext *hal_ctx,
- explicit_mount_point_given = FALSE;
- if (strlen (mount_point) == 0) {
- char *p;
--
-- 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");
-- }
-+ char *basename;
-+
-+ 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
deleted file mode 100644
index 0637d2eb66ff..000000000000
--- a/sysutils/hal/files/hald.in
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: hald
-# REQUIRE: DAEMON devd dbus moused webcamd
-#
-# Add the following line to /etc/rc.conf to enable the HAL daemon:
-#
-# hald_enable="YES"
-#
-
-. /etc/rc.subr
-. %%GNOME_SUBR%%
-
-hald_enable=${hald_enable-${gnome_enable}}
-hald_flags=${hald_flags-""}
-
-name=hald
-rcvar=hald_enable
-
-command="%%PREFIX%%/sbin/hald"
-pidfile="/var/run/${name}/${name}.pid"
-
-stop_postcmd="hald_postcmd"
-start_precmd="hald_precmd"
-start_cmd="hald_start"
-
-local_force_depend()
-{
- _depend="$1"
- if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
- _depend="${_depend}.sh"
- fi
-
- if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
- ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
- return 1
- fi
- return 0
-}
-
-init_var_policykit()
-{
- local USER=polkit
- local GROUP=${USER}
- local PREFIX=/usr/local
-
- /usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/run/PolicyKit
- /usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/lib/PolicyKit
- /usr/bin/install -d -o ${USER} -m 0755 -g wheel /var/lib/PolicyKit-public
- /bin/mkdir -p /var/lib/misc
- /usr/bin/touch -f /var/lib/misc/PolicyKit.reload
- /usr/sbin/chown ${USER}:${GROUP} /var/lib/misc/PolicyKit.reload
- /bin/chmod 0664 /var/lib/misc/PolicyKit.reload
-}
-
-init_var_polkit()
-{
- mkdir -p /var/lib/polkit-1/localauthority
- for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d
- do
- mkdir -p /var/lib/polkit-1/localauthority/${i}
- done
- chmod 0700 /var/lib/polkit-1
-}
-
-init_var_hal()
-{
- local USER=haldaemon
- local GROUP=${USER}
-
- /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
- /usr/local/bin/polkit-auth --user ${USER} --grant \
- org.freedesktop.policykit.read 1> /dev/null 2>&1
-}
-
-hald_precmd()
-{
- if ! checkyesno dbus_enable
- then
- local_force_depend dbus || return 1
- fi
-
- init_var_policykit
- init_var_polkit
- init_var_hal
-
- chmod 0755 /var/cache
-
- mkdir -p $(dirname $pidfile)
-}
-
-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/mount-fuse b/sysutils/hal/files/mount-fuse
deleted file mode 100644
index a0ea8536e3a5..000000000000
--- a/sysutils/hal/files/mount-fuse
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-# Wrapper script for FreeBSD and PC-BSD, which takes calls from HAL
-# for running mount_ntfs, and performs it with a given FUSE helper.
-###################################################################
-
-## Modify this next variable to point to the correct FUSE helper.
-FUSE_HELPER="ntfs-3g"
-## DO NOT modify anything below this.
-
-FUSEDB="/tmp"
-if [ -n "${TMPDIR}" ]
-then
- FUSEDB=${TMPDIR}
-fi
-
-FUSEDB="${FUSEDB}/.fuse-mnts"
-MNTSTRING=""
-OPTIONS=""
-FOUNDOPT="0"
-FOUNDU="0"
-FOUNDG="0"
-FOUNDBADARG="0"
-HWDEV=""
-FOUNDDEV="0"
-
-for i in $@
-do
- if [ "$FOUNDOPT" = "1" ]
- then
- OPTIONS="${OPTIONS} -o ${i}"
- elif [ "${FOUNDU}" = "1" ]
- then
- OPTIONS="${OPTIONS} -o uid=${i}"
- elif [ "${FOUNDG}" = "1" ]
- then
- OPTIONS="${OPTIONS} -o gid=${i}"
- elif [ "${FOUNDBADARG}" = "1" ]
- then
- # We have an invalid argument flag, so ignore it and following argument
- FOUNDBADARG="0"
- else
-
- if [ "${FOUNDDEV}" = "1" ]
- then
- # Save the mount-point, will be used later
- MNTPOINT="${i}"
- FOUNDDEV="2"
- fi
-
- echo ${i}| grep -q "/dev" 2>/dev/null
- if [ "$?" = "0" -a "${FOUNDDEV}" = "0" ]
- then
- FOUNDDEV="1"
- # Lets check if we were given a fuse[] device
- # or a real device name
- echo "${i}" | grep -q "fuse" 2>/dev/null
- if [ "$?" = "0" ]
- then
- # Lets save the old fuse device name we had saved
- OLDFUSE="${i}"
-
- # Lets get the *real* device name for FUSE helper
- REALHWDEV="`cat ${FUSEDB} | grep ${i} | cut -d '=' -f 2`"
-
- # Now lets change the string we will be saving
- i="${REALHWDEV}"
- else
- # We are doing a first time mount of this device
-
- # Set the real device name for mounting
- REALHWDEV="${i}"
- fi
- fi
-
- # Add the value to our mount string if it isn't any invalid flag
- if [ "${i}" != "-o" -a "${i}" != "-u" -a "${i}" != "-C" -a "${i}" != "-g" -a "${i}" != "-m" -a "${i}" != "-a" -a "${i}" != "-i" -a "${i}" -a "-W" ]
- then
- MNTSTRING="${MNTSTRING} ${i}"
- fi
-
- fi
-
- # Check if we are on a -u user id flag now
- if [ "${i}" = "-u" ]
- then
- FOUNDU="1"
- else
- FOUNDU="0"
- fi
-
- # Check if we are on a -g group id flag now
- if [ "${i}" = "-g" ]
- then
- FOUNDG="1"
- else
- FOUNDG="0"
- fi
-
- # Check if we are on a -o option
- if [ "${i}" = "-o" ]
- then
- FOUNDOPT="1"
- else
- FOUNDOPT="0"
- fi
-
- # Check if we are on some other invalid flag
- if [ "${i}" = "-C" -o "${i}" = "-m" -o "${i}" = "-W" ]
- then
- FOUNDBADARG="1"
- else
- FOUNDBADARG="0"
- fi
-done
-
-# Save our final string which our FUSE helper will use
-FINALSTRING="${MNTSTRING} ${OPTIONS}"
-
-# Check that fuse.ko is loaded
-kldstat | grep -q fuse 2>/dev/null
-if [ "$?" != "0" ]
-then
- kldload /usr/local/modules/fuse.ko
-fi
-
-# Run the FUSE helper command now, with the options in the right order
-${FUSE_HELPER} ${FINALSTRING}
-
-# If we have an OLDFUSE variable, lets clear it from the list
-if [ ! -z "${OLDFUSE}" -a -e ${FUSEDB} ]
-then
- cat ${FUSEDB} | grep -v "${OLDFUSE}=" > /tmp/.newfuse
- mv /tmp/.newfuse ${FUSEDB}
-fi
-
-# Now lets figure out which fuse device was used and save it to DB
-NEWFUSE="`mount | tr -s ' ' | grep \" ${MNTPOINT} \" | cut -d ' ' -f 1`"
-
-# Make sure we don't already have this fuse device listed
-if [ -e ${FUSEDB} ]
-then
- cat ${FUSEDB} | grep -v "${NEWFUSE}=" > /tmp/.newfuse
- mv /tmp/.newfuse ${FUSEDB}
-else
- touch ${FUSEDB}
-fi
-
-# Save the fuse device to our DB
-echo "${NEWFUSE}=${REALHWDEV}" >> ${FUSEDB}
-
-
-# Finished!
-exit 0
diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in
deleted file mode 100644
index 46b74a5b1a0c..000000000000
--- a/sysutils/hal/files/patch-Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig 2009-12-23 13:39:15.000000000 -0500
-+++ Makefile.in 2009-12-23 13:39:58.000000000 -0500
-@@ -379,17 +379,17 @@ clean-libtool:
- distclean-libtool:
- -rm -f libtool config.lt
- install-dist_dbusDATA: $(dist_dbus_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)"
-- @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \
-- for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- echo "$$d$$p"; \
-- done | $(am__base_list) | \
-- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdir)" || exit $$?; \
-- done
-+# @$(NORMAL_INSTALL)
-+# test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)"
-+# @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \
-+# for p in $$list; do \
-+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+# echo "$$d$$p"; \
-+# done | $(am__base_list) | \
-+# while read files; do \
-+# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdir)'"; \
-+# $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdir)" || exit $$?; \
-+# done
-
- uninstall-dist_dbusDATA:
- @$(NORMAL_UNINSTALL)
diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in
deleted file mode 100644
index 9cd951720ede..000000000000
--- a/sysutils/hal/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 man
-+SUBDIRS = spec man
- MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in
diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
deleted file mode 100644
index 1391709f8f0c..000000000000
--- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
+++ /dev/null
@@ -1,13 +0,0 @@
---- fdi/policy/10osvendor/10-power-mgmt-policy.fdi.orig 2008-05-07 19:21:15.000000000 -0400
-+++ fdi/policy/10osvendor/10-power-mgmt-policy.fdi 2009-01-30 17:41:05.000000000 -0500
-@@ -10,7 +10,9 @@
-
- <device>
- <match key="power_management.type" string="acpi">
-- <append key="info.addons" type="strlist">hald-addon-acpi</append>
-+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
-+ <append key="info.addons" type="strlist">hald-addon-acpi</append>
-+ </match>
- </match>
- </device>
-
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
deleted file mode 100644
index bb18f33107a3..000000000000
--- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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>
-
-- <!-- FIXME: Support tablets too. -->
-- <match key="info.capabilities" contains="input.mouse">
-- <merge key="input.x11_driver" type="string">mouse</merge>
-- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-- string="Linux">
-- <merge key="input.x11_driver" type="string">evdev</merge>
-- </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
- keyboard otherwise). -->
-- <merge key="input.x11_driver" type="string">keyboard</merge>
-+ <merge key="input.x11_driver" type="string">kbd</merge>
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
- <merge key="input.x11_driver" type="string">evdev</merge>
diff --git a/sysutils/hal/files/patch-hald-runner_runner.c b/sysutils/hal/files/patch-hald-runner_runner.c
deleted file mode 100644
index 5b6c0043a5dd..000000000000
--- a/sysutils/hal/files/patch-hald-runner_runner.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- hald-runner/runner.c.orig 2010-11-05 19:26:05.673393765 +0200
-+++ hald-runner/runner.c 2010-11-05 19:26:33.471393058 +0200
-@@ -281,7 +281,7 @@ run_request_run (run_request *r, DBusCon
- }
- g_free (program_dir);
-
-- if (r->input) {
-+ if (r->input && strlen(r->input) > 0) {
- if (write(stdin_v, r->input, strlen(r->input)) != (ssize_t) strlen(r->input))
- printf("Warning: Error while writing r->input (%s) to stdin_v.\n", r->input);
- close(stdin_v);
diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_Makefile.in
deleted file mode 100644
index cf11baa5f533..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./hald/freebsd/Makefile.in.orig 2009-11-30 23:22:38.000000000 +0100
-+++ ./hald/freebsd/Makefile.in 2013-10-22 02:07:00.268399458 +0200
-@@ -59,13 +59,14 @@
- hf-pcmcia.c hf-pcmcia.h hf-scsi.c hf-scsi.h hf-serial.c \
- hf-serial.h hf-sound.c hf-sound.h hf-storage.c hf-storage.h \
- hf-usb.c hf-usb.h hf-util.c hf-util.h hf-volume.c hf-volume.h \
-- osspec.c hal-file-monitor.c hf-usb2.c hf-usb2.h
-+ osspec.c hal-file-monitor.c hf-usb2.c hf-usb2.h \
-+ hf-memcard.c hf-memcard.h
- @HAVE_LIBUSB20_TRUE@am__objects_1 = hf-usb2.lo
- am_libhald_freebsd_la_OBJECTS = hf-acpi.lo hf-ata.lo hf-block.lo \
- hf-computer.lo hf-devd.lo hf-devtree.lo hf-drm.lo hf-net.lo \
- hf-pci.lo hf-pcmcia.lo hf-scsi.lo hf-serial.lo hf-sound.lo \
- hf-storage.lo hf-usb.lo hf-util.lo hf-volume.lo osspec.lo \
-- hal-file-monitor.lo $(am__objects_1)
-+ hf-memcard.lo hal-file-monitor.lo $(am__objects_1)
- libhald_freebsd_la_OBJECTS = $(am_libhald_freebsd_la_OBJECTS)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -325,7 +326,7 @@
- hf-scsi.c hf-scsi.h hf-serial.c hf-serial.h hf-sound.c \
- hf-sound.h hf-storage.c hf-storage.h hf-usb.c hf-usb.h \
- hf-util.c hf-util.h hf-volume.c hf-volume.h osspec.c \
-- hal-file-monitor.c $(am__append_1)
-+ hf-memcard.c hf-memcard.h hal-file-monitor.c $(am__append_1)
- libhald_freebsd_la_LDFLAGS = -lcam $(am__append_2)
- EXTRA_DIST = README TODO
- all: all-recursive
-@@ -388,6 +389,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-devd.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-devtree.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-drm.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-memcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-net.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-pci.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-pcmcia.Plo@am__quote@
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
deleted file mode 100644
index fed388c953ef..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
+++ /dev/null
@@ -1,105 +0,0 @@
---- hald/freebsd/addons/addon-storage.c.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/addons/addon-storage.c 2009-12-23 13:53:00.000000000 -0500
-@@ -107,8 +107,7 @@ hf_addon_storage_update (void)
-
- if (hf_addon_storage_cdrom_eject_pressed(cdrom))
- {
-- libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error);
-- dbus_error_free(&hfp_error);
-+ libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
- }
-
- hfp_cdrom_free(cdrom);
-@@ -164,19 +163,17 @@ unmount_volumes (void)
- "block.storage_device",
- hfp_udi,
- &num_volumes,
-- &hfp_error)) != NULL)
-+ NULL)) != NULL)
- {
- int i;
-
-- dbus_error_free(&hfp_error);
--
- for (i = 0; i < num_volumes; i++)
- {
- char *vol_udi;
-
- vol_udi = volumes[i];
-
-- if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", &hfp_error))
-+ if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL))
- {
- DBusMessage *msg = NULL;
- DBusMessage *reply = NULL;
-@@ -185,7 +182,6 @@ unmount_volumes (void)
- char **options = NULL;
- char *devfile;
-
-- dbus_error_free(&hfp_error);
- hfp_info("Forcing unmount of volume '%s'", vol_udi);
-
- dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);
-@@ -265,10 +261,9 @@ poll_for_media (boolean check_only, bool
- check_lock_state = FALSE;
-
- hfp_info("Checking whether device %s is locked by HAL", addon.device_file);
-- if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", &hfp_error))
-+ if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL))
- {
- hfp_info("... device %s is locked by HAL", addon.device_file);
-- dbus_error_free(&hfp_error);
- is_locked_by_hal = TRUE;
- update_proc_title(addon.device_file);
- goto skip_check;
-@@ -278,10 +273,8 @@ poll_for_media (boolean check_only, bool
- hfp_info("... device %s is not locked by HAL", addon.device_file);
- is_locked_by_hal = FALSE;
- }
-- dbus_error_free(&hfp_error);
-
-- should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
-- dbus_error_free(&hfp_error);
-+ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL);
- polling_disabled = ! should_poll;
- update_proc_title(addon.device_file);
- }
-@@ -314,8 +307,7 @@ poll_for_media (boolean check_only, bool
- unmount_volumes();
- #endif
-
-- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
-- dbus_error_free(&hfp_error);
-+ libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
- addon.had_media = has_media;
-
- return TRUE;
-@@ -412,12 +404,10 @@ main (int argc, char **argv)
- ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
- addon.had_media = poll_for_media(TRUE, FALSE);
-
-- if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
-+ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL))
- goto end;
-- dbus_error_free(&hfp_error);
-
-- syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error);
-- dbus_error_free(&hfp_error);
-+ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
- assert(syscon != NULL);
- dbus_connection_set_exit_on_disconnect(syscon, 0);
-
-@@ -452,12 +442,11 @@ main (int argc, char **argv)
- " <method name=\"CheckForMedia\">\n"
- " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
- " </method>\n",
-- &hfp_error))
-+ NULL))
- {
- hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
- goto end;
- }
-- dbus_error_free(&hfp_error);
-
- while (TRUE)
- {
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c b/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
deleted file mode 100644
index de85692da9a0..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- hald/freebsd/hf-devd.c.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/hf-devd.c 2011-02-26 13:03:00.000000000 -0500
-@@ -122,7 +122,7 @@ hf_devd_parse_add_remove (const char *ev
- g_return_val_if_fail(parent != NULL, FALSE);
-
- if ((params_ptr = strchr(event, ' '))
-- && (at_ptr = strstr(params_ptr + 1, " at "))
-+ && (at_ptr = strstr(params_ptr, "at "))
- && (parent_ptr = strstr(at_ptr + 4, " on ")))
- {
- char *params_str;
-@@ -130,7 +130,7 @@ hf_devd_parse_add_remove (const char *ev
-
- *name = g_strndup(event, params_ptr - event);
- params_str = g_strndup(params_ptr + 1, at_ptr - params_ptr - 1);
-- at_str = g_strndup(at_ptr + 4, parent_ptr - at_ptr - 4);
-+ at_str = g_strndup(at_ptr + 3, parent_ptr - at_ptr - 3);
- *parent = g_strdup(parent_ptr + 4);
-
- if (! strcmp(*parent, ".")) /* sys/kern/subr_bus.c */
-@@ -398,7 +398,7 @@ hf_devd_event_cb (GIOChannel *source, GI
- hf_devd_process_event(event);
- g_free(event);
- }
-- else if (status == G_IO_STATUS_AGAIN)
-+ else if (status == G_IO_STATUS_AGAIN || status == G_IO_STATUS_EOF)
- {
- hf_devd_init();
- if (hf_devd_inited)
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c b/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c
deleted file mode 100644
index 85d77bf596b2..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./hald/freebsd/hf-devtree.c.orig 2009-09-17 15:47:14.000000000 +0200
-+++ ./hald/freebsd/hf-devtree.c 2013-10-22 02:16:42.548388644 +0200
-@@ -36,6 +36,7 @@
- #include "hf-ata.h"
- #include "hf-block.h"
- #include "hf-drm.h"
-+#include "hf-memcard.h"
- #include "hf-pcmcia.h"
- #include "hf-storage.h"
- #include "hf-util.h"
-@@ -388,7 +389,9 @@
- { "psm", hf_devtree_psm_set_properties },
- { "sio", NULL },
- { "speaker", NULL },
-- { "usbus", NULL }
-+ { "usbus", NULL },
-+ { "mmc", hf_mmc_host_set_properties },
-+ { "mmcsd", hf_mmc_set_properties }
- };
-
- static void
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-drm.c b/sysutils/hal/files/patch-hald_freebsd_hf-drm.c
deleted file mode 100644
index dbde83cceef1..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-drm.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- hald/freebsd/hf-drm.c.orig 2008-08-10 15:50:10.000000000 +0200
-+++ hald/freebsd/hf-drm.c 2012-09-27 12:04:28.000000000 +0200
-@@ -234,6 +234,12 @@
- {
- HalDevice *parent = HAL_DEVICE(l->data);
-
-+ if (hf_device_store_match(hald_get_gdl(),
-+ "info.parent", HAL_PROPERTY_TYPE_STRING, hal_device_get_udi(parent),
-+ "info.subsystem", HAL_PROPERTY_TYPE_STRING, "drm",
-+ NULL))
-+ continue;
-+
- if (! hal_device_property_get_bool(parent, "info.ignore"))
- {
- Card *card;
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-memcard.c b/sysutils/hal/files/patch-hald_freebsd_hf-memcard.c
deleted file mode 100644
index 1a72295eb3d2..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-memcard.c
+++ /dev/null
@@ -1,109 +0,0 @@
---- ./hald/freebsd/hf-memcard.c.orig 2013-10-22 01:49:10.228430727 +0200
-+++ ./hald/freebsd/hf-memcard.c 2013-10-22 01:48:06.869268391 +0200
-@@ -0,0 +1,106 @@
-+/***************************************************************************
-+ * CVSID: $Id$
-+ *
-+ * hf-memcard.c : memory card support
-+ *
-+ * Copyright (C) 2013 Alberto Villa <avilla@FreeBSD.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ **************************************************************************/
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <string.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+#include "../logger.h"
-+
-+#include "hf-memcard.h"
-+#include "hf-block.h"
-+#include "hf-devtree.h"
-+#include "hf-storage.h"
-+#include "hf-util.h"
-+
-+static HalDevice *
-+hf_memcard_block_device_new (HalDevice *parent,
-+ const char *driver,
-+ int unit,
-+ const char *drive_type)
-+{
-+ HalDevice *device;
-+ char devname[16];
-+
-+ snprintf(devname, sizeof(devname), "%s%d", driver, unit);
-+
-+ g_return_val_if_fail(HAL_IS_DEVICE(parent), NULL);
-+ g_return_val_if_fail(devname != NULL, NULL);
-+
-+ device = hf_device_new(parent);
-+
-+ hf_devtree_device_set_name(device, devname);
-+ hf_block_device_enable(device, devname);
-+
-+ hf_storage_device_enable(device);
-+
-+ hal_device_copy_property(parent, "info.subsystem", device, "storage.bus");
-+ hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
-+ hal_device_property_set_bool(device, "storage.removable", TRUE);
-+ hal_device_property_set_bool(device, "storage.media_check_enabled", TRUE);
-+ hal_device_property_set_bool(device, "storage.removable.support_async_notification", FALSE);
-+ hal_device_property_set_bool(device, "storage.hotpluggable", TRUE);
-+ if (drive_type)
-+ {
-+ hal_device_property_set_string(device, "storage.drive_type", drive_type);
-+ }
-+
-+ if (hf_device_preprobe(device))
-+ {
-+ hf_block_device_complete(device, device, FALSE);
-+ hf_device_add(device);
-+ hf_storage_device_probe(device, FALSE);
-+ }
-+
-+ return device;
-+}
-+
-+void
-+hf_mmc_host_set_properties (HalDevice *device)
-+{
-+ hal_device_property_set_string(device, "info.subsystem", "mmc_host");
-+ hal_device_copy_property(device, "freebsd.unit", device, "mmc_host.host");
-+}
-+
-+void
-+hf_mmc_set_properties (HalDevice *device)
-+{
-+ HalDevice *block_device;
-+
-+ hal_device_property_set_string(device, "info.subsystem", "mmc");
-+
-+ hf_memcard_block_device_new(device,
-+ hal_device_property_get_string(device, "freebsd.driver"),
-+ hal_device_property_get_int(device, "freebsd.unit"),
-+ "sd_mmc");
-+
-+ /* This information belongs to the block device. */
-+ hal_device_property_remove(device, "freebsd.device_file");
-+ hal_device_property_remove(device, "freebsd.driver");
-+ hal_device_property_remove(device, "freebsd.unit");
-+}
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-memcard.h b/sysutils/hal/files/patch-hald_freebsd_hf-memcard.h
deleted file mode 100644
index 153d6defbfd6..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-memcard.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./hald/freebsd/hf-memcard.h.orig 2013-10-22 01:49:12.608421644 +0200
-+++ ./hald/freebsd/hf-memcard.h 2013-10-22 01:41:55.228962237 +0200
-@@ -0,0 +1,36 @@
-+/***************************************************************************
-+ * CVSID: $Id$
-+ *
-+ * hf-memcard.h : memory card support
-+ *
-+ * Copyright (C) 2013 Alberto Villa <avilla@FreeBSD.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ **************************************************************************/
-+
-+#ifndef _HF_MEMCARD_H
-+#define _HF_MEMCARD_H
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "../device.h"
-+
-+void hf_mmc_host_set_properties (HalDevice *device);
-+void hf_mmc_set_properties (HalDevice *device);
-+
-+#endif /* _HF_MEMCARD_H */
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
deleted file mode 100644
index f3c17f7d7029..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./hald/freebsd/hf-scsi.c.orig 2009-08-24 14:42:29.000000000 +0200
-+++ ./hald/freebsd/hf-scsi.c 2013-10-23 13:11:08.979758920 +0200
-@@ -223,7 +223,7 @@
- hal_device_copy_property(parent, "scsi.lun", device, "storage.lun");
- /* do not stop here, in case it's an umass device */
- }
-- else if (! strcmp(bus, "usb"))
-+ else if (hal_device_has_property(parent, "scsi_host.freebsd.driver") && ! strcmp(hal_device_property_get_string(parent, "scsi_host.freebsd.driver"), "umass"))
- {
- hal_device_property_set_string(device, "storage.bus", "usb");
- hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
-@@ -301,7 +301,7 @@
-
- driver = hal_device_property_get_string(child, "freebsd.driver");
- /* ATAPI devices: CD-ROM (acd), tape (ast) or floppy (afd) */
-- if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd")))
-+ if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd") && strcmp(driver, "cd")))
- continue;
-
- phys_device = hal_device_property_get_string(child, "storage.originating_device");
-@@ -508,6 +508,16 @@
- if (! parent || ! hal_device_property_get_bool(parent, "info.ignore"))
- {
- device = hf_scsi_bus_device_new(parent, match);
-+ /*
-+ * Due to synchronization problems, the SCSI bus could be
-+ * created before the USB interface. Mark it as a USB mass
-+ * storage device to ensure it is detected as such.
-+ */
-+ if (! strcmp(match->dev_name, "umass-sim"))
-+ {
-+ hal_device_property_set_string(device, "scsi_host.freebsd.driver", "umass");
-+ hal_device_property_set_int(device, "scsi_host.freebsd.unit", match->unit_number);
-+ }
- hf_device_preprobe_and_add(device);
- }
- }
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
deleted file mode 100644
index 8e4d2a1b27c6..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- hald/freebsd/hf-usb.c.orig 2009-09-17 08:49:46.000000000 -0500
-+++ hald/freebsd/hf-usb.c 2010-03-17 22:20:33.000000000 -0500
-@@ -392,7 +392,7 @@
- hf_devtree_device_set_name(device, di->udi_devnames[0]);
-
- if ((devname = hf_usb_get_devname(di, "ukbd"))) /* USB keyboard */
-- hf_device_set_input(device, "keyboard", "keys", devname);
-+ hf_device_set_input(device, "keyboard", "keys", NULL);
- else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */
- hf_device_set_input(device, "mouse", NULL, devname);
- else if ((devname = hf_usb_get_devname(di, "uhid"))) /* UHID device */
-@@ -908,6 +908,8 @@
-
- hal_device_property_set_string(device, "info.category", "video4linux");
- hal_device_add_capability(device, "video4linux");
-+ hal_device_add_capability(device, "video4linux.video_capture");
- hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit);
- hal_device_property_set_string(device, "info.product", "Video Device");
-+ hal_device_property_set_string(device, "video4linux.version", "1");
- }
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
deleted file mode 100644
index 898530343146..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
+++ /dev/null
@@ -1,426 +0,0 @@
---- hald/freebsd/hf-usb2.c.orig 2009-08-24 14:42:29.000000000 +0200
-+++ hald/freebsd/hf-usb2.c 2014-02-06 08:22:11.000000000 +0100
-@@ -22,7 +22,7 @@
- **************************************************************************/
-
- #ifdef HAVE_CONFIG_H
--# include <config.h>
-+#include <config.h>
- #endif
-
- #include <string.h>
-@@ -42,246 +42,213 @@
- static struct libusb20_backend *hf_usb2_be = NULL;
-
- static void
--hf_usb2_copy_parent (HalDevice *parent,
-- const char *key,
-- gpointer user_data)
-+hf_usb2_probe_interfaces(HalDevice * parent)
- {
-- HalDevice *device;
-+ int num_interfaces;
-+ int i;
-
-- g_return_if_fail(HAL_IS_DEVICE(parent));
-- g_return_if_fail(HAL_IS_DEVICE(user_data));
-+ g_return_if_fail(HAL_IS_DEVICE(parent));
-
-- device = HAL_DEVICE(user_data);
--
-- if (! strncmp(key, "usb_device.", strlen("usb_device.")))
-- hal_device_copy_property(parent, key, device, key);
-+ if (hal_device_property_get_bool(parent, "info.ignore"))
-+ return;
-+
-+ num_interfaces = hal_device_property_get_int(parent,
-+ "usb_device.num_interfaces");
-+
-+ for (i = 0; i < num_interfaces; i++) {
-+ HalDevice *device;
-+
-+ device = hf_device_new(parent);
-+
-+ hal_device_property_set_string(device, "info.subsystem", "usb");
-+ hal_device_property_set_int(device, "usb.interface.number", i);
-+ hal_device_copy_property(parent, "info.product", device, "info.product");
-+ hal_device_copy_property(parent, "info.vendor", device, "info.vendor");
-+ hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device.");
-+
-+ if (hf_device_preprobe(device)) {
-+ const char *driver, *devname;
-+
-+ hf_runner_run_sync(device, 0, "hald-probe-usb2-interface", NULL);
-+
-+ devname = hal_device_property_get_string(device,
-+ "usb.freebsd.devname");
-+ if (devname)
-+ hf_devtree_device_set_name(device, devname);
-+
-+ driver = hal_device_property_get_string(device, "freebsd.driver");
-+ if (driver) {
-+ if (!strcmp(driver, "ukbd"))
-+ hf_device_set_input(device, "keyboard", "keys", NULL);
-+ else if (!strcmp(driver, "ums") || !strcmp(driver, "atp") || !strcmp(driver, "wsp")) {
-+ hf_device_set_input(device, "mouse", NULL, devname);
-+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
-+ } else if (!strcmp(driver, "uhid")) {
-+ hal_device_property_set_string(device, "info.category",
-+ "hiddev");
-+ hal_device_add_capability(device, "hiddev");
-+ hf_device_property_set_string_printf(device, "hiddev.device",
-+ "/dev/%s", devname);
-+ hal_device_copy_property(device, "info.product", device,
-+ "hiddev.product");
-+ hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL);
-+ } else if (!strcmp(driver, "ldev")) {
-+ /* Linux driver (webcam) */
-+
-+ /*
-+ * XXX This is a hack. Currently, all ldev devices are
-+ * webcams. That may not always be the case. Hopefully,
-+ * when other Linux driver support is added, there will be
-+ * a sysctl or some other way to determine device class.
-+ */
-+ hf_usb_add_webcam_properties(device);
-+ } else if (!strcmp(driver, "pwc")) {
-+ /* Phillips Web Cam */
-+ hf_usb_add_webcam_properties(device);
-+ }
-+ } else {
-+ /* Try and detect webcamd devices. */
-+ hf_runner_run_sync(device, 0, "hald-probe-video4linux", NULL);
-+ }
-+
-+ hf_usb_device_compute_udi(device);
-+ hf_device_add(device);
-+
-+ /*
-+ * The SCSI bus could already exist; make it a child of
-+ * this USB interface.
-+ */
-+ if (driver && !strcmp(driver, "umass")) {
-+ HalDevice *scsi_bus;
-+ scsi_bus = hf_device_store_match(hald_get_gdl(),
-+ "scsi_host.freebsd.driver", HAL_PROPERTY_TYPE_STRING, driver,
-+ "scsi_host.freebsd.unit", HAL_PROPERTY_TYPE_INT32, hal_device_property_get_int(device, "freebsd.unit"), NULL);
-+ if (scsi_bus)
-+ hal_device_property_set_string(scsi_bus, "info.parent", hal_device_get_udi(device));
-+ }
-+ }
-+ }
- }
-
- static void
--hf_usb2_probe_interfaces(HalDevice *parent)
-+hf_usb2_probe_device(HalDevice * parent, int bus, int addr)
- {
-- int num_interfaces;
-- int i;
-+ HalDevice *device;
-
-- g_return_if_fail(HAL_IS_DEVICE(parent));
-+ g_return_if_fail(HAL_IS_DEVICE(parent));
-
-- if (hal_device_property_get_bool(parent, "info.ignore"))
-- return;
-+ device = hf_device_new(parent);
-
-- num_interfaces = hal_device_property_get_int(parent,
-- "usb_device.num_interfaces");
--
-- for (i = 0; i < num_interfaces; i++)
-- {
-- HalDevice *device;
--
-- device = hf_device_new(parent);
--
-- hal_device_property_set_string(device, "info.subsystem", "usb");
-- hal_device_property_set_int(device, "usb.interface.number", i);
-- hal_device_property_foreach(parent, hf_usb2_copy_parent, device);
-- hal_device_copy_property(parent, "info.product", device, "info.product");
-- hal_device_copy_property(parent, "info.vendor", device, "info.vendor");
--
-- if (hf_device_preprobe(device))
-- {
-- const char *driver, *devname;
--
-- hf_runner_run_sync(device, 0, "hald-probe-usb2-interface", NULL);
--
-- devname = hal_device_property_get_string(device,
-- "usb.freebsd.devname");
-- if (devname)
-- hf_devtree_device_set_name(device, devname);
--
-- driver = hal_device_property_get_string(device, "freebsd.driver");
-- if (driver)
-- {
-- if (! strcmp(driver, "ukbd"))
-- hf_device_set_input(device, "keyboard", NULL);
-- else if (! strcmp(driver, "ums"))
-- {
-- hf_device_set_input(device, "mouse", devname);
-- hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
-- }
-- else if (! strcmp(driver, "uhid"))
-- {
-- hal_device_property_set_string(device, "info.category",
-- "hiddev");
-- hal_device_add_capability(device, "hiddev");
-- hf_device_property_set_string_printf(device, "hiddev.device",
-- "/dev/%s", devname);
-- hal_device_copy_property(device, "info.product", device,
-- "hiddev.product");
-- hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL);
-- }
-- else if (! strcmp(driver, "ldev"))
-- {
-- /* Linux driver (webcam) */
--
-- /*
-- * XXX This is a hack. Currently, all ldev devices are
-- * webcams. That may not always be the case. Hopefully,
-- * when other Linux driver support is added, there will be
-- * a sysctl or some other way to determine device class.
-- */
-- hf_usb_add_webcam_properties(device);
-- }
-- else if (! strcmp(driver, "pwc"))
-- {
-- /* Phillips Web Cam */
-- hf_usb_add_webcam_properties(device);
-- }
-- }
-+ hal_device_property_set_string(device, "info.subsystem", "usb_device");
-+ hal_device_property_set_int(device, "usb_device.bus_number", bus);
-+ hal_device_property_set_int(device, "usb_device.level_number", 1);
-+ hal_device_property_set_int(device, "usb_device.port_number", addr);
-
-- hf_usb_device_compute_udi(device);
-- hf_device_add(device);
-+ if (hf_device_preprobe(device)) {
-+ hf_runner_run_sync(device, 0, "hald-probe-usb2-device", NULL);
-+ hf_usb_device_compute_udi(device);
-+ hf_device_add(device);
-+ hf_usb2_probe_interfaces(device);
- }
-- }
- }
-
- static void
--hf_usb2_probe_device (HalDevice *parent, int bus, int addr)
-+hf_usb2_privileged_init(void)
- {
-- HalDevice *device;
--
-- g_return_if_fail(HAL_IS_DEVICE(parent));
--
-- device = hf_device_new(parent);
-+ hf_usb2_be = libusb20_be_alloc_default();
-+ if (hf_usb2_be == NULL)
-+ HAL_INFO(("unable to open USB backend: %s", g_strerror(errno)));
-+}
-
-- hal_device_property_set_string(device, "info.subsystem", "usb_device");
-- hal_device_property_set_int(device, "usb_device.bus_number", bus);
-- hal_device_property_set_int(device, "usb_device.level_number", addr - 1);
-- hal_device_property_set_int(device, "usb_device.port_number", addr);
-+static void
-+hf_usb2_new_device(int bus, int addr)
-+{
-+ HalDevice *parent;
-
-- if (hf_device_preprobe(device))
-- {
-- hf_runner_run_sync(device, 0, "hald-probe-usb2-device", NULL);
-- hf_usb_device_compute_udi(device);
-+ parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
-
-- hf_device_add(device);
-- }
-- else
-- return;
-+ if (!parent || hal_device_property_get_bool(parent, "info.ignore"))
-+ return;
-
-- hf_usb2_probe_interfaces(device);
-+ hf_usb2_probe_device(parent, bus, addr);
- }
-
- static void
--hf_usb2_privileged_init (void)
-+hf_usb2_probe(void)
- {
-- hf_usb2_be = libusb20_be_alloc_default();
-- if (hf_usb2_be == NULL)
-- HAL_INFO(("unable to open USB backend: %s", g_strerror(errno)));
--}
-+ struct libusb20_device *pdev = NULL;
-
--static void
--hf_usb2_probe (void)
--{
-- struct libusb20_device *pdev = NULL;
-+ if (hf_usb2_be == NULL)
-+ return;
-
-- if (hf_usb2_be == NULL)
-- return;
-+ while ((pdev = libusb20_be_device_foreach(hf_usb2_be, pdev))) {
-+ hf_usb2_new_device(libusb20_dev_get_bus_number(pdev),
-+ libusb20_dev_get_address(pdev));
-+ }
-
-- while ((pdev = libusb20_be_device_foreach(hf_usb2_be, pdev)))
-- {
-- HalDevice *parent;
-- int bus, addr;
--
-- bus = libusb20_dev_get_bus_number(pdev);
-- addr = libusb20_dev_get_address(pdev);
--
-- if (addr == 1)
-- parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus);
-- else
-- parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
-- HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-- HAL_PROPERTY_TYPE_INT32, addr - 1, NULL);
-- if (! parent || hal_device_property_get_bool(parent, "info.ignore"))
-- continue;
-+ libusb20_be_free(hf_usb2_be);
-+ hf_usb2_be = NULL;
-+}
-
-- hf_usb2_probe_device(parent, bus, addr);
-- }
-+static gboolean
-+hf_usb2_devd_notify(const char *system,
-+ const char *subsystem,
-+ const char *type,
-+ const char *data)
-+{
-+ const char *ugen;
-+ int bus;
-+ int addr;
-+
-+ if (!data || strcmp(system, "USB") || strcmp(subsystem, "DEVICE") ||
-+ (strcmp(type, "ATTACH") && strcmp(type, "DETACH")))
-+ return FALSE;
-+
-+ ugen = strstr(data, "ugen=");
-+ if (ugen == NULL) {
-+ /*
-+ * The following case is not required in
-+ * FreeBSD 8-stable and newer:
-+ */
-+ ugen = strstr(data, "cdev=");
-+ if (ugen == NULL)
-+ return FALSE;
-+
-+ if (sscanf(ugen, "cdev=ugen%i.%i", &bus, &addr) != 2)
-+ return FALSE;
-+ } else {
-+ if (sscanf(ugen, "ugen=ugen%i.%i", &bus, &addr) != 2)
-+ return FALSE;
-+ }
-
-- libusb20_be_free(hf_usb2_be);
-- hf_usb2_be = NULL;
--}
-+ if (strcmp(type, "ATTACH") == 0) {
-
--static gboolean
--hf_usb2_devd_add (const char *name,
-- GHashTable *params,
-- GHashTable *at,
-- const char *parent)
--{
-- HalDevice *parent_device;
-- int bus, addr, pbus, paddr;
-+ HAL_INFO(("received devd attach event, device %s", data));
-
-- if (strncmp(name, "ugen", strlen("ugen")))
-- return FALSE;
-- else if (strncmp(parent, "ugen", strlen("ugen")))
-- return TRUE;
--
-- if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
-- return FALSE;
--
-- if (sscanf(parent, "ugen%i.%i", &pbus, &paddr) != 2)
-- return FALSE;
--
-- HAL_INFO(("received devd add event for device '%s' with parent '%s'",
-- name, parent));
--
-- parent_device = hf_device_store_match(hald_get_gdl(),
-- "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,
-- "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL);
--
-- if (parent_device && ! hal_device_property_get_bool(parent_device,
-- "info.ignore"))
-- {
-- hf_usb2_probe_device(parent_device, bus, addr);
-- return TRUE;
-- }
-+ hf_usb2_new_device(bus, addr);
-+ }
-+ if (strcmp(type, "DETACH") == 0) {
-
-- return FALSE;
--}
-+ HalDevice *device;
-
--static gboolean
--hf_usb2_devd_remove (const char *name,
-- GHashTable *params,
-- GHashTable *at,
-- const char *parent)
--{
-- HalDevice *device;
-- int bus, addr;
-+ HAL_INFO(("received devd detach event, device %s", data));
-
-- if (strncmp(name, "ugen", strlen("ugen")))
-- return FALSE;
-- else if (strncmp(parent, "ugen", strlen("ugen")))
-- return TRUE;
--
-- if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
-- return FALSE;
--
-- HAL_INFO(("received devd remove event, device %s", name));
--
-- device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
-- HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-- HAL_PROPERTY_TYPE_INT32, addr, NULL);
--
-- if (device)
-- {
-- hf_device_remove_tree(device);
-- return TRUE;
-- }
-+ device = hf_device_store_match(hald_get_gdl(),
-+ "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, bus,
-+ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, addr,
-+ "info.bus", HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
-
-- return FALSE;
-+ if (device)
-+ hf_device_remove_tree(device);
-+ }
-+ return TRUE;
- }
-
- HFHandler hf_usb2_handler = {
-- .privileged_init = hf_usb2_privileged_init,
-- .probe = hf_usb2_probe
-+ .privileged_init = hf_usb2_privileged_init,
-+ .probe = hf_usb2_probe
- };
-
- HFDevdHandler hf_usb2_devd_handler = {
-- .add = hf_usb2_devd_add,
-- .remove = hf_usb2_devd_remove
-+ .notify = hf_usb2_devd_notify
- };
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
deleted file mode 100644
index 4fb0d95b4e85..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- hald/freebsd/hf-volume.c.orig 2009-12-23 14:01:00.000000000 -0500
-+++ hald/freebsd/hf-volume.c 2009-12-23 14:01:25.000000000 -0500
-@@ -86,9 +86,12 @@ hf_volume_resolve_fuse (const char *spec
- {
- if (strcmp(fields[0], special) == 0)
- {
-+ char *ret;
-+
-+ ret = g_strdup(fields[1]);
- g_strfreev(fields);
- g_strfreev(lines);
-- return g_strdup(fields[1]);
-+ return ret;
- }
- }
- g_strfreev(fields);
diff --git a/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c b/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c
deleted file mode 100644
index 9e1dbe13485d..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- hald/freebsd/probing/probe-usb2-device.c.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/probing/probe-usb2-device.c 2012-03-31 15:20:14.000000000 -0400
-@@ -100,6 +100,7 @@ main(int argc, char **argv)
- if (pcfg == NULL || libusb20_dev_get_info(pdev, &di))
- {
- free(pcfg);
-+ libusb20_dev_close(pdev);
- continue;
- }
-
-@@ -148,15 +149,16 @@ main(int argc, char **argv)
- bcdspeed = 0x01200;
- break;
- case LIBUSB20_SPEED_HIGH:
-+ case LIBUSB20_SPEED_VARIABLE:
- speed = 480.0;
- bcdspeed = 0x48000;
- break;
- case LIBUSB20_SPEED_SUPER:
-- speed = 4800.0;
-- bcdspeed = 0x480000;
-+ speed = 5000.0;
-+ bcdspeed = 0x500000;
- break;
- default:
-- ;
-+ break;
- }
-
- libhal_device_set_property_double(hfp_ctx, hfp_udi, "usb_device.speed",
-@@ -169,6 +171,9 @@ main(int argc, char **argv)
- case UD_USB_2_0:
- version = 2.0;
- break;
-+ case 0x0250:
-+ version = 2.5;
-+ break;
- case UD_USB_3_0:
- version = 3.0;
- break;
-@@ -184,7 +189,7 @@ main(int argc, char **argv)
- libhal_device_set_property_int(hfp_ctx, hfp_udi,
- "usb_device.vendor_id", di.udi_vendorNo, &hfp_error);
- libhal_device_set_property_int(hfp_ctx, hfp_udi,
-- "usb_device.device_revision_bcd", ddesc->bcdUSB, &hfp_error);
-+ "usb_device.device_revision_bcd", ddesc->bcdDevice, &hfp_error);
- libhal_device_set_property_string(hfp_ctx, hfp_udi,
- "usb_device.serial", di.udi_serial, &hfp_error);
- libhal_device_set_property_string(hfp_ctx, hfp_udi,
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
deleted file mode 100644
index ccb4773de51c..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
---- hald/freebsd/probing/Makefile.am.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/probing/Makefile.am 2010-02-19 23:08:42.000000000 -0500
-@@ -19,7 +19,8 @@ libexec_PROGRAMS = \
- if HAVE_LIBUSB20
- libexec_PROGRAMS += \
- hald-probe-usb2-device \
-- hald-probe-usb2-interface
-+ hald-probe-usb2-interface \
-+ hald-probe-video4linux
- endif
- endif
-
-@@ -38,6 +39,14 @@ hald_probe_usb2_interface_SOURCES = prob
- hald_probe_usb2_interface_LDADD = \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
- @LIBUSB20_LIBS@
-+
-+hald_probe_video4linux_SOURCES = probe-video4linux.c
-+hald_probe_video4linux_CPPFLAGS = \
-+ $(AM_CPPFLAGS) @GLIB_CFLAGS@
-+hald_probe_video4linux_LDADD = \
-+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+ @GLIB_LIBS@ \
-+ @LIBUSB20_LIBS@
- endif
-
- hald_probe_mouse_SOURCES = probe-mouse.c
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
deleted file mode 100644
index de353f177a99..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
+++ /dev/null
@@ -1,564 +0,0 @@
---- hald/freebsd/probing/Makefile.in.orig 2010-02-19 23:05:16.000000000 -0500
-+++ hald/freebsd/probing/Makefile.in 2010-02-19 23:14:32.000000000 -0500
-@@ -1,9 +1,8 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
--# Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,9 +16,8 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
--pkglibexecdir = $(libexecdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -44,7 +42,8 @@ host_triplet = @host@
- @HALD_COMPILE_FREEBSD_TRUE@ $(am__EXEEXT_1)
- @HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__append_1 = \
- @HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-device \
--@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface \
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-video4linux
-
- subdir = hald/freebsd/probing
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -56,17 +55,15 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--CONFIG_CLEAN_VPATH_FILES =
- @HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__EXEEXT_1 = hald-probe-usb2-device$(EXEEXT) \
--@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT)
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT) \
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-video4linux$(EXEEXT)
- am__installdirs = "$(DESTDIR)$(libexecdir)"
-+libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(libexec_PROGRAMS)
- am_hald_probe_hiddev_OBJECTS = probe-hiddev.$(OBJEXT)
- hald_probe_hiddev_OBJECTS = $(am_hald_probe_hiddev_OBJECTS)
- hald_probe_hiddev_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
--AM_V_lt = $(am__v_lt_$(V))
--am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
--am__v_lt_0 = --silent
- am_hald_probe_mouse_OBJECTS = hald_probe_mouse-probe-mouse.$(OBJEXT)
- hald_probe_mouse_OBJECTS = $(am_hald_probe_mouse_OBJECTS)
- hald_probe_mouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -92,6 +89,10 @@ am__hald_probe_usb2_interface_SOURCES_DI
- hald_probe_usb2_interface_OBJECTS = \
- $(am_hald_probe_usb2_interface_OBJECTS)
- @HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-+am__hald_probe_video4linux_SOURCES_DIST = probe-video4linux.c
-+@HAVE_LIBUSB20_TRUE@am_hald_probe_video4linux_OBJECTS = hald_probe_video4linux-probe-video4linux.$(OBJEXT)
-+hald_probe_video4linux_OBJECTS = $(am_hald_probe_video4linux_OBJECTS)
-+@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
- am_hald_probe_volume_OBJECTS = \
- hald_probe_volume-freebsd_dvd_rw_utils.$(OBJEXT) \
- hald_probe_volume-probe-volume.$(OBJEXT)
-@@ -100,40 +101,27 @@ hald_probe_volume_DEPENDENCIES = $(top_b
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
--AM_V_CC = $(am__v_CC_$(V))
--am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
--am__v_CC_0 = @echo " CC " $@;
--AM_V_at = $(am__v_at_$(V))
--am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
--am__v_at_0 = @
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--AM_V_CCLD = $(am__v_CCLD_$(V))
--am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
--am__v_CCLD_0 = @echo " CCLD " $@;
--AM_V_GEN = $(am__v_GEN_$(V))
--am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
--am__v_GEN_0 = @echo " GEN " $@;
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+ $(LDFLAGS) -o $@
- SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_mouse_SOURCES) \
- $(hald_probe_scsi_SOURCES) $(hald_probe_smbios_SOURCES) \
- $(hald_probe_storage_SOURCES) \
- $(hald_probe_usb2_device_SOURCES) \
- $(hald_probe_usb2_interface_SOURCES) \
-- $(hald_probe_volume_SOURCES)
-+ $(hald_probe_video4linux_SOURCES) $(hald_probe_volume_SOURCES)
- DIST_SOURCES = $(hald_probe_hiddev_SOURCES) \
- $(hald_probe_mouse_SOURCES) $(hald_probe_scsi_SOURCES) \
- $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \
- $(am__hald_probe_usb2_device_SOURCES_DIST) \
- $(am__hald_probe_usb2_interface_SOURCES_DIST) \
-+ $(am__hald_probe_video4linux_SOURCES_DIST) \
- $(hald_probe_volume_SOURCES)
- ETAGS = etags
- CTAGS = ctags
-@@ -142,7 +130,6 @@ ACLOCAL = @ACLOCAL@
- ACPI_ACPID = @ACPI_ACPID@
- ACPI_PROC = @ACPI_PROC@
- AMTAR = @AMTAR@
--AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -222,7 +209,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
--PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PARTED_CFLAGS = @PARTED_CFLAGS@
- PARTED_LIBS = @PARTED_LIBS@
-@@ -325,6 +311,15 @@ hald_probe_hiddev_LDADD = \
- @HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
- @HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@
-
-+@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_SOURCES = probe-video4linux.c
-+@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_CPPFLAGS = \
-+@HAVE_LIBUSB20_TRUE@ $(AM_CPPFLAGS) @GLIB_CFLAGS@
-+
-+@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_LDADD = \
-+@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+@HAVE_LIBUSB20_TRUE@ @GLIB_LIBS@ \
-+@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@
-+
- hald_probe_mouse_SOURCES = probe-mouse.c
- hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@
- hald_probe_mouse_LDADD = \
-@@ -363,14 +358,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile'; \
-- $(am__cd) $(top_srcdir) && \
-- $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -388,74 +383,61 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- install-libexecPROGRAMS: $(libexec_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
-- for p in $$list; do echo "$$p $$p"; done | \
-- sed 's/$(EXEEXT)$$//' | \
-- while read p p1; do if test -f $$p || test -f $$p1; \
-- then echo "$$p"; echo "$$p"; else :; fi; \
-- done | \
-- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-- sed 'N;N;N;s,\n, ,g' | \
-- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-- if ($$2 == $$4) files[d] = files[d] " " $$1; \
-- else { print "f", $$3 "/" $$4, $$1; } } \
-- END { for (d in files) print "f", d, files[d] }' | \
-- while read type dir files; do \
-- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-- test -z "$$files" || { \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
-- } \
-- ; done
-+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
-+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ if test -f $$p \
-+ || test -f $$p1 \
-+ ; then \
-+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-+ else :; fi; \
-+ done
-
- uninstall-libexecPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
-- files=`for p in $$list; do echo "$$p"; done | \
-- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-- -e 's/$$/$(EXEEXT)/' `; \
-- test -n "$$list" || exit 0; \
-- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
-+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
-+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-+ done
-
- clean-libexecPROGRAMS:
-- @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
-- echo " rm -f" $$list; \
-- rm -f $$list || exit $$?; \
-- test -n "$(EXEEXT)" || exit 0; \
-- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f" $$list; \
-- rm -f $$list
-+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
-+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f $$p $$f"; \
-+ rm -f $$p $$f ; \
-+ done
- hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES)
- @rm -f hald-probe-hiddev$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS)
- hald-probe-mouse$(EXEEXT): $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_DEPENDENCIES)
- @rm -f hald-probe-mouse$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS)
- hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES)
- @rm -f hald-probe-scsi$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS)
- hald-probe-smbios$(EXEEXT): $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_DEPENDENCIES)
- @rm -f hald-probe-smbios$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_LDADD) $(LIBS)
- hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES)
- @rm -f hald-probe-storage$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS)
- hald-probe-usb2-device$(EXEEXT): $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_DEPENDENCIES)
- @rm -f hald-probe-usb2-device$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS)
- hald-probe-usb2-interface$(EXEEXT): $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_DEPENDENCIES)
- @rm -f hald-probe-usb2-interface$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS)
-+hald-probe-video4linux$(EXEEXT): $(hald_probe_video4linux_OBJECTS) $(hald_probe_video4linux_DEPENDENCIES)
-+ @rm -f hald-probe-video4linux$(EXEEXT)
-+ $(LINK) $(hald_probe_video4linux_OBJECTS) $(hald_probe_video4linux_LDADD) $(LIBS)
- hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES)
- @rm -f hald-probe-volume$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS)
-+ $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -466,6 +448,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_mouse-probe-mouse.Po@am__quote@
- @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_video4linux-probe-video4linux.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-probe-volume.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@
-@@ -475,105 +458,106 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-interface.Po@am__quote@
-
- .c.o:
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- hald_probe_mouse-probe-mouse.o: probe-mouse.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.o -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.o -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c
-
- hald_probe_mouse-probe-mouse.obj: probe-mouse.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.obj -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.obj -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi`
-
- hald_probe_storage-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_storage-freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
-
- hald_probe_storage-freebsd_dvd_rw_utils.obj: freebsd_dvd_rw_utils.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_storage-freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi`
-
- hald_probe_storage-probe-storage.o: probe-storage.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-storage.c' object='hald_probe_storage-probe-storage.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c
-
- hald_probe_storage-probe-storage.obj: probe-storage.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-storage.c' object='hald_probe_storage-probe-storage.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi`
-
-+hald_probe_video4linux-probe-video4linux.o: probe-video4linux.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_video4linux-probe-video4linux.o -MD -MP -MF $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo -c -o hald_probe_video4linux-probe-video4linux.o `test -f 'probe-video4linux.c' || echo '$(srcdir)/'`probe-video4linux.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-video4linux.c' object='hald_probe_video4linux-probe-video4linux.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_video4linux-probe-video4linux.o `test -f 'probe-video4linux.c' || echo '$(srcdir)/'`probe-video4linux.c
-+
-+hald_probe_video4linux-probe-video4linux.obj: probe-video4linux.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_video4linux-probe-video4linux.obj -MD -MP -MF $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo -c -o hald_probe_video4linux-probe-video4linux.obj `if test -f 'probe-video4linux.c'; then $(CYGPATH_W) 'probe-video4linux.c'; else $(CYGPATH_W) '$(srcdir)/probe-video4linux.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-video4linux.c' object='hald_probe_video4linux-probe-video4linux.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_video4linux-probe-video4linux.obj `if test -f 'probe-video4linux.c'; then $(CYGPATH_W) 'probe-video4linux.c'; else $(CYGPATH_W) '$(srcdir)/probe-video4linux.c'; fi`
-+
- hald_probe_volume-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_volume-freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
-
- hald_probe_volume-freebsd_dvd_rw_utils.obj: freebsd_dvd_rw_utils.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_volume-freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi`
-
- hald_probe_volume-probe-volume.o: probe-volume.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-volume.c' object='hald_probe_volume-probe-volume.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c
-
- hald_probe_volume-probe-volume.obj: probe-volume.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi`
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po
--@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-volume.c' object='hald_probe_volume-probe-volume.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi`
-@@ -589,14 +573,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- set x; \
-+ tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -604,34 +588,29 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- shift; \
-- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- if test $$# -gt 0; then \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- "$$@" $$unique; \
-- else \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$unique; \
-- fi; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-+ tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$unique" \
-+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$unique
-+ $$tags $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && $(am__cd) $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) "$$here"
-+ && cd $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -652,17 +631,13 @@ distdir: $(DISTFILES)
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test -d "$(distdir)/$$file"; then \
-- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
-- test -f "$(distdir)/$$file" \
-- || cp -p $$d/$$file "$(distdir)/$$file" \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-@@ -693,7 +668,6 @@ clean-generic:
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -715,8 +689,6 @@ dvi-am:
-
- html: html-am
-
--html-am:
--
- info: info-am
-
- info-am:
-@@ -725,28 +697,18 @@ install-data-am:
-
- install-dvi: install-dvi-am
-
--install-dvi-am:
--
- install-exec-am: install-libexecPROGRAMS
-
- install-html: install-html-am
-
--install-html-am:
--
- install-info: install-info-am
-
--install-info-am:
--
- install-man:
-
- install-pdf: install-pdf-am
-
--install-pdf-am:
--
- install-ps: install-ps-am
-
--install-ps-am:
--
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -785,7 +747,6 @@ uninstall-am: uninstall-libexecPROGRAMS
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libexecPROGRAMS
-
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
deleted file mode 100644
index ae1ac842700d..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- hald/freebsd/probing/probe-storage.c.orig 2009-08-24 14:42:29.000000000 +0200
-+++ hald/freebsd/probing/probe-storage.c 2012-09-27 12:03:02.000000000 +0200
-@@ -236,7 +236,27 @@
-
- hfp_cdrom_free(cdrom);
- }
-- else if (! has_children) /* by definition, if it has children it has no fs */
-+ else
-+ {
-+ int fd;
-+ off_t size;
-+
-+ fd = open(device_file, O_RDONLY | O_NONBLOCK);
-+ if (fd > -1)
-+ {
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", TRUE, &hfp_error);
-+ if (ioctl (fd, DIOCGMEDIASIZE, &size) == 0)
-+ {
-+ libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "storage.removable.media_size", size, &hfp_error);
-+ }
-+ close(fd);
-+ }
-+ else
-+ {
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", FALSE, &hfp_error);
-+ }
-+
-+ if (! has_children) /* by definition, if it has children it has no fs */
- {
- struct volume_id *vid;
-
-@@ -249,6 +269,7 @@
-
- volume_id_close(vid);
- }
-+ }
-
- end:
- return ret;
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
deleted file mode 100644
index 87d13b4d7f3e..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- hald/freebsd/probing/probe-usb2-interface.c.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/probing/probe-usb2-interface.c 2012-04-01 19:36:25.000000000 -0400
-@@ -58,11 +58,11 @@ main(int argc, char **argv)
- if (pbe == NULL)
- goto end;
-
-- busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER");
-+ busstr = getenv("HAL_PROP_USB_BUS_NUMBER");
- if (! busstr)
- goto end;
-
-- addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER");
-+ addrstr = getenv("HAL_PROP_USB_PORT_NUMBER");
- if (! addrstr)
- goto end;
-
-@@ -93,7 +93,10 @@ main(int argc, char **argv)
- curr_config = libusb20_dev_get_config_index(pdev);
- pcfg = libusb20_dev_alloc_config(pdev, curr_config);
- if (! pcfg)
-- continue;
-+ {
-+ libusb20_dev_close(pdev);
-+ continue;
-+ }
-
- pif = pcfg->interface + iface;
-
-@@ -129,6 +132,7 @@ main(int argc, char **argv)
- }
- }
-
-+ libusb20_dev_close(pdev);
- free(pcfg);
- }
-
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
deleted file mode 100644
index 808d175c99a4..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
+++ /dev/null
@@ -1,221 +0,0 @@
---- hald/freebsd/probing/probe-video4linux.c.orig 2014-10-03 22:48:53.887627582 -0300
-+++ hald/freebsd/probing/probe-video4linux.c 2014-10-12 23:37:47.263963719 -0300
-@@ -0,0 +1,218 @@
-+/***************************************************************************
-+ * CVSID: $Id$
-+ *
-+ * probe-video4linux.c : Probe video4linux devices
-+ * Adapted for FreeBSD by : Joe Marcus Clarke <marcus@FreeBSD.org>
-+ *
-+ * Copyright (C) 2007 Nokia Corporation
-+ *
-+ * Licensed under the Academic Free License version 2.1
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ **************************************************************************/
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/user.h>
-+#include <sys/sysctl.h>
-+#include <sys/time.h>
-+#include <sys/ioctl.h>
-+#include <linux/videodev.h>
-+#include <linux/videodev2.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <glib.h>
-+
-+#include "../libprobe/hfp.h"
-+
-+#define WEBCAMD_PID_FILE "/var/run/webcamd"
-+#define V4B_DEVICES_MAX 10 /* XXX from video4bsd.h */
-+
-+static int
-+hfp_v4l_get_unit (int bus, int addr)
-+{
-+ int i;
-+ pid_t pid;
-+ int mib[4];
-+ char *endptr;
-+ char *pidf = NULL;
-+ char *contents = NULL;
-+ gsize len;
-+
-+ for (i = 0; i < V4B_DEVICES_MAX; i++) {
-+ pidf = g_strdup_printf ("%s.%i.%i.%i.pid", WEBCAMD_PID_FILE, bus, addr, i);
-+ if (g_file_test (pidf, G_FILE_TEST_EXISTS))
-+ break;
-+ g_free (pidf);
-+ pidf = NULL;
-+ }
-+
-+ if (pidf == NULL)
-+ return -1;
-+
-+ if (! g_file_get_contents (pidf, &contents, &len, NULL)) {
-+ g_free (pidf);
-+ return -1;
-+ }
-+
-+ g_free (pidf);
-+
-+ pid = (int) strtol (contents, &endptr, 10);
-+ if (endptr == contents) {
-+ g_free (contents);
-+ return -1;
-+ }
-+ g_free (contents);
-+ return i;
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int ret = 1;
-+ int fd = -1;
-+ int unit = -1;
-+ int bus = -1;
-+ int addr = -1;
-+ int intf = -1;
-+ //int i;
-+ char *device_file = NULL;
-+ char *busstr;
-+ char *addrstr;
-+ char *intfstr;
-+ struct video_capability v1cap;
-+ struct v4l2_capability v2cap;
-+ LibHalChangeSet *cset;
-+
-+
-+ if (! hfp_init (argc, argv))
-+ goto out;
-+
-+ busstr = getenv ("HAL_PROP_USB_BUS_NUMBER");
-+ if (! busstr)
-+ goto out;
-+ addrstr = getenv ("HAL_PROP_USB_PORT_NUMBER");
-+ if (! addrstr)
-+ goto out;
-+ intfstr = getenv ("HAL_PROP_USB_INTERFACE_NUMBER");
-+ if (! intfstr)
-+ goto out;
-+
-+ bus = atoi (busstr);
-+ addr = atoi (addrstr);
-+ intf = atoi (intfstr);
-+
-+ //g_message("bus:%d, addr=%d, intf=%d",bus,addr,intf);
-+ if (intf != 0)
-+ goto out;
-+
-+ unit = hfp_v4l_get_unit (bus, addr);
-+ if (unit == -1)
-+ goto out;
-+ device_file = g_strdup_printf ("/dev/video%i", unit);
-+ if (device_file == NULL)
-+ goto out;
-+
-+ /* give a meaningful process title for ps(1) */
-+ setproctitle("%s (bus: %i, addr: %i)", device_file, bus, addr);
-+
-+ cset = libhal_device_new_changeset (hfp_udi);
-+
-+ hfp_info ("Doing probe-video4linux for %s (udi=%s)", device_file, hfp_udi);
-+
-+ fd = open (device_file, O_RDONLY);
-+ if (fd < 0) {
-+ hfp_critical ("Cannot open %s: %s", device_file, strerror (errno));
-+ goto out;
-+ }
-+
-+ if (ioctl (fd, VIDIOC_QUERYCAP, &v2cap) == 0) {
-+ libhal_changeset_set_property_string (cset,
-+ "video4linux.device", device_file);
-+ libhal_changeset_set_property_string (cset,
-+ "info.category", "video4linux");
-+ libhal_changeset_set_property_string (cset,
-+ "video4linux.version", "2");
-+
-+ libhal_changeset_set_property_string (cset,
-+ "info.product", (const char *)v2cap.card);
-+
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux", NULL);
-+ if ((v2cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_capture", NULL);
-+ } if ((v2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_output", NULL);
-+ } if ((v2cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_overlay", NULL);
-+ } if ((v2cap.capabilities & V4L2_CAP_AUDIO) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.audio", NULL);
-+ } if ((v2cap.capabilities & V4L2_CAP_TUNER) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.tuner", NULL);
-+ } if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.radio", NULL);
-+ }
-+ } else {
-+ hfp_info (("ioctl VIDIOC_QUERYCAP failed"));
-+
-+ if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
-+ libhal_changeset_set_property_string (cset,
-+ "video4linux.device", device_file);
-+ libhal_changeset_set_property_string (cset,
-+ "info.category", "video4linux");
-+ libhal_changeset_set_property_string (cset,
-+ "video4linux.version", "1");
-+
-+ libhal_changeset_set_property_string (cset,
-+ "info.product", v1cap.name);
-+
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux", NULL);
-+ if ((v1cap.type & VID_TYPE_CAPTURE) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_capture", NULL);
-+ } if ((v1cap.type & VID_TYPE_OVERLAY) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_overlay", NULL);
-+ } if (v1cap.audios > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.audio", NULL);
-+ } if ((v1cap.type & VID_TYPE_TUNER) > 0) {
-+ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.tuner", NULL);
-+ }
-+ } else {
-+ hfp_info (("ioctl VIDIOCGCAP failed; not a v4l device"));
-+ }
-+ }
-+
-+ libhal_device_commit_changeset (hfp_ctx, cset, NULL);
-+ libhal_device_free_changeset (cset);
-+
-+ close (fd);
-+
-+ ret = 0;
-+
-+out:
-+ g_free (device_file);
-+ if (fd >= 0)
-+ close (fd);
-+
-+ return ret;
-+}
-+
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
deleted file mode 100644
index 1ff3d020642a..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- hald/freebsd/probing/probe-volume.c.orig 2009-12-23 14:06:53.000000000 -0500
-+++ hald/freebsd/probing/probe-volume.c 2009-12-23 14:07:01.000000000 -0500
-@@ -574,6 +574,7 @@ main (int argc, char **argv)
-
- 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);
-+ dbus_error_free(&hfp_error);
- ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
- "volume.freebsd.ufsid",
- ufsid,
-@@ -582,16 +583,17 @@ main (int argc, char **argv)
- dbus_error_free(&hfp_error);
- for (i = 0; i < num_udis; i++)
- {
-- if (ufs_devs[i] != NULL)
-+ if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi))
- {
- gboolean mounted;
-
- mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);
-- dbus_error_free(&hfp_error);
-+ dbus_error_free(&hfp_error);
- if (mounted)
-- {
-+ {
- libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
- dbus_error_free(&hfp_error);
-+ break;
- }
- }
- }
diff --git a/sysutils/hal/files/patch-hald_hf-storage.c b/sysutils/hal/files/patch-hald_hf-storage.c
deleted file mode 100644
index 9d468cbbd044..000000000000
--- a/sysutils/hal/files/patch-hald_hf-storage.c
+++ /dev/null
@@ -1,107 +0,0 @@
---- hald/freebsd/hf-storage.c.orig 2009-08-24 12:42:29.000000000 +0000
-+++ hald/freebsd/hf-storage.c 2014-04-16 19:04:08.004114131 +0000
-@@ -30,6 +30,7 @@
- #include <limits.h>
- #include <inttypes.h>
- #include <string.h>
-+#include <unistd.h>
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/disklabel.h>
-@@ -174,6 +175,10 @@
- if (! geom_obj)
- return;
-
-+ /* Exclude /dev/diskid/ labels as they are duplicates. */
-+ if (strncmp(geom_obj->dev, "diskid/", 7) == 0)
-+ return;
-+
- node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL,
- GUINT_TO_POINTER(geom_obj->hash));
-
-@@ -418,10 +423,42 @@
- continue;
- }
-
-+ /* XXX This is a hack, but we need to ignore dynamic labels like
-+ * ufsids which are created and destroyed based on whether or not
-+ * the actual device is mounted or not. If we don't then strange
-+ * things happen in applications like nautilus.
-+ */
-+ if ((! strcmp(fields[1], "LABEL") ||
-+ ! strcmp(fields[1], "BSD") ||
-+ ! strcmp(fields[1], "PART")) &&
-+ (! strncmp(fields[2], "ufsid/", strlen("ufsid/")) ||
-+ ! strncmp(fields[2], "ufs/", strlen("ufs/")) ||
-+ ! strncmp(fields[2], "diskid/", strlen("diskid/"))))
-+ {
-+ g_strfreev(fields);
-+ continue;
-+ }
-+
- geom_obj = g_new0(Geom_Object, 1);
-
- geom_obj->class = g_strdup(fields[1]);
- geom_obj->dev = g_strdup(fields[2]);
-+ /* Allow for spaces in label names. */
-+ if (! strcmp(fields[1], "LABEL"))
-+ {
-+ int j;
-+
-+ for (j = 3; g_strv_length(fields) > (j + 2) &&
-+ strcmp(fields[j + 2], "i"); j++)
-+ {
-+ char *tmp;
-+
-+ tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]);
-+ g_free(geom_obj->dev);
-+ geom_obj->dev = tmp;
-+ }
-+ }
-+
- geom_obj->type = -1; /* We use -1 here to denote a missing type. */
- geom_obj->hash = hash;
-
-@@ -458,6 +495,13 @@
- {
- g_free(geom_obj->class);
- geom_obj->class = g_strdup(fields[12]);
-+ if (! strcmp(geom_obj->class, "BSD") &&
-+ geom_obj->type == FS_UNUSED)
-+ {
-+ geom_obj->type = FS_BSDFFS;
-+ g_free(geom_obj->str_type);
-+ geom_obj->str_type = g_strdup("freebsd-ufs");
-+ }
- }
- }
- }
-@@ -589,11 +633,18 @@
- char *conftxt;
- GSList *new_disks;
-
-- if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
-+ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
-+ ! strncmp(data, "cdev=ufs/", strlen("cdev=ufs/")) ||
-+ ! strncmp(data, "cdev=ufsid/", strlen("cdev=ufsid/")) ||
- (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
- return FALSE;
-
-+ if (! strcmp(type, "DESTROY"))
-+ g_usleep(G_USEC_PER_SEC/2);
-+
- conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
-+ if (! conftxt)
-+ return FALSE;
- new_disks = hf_storage_parse_conftxt(conftxt);
- g_free(conftxt);
-
-@@ -669,7 +720,7 @@
- if (hf_is_waiting)
- return TRUE;
-
-- hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL);
-+ hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", "");
-
- return TRUE;
- }
diff --git a/sysutils/hal/files/patch-tools_hal-storage-eject.c b/sysutils/hal/files/patch-tools_hal-storage-eject.c
deleted file mode 100644
index 730e2a076d1c..000000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-eject.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/hal-storage-eject.c.orig 2008-10-27 13:23:11.000000000 -0400
-+++ tools/hal-storage-eject.c 2008-10-27 13:23:23.000000000 -0400
-@@ -190,7 +190,7 @@ main (int argc, char *argv[])
- unknown_eject_error ("Cannot obtain lock on /media/.hal-mtab");
- }
- handle_unmount (hal_ctx,
-- udi, volume_to_unmount, drive,
-+ volume_udi, volume_to_unmount, drive,
- libhal_volume_get_device_file (volume_to_unmount),
- invoked_by_uid, invoked_by_syscon_name,
- FALSE, FALSE); /* use neither lazy nor force */
diff --git a/sysutils/hal/files/patch-tools_hal-storage-mount.c b/sysutils/hal/files/patch-tools_hal-storage-mount.c
deleted file mode 100644
index 390d35111481..000000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-mount.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- tools/hal-storage-mount.c.orig 2008-05-07 19:24:23.000000000 -0400
-+++ tools/hal-storage-mount.c 2008-10-09 00:54:34.000000000 -0400
-@@ -56,8 +56,9 @@
-
- #ifdef __FreeBSD__
- #define MOUNT "/sbin/mount"
--#define MOUNT_OPTIONS "noexec,nosuid"
-+#define MOUNT_OPTIONS "nosuid"
- #define MOUNT_TYPE_OPT "-t"
-+#define FUSE_DB "/tmp/.fuse-mnts"
- #elif sun
- #define MOUNT "/sbin/mount"
- #define MOUNT_OPTIONS "noexec,nosuid"
-@@ -255,6 +256,51 @@ out:
- return f;
- }
-
-+#ifdef __FreeBSD__
-+static char *
-+resolve_fuse (const char *special)
-+{
-+ gchar *contents;
-+ gchar **lines;
-+ gsize len;
-+ int i;
-+
-+ if (! g_file_get_contents (FUSE_DB, &contents, &len, NULL))
-+ return g_strdup (special);
-+
-+ lines = g_strsplit (contents, "\n", 0);
-+ g_free (contents);
-+
-+ for (i = 0; lines && lines[i]; i++) {
-+ gchar **fields;
-+
-+ fields = g_strsplit (lines[i], "=", 2);
-+ if (fields && g_strv_length (fields) == 2) {
-+ if (strcmp (fields[0], special) == 0) {
-+ g_strfreev (fields);
-+ g_strfreev (lines);
-+ return g_strdup (fields[1]);
-+ }
-+ }
-+ g_strfreev (fields);
-+ }
-+
-+ g_strfreev (lines);
-+
-+ return g_strdup (special);
-+}
-+#endif
-+
-+static char *
-+resolve_special (const char *special)
-+{
-+#ifdef __FreeBSD__
-+ if (strstr(special, "fuse"))
-+ return resolve_fuse (special);
-+#endif
-+ return g_strdup (special);
-+}
-+
- static LibHalVolume *
- volume_findby (LibHalContext *hal_ctx, const char *property, const char *value)
- {
-@@ -400,18 +446,20 @@ device_is_mounted (const char *device, c
- unknown_error ("Cannot open /etc/mtab or equivalent");
- }
- while (((entry = mtab_next (handle, mount_point)) != NULL) && (ret == FALSE)) {
-- char *resolved;
-+ char *resolved, *rspecial;
-
- resolved = resolve_symlink (entry);
-+ rspecial = resolve_special (resolved);
-+ g_free (resolved);
- #ifdef DEBUG
-- printf ("/proc/mounts: device %s -> %s \n", entry, resolved);
-+ printf ("/proc/mounts: device %s -> %s \n", entry, rspecial);
- #endif
-- if (strcmp (device, resolved) == 0) {
-- printf ("%s (-> %s) found in mount list. Not mounting.\n", entry, resolved);
-+ if (strcmp (device, rspecial) == 0) {
-+ printf ("%s (-> %s) found in mount list. Not mounting.\n", entry, rspecial);
- ret = TRUE;
- }
-
-- g_free (resolved);
-+ g_free (rspecial);
- }
- mtab_close (handle);
- return ret;
diff --git a/sysutils/hal/files/patch-tools_hal-storage-shared.c b/sysutils/hal/files/patch-tools_hal-storage-shared.c
deleted file mode 100644
index 1ed7fe907bac..000000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-shared.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- tools/hal-storage-shared.c.orig 2008-05-07 19:24:24.000000000 -0400
-+++ tools/hal-storage-shared.c 2008-10-20 14:53:35.000000000 -0400
-@@ -297,6 +297,9 @@ handle_unmount (LibHalContext *hal_ctx,
- char *mount_point_to_unmount;
- gboolean mounted_by_other_uid;
- FILE *hal_mtab_new;
-+#ifdef __FreeBSD__
-+ char *rdevice = NULL;
-+#endif
-
- #ifdef DEBUG
- printf ("device = %s\n", device);
-@@ -473,7 +476,20 @@ line_found:
- #endif
- if (option_force)
- args[na++] = "-f";
-- args[na++] = (char *) device;
-+#ifdef __FreeBSD__
-+ dbus_error_init (&error);
-+ if (libhal_device_property_exists (hal_ctx, udi, "volume.freebsd.real_mounted_device", NULL)) {
-+ rdevice = libhal_device_get_property_string (hal_ctx, udi, "volume.freebsd.real_mounted_device", &error);
-+ if (dbus_error_is_set (&error)) {
-+ dbus_error_free (&error);
-+ unknown_error ("Error while getting volume.freebsd.real_mounted_device");
-+ }
-+ }
-+ if (rdevice)
-+ args[na++] = rdevice;
-+ else
-+#endif
-+ args[na++] = (char *) device;
- args[na++] = NULL;
-
- #ifdef DEBUG
-@@ -497,6 +513,10 @@ line_found:
- unknown_error ("Cannot spawn " UMOUNT);
- }
-
-+#ifdef __FreeBSD__
-+ g_free (rdevice);
-+#endif
-+
- /* check if unmount was succesful */
- if (exit_status != 0) {
- printf ("%s error %d, stdout='%s', stderr='%s'\n", UMOUNT, exit_status, sout, serr);
diff --git a/sysutils/hal/files/pkg-deinstall.in b/sysutils/hal/files/pkg-deinstall.in
deleted file mode 100644
index 4650d60fe08b..000000000000
--- a/sysutils/hal/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-[ "$2" != DEINSTALL ] && exit 0
-
-USER=haldaemon
-
-%%LOCALBASE%%/bin/polkit-auth --user ${USER} --revoke \
- org.freedesktop.policykit.read
-
-for pair in %%RC_FILES%%; do
- file=`echo $pair | cut -f 1 -d :`
- destdir=`echo $pair | cut -f 2 -d :`
-
- if cmp -s %%DATADIR%%/dist/$file $destdir/$file; then
- rm -f $destdir/$file
- fi
-done
diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in
deleted file mode 100644
index 253eef1f0e62..000000000000
--- a/sysutils/hal/files/pkg-install.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- USER=haldaemon
- GROUP=${USER}
-
- /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
- %%LOCALBASE%%/bin/polkit-auth --user ${USER} --grant \
- org.freedesktop.policykit.read
-
- for pair in %%RC_FILES%%; do
- file=`echo $pair | cut -f 1 -d :`
- destdir=`echo $pair | cut -f 2 -d :`
-
- if [ ! -f $destdir/$file ]; then
- mkdir -p $destdir
- cp -p %%DATADIR%%/dist/$file $destdir/$file
- fi
- done
- exit 0
- ;;
-esac
diff --git a/sysutils/hal/pkg-descr b/sysutils/hal/pkg-descr
deleted file mode 100644
index c9435851381f..000000000000
--- a/sysutils/hal/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-HAL is a hardware abstraction layer whose goal is to merge information from
-various sources such that desktop applications can locate and use hardware
-devices. The point is that the exact set of information to merge varies by
-device and bus type.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
deleted file mode 100644
index e5305418f9e0..000000000000
--- a/sysutils/hal/pkg-plist
+++ /dev/null
@@ -1,120 +0,0 @@
-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
-include/hal/libhal-storage.h
-include/hal/libhal.h
-lib/libhal-storage.a
-lib/libhal-storage.la
-lib/libhal-storage.so
-lib/libhal-storage.so.1
-lib/libhal-storage.so.1.0.0
-lib/libhal.a
-lib/libhal.la
-lib/libhal.so
-lib/libhal.so.1
-lib/libhal.so.1.0.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-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-set-brightness
-libexec/hal/scripts/hal-system-power-hibernate
-libexec/hal/scripts/hal-system-power-reboot
-libexec/hal/scripts/hal-system-power-set-power-save
-libexec/hal/scripts/hal-system-power-shutdown
-libexec/hal/scripts/hal-system-power-suspend
-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-mouse-sysmouse
-libexec/hald-addon-storage
-libexec/hald-generate-fdi-cache
-libexec/hald-probe-hiddev
-libexec/hald-probe-mouse
-libexec/hald-probe-scsi
-libexec/hald-probe-smbios
-libexec/hald-probe-storage
-libexec/hald-probe-usb2-device
-libexec/hald-probe-usb2-interface
-libexec/hald-probe-video4linux
-libexec/hald-probe-volume
-libexec/hald-runner
-man/man1/hal-disable-polling.1.gz
-man/man1/hal-find-by-capability.1.gz
-man/man1/hal-find-by-property.1.gz
-man/man1/hal-get-property.1.gz
-man/man1/hal-is-caller-locked-out.1.gz
-man/man1/hal-is-caller-privileged.1.gz
-man/man1/hal-lock.1.gz
-man/man1/hal-set-property.1.gz
-man/man1/lshal.1.gz
-man/man8/hald.8.gz
-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
-%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/README.fuse
-%%DATADIR%%/dist/hal.conf
-%%DATADIR%%/fdi/fdi.dtd
-%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.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-leds.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-mouse-sysmouse.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
-%%DATADIR%%/mount-fuse
-@unexec rm -f /var/lib/PolicyKit/user-haldaemon.auths 2>/dev/null || true
-@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
-@dir etc/hal/fdi/information
-@dir etc/hal/fdi/policy
-@dir etc/hal/fdi/preprobe
-@dir %%DATADIR%%/fdi/information/20thirdparty
-@dir %%DATADIR%%/fdi/policy/20thirdparty
-@dir %%DATADIR%%/fdi/preprobe/10osvendor
-@dir %%DATADIR%%/fdi/preprobe/20thirdparty
-@dir /var/cache/hald
-@dir /var/lib/hal
-@dir /var/lib
-@dir /var/run/hald/hald-local
-@dir /var/run/hald/hald-runner
-@dir /var/run/hald