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

[Ronald van Haren]

    Date: Thursday, September 25, 2008 @ 11:32:52
  Author: ronald
Revision: 12981

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

........
  r12979 | ronald | 2008-09-25 17:29:03 +0200 (Thu, 25 Sep 2008) | 1 line
  
  upgpkg: dhcpcd 4.0.1-3
........

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

----------+
 PKGBUILD |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


Property changes on: dhcpcd/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /dhcpcd/trunk:1-12969
   + /dhcpcd/trunk:1-12980

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-25 15:31:09 UTC (rev 12980)
+++ testing-i686/PKGBUILD	2008-09-25 15:32:52 UTC (rev 12981)
@@ -4,7 +4,7 @@
 
 pkgname=dhcpcd
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A DHCP client daemon"
 arch=(i686 x86_64)
 license=('BSD')
@@ -22,13 +22,15 @@
   cd $srcdir/$pkgname-$pkgver
   
   #disable DUID usage
-  echo "#undef ENABLE_DUID" >> config.h || return 1
+  #echo "#undef ENABLE_DUID" >> config.h
   
   # 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/${PREFIX}\/sbin/\/sbin/' Makefile || return 1 # compatibility hack for current scripts
+  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
 
   make || return 1
   make DESTDIR=$pkgdir install || return 1
@@ -41,6 +43,6 @@
 
   # get the license
   install -d $pkgdir/usr/share/licenses/$pkgname || return 1
-  awk '{if(FNR<27)print $0}' $srcdir/$pkgname-$pkgver/bpf.c \
+  awk '{if(FNR<27)print $0}' $srcdir/$pkgname-$pkgver/config.h \
 	>> $pkgdir/usr/share/licenses/$pkgname/license || return 1
 }