15 files changed, 110 insertions, 145 deletions
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index baccb1844ec6..c5ac6363c3f2 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.b2.24
+PORTVERSION=	3.0.r1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:R}pl${PORTVERSION:E}
 
 MAINTAINER=	clefevre@poboxes.com
 
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index b4d0c5e6cbed..a72f6377fd0e 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b2pl24.tar.gz) = ea48b791cb2be15c6d3458f5f55de8ca
+MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773
diff --git a/net/isc-dhcp3-server/pkg-descr b/net/isc-dhcp3-server/pkg-descr
index ec2d72947025..47c2b8c9ada8 100644
--- a/net/isc-dhcp3-server/pkg-descr
+++ b/net/isc-dhcp3-server/pkg-descr
@@ -1,31 +1,24 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides
-a freely redistributable reference implementation of all aspects
-of the DHCP protocol, through a suite of DHCP tools:
+The ISC Dynamic Host Configuration Protocol Distribution provides a
+freely redistributable reference implementation of all aspects of the
+DHCP protocol, through a suite of DHCP tools:
 
-    * A DHCP server
-    * A DHCP client
-    * A DHCP relay agent
+  * A DHCP server
+  * A DHCP client
+  * A DHCP relay agent
 
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0:
+Version 3 of the ISC DHCP Distribution includes the following features
+that are new since version 2.0:
 
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state.
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features.
-
-Also, a fully-featured implementation of dynamic DNS updates is
-included and there are no build dependencies with any BIND version.
-
-Since patch-level 15, a log-facility configuration parameter has
-been added, see the manual pages for details.
+  * DHCP Failover Protocol support
+  * OMAPI, an API for accessing and modifying the DHCP server and client state
+  * Conditional behaviour
+  * Storing arbitrary information on leases
+  * Address pools with access control
+  * Client classing
+  * Address allocation restriction by class
+  * Relay agent information option support 
+  * Dynamic DNS updates
+  * Many bug fixes, performance enhancements, and minor new DHCP protocol
+    features. 
 
 WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index baccb1844ec6..c5ac6363c3f2 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.b2.24
+PORTVERSION=	3.0.r1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:R}pl${PORTVERSION:E}
 
 MAINTAINER=	clefevre@poboxes.com
 
diff --git a/net/isc-dhcp3/distinfo b/net/isc-dhcp3/distinfo
index b4d0c5e6cbed..a72f6377fd0e 100644
--- a/net/isc-dhcp3/distinfo
+++ b/net/isc-dhcp3/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b2pl24.tar.gz) = ea48b791cb2be15c6d3458f5f55de8ca
+MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773
diff --git a/net/isc-dhcp3/pkg-descr b/net/isc-dhcp3/pkg-descr
index ec2d72947025..47c2b8c9ada8 100644
--- a/net/isc-dhcp3/pkg-descr
+++ b/net/isc-dhcp3/pkg-descr
@@ -1,31 +1,24 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides
-a freely redistributable reference implementation of all aspects
-of the DHCP protocol, through a suite of DHCP tools:
+The ISC Dynamic Host Configuration Protocol Distribution provides a
+freely redistributable reference implementation of all aspects of the
+DHCP protocol, through a suite of DHCP tools:
 
-    * A DHCP server
-    * A DHCP client
-    * A DHCP relay agent
+  * A DHCP server
+  * A DHCP client
+  * A DHCP relay agent
 
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0:
+Version 3 of the ISC DHCP Distribution includes the following features
+that are new since version 2.0:
 
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state.
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features.
-
-Also, a fully-featured implementation of dynamic DNS updates is
-included and there are no build dependencies with any BIND version.
-
-Since patch-level 15, a log-facility configuration parameter has
-been added, see the manual pages for details.
+  * DHCP Failover Protocol support
+  * OMAPI, an API for accessing and modifying the DHCP server and client state
+  * Conditional behaviour
+  * Storing arbitrary information on leases
+  * Address pools with access control
+  * Client classing
+  * Address allocation restriction by class
+  * Relay agent information option support 
+  * Dynamic DNS updates
+  * Many bug fixes, performance enhancements, and minor new DHCP protocol
+    features. 
 
 WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index baccb1844ec6..c5ac6363c3f2 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.b2.24
+PORTVERSION=	3.0.r1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:R}pl${PORTVERSION:E}
 
 MAINTAINER=	clefevre@poboxes.com
 
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index b4d0c5e6cbed..a72f6377fd0e 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b2pl24.tar.gz) = ea48b791cb2be15c6d3458f5f55de8ca
+MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773
diff --git a/net/isc-dhcp30-server/pkg-descr b/net/isc-dhcp30-server/pkg-descr
index ec2d72947025..47c2b8c9ada8 100644
--- a/net/isc-dhcp30-server/pkg-descr
+++ b/net/isc-dhcp30-server/pkg-descr
@@ -1,31 +1,24 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides
-a freely redistributable reference implementation of all aspects
-of the DHCP protocol, through a suite of DHCP tools:
+The ISC Dynamic Host Configuration Protocol Distribution provides a
+freely redistributable reference implementation of all aspects of the
+DHCP protocol, through a suite of DHCP tools:
 
