From b24d4534a7af71144c9f5f5d265c117df6522611 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 24 Dec 2009 20:50:00 +0100
Subject: Maj dhcpcd#5.1.3-1

---
 base/dhcpcd/.footprint   | 27 ++++++++++++++-------------
 base/dhcpcd/.md5sum      |  2 +-
 base/dhcpcd/Pkgfile      | 16 ++++++++--------
 base/dhcpcd/dhcpcd.patch | 11 -----------
 4 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 base/dhcpcd/dhcpcd.patch

diff --git a/base/dhcpcd/.footprint b/base/dhcpcd/.footprint
index 84f8dc34b..c4a8f53e2 100644
--- a/base/dhcpcd/.footprint
+++ b/base/dhcpcd/.footprint
@@ -7,23 +7,24 @@ drwxr-xr-x	root/root	etc/sysconfig/network-devices/ifconfig.eth0/
 drwxr-xr-x	root/root	etc/sysconfig/network-devices/services/
 -rwxr-xr--	root/root	etc/sysconfig/network-devices/services/dhcpcd
 drwxr-xr-x	root/root	sbin/
--rwxr-xr-x	root/root	sbin/dhcpcd
+-r-xr-xr-x	root/root	sbin/dhcpcd
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/dhcpcd/
 drwxr-xr-x	root/root	usr/lib/dhcpcd/dhcpcd-hooks/
--rw-r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/01-test
--rw-r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/10-mtu
--rw-r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/20-resolv.conf
--rw-r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/29-lookup-hostname
--rw-r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/30-hostname
--rwxr-xr-x	root/root	usr/lib/dhcpcd/dhcpcd-run-hooks
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man5/
--r--r--r--	root/root	usr/man/man5/dhcpcd.conf.5.gz
-drwxr-xr-x	root/root	usr/man/man8/
--r--r--r--	root/root	usr/man/man8/dhcpcd-run-hooks.8.gz
--r--r--r--	root/root	usr/man/man8/dhcpcd.8.gz
+-r--r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/01-test
+-r--r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/10-mtu
+-r--r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/20-resolv.conf
+-r--r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/29-lookup-hostname
+-r--r--r--	root/root	usr/lib/dhcpcd/dhcpcd-hooks/30-hostname
+-r-xr-xr-x	root/root	usr/lib/dhcpcd/dhcpcd-run-hooks
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man5/
+-r--r--r--	root/root	usr/share/man/man5/dhcpcd.conf.5.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-r--r--r--	root/root	usr/share/man/man8/dhcpcd-run-hooks.8.gz
+-r--r--r--	root/root	usr/share/man/man8/dhcpcd.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/dhcpcd/
diff --git a/base/dhcpcd/.md5sum b/base/dhcpcd/.md5sum
index e1f2c7cbe..a554e2067 100644
--- a/base/dhcpcd/.md5sum
+++ b/base/dhcpcd/.md5sum
@@ -1,2 +1,2 @@
 e47afe62907b4b36997fa2634b22a541  dhcpcd
-600716ddbfa2525a7ef7ae0968a8158a  dhcpcd-5.0.6.tar.bz2
+f852090ad221b6331478f50fc1aa539e  dhcpcd-5.1.3.tar.bz2
diff --git a/base/dhcpcd/Pkgfile b/base/dhcpcd/Pkgfile
index cd2c3cb4c..e0ed4769a 100755
--- a/base/dhcpcd/Pkgfile
+++ b/base/dhcpcd/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=dhcpcd
-version=5.0.6
+version=5.1.3
 release=1
 source=( http://roy.marples.name/downloads/$name/$name-$version.tar.bz2\
           dhcpcd \
@@ -16,13 +16,12 @@ build() {
         wget http://www.linuxfromscratch.org/blfs/downloads/svn/${scripts}-${scriptsversion}.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
 	cd $name-$version
-  export PREFIX=/usr 
-  sed -i 's/${PREFIX}\/etc/\/etc/' Makefile
-  sed -i 's/\/db/\/lib\/dhcpcd/' Makefile
-  sed -i 's/\/libexec/\/lib\/dhcpcd/' Makefile
-  sed -i 's/\/libexec/\/lib\/dhcpcd/' dhcpcd-hooks/Makefile
-  sed -i 's/${PREFIX}\/sbin/\/sbin/' Makefile
-
+	    ./configure --prefix= \
+                --libexecdir=/usr/lib/dhcpcd \
+                --dbdir=/var/lib/dhcpcd \
+                --sysconfdir=/etc \
+                --os=linux \
+                --with-hooks=none
 	make
 	make DESTDIR=$PKG install
         mkdir -p $PKG/etc/sysconfig/network-devices/ifconfig.eth0
@@ -30,4 +29,5 @@ build() {
 	cd ../$scripts-$scriptsversion
 	make DESTDIR=$PKG install-service-dhcpcd
 	cd ../..
+
 }
diff --git a/base/dhcpcd/dhcpcd.patch b/base/dhcpcd/dhcpcd.patch
deleted file mode 100644
index 754319b6d..000000000
--- a/base/dhcpcd/dhcpcd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pkg/etc/sysconfig/network-devices/services/dhcpcd~	2009-02-26 16:46:40.000000000 +0000
-+++ pkg/etc/sysconfig/network-devices/services/dhcpcd	2009-02-26 16:46:12.000000000 +0000
-@@ -31,7 +31,7 @@
- 				exit 2
- 			fi
- 		fi
--		/sbin/dhcpcd $1 $DHCP_START
-+		/sbin/dhcpcd $1 $DHCP_START &
- 		# Save the return value
- 		RET="$?"
- 		# Print the assigned settings if requested
-- 
cgit v1.2.3-70-g09d2