Index: head/net/isc-dhcp3/Makefile
===================================================================
--- head/net/isc-dhcp3/Makefile	(revision 43591)
+++ head/net/isc-dhcp3/Makefile	(revision 43592)
@@ -1,197 +1,200 @@
 # ex:ts=8
 # Ports collection makefile for:    dhcp
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
 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} \
 		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
 		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
 		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
 		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
 		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
 		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
 		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
 		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
 MASTER_SITE_SUBDIR=	dhcp dpcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 
 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
 #
 
 # fast
 AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
 FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
 			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
 FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
 GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.gigabell.net/pub/%SUBDIR%/
 HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
 ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
 JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
 			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
 LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
 POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
 RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
 SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
 SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
 UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
 US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
 			ftp://ftp.nominum.com/pub/isc/SUBDIR%/
 NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # slow
 BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
 GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
 TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
 			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # for instance, possible version formats are, in order:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
 #	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
 VERSION=
 PATCHLEVEL=
 .if ${PORTVERSION:R:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R:R}
 VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .elif ${PORTVERSION:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R}
 VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
 .elif ${PORTVERSION:R:E} != ""
 RELEASE=	${PORTVERSION:R}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .else
 RELEASE=	${PORTVERSION}
 .endif
 
 PATCH_SUBDIRS=	common minires dst omapip server client relay dhcpctl
 
 SAMP_SUFFIX=	.sample
 
 BIN_FILES=	dhclient dhcpd dhcrelay
 CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf server/dhcpd.conf
 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
 INC_SUBDIR=	include
 LIB_SUBDIR=	lib
 DOC_SUBDIR=	share/doc/${PKGBASE}
 DATA_DIR=	/var/db
 
 STRIP_CMD?=	strip
 
 #
 # Post-patch
 #
 
 post-patch: patch-scripts patch-makefile-conf patch-makefiles-dist \
 	    patch-man-pages
 
 patch-scripts:
 	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \
 		${WRKSRC}/client/scripts/freebsd
 
 patch-makefile-conf:
 	@${PERL} -pi.fbsd -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
 		${WRKSRC}/Makefile.conf
 
 patch-makefiles-dist:
 .for subdir in ${PATCH_SUBDIRS}
 	@${PERL} -pi.fbsd -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
 		${WRKSRC}/${subdir}/Makefile.dist
 .endfor
 
 # temporary hack - no patch file needed for this typo.
 # grrr! don't know how to delete lines in perl :(
 patch-man-pages:
 	@${PERL} -pi.fbsd -e 's/^\.Fd$$//' ${WRKSRC}/dhcpctl/dhcpctl.3
 
 #
 # Post-install
 #
 
 post-install: strip-binary-files install-startup-files \
 	      install-doc-files install-sample-files \
 	      create-data-files create-conf-files
 
 strip-binary-files:
 .for file in ${BIN_FILES}
 .if exists(${PREFIX}/${BIN_SUBDIR}/${file})
 	@${STRIP_CMD} ${PREFIX}/${BIN_SUBDIR}/${file}
 .endif
 .endfor
 
 install-startup-files:
 .for file in ${RCD_FILES}
 	@${INSTALL_SCRIPT} ${FILESDIR}/${file} ${PREFIX}/${RCD_SUBDIR}
 .endfor
 
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
 .endfor
 .endif
 
 install-sample-files:
 .for file in ${SAMP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} \
 		${PREFIX}/${SAMP_SUBDIR}/${file:T}${SAMP_SUFFIX}
 .endfor
 
 create-data-files:
 .for file in ${DATA_FILES}
 .if !exists(${DATA_DIR}/${file})
 	@${TOUCH} ${DATA_DIR}/${file}
 .endif
 .endfor
 
 create-conf-files:
 .for file in ${CONF_FILES}
 .if !exists(${PREFIX}/${CONF_SUBDIR}/${file})
 	@${TOUCH} ${PREFIX}/${CONF_SUBDIR}/${file}
 .endif
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.63
\ No newline at end of property
+1.64
\ No newline at end of property
Index: head/net/isc-dhcp3/distinfo
===================================================================
--- head/net/isc-dhcp3/distinfo	(revision 43591)
+++ head/net/isc-dhcp3/distinfo	(revision 43592)
@@ -1 +1 @@
-MD5 (dhcp-3.0rc7.tar.gz) = 835be51c217c629d46fbcb422b1c91a9
+MD5 (dhcp-3.0rc8.tar.gz) = 7dc2d0e71699eab558aff56430725266