-    * A DHCP server
-    * A DHCP client
-    * A DHCP relay agent
+  * A DHCP server
+  * A DHCP client
+  * A DHCP relay agent
 
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0:
+Version 3 of the ISC DHCP Distribution includes the following features
+that are new since version 2.0:
 
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state.
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features.
-
-Also, a fully-featured implementation of dynamic DNS updates is
-included and there are no build dependencies with any BIND version.
-
-Since patch-level 15, a log-facility configuration parameter has
-been added, see the manual pages for details.
+  * DHCP Failover Protocol support
+  * OMAPI, an API for accessing and modifying the DHCP server and client state
+  * Conditional behaviour
+  * Storing arbitrary information on leases
+  * Address pools with access control
+  * Client classing
+  * Address allocation restriction by class
+  * Relay agent information option support 
+  * Dynamic DNS updates
+  * Many bug fixes, performance enhancements, and minor new DHCP protocol
+    features. 
 
 WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index baccb1844ec6..c5ac6363c3f2 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.b2.24
+PORTVERSION=	3.0.r1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:R}pl${PORTVERSION:E}
 
 MAINTAINER=	clefevre@poboxes.com
 
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index b4d0c5e6cbed..a72f6377fd0e 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b2pl24.tar.gz) = ea48b791cb2be15c6d3458f5f55de8ca
+MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773
diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr
index ec2d72947025..47c2b8c9ada8 100644
--- a/net/isc-dhcp31-server/pkg-descr
+++ b/net/isc-dhcp31-server/pkg-descr
@@ -1,31 +1,24 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides
-a freely redistributable reference implementation of all aspects
-of the DHCP protocol, through a suite of DHCP tools:
+The ISC Dynamic Host Configuration Protocol Distribution provides a
+freely redistributable reference implementation of all aspects of the
+DHCP protocol, through a suite of DHCP tools:
 
-    * A DHCP server
-    * A DHCP client
-    * A DHCP relay agent
+  * A DHCP server
+  * A DHCP client
+  * A DHCP relay agent
 
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0:
+Version 3 of the ISC DHCP Distribution includes the following features
+that are new since version 2.0:
 
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state.
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features.
-
-Also, a fully-featured implementation of dynamic DNS updates is
-included and there are no build dependencies with any BIND version.
-
-Since patch-level 15, a log-facility configuration parameter has
-been added, see the manual pages for details.
+  * DHCP Failover Protocol support
+  * OMAPI, an API for accessing and modifying the DHCP server and client state
+  * Conditional behaviour
+  * Storing arbitrary information on leases
+  * Address pools with access control
+  * Client classing
+  * Address allocation restriction by class
+  * Relay agent information option support 
+  * Dynamic DNS updates
+  * Many bug fixes, performance enhancements, and minor new DHCP protocol
+    features. 
 
 WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index baccb1844ec6..c5ac6363c3f2 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.b2.24
+PORTVERSION=	3.0.r1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:R}pl${PORTVERSION:E}
 
 MAINTAINER=	clefevre@poboxes.com
 
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index b4d0c5e6cbed..a72f6377fd0e 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0b2pl24.tar.gz) = ea48b791cb2be15c6d3458f5f55de8ca
+MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773
diff --git a/net/isc-dhcp40-server/pkg-descr b/net/isc-dhcp40-server/pkg-descr
index ec2d72947025..47c2b8c9ada8 100644
--- a/net/isc-dhcp40-server/pkg-descr
+++ b/net/isc-dhcp40-server/pkg-descr
@@ -1,31 +1,24 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides
-a freely redistributable reference implementation of all aspects
-of the DHCP protocol, through a suite of DHCP tools:
+The ISC Dynamic Host Configuration Protocol Distribution provides a
+freely redistributable reference implementation of all aspects of the
+DHCP protocol, through a suite of DHCP tools:
 
-    * A DHCP server
-    * A DHCP client
-    * A DHCP relay agent
+  * A DHCP server
+  * A DHCP client
+  * A DHCP relay agent
 
-Version 3, Beta 2 of the ISC DHCP Distribution includes the following
-features that are new since version 2.0:
+Version 3 of the ISC DHCP Distribution includes the following features
+that are new since version 2.0:
 
-    * DHCP Failover Protocol support 
-    * OMAPI, an API for accessing and modifying the DHCP
-      server and client state.
-    * Conditional behaviour 
-    * Storing arbitrary information on leases 
-    * Address pools with access control 
-    * Client classing 
-    * Address allocation restriction by class 
-    * Relay agent information option support 
-    * Dynamic DNS updates 
-    * Many bug fixes, performance enhancements, and minor
-      new DHCP protocol features.
-
-Also, a fully-featured implementation of dynamic DNS updates is
-included and there are no build dependencies with any BIND version.
-
-Since patch-level 15, a log-facility configuration parameter has
-been added, see the manual pages for details.
+  * DHCP Failover Protocol support
+  * OMAPI, an API for accessing and modifying the DHCP server and client state
+  * Conditional behaviour
+  * Storing arbitrary information on leases
+  * Address pools with access control
+  * Client classing
+  * Address allocation restriction by class
+  * Relay agent information option support 
+  * Dynamic DNS updates
+  * Many bug fixes, performance enhancements, and minor new DHCP protocol
+    features. 
 
 WWW: http://www.isc.org/products/DHCP/