dhcpcd:bumped to latest.

2 files changed, 17 insertions, 15 deletions

diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD
index 1cfb7f9..df6e342 100644
--- a/abs/core/dhcpcd/PKGBUILD
+++ b/abs/core/dhcpcd/PKGBUILD
@@ -1,31 +1,36 @@
+# $Id: PKGBUILD 96706 2010-10-24 10:55:10Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tom Killian <tom.archlinux.org>
+# Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.0.7
+pkgver=5.2.8
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
 arch=('i686' 'x86_64')
 license=('BSD')
 groups=('base')
-depends=('glibc' 'bash')
+depends=('glibc' 'sh')
 backup=('etc/conf.d/dhcpcd' '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')
+sha1sums=('3a7ffc6d3599fd4146791853b083dc577d8dd9c0'
+          'b67b9ce6a2faaca75fea356966a16be2283b7db0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # Fix Installation Locations
-  export PREFIX=/usr
-  sed -i 's/${PREFIX}\/etc/\/etc/' Makefile || return 1
-  sed -i 's/\/db/\/lib\/dhcpcd/' Makefile || return 1
-  sed -i 's/\/libexec/\/lib\/dhcpcd/' Makefile || return 1
-  sed -i 's/\/libexec/\/lib\/dhcpcd/' dhcpcd-hooks/Makefile || return 1
-  sed -i 's/${PREFIX}\/sbin/\/sbin/' Makefile || return 1
+  # configure variables
+  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
 
   # Build
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
 
   # Create Binary Symlink
@@ -37,11 +42,8 @@ build() {
 
   # Install License
   install -d $pkgdir/usr/share/licenses/$pkgname || return 1
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/config.h \
-	>> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-
-  # Make Man Pages FHS Compliant
-  mv -f ${pkgdir}/usr/man ${pkgdir}/usr/share/man || return 1
+  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
+        >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 
   # Set Options in /etc/dhcpcd.conf
   echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf || return 1 # Disable ip4vall
diff --git a/abs/core/dhcpcd/dhcpcd.conf.d b/abs/core/dhcpcd/dhcpcd.conf.d
index 9f5a80b..83c6f14 100644
--- a/abs/core/dhcpcd/dhcpcd.conf.d
+++ b/abs/core/dhcpcd/dhcpcd.conf.d
@@ -2,5 +2,5 @@
 # Arguments to be passed to the DHCP client daemon
 #
 
-DHCPCD_ARGS="-t 30 -h $HOSTNAME"
+DHCPCD_ARGS="-q"