Import of pkgsrc-2016Q3

sysutils/hal/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2015/09/07 09:03:24 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2016/09/17 15:33:59 richard Exp $
 
 DISTNAME=		hal-0.5.14
-PKGREVISION=		16
+PKGREVISION=		18
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=		.tar.bz2
@@ -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"
@@ -74,9 +80,8 @@ PLIST_SRC=		PLIST
 
 CFLAGS.SunOS+=		-Du_int32_t=uint32_t
 
-.if ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
-.endif
+BUILDLINK_TRANSFORM.Darwin+=	rm:-Wl,--as-needed
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--as-needed:-Wl,-zignore
 
 REPLACE_INTERPRETER+=	bash
 REPLACE.bash.old=	/bin/bash
@@ -92,15 +97,17 @@ CONFIGURE_ARGS+=	--with-hal-group=${HAL_GROUP}
 CONFIGURE_ARGS+=	--disable-pmu
 
 RCD_SCRIPTS=		hal
+SMF_METHODS=		hal
 
 .if ${HAL_GROUP} != "operator"
 PKG_GROUPS=		${HAL_GROUP}
 .endif
 PKG_USERS=		${HAL_USER}:${HAL_GROUP}
-PKG_HOME.haldaemon=	${VARBASE}/run/hal
+PKG_HOME.haldaemon=	${VARBASE}/run/hald
 
 FILES_SUBST+=		HAL_USER=${HAL_USER}
 FILES_SUBST+=		HAL_GROUP=${HAL_GROUP}
+FILES_SUBST+=		PKG_HOME.haldaemon=${PKG_HOME.haldaemon}
 
 PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 

sysutils/hal/PLIST.Linux

@@ -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-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
+${PLIST.imac}share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
 share/hal/fdi/policy/10osvendor/10-keymap.fdi

sysutils/hal/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.24 2012/05/14 03:12:01 sbd 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
+SHA512 (hal-0.5.14.tar.bz2) = fe34e0dd0a630b943ea1ce2a2af71260309144fb76ae0f482c475610f0347f403f2a3bac81d27a95868bf640fca78e6e8de0051e8e1a3f39ff6804232ecc333c
 Size (hal-0.5.14.tar.bz2) = 942954 bytes
 SHA1 (patch-aa) = 83d20e99943be5c4e9eaeff7a86d79a8912d9c99
 SHA1 (patch-ab) = 03723893f9219967a0e3b48c1a03592688389234
@@ -46,5 +47,5 @@ SHA1 (patch-hald_linux_addons_addon-storage.c) = 9949c8768395295f27aebc792b8b809
 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

sysutils/hal/files/hal.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: hal.sh,v 1.2 2008/11/22 16:16:26 jmcneill Exp $
+# $NetBSD: hal.sh,v 1.3 2015/09/25 16:26:16 richard Exp $
 #
 # PROVIDE: hal
 # REQUIRE: DAEMON dbus
@@ -14,7 +14,7 @@ command="@PREFIX@/sbin/hald"
 start_precmd=hal_prestart
 
 hal_prestart() {
-	dir="@VARBASE@/run/hald"
+	dir="@PKG_HOME.haldaemon@"
 	if @TEST@ ! -d $dir; then
 		@MKDIR@ $dir
 		@CHMOD@ 0755 $dir

sysutils/hal/files/smf/hal.sh

@@ -0,0 +1,35 @@
+#!/sbin/sh
+
+. /lib/svc/share/smf_include.sh
+
+if [ ! -x @PREFIX@/sbin/hald ] ; then
+	echo "@PREFIX@/sbin/hald not found or not executable"
+	exit $SMF_EXIT_ERR_FATAL
+fi
+
+case "$1" in
+'start')
+	dir="@PKG_HOME.haldaemon@"
+	if ! [ -d $dir ]; then
+		@MKDIR@ -m 0755 $dir
+		@CHOWN@ @HAL_USER@:@HAL_GROUP@ $dir
+	fi
+
+	if ! [ -d /media ]; then
+		@MKDIR@ -m 755 /media
+	fi
+
+	@PREFIX@/sbin/hald --daemon=yes --use-syslog
+	err=$?
+	if [ $err -ne 0 ]; then
+		echo "hal failed to start: error $err"
+		exit $SMF_EXIT_ERR_FATAL
+	fi
+	;;
+*)
+        echo "Usage: $0 { start }"
+	exit $SMF_EXIT_ERR_FATAL
+        ;;
+esac
+
+exit $SMF_EXIT_OK

sysutils/hal/files/smf/manifest.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type='manifest' name='export'>
+<service
+	name='@SMF_PREFIX@/@SMF_NAME@'
+	type='service'
+	version='1'>
+	<create_default_instance enabled='false' />
+	<single_instance />
+	<dependency name='usr'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/system/filesystem/minimal' />
+	</dependency>
+	<dependency
+		name='devices'
+		grouping='require_all'
+		restart_on='none'
+		type='service'>
+		<service_fmri value='svc:/system/device/local' />
+	</dependency>
+	<dependency name='dbus'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/@SMF_PREFIX@/dbus' />
+	</dependency>
+	<dependency name='sysevent'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/system/sysevent' />
+	</dependency>
+
+	<dependency name='keymap'
+		type='service'
+		grouping='optional_all'
+		restart_on='none'>
+		<service_fmri value='svc:/system/keymap' />
+	</dependency>
+
+	<exec_method
+		type='method'
+		name='start'
+		exec='@PREFIX@/@SMF_METHOD_FILE.hal@ start'
+		timeout_seconds='600'>
+		<method_context>
+			<method_credential user='root' group='root' />
+		</method_context>
+	</exec_method>
+
+	<exec_method
+		type='method'
+		name='stop'
+		exec=':kill'
+		timeout_seconds='30' />
+
+	<property_group name='startd' type='framework'>
+		<!-- sub-process core dumps shouldn't restart session -->
+		<propval name='ignore_error' type='astring'
+		    value='core,signal' />
+	</property_group>
+
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+			Hardware Abstraction Layer daemon
+			</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='hald' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
+		</documentation>
+	</template>
+
+</service>
+
+</service_bundle>

sysutils/hal/patches/patch-nc

@@ -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:19 jmcneill Exp $
  
  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 }' < $< > $@