From e5ab573ce36062b6553020f12e42be23ca6ec6fb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Thu, 4 Jun 2015 00:26:18 +0200
Subject: [PATCH] bind: removed systemd support

---
 srcpkgs/bind/INSTALL             |  4 ++--
 srcpkgs/bind/files/named.service | 18 ------------------
 srcpkgs/bind/template            |  6 +-----
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/bind/files/named.service

diff --git a/srcpkgs/bind/INSTALL b/srcpkgs/bind/INSTALL
index 7bf7f858297..025af19f8df 100644
--- a/srcpkgs/bind/INSTALL
+++ b/srcpkgs/bind/INSTALL
@@ -3,10 +3,10 @@ post)
 	touch var/log/named.log
 	chown root:named var/log/named.log
 	chmod 0770 var/log/named.log
-	
+
 	# create an rndc.key if it doesn't already exist
 	if [ ! -s etc/named/rndc.key ]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | \
+		usr/bin/rndc-confgen -r /dev/urandom -b 256 | \
 			head -n 5 >> etc/named/rndc.key
 		chown root:named etc/named/rndc.key
 		chmod 644 etc/named/rndc.key
diff --git a/srcpkgs/bind/files/named.service b/srcpkgs/bind/files/named.service
deleted file mode 100644
index 6c8454b2398..00000000000
--- a/srcpkgs/bind/files/named.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Berkeley Internet Name Domain (DNS) server
-Wants=nss-lookup.target
-Before=nss-lookup.target
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/named/named.pid
-ExecStartPre=/usr/sbin/named-checkconf -z /etc/named/named.conf
-ExecStart=/usr/sbin/named -u named
-ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID'
-ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
-PrivateTmp=true
-TimeoutSec=25
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index aa30e1ee23c..1e17744a7d5 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -4,7 +4,7 @@ _distver=9.9.6
 _patchver=P2
 version="${_distver}${_patchver}"
 wrksrc="${pkgname}-${_distver}-${_patchver}"
-revision=3
+revision=4
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="ISC"
@@ -26,7 +26,6 @@ system_accounts="named"
 named_desc="BIND DNS server"
 named_homedir="/var/named"
 make_dirs="/var/named 0770 root named"
-build_options="systemd"
 
 pre_configure() {
 	autoreconf -fi
@@ -35,9 +34,6 @@ pre_configure() {
 }
 
 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