Add MASTER_SITE_RINGSERVER to MASTER_SITES.

9 files changed, 18 insertions, 8 deletions

diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index 9a5e25502a52..d721b912787f 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -12,7 +12,8 @@ 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%/
+		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
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 2930b3303f16..0b6f39ef13dd 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -22,7 +22,8 @@ MASTER_SITES=   http://www.apache.org/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/
+		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,}
 DISTNAME=	apache_${PORTVERSION}
 
 PATCH_SITES=	http://motoyuki.bsdclub.org/data/IPv6/
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index c3484e7d17b6..a3703efd5d71 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -10,8 +10,6 @@ PKGNAMESUFFIX=	_fp
 PORTVERSION=	1.3.27
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
-		http://www.freebsd.org/gifs/ \
-		http://officeupdate.microsoft.com/frontpage/wpp/serk/ \
 		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/ \
@@ -25,9 +23,12 @@ MASTER_SITES=	http://www.apache.org/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/
+		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
+		http://www.freebsd.org/gifs/:powerlogo \
+		http://officeupdate.microsoft.com/frontpage/wpp/serk/:fplogo
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-DISTFILES=	${APACHE} powerlogo.gif fplogo.gif
+DISTFILES=	${APACHE} powerlogo.gif:powerlogo fplogo.gif:fplogo
 
 MAINTAINER=	hetzels@westbend.net
 
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 25f8fa2cd6a9..a85085e95a5e 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -23,6 +23,7 @@ MASTER_SITES=	http://www.apache.org/dist/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_MODSSL:S/$/:modssl/}
 DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -43,7 +44,8 @@ MASTER_SITES_MODSSL=	http://www.modssl.org/source/ \
 		ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \
 		ftp://ftp.blatzheim.com/pub/mod_ssl/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
-		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
+		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mod_ssl/source,}
 USE_OPENSSL=	YES
 
 .include <bsd.port.pre.mk>
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 11f529ce611e..fbe0d881ed55 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -22,7 +22,8 @@ MASTER_SITES=   http://www.apache.org/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/
+		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,}
 DISTNAME=	apache_${PORTVERSION}
 
 #PATCH_SITES=    http://www.apache.org/dist/httpd/patches/apply_to_1.3.26/
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 034e10a010da..f7f81e54edbe 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
 		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
 		http://www.freebsd.org/gifs/:freebsd \
 		http://www2.freebsd.org/gifs/:freebsd
 DISTNAME=	httpd-${PORTVERSION}
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 034e10a010da..f7f81e54edbe 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
 		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
 		http://www.freebsd.org/gifs/:freebsd \
 		http://www2.freebsd.org/gifs/:freebsd
 DISTNAME=	httpd-${PORTVERSION}
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 034e10a010da..f7f81e54edbe 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
 		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
 		http://www.freebsd.org/gifs/:freebsd \
 		http://www2.freebsd.org/gifs/:freebsd
 DISTNAME=	httpd-${PORTVERSION}
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 034e10a010da..f7f81e54edbe 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
 		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd,} \
 		http://www.freebsd.org/gifs/:freebsd \
 		http://www2.freebsd.org/gifs/:freebsd
 DISTNAME=	httpd-${PORTVERSION}