Update to 3.0 RC 2 patch-level 1.

Install docs into a version-dependent dir.
Add a backup MASTER_SITE_SUBDIR.

PR:		26835
Submitted by:	maintainer

15 files changed, 55 insertions, 40 deletions

diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 8e95e52e1f65..7f764bb1b6de 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.r2
+PORTVERSION=	3.0.r2.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
+MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
@@ -22,6 +23,8 @@ MAINTAINER=	clefevre@poboxes.com
 
 HAS_CONFIGURE=	yes
 
+PLIST_SUB=	PKGBASE="${PKGBASE}"
+
 MAN3=		dhcpctl.3 omapi.3
 MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
 		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index 9e6a57d1190d..b85dfdd4ab1e 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d
+MD5 (dhcp-3.0rc2pl1.tar.gz) = 7c81d953f4c82fa7835edc09df945fd7
diff --git a/net/isc-dhcp3-server/pkg-plist b/net/isc-dhcp3-server/pkg-plist
index 9cca499d267d..82294d786883 100644
--- a/net/isc-dhcp3-server/pkg-plist
+++ b/net/isc-dhcp3-server/pkg-plist
@@ -19,13 +19,13 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-share/doc/isc-dhcp3/CHANGES
-share/doc/isc-dhcp3/COPYRIGHT
-share/doc/isc-dhcp3/README
-share/doc/isc-dhcp3/RELNOTES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/CHANGES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/COPYRIGHT
+%%PORTDOCS%%share/doc/%%PKGBASE%%/README
+%%PORTDOCS%%share/doc/%%PKGBASE%%/RELNOTES
 @dirrm include/isc
 @dirrm include/omapip
-@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%@dirrm share/doc/%%PKGBASE%%
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
 @unexec [ -s /var/db/dhclient.leases ] || rm -f /var/db/dhclient.leases
 @exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 8e95e52e1f65..7f764bb1b6de 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.r2
+PORTVERSION=	3.0.r2.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
+MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
@@ -22,6 +23,8 @@ MAINTAINER=	clefevre@poboxes.com
 
 HAS_CONFIGURE=	yes
 
+PLIST_SUB=	PKGBASE="${PKGBASE}"
+
 MAN3=		dhcpctl.3 omapi.3
 MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
 		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
diff --git a/net/isc-dhcp3/distinfo b/net/isc-dhcp3/distinfo
index 9e6a57d1190d..b85dfdd4ab1e 100644
--- a/net/isc-dhcp3/distinfo
+++ b/net/isc-dhcp3/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d
+MD5 (dhcp-3.0rc2pl1.tar.gz) = 7c81d953f4c82fa7835edc09df945fd7
diff --git a/net/isc-dhcp3/pkg-plist b/net/isc-dhcp3/pkg-plist
index 9cca499d267d..82294d786883 100644
--- a/net/isc-dhcp3/pkg-plist
+++ b/net/isc-dhcp3/pkg-plist
@@ -19,13 +19,13 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-share/doc/isc-dhcp3/CHANGES
-share/doc/isc-dhcp3/COPYRIGHT
-share/doc/isc-dhcp3/README
-share/doc/isc-dhcp3/RELNOTES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/CHANGES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/COPYRIGHT
+%%PORTDOCS%%share/doc/%%PKGBASE%%/README
+%%PORTDOCS%%share/doc/%%PKGBASE%%/RELNOTES
 @dirrm include/isc
 @dirrm include/omapip
-@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%@dirrm share/doc/%%PKGBASE%%
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
 @unexec [ -s /var/db/dhclient.leases ] || rm -f /var/db/dhclient.leases
 @exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 8e95e52e1f65..7f764bb1b6de 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.r2
+PORTVERSION=	3.0.r2.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
+MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
@@ -22,6 +23,8 @@ MAINTAINER=	clefevre@poboxes.com
 
 HAS_CONFIGURE=	yes
 
+PLIST_SUB=	PKGBASE="${PKGBASE}"
+
 MAN3=		dhcpctl.3 omapi.3
 MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
 		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index 9e6a57d1190d..b85dfdd4ab1e 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d
