1 files changed, 8 insertions, 12 deletions
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 58b63ab65..7e64410c1 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184223 2013-05-04 10:58:11Z foutrelis $
+# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $
 # 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=1
+pkgrel=3
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
 arch=('i686' 'x86_64')
@@ -13,12 +13,11 @@ license=('BSD')
 groups=('base')
 depends=('glibc' 'sh')
 provides=('dhcp-client')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
+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.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
+        'dhcpcd_.service' 'dhcpcd.service')
 sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
           '6245b8db7e6f39a0305571726bb693a53901c400'
           'e49e01041f831281a1cd0c97ca21204e0aa07fda')
 
@@ -37,13 +36,6 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  # Create Binary Symlink
-  install -d ${pkgdir}/usr/sbin
-  ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
-  # Install Configuration File used in /etc/rc.d/network
-  install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
   # Install License
   install -d $pkgdir/usr/share/licenses/$pkgname
   awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
@@ -55,4 +47,8 @@ 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
 }