From 341f949fcda0a38c799e7131aad2397b4cc062fb Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 28 Oct 2014 09:54:00 +0100
Subject: [PATCH] base-system: add systemd build option (off) to replace
 base-system-systemd.

---
 srcpkgs/base-system-systemd/template | 26 --------------------------
 srcpkgs/base-system/template         | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/base-system-systemd/template

diff --git a/srcpkgs/base-system-systemd/template b/srcpkgs/base-system-systemd/template
deleted file mode 100644
index 501b12ebf6e..00000000000
--- a/srcpkgs/base-system-systemd/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'base-system-systemd'
-pkgname=base-system-systemd
-version=0.93
-revision=1
-build_style=meta
-homepage="http://www.voidlinux.eu/"
-short_desc="Void Linux base system meta package"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="Public domain"
-
-provides="base-system-${version}_${revision}"
-replaces="base-system>=0"
-
-makedepends="gcc glibc"
-depends="
- base-files>=0.77 ncurses coreutils findutils glibc-locales diffutils
- dash bash grep gzip file sed awk less util-linux which tar man-pages
- man shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd
- psmisc procps-ng tzdata pciutils iana-etc systemd openssh dhcpcd iproute2 iputils
- iw wpa_supplicant xbps nvi sudo wifi-firmware void-artwork traceroute ethtool
- kmod"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686) depends+=" linux";;
-	x86_64) depends+=" linux";;
-esac
diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index 9235d5cd0b5..0f7909a3a45 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -1,6 +1,6 @@
 # Template file for 'base-system'
 pkgname=base-system
-version=0.95
+version=0.96
 revision=1
 build_style=meta
 homepage="http://www.voidlinux.eu/"
@@ -8,23 +8,26 @@ short_desc="Void Linux base system meta package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
 
-replaces="base-system-runit>=0"
-
 depends="
  base-files>=0.77 ncurses coreutils findutils glibc-locales diffutils
  dash bash grep gzip file sed awk less util-linux which tar man-pages
  man shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools
- psmisc procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd
+ psmisc procps-ng tzdata pciutils iana-etc openssh dhcpcd
  kbd iproute2 iputils iw wpa_supplicant xbps nvi sudo wifi-firmware
- void-artwork traceroute ethtool kmod"
+ void-artwork traceroute ethtool kmod
+ $(vopt_if systemd systemd 'eudev runit-void')"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686) depends+=" linux";;
 	x86_64) depends+=" linux";;
 esac
 
+build_options="systemd"
+
 do_install() {
 	# Create /sbin/init symlink to runit-init.
-	vmkdir usr/sbin
-	ln -s /usr/bin/runit-init ${DESTDIR}/usr/sbin/init
+	if [ -z "$build_option_systemd" ]; then
+		vmkdir usr/sbin
+		ln -s /usr/bin/runit-init ${DESTDIR}/usr/sbin/init
+	fi
 }