diff --git a/templates/hal/files/hal b/templates/hal/files/hal deleted file mode 100644 index 637e5e0153d..00000000000 --- a/templates/hal/files/hal +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# PROVIDE: hal -# REQUIRE: DAEMON dbus -# KEYWORD: shutdown - -. /etc/rc.subr - -name="hal" -rcvar=$name -command="/usr/sbin/hald" -pidfile="/var/run/hald/pid" -start_precmd=hal_prestart - -hal_prestart() { - dirs="/var/run/hald /var/cache/hald" - for d in ${dirs}; do - if [ ! -d ${d} ]; then - mkdir ${d} - chmod 0755 ${d} - chown hal:hal ${d} - fi - done - for f in hald-local hald-runner; do - if [ ! -x /var/run/hald/${f} ]; then - touch /var/run/hald/${f} - fi - done -} - -load_rc_config $name -run_rc_command "$1" diff --git a/templates/hal/files/hal.rc b/templates/hal/files/hal.rc new file mode 100644 index 00000000000..e3669310a13 --- /dev/null +++ b/templates/hal/files/hal.rc @@ -0,0 +1,10 @@ +#!/sbin/runscript + +command=/usr/sbin/hald +pidfile=/var/run/hald/pid +name="HAL (Hardware Abstraction Layer)" + +depend() +{ + need dbus +} diff --git a/templates/hal/template b/templates/hal/template index 53a5c4527e3..049e8692ba2 100644 --- a/templates/hal/template +++ b/templates/hal/template @@ -1,6 +1,7 @@ # Template file for 'hal' pkgname=hal version=0.5.12rc1 +revision=1 distfiles="http://hal.freedesktop.org/releases/hal-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-man-pages --enable-console-kit --enable-policy-kit @@ -16,6 +17,8 @@ long_desc=" conf_files="/etc/dbus-1/system.d/hal.conf /etc/hal/fdi/policy/10-keymap.fdi" +openrc_services="hal default" +triggers="openrc-service" Add_dependency full glibc Add_dependency full udev @@ -33,11 +36,12 @@ Add_dependency full dmidecode Add_dependency build pkg-config Add_dependency build libsmbios Add_dependency run libsmbios-utils +Add_dependency run OpenRC post_install() { rm -rf ${DESTDIR}/var - install -D -m755 ${FILESDIR}/hal ${DESTDIR}/etc/rc.d/hal + install -D -m755 ${FILESDIR}/hal.rc ${DESTDIR}/etc/init.d/hal install -D -m644 ${FILESDIR}/10-keymap.fdi \ ${DESTDIR}/etc/hal/fdi/policy/10-keymap.fdi }