Use MASTER_SITE_APACHE*.

PR:		47984
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org>

6 files changed, 14 insertions, 38 deletions

diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index 9ab5c09..5e02e84 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	cocoon
 PORTVERSION=	1.8.2
 PORTREVISION=	3
 CATEGORIES=	textproc www java
-MASTER_SITES=	http://xml.apache.org/cocoon/dist/cocoon1/ \
-		http://www.metaverse.nl/~ernst/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	znerd
+MASTER_SITES=	${MASTER_SITE_APACHE_XML} \
+		http://www.metaverse.nl/~ernst/
+MASTER_SITE_SUBDIR=	cocoon/cocoon1
+
 DISTNAME=	Cocoon-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 2869739..942b513 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	xerces_c
 PORTVERSION=	1.7.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://xml.apache.org/dist/xerces-c/stable/archives/Xerces-C_${PORTVERSION:S/./_/g}/ \
+MASTER_SITES=	${MASTER_SITE_APACHE_XML} \
 		http://document-root.de/xerces-c-mirror/
+MASTER_SITE_SUBDIR=	xerces-c/stable/archives/Xerces-C_${PORTVERSION:S/./_/g}
 DISTNAME=	xerces-c-src${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index d721b91..8ee2eed 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -8,13 +8,8 @@
 PORTNAME=	apache-contrib
 PORTVERSION=	1.0.8
 CATEGORIES=	www
-MASTER_SITES=	http://www.apache.org/dist/%SUBDIR%/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/%SUBDIR%/ \
-		ftp://ftp.epix.net/pub/apache/dist/%SUBDIR%/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/www/servers/apache/dist/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/&,}
-MASTER_SITE_SUBDIR=	httpd/contrib/modules/1.3
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITE_SUBDIR=	contrib/modules/1.3
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 3f8fcc0..9032664 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -8,22 +8,7 @@
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
 CATEGORIES=	www security
-MASTER_SITES=	http://www.apache.org/dist/httpd/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
-		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
-		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
-		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
-		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://www3.service.digital.com/apache/dist/httpd/ \
-		ftp://galileo.galilei.com/pub/apache/httpd/ \
-		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
-		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_MODSSL:S/$/:modssl/}
 DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 944df3a..a07cdcd 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -11,12 +11,7 @@ PORTNAME=	apache+ssl
 PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
 PORTREVISION=	2
 CATEGORIES=	www security
-MASTER_SITES=	http://www.apache.org/dist/httpd/ \
-		ftp://src.doc.ic.ac.uk/packages/apache/dist/ \
-		ftp://ftp.gbnet.net/pub/apache/dist/ \
-		ftp://ftp.flirble.org/pub/web/apache/dist/ \
-		ftp://ukug.uk.freebsd.org/pub/mirrors/apache/dist/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/:ssl \
 		ftp://ftp.MASTER.pgp.net/pub/crypto/SSL/Apache-SSL/:ssl \
 		ftp://ftp.replay.com/pub/crypto/apache/Apache-SSL/:ssl \
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 9ab5c09..5e02e84 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	cocoon
 PORTVERSION=	1.8.2
 PORTREVISION=	3
 CATEGORIES=	textproc www java
-MASTER_SITES=	http://xml.apache.org/cocoon/dist/cocoon1/ \
-		http://www.metaverse.nl/~ernst/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	znerd
+MASTER_SITES=	${MASTER_SITE_APACHE_XML} \
+		http://www.metaverse.nl/~ernst/
+MASTER_SITE_SUBDIR=	cocoon/cocoon1
+
 DISTNAME=	Cocoon-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org