From 4f1ecd3fc486ba8f3cd8bd1cd8bb024a4c153534 Mon Sep 17 00:00:00 2001
From: James Mills <prologic@shortcircuit.net.au>
Date: Mon, 26 Nov 2007 17:26:49 +1000
Subject: [PATCH] dhcpd: 3.0.6rc2 -> 4.0.0b3

---
 dhcp/.footprint | 16 +++++++++++-----
 dhcp/.md5sum    |  2 +-
 dhcp/Pkgfile    | 11 ++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/dhcp/.footprint b/dhcp/.footprint
index 48c2b7632..b005338ea 100644
--- a/dhcp/.footprint
+++ b/dhcp/.footprint
@@ -3,14 +3,15 @@ drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/dhcpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/dhcpd
-drwxr-xr-x	root/root	sbin/
--rwxr-xr-x	root/root	sbin/dhclient
--rwx------	root/root	sbin/dhclient-script
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/omshell
+drwxr-xr-x	root/root	usr/etc/
+-rw-r--r--	root/root	usr/etc/dhclient.conf
+-rw-r--r--	root/root	usr/etc/dhcpd.conf
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/dhcpctl.h
+drwxr-xr-x	root/root	usr/include/dhcpctl/
+-rw-r--r--	root/root	usr/include/dhcpctl/dhcpctl.h
 drwxr-xr-x	root/root	usr/include/isc-dhcp/
 -rw-r--r--	root/root	usr/include/isc-dhcp/boolean.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/dst.h
@@ -22,9 +23,14 @@ drwxr-xr-x	root/root	usr/include/isc-dhcp/
 drwxr-xr-x	root/root	usr/include/omapip/
 -rw-r--r--	root/root	usr/include/omapip/alloc.h
 -rw-r--r--	root/root	usr/include/omapip/buffer.h
+-rw-r--r--	root/root	usr/include/omapip/convert.h
+-rw-r--r--	root/root	usr/include/omapip/hash.h
 -rw-r--r--	root/root	usr/include/omapip/omapip.h
+-rw-r--r--	root/root	usr/include/omapip/omapip_p.h
+-rw-r--r--	root/root	usr/include/omapip/trace.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libdhcpctl.a
+-rw-r--r--	root/root	usr/lib/libdst.a
 -rw-r--r--	root/root	usr/lib/libomapi.a
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
@@ -32,7 +38,6 @@ drwxr-xr-x	root/root	usr/man/man1/
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/dhcpctl.3.gz
 -rw-r--r--	root/root	usr/man/man3/omapi.3.gz
--rw-r--r--	root/root	usr/man/man3/omshell.3.gz
 drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/dhclient.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/dhclient.leases.5.gz
@@ -46,6 +51,7 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/dhcpd.8.gz
 -rw-r--r--	root/root	usr/man/man8/dhcrelay.8.gz
 drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/dhclient
 -rwxr-xr-x	root/root	usr/sbin/dhcpd
 -rwxr-xr-x	root/root	usr/sbin/dhcrelay
 drwxr-xr-x	root/root	var/
diff --git a/dhcp/.md5sum b/dhcp/.md5sum
index f49bc2da3..dcbced4c3 100644
--- a/dhcp/.md5sum
+++ b/dhcp/.md5sum
@@ -1,3 +1,3 @@
 9d3f34b05e622bdb3466ca725af454d1  default-config.diff
-51c758f950a2ab6b8ac59a2875417ecd  dhcp-3.0.6rc2.tar.gz
+029211d6d09a3eac0fd65deee40e8f71  dhcp-4.0.0b3.tar.gz
 82393e9302e5d8da24ece3ec8717cd7e  dhcpd
diff --git a/dhcp/Pkgfile b/dhcp/Pkgfile
index ab8ca13d6..d3bb5887e 100644
--- a/dhcp/Pkgfile
+++ b/dhcp/Pkgfile
@@ -6,21 +6,22 @@
 # Depends on:	
 
 name=dhcp
-version=3.0.6rc2
+version=4.0.0b3
 release=1
-source=(http://ftp.isc.org/isc/$name/$name-3.0-history/$name-$version.tar.gz
+source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz
 			dhcpd
 			default-config.diff)
 
 build() {
 	cd dhcp-$version
 	patch -p1 -i $SRC/default-config.diff
-	./configure
-	make && make DESTDIR=$PKG INCDIR=/usr/include LIBDIR=/usr/lib install
+	./configure --prefix=/usr
+	make
+	make DESTDIR=$PKG install
+	mkdir $PKG/etc/
 	install -m644 client/dhclient.conf server/dhcpd.conf -t $PKG/etc
 	install -D ../dhcpd $PKG/etc/rc.d/dhcpd
 	mkdir -p $PKG/var/state/dhcp
 	touch $PKG/var/state/dhcp/dhcpd.leases
-	find $PKG/usr/man -type f -exec chmod 644 {} \;
 	chown -R root:root $PKG
 }