Property changes on: head/net/isc-dhcp3/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.31
\ No newline at end of property
+1.32
\ No newline at end of property
Index: head/net/isc-dhcp3/files/patch-site.conf
===================================================================
--- head/net/isc-dhcp3/files/patch-site.conf	(revision 43591)
+++ head/net/isc-dhcp3/files/patch-site.conf	(revision 43592)
@@ -1,35 +1,36 @@
 --- 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
 +ADMMANEXT =	.8
 +FFMANDIR =	$(PREFIX)/man/man5
 +FFMANEXT =	.5
 +LIBMANDIR =	$(PREFIX)/man/man3
 +LIBMANEXT =	.3
 +MANCAT =	man
 +# INSTALL =	${INSTALL_DATA}
 +# MANINSTALL =	${INSTALL_MAN}
 +ETC =		$(PREFIX)/etc
 +LIBDIR =	${PREFIX}/lib
 +INCDIR =	${PREFIX}/include
 +
 +DEBUG ?=	#none
 +
 +CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
 +CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
 +CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
 +CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
 +CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
 +CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARDB)/dhclient.pid\"

Property changes on: head/net/isc-dhcp3/files/patch-site.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net/isc-dhcp3/pkg-plist
===================================================================
--- head/net/isc-dhcp3/pkg-plist	(revision 43591)
+++ head/net/isc-dhcp3/pkg-plist	(revision 43592)
@@ -1,35 +1,36 @@
 @comment $FreeBSD$
 %%SAMP_SUBDIR%%/dhclient.conf%%SAMP_SUFFIX%%
 %%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
 @exec [ -f %%DATA_DIR%%/dhclient.leases ] || touch %%DATA_DIR%%/dhclient.leases
 @unexec [ -s %%DATA_DIR%%/dhclient.leases ] || rm -f %%DATA_DIR%%/dhclient.leases
 @exec [ -f %%DATA_DIR%%/dhcpd.leases ] || touch %%DATA_DIR%%/dhcpd.leases
 @unexec [ -s %%DATA_DIR%%/dhcpd.leases ] || rm -f %%DATA_DIR%%/dhcpd.leases
 @exec [ -f %D/%%CONF_SUBDIR%%/dhclient.conf ] || touch %D/%%CONF_SUBDIR%%/dhclient.conf
 @unexec [ -L %D/%%CONF_SUBDIR%%/dhclient.conf -o -s %D/%%CONF_SUBDIR%%/dhclient.conf ] || rm -f %D/%%CONF_SUBDIR%%/dhclient.conf

