Update the net/isc-dhcp3-* ports to version 3.0.5rc2.

Changes since version 3.0.5rc1:
*  A bug was repaired in fixes to the dhclient, which saught to run the
   dhclient-script with the 'EXPIRE' state should it receive a NAK in
   response to a REQUEST. The client now iterates the PREINIT state
   after the EXPIRE state, so that interfaces that might be configured
   'down' can be brought back 'up' and initialized.
*  DHCPINFORM handling for clients that properly set ciaddr and come to
   the server via a relay agent has been repaired.

PR:		ports/102680
Submitted:	maintainer

8 files changed, 108 insertions, 40 deletions

diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index b3cb4ba3290a..f7421f816aa4 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,7 +7,8 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r1
+PORTVERSION=	3.0.5.r2
+PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -18,6 +19,11 @@ DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
+PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	0
+PORTREVISION_RELAY=	0
+PORTREVISION_DEVEL=	0
+
 SUBSYS?=	server
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -35,6 +41,17 @@ OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
 		DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
 .endif
 
+# PORTREVISION handling
+.if ${SUBSYS} == client
+DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
+.elif ${SUBSYS} == relay
+DHCP_PORTREVISION=	${PORTREVISION_RELAY}
+.elif ${SUBSYS} == devel
+DHCP_PORTREVISION=	${PORTREVISION_DEVEL}
+.else
+DHCP_PORTREVISION=	${PORTREVISION_SERVER}
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index 50e34e05f3c2..388f6940d23e 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
-SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
-SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
-MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
+SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
+SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
+MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index b3cb4ba3290a..f7421f816aa4 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,7 +7,8 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r1
+PORTVERSION=	3.0.5.r2
+PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -18,6 +19,11 @@ DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
+PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	0
+PORTREVISION_RELAY=	0
+PORTREVISION_DEVEL=	0
+
 SUBSYS?=	server
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -35,6 +41,17 @@ OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
 		DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
 .endif
 
+# PORTREVISION handling
+.if ${SUBSYS} == client
+DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
+.elif ${SUBSYS} == relay
+DHCP_PORTREVISION=	${PORTREVISION_RELAY}
+.elif ${SUBSYS} == devel
+DHCP_PORTREVISION=	${PORTREVISION_DEVEL}
+.else
+DHCP_PORTREVISION=	${PORTREVISION_SERVER}
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index 50e34e05f3c2..388f6940d23e 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
-SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
-SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
-MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
+SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
+SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
+MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index b3cb4ba3290a..f7421f816aa4 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,7 +7,8 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r1
+PORTVERSION=	3.0.5.r2
+PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -18,6 +19,11 @@ DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
+PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	0
+PORTREVISION_RELAY=	0
+PORTREVISION_DEVEL=	0
+
 SUBSYS?=	server
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -35,6 +41,17 @@ OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
 		DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
 .endif
 
+# PORTREVISION handling
+.if ${SUBSYS} == client
+DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
+.elif ${SUBSYS} == relay
+DHCP_PORTREVISION=	${PORTREVISION_RELAY}
+.elif ${SUBSYS} == devel
+DHCP_PORTREVISION=	${PORTREVISION_DEVEL}
+.else
+DHCP_PORTREVISION=	${PORTREVISION_SERVER}
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index 50e34e05f3c2..388f6940d23e 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
-SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
-SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
-MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
+SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
+SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
+MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index b3cb4ba3290a..f7421f816aa4 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,7 +7,8 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.5.r1
+PORTVERSION=	3.0.5.r2
+PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -18,6 +19,11 @@ DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
+PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	0
+PORTREVISION_RELAY=	0
+PORTREVISION_DEVEL=	0
+
 SUBSYS?=	server
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -35,6 +41,17 @@ OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
 		DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
 .endif
 
+# PORTREVISION handling
+.if ${SUBSYS} == client
+DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
+.elif ${SUBSYS} == relay
+DHCP_PORTREVISION=	${PORTREVISION_RELAY}
+.elif ${SUBSYS} == devel
+DHCP_PORTREVISION=	${PORTREVISION_DEVEL}
+.else
+DHCP_PORTREVISION=	${PORTREVISION_SERVER}
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index 50e34e05f3c2..388f6940d23e 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
-SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
-SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
-MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
-SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
-SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
-MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc2.tar.gz) = f14122e6b414f5881e6926aa5d88c56a
+SHA256 (dhcp-3.0.5rc2.tar.gz) = 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
+SIZE (dhcp-3.0.5rc2.tar.gz) = 876507
+MD5 (dhcp-3.0.5rc2-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc2-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc2-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc2-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc2-dlq-patch) = 7655