Update to 4.1.0

ISC DHCP 4.1.x will have several new DHCPv6 features that were not in DHCP 4.0.x. These new features include:

* Support for the rapid-commit option on the client side
* Prefix Delegation support
* IA_TA address support
* A basic DHCPv6 relay agent
* basic DHCPv6 Leasequery support

18 files changed, 69 insertions, 97 deletions

diff --git a/net/isc-dhclient4/Makefile b/net/isc-dhclient4/Makefile
index 8a73c2c2a67..e9003cd4711 100644
--- a/net/isc-dhclient4/Makefile
+++ b/net/isc-dhclient4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 00:59:23 adrianp Exp $
 #
 
+PKGNAME=	isc-dhclient-${DHVER}
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Client
-COMPONENT=	client
-PKGREVISION=	1
 SUBDIR=		client
 
 CONF_FILES+=	${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
diff --git a/net/isc-dhclient4/PLIST b/net/isc-dhclient4/PLIST
index 20ead260c21..ca3cf280f07 100644
--- a/net/isc-dhclient4/PLIST
+++ b/net/isc-dhclient4/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:05:21 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:59:23 adrianp Exp $
 man/man5/dhclient.conf.5
 man/man5/dhclient.leases.5
 man/man8/dhclient-script.8
 man/man8/dhclient.8
 sbin/dhclient
-share/examples/isc-dhcp-client/dhclient.conf
+share/examples/isc-dhclient/dhclient.conf
 share/examples/rc.d/isc_dhclient
-@dirrm share/examples/isc-dhcp-client
+@dirrm share/examples/isc-dhclient
diff --git a/net/isc-dhclient4/distinfo b/net/isc-dhclient4/distinfo
deleted file mode 100644
index 2f60323a443..00000000000
--- a/net/isc-dhclient4/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
-
-SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
-RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
-Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
-SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
-SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
-SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff --git a/net/isc-dhcp4/files/isc_dhclient.sh b/net/isc-dhclient4/files/isc_dhclient.sh
index 4134b932ee2..3f35d23e634 100755
--- a/net/isc-dhcp4/files/isc_dhclient.sh
+++ b/net/isc-dhclient4/files/isc_dhclient.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhclient.sh,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: isc_dhclient.sh,v 1.1 2009/01/04 00:59:23 adrianp Exp $
 #
 
 # PROVIDE: dhclient
@@ -15,10 +15,10 @@ if [ -f /etc/rc.subr ]; then
         . /etc/rc.subr
 fi
 
-name="dhclient"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
+name="isc_dhclient"
+rcvar="${name}"
+command="@PREFIX@/sbin/dhclient"
+pidfile="@VARBASE@/run/isc-dhcp/isc-dhclient.pid"
 start_precmd="isc_dhclient_precmd"
 
 isc_dhclient_precmd()
diff --git a/net/isc-dhcp4/Makefile b/net/isc-dhcp4/Makefile
index ac0a1d07956..523ad1f915f 100644
--- a/net/isc-dhcp4/Makefile
+++ b/net/isc-dhcp4/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 00:56:32 adrianp Exp $
 #
 
+PKGNAME=	isc-dhcp-${DHVER}
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Base
-COMPONENT=	base
-PKGREVISION=	1
 SUBDIR=		includes common minires dst
 
 .include "options.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
 
 	${INSTALL_DATA} ${WRKSRC}/README \
-		${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+		${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/RELNOTES \
-		${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+		${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/References.txt \
-		${PREFIX}/share/doc/isc-dhcp-${COMPONENT}
+		${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 5f2cefd7fd0..c8a18625fae 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.common,v 1.3 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/01/04 00:56:32 adrianp Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
 # used by net/isc-dhclient4/Makefile
 # used by net/isc-dhcrelay4/Makefile
 
-DISTNAME=		dhcp-4.0.0
-PKGNAME=		${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/}
+DISTNAME=		dhcp-4.1.0
+DHVER=			${DISTNAME:S/dhcp-//}
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=		adrianp@NetBSD.org
-HOMEPAGE=		http://www.isc.org/sw/dhcp/dhcp4_0.php
+HOMEPAGE=		https://www.isc.org/sw/dhcp
 
 CONFLICTS+=		isc-dhcp-base-3.*{,nb*}
 
@@ -22,9 +22,9 @@ DHCP_HOME?=		${VARBASE}/db/isc-dhcp
 DHCP_PID?=		${VARBASE}/run/isc-dhcp
 PKG_SYSCONFSUBDIR=	dhcp
 
-FILESDIR=		${.CURDIR}/../isc-dhcp4/files
 PATCHDIR=		${.CURDIR}/../isc-dhcp4/patches
-EGDIR=			${PREFIX}/share/examples/isc-dhcp-${COMPONENT}
+DISTINFO_FILE= 		${.CURDIR}/../isc-dhcp4/distinfo
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 BUILD_DEFS+=		VARBASE DHCP_HOME DHCP_PID
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
diff --git a/net/isc-dhcp4/PLIST b/net/isc-dhcp4/PLIST
index 4a9a4e29cb9..3e443fdd023 100644
--- a/net/isc-dhcp4/PLIST
+++ b/net/isc-dhcp4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:56:32 adrianp Exp $
 include/isc-dhcp/boolean.h
 include/isc-dhcp/commandline.h
 include/isc-dhcp/dst.h
@@ -21,9 +21,9 @@ include/omapip/trace.h
 lib/libdst.a
 man/man5/dhcp-eval.5
 man/man5/dhcp-options.5
-share/doc/isc-dhcp-base/README
-share/doc/isc-dhcp-base/RELNOTES
-share/doc/isc-dhcp-base/References.txt
-@dirrm share/doc/isc-dhcp-base
+share/doc/isc-dhcp/README
+share/doc/isc-dhcp/RELNOTES
+share/doc/isc-dhcp/References.txt
+@dirrm share/doc/isc-dhcp
 @dirrm include/isc-dhcp
 @dirrm include/omapip
diff --git a/net/isc-dhcp4/buildlink3.mk b/net/isc-dhcp4/buildlink3.mk
index 76907e0c2c5..9c1e452eca3 100644
--- a/net/isc-dhcp4/buildlink3.mk
+++ b/net/isc-dhcp4/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/01/04 00:56:32 adrianp Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-ISC_DHCP_BASE_BUILDLINK3_MK:=	${ISC_DHCP_BASE_BUILDLINK3_MK}+
+ISC_DHCP_BUILDLINK3_MK:=	${ISC_DHCP_BUILDLINK3_MK}+
 
 .if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	isc-dhcp-base
+BUILDLINK_DEPENDS+=	isc-dhcp
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nisc-dhcp-base}
-BUILDLINK_PACKAGES+=	isc-dhcp-base
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp-base
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nisc-dhcp}
+BUILDLINK_PACKAGES+=	isc-dhcp
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp
 
-.if ${ISC_DHCP_BASE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.isc-dhcp-base+=	isc-dhcp-base>=4.0.0
-BUILDLINK_PKGSRCDIR.isc-dhcp-base?=	../../net/isc-dhcp4
-.endif	# ISC_DHCP_BASE_BUILDLINK3_MK
+.if ${ISC_DHCP_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.isc-dhcp+=	isc-dhcp>=4.1.0
+BUILDLINK_PKGSRCDIR.isc-dhcp?=	../../net/isc-dhcp4
+.endif	# ISC_DHCP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index 2f60323a443..52f9be3594f 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/01/04 00:56:32 adrianp Exp $
 
-SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
-RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
-Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
-SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
-SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
+SHA1 (dhcp-4.1.0.tar.gz) = 46e161892140a3b60cd56e62b442f48f51bc605f
+RMD160 (dhcp-4.1.0.tar.gz) = bf96fa9d135a65b4d9b27f8caf4f3744f0636c80
+Size (dhcp-4.1.0.tar.gz) = 1086815 bytes
+SHA1 (patch-aa) = 4090c4198ee16bd596d16a06856cfb5bb83dab81
+SHA1 (patch-ab) = 049a3a5037c91a83c0f3eb22e76d861d8c3aa801
 SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff --git a/net/isc-dhcp4/patches/patch-aa b/net/isc-dhcp4/patches/patch-aa
index d74f991b82b..fc373da0828 100644
--- a/net/isc-dhcp4/patches/patch-aa
+++ b/net/isc-dhcp4/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2009/01/04 00:56:32 adrianp Exp $
 
---- server/Makefile.in.orig	2007-12-14 18:26:36.000000000 +0000
+--- server/Makefile.in.orig	2008-12-05 20:14:57.000000000 +0000
 +++ server/Makefile.in
-@@ -367,13 +367,6 @@ uninstall-man8:
+@@ -360,13 +360,6 @@ uninstall-man8:
  	done
  install-dist_sysconfDATA: $(dist_sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+-	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
 -	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  f=$(am__strip_dir) \
diff --git a/net/isc-dhcp4/patches/patch-ab b/net/isc-dhcp4/patches/patch-ab
index 6b4d9598086..647e39e6974 100644
--- a/net/isc-dhcp4/patches/patch-ab
+++ b/net/isc-dhcp4/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+$NetBSD: patch-ab,v 1.2 2009/01/04 00:56:32 adrianp Exp $
 
---- client/Makefile.in.orig	2007-12-14 18:26:07.000000000 +0000
+--- client/Makefile.in.orig	2008-12-05 20:14:48.000000000 +0000
 +++ client/Makefile.in
-@@ -347,13 +347,6 @@ uninstall-man8:
+@@ -341,13 +341,6 @@ uninstall-man8:
  	done
  install-dist_sysconfDATA: $(dist_sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+-	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
 -	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  f=$(am__strip_dir) \
diff --git a/net/isc-dhcpd4/Makefile b/net/isc-dhcpd4/Makefile
index 9459845b2f3..8bc91722ef6 100644
--- a/net/isc-dhcpd4/Makefile
+++ b/net/isc-dhcpd4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 00:58:41 adrianp Exp $
 #
 
+PKGNAME=	isc-dhcpd-${DHVER}
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Server
-COMPONENT=	server
-PKGREVISION=	1
 SUBDIR=		omapip dhcpctl server
 
 CONF_FILES+=	${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
diff --git a/net/isc-dhcpd4/PLIST b/net/isc-dhcpd4/PLIST
index bb9d5861c7c..01954a0d57f 100644
--- a/net/isc-dhcpd4/PLIST
+++ b/net/isc-dhcpd4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/13 22:06:15 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/04 00:58:41 adrianp Exp $
 bin/omshell
 lib/libdhcpctl.a
 lib/libomapi.a
@@ -9,6 +9,6 @@ man/man5/dhcpd.conf.5
 man/man5/dhcpd.leases.5
 man/man8/dhcpd.8
 sbin/dhcpd
-share/examples/isc-dhcp-server/dhcpd.conf
+share/examples/isc-dhcpd/dhcpd.conf
 share/examples/rc.d/isc_dhcpd
-@dirrm share/examples/isc-dhcp-server
+@dirrm share/examples/isc-dhcpd
diff --git a/net/isc-dhcpd4/distinfo b/net/isc-dhcpd4/distinfo
deleted file mode 100644
index 2f60323a443..00000000000
--- a/net/isc-dhcpd4/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
-
-SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
-RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
-Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
-SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
-SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
-SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff --git a/net/isc-dhcp4/files/isc_dhcpd.sh b/net/isc-dhcpd4/files/isc_dhcpd.sh
index 5ad79967233..5fc6f711d83 100755
--- a/net/isc-dhcp4/files/isc_dhcpd.sh
+++ b/net/isc-dhcpd4/files/isc_dhcpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhcpd.sh,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: isc_dhcpd.sh,v 1.1 2009/01/04 00:58:42 adrianp Exp $
 #
 
 # PROVIDE: dhcpd
@@ -11,11 +11,11 @@ if [ -f /etc/rc.subr ]; then
         . /etc/rc.subr
 fi
 
-name="dhcpd"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
+name="isc_dhcpd"
+rcvar="${name}"
+command="@PREFIX@/sbin/dhcpd"
+pidfile="@VARBASE@/run/isc-dhcp/isc-dhcpd.pid"
+required_files="@PKG_SYSCONFDIR@/dhcpd.conf"
 start_precmd="isc_dhcpd_precmd"
 
 isc_dhcpd_precmd()
diff --git a/net/isc-dhcrelay4/Makefile b/net/isc-dhcrelay4/Makefile
index 57566b3092a..c10da672696 100644
--- a/net/isc-dhcrelay4/Makefile
+++ b/net/isc-dhcrelay4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/12/21 21:24:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 01:00:09 adrianp Exp $
 #
 
+PKGNAME=	isc-dhcrelay-${DHVER}
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Relay
-COMPONENT=	relay
-PKGREVISION=	1
 SUBDIR=		relay
 
 RCD_SCRIPTS=	isc_dhcrelay
diff --git a/net/isc-dhcrelay4/distinfo b/net/isc-dhcrelay4/distinfo
deleted file mode 100644
index 2f60323a443..00000000000
--- a/net/isc-dhcrelay4/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/12/21 21:24:08 adrianp Exp $
-
-SHA1 (dhcp-4.0.0.tar.gz) = acb4ab7634ba002893b15baba1443ef4d6c92201
-RMD160 (dhcp-4.0.0.tar.gz) = 86963598124617bc7d1059262c75176db431f26d
-Size (dhcp-4.0.0.tar.gz) = 1043725 bytes
-SHA1 (patch-aa) = 162f8950cfcbb9647b81d8d1518867aaf8ec7905
-SHA1 (patch-ab) = cd38b5075d2f3a3121fb7dc9f870a6091c603ef1
-SHA1 (patch-ac) = 7079a37a7bbdf7ede805ecba61700ecf86fffaea
diff --git a/net/isc-dhcp4/files/isc_dhcrelay.sh b/net/isc-dhcrelay4/files/isc_dhcrelay.sh
index bbe0ac46117..136e1e43d5e 100755
--- a/net/isc-dhcp4/files/isc_dhcrelay.sh
+++ b/net/isc-dhcrelay4/files/isc_dhcrelay.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhcrelay.sh,v 1.1.1.1 2008/02/13 22:03:58 adrianp Exp $
+# $NetBSD: isc_dhcrelay.sh,v 1.1 2009/01/04 01:00:09 adrianp Exp $
 #
 
 # PROVIDE: dhcrelay
@@ -15,10 +15,10 @@ if [ -f /etc/rc.subr ]; then
         . /etc/rc.subr
 fi
 
-name="dhcrelay"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
+name="isc_dhcrelay"
+rcvar="${name}"
+command="@PREFIX@/sbin/dhcrelay"
+pidfile="@VARBASE@/run/isc-dhcp/isc-dhcrelay.pid"
 start_precmd="isc_dhcrelay_precmd"
 
 isc_dhcrelay_precmd()