PR# pkg/40147: sysutils/hal fails to build on Linux

4 files changed, 61 insertions, 2 deletions

diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 7d278e925f9..b1a97a5016d 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/12/20 21:11:05 jmcneill Exp $
+# $NetBSD: Makefile,v 1.26 2008/12/21 13:58:28 jmcneill Exp $
 #
 
 DISTNAME=		hal-0.5.11
@@ -56,6 +56,8 @@ PLIST_SRC=		PLIST
 .include "../../devel/libvolume_id/buildlink3.mk"
 .include "../../sysutils/pciutils/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-backend=linux
+CONF_FILES+=		${EGDIR}/90-hal.rules \
+			${PKG_SYSCONFBASE}/udev/rules.d/90-hal.rules
 .endif
 
 .if ${OPSYS} == "Darwin"
diff --git a/sysutils/hal/PLIST.Linux b/sysutils/hal/PLIST.Linux
new file mode 100644
index 00000000000..e6990a0faa6
--- /dev/null
+++ b/sysutils/hal/PLIST.Linux
@@ -0,0 +1,42 @@
+etc/udev/rules.d/90-hal.rules
+lib/hal/scripts/linux/hal-dockstation-undock-linux
+lib/hal/scripts/linux/hal-luks-remove-linux
+lib/hal/scripts/linux/hal-luks-setup-linux
+lib/hal/scripts/linux/hal-luks-teardown-linux
+lib/hal/scripts/linux/hal-system-killswitch-get-power-linux
+lib/hal/scripts/linux/hal-system-killswitch-set-power-linux
+lib/hal/scripts/linux/hal-system-lcd-get-brightness-linux
+lib/hal/scripts/linux/hal-system-lcd-set-brightness-linux
+lib/hal/scripts/linux/hal-system-power-hibernate-linux
+lib/hal/scripts/linux/hal-system-power-reboot-linux
+lib/hal/scripts/linux/hal-system-power-set-power-save-linux
+lib/hal/scripts/linux/hal-system-power-shutdown-linux
+lib/hal/scripts/linux/hal-system-power-suspend-hybrid-linux
+lib/hal/scripts/linux/hal-system-power-suspend-linux
+lib/hal/scripts/linux/hal-system-wol-enable-linux
+lib/hal/scripts/linux/hal-system-wol-enabled-linux
+lib/hal/scripts/linux/hal-system-wol-linux
+lib/hal/scripts/linux/hal-system-wol-supported-linux
+libexec/hal-ipw-killswitch-linux
+libexec/hal-system-sonypic
+libexec/hald-addon-acpi
+libexec/hald-addon-cpufreq
+libexec/hald-addon-hid-ups
+libexec/hald-addon-imac-backlight
+libexec/hald-addon-input
+libexec/hald-addon-storage
+libexec/hald-addon-usb-csr
+libexec/hald-probe-hiddev
+libexec/hald-probe-ieee1394-unit
+libexec/hald-probe-input
+libexec/hald-probe-net-bluetooth
+libexec/hald-probe-pc-floppy
+libexec/hald-probe-printer
+libexec/hald-probe-serial
+libexec/hald-probe-smbios
+libexec/hald-probe-storage
+libexec/hald-probe-video4linux
+libexec/hald-probe-volume
+share/hal/fdi/policy/10osvendor/10-cpufreq.fdi
+share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
+share/hal/fdi/policy/10osvendor/10-usbcsr-mice.fdi
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 5c1da53d1cc..5df2e498f66 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2008/12/20 21:11:05 jmcneill Exp $
+$NetBSD: distinfo,v 1.9 2008/12/21 13:58:28 jmcneill Exp $
 
 SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
@@ -18,6 +18,7 @@ SHA1 (patch-al) = 8279947ecb720f3e99777dae8c20d4afe0e19039
 SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a
 SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
 SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34
+SHA1 (patch-ap) = 37b9ff8995250c3d279a718ded29cac31b213d41
 SHA1 (patch-na) = 77b7c505bf3644fe19f26463eb1272b7cb3ceaf6
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
 SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
diff --git a/sysutils/hal/patches/patch-ap b/sysutils/hal/patches/patch-ap
new file mode 100644
index 00000000000..f219be4f06e
--- /dev/null
+++ b/sysutils/hal/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 2008/12/21 13:58:28 jmcneill Exp $
+
+PR# pkg/40147: sysutils/hal fails to build on Linux
+
+--- tools/linux/Makefile.am.orig	2008-12-21 08:52:45.000000000 -0500
++++ tools/linux/Makefile.am	2008-12-21 08:53:31.000000000 -0500
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-udevrulesdir = $(sysconfdir)/udev/rules.d
++udevrulesdir = $(EGDIR)
+ udevrules_DATA = 90-hal.rules
+ 
+