Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_155674030582310"
MIME-Version: 1.0
Date: Wed, 1 May 2019 19:51:45 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/hal
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20190501195145.C0A35FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_155674030582310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Wed May  1 19:51:45 UTC 2019

Modified Files:
	pkgsrc/sysutils/hal: Makefile PLIST.Linux

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/sysutils/hal/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/hal/PLIST.Linux

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_155674030582310
Content-Disposition: inline
Content-Length: 2107
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/hal/Makefile
diff -u pkgsrc/sysutils/hal/Makefile:1.82 pkgsrc/sysutils/hal/Makefile:1.83
--- pkgsrc/sysutils/hal/Makefile:1.82	Wed Aug 22 09:46:34 2018
+++ pkgsrc/sysutils/hal/Makefile	Wed May  1 19:51:45 2019
@@ -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 @@ HAL_GROUP=		operator
 .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

Index: pkgsrc/sysutils/hal/PLIST.Linux
diff -u pkgsrc/sysutils/hal/PLIST.Linux:1.8 pkgsrc/sysutils/hal/PLIST.Linux:1.9
--- pkgsrc/sysutils/hal/PLIST.Linux:1.8	Mon Jan  1 22:29:56 2018
+++ pkgsrc/sysutils/hal/PLIST.Linux	Wed May  1 19:51:45 2019
@@ -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 @@ ${PLIST.imac}libexec/hald-addon-imac-bac
 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/examples/hal/90-hal.rules
 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


--_----------=_155674030582310--