From 6f315dcf6d923ef22e6aecbe3c57c2489b166cd9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 2 Jun 2015 12:30:40 +0200
Subject: [PATCH] runit-void: move to usr/bin.

---
 srcpkgs/runit-void/INSTALL  | 6 ++++++
 srcpkgs/runit-void/template | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runit-void/INSTALL b/srcpkgs/runit-void/INSTALL
index 276bf80d350..5a998f22549 100644
--- a/srcpkgs/runit-void/INSTALL
+++ b/srcpkgs/runit-void/INSTALL
@@ -15,5 +15,11 @@ post)
 		[ -e /etc/sv/agetty-tty${f}/down ] || ln -sf /etc/sv/agetty-tty$f etc/runit/runsvdir/default
 	done
 	[ -e etc/sv/udevd/run ] && ln -sf /etc/sv/udevd etc/runit/runsvdir/default
+
+	if [ -d usr/sbin -a ! -L usr/sbin ]; then
+		for f in init shutdown halt reboot poweroff; do
+			ln -sr ../bin/$f usr/sbin/$f
+		done
+	fi
 	;;
 esac
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index d8509af4d42..0b08ea9e856 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20150602.1
-revision=1
+revision=2
 wrksrc="void-runit-${version}"
 build_pie=yes
 build_style=gnu-makefile
@@ -28,6 +28,8 @@ make_dirs="
  /etc/zzz.d/resume 0755 root root"
 
 post_install() {
+	vmkdir usr/bin
+	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${XBPS_SRCPKGDIR}/systemd/files/hostname
 	vconf ${XBPS_SRCPKGDIR}/systemd/files/os-release
 	vconf ${XBPS_SRCPKGDIR}/systemd/files/locale.conf
@@ -35,5 +37,5 @@ post_install() {
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/single
-	ln -s /usr/bin/runit-init ${DESTDIR}/usr/sbin/init
+	ln -s /usr/bin/runit-init ${DESTDIR}/usr/bin/init
 }