diff options
author | dsainty <dsainty@pkgsrc.org> | 2011-01-09 01:26:56 +0000 |
---|---|---|
committer | dsainty <dsainty@pkgsrc.org> | 2011-01-09 01:26:56 +0000 |
commit | fafa714c0fb73cba54db6509a3dd87da4b9cae3a (patch) | |
tree | c3b99809cf3996ea654b605fca2a96b25d0f9866 /sysutils/hal | |
parent | 9f3f4731a2a6d5f365f19b82c24d1add4fce15d4 (diff) | |
download | pkgsrc-fafa714c0fb73cba54db6509a3dd87da4b9cae3a.tar.gz |
Fixes for Linux build:
- Pull in libblkid for Linux in order to successfully build
- Fix PLIST.Linux: lib/hal -> libexec
- Remove Linux-only libusb buildlink. This version of hal fails to use libusb,
since it isn't version 2.0 (this does look a little like a mistake though).
- The CSR support is absent because libusb isn't available. Remove from
PLIST.Linux
- Other minor additions and edits to PLIST.Linux
- Buildlink in gperf explicitly, to reliably build the keymap support
- Make sure .../etc/udev/rules.d exists before trying to install to it
Diffstat (limited to 'sysutils/hal')
-rw-r--r-- | sysutils/hal/Makefile | 7 | ||||
-rw-r--r-- | sysutils/hal/PLIST.Linux | 47 |
2 files changed, 30 insertions, 24 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index b22f88452e8..560f26b9962 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2011/01/08 13:39:08 obache Exp $ +# $NetBSD: Makefile,v 1.51 2011/01/09 01:26:56 dsainty Exp $ DISTNAME= hal-0.5.14 PKGREVISION= 1 @@ -47,10 +47,13 @@ CONFIGURE_ARGS+= --with-backend=netbsd HAL_GROUP= operator .elif ${OPSYS} == "Linux" -.include "../../devel/libusb/buildlink3.mk" +.include "../../devel/gperf/buildlink3.mk" +.include "../../devel/libblkid/buildlink3.mk" .include "../../devel/libvolume_id/buildlink3.mk" .include "../../sysutils/pciutils/buildlink3.mk" CONFIGURE_ARGS+= --with-backend=linux +MAKE_DIRS+= ${PKG_SYSCONFBASE}/udev +MAKE_DIRS+= ${PKG_SYSCONFBASE}/udev/rules.d CONF_FILES+= ${EGDIR}/90-hal.rules \ ${PKG_SYSCONFBASE}/udev/rules.d/90-hal.rules diff --git a/sysutils/hal/PLIST.Linux b/sysutils/hal/PLIST.Linux index a1133e809f2..811be25fa64 100644 --- a/sysutils/hal/PLIST.Linux +++ b/sysutils/hal/PLIST.Linux @@ -1,31 +1,16 @@ -@comment $NetBSD: PLIST.Linux,v 1.4 2009/06/14 18:16:07 joerg Exp $ -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 +@comment $NetBSD: PLIST.Linux,v 1.5 2011/01/09 01:26:56 dsainty Exp $ +bin/hal-setup-keymap libexec/hal-system-sonypic libexec/hald-addon-acpi libexec/hald-addon-cpufreq +libexec/hald-addon-generic-backlight libexec/hald-addon-hid-ups libexec/hald-addon-imac-backlight libexec/hald-addon-input +libexec/hald-addon-ipw-killswitch +libexec/hald-addon-leds +libexec/hald-addon-rfkill-killswitch libexec/hald-addon-storage -libexec/hald-addon-usb-csr libexec/hald-probe-hiddev libexec/hald-probe-ieee1394-unit libexec/hald-probe-input @@ -37,7 +22,25 @@ libexec/hald-probe-smbios libexec/hald-probe-storage libexec/hald-probe-video4linux libexec/hald-probe-volume +libexec/scripts/linux/hal-dockstation-undock-linux +libexec/scripts/linux/hal-luks-remove-linux +libexec/scripts/linux/hal-luks-setup-linux +libexec/scripts/linux/hal-luks-teardown-linux +libexec/scripts/linux/hal-system-killswitch-get-power-linux +libexec/scripts/linux/hal-system-killswitch-set-power-linux +libexec/scripts/linux/hal-system-lcd-get-brightness-linux +libexec/scripts/linux/hal-system-lcd-set-brightness-linux +libexec/scripts/linux/hal-system-power-hibernate-linux +libexec/scripts/linux/hal-system-power-reboot-linux +libexec/scripts/linux/hal-system-power-set-power-save-linux +libexec/scripts/linux/hal-system-power-shutdown-linux +libexec/scripts/linux/hal-system-power-suspend-hybrid-linux +libexec/scripts/linux/hal-system-power-suspend-linux +libexec/scripts/linux/hal-system-wol-enable-linux +libexec/scripts/linux/hal-system-wol-enabled-linux +libexec/scripts/linux/hal-system-wol-linux +libexec/scripts/linux/hal-system-wol-supported-linux share/examples/hal/90-hal.rules 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 +share/hal/fdi/policy/10osvendor/10-keymap.fdi |