Merge branch '2.7' of crux:/home/crux/scm/ports/contrib into 2.7

dhcp/.footprint

@@ -2,7 +2,10 @@ drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/dhclient.conf
 -rw-r--r--	root/root	etc/dhcpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
+-rwxr-xr-x	root/root	etc/rc.d/dhcpcd
 -rwxr-xr-x	root/root	etc/rc.d/dhcpd
+drwxr-xr-x	root/root	sbin/
+-rwxr-xr-x	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
@@ -48,6 +51,7 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/dhcpd
 -rwxr-xr-x	root/root	usr/sbin/dhcrelay
 drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/db/
 drwxr-xr-x	root/root	var/state/
 drwxr-xr-x	root/root	var/state/dhcp/
 -rw-r--r--	root/root	var/state/dhcp/dhcpd.leases (EMPTY)

dhcp/.md5sum

@@ -1,3 +1,4 @@
 456711bbb2c8fc8b6e0df7c9a514c237  default-config.diff
 bddce8a23551f009fd0ac840afc89780  dhcp-4.2.1.tar.gz
+77a8a395a9cbe98e2cf666df69bf2e15  dhcpcd
 51665125f8360c6cc1ef59ad6cd8cf84  dhcpd

dhcp/Pkgfile

@@ -2,15 +2,12 @@
 # URL:         http://www.isc.org/dhcp
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager:    Mark Rosenstand, mark at borkware dot net
-#
-# Depends on: 
 
 name=dhcp
 version=4.2.1
 release=1
-source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz
-      dhcpd
-      default-config.diff)
+source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz dhcpd \
+        dhcpcd default-config.diff)
 
 build() {
   cd dhcp-$version
@@ -23,6 +20,9 @@ build() {
   make
   make DESTDIR=$PKG install
   install -D ../dhcpd $PKG/etc/rc.d/dhcpd
-  mkdir -p $PKG/var/state/dhcp
+  install -D ../dhcpcd $PKG/etc/rc.d/dhcpcd
+  install -d -m 0755 $PKG/var/state/dhcp
+  install -d -m 0755 $PKG/var/db
   touch $PKG/var/state/dhcp/dhcpd.leases
+  install -D -m 755 $SRC/dhcp-$version/client/scripts/linux $PKG/sbin/dhclient-script
 }