diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 9f5b839828b1..4bdee6352da3 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,17 +7,13 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r11
-PORTREVISION=	1
+PORTVERSION=	3.0.1.r12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-PATCH_SITES=	http://security.debian.org/pool/updates/main/d/dhcp3/
-PATCHFILES=	dhcp3_3.0+3.0.1rc9-2.2.diff.gz
-PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index a115bf548825..8f17696d97cc 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (dhcp-3.0.1rc11.tar.gz) = af79b0453ac67fb6824247d3d48fff91
+MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
 MD5 (dhcp3_3.0+3.0.1rc9-2.2.diff.gz) = 9d555df929ea70ef2b36f7455298a79f
diff --git a/net/isc-dhcp3-server/pkg-plist b/net/isc-dhcp3-server/pkg-plist
index f60b752e35d9..e23d06935e9a 100644
--- a/net/isc-dhcp3-server/pkg-plist
+++ b/net/isc-dhcp3-server/pkg-plist
@@ -31,12 +31,12 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS
-%%PORTDOCS%%share/doc/isc-dhcp3/CHANGES
-%%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT
-%%PORTDOCS%%share/doc/isc-dhcp3/README
-%%PORTDOCS%%share/doc/isc-dhcp3/RELNOTES
-%%PORTDOCS%%@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/omapip
 @dirrm include/isc-dhcp
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 9f5b839828b1..4bdee6352da3 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -7,17 +7,13 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r11
-PORTREVISION=	1
+PORTVERSION=	3.0.1.r12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-PATCH_SITES=	http://security.debian.org/pool/updates/main/d/dhcp3/
-PATCHFILES=	dhcp3_3.0+3.0.1rc9-2.2.diff.gz
-PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp3/distinfo b/net/isc-dhcp3/distinfo
index a115bf548825..8f17696d97cc 100644
--- a/net/isc-dhcp3/distinfo
+++ b/net/isc-dhcp3/distinfo
@@ -1,2 +1,2 @@
-MD5 (dhcp-3.0.1rc11.tar.gz) = af79b0453ac67fb6824247d3d48fff91
+MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
 MD5 (dhcp3_3.0+3.0.1rc9-2.2.diff.gz) = 9d555df929ea70ef2b36f7455298a79f
diff --git a/net/isc-dhcp3/pkg-plist b/net/isc-dhcp3/pkg-plist
index f60b752e35d9..e23d06935e9a 100644
--- a/net/isc-dhcp3/pkg-plist
+++ b/net/isc-dhcp3/pkg-plist
@@ -31,12 +31,12 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS
-%%PORTDOCS%%share/doc/isc-dhcp3/CHANGES
-%%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT
-%%PORTDOCS%%share/doc/isc-dhcp3/README
-%%PORTDOCS%%share/doc/isc-dhcp3/RELNOTES
-%%PORTDOCS%%@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/omapip
 @dirrm include/isc-dhcp
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 9f5b839828b1..4bdee6352da3 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,17 +7,13 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r11
-PORTREVISION=	1
+PORTVERSION=	3.0.1.r12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-PATCH_SITES=	http://security.debian.org/pool/updates/main/d/dhcp3/
-PATCHFILES=	dhcp3_3.0+3.0.1rc9-2.2.diff.gz
-PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index a115bf548825..8f17696d97cc 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (dhcp-3.0.1rc11.tar.gz) = af79b0453ac67fb6824247d3d48fff91
+MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
 MD5 (dhcp3_3.0+3.0.1rc9-2.2.diff.gz) = 9d555df929ea70ef2b36f7455298a79f
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
index f60b752e35d9..e23d06935e9a 100644
--- a/net/isc-dhcp30-server/pkg-plist
+++ b/net/isc-dhcp30-server/pkg-plist
@@ -31,12 +31,12 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS
-%%PORTDOCS%%share/doc/isc-dhcp3/CHANGES
-%%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT
-%%PORTDOCS%%share/doc/isc-dhcp3/README
-%%PORTDOCS%%share/doc/isc-dhcp3/RELNOTES
-%%PORTDOCS%%@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/omapip
 @dirrm include/isc-dhcp
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 9f5b839828b1..4bdee6352da3 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,17 +7,13 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r11
-PORTREVISION=	1
+PORTVERSION=	3.0.1.r12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-PATCH_SITES=	http://security.debian.org/pool/updates/main/d/dhcp3/
-PATCHFILES=	dhcp3_3.0+3.0.1rc9-2.2.diff.gz
-PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index a115bf548825..8f17696d97cc 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (dhcp-3.0.1rc11.tar.gz) = af79b0453ac67fb6824247d3d48fff91
+MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
 MD5 (dhcp3_3.0+3.0.1rc9-2.2.diff.gz) = 9d555df929ea70ef2b36f7455298a79f
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
index f60b752e35d9..e23d06935e9a 100644
--- a/net/isc-dhcp31-server/pkg-plist
+++ b/net/isc-dhcp31-server/pkg-plist
@@ -31,12 +31,12 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS
-%%PORTDOCS%%share/doc/isc-dhcp3/CHANGES
-%%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT
-%%PORTDOCS%%share/doc/isc-dhcp3/README
-%%PORTDOCS%%share/doc/isc-dhcp3/RELNOTES
-%%PORTDOCS%%@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/omapip
 @dirrm include/isc-dhcp
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 9f5b839828b1..4bdee6352da3 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,17 +7,13 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.1.r11
-PORTREVISION=	1
+PORTVERSION=	3.0.1.r12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-PATCH_SITES=	http://security.debian.org/pool/updates/main/d/dhcp3/
-PATCHFILES=	dhcp3_3.0+3.0.1rc9-2.2.diff.gz
-PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	ISC Dynamic Host Configuration Protocol client and server code
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index a115bf548825..8f17696d97cc 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (dhcp-3.0.1rc11.tar.gz) = af79b0453ac67fb6824247d3d48fff91
+MD5 (dhcp-3.0.1rc12.tar.gz) = cf00193dcf349c888a62e4462ae1eb9c
 MD5 (dhcp3_3.0+3.0.1rc9-2.2.diff.gz) = 9d555df929ea70ef2b36f7455298a79f
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
index f60b752e35d9..e23d06935e9a 100644
--- a/net/isc-dhcp40-server/pkg-plist
+++ b/net/isc-dhcp40-server/pkg-plist
@@ -31,12 +31,12 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS
-%%PORTDOCS%%share/doc/isc-dhcp3/CHANGES
-%%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT
-%%PORTDOCS%%share/doc/isc-dhcp3/README
-%%PORTDOCS%%share/doc/isc-dhcp3/RELNOTES
-%%PORTDOCS%%@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%%%DOCSDIR%%/ANONCVS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/omapip
 @dirrm include/isc-dhcp
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases