Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

1 files changed, 41 insertions, 20 deletions

diff --git a/abs/core-testing/dhcpcd/PKGBUILD b/abs/core-testing/dhcpcd/PKGBUILD
index dfc1914..1cfb7f9 100644
--- a/abs/core-testing/dhcpcd/PKGBUILD
+++ b/abs/core-testing/dhcpcd/PKGBUILD
@@ -1,27 +1,48 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: judd <jvinet@zeroflux.org>
+
 pkgname=dhcpcd
-pkgver=3.2.1
-pkgrel=10
-pkgdesc="A DHCP client daemon"
-arch=(i686 x86_64)
+pkgver=5.0.7
+pkgrel=1
+pkgdesc="RFC2131 compliant DHCP client daemon"
+url="http://roy.marples.name/dhcpcd/"
+arch=('i686' 'x86_64')
 license=('BSD')
-url="http://roy.marples.name/dhcpcd"
 groups=('base')
-depends=('glibc')
-backup=('etc/conf.d/dhcpcd')
-source=(http://roy.marples.name/dhcpcd/$pkgname-$pkgver.tar.bz2
-	dhcpcd.conf.d)
-md5sums=('5a437882b6b9eb29bde323dc411be4a4'
-         '12d866a78d9f5fa5f31ca18b3940d847')
+depends=('glibc' 'bash')
+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')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  #disable DUID usage
-  echo "#undef ENABLE_DUID" >> config.h
+  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
+
+  # Build
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p $startdir/pkg/usr/sbin
-  ln -sf /sbin/dhcpcd $startdir/pkg/usr/sbin/dhcpcd
-  install -D -m644 ../dhcpcd.conf.d $startdir/pkg/etc/conf.d/dhcpcd
+  make DESTDIR=${pkgdir} install || return 1
+
+  # Create Binary Symlink
+  install -d ${pkgdir}/usr/sbin || return 1
+  ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd || return 1
+
+  # Install Configuration File used in /etc/rc.d/network
+  install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname || return 1
+
+  # 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
+
+  # Set Options in /etc/dhcpcd.conf
+  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf || return 1 # Disable ip4vall
 }