+MD5 (dhcp-3.0rc2pl1.tar.gz) = 7c81d953f4c82fa7835edc09df945fd7
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
index 9cca499d267d..82294d786883 100644
--- a/net/isc-dhcp30-server/pkg-plist
+++ b/net/isc-dhcp30-server/pkg-plist
@@ -19,13 +19,13 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-share/doc/isc-dhcp3/CHANGES
-share/doc/isc-dhcp3/COPYRIGHT
-share/doc/isc-dhcp3/README
-share/doc/isc-dhcp3/RELNOTES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/CHANGES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/COPYRIGHT
+%%PORTDOCS%%share/doc/%%PKGBASE%%/README
+%%PORTDOCS%%share/doc/%%PKGBASE%%/RELNOTES
 @dirrm include/isc
 @dirrm include/omapip
-@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%@dirrm share/doc/%%PKGBASE%%
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
 @unexec [ -s /var/db/dhclient.leases ] || rm -f /var/db/dhclient.leases
 @exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 8e95e52e1f65..7f764bb1b6de 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.r2
+PORTVERSION=	3.0.r2.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
+MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
@@ -22,6 +23,8 @@ MAINTAINER=	clefevre@poboxes.com
 
 HAS_CONFIGURE=	yes
 
+PLIST_SUB=	PKGBASE="${PKGBASE}"
+
 MAN3=		dhcpctl.3 omapi.3
 MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
 		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index 9e6a57d1190d..b85dfdd4ab1e 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d
+MD5 (dhcp-3.0rc2pl1.tar.gz) = 7c81d953f4c82fa7835edc09df945fd7
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
index 9cca499d267d..82294d786883 100644
--- a/net/isc-dhcp31-server/pkg-plist
+++ b/net/isc-dhcp31-server/pkg-plist
@@ -19,13 +19,13 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-share/doc/isc-dhcp3/CHANGES
-share/doc/isc-dhcp3/COPYRIGHT
-share/doc/isc-dhcp3/README
-share/doc/isc-dhcp3/RELNOTES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/CHANGES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/COPYRIGHT
+%%PORTDOCS%%share/doc/%%PKGBASE%%/README
+%%PORTDOCS%%share/doc/%%PKGBASE%%/RELNOTES
 @dirrm include/isc
 @dirrm include/omapip
-@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%@dirrm share/doc/%%PKGBASE%%
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
 @unexec [ -s /var/db/dhclient.leases ] || rm -f /var/db/dhclient.leases
 @exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 8e95e52e1f65..7f764bb1b6de 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.r2
+PORTVERSION=	3.0.r2.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/
+MASTER_SITES=	ftp://ftp.isc.org/isc/dhcp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
@@ -22,6 +23,8 @@ MAINTAINER=	clefevre@poboxes.com
 
 HAS_CONFIGURE=	yes
 
+PLIST_SUB=	PKGBASE="${PKGBASE}"
+
 MAN3=		dhcpctl.3 omapi.3
 MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \
 		dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index 9e6a57d1190d..b85dfdd4ab1e 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d
+MD5 (dhcp-3.0rc2pl1.tar.gz) = 7c81d953f4c82fa7835edc09df945fd7
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
index 9cca499d267d..82294d786883 100644
--- a/net/isc-dhcp40-server/pkg-plist
+++ b/net/isc-dhcp40-server/pkg-plist
@@ -19,13 +19,13 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
-share/doc/isc-dhcp3/CHANGES
-share/doc/isc-dhcp3/COPYRIGHT
-share/doc/isc-dhcp3/README
-share/doc/isc-dhcp3/RELNOTES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/CHANGES
+%%PORTDOCS%%share/doc/%%PKGBASE%%/COPYRIGHT
+%%PORTDOCS%%share/doc/%%PKGBASE%%/README
+%%PORTDOCS%%share/doc/%%PKGBASE%%/RELNOTES
 @dirrm include/isc
 @dirrm include/omapip
-@dirrm share/doc/isc-dhcp3
+%%PORTDOCS%%@dirrm share/doc/%%PKGBASE%%
 @exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases
 @unexec [ -s /var/db/dhclient.leases ] || rm -f /var/db/dhclient.leases
 @exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases