From f7cd2a0a073da2373cd3f3c8e31515dd0b83b645 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 2 Aug 2013 01:31:32 -0700
Subject: Fri Aug  2 01:30:56 PDT 2013

---
 core/dhcpcd/PKGBUILD | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'core/dhcpcd/PKGBUILD')

diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 7e64410c1..c1d8f239c 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $
+# $Id: PKGBUILD 191940 2013-08-01 13:10:13Z dreisner $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.6.8
-pkgrel=3
+pkgver=6.0.4
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
 arch=('i686' 'x86_64')
@@ -15,9 +15,10 @@ depends=('glibc' 'sh')
 provides=('dhcp-client')
 backup=('etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'dhcpcd_.service'
+        'dhcpcd.service')
+sha1sums=('3e93b02071015e90f9199658c04509e4b565dd4d'
           '6245b8db7e6f39a0305571726bb693a53901c400'
           'e49e01041f831281a1cd0c97ca21204e0aa07fda')
 
@@ -25,8 +26,11 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # configure variables
-  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
-	--rundir=/run
+  ./configure \
+      --sbindir=/usr/bin \
+      --libexecdir=/usr/lib/dhcpcd \
+      --dbdir=/var/lib/dhcpcd \
+      --rundir=/run
 
   # Build
   make
@@ -38,8 +42,8 @@ package() {
 
   # Install License
   install -d $pkgdir/usr/share/licenses/$pkgname
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
-        >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  sed 26q "$srcdir/$pkgname-$pkgver/control.h" \
+      >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Set Options in /etc/dhcpcd.conf
   echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
@@ -47,8 +51,4 @@ package() {
   # install systemd files
   install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
   install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
-
-  # usrmove
-  cd "$pkgdir"
-  mv sbin usr/bin
 }
-- 
cgit v1.2.3-54-g00ecf