[arch-commits] Commit in dhcpcd/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[Ronald van Haren]

    Date: Thursday, September 25, 2008 @ 06:03:35
  Author: ronald
Revision: 12966

Merged revisions 12965 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/dhcpcd/trunk

........
  r12965 | ronald | 2008-09-25 12:02:46 +0200 (Thu, 25 Sep 2008) | 1 line
  
  upgpkg: dhcpcd 4.0.1-2
........

Modified:
  dhcpcd/repos/testing-x86_64/	(properties)
  dhcpcd/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


Property changes on: dhcpcd/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /dhcpcd/trunk:1-12939
   + /dhcpcd/trunk:1-12965

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-09-25 10:02:46 UTC (rev 12965)
+++ testing-x86_64/PKGBUILD	2008-09-25 10:03:35 UTC (rev 12966)
@@ -4,7 +4,7 @@
 
 pkgname=dhcpcd
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A DHCP client daemon"
 arch=(i686 x86_64)
 license=('BSD')
@@ -14,6 +14,7 @@
 backup=('etc/conf.d/dhcpcd')
 source=(http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
 	dhcpcd.conf.d)
+options=('!emptydirs')
 md5sums=('4e84bcba4f5c9c2b558db1b1f22e6828'
          '12d866a78d9f5fa5f31ca18b3940d847')
 
@@ -26,6 +27,7 @@
   # fix installation locations
   export PREFIX=/usr 
   sed -i 's/${PREFIX}\/etc/\/etc/' Makefile
+  sedi -i 's/\/db/\/lib\/dhcpcd/' Makefile
   sed -i 's/${PREFIX}\/sbin/\/sbin/' Makefile  # compatibility hack for current scripts
 
   make || return 1
@@ -36,4 +38,9 @@
   
   # install standard configuration file
   install -Dm644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/dhcpcd || return 1
+
+  # get the license
+  install -d $pkgdir/usr/share/licenses/$pkgname
+  awk '{if(FNR<27)print $0}' $srcdir/$pkgname-$pkgver/bpf.c \
+	>> $pkgdir/usr/share/licenses/$pkgname/license
 }