add MASTER_SITE_ISC (1) and apply them

PR:		41218
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org> (1)

16 files changed, 54 insertions, 231 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index e51a8a9dd002..9c28a32c4f32 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -89,6 +89,35 @@ MASTER_SITE_GNOME+=	\
 	ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/www.gnome.org/%SUBDIR%/ \
 	ftp://ftp.cse.buffalo.edu/pub/Gnome/%SUBDIR%/
 
+MASTER_SITE_ISC+=	\
+	ftp://ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/ \
+	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
+	ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/ \
+	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/ \
+	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
+	ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
+	ftp://ftp.dti.ad.jp/pub/net/isc/%SUBDIR%/ \
+	ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/ \
+	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/ \
+	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/ \
+	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/ \
+	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
+	ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/ \
+	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
+	ftp://ftp.nominum.com/pub/isc/%SUBDIR%/ \
+	ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
+	ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/ \
+	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/ \
+	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/ \
+	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
+	ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
+
 MASTER_SITE_GNU+=	\
 	ftp://ftp.gnu.org/gnu/%SUBDIR%/ \
 	ftp://gatekeeper.dec.com/pub/GNU/%SUBDIR%/ \
diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile
index 8ca3dfb78ff2..26653e3f0f5c 100644
--- a/dns/bind8/Makefile
+++ b/dns/bind8/Makefile
@@ -13,10 +13,8 @@
 PORTNAME=	bind
 PORTVERSION=	8.3.3
 CATEGORIES?=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${PORTVERSION}/ \
-		ftp://ftp.epix.net/pub/isc/bind/src/${PORTVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind/src/${PORTVERSION}/ \
-		ftp://ftp.grolier.fr/pub/isc/bind/src/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR=	bind/src/${PORTVERSION}
 
 DISTFILES=	bind-src.tar.gz bind-doc.tar.gz
 DIST_SUBDIR=	bind-${PORTVERSION}
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index 72a0e478c308..e67d33069bd7 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -14,11 +14,9 @@
 PORTNAME=	bind9
 PORTVERSION=	9.2.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
+MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+MASTER_SITE_SUBDIR=	isc/bind9/${ISCVERSION}
 DISTFILES=	bind-9.2.1.tar.gz
 
 MAINTAINER=	DougB@FreeBSD.org
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index 72a0e478c308..e67d33069bd7 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -14,11 +14,9 @@
 PORTNAME=	bind9
 PORTVERSION=	9.2.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
+MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+MASTER_SITE_SUBDIR=	isc/bind9/${ISCVERSION}
 DISTFILES=	bind-9.2.1.tar.gz
 
 MAINTAINER=	DougB@FreeBSD.org
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 72a0e478c308..e67d33069bd7 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -14,11 +14,9 @@
 PORTNAME=	bind9
 PORTVERSION=	9.2.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
+MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+MASTER_SITE_SUBDIR=	isc/bind9/${ISCVERSION}
 DISTFILES=	bind-9.2.1.tar.gz
 
 MAINTAINER=	DougB@FreeBSD.org
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 72a0e478c308..e67d33069bd7 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -14,11 +14,9 @@
 PORTNAME=	bind9
 PORTVERSION=	9.2.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
+MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+MASTER_SITE_SUBDIR=	isc/bind9/${ISCVERSION}
 DISTFILES=	bind-9.2.1.tar.gz
 
 MAINTAINER=	DougB@FreeBSD.org
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 8ca3dfb78ff2..26653e3f0f5c 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -13,10 +13,8 @@
 PORTNAME=	bind
 PORTVERSION=	8.3.3
 CATEGORIES?=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${PORTVERSION}/ \
-		ftp://ftp.epix.net/pub/isc/bind/src/${PORTVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind/src/${PORTVERSION}/ \
-		ftp://ftp.grolier.fr/pub/isc/bind/src/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR=	bind/src/${PORTVERSION}
 
 DISTFILES=	bind-src.tar.gz bind-doc.tar.gz
 DIST_SUBDIR=	bind-${PORTVERSION}
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 72a0e478c308..e67d33069bd7 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -14,11 +14,9 @@
 PORTNAME=	bind9
 PORTVERSION=	9.2.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
