From 779c26aac14bb1f23aa034dc1779f6bb6aacfcc7 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Tue, 2 Jun 2015 21:33:17 +0200
Subject: [PATCH] dhcpcd: removed systemd service

---
 srcpkgs/dhcpcd/files/dhcpcd.service  | 13 -------------
 srcpkgs/dhcpcd/files/dhcpcd@.service | 15 ---------------
 srcpkgs/dhcpcd/template              |  9 ++-------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/dhcpcd/files/dhcpcd.service
 delete mode 100644 srcpkgs/dhcpcd/files/dhcpcd@.service

diff --git a/srcpkgs/dhcpcd/files/dhcpcd.service b/srcpkgs/dhcpcd/files/dhcpcd.service
deleted file mode 100644
index 2d2b4e2c623..00000000000
--- a/srcpkgs/dhcpcd/files/dhcpcd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Lightweight DHCP client daemon
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd.pid
-ExecStart=/usr/sbin/dhcpcd -q -b
-ExecStop=/usr/sbin/dhcpcd -x
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/dhcpcd/files/dhcpcd@.service b/srcpkgs/dhcpcd/files/dhcpcd@.service
deleted file mode 100644
index a33d235d1d5..00000000000
--- a/srcpkgs/dhcpcd/files/dhcpcd@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Lightweight DHCP client daemon on %I
-Wants=network.target
-Before=network.target
-BindsTo=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/usr/sbin/dhcpcd -q -w %I -e "wpa_supplicant_conf=/etc/wpa_supplicant/wpa_supplicant-%I.conf"
-ExecStop=/usr/sbin/dhcpcd -x %I
-
-[Install]
-Alias=multi-user.target.wants/dhcpcd@%i.service
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index d7a108f2608..c2e54a3f58f 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,10 +1,9 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=6.9.0
-revision=2
+revision=3
 lib32disabled=yes
 build_pie=yes
-build_options="systemd"
 build_style=configure
 configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run"
 hostmakedepends="ntp pkg-config"
@@ -14,7 +13,7 @@ short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="2-clause-BSD"
 homepage="http://roy.marples.name/projects/dhcpcd"
-distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
+distfiles="http://ftp.osuosl.org/pub/blfs/conglomeration/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=1566a58ef785880c07762ff6c520e974cf42872be5fbb23b4520f4446b120a68
 
 pre_install() {
@@ -22,10 +21,6 @@ pre_install() {
 	sed -i 's,-B,& -s,' dhcpcd-hooks/10-wpa_supplicant
 }
 post_install() {
-	if [ "$build_option_systemd" ]; then
-		vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system
-	fi
 	vsv dhcpcd
 	vsv dhcpcd-eth0
 	# Enable controlgroup by default, to make dhcpcd-ui work.