[pkgsrc/trunk]: pkgsrc/sysutils/hal hal: try to help ubuntu 14.04 builds.

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/845c93cb7f40
branches:  trunk
changeset: 322991:845c93cb7f40
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed May 01 19:51:45 2019 +0000

description:
hal: try to help ubuntu 14.04 builds.

we rely on libpci to come from pciutils, but it installs to a different
include path than this package expects (it looks for pci/pci.h)

XXX we might want to change this! the reason we namespace is that netbsd
has its own libpci, and to avoid unexpected conflicts.

but the upstream default isn't pci/pci.h, either!

diffstat:

 sysutils/hal/Makefile    |  7 +++++--
 sysutils/hal/PLIST.Linux |  6 +-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r f6f29ed3f396 -r 845c93cb7f40 sysutils/hal/Makefile
--- a/sysutils/hal/Makefile     Wed May 01 19:31:45 2019 +0000
+++ b/sysutils/hal/Makefile     Wed May 01 19:51:45 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2018/08/22 09:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2019/05/01 19:51:45 maya Exp $
 
 DISTNAME=              hal-0.5.14
 PKGREVISION=           21
@@ -58,7 +58,10 @@
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/libblkid/buildlink3.mk"
 .include "../../devel/libvolume_id/buildlink3.mk"
-.include "../../sysutils/pciutils/buildlink3.mk"
+# XXX we install libpci headers to an unexpected location
+# as far as this package is concerned, so it fails
+# to detect libpci!
+#.include "../../sysutils/pciutils/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-backend=linux
 MAKE_DIRS+=            /etc/udev
 MAKE_DIRS+=            /etc/udev/rules.d
diff -r f6f29ed3f396 -r 845c93cb7f40 sysutils/hal/PLIST.Linux
--- a/sysutils/hal/PLIST.Linux  Wed May 01 19:31:45 2019 +0000
+++ b/sysutils/hal/PLIST.Linux  Wed May 01 19:51:45 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.8 2018/01/01 22:29:56 rillig Exp $
+@comment $NetBSD: PLIST.Linux,v 1.9 2019/05/01 19:51:45 maya Exp $
 bin/hal-setup-keymap
 libexec/hal-system-sonypic
 libexec/hald-addon-acpi
@@ -9,8 +9,6 @@
 libexec/hald-addon-input
 libexec/hald-addon-ipw-killswitch
 libexec/hald-addon-leds
-${PLIST.imac}libexec/hald-addon-macbook-backlight
-${PLIST.imac}libexec/hald-addon-macbookpro-backlight
 libexec/hald-addon-rfkill-killswitch
 libexec/hald-addon-storage
 libexec/hald-probe-hiddev
@@ -46,5 +44,3 @@
 share/hal/fdi/policy/10osvendor/10-cpufreq.fdi
 ${PLIST.imac}share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
 share/hal/fdi/policy/10osvendor/10-keymap.fdi
-${PLIST.imac}share/hal/fdi/policy/10osvendor/10-macbook-backlight.fdi
-${PLIST.imac}share/hal/fdi/policy/10osvendor/10-macbookpro-utils.fdi