-		ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
+MASTER_SITES=	${MASTER_SITE_ISC} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+MASTER_SITE_SUBDIR=	isc/bind9/${ISCVERSION}
 DISTFILES=	bind-9.2.1.tar.gz
 
 MAINTAINER=	DougB@FreeBSD.org
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 288d30b890b2..92ea02aa0a2f 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -9,16 +9,7 @@
 PORTNAME=	dhcp
 PORTVERSION=	3.0.1.r9
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
-		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
-		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
-		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
-		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
-		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
-		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
-		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
-		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
-		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
+MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
@@ -48,36 +39,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 # Local variables
 #
 
-# fast
-AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
-FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
-			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
-FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
-GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.gigabell.net/pub/%SUBDIR%/
-HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
-ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
-JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
-			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
-LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
-POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
-RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
-SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
-SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
-UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
-US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
-			ftp://ftp.nominum.com/pub/isc/%SUBDIR%/
-NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
-# slow
-BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
-GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
-TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
-			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
 # for instance, possible versions are:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 288d30b890b2..92ea02aa0a2f 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -9,16 +9,7 @@
 PORTNAME=	dhcp
 PORTVERSION=	3.0.1.r9
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
-		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
-		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
-		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
-		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
-		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
-		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
-		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
-		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
-		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
+MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
@@ -48,36 +39,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 # Local variables
 #
 
-# fast
-AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
-FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
-			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
-FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
-GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.gigabell.net/pub/%SUBDIR%/
-HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
-ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
-JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
-			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
-LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
-POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
-RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
-SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
-SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
-UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
-US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
-			ftp://ftp.nominum.com/pub/isc/%SUBDIR%/
-NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
-# slow
-BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
-GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
-TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
-			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
 # for instance, possible versions are:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 288d30b890b2..92ea02aa0a2f 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -9,16 +9,7 @@
 PORTNAME=	dhcp
 PORTVERSION=	3.0.1.r9
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
-		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
-		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
-		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
-		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
-		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
-		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
-		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
-		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
-		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
+MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
@@ -48,36 +39,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 # Local variables
 #
 
-# fast
-AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
-FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
-			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
-FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
-GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.gigabell.net/pub/%SUBDIR%/
-HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
-ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
-JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
-			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
-LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
-POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
-RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
-SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
-SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
-UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
-US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
-			ftp://ftp.nominum.com/pub/isc/%SUBDIR%/
-NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
-# slow
-BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
-GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
-TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
-			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
 # for instance, possible versions are:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 288d30b890b2..92ea02aa0a2f 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -9,16 +9,7 @@
 PORTNAME=	dhcp
 PORTVERSION=	3.0.1.r9
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
-		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
-		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
-		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
-		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
-		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
-		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
-		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
-		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
-		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
+MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
@@ -48,36 +39,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 # Local variables
 #
 
-# fast
-AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
-FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
-			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
-FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
-GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.gigabell.net/pub/%SUBDIR%/
-HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
-ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
-JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
-			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
-LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
-POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
-RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
-SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
-SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
-UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
-US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
-			ftp://ftp.nominum.com/pub/isc/%SUBDIR%/
-NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
-# slow
-BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
-GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
-TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
-			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
 # for instance, possible versions are:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 288d30b890b2..92ea02aa0a2f 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -9,16 +9,7 @@
 PORTNAME=	dhcp
 PORTVERSION=	3.0.1.r9
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
-		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
-		${AUSTRIA_MASTER_SITES} ${FRANCE_MASTER_SITES} \
-		${FINLAND_MASTER_SITES} ${GERMANY_MASTER_SITES} \
-		${HUNGARY_MASTER_SITES} ${ICELAND_MASTER_SITES} \
-		${LATVIA_MASTER_SITES} ${POLAND_MASTER_SITES} \
-		${RUSSIA_MASTER_SITES} ${SPAIN_MASTER_SITES} \
-		${SWEDEN_MASTER_SITES} ${UK_MASTER_SITES} \
-		${NETHERLANDS_MASTER_SITES} ${BRAZIL_MASTER_SITES} \
-		${GREECE_MASTER_SITES} ${TURKEY_MASTER_SITES}
+MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	3
@@ -48,36 +39,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 # Local variables
 #
 
