[arch-commits] Commit in dhcpcd/repos (testing-x86_64 testing-x86_64/PKGBUILD)
Ronald van Haren
ronald at archlinux.org
Thu Sep 25 15:31:27 UTC 2008
Date: Thursday, September 25, 2008 @ 11:31:09
Author: ronald
Revision: 12980
fix svn merge problem
Modified:
dhcpcd/repos/testing-x86_64/ (properties)
dhcpcd/repos/testing-x86_64/PKGBUILD
----------+
PKGBUILD | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
Property changes on: dhcpcd/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /dhcpcd/trunk:1-12965
+ /dhcpcd/trunk:1-12979
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2008-09-25 15:29:03 UTC (rev 12979)
+++ testing-x86_64/PKGBUILD 2008-09-25 15:31:09 UTC (rev 12980)
@@ -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
}
More information about the arch-commits
mailing list