- Use MASTER_SITE_SUBDIR.

- Add MASTER_SITE_RINGSERVER to MASTER_SITES.

7 files changed, 42 insertions, 28 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index bb0a43a62023..17e249abbc94 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	2.4
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
+	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
+MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.4.STABLE7
 EXTRACT_SUFX=	-src.tar.gz