Property changes on: head/net/isc-dhcp3/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/net/isc-dhcp3-server/Makefile
===================================================================
--- head/net/isc-dhcp3-server/Makefile	(revision 43591)
+++ head/net/isc-dhcp3-server/Makefile	(revision 43592)
@@ -1,197 +1,200 @@
 # ex:ts=8
 # Ports collection makefile for:    dhcp
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
 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} \
 		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
 		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
 		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
 		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
 		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
 		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
 		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
 		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
 MASTER_SITE_SUBDIR=	dhcp dpcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 
 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
 #
 
 # fast
 AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
 FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
 			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
 FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
 GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.gigabell.net/pub/%SUBDIR%/
 HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
 ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
 JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
 			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
 LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
 POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
 RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
 SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
 SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
 UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
 US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
 			ftp://ftp.nominum.com/pub/isc/SUBDIR%/
 NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # slow
 BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
 GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
 TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
 			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # for instance, possible version formats are, in order:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
 #	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
 VERSION=
 PATCHLEVEL=
 .if ${PORTVERSION:R:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R:R}
 VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .elif ${PORTVERSION:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R}
 VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
 .elif ${PORTVERSION:R:E} != ""
 RELEASE=	${PORTVERSION:R}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .else
 RELEASE=	${PORTVERSION}
 .endif
 
 PATCH_SUBDIRS=	common minires dst omapip server client relay dhcpctl
 
 SAMP_SUFFIX=	.sample
 
 BIN_FILES=	dhclient dhcpd dhcrelay
 CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf server/dhcpd.conf
 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
 INC_SUBDIR=	include
 LIB_SUBDIR=	lib
 DOC_SUBDIR=	share/doc/${PKGBASE}
 DATA_DIR=	/var/db
 
 STRIP_CMD?=	strip
 
 #
 # Post-patch
 #
 
 post-patch: patch-scripts patch-makefile-conf patch-makefiles-dist \
 	    patch-man-pages
 
 patch-scripts:
 	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \
 		${WRKSRC}/client/scripts/freebsd
 
 patch-makefile-conf:
 	@${PERL} -pi.fbsd -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
 		${WRKSRC}/Makefile.conf
 
 patch-makefiles-dist:
 .for subdir in ${PATCH_SUBDIRS}
 	@${PERL} -pi.fbsd -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
 		${WRKSRC}/${subdir}/Makefile.dist
 .endfor
 
 # temporary hack - no patch file needed for this typo.
 # grrr! don't know how to delete lines in perl :(
 patch-man-pages:
 	@${PERL} -pi.fbsd -e 's/^\.Fd$$//' ${WRKSRC}/dhcpctl/dhcpctl.3
 
 #
 # Post-install
 #
 
 post-install: strip-binary-files install-startup-files \
 	      install-doc-files install-sample-files \
 	      create-data-files create-conf-files
 
 strip-binary-files:
 .for file in ${BIN_FILES}
 .if exists(${PREFIX}/${BIN_SUBDIR}/${file})
 	@${STRIP_CMD} ${PREFIX}/${BIN_SUBDIR}/${file}
 .endif
 .endfor
 
 install-startup-files:
 .for file in ${RCD_FILES}
 	@${INSTALL_SCRIPT} ${FILESDIR}/${file} ${PREFIX}/${RCD_SUBDIR}
 .endfor
 
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
 .endfor
 .endif
 
 install-sample-files:
 .for file in ${SAMP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} \
 		${PREFIX}/${SAMP_SUBDIR}/${file:T}${SAMP_SUFFIX}
 .endfor
 
 create-data-files:
 .for file in ${DATA_FILES}
 .if !exists(${DATA_DIR}/${file})
 	@${TOUCH} ${DATA_DIR}/${file}
 .endif
 .endfor
 
 create-conf-files:
 .for file in ${CONF_FILES}
 .if !exists(${PREFIX}/${CONF_SUBDIR}/${file})
 	@${TOUCH} ${PREFIX}/${CONF_SUBDIR}/${file}
 .endif
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp3-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.63
\ No newline at end of property
+1.64
\ No newline at end of property
Index: head/net/isc-dhcp3-server/distinfo
===================================================================
--- head/net/isc-dhcp3-server/distinfo	(revision 43591)
+++ head/net/isc-dhcp3-server/distinfo	(revision 43592)
@@ -1 +1 @@
-MD5 (dhcp-3.0rc7.tar.gz) = 835be51c217c629d46fbcb422b1c91a9
+MD5 (dhcp-3.0rc8.tar.gz) = 7dc2d0e71699eab558aff56430725266

Property changes on: head/net/isc-dhcp3-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.31
\ No newline at end of property
+1.32
\ No newline at end of property
Index: head/net/isc-dhcp3-server/files/patch-site.conf
===================================================================
--- head/net/isc-dhcp3-server/files/patch-site.conf	(revision 43591)
+++ head/net/isc-dhcp3-server/files/patch-site.conf	(revision 43592)
@@ -1,35 +1,36 @@
 --- 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
 +ADMMANEXT =	.8
 +FFMANDIR =	$(PREFIX)/man/man5
 +FFMANEXT =	.5
 +LIBMANDIR =	$(PREFIX)/man/man3
 +LIBMANEXT =	.3
 +MANCAT =	man
 +# INSTALL =	${INSTALL_DATA}
 +# MANINSTALL =	${INSTALL_MAN}
 +ETC =		$(PREFIX)/etc
 +LIBDIR =	${PREFIX}/lib
 +INCDIR =	${PREFIX}/include
 +
 +DEBUG ?=	#none
 +
 +CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
 +CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
 +CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
 +CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
 +CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
 +CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARDB)/dhclient.pid\"

Property changes on: head/net/isc-dhcp3-server/files/patch-site.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net/isc-dhcp3-server/pkg-plist
===================================================================
--- head/net/isc-dhcp3-server/pkg-plist	(revision 43591)
+++ head/net/isc-dhcp3-server/pkg-plist	(revision 43592)
@@ -1,35 +1,36 @@
 @comment $FreeBSD$
 %%SAMP_SUBDIR%%/dhclient.conf%%SAMP_SUFFIX%%
 %%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
 @exec [ -f %%DATA_DIR%%/dhclient.leases ] || touch %%DATA_DIR%%/dhclient.leases
 @unexec [ -s %%DATA_DIR%%/dhclient.leases ] || rm -f %%DATA_DIR%%/dhclient.leases
 @exec [ -f %%DATA_DIR%%/dhcpd.leases ] || touch %%DATA_DIR%%/dhcpd.leases
 @unexec [ -s %%DATA_DIR%%/dhcpd.leases ] || rm -f %%DATA_DIR%%/dhcpd.leases
 @exec [ -f %D/%%CONF_SUBDIR%%/dhclient.conf ] || touch %D/%%CONF_SUBDIR%%/dhclient.conf
 @unexec [ -L %D/%%CONF_SUBDIR%%/dhclient.conf -o -s %D/%%CONF_SUBDIR%%/dhclient.conf ] || rm -f %D/%%CONF_SUBDIR%%/dhclient.conf

