Complete deployment of MASTER_SITES:n

5 files changed, 56 insertions, 45 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 06b2e1ab4049..d9d173daf1b6 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -9,26 +9,27 @@ PORTNAME=	ghostscript
 PORTVERSION=	7.03
 PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gimp_print,hpijs/} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/:pdf \
 		http://www.gelhaus.net/hp880c/1.4beta/:gdevcd \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:gdevdj \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs703/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
-
-MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
+		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print/:gimp_print \
+			hpinkjet/:hpijs
 PKGNAMESUFFIX=	-afpl
-DISTFILES=	${GS_SOURCES} \
-		${GS_FONTS_STD} \
-		${GS_FONTS_OTHER} \
+DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
+		${GS_FONTS_STD}:DEFAULT,fonts \
+		${GS_FONTS_OTHER}:DEFAULT,fonts,gatekeeper \
 		${DECRYPT_PDF}:pdf \
 		${HP8XX_DRV}:gdevcd \
 		${HPDJ_SRC}:hpdj_pcl3 \
 		${PCL3_SRC}:hpdj_pcl3 \
 		${HP970_DRV}:gdevdj \
-		${GPRINT_SRC} \
-		${HPIJS_SRC}
+		${GPRINT_SRC}:gatekeeper,gimp_print \
+		${HPIJS_SRC}:gatekeeper,hpijs
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}
 
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 513c4eb015b9..b5db00eddd66 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -9,26 +9,30 @@ PORTNAME=	ghostscript
 PORTVERSION=	6.52
 PORTREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_GNU:S/$/:fonts/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gimp_print,hpijs/} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/:pdf \
 		http://www.gelhaus.net/hp880c/1.4beta/:gdevcd \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:gdevdj \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs652/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
-MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
+		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+# gatekeeper is an exception, it is the only GNU site which carries
+# some of the other files, so add it although it is listed inside
+# MASTER_SITE_GNU
+MASTER_SITE_SUBDIR=     ${PORTNAME} gimp-print/:gimp_print hpinkjet/:hpijs
 PKGNAMESUFFIX=	-gnu
-DISTFILES=	${GS_SOURCES} \
-		${GS_FONTS_STD} \
-		${GS_FONTS_OTHER} \
+DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
+		${GS_FONTS_STD}:fonts \
+		${GS_FONTS_OTHER}:fonts,gatekeeper \
 		${DECRYPT_PDF}:pdf \
 		${HP8XX_DRV}:gdevcd \
 		${HPDJ_SRC}:hpdj_pcl3 \
 		${PCL3_SRC}:hpdj_pcl3 \
 		${HP970_DRV}:gdevdj \
-		${GPRINT_SRC} \
-		${HPIJS_SRC}
+		${GPRINT_SRC}:gatekeeper,gimp_print \
+		${HPIJS_SRC}:gatekeeper,hpijs
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}
 
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 06b2e1ab4049..d9d173daf1b6 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -9,26 +9,27 @@ PORTNAME=	ghostscript
 PORTVERSION=	7.03
 PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gimp_print,hpijs/} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/:pdf \
 		http://www.gelhaus.net/hp880c/1.4beta/:gdevcd \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:gdevdj \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs703/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
-
-MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
+		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print/:gimp_print \
+			hpinkjet/:hpijs
 PKGNAMESUFFIX=	-afpl
-DISTFILES=	${GS_SOURCES} \
-		${GS_FONTS_STD} \
-		${GS_FONTS_OTHER} \
+DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
+		${GS_FONTS_STD}:DEFAULT,fonts \
+		${GS_FONTS_OTHER}:DEFAULT,fonts,gatekeeper \
 		${DECRYPT_PDF}:pdf \
 		${HP8XX_DRV}:gdevcd \
 		${HPDJ_SRC}:hpdj_pcl3 \
 		${PCL3_SRC}:hpdj_pcl3 \
 		${HP970_DRV}:gdevdj \
-		${GPRINT_SRC} \
-		${HPIJS_SRC}
+		${GPRINT_SRC}:gatekeeper,gimp_print \
+		${HPIJS_SRC}:gatekeeper,hpijs
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}
 
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 513c4eb015b9..b5db00eddd66 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -9,26 +9,30 @@ PORTNAME=	ghostscript
 PORTVERSION=	6.52
 PORTREVISION=	5
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_GNU:S/$/:fonts/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gimp_print,hpijs/} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/:pdf \
 		http://www.gelhaus.net/hp880c/1.4beta/:gdevcd \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:gdevdj \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs652/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
-MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
+		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+# gatekeeper is an exception, it is the only GNU site which carries
+# some of the other files, so add it although it is listed inside
+# MASTER_SITE_GNU
+MASTER_SITE_SUBDIR=     ${PORTNAME} gimp-print/:gimp_print hpinkjet/:hpijs
 PKGNAMESUFFIX=	-gnu
-DISTFILES=	${GS_SOURCES} \
-		${GS_FONTS_STD} \
-		${GS_FONTS_OTHER} \
+DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
+		${GS_FONTS_STD}:fonts \
+		${GS_FONTS_OTHER}:fonts,gatekeeper \
 		${DECRYPT_PDF}:pdf \
 		${HP8XX_DRV}:gdevcd \
 		${HPDJ_SRC}:hpdj_pcl3 \
 		${PCL3_SRC}:hpdj_pcl3 \
 		${HP970_DRV}:gdevdj \
-		${GPRINT_SRC} \
-		${HPIJS_SRC}
+		${GPRINT_SRC}:gatekeeper,gimp_print \
+		${HPIJS_SRC}:gatekeeper,hpijs
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}
 
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 06b2e1ab4049..d9d173daf1b6 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -9,26 +9,27 @@ PORTNAME=	ghostscript
 PORTVERSION=	7.03
 PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gimp_print,hpijs/} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/:pdf \
 		http://www.gelhaus.net/hp880c/1.4beta/:gdevcd \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:gdevdj \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs703/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
-
-MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
+		ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print/:gimp_print \
+			hpinkjet/:hpijs
 PKGNAMESUFFIX=	-afpl
-DISTFILES=	${GS_SOURCES} \
-		${GS_FONTS_STD} \
-		${GS_FONTS_OTHER} \
+DISTFILES=	${GS_SOURCES}:DEFAULT,gatekeeper \
+		${GS_FONTS_STD}:DEFAULT,fonts \
+		${GS_FONTS_OTHER}:DEFAULT,fonts,gatekeeper \
 		${DECRYPT_PDF}:pdf \
 		${HP8XX_DRV}:gdevcd \
 		${HPDJ_SRC}:hpdj_pcl3 \
 		${PCL3_SRC}:hpdj_pcl3 \
 		${HP970_DRV}:gdevdj \
-		${GPRINT_SRC} \
-		${HPIJS_SRC}
+		${GPRINT_SRC}:gatekeeper,gimp_print \
+		${HPIJS_SRC}:gatekeeper,hpijs
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SOURCES}