4 files changed, 27 insertions, 22 deletions

diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 73d69e15e12b..1fd0360c6f8f 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.r7
+PORTVERSION=	3.0.r8
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
 		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
@@ -30,19 +30,21 @@ MAINTAINER=	clefevre@poboxes.com
 # Global variables
 #
 
+FETCH_BEFORE_ARGS+=	-p
+
 HAS_CONFIGURE=	yes
 
 PLIST_SUB=	DATA_DIR="${DATA_DIR}" RCD_SUBDIR="${RCD_SUBDIR}" \
 		CONF_SUBDIR="${CONF_SUBDIR}" SAMP_SUBDIR="${SAMP_SUBDIR}" \
-		BIN_SUBDIR="${BIN_SUBDIR}" INC_SUBDIR="${INC_SUBDIR}" \
-		LIB_SUBDIR="${LIB_SUBDIR}" DOC_SUBDIR="${DOC_SUBDIR}" \
-		SAMP_SUFFIX="${SAMP_SUFFIX}"
+		BIN_SUBDIR="${BIN_SUBDIR}" SBIN_SUBDIR="${SBIN_SUBDIR}" \
+		INC_SUBDIR="${INC_SUBDIR}" LIB_SUBDIR="${LIB_SUBDIR}" \
+		DOC_SUBDIR="${DOC_SUBDIR}" SAMP_SUFFIX="${SAMP_SUFFIX}"
 
-MAN3=		dhcpctl.3 omapi.3
+MAN3=		dhcpctl.3 omapi.3 omshell.3
 MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
 		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
-MAN8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
+MAN8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8 omshell.8
 
 #
 # Local variables
@@ -109,7 +111,8 @@ RCD_FILES=	isc-dhcpd.sh${SAMP_SUFFIX}
 DOC_FILES=	CHANGES COPYRIGHT README RELNOTES
 DATA_FILES=	dhclient.leases dhcpd.leases
 
-BIN_SUBDIR=	sbin
+BIN_SUBDIR=	bin
+SBIN_SUBDIR=	sbin
 CONF_SUBDIR=	etc
 SAMP_SUBDIR=	${CONF_SUBDIR}
 RCD_SUBDIR=	etc/rc.d
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index d11a69e3814d..5bd51ee78e7a 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0rc7.tar.gz) = 835be51c217c629d46fbcb422b1c91a9
+MD5 (dhcp-3.0rc8.tar.gz) = 7dc2d0e71699eab558aff56430725266
diff --git a/net/isc-dhcp40-server/files/patch-site.conf b/net/isc-dhcp40-server/files/patch-site.conf
index 23520fd62a97..2ddf7a219ed8 100644
--- a/net/isc-dhcp40-server/files/patch-site.conf
+++ b/net/isc-dhcp40-server/files/patch-site.conf
@@ -1,11 +1,12 @@
 --- site.conf.orig	Wed Jul  7 17:20:10 1999
-+++ site.conf	Sat Mar 24 04:55:39 2001
-@@ -1,2 +1,32 @@
++++ site.conf	Wed Jun  6 06:05:47 2001
+@@ -1,2 +1,33 @@
  # Put local site configuration stuff here to override the default
  # settings in Makefile.conf
 +
 +PREFIX ?=	/usr/local
 +
++USERBINDIR =	$(PREFIX)/bin
 +BINDIR =	$(PREFIX)/sbin
 +CLIENTBINDIR =	$(PREFIX)/sbin
 +ADMMANDIR =	$(PREFIX)/man/man8
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
index 8659cec3c16c..14392593c635 100644
--- a/net/isc-dhcp40-server/pkg-plist
+++ b/net/isc-dhcp40-server/pkg-plist
@@ -3,27 +3,28 @@
 %%SAMP_SUBDIR%%/dhcpd.conf%%SAMP_SUFFIX%%
 %%RCD_SUBDIR%%/isc-dhcpd.sh%%SAMP_SUFFIX%%
 %%INC_SUBDIR%%/dhcpctl.h
-%%INC_SUBDIR%%/isc/boolean.h
-%%INC_SUBDIR%%/isc/dst.h
-%%INC_SUBDIR%%/isc/int.h
-%%INC_SUBDIR%%/isc/lang.h
-%%INC_SUBDIR%%/isc/list.h
-%%INC_SUBDIR%%/isc/result.h
-%%INC_SUBDIR%%/isc/types.h
+%%INC_SUBDIR%%/isc-dhcp/boolean.h
+%%INC_SUBDIR%%/isc-dhcp/dst.h
+%%INC_SUBDIR%%/isc-dhcp/int.h
+%%INC_SUBDIR%%/isc-dhcp/lang.h
+%%INC_SUBDIR%%/isc-dhcp/list.h
+%%INC_SUBDIR%%/isc-dhcp/result.h
+%%INC_SUBDIR%%/isc-dhcp/types.h
 %%INC_SUBDIR%%/omapip/alloc.h
 %%INC_SUBDIR%%/omapip/buffer.h
 %%INC_SUBDIR%%/omapip/omapip.h
 %%LIB_SUBDIR%%/libdhcpctl.a
 %%LIB_SUBDIR%%/libomapi.a
-%%BIN_SUBDIR%%/dhclient
-%%BIN_SUBDIR%%/dhclient-script
-%%BIN_SUBDIR%%/dhcpd
-%%BIN_SUBDIR%%/dhcrelay
+%%BIN_SUBDIR%%/omshell
+%%SBIN_SUBDIR%%/dhclient
+%%SBIN_SUBDIR%%/dhclient-script
+%%SBIN_SUBDIR%%/dhcpd
+%%SBIN_SUBDIR%%/dhcrelay
 %%PORTDOCS%%%%DOC_SUBDIR%%/CHANGES
 %%PORTDOCS%%%%DOC_SUBDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOC_SUBDIR%%/README
 %%PORTDOCS%%%%DOC_SUBDIR%%/RELNOTES
-@dirrm %%INC_SUBDIR%%/isc
+@dirrm %%INC_SUBDIR%%/isc-dhcp
 @dirrm %%INC_SUBDIR%%/omapip
 %%PORTDOCS%%@dirrm %%DOC_SUBDIR%%
 @unexec rm -f %%RCD_SUBDIR%%/isc-dhcpd.sh