Property changes on: head/net/isc-dhcp3-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/net/isc-dhcp30-server/Makefile
===================================================================
--- head/net/isc-dhcp30-server/Makefile	(revision 43591)
+++ head/net/isc-dhcp30-server/Makefile	(revision 43592)
@@ -1,197 +1,200 @@
 # ex:ts=8
 # Ports collection makefile for:    dhcp
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
 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} \
 		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
 		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
 		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
 		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
 		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
 		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
 		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
 		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
 MASTER_SITE_SUBDIR=	dhcp dpcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 
 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
 #
 
 # fast
 AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
 FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
 			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
 FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
 GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.gigabell.net/pub/%SUBDIR%/
 HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
 ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
 JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
 			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
 LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
 POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
 RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
 SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
 SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
 UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
 US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
 			ftp://ftp.nominum.com/pub/isc/SUBDIR%/
 NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # slow
 BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
 GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
 TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
 			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # for instance, possible version formats are, in order:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
 #	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
 VERSION=
 PATCHLEVEL=
 .if ${PORTVERSION:R:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R:R}
 VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .elif ${PORTVERSION:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R}
 VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
 .elif ${PORTVERSION:R:E} != ""
 RELEASE=	${PORTVERSION:R}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .else
 RELEASE=	${PORTVERSION}
 .endif
 
 PATCH_SUBDIRS=	common minires dst omapip server client relay dhcpctl
 
 SAMP_SUFFIX=	.sample
 
 BIN_FILES=	dhclient dhcpd dhcrelay
 CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf server/dhcpd.conf
 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
 INC_SUBDIR=	include
 LIB_SUBDIR=	lib
 DOC_SUBDIR=	share/doc/${PKGBASE}
 DATA_DIR=	/var/db
 
 STRIP_CMD?=	strip
 
 #
 # Post-patch
 #
 
 post-patch: patch-scripts patch-makefile-conf patch-makefiles-dist \
 	    patch-man-pages
 
 patch-scripts:
 	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \
 		${WRKSRC}/client/scripts/freebsd
 
 patch-makefile-conf:
 	@${PERL} -pi.fbsd -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
 		${WRKSRC}/Makefile.conf
 
 patch-makefiles-dist:
 .for subdir in ${PATCH_SUBDIRS}
 	@${PERL} -pi.fbsd -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
 		${WRKSRC}/${subdir}/Makefile.dist
 .endfor
 
 # temporary hack - no patch file needed for this typo.
 # grrr! don't know how to delete lines in perl :(
 patch-man-pages:
 	@${PERL} -pi.fbsd -e 's/^\.Fd$$//' ${WRKSRC}/dhcpctl/dhcpctl.3
 
 #
 # Post-install
 #
 
 post-install: strip-binary-files install-startup-files \
 	      install-doc-files install-sample-files \
 	      create-data-files create-conf-files
 
 strip-binary-files:
 .for file in ${BIN_FILES}
 .if exists(${PREFIX}/${BIN_SUBDIR}/${file})
 	@${STRIP_CMD} ${PREFIX}/${BIN_SUBDIR}/${file}
 .endif
 .endfor
 
 install-startup-files:
 .for file in ${RCD_FILES}
 	@${INSTALL_SCRIPT} ${FILESDIR}/${file} ${PREFIX}/${RCD_SUBDIR}
 .endfor
 
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
 .endfor
 .endif
 
 install-sample-files:
 .for file in ${SAMP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} \
 		${PREFIX}/${SAMP_SUBDIR}/${file:T}${SAMP_SUFFIX}
 .endfor
 
 create-data-files:
 .for file in ${DATA_FILES}
 .if !exists(${DATA_DIR}/${file})
 	@${TOUCH} ${DATA_DIR}/${file}
 .endif
 .endfor
 
 create-conf-files:
 .for file in ${CONF_FILES}
 .if !exists(${PREFIX}/${CONF_SUBDIR}/${file})
 	@${TOUCH} ${PREFIX}/${CONF_SUBDIR}/${file}
 .endif
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp30-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.63
\ No newline at end of property
+1.64
\ No newline at end of property
Index: head/net/isc-dhcp30-server/distinfo
===================================================================
--- head/net/isc-dhcp30-server/distinfo	(revision 43591)
+++ head/net/isc-dhcp30-server/distinfo	(revision 43592)
@@ -1 +1 @@
-MD5 (dhcp-3.0rc7.tar.gz) = 835be51c217c629d46fbcb422b1c91a9
+MD5 (dhcp-3.0rc8.tar.gz) = 7dc2d0e71699eab558aff56430725266

