Merge branch 'runit-services'

All packages that had runit services are now providing them themselves.

common/environment/setup/install.sh

@@ -27,6 +27,15 @@ _vsv() {
 
 	vmkdir etc/sv
 	vcopy "${FILESDIR}/$service" etc/sv
+	chmod +x ${PKGDESTDIR}/etc/sv/${service}/run
+	if [ -r ${PKGDESTDIR}/etc/sv/${service}/finish ]; then
+		chmod +x ${PKGDESTDIR}/etc/sv/${service}/finish
+	fi
+	ln -s /run/runit/supervise.${service} ${PKGDESTDIR}/etc/sv/${service}/supervise
+	if [ -r ${PKGDESTDIR}/etc/sv/${service}/log/run ]; then
+		chmod +x ${PKGDESTDIR}/etc/sv/${service}/log/run
+		ln -s /run/runit/supervise.${service}-log ${PKGDESTDIR}/etc/sv/${service}/log/supervise
+	fi
 }
 
 _vbin() {

srcpkgs/NetworkManager/files/NetworkManager/run

@@ -0,0 +1,7 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+# Create required dirs
+[ ! -d /etc/NetworkManager/dispatcher.d ] && mkdir -m0755 -p /etc/NetworkManager/dispatcher.d
+[ ! -d /etc/NetworkManager/system-connections ] && mkdir -m0755 -p /etc/NetworkManager/system-connections
+[ ! -d /var/lib/NetworkManager ] && mkdir -m0700 -p /var/lib/NetworkManager
+exec NetworkManager -n

srcpkgs/NetworkManager/template

@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.10.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
@@ -30,7 +30,7 @@ makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
 lib32disabled=yes
 depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
+replaces="runit-void<20141013_2"
 
 # Package build options
 build_options="gir systemd"
@@ -50,6 +50,7 @@ if [ "$build_option_systemd" ]; then
 	configure_args+=" --with-session-tracking=systemd --with-suspend-resume=systemd"
 	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
 	makedepends+=" systemd-devel"
+	systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
 else
 	configure_args+=" --with-session-tracking=consolekit --with-suspend-resume=upower"
 fi
@@ -63,9 +64,12 @@ pre_configure() {
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
+	fi
 	# remove unused stuff
 	rm -rf ${DESTDIR}/etc/init.d
+	vsv ${pkgname}
 }
 
 libnm_package() {
@@ -78,7 +82,6 @@ libnm_package() {
 		fi
 	}
 }
-
 NetworkManager-devel_package() {
 	depends="dbus-glib-devel libnm-${version}_${revision}"
 	short_desc+=" - development files"

srcpkgs/acpid/files/acpid/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec acpid -f

srcpkgs/acpid/template

@@ -1,7 +1,8 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.23
-revision=1
+revision=2
+replaces="runit-void<20141013_2"
 build_style=gnu-configure
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
@@ -23,4 +24,5 @@ post_install() {
 	fi
 	vinstall ${FILESDIR}/handler.sh 755 etc/acpi
 	vinstall ${FILESDIR}/anything 644 etc/acpi/events
+	vsv acpid
 }

srcpkgs/alsa-utils/files/alsa/finish

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+exec alsactl store

srcpkgs/alsa-utils/files/alsa/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+alsactl restore
+exec chpst -b alsa pause

srcpkgs/alsa-utils/template

@@ -1,7 +1,8 @@
 # Template build file for 'alsa-utils'.
 pkgname=alsa-utils
 version=1.0.28
-revision=2
+revision=3
+replaces="runit-void<20141013_2"
 build_style=gnu-configure
 configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf"
 hostmakedepends="pkg-config xmlto"
@@ -25,4 +26,5 @@ post_install() {
 	# Install required udev rules file.
 	make -C alsactl 90-alsa-restore.rules
 	vinstall alsactl/90-alsa-restore.rules 644 usr/lib/udev/rules.d
+	vsv alsa
 }

srcpkgs/apache/files/apache/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+mkdir -p /run/httpd || exit 1
+chmod 0710 /run/httpd || exit 1
+chown root:httpd /run/httpd || exit 1
+exec httpd -DNO_DETACH

srcpkgs/apache/template

@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.10
-revision=2
+revision=3
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --enable-pie --enable-modules=all
@@ -44,6 +44,7 @@ license="Apache-2.0"
 distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a
 
+replaces="runit-void<20141013_2"
 system_accounts="httpd"
 httpd_descr="Apache HTTP server"
 httpd_homedir="/srv/httpd"
@@ -59,6 +60,9 @@ if [ "$build_option_systemd" ]; then
 fi
 
 pre_configure() {
+	# SSL_CTX_use_certificate_chain() conflicts with libressl-2.1.
+	sed -e 's,SSL_CTX_use_certificate_chain,_SSL_CTX_use_certificate_chain,g' -i modules/ssl/*.[ch]
+
         # set default user
 	sed -e 's#User daemon#User httpd#' \
 	    -e 's#Group daemon#Group httpd#' \
@@ -100,6 +104,8 @@ post_install() {
 		vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf
 	fi
 
+	vsv apache
+
 	rm -rf ${DESTDIR}/etc/httpd/original
 }
 

srcpkgs/atop/files/atop/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+mkdir -p /var/log/atop || exit 1
+exec atop -a -w /var/log/atop/atop_$(date +%Y%m%d) 600

srcpkgs/atop/template

@@ -2,8 +2,10 @@
 pkgname=atop
 version=2.0.2
 wrksrc=atop-${version}
-revision=2
+revision=3
 build_style=gnu-makefile
+build_options="systemd"
+replaces="runit-void<20141013_2"
 makedepends="ncurses-devel zlib-devel"
 short_desc="A system and process level monitor"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,11 +14,9 @@ homepage="http://www.atoptool.nl/"
 distfiles="http://www.atoptool.nl/download/$pkgname-$version.tar.gz"
 checksum=a620dbe0de7c7ee004949b201bed27559a8dd6cbdee651c7a3e15fc584723409
 
-build_options="systemd"
+pre_install() {
-if [ "$build_option_systemd" ]; then
+	sed -i '/chown/d' Makefile
-	systemd_services="atop.service true"
+}
-fi
-
 post_install() {
 	# Remove unused stuff.
 	rm -f ${DESTDIR}/usr/bin/atop{,sar}-2.0 
@@ -25,4 +25,5 @@ post_install() {
 		# systemd service
 		vinstall atop.service 644 usr/lib/systemd/system
 	fi
+	vsv atop
 }

srcpkgs/avahi/files/avahi-daemon/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+exec avahi-daemon -s

srcpkgs/avahi/template

@@ -1,7 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
-revision=17
+revision=18
 build_style=gnu-configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
  --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@@ -28,6 +28,7 @@ conf_files="
 	/etc/avahi/hosts
 	/etc/avahi/avahi-dnsconfd.action"
 system_accounts="avahi:23"
+replaces="runit-void<20141013_2"
 
 build_options="systemd"
 if [ "$build_option_systemd" ]; then
@@ -46,10 +47,10 @@ post_extract() {
 	# Switch to /run to not depend on /var/run being a symlink.
 	sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
 }
-
 post_install() {
 	# Enable 'disallow_other_stacks' option by default.
 	sed -e 's,\#\(disallow-other-stacks\).*,\1=yes,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
+	vsv avahi-daemon
 }
 
 avahi-autoipd_package() {
@@ -61,7 +62,6 @@ avahi-autoipd_package() {
 		vmove etc/avahi/avahi-autoipd.action
 	}
 }
-
 avahi-compat-libs-devel_package() {
 	depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
 	short_desc="Avahi compat libraries - development files"
@@ -72,7 +72,6 @@ avahi-compat-libs-devel_package() {
 		vmove usr/lib/libdns_sd.so
 	}
 }
-
 avahi-compat-libs_package() {
 	short_desc="Avahi compatiblity shared libraries"
 	pkg_install() {
@@ -80,7 +79,6 @@ avahi-compat-libs_package() {
 		vmove "usr/lib/libdns_sd.so.*"
 	}
 }
-
 avahi-libs-devel_package() {
 	depends="dbus-devel avahi-libs-${version}_${revision}"
 	short_desc="Avahi core libraries - development files"
@@ -95,7 +93,6 @@ avahi-libs-devel_package() {
 		vmove usr/lib/libavahi-common.so
 	}
 }
-
 avahi-libs_package() {
 	short_desc="Avahi shared libraries"
 	pkg_install() {
@@ -104,7 +101,6 @@ avahi-libs_package() {
 		vmove "usr/lib/libavahi-common.so.*"
 	}
 }
-
 avahi-utils_package() {
 	short_desc="Avahi browsing, publishing and discovery utilities"
 	pkg_install() {

srcpkgs/bind/files/named/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+mkdir -p /var/run/named || exit 1
+chown named:named /var/run/named || exit 1
+exec named -u named -f -c /etc/named/named.conf

srcpkgs/bind/template

@@ -4,7 +4,7 @@ _distver=9.9.5
 _patchver=P1
 version=${_distver}${_patchver}
 wrksrc=${pkgname}-${_distver}-${_patchver}
-revision=3
+revision=4
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
@@ -27,11 +27,8 @@ named_desc="BIND DNS server"
 named_homedir="/var/named"
 named_shell="/bin/false"
 make_dirs="/var/named 0770 root named"
-
 build_options="systemd"
-if [ "$build_option_systemd" ]; then
+replaces="runit-void<20141013_2"
-	systemd_services="named.service true"
-fi
 
 pre_configure() {
 	# disable bin tests for now.
@@ -44,6 +41,7 @@ post_install() {
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/named.service 644 usr/lib/systemd/system
 	fi
+	vsv named
 	vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
 	vinstall ${FILESDIR}/named.conf 640 etc/named
 
@@ -58,7 +56,6 @@ bind-libs_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 bind-utils_package() {
 	short_desc+=" - DNS utils"
 	pkg_install() {
@@ -68,7 +65,6 @@ bind-utils_package() {
 		done
 	}
 }
-
 bind-devel_package() {
 	depends="bind-libs>=${version}_${revision}"
 	short_desc+=" - development files"

srcpkgs/bluez/files/bluetoothd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null

srcpkgs/bluez/template

@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=5.24
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev
  --enable-pie --enable-threads --enable-library"
@@ -9,6 +9,7 @@ hostmakedepends="automake libtool pkg-config flex"
 makedepends="libglib-devel libudev-devel dbus-devel
  cups-devel libical-devel readline-devel>=6.3"
 conf_files="/etc/bluetooth/main.conf"
+replaces="runit-void<20141013_2"
 short_desc="Bluetooth tools and daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
@@ -32,6 +33,7 @@ pre_configure() {
 }
 post_install() {
 	vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
+	vsv bluetoothd
 }
 
 libbluetooth_package() {
@@ -40,7 +42,6 @@ libbluetooth_package() {
 		vmove "usr/lib/libbluetooth.so.*"
 	}
 }
-
 libbluetooth-devel_package() {
 	depends="libbluetooth>=${version}_${revision}"
 	short_desc="Development files to use the BlueZ Linux Bluetooth library"
@@ -50,7 +51,6 @@ libbluetooth-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 bluez-cups_package() {
 	short_desc="CUPS printer backend for Bluetooth printers"
 	pkg_install() {

srcpkgs/bumblebee/files/bumblebeed/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec bumblebeed --use-syslog

srcpkgs/bumblebee/template

@@ -1,7 +1,7 @@
 # Template file for 'bumblebee'
 pkgname=bumblebee
 version=3.2.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="
 	CONF_DRIVER_MODULE_NVIDIA=nvidia
@@ -26,13 +26,11 @@ distfiles="http://www.bumblebee-project.org/${pkgname}-${version}.tar.gz"
 checksum=1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e
 
 only_for_archs="i686 x86_64"
-
 build_options="systemd"
-if [ "$build_option_systemd" ]; then
+replaces="runit-void<20141013_2"
-	systemd_services="bumblebeed.service true"
-fi
 
 post_install() {
+	vsv bumblebeed
 	# Install systemd service
 	if [ "$build_option_systemd" ]; then
 		vinstall scripts/systemd/bumblebeed.service 644 usr/lib/systemd/system

srcpkgs/cntlm/files/cntlm/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec cntlm -f 2>&1

srcpkgs/cntlm/template

@@ -1,9 +1,9 @@
 # Template file for 'cntlm'
 pkgname=cntlm
 version=0.92.3
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="which"
+replaces="runit-void<20141013_2"
 conf_files="/etc/cntlm.conf"
 short_desc="NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
@@ -13,10 +13,13 @@ distfiles="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname%2
 checksum=9c3ad10924d43f7248df9ecd33cbc033afbd7ea8d9545de0d68a2782fed76298
 
 do_build() {
-	sed -i 's|/sbin|/bin|' Makefile
 	make CC=$CC ${makejobs}
 }
-
+do_install() {
-post_install() {
+	vbin cntlm
+	vman doc/cntlm.1
+	vsv cntlm
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/cntlm.service 644 usr/lib/systemd/system
+	fi
 }

srcpkgs/connman/files/connmand/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec connmand -n

srcpkgs/connman/template

@@ -19,10 +19,12 @@ distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz"
 checksum=7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a
 
 build_options="systemd"
+replaces="runit-void<20141013_2"
 
 post_install() {
 	# Install the client connmanctl.
 	vbin client/connmanctl
+	vsv connmand
 }
 
 connman-devel_package() {

srcpkgs/cronie/files/cronie/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec crond -n 2>&1

srcpkgs/cronie/template

@@ -1,11 +1,11 @@
 # Template file for 'cronie'
 pkgname=cronie
 version=1.4.12
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-inotify --without-selinux --with-pam
  --disable-anacron --localstatedir=/var --enable-pie --enable-relro"
-makedepends="pam-devel run-parts"
+makedepends="pam-devel"
 depends="run-parts"
 make_dirs="
 	/etc/cron.d 0755 root root
@@ -18,7 +18,6 @@ make_dirs="
 conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny"
 replaces="cron-daemon>=0"
 provides="cron-daemon-0_1"
-systemd_services="cronie.service on"
 short_desc="Runs specified programs at scheduled times"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://fedorahosted.org/cronie/"
@@ -27,12 +26,13 @@ distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz"
 checksum=0f5c9bf32f352599451c4ca0d6bc076d19e73ecfa5a90b34ecfe47c918c8bafd
 
 build_options="systemd"
+replaces="runit-void<20141013_2"
 
 post_install() {
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/cronie.service 644 usr/lib/systemd/system
 	fi
-
+	vsv cronie
 	vinstall ${FILESDIR}/crontab 644 etc
 	vinstall ${FILESDIR}/crond.pam 644 etc/pam.d crond
 

srcpkgs/cups/files/cupsd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec cupsd -f

srcpkgs/cups/template

@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
 version=1.7.5
-revision=2
+revision=3
 patch_args="-Np1"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -29,7 +29,7 @@ make_dirs="
 	/var/log/cups 		0750 root root
 	/var/spool/cups 	0755 root lp
 	/etc/cups/ssl 		0700 root lp"
-
+replaces="runit-void<20141013_2"
 
 # Package build options
 build_options="systemd"
@@ -93,6 +93,8 @@ do_install() {
 	# comment out all conversion rules which use any of the removed filters
 	perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \
 		${DESTDIR}/usr/share/cups/mime/mime.convs
+
+	vsv cupsd
 }
 
 libcups_package() {
@@ -105,7 +107,6 @@ libcups_package() {
 		vmove usr/share/man/man5/client.conf.5
 	}
 }
-
 cups-devel_package() {
 	depends="zlib-devel libcups>=${version}_${revision}"
 	short_desc+=" - development files"

srcpkgs/dbus/files/dbus/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
+dbus-uuidgen --ensure
+exec dbus-daemon --system --nofork --nopidfile

srcpkgs/dbus/template

@@ -2,7 +2,7 @@
 #
 pkgname=dbus
 version=1.8.8
-revision=1
+revision=2
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,6 +14,7 @@ create_wrksrc=yes
 hostmakedepends="pkg-config intltool gperf xmlto"
 makedepends="expat-devel libX11-devel libcap-devel"
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
+replaces="runit-void<20141013_2"
 
 # Create dbus:22 system account.
 system_accounts="dbus:22"
@@ -46,7 +47,6 @@ _dbus_bootstrap() {
 	make ${makejobs}
 	make install
 }
-
 _systemd_bootstrap() {
 	# Build a temporary systemd; we are only interested in libsystemd-login.
 	if [ ! -d ${wrksrc}/systemd-bootstrap ]; then
@@ -88,7 +88,6 @@ _systemd_bootstrap() {
 	cp -a ${wrksrc}/systemd-install/usr/lib/pkgconfig/libsystemd* \
 		${_systemddir}/lib/pkgconfig/
 }
-
 pre_configure() {
 	if [ "$build_option_systemd" ]; then
 		if [ ! -f ${wrksrc}/dbus_bootstrap_done ]; then
@@ -101,7 +100,6 @@ pre_configure() {
 		fi
 	fi
 }
-
 do_configure() {
 	cd ${wrksrc}/dbus-${version}
 
@@ -129,7 +127,6 @@ do_build() {
 	cd ${wrksrc}/dbus-${version}
 	make ${makejobs}
 }
-
 do_install() {
 	cd ${wrksrc}/dbus-${version}
 	make DESTDIR=${DESTDIR} install
@@ -140,6 +137,7 @@ do_install() {
 		rm -rf ${_systemddir}/include/systemd
 		rm -f ${_systemddir}/lib/libsystemd-*
 	fi
+	vsv dbus
 }
 
 dbus-devel_package() {
@@ -153,14 +151,12 @@ dbus-devel_package() {
 		vmove usr/share/doc
 	}
 }
-
 dbus-libs_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 dbus-x11_package() {
 	replaces="dbus<1.4.16_2"
 	short_desc+=" - X11 support"

srcpkgs/dcron/files/dcron/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p cron.notice

srcpkgs/dcron/files/dcron/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec crond -f 2>&1

srcpkgs/dcron/template

@@ -1,9 +1,9 @@
 # Template file for 'dcron'
 pkgname=dcron
 version=4.5
-revision=24
+revision=25
 conf_files="/var/spool/cron/root"
-replaces="cron-daemon>=0"
+replaces="cron-daemon>=0 runit-void<20141013_2"
 provides="cron-daemon-1_1"
 short_desc="Dillon's lightweight cron daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -45,4 +45,6 @@ do_install() {
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/dcron.service 644 usr/lib/systemd/system
 	fi
+
+	vsv dcron
 }

srcpkgs/dhcpcd/files/dhcpcd-eth0/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec dhcpcd -M -B eth0

srcpkgs/dhcpcd/files/dhcpcd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec dhcpcd -M -B

srcpkgs/dhcpcd/template

@@ -1,7 +1,8 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=6.5.0
-revision=1
+revision=2
+replaces="runit-void<20141013_2"
 lib32disabled=yes
 build_options="systemd"
 build_style=configure
@@ -22,4 +23,6 @@ post_install() {
 		vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system
 		vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system
 	fi
+	vsv dhcpcd
+	vsv dhcpcd-eth0
 }

srcpkgs/distcc/files/distccd/supervise

@@ -1 +0,0 @@
-/run/runit/supervise.distccd

srcpkgs/docker/files/docker/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t docker

srcpkgs/docker/files/docker/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -o 1048576 -p 1048576 docker -d 2>/dev/null

srcpkgs/docker/template

@@ -1,7 +1,7 @@
 # Template file for 'docker'
 pkgname=docker
 version=1.2.0
-revision=1
+revision=2
 hostmakedepends="git go>=1.2"
 makedepends="libbtrfs-devel sqlite-devel device-mapper-devel"
 short_desc="Easily create lightweight, portable, self-sufficient containers from any application"
@@ -13,6 +13,7 @@ system_groups="docker"
 # These are required at run-time.
 depends="iptables xz git"
 build_options="systemd"
+replaces="runit-void<20141013_2"
 nostrip=yes
 nocross=yes
 
@@ -33,4 +34,5 @@ do_install() {
 	if [ "$build_option_systemd" ]; then
 		vinstall contrib/init/systemd/docker.service 644 usr/lib/systemd/system
 	fi
+	vsv docker
 }

srcpkgs/dovecot/files/dovecot/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+install -d -m 0755 -o root -g root /var/run/dovecot
+exec dovecot -F

srcpkgs/dovecot/template

@@ -1,14 +1,14 @@
 # Template file for 'dovecot'
 pkgname=dovecot
 version=2.2.13
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-nss --with-pam --with-mysql --with-pgsql
  --with-sqlite --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-libcap --with-solr --with-docs
- --with-systemdsystemunitdir=/usr/lib/systemd/system"
+ $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)"
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -46,7 +46,8 @@ fi
 
 # For SSL support.
 depends="virtual?openssl"
-systemd_services="dovecot.service true"
+replaces="runit-void<20141013_2"
+build_options="systemd"
 system_accounts="dovecot dovenull"
 dovecot_homedir="/var/chroot"
 dovenull_homedir="/var/chroot"
@@ -93,6 +94,8 @@ post_install() {
 	# Remove development stuff.
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/share/aclocal
+
+	vsv dovecot
 }
 
 dovecot-plugin-ldap_package() {
@@ -105,7 +108,6 @@ dovecot-plugin-ldap_package() {
 		vmove etc/dovecot/conf.d/auth-ldap.conf.ext
 	}
 }
-
 dovecot-plugin-lucene_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - Full Text Search plugin (Lucene)"
@@ -114,7 +116,6 @@ dovecot-plugin-lucene_package() {
 		vmove usr/lib/dovecot/modules/lib21_fts_lucene_plugin.so
 	}
 }
-
 dovecot-plugin-mysql_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - MySQL plugin"
@@ -124,7 +125,6 @@ dovecot-plugin-mysql_package() {
 		vmove usr/lib/dovecot/modules/libdriver_mysql.so
 	}
 }
-
 dovecot-plugin-pgsql_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - PostgreSQL plugin"
@@ -134,7 +134,6 @@ dovecot-plugin-pgsql_package() {
 		vmove usr/lib/dovecot/modules/libdriver_pgsql.so
 	}
 }
-
 dovecot-plugin-sqlite_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - SQLite plugin"

srcpkgs/dropbear/files/dropbear/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec dropbear -F -R

srcpkgs/dropbear/template

@@ -1,24 +1,24 @@
 # Template file for 'dropbear'
 pkgname=dropbear
 version=2014.65
-revision=1
+revision=2
+build_options="systemd"
+replaces="runit-void<20141013_2"
 build_style="gnu-configure"
 configure_args="--sbindir=/usr/bin --enable-zlib"
 makedepends="zlib-devel"
 make_dirs="/etc/dropbear 0755 root root"
-short_desc="Small SSH server and client."
+short_desc="Small SSH server and client"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
 license="MIT"
 homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
 distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
 checksum=e20057aa7db0f9ea4efdcbfc6fc6b73a648b47b6ab6a01659472142b06f5f56c
 
-# Package build options
-build_options="systemd"
-
 post_install() {
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/dropbear.service 644 usr/lib/systemd/system/
 	fi
+	vsv dropbear
 	vlicense LICENSE
 }

srcpkgs/gdm/files/gdm/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+[ ! -d /run/gdm ] && mkdir -m0711 -p /run/gdm && chown root:gdm /run/gdm
+exec gdm

srcpkgs/gdm/template

@@ -1,18 +1,16 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static
  --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
  --with-screenshot-dir=/var/lib/gdm/greeter
- --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid
+ --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid"
- --with-systemdsystemunitdir=/usr/lib/systemd/system"
+hostmakedepends="pkg-config itstool intltool gnome-doc-utils"
-hostmakedepends="pkg-config itstool intltool which gnome-doc-utils"
+makedepends="glib-devel iso-codes
-makedepends="
  pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel
- libSM-devel libcanberra-devel xrdb dconf>=0.20 hicolor-icon-theme
+ libSM-devel libcanberra-devel dconf"
- xorg-server gnome-session>=3.12 gnome-settings-daemon>=3.12"
 conf_files="
 	/etc/gdm/custom.conf
 	/etc/pam.d/gdm
@@ -21,11 +19,11 @@ conf_files="
 	/etc/pam.d/gdm-password
 	/etc/pam.d/gdm-smartcard
 	/etc/pam.d/gdm-welcome"
+replaces="runit-void<20141013_2"
 # Create the 'gdm' system user/group.
 system_accounts="gdm"
 gdm_homedir="/var/lib/gdm"
-systemd_services="gdm.service off"
+depends="iso-codes xrdb xorg-server hicolor-icon-theme
-depends="xrdb xorg-server hicolor-icon-theme
  dconf>=0.20 gnome-session>=3.12 gnome-settings-daemon>=3.12"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -50,6 +48,7 @@ fi
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --with-systemd --enable-systemd-journal --with-initial-vt=1"
+	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
 	makedepends+=" systemd-devel"
 else
 	configure_args+=" --without-systemd --disable-systemd-journal --with-initial-vt=7"
@@ -61,8 +60,10 @@ post_install() {
 	for f in ${FILESDIR}/*.pam; do
 		vinstall ${f} 644 etc/pam.d ${f%.pam}
 	done
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/gdm.tmpfiles.d 644 usr/lib/tmpfiles.d gdm.conf
-
+	fi
+	vsv gdm
 	chmod 1770 ${DESTDIR}/var/log/gdm
 }
 
@@ -72,7 +73,6 @@ libgdm_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 gdm-devel_package() {
 	depends="libgdm>=${version}_${revision}"
 	short_desc+=" - development files"

srcpkgs/irqbalance/files/irqbalance/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec irqbalance -f

srcpkgs/irqbalance/template

@@ -1,11 +1,12 @@
 # Template file for 'irqbalance'
 pkgname=irqbalance
 version=1.0.7
-revision=2
+revision=3
+build_options="systemd"
+replaces="runit-void<20141013_2"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libglib-devel libcap-ng-devel libnuma-devel"
-systemd_services="irqbalance.service on"
 short_desc="Handholding your interrupts for power and performance"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,11 +14,12 @@ homepage="https://code.google.com/p/irqbalance/"
 distfiles="https://github.com/Irqbalance/irqbalance/archive/v${version}.tar.gz"
 checksum=8c3916780d254b74fb1c7ec22876d63ac01f1b32776d9204a604b73c8f591d2a
 
-
 pre_configure() {
 	autoreconf -fi
 }
-
 post_install() {
+	vsv ${pkgname}
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
+	fi
 }

srcpkgs/kde-workspace/files/kdm/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec kdm -nodaemon

srcpkgs/kde-workspace/template

@@ -3,7 +3,7 @@ _kdeversion=4.13.3
 
 pkgname=kde-workspace
 version=4.11.11
-revision=1
+revision=2
 short_desc="Provides the interface and basic tools for the KDE workspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL, LGPL, FDL"
@@ -33,6 +33,7 @@ conf_files="
 	/etc/pam.d/kde-np.pam
 	/etc/pam.d/kde.pam
 	/etc/pam.d/kscreensaver.pam"
+replaces="runit-void<20141013_2"
 system_accounts="kdm"
 kdm_homedir="/var/lib/kdm"
 make_dirs="
@@ -59,8 +60,10 @@ post_install() {
 	for f in kde kde-np kscreensaver; do
 		install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f}
 	done
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system
-
+	fi
+	vsv kdm
 	vmkdir usr/share/xsessions
 	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
 		${DESTDIR}/usr/share/xsessions
@@ -78,7 +81,6 @@ kde-workspace-devel_package() {
 		vmove usr/share/apps/cmake
 	}
 }
-
 kde-python_package() {
 	short_desc+=" - Python 2 bindings"
 	pycompile_module="PyKDE4"

srcpkgs/lightdm/files/lightdm/run

@@ -0,0 +1,6 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+[ ! -d /run/lightdm ] && mkdir -p /run/lightdm
+chmod 0711 /run/lightdm
+chown lightdm:lightdm /run/lightdm
+exec lightdm

srcpkgs/lightdm/template

@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.10.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
  --with-greeter-user=lightdm --disable-static --disable-tests"
@@ -24,9 +24,9 @@ conf_files="
 	/etc/pam.d/lightdm
 	/etc/pam.d/lightdm-greeter
 	/etc/pam.d/lightdm-autologin"
+replaces="runit-void<20141013_2"
 system_accounts="lightdm"
 lightdm_homedir="/var/lib/lightdm"
-systemd_services="lightdm.service off"
 make_dirs="
  /var/lib/lightdm 0755 lightdm lightdm
  /var/lib/lightdm-data 0755 lightdm lightdm"
@@ -37,8 +37,11 @@ build_options_default="upower"
 post_install() {
 	# Remove provided init file and use our own.
 	rm -rf ${DESTDIR}/etc/init
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system
 		vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf
+	fi
+	vsv lightdm
 	vinstall ${FILESDIR}/lightdm.rules 644 usr/share/polkit-1/rules.d
 	vinstall ${FILESDIR}/xsession 755 etc/lightdm Xsession
 	# make pam_systemd optional
@@ -55,14 +58,12 @@ liblightdm-gobject_package() {
 		vmove usr/lib/girepository-1.0
 	}
 }
-
 liblightdm-qt_package() {
 	short_desc+=" - QT support library"
 	pkg_install() {
 		vmove "usr/lib/liblightdm-qt*.so.*"
 	}
 }
-
 lightdm-devel_package() {
 	depends="libglib-devel liblightdm-gobject>=${version}_${revision}
 		liblightdm-qt>=${version}_${revision}"

srcpkgs/lighttpd/files/lighttpd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf

srcpkgs/lighttpd/template

@@ -1,16 +1,14 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.35
-revision=4
+revision=5
 makedepends="libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel"
-hostmakedepends="automake pkg-config pcre-devel libtool which"
+hostmakedepends="automake pkg-config pcre-devel libtool"
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="lighttpd"
 lighttpd_homedir="/var/tmp/lighttpd"
+replaces="runit-void<20141013_2"
 build_options="systemd"
-if [ "$build_option_systemd" ]; then
-	systemd_services="lighttpd.service on"
-fi
 make_dirs="
 	/srv/www 0755 root root
 	/var/log/lighttpd 0750 lighttpd lighttpd"
@@ -46,6 +44,7 @@ pre_configure() {
 	autoreconf -fi
 }
 post_install() {
+	vsv lighttpd
 	vinstall ${FILESDIR}/lighttpd.conf 644 etc/lighttpd
 	# Install systemd services
 	if [ "$build_option_systemd" ]; then

srcpkgs/linux-tools/files/usbipd/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+modprobe -q usbip || exit 1
+exec usbipd

srcpkgs/linux-tools/template

@@ -1,7 +1,7 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=3.16
-revision=2
+revision=3
 wrksrc="linux-${version}"
 short_desc="Linux kernel tools meta-pkg"
 hostmakedepends="flex perl>=5.20 asciidoc xmlto python automake libtool"
@@ -24,6 +24,7 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the
 fi
 
 nocross=yes
+build_options="systemd"
 
 do_build() {
 	cd ${wrksrc}/tools/perf
@@ -80,7 +81,6 @@ do_install() {
 	vmkdir usr/lib/modules-load.d
 	printf 'usbip-core\nusbip-host\n' > \
 		${DESTDIR}/usr/lib/modules-load.d/usbip.conf
-	vinstall ${FILESDIR}/usbipd.service 644 usr/lib/systemd/system
 
 	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		# x86_energy_perf_policy
@@ -158,14 +158,16 @@ x86_energy_perf_policy_package() {
 		vmove usr/share/man/man8/x86_energy_perf_policy.8
 	}
 }
-
 usbip_package() {
 	short_desc="An USB device sharing system over IP network"
-	systemd_services="usbipd.service"
+	replaces="runit-void<20141013_2"
 	pkg_install() {
 		vmove "usr/bin/usbip*"
 		vmove "usr/share/man/man8/usbip*"
 		vmove usr/lib/modules-load.d/usbip.conf
-		vmove usr/lib/systemd/system/usbipd.service
+		vsv usbipd
+		if [ "$build_option_systemd" ]; then
+			vinstall ${FILESDIR}/usbipd.service 644 usr/lib/systemd/system
+		fi
 	}
 }

srcpkgs/lxdm/files/lxdm/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec lxdm

srcpkgs/lxdm/template

@@ -1,7 +1,7 @@
 # Template file for 'lxdm'
 pkgname=lxdm
 version=0.5.0
-revision=2
+revision=3
 build_style=gnu-configure
 build_options="consolekit"
 build_options_default="consolekit"
@@ -18,6 +18,7 @@ conf_files="
 	/etc/lxdm/Xsession
 	/etc/lxdm/lxdm.conf
 	/etc/pam.d/lxdm"
+replaces="runit-void<20141013_2"
 system_groups="lxdm"
 short_desc="GUI login manager for LXDE"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -27,6 +28,7 @@ distfiles="${SOURCEFORGE_SITE}/lxdm/lxdm-${version}.tar.xz"
 checksum=6e876fe8cc52341f3f55c54517da1c6dcf794aa11caffbf5a929ded442a949d4
 
 post_install() {
+	vsv lxdm
 	# Use our own pam file.
 	rm -f ${DESTDIR}/etc/pam.d/lxdm
 	vinstall ${FILESDIR}/lxdm.pam 644 etc/pam.d lxdm

srcpkgs/mdadm/files/mdadm/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+# --syslog makes it run in every case, yet forwards to mail address if given.
+exec mdadm --monitor --scan --syslog

srcpkgs/mdadm/template

@@ -1,10 +1,11 @@
 # Template file for 'mdadm'
 pkgname=mdadm
 version=3.3.2
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="libudev-devel"
+replaces="runit-void<20141013_2"
 short_desc="A tool for managing/monitoring Linux md device arrays"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
@@ -16,4 +17,5 @@ do_install() {
     make CC=$CC BINDIR=/usr/sbin STRIP= PREFIX=/usr \
 	SYSTEMD_DIR=/usr/lib/systemd/system DESTDIR=${DESTDIR} install install-systemd
     vsconf mdadm.conf-example mdadm.conf
+    vsv mdadm
 }

srcpkgs/mpd/files/mpd/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+install -d -m 0755 -o mpd -g mpd /run/mpd
+exec mpd --no-daemon

srcpkgs/mpd/template

@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.19
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-opus --enable-mikmod
  --enable-soundcloud --enable-pipe-output --disable-twolame-encoder
@@ -21,6 +21,7 @@ conf_files="/etc/mpd.conf"
 system_accounts="mpd"
 mpd_homedir="/var/lib/mpd"
 make_dirs="/var/lib/mpd/playlists 0755 mpd mpd"
+replaces="runit-void<20141013_2"
 short_desc="Flexible, powerful, server-side application for playing music"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -43,7 +44,6 @@ fi
 pre_configure() {
 	sed -i '/^doc_DATA =/s,doc/mpdconf.example,,' Makefile.in
 }
-
 post_install() {
 	vconf doc/mpdconf.example mpd.conf
 	vsconf doc/mpdconf.example
@@ -55,6 +55,8 @@ post_install() {
 		-e '/^#user/c user "mpd"' \
 		-i ${DESTDIR}/etc/mpd.conf
 
+	vsv mpd
+
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf
 		install -Dm644 ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service

srcpkgs/mysql/files/mysqld/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.notice

srcpkgs/mysql/files/mysqld/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d /run/mysqld ] && mkdir -p /run/mysqld
+chown mysql:mysql /run/mysqld
+exec chpst -u mysql:mysql mysqld --user=mysql 2>&1

srcpkgs/mysql/template

@@ -1,7 +1,7 @@
 # Template file for 'mysql'
 pkgname=mysql
 version=5.6.20
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -20,11 +20,11 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
 lib32disabled=yes
 hostmakedepends="perl cmake bison ncurses-devel"
 makedepends="zlib-devel ncurses-devel libressl-devel readline-devel"
-depends="shadow mysql-client"
+depends="mysql-client"
 conf_files="/etc/mysql/my.cnf"
-systemd_services="mysqld.service on"
 system_accounts="mysql"
-mysqld_homedir="/var/lib/mysql"
+mysql_homedir="/var/lib/mysql"
+replaces="runit-void<20141013_2"
 short_desc="The world's most popular open source database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://www.mysql.com/products/community/"
@@ -49,7 +49,6 @@ pre_configure() {
 		rm CMakeCache.txt
 	fi
 }
-
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		cp bin.host/comp_err ${wrksrc}/extra
@@ -59,7 +58,6 @@ pre_build() {
 		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql:${wrksrc}/storage/perfschema
 	fi
 }
-
 post_install() {
 	# Remove unneeded stuff.
 	rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data}
@@ -69,9 +67,13 @@ post_install() {
 	vinstall ${FILESDIR}/my.cnf 640 etc/mysql
 
 	# systemd service.
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
 		vinstall ${FILESDIR}/mysqld-post 755 usr/bin
 		vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf
+	fi
+	# runit service
+	vsv mysqld
 }
 
 libmysqlclient_package() {
@@ -80,7 +82,6 @@ libmysqlclient_package() {
 		vmove "usr/lib/libmysqlclient*.so.*"
 	}
 }
-
 libmysqlclient-devel_package() {
 	depends="libmysqlclient>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -92,7 +93,6 @@ libmysqlclient-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 mysql-client_package() {
 	depends="perl"
 	short_desc+=" - database client binaries"

srcpkgs/network-ups-tools/files/upsd/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Network UPS Tools - information server
+# upsmon will run in the foreground and prints information on stdout
+exec upsd -D

srcpkgs/network-ups-tools/files/upsdrvctl/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Network UPS Tools - driver controller
+exec upsdrvctl -D start

srcpkgs/network-ups-tools/files/upsmon/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Network UPS Tools - monitor and shutdown controller
+# upsmon will run in the foreground and prints information on stdout
+exec upsmon -D

srcpkgs/network-ups-tools/template

@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin --sysconfdir=/etc/ups --without-doc --disable-static
@@ -11,6 +11,7 @@ configure_args="
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel"
 system_accounts="nut"
+replaces="runit-void<20141013_2"
 conf_files="
 	/etc/ups/ups.conf
 	/etc/ups/upsd.users
@@ -44,6 +45,11 @@ post_install() {
 		mv ${DESTDIR}/etc/ups/${f}.conf{.sample,}
 	done
 	mv ${DESTDIR}/etc/ups/upsd.users{.sample,}
+
+	# runit services
+	vsv upsd
+	vsv upsmon
+	vsv upsdrvctl
 }
 
 libnetwork-ups-tools_package() {
@@ -52,7 +58,6 @@ libnetwork-ups-tools_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 network-ups-tools-devel_package() {
 	short_desc+=" - development files"
 	depends="lib${sourcepkg}>=${version}_${revision}"

srcpkgs/nfs-utils/files/nfs-server/finish

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+umount -l /proc/fs/nfsd
+umount -l /var/lib/nfs/rpc_pipefs
+/usr/sbin/rpc.nfsd -- 0
+/usr/sbin/exportfs -a -u

srcpkgs/nfs-utils/files/nfs-server/run

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Make sure the statd service is running.
+sv check statd >/dev/null || exit 1
+
+# Get the nfs service parameters from the LFS standard file
+# this sets some envars.
+if [ -e /etc/conf.d/nfs-server.conf ]; then
+	. /etc/conf.d/nfs-server.conf
+fi
+
+modprobe sunrpc || exit 1
+modprobe nfs || exit 1
+modprobe nfsd || exit 1
+if ! mountpoint -q /var/lib/nfs/rpc_pipefs; then
+	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs -o defaults || exit 1
+fi
+
+# Uncomment this and add the two daemons if you need kerberos support.
+# sv check idmapd gssd >/dev/null || exit 1
+
+if ! mountpoint -q /proc/fs/nfsd; then
+	mount -t nfsd nfsd /proc/fs/nfsd || exit 1
+fi
+exportfs -ra > /dev/null || exit 1
+rpc.nfsd -- $PROCESSES || exit 1
+
+exec rpc.mountd --foreground

srcpkgs/nfs-utils/files/statd/run

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Make sure the portmap service is running.
+sv check rpcbind >/dev/null || exit 1
+
+exec rpc.statd -F -d

srcpkgs/nfs-utils/template

@@ -1,7 +1,7 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
 version=1.3.1
-revision=1
+revision=2
 short_desc="Network File System client utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,6 +16,7 @@ makedepends="libblkid-devel libmount-devel libtirpc-devel
  libblkid-devel sqlite-devel"
 depends="rpcbind"
 conf_files="/etc/idmapd.conf"
+replaces="runit-void<20141013_2"
 make_dirs="
 	/var/lib/nfs/rpc_pipefs	0755	root	root
 	/var/lib/nfs/sm		0750	root	root"
@@ -35,15 +36,15 @@ do_configure() {
 do_build() {
 	make ${makejobs}
 }
-
 do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	vmkdir usr/sbin
 	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
 	# conffiles
-	vinstall ${FILESDIR}/exports 644 etc
+	vconf ${FILESDIR}/exports
-	vinstall ${FILESDIR}/idmapd.conf 644 etc
+	vconf ${FILESDIR}/idmapd.conf
+	vsv statd
 	# systemd glue
 	if [ "$build_option_systemd" ]; then
 		vmkdir usr/lib/systemd/system
@@ -56,7 +57,7 @@ do_install() {
 nfs-utils-server_package() {
 	short_desc="Network File System utilities - Server utilities"
 	depends="rpcbind"
-	replaces="nfs-utils<1.2.6_2"
+	replaces="runit-void<20141013_2"
 	conf_files="/etc/exports"
 	make_dirs="
 		/var/lib/nfs/v4recovery 	0755    root    root
@@ -80,5 +81,7 @@ nfs-utils-server_package() {
 			done
 			vmove usr/lib/systemd/system/proc-fs-nfsd.mount
 		fi
+		# runit services
+		vsv nfs-server
 	}
 }

srcpkgs/nginx/files/nginx/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec nginx -g 'daemon off;'

srcpkgs/nginx/template

@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.6.2
-revision=1
+revision=2
 makedepends="pcre-devel>=8.30 libressl-devel"
 if [ "$CROSS_BUILD" ]; then
 	# fake configure run on host
@@ -31,9 +31,7 @@ distfiles="http://nginx.org/download/nginx-$version.tar.gz"
 checksum=b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18
 
 build_options="systemd"
-if [ "$build_option_systemd" ]; then
+replaces="runit-void<20141013_2"
-	systemd_services="nginx.service on"
-fi
 
 do_configure() {
 	local cfgdir=/etc/nginx
@@ -77,7 +75,6 @@ do_configure() {
 do_build() {
 	make ${makejobs} CC="${CC}" LD="${LD}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
-
 do_install() {
 	make DESTDIR=$DESTDIR install
 
@@ -90,7 +87,9 @@ do_install() {
 	vmkdir usr/share/nginx
 	mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx
 
-	vinstall LICENSE 644 usr/share/licenses/nginx
+	vlicense LICENSE
+	vsv nginx
+
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system
 	fi

srcpkgs/ngircd/files/ngircd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ngircd -n

srcpkgs/ngircd/template

@@ -1,8 +1,10 @@
 # Template build file for 'ngircd'
 pkgname=ngircd
 version=21.1
-revision=3
+revision=4
 build_style=gnu-configure
+build_options="systemd"
+replaces="runit-void<20141013_2"
 configure_args="--enable-ipv6 --with-openssl --without-ident"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libressl-devel"
@@ -18,5 +20,8 @@ post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h
 }
 post_install() {
+	vsv ngircd
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
+	fi
 }

srcpkgs/ntp/files/ntpd/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.notice

srcpkgs/ntp/files/ntpd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ntpd -g -u ntpd:ntpd -n

srcpkgs/ntp/template

@@ -1,7 +1,7 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.7p476
-revision=2
+revision=3
 wrksrc="ntp-dev-${version}"
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6
@@ -20,8 +20,7 @@ conf_files="/etc/ntp.conf"
 system_accounts="ntpd"
 ntpd_homedir="/var/db/ntpd"
 provides="ntp-daemon-0_1"
-replaces="ntp-daemon>=0"
+replaces="runit-void<20141013_2 ntp-daemon>=0"
-
 build_options="systemd"
 
 post_install() {
@@ -36,6 +35,7 @@ post_install() {
 		echo "ntpd.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/60-ntp.list
 	fi
 	vconf ${FILESDIR}/ntp.conf
+	vsv ntpd
 	rm -r ${DESTDIR}/usr/share/doc
 }
 

srcpkgs/opensmtpd/files/opensmtpd/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p mail.notice

srcpkgs/opensmtpd/files/opensmtpd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec smtpd -d 2>&1

srcpkgs/opensmtpd/template

@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=5.4.2p1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-maildir=/var/spool/mail --with-privsep-path=/var/db
@@ -13,10 +13,11 @@ makedepends="zlib-devel libressl-devel libevent-devel db-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 system_accounts="smtpd smtpq"
-systemd_services="smtpd.socket on"
+smtpd_homedir="/var/spool/mail"
 smtpq_homedir="/var/spool/mail"
+build_options="systemd"
 provides="smtp-forwarder-0_1 smtp-server-0_1"
-replaces="smtp-forwarder>=0 smtp-server>=0"
+replaces="runit-void<20141013_2 smtp-forwarder>=0 smtp-server>=0"
 short_desc="Free implementation of the server-side SMTP protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD, ISC, MIT"
@@ -34,13 +35,16 @@ pre_configure() {
 	sed -e 's,^\(libevent_major_version\)=.*$,\1=2,' -i configure
 	sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf
 }
-
 post_install() {
-	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+	vsv opensmtpd
-	vinstall ${FILESDIR}/smtpd.service 644 usr/lib/systemd/system
+	vlicense LICENSE
-	vinstall ${FILESDIR}/smtpd.socket 644 usr/lib/systemd/system
 	vinstall /dev/null 644 etc/smtpd aliases
 
 	vmkdir usr/sbin
 	ln -s /usr/bin/sendmail ${DESTDIR}/usr/sbin/sendmail
+
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/smtpd.service 644 usr/lib/systemd/system
+		vinstall ${FILESDIR}/smtpd.socket 644 usr/lib/systemd/system
+	fi
 }

srcpkgs/openssh/files/sshd/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+ssh-keygen -A # Will generate host keys if they don't already exist
+exec /usr/sbin/sshd -D

srcpkgs/openssh/template

@@ -3,7 +3,7 @@ _desc="The OpenSSH implementation of SSH protocol"
 
 pkgname=openssh
 version=6.7p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -58,6 +58,7 @@ post_install() {
 openssh-server_package() {
 	conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 	make_dirs="/var/chroot/ssh 0755 root root"
+	replaces="runit-void<20141013_2"
 	depends="openssh>=$version"
 	short_desc="${_desc} - server"
 	pkg_install() {
@@ -74,5 +75,6 @@ openssh-server_package() {
 			install -m644 ${FILESDIR}/*.{socket,service} \
 				${PKGDESTDIR}/usr/lib/systemd/system
 		fi
+		vsv sshd
 	}
 }

srcpkgs/pcsclite/files/pcscd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec pcscd -f

srcpkgs/pcsclite/template

@@ -1,13 +1,13 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
 version=1.8.11
-revision=6
+revision=7
 build_style=gnu-configure
 maintainer="Carlo Dormeletti <carlo.dormeletti@email.it>"
 homepage="https://alioth.debian.org/projects/pcsclite"
 license="Modified BSD"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
-configure_args="--enable-libudev "
+configure_args="--enable-libudev"
 hostmakedepends="intltool pkg-config python"
 makedepends="libudev-devel libusb-devel python-devel"
 depends="python"
@@ -15,6 +15,11 @@ distfiles="https://alioth.debian.org/frs/download.php/file/3991/${pkgname}-${ver
 checksum="945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6"
 wrksrc="pcsc-lite-${version}"
 conf_files="/etc/reader.conf"
+replaces="runit-void<20141013_2"
+
+post_install() {
+    vsv pcscd
+}
 
 pcsclite-devel_package() {
     short_desc+=" - development files"
@@ -26,7 +31,6 @@ pcsclite-devel_package() {
         vmove "usr/lib/*.so"
     }
 }
-
 libpcsclite_package() {
     short_desc+=" - library files"
     pkg_install() {

srcpkgs/polipo/files/polipo/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u nobody polipo

srcpkgs/polipo/template

@@ -1,7 +1,9 @@
 # Template file for 'polipo'
 pkgname=polipo
 version=1.1.1
-revision=2
+revision=3
+build_options="systemd"
+replaces="runit-void<20141013_2"
 short_desc="A small and fast caching web proxy"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -9,15 +11,9 @@ homepage="http://www.pps.jussieu.fr/~jch/software/polipo/"
 distfiles="http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/polipo-${version}.tar.gz"
 checksum=a259750793ab79c491d05fcee5a917faf7d9030fb5d15e05b3704e9c9e4ee015
 
-build_options="systemd"
-if [ "$build_option_systemd" ]; then
-	systemd_services="polipo.service on"
-fi
-
 do_build() {
 	make CFLAGS="$CFLAGS" ${makejobs}
 }
-
 do_install() {
 	make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man \
 		INFODIR=${DESTDIR}/usr/share/info \
@@ -31,4 +27,5 @@ do_install() {
 		# systemd service
 		vinstall ${FILESDIR}/polipo.service 644 usr/lib/systemd/system
 	fi
+	vsv polipo
 }

srcpkgs/postfix/files/postfix/run

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+daemon_directory=/usr/libexec/postfix \
+data_directory=/var/lib/postfix \
+command_directory=/usr/bin \
+config_directory=/etc/postfix \
+queue_directory=/var/spool/postfix \
+mail_owner=postfix \
+setgid_group=postdrop \
+/usr/libexec/postfix/postfix-script check || exit 1
+
+exec /usr/libexec/postfix/master -d

srcpkgs/postfix/template

@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=2.11.1
-revision=4
+revision=5
 short_desc="High-performance mail transport agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="IBM Public License 1.0, BSD-alike"
@@ -29,12 +29,12 @@ conf_files="
 	/etc/postfix/relocated
 	/etc/postfix/transport
 	/etc/postfix/virtual"
-systemd_services="postfix.service true"
+build_options="systemd"
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
 system_groups="postdrop"
 provides="smtp-server-0_1"
-replaces="smtp-server>=0"
+replaces="smtp-server>=0 runit-void<20141013_2"
 make_dirs="
 	/var/lib/postfix		0700	postfix	root
 	/var/spool/postfix/active	0700	postfix	root
@@ -81,13 +81,11 @@ do_build() {
 	fi
 	make ${makejobs}
 }
-
 pre_install() {
 	if [ "$CROSS_BUILD" ]; then
 		sed -e 's,bin/postconf,/usr/bin/postconf,g' -i postfix-install
 	fi
 }
-
 do_install() {
 	sh postfix-install -non-interactive install_root=${DESTDIR}
 	vmkdir usr/sbin
@@ -99,6 +97,9 @@ do_install() {
 	cd $DESTDIR
 	patch -p0 -i ${FILESDIR}/aliases.patch
 
-	# systemd.
+	# systemd
+	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system
+	fi
+	vsv postfix
 }

srcpkgs/postgresql/files/postgresql/log/supervise

@@ -1 +0,0 @@
-/run/runit/supervise.postgresql-log

srcpkgs/postgresql/files/postgresql/supervise

@@ -1 +0,0 @@
-/run/runit/supervise.postgresql

srcpkgs/radvd/files/radvd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec radvd --nodaemon --logmethod=syslog

srcpkgs/radvd/template

@@ -1,11 +1,12 @@
 # Template file for 'radvd'
 pkgname=radvd
 version=2.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config bison flex"
+hostmakedepends="pkg-config flex"
 makedepends="check-devel libdaemon-devel"
 conf_files="/etc/radvd.conf"
+replaces="runit-void<20141013_2"
 short_desc="IPv6 Router Advertisement Daemon"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="custom"
@@ -14,6 +15,7 @@ distfiles="http://www.litech.org/radvd/dist/${pkgname}-${version}.tar.xz"
 checksum=0a1041b2044dafa45882b9fc30badadb7abed76c1a20f6332fecaa53c8440df9
 
 post_install() {
-    vinstall radvd.conf.example 644 etc radvd.conf
+    vsv radvd
+    vconf radvd.conf.example radvd.conf
     vlicense COPYRIGHT LICENSE
 }

srcpkgs/redis/files/redis/supervise

@@ -1 +0,0 @@
-/run/runit/supervise.redis

srcpkgs/rpcbind/files/rpcbind/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec rpcbind -f

srcpkgs/rpcbind/template

@@ -1,12 +1,11 @@
 # Template file for 'rpcbind'
 pkgname=rpcbind
 version=0.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc"
 hostmakedepends="pkg-config"
 makedepends="libtirpc-devel"
-system_accounts="rpc"
 short_desc="Converts RPC program numbers into universal addresses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://rpcbind.sourceforge.net"
@@ -15,11 +14,11 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e
 
 build_options="systemd"
-if [ "$build_option_systemd" ]; then
+system_accounts="rpc"
-	systemd_services="${pkgname}.service on"
+replaces="runit-void<20141013_2"
-fi
 
 post_install() {
+	vsv rpcbind
 	vinstall man/rpcbind.8 644 usr/share/man/man8
 	vinstall man/rpcinfo.8 644 usr/share/man/man8
 	if [ "$build_option_systemd" ]; then

srcpkgs/rsyslog/files/rsyslogd/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec rsyslogd -n

srcpkgs/rsyslog/template

@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gnutls --enable-mysql --enable-pgsql
  --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5
@@ -25,9 +25,8 @@ makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel
  libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9
  libee-devel>=0.4.1 liblogging-devel>=1.0.3"
 conf_files="/etc/rsyslog.conf"
-systemd_services="rsyslog.service on"
 provides="syslog-daemon-0_1"
-replaces="syslog-daemon>=0"
+replaces="runit-void<20141013_2 syslog-daemon>=0"
 make_dirs="/etc/rsyslog.d 0755 root root"
 
 if [ "$CROSS_BUILD" ]; then
@@ -45,14 +44,15 @@ build_options="systemd"
 
 if [ "$build_option_systemd" ]; then
 	makedepends+=" systemd-devel"
+	systemd_services="rsyslog.service on"
 fi
 
 post_configure() {
 	echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile
 }
-
 post_install() {
-	vinstall ${FILESDIR}/rsyslog.conf 644 etc
+	vsv rsyslogd
+	vconf ${FILESDIR}/rsyslog.conf
 }
 
 rsyslog-gssapi_package() {
@@ -63,7 +63,6 @@ rsyslog-gssapi_package() {
 		vmove "usr/lib/rsyslog/*gss*.so"
 	}
 }
-
 rsyslog-gnutls_package() {
 	lib32disabled=yes
 	depends="rsyslog"
@@ -72,7 +71,6 @@ rsyslog-gnutls_package() {
 		vmove "usr/lib/rsyslog/*gtls*"
 	}
 }
-
 rsyslog-mysql_package() {
 	lib32disabled=yes
 	depends="rsyslog"
@@ -81,7 +79,6 @@ rsyslog-mysql_package() {
 		vmove usr/lib/rsyslog/ommysql.so
 	}
 }
-
 rsyslog-postgresql_package() {
 	lib32disabled=yes
 	depends="rsyslog"