Import of pkgsrc-2016Q3

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>