-# fast
-AUSTRIA_MASTER_SITES=	ftp://gd.tuwien.ac.at/infosys/servers/isc/%SUBDIR%/
-FRANCE_MASTER_SITES=	ftp://ftp.ciril.fr/pub/isc/%SUBDIR%/ \
-			ftp://ftp.grolier.fr/pub/isc/%SUBDIR%/
-FINLAND_MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.isc.org/isc/%SUBDIR%/
-GERMANY_MASTER_SITES=	ftp://ftp.freenet.de/pub/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.gigabell.net/pub/%SUBDIR%/
-HUNGARY_MASTER_SITES=	ftp://ftp.fsn.hu/pub/isc/%SUBDIR%/
-ICELAND_MASTER_SITES=	ftp://ftp.gm.is/pub/isc/%SUBDIR%/
-JAPAN_MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/Net/isc/%SUBDIR%/ \
-			ftp://ftp.iij.ad.jp/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/isc/%SUBDIR%/
-LATVIA_MASTER_SITES=	ftp://ftp.linux.lv/pub/software/isc/%SUBDIR%/
-POLAND_MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.isc.org/isc/%SUBDIR%/
-RUSSIA_MASTER_SITES=	ftp://ftp.cdu.elektra.ru/pub/unix/isc/%SUBDIR%/
-SPAIN_MASTER_SITES=	ftp://ftp.si.uniovi.es/mirror/isc/%SUBDIR%/
-SWEDEN_MASTER_SITES=	ftp://ftp.sunet.se/pub/network/isc/%SUBDIR%/ \
-			ftp://ftp.chl.chalmers.se/pub/unix/network/isc/%SUBDIR%/
-UK_MASTER_SITES=	ftp://unix.hensa.ac.uk/mirrors/ftp.isc.org/isc/%SUBDIR%/
-US_MASTER_SITES=	ftp://ftp.epix.net/pub/isc/%SUBDIR%/ \
-			ftp://ftp.nominum.com/pub/isc/%SUBDIR%/
-NETHERLANDS_MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
-# slow
-BRAZIL_MASTER_SITES=	ftp://ftp.pop-mg.com.br/pub/isc/%SUBDIR%/
-GREECE_MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/isc/isc/%SUBDIR%/
-TURKEY_MASTER_SITES=	ftp://ftp.ulak.net.tr/pub/networking/isc/%SUBDIR%/ \
-			ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
-
 # for instance, possible versions are:
 #	1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
 # which have to become:
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 41d32e1cee93..ed4fb4ad60c9 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	inn
 PORTVERSION=	2.3.3
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
+MASTER_SITES=	${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR=	inn
 NO_LATEST_LINK=	yes
 
 MAINTAINER=	des@FreeBSD.org
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 943da9864a63..d05c8f051662 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -10,7 +10,8 @@ PORTNAME=	inn
 SNAPSHOT=	20020620
 PORTVERSION=	2.3.${SNAPSHOT}
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.isc.org/isc/inn/snapshots/
+MASTER_SITES=	${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR=	inn/snapshots
 DISTNAME=	inn-STABLE-${SNAPSHOT}
 
 MAINTAINER=	des@FreeBSD.org
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 41d32e1cee93..ed4fb4ad60c9 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	inn
 PORTVERSION=	2.3.3
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
+MASTER_SITES=	${MASTER_SITE_ISC}
+MASTER_SITE_SUBDIR=	inn
 NO_LATEST_LINK=	yes
 
 MAINTAINER=	des@FreeBSD.org