Property changes on: head/net/isc-dhcp30-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.31
\ No newline at end of property
+1.32
\ No newline at end of property
Index: head/net/isc-dhcp30-server/files/patch-site.conf
===================================================================
--- head/net/isc-dhcp30-server/files/patch-site.conf	(revision 43591)
+++ head/net/isc-dhcp30-server/files/patch-site.conf	(revision 43592)
@@ -1,35 +1,36 @@
 --- 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
 +ADMMANEXT =	.8
 +FFMANDIR =	$(PREFIX)/man/man5
 +FFMANEXT =	.5
 +LIBMANDIR =	$(PREFIX)/man/man3
 +LIBMANEXT =	.3
 +MANCAT =	man
 +# INSTALL =	${INSTALL_DATA}
 +# MANINSTALL =	${INSTALL_MAN}
 +ETC =		$(PREFIX)/etc
 +LIBDIR =	${PREFIX}/lib
 +INCDIR =	${PREFIX}/include
 +
 +DEBUG ?=	#none
 +
 +CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
 +CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
 +CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
 +CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
 +CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
 +CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARDB)/dhclient.pid\"

Property changes on: head/net/isc-dhcp30-server/files/patch-site.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net/isc-dhcp30-server/pkg-plist
===================================================================
--- head/net/isc-dhcp30-server/pkg-plist	(revision 43591)
+++ head/net/isc-dhcp30-server/pkg-plist	(revision 43592)
@@ -1,35 +1,36 @@
 @comment $FreeBSD$
 %%SAMP_SUBDIR%%/dhclient.conf%%SAMP_SUFFIX%%
 %%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
 @exec [ -f %%DATA_DIR%%/dhclient.leases ] || touch %%DATA_DIR%%/dhclient.leases
 @unexec [ -s %%DATA_DIR%%/dhclient.leases ] || rm -f %%DATA_DIR%%/dhclient.leases
 @exec [ -f %%DATA_DIR%%/dhcpd.leases ] || touch %%DATA_DIR%%/dhcpd.leases
 @unexec [ -s %%DATA_DIR%%/dhcpd.leases ] || rm -f %%DATA_DIR%%/dhcpd.leases
 @exec [ -f %D/%%CONF_SUBDIR%%/dhclient.conf ] || touch %D/%%CONF_SUBDIR%%/dhclient.conf
 @unexec [ -L %D/%%CONF_SUBDIR%%/dhclient.conf -o -s %D/%%CONF_SUBDIR%%/dhclient.conf ] || rm -f %D/%%CONF_SUBDIR%%/dhclient.conf

Property changes on: head/net/isc-dhcp30-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/net/isc-dhcp31-server/Makefile
===================================================================
--- head/net/isc-dhcp31-server/Makefile	(revision 43591)
+++ head/net/isc-dhcp31-server/Makefile	(revision 43592)
@@ -1,197 +1,200 @@
 # ex:ts=8
 # Ports collection makefile for:    dhcp
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
 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} \
 		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
 		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
 		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
 		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
 		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
 		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
 		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
 		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
 MASTER_SITE_SUBDIR=	dhcp dpcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 
 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
 #
 
 # fast
 AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
 FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
 			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
 FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
 GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.gigabell.net/pub/%SUBDIR%/
 HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
 ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
 JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
 			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
 LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
 POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
 RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
 SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
 SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
 UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
 US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
 			ftp://ftp.nominum.com/pub/isc/SUBDIR%/
 NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # slow
 BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
 GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
 TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
 			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # for instance, possible version formats are, in order:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
 #	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
 VERSION=
 PATCHLEVEL=
 .if ${PORTVERSION:R:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R:R}
 VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .elif ${PORTVERSION:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R}
 VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
 .elif ${PORTVERSION:R:E} != ""
 RELEASE=	${PORTVERSION:R}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .else
 RELEASE=	${PORTVERSION}
 .endif
 
 PATCH_SUBDIRS=	common minires dst omapip server client relay dhcpctl
 
 SAMP_SUFFIX=	.sample
 
 BIN_FILES=	dhclient dhcpd dhcrelay
 CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf server/dhcpd.conf
 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
 INC_SUBDIR=	include
 LIB_SUBDIR=	lib
 DOC_SUBDIR=	share/doc/${PKGBASE}
 DATA_DIR=	/var/db
 
 STRIP_CMD?=	strip
 
 #
 # Post-patch
 #
 
 post-patch: patch-scripts patch-makefile-conf patch-makefiles-dist \
 	    patch-man-pages
 
 patch-scripts:
 	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \
 		${WRKSRC}/client/scripts/freebsd
 
 patch-makefile-conf:
 	@${PERL} -pi.fbsd -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
 		${WRKSRC}/Makefile.conf
 
 patch-makefiles-dist:
 .for subdir in ${PATCH_SUBDIRS}
 	@${PERL} -pi.fbsd -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
 		${WRKSRC}/${subdir}/Makefile.dist
 .endfor
 
 # temporary hack - no patch file needed for this typo.
 # grrr! don't know how to delete lines in perl :(
 patch-man-pages:
 	@${PERL} -pi.fbsd -e 's/^\.Fd$$//' ${WRKSRC}/dhcpctl/dhcpctl.3
 
 #
 # Post-install
 #
 
 post-install: strip-binary-files install-startup-files \
 	      install-doc-files install-sample-files \
 	      create-data-files create-conf-files
 
 strip-binary-files:
 .for file in ${BIN_FILES}
 .if exists(${PREFIX}/${BIN_SUBDIR}/${file})
 	@${STRIP_CMD} ${PREFIX}/${BIN_SUBDIR}/${file}
 .endif
 .endfor
 
 install-startup-files:
 .for file in ${RCD_FILES}
 	@${INSTALL_SCRIPT} ${FILESDIR}/${file} ${PREFIX}/${RCD_SUBDIR}
 .endfor
 
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
 .endfor
 .endif
 
 install-sample-files:
 .for file in ${SAMP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} \
 		${PREFIX}/${SAMP_SUBDIR}/${file:T}${SAMP_SUFFIX}
 .endfor
 
 create-data-files:
 .for file in ${DATA_FILES}
 .if !exists(${DATA_DIR}/${file})
 	@${TOUCH} ${DATA_DIR}/${file}
 .endif
 .endfor
 
 create-conf-files:
 .for file in ${CONF_FILES}
 .if !exists(${PREFIX}/${CONF_SUBDIR}/${file})
 	@${TOUCH} ${PREFIX}/${CONF_SUBDIR}/${file}
 .endif
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp31-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.63
\ No newline at end of property
+1.64
\ No newline at end of property
Index: head/net/isc-dhcp31-server/distinfo
===================================================================
--- head/net/isc-dhcp31-server/distinfo	(revision 43591)
+++ head/net/isc-dhcp31-server/distinfo	(revision 43592)
@@ -1 +1 @@
-MD5 (dhcp-3.0rc7.tar.gz) = 835be51c217c629d46fbcb422b1c91a9
+MD5 (dhcp-3.0rc8.tar.gz) = 7dc2d0e71699eab558aff56430725266

Property changes on: head/net/isc-dhcp31-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.31
\ No newline at end of property
+1.32
\ No newline at end of property
Index: head/net/isc-dhcp31-server/files/patch-site.conf
===================================================================
--- head/net/isc-dhcp31-server/files/patch-site.conf	(revision 43591)
+++ head/net/isc-dhcp31-server/files/patch-site.conf	(revision 43592)
@@ -1,35 +1,36 @@
 --- 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
 +ADMMANEXT =	.8
 +FFMANDIR =	$(PREFIX)/man/man5
 +FFMANEXT =	.5
 +LIBMANDIR =	$(PREFIX)/man/man3
 +LIBMANEXT =	.3
 +MANCAT =	man
 +# INSTALL =	${INSTALL_DATA}
 +# MANINSTALL =	${INSTALL_MAN}
 +ETC =		$(PREFIX)/etc
 +LIBDIR =	${PREFIX}/lib
 +INCDIR =	${PREFIX}/include
 +
 +DEBUG ?=	#none
 +
 +CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
 +CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
 +CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
 +CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
 +CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
 +CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARDB)/dhclient.pid\"

Property changes on: head/net/isc-dhcp31-server/files/patch-site.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net/isc-dhcp31-server/pkg-plist
===================================================================
--- head/net/isc-dhcp31-server/pkg-plist	(revision 43591)
+++ head/net/isc-dhcp31-server/pkg-plist	(revision 43592)
@@ -1,35 +1,36 @@
 @comment $FreeBSD$
 %%SAMP_SUBDIR%%/dhclient.conf%%SAMP_SUFFIX%%
 %%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
 @exec [ -f %%DATA_DIR%%/dhclient.leases ] || touch %%DATA_DIR%%/dhclient.leases
 @unexec [ -s %%DATA_DIR%%/dhclient.leases ] || rm -f %%DATA_DIR%%/dhclient.leases
 @exec [ -f %%DATA_DIR%%/dhcpd.leases ] || touch %%DATA_DIR%%/dhcpd.leases
 @unexec [ -s %%DATA_DIR%%/dhcpd.leases ] || rm -f %%DATA_DIR%%/dhcpd.leases
 @exec [ -f %D/%%CONF_SUBDIR%%/dhclient.conf ] || touch %D/%%CONF_SUBDIR%%/dhclient.conf
 @unexec [ -L %D/%%CONF_SUBDIR%%/dhclient.conf -o -s %D/%%CONF_SUBDIR%%/dhclient.conf ] || rm -f %D/%%CONF_SUBDIR%%/dhclient.conf

Property changes on: head/net/isc-dhcp31-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/net/isc-dhcp40-server/Makefile
===================================================================
--- head/net/isc-dhcp40-server/Makefile	(revision 43591)
+++ head/net/isc-dhcp40-server/Makefile	(revision 43592)
@@ -1,197 +1,200 @@
 # ex:ts=8
 # Ports collection makefile for:    dhcp
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
 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} \
 		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
 		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
 		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
 		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
 		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
 		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
 		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
 		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
 MASTER_SITE_SUBDIR=	dhcp dpcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 
 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
 #
 
 # fast
 AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
 FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
 			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
 FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
 GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.gigabell.net/pub/%SUBDIR%/
 HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
 ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
 JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
 			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
 LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
 POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
 RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
 SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
 SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
 			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
 UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
 US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
 			ftp://ftp.nominum.com/pub/isc/SUBDIR%/
 NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
 			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # slow
 BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
 GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
 TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
 			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 # for instance, possible version formats are, in order:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
 #	1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2
 VERSION=
 PATCHLEVEL=
 .if ${PORTVERSION:R:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R:R}
 VERSION=	${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .elif ${PORTVERSION:E:M[br]*} != ""
 RELEASE=	${PORTVERSION:R}
 VERSION=	${PORTVERSION:E:S/b/beta/:S/r/rc/}
 .elif ${PORTVERSION:R:E} != ""
 RELEASE=	${PORTVERSION:R}
 PATCHLEVEL=	pl${PORTVERSION:E}
 .else
 RELEASE=	${PORTVERSION}
 .endif
 
 PATCH_SUBDIRS=	common minires dst omapip server client relay dhcpctl
 
 SAMP_SUFFIX=	.sample
 
 BIN_FILES=	dhclient dhcpd dhcrelay
 CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf server/dhcpd.conf
 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
 INC_SUBDIR=	include
 LIB_SUBDIR=	lib
 DOC_SUBDIR=	share/doc/${PKGBASE}
 DATA_DIR=	/var/db
 
 STRIP_CMD?=	strip
 
 #
 # Post-patch
 #
 
 post-patch: patch-scripts patch-makefile-conf patch-makefiles-dist \
 	    patch-man-pages
 
 patch-scripts:
 	@${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \
 		${WRKSRC}/client/scripts/freebsd
 
 patch-makefile-conf:
 	@${PERL} -pi.fbsd -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
 		${WRKSRC}/Makefile.conf
 
 patch-makefiles-dist:
 .for subdir in ${PATCH_SUBDIRS}
 	@${PERL} -pi.fbsd -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
 		${WRKSRC}/${subdir}/Makefile.dist
 .endfor
 
 # temporary hack - no patch file needed for this typo.
 # grrr! don't know how to delete lines in perl :(
 patch-man-pages:
 	@${PERL} -pi.fbsd -e 's/^\.Fd$$//' ${WRKSRC}/dhcpctl/dhcpctl.3
 
 #
 # Post-install
 #
 
 post-install: strip-binary-files install-startup-files \
 	      install-doc-files install-sample-files \
 	      create-data-files create-conf-files
 
 strip-binary-files:
 .for file in ${BIN_FILES}
 .if exists(${PREFIX}/${BIN_SUBDIR}/${file})
 	@${STRIP_CMD} ${PREFIX}/${BIN_SUBDIR}/${file}
 .endif
 .endfor
 
 install-startup-files:
 .for file in ${RCD_FILES}
 	@${INSTALL_SCRIPT} ${FILESDIR}/${file} ${PREFIX}/${RCD_SUBDIR}
 .endfor
 
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
 .endfor
 .endif
 
 install-sample-files:
 .for file in ${SAMP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} \
 		${PREFIX}/${SAMP_SUBDIR}/${file:T}${SAMP_SUFFIX}
 .endfor
 
 create-data-files:
 .for file in ${DATA_FILES}
 .if !exists(${DATA_DIR}/${file})
 	@${TOUCH} ${DATA_DIR}/${file}
 .endif
 .endfor
 
 create-conf-files:
 .for file in ${CONF_FILES}
 .if !exists(${PREFIX}/${CONF_SUBDIR}/${file})
 	@${TOUCH} ${PREFIX}/${CONF_SUBDIR}/${file}
 .endif
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp40-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.63
\ No newline at end of property
+1.64
\ No newline at end of property
Index: head/net/isc-dhcp40-server/distinfo
===================================================================
--- head/net/isc-dhcp40-server/distinfo	(revision 43591)
+++ head/net/isc-dhcp40-server/distinfo	(revision 43592)
@@ -1 +1 @@
-MD5 (dhcp-3.0rc7.tar.gz) = 835be51c217c629d46fbcb422b1c91a9
+MD5 (dhcp-3.0rc8.tar.gz) = 7dc2d0e71699eab558aff56430725266

Property changes on: head/net/isc-dhcp40-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.31
\ No newline at end of property
+1.32
\ No newline at end of property
Index: head/net/isc-dhcp40-server/files/patch-site.conf
===================================================================
--- head/net/isc-dhcp40-server/files/patch-site.conf	(revision 43591)
+++ head/net/isc-dhcp40-server/files/patch-site.conf	(revision 43592)
@@ -1,35 +1,36 @@
 --- 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
 +ADMMANEXT =	.8
 +FFMANDIR =	$(PREFIX)/man/man5
 +FFMANEXT =	.5
 +LIBMANDIR =	$(PREFIX)/man/man3
 +LIBMANEXT =	.3
 +MANCAT =	man
 +# INSTALL =	${INSTALL_DATA}
 +# MANINSTALL =	${INSTALL_MAN}
 +ETC =		$(PREFIX)/etc
 +LIBDIR =	${PREFIX}/lib
 +INCDIR =	${PREFIX}/include
 +
 +DEBUG ?=	#none
 +
 +CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
 +CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
 +CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
 +
 +CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
 +CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
 +CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
 +CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARDB)/dhclient.pid\"

Property changes on: head/net/isc-dhcp40-server/files/patch-site.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net/isc-dhcp40-server/pkg-plist
===================================================================
--- head/net/isc-dhcp40-server/pkg-plist	(revision 43591)
+++ head/net/isc-dhcp40-server/pkg-plist	(revision 43592)
@@ -1,35 +1,36 @@
 @comment $FreeBSD$
 %%SAMP_SUBDIR%%/dhclient.conf%%SAMP_SUFFIX%%
 %%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
 @exec [ -f %%DATA_DIR%%/dhclient.leases ] || touch %%DATA_DIR%%/dhclient.leases
 @unexec [ -s %%DATA_DIR%%/dhclient.leases ] || rm -f %%DATA_DIR%%/dhclient.leases
 @exec [ -f %%DATA_DIR%%/dhcpd.leases ] || touch %%DATA_DIR%%/dhcpd.leases
 @unexec [ -s %%DATA_DIR%%/dhcpd.leases ] || rm -f %%DATA_DIR%%/dhcpd.leases
 @exec [ -f %D/%%CONF_SUBDIR%%/dhclient.conf ] || touch %D/%%CONF_SUBDIR%%/dhclient.conf
 @unexec [ -L %D/%%CONF_SUBDIR%%/dhclient.conf -o -s %D/%%CONF_SUBDIR%%/dhclient.conf ] || rm -f %D/%%CONF_SUBDIR%%/dhclient.conf

Property changes on: head/net/isc-dhcp40-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property