From cc57cb201ddb179d2bb481c13dd4f286ae643b12 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 4 Jun 2013 00:27:56 -0700
Subject: Tue Jun  4 00:27:56 PDT 2013

---
 extra/dhcp/PKGBUILD | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'extra/dhcp/PKGBUILD')

diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 70f7eadf8..10a547001 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $
+# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.5
-_pkgver=4.2.5
-pkgrel=1
+pkgver=4.2.5.p1
+_pkgver=4.2.5-P1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 makedepends=('bash' 'iproute2')
 source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
-        dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
+        dhcpd4.service
+        dhcpd6.service
         dhcp-4.2.5-client_script-1.patch
         dhcp-4.2.5-missing_ipv6-1.patch)
-md5sums=('6489e919ac093d17249270ee9be1020e'
-         '022bc7038b3061cfb31da4736e7ab8a8'
-         'c49b1497837ba56c54e401a66e1bab9b'
-         '12c2f3ae47ed23eb698eb7f1bfd80f20'
-         '8f357e46e1efcbb746f38737a3f977a2'
+md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
+         'SKIP'
          '439ee2f145a1e86dd644cb94a854f8e7'
          '588aa85b6fe228c45623185a58d11992'
          '9e4dcf90beec15bfcb6631809cdcc780'
          'da655f02f1cf4d95b4708e84e69edbc8')
 
-build() {
+
+prepare() {
   cd "${srcdir}/${pkgbase}-${_pkgver}"
 
   # Define _GNU_SOURCE to fix IPV6.
@@ -36,8 +35,11 @@ build() {
   patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch
   # Make dhcp client script suck less.
   patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch
+}
 
-  ./configure --prefix=/usr --sysconfdir=/etc \
+build() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
       --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
       --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
       --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
@@ -48,15 +50,12 @@ build() {
 
 package_dhcp(){
   pkgdesc="A DHCP server, client, and relay agent"
-  backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
+  backup=('etc/dhcpd.conf')
   install=dhcp.install
-  
+
   cd "${srcdir}/${pkgbase}-${_pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
-  install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
-  install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
   install -d "${pkgdir}/var/lib/dhcp"
 
   install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
@@ -67,7 +66,7 @@ package_dhcp(){
 
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall
-  
+
   # install license
   install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
 }
@@ -82,11 +81,11 @@ package_dhclient(){
 
   install -m755 -d "${pkgdir}/usr/share/dhclient"
   mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
-  
+
   install -d "${pkgdir}/var/lib/dhclient"
 
   # install dhclient linux script
-  install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
+  install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script"
 
   # install license
   install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
-- 
cgit v1.2.3-54-g00ecf