Sun Dec 21 13:58:28 2008 UTC ()
PR# pkg/40147: sysutils/hal fails to build on Linux


(jmcneill)
diff -r1.25 -r1.26 pkgsrc/sysutils/hal/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/hal/PLIST.Linux
diff -r1.8 -r1.9 pkgsrc/sysutils/hal/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/hal/patches/patch-ap
cvs diff -r1.25 -r1.26 pkgsrc/sysutils/hal/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2008/12/20 21:11:05 1.25
+++ pkgsrc/sysutils/hal/Makefile 2008/12/21 13:58:28 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2008/12/20 21:11:05 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.26 2008/12/21 13:58:28 jmcneill Exp $
2# 2#
3 3
4DISTNAME= hal-0.5.11 4DISTNAME= hal-0.5.11
5PKGREVISION= 16 5PKGREVISION= 16
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= http://hal.freedesktop.org/releases/ 7MASTER_SITES= http://hal.freedesktop.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= jmcneill@NetBSD.org 10MAINTAINER= jmcneill@NetBSD.org
11HOMEPAGE= http://hal.freedesktop.org/ 11HOMEPAGE= http://hal.freedesktop.org/
12COMMENT= FreeDesktop hardware abstraction layer 12COMMENT= FreeDesktop hardware abstraction layer
13 13
14BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
@@ -46,26 +46,28 @@ PLIST_SRC= PLIST.FreeBSD PLIST @@ -46,26 +46,28 @@ PLIST_SRC= PLIST.FreeBSD PLIST
46CONFIGURE_ARGS+= --with-backend=netbsd 46CONFIGURE_ARGS+= --with-backend=netbsd
47HAL_GROUP= operator 47HAL_GROUP= operator
48.elif ${OPSYS} == "NetBSD" 48.elif ${OPSYS} == "NetBSD"
49# Pull in the dummy backend for older NetBSD 49# Pull in the dummy backend for older NetBSD
50CONFIGURE_ARGS+= --with-backend=dummy 50CONFIGURE_ARGS+= --with-backend=dummy
51PLIST_SRC= PLIST 51PLIST_SRC= PLIST
52.endif 52.endif
53 53
54.if ${OPSYS} == "Linux" 54.if ${OPSYS} == "Linux"
55.include "../../devel/libusb/buildlink3.mk" 55.include "../../devel/libusb/buildlink3.mk"
56.include "../../devel/libvolume_id/buildlink3.mk" 56.include "../../devel/libvolume_id/buildlink3.mk"
57.include "../../sysutils/pciutils/buildlink3.mk" 57.include "../../sysutils/pciutils/buildlink3.mk"
58CONFIGURE_ARGS+= --with-backend=linux 58CONFIGURE_ARGS+= --with-backend=linux
 59CONF_FILES+= ${EGDIR}/90-hal.rules \
 60 ${PKG_SYSCONFBASE}/udev/rules.d/90-hal.rules
59.endif 61.endif
60 62
61.if ${OPSYS} == "Darwin" 63.if ${OPSYS} == "Darwin"
62BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed 64BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed
63.endif 65.endif
64 66
65REPLACE_INTERPRETER+= bash 67REPLACE_INTERPRETER+= bash
66REPLACE.bash.old= /bin/bash 68REPLACE.bash.old= /bin/bash
67REPLACE.bash.new= ${SH} 69REPLACE.bash.new= ${SH}
68.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported 70.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported
69REPLACE_FILES.bash+= tools/hal-${halscript} 71REPLACE_FILES.bash+= tools/hal-${halscript}
70.endfor 72.endfor
71 73
File Added: pkgsrc/sysutils/hal/PLIST.Linux
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
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/hal/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/distinfo 2008/12/20 21:11:05 1.8
+++ pkgsrc/sysutils/hal/distinfo 2008/12/21 13:58:28 1.9
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.8 2008/12/20 21:11:05 jmcneill Exp $ 1$NetBSD: distinfo,v 1.9 2008/12/21 13:58:28 jmcneill Exp $
2 2
3SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9 3SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9
4RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f 4RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f
5Size (hal-0.5.11.tar.bz2) = 1281251 bytes 5Size (hal-0.5.11.tar.bz2) = 1281251 bytes
6SHA1 (patch-aa) = cad685075f8246397e3783fb3e9d094a2bee4d04 6SHA1 (patch-aa) = cad685075f8246397e3783fb3e9d094a2bee4d04
7SHA1 (patch-ab) = 03723893f9219967a0e3b48c1a03592688389234 7SHA1 (patch-ab) = 03723893f9219967a0e3b48c1a03592688389234
8SHA1 (patch-ac) = 5836bb68f4742bdccc9c61fbf8cc86020007a0a5 8SHA1 (patch-ac) = 5836bb68f4742bdccc9c61fbf8cc86020007a0a5
9SHA1 (patch-ad) = 2a2732f82a4fd8d7ffa311b4a0e747208dc9ad1c 9SHA1 (patch-ad) = 2a2732f82a4fd8d7ffa311b4a0e747208dc9ad1c
10SHA1 (patch-ae) = ebc98ede0b6e9535825434f2dc6185193d837f36 10SHA1 (patch-ae) = ebc98ede0b6e9535825434f2dc6185193d837f36
11SHA1 (patch-af) = 161b59ee30d59dbc9e0c79f7f3162bcec5480d99 11SHA1 (patch-af) = 161b59ee30d59dbc9e0c79f7f3162bcec5480d99
12SHA1 (patch-ag) = 3fd8b7d10b1a43311541d2c6ad67a944e286c5ec 12SHA1 (patch-ag) = 3fd8b7d10b1a43311541d2c6ad67a944e286c5ec
13SHA1 (patch-ah) = 6d801a2c30cee6199b25acf46d7e9866f6004182 13SHA1 (patch-ah) = 6d801a2c30cee6199b25acf46d7e9866f6004182
14SHA1 (patch-ai) = 2e11ee437e778f540f401335b4f022fe6e8e8fee 14SHA1 (patch-ai) = 2e11ee437e778f540f401335b4f022fe6e8e8fee
15SHA1 (patch-aj) = 533289d4e1328a89ad9e4ce6c1b28e32139b70db 15SHA1 (patch-aj) = 533289d4e1328a89ad9e4ce6c1b28e32139b70db
16SHA1 (patch-ak) = 2a83d09cad7b33c0370c6318f095e878f1cd7e96 16SHA1 (patch-ak) = 2a83d09cad7b33c0370c6318f095e878f1cd7e96
17SHA1 (patch-al) = 8279947ecb720f3e99777dae8c20d4afe0e19039 17SHA1 (patch-al) = 8279947ecb720f3e99777dae8c20d4afe0e19039
18SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a 18SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a
19SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2 19SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
20SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34 20SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34
 21SHA1 (patch-ap) = 37b9ff8995250c3d279a718ded29cac31b213d41
21SHA1 (patch-na) = 77b7c505bf3644fe19f26463eb1272b7cb3ceaf6 22SHA1 (patch-na) = 77b7c505bf3644fe19f26463eb1272b7cb3ceaf6
22SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc 23SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
23SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227 24SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
File Added: pkgsrc/sysutils/hal/patches/patch-ap
$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