CVS commit: pkgsrc/sysutils/hal

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Sat Sep 17 15:33:59 UTC 2016

Modified Files:
        pkgsrc/sysutils/hal: Makefile PLIST.Linux distinfo
        pkgsrc/sysutils/hal/patches: patch-nc

Log Message:
To fix build on aarch64-linux-gnu, conditionalise imac which is x86 only
and support the recent migration of key event codes in linux/input.h to
linux/input-event-codes.h.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/sysutils/hal/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/hal/PLIST.Linux
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/hal/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/hal/patches/patch-nc

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

Modified files:

Index: pkgsrc/sysutils/hal/Makefile
diff -u pkgsrc/sysutils/hal/Makefile:1.77 pkgsrc/sysutils/hal/Makefile:1.78
--- pkgsrc/sysutils/hal/Makefile:1.77   Sat Jul  9 06:39:00 2016
+++ pkgsrc/sysutils/hal/Makefile        Sat Sep 17 15:33:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2016/07/09 06:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2016/09/17 15:33:59 richard Exp $
 
 DISTNAME=              hal-0.5.14
 PKGREVISION=           18
@@ -64,7 +64,13 @@ MAKE_DIRS+=          /etc/udev
 MAKE_DIRS+=            /etc/udev/rules.d
 CONF_FILES+=           ${EGDIR}/90-hal.rules \
                        /etc/udev/rules.d/90-hal.rules
-
+PLIST_VARS+=   imac
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PLIST.imac=    yes
+CONFIGURE_ARGS+=       --with-imac
+.else
+CONFIGURE_ARGS+=       --without-imac
+.endif
 .else  # Unsupported systems
 # Pull in the dummy backend
 .include "../../devel/libvolume_id/buildlink3.mk"

Index: pkgsrc/sysutils/hal/PLIST.Linux
diff -u pkgsrc/sysutils/hal/PLIST.Linux:1.5 pkgsrc/sysutils/hal/PLIST.Linux:1.6
--- pkgsrc/sysutils/hal/PLIST.Linux:1.5 Sun Jan  9 01:26:56 2011
+++ pkgsrc/sysutils/hal/PLIST.Linux     Sat Sep 17 15:33:59 2016
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.Linux,v 1.5 2011/01/09 01:26:56 dsainty Exp $
+@comment $NetBSD: PLIST.Linux,v 1.6 2016/09/17 15:33:59 richard 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
+${PLIST.imac}libexec/hald-addon-imac-backlight
 libexec/hald-addon-input
 libexec/hald-addon-ipw-killswitch
 libexec/hald-addon-leds
@@ -42,5 +42,5 @@ libexec/scripts/linux/hal-system-wol-lin
 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
+${PLIST.imac}share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
 share/hal/fdi/policy/10osvendor/10-keymap.fdi

Index: pkgsrc/sysutils/hal/distinfo
diff -u pkgsrc/sysutils/hal/distinfo:1.25 pkgsrc/sysutils/hal/distinfo:1.26
--- pkgsrc/sysutils/hal/distinfo:1.25   Wed Nov  4 01:32:17 2015
+++ pkgsrc/sysutils/hal/distinfo        Sat Sep 17 15:33:59 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2015/11/04 01:32:17 agc Exp $
+$NetBSD: distinfo,v 1.26 2016/09/17 15:33:59 richard Exp $
 
 SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59
 RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9
@@ -47,5 +47,5 @@ SHA1 (patch-hald_linux_addons_addon-stor
 SHA1 (patch-hald_linux_addons_addon-usb-csr.c) = 34b5be5ff308f9aafcf505b303d36cbc2483d015
 SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
-SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
+SHA1 (patch-nc) = 6ced27d1a8e4529f86afc4c18064687039d573eb
 SHA1 (patch-nd) = 877dcbafaca0cebd3fdce74c5a622721823c153b

Index: pkgsrc/sysutils/hal/patches/patch-nc
diff -u pkgsrc/sysutils/hal/patches/patch-nc:1.1 pkgsrc/sysutils/hal/patches/patch-nc:1.2
--- pkgsrc/sysutils/hal/patches/patch-nc:1.1    Thu Nov 27 03:32:19 2008
+++ pkgsrc/sysutils/hal/patches/patch-nc        Sat Sep 17 15:33:59 2016
@@ -1,8 +1,10 @@
-$NetBSD: patch-nc,v 1.1 2008/11/27 03:32:19 jmcneill Exp $
+$NetBSD: patch-nc,v 1.2 2016/09/17 15:33:59 richard Exp $
 
---- tools/Makefile.am.orig     2008-11-26 21:01:00.000000000 -0500
-+++ tools/Makefile.am  2008-11-26 21:01:24.000000000 -0500
-@@ -8,8 +8,11 @@
+key event codes have migrated from linux/input.h to linux/input-event-codes .h
+so update to support generating gperf hash from either.
+--- tools/Makefile.am.orig     2009-11-09 15:33:53.000000000 +0000
++++ tools/Makefile.am
+@@ -8,8 +8,11 @@ endif
  if HALD_COMPILE_FREEBSD
  SUBDIRS += freebsd
  endif
@@ -15,3 +17,16 @@ $NetBSD: patch-nc,v 1.1 2008/11/27 03:32
  
  AM_CPPFLAGS = \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+@@ -80,7 +83,11 @@ if BUILD_KEYMAPS
+ 
+ if HAVE_GPERF
+ hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
+-      awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
++      if test -f /usr/include/linux/input-event-codes.h; then \
++              awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < /usr/include/linux/input-event-codes.h > $@; \
++      else \
++              awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@; \
++      fi
+ 
+ hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
+       awk 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", KEY_" $$1 }' < $< > $@