39 files changed, 44 insertions, 83 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 0685dcfbef13..c2813f5020e6 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	a2ps
 PORTVERSION=	4.13b
 PORTREVISION=	6
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		${MASTER_SITE_LOCAL:S/$/:i18n/}
-MASTER_SITE_SUBDIR=	${PORTNAME} hrs/a2ps/:i18n
+MASTER_SITES=	GNU LOCAL/hrs/a2ps/:i18n
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Formats an ASCII file for printing on a postscript printer
diff --git a/print/abc2mtex/Makefile b/print/abc2mtex/Makefile
index 038fbb2e58fd..4021d84ed0a7 100644
--- a/print/abc2mtex/Makefile
+++ b/print/abc2mtex/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=		abc2mtex
 PORTVERSION=		1.6.1
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	support/abc2mtex
+MASTER_SITES=		TEX_CTAN/support/abc2mtex
 DISTNAME=		${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	joerg@FreeBSD.org
diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index 609a9970da03..4420a2ca94fb 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	adobe-cmaps
 PORTVERSION=	20051217
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hrs/adobe
+MASTER_SITES=	LOCAL/hrs/adobe
 DISTFILES=	ac15.tar.gz ag15.tar.gz \
 		ai0.tar.gz aj16.tar.gz \
 		aj20.tar.gz ak12.tar.gz rksj-cmaps.tar.gz
diff --git a/print/alignmargins/Makefile b/print/alignmargins/Makefile
index b9649ff0010f..9dbfc43fc53f 100644
--- a/print/alignmargins/Makefile
+++ b/print/alignmargins/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	alignmargins
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/lofi \
 		http://www.linuxprinting.org/download/printing/
-MASTER_SITE_SUBDIR=lofi
 DISTFILES=	alignmargins align.ps
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index f4a4e11ede5a..9ba1b914d0de 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	asprint
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR=	apps/asprint
+MASTER_SITES=	AFTERSTEP/apps/asprint
 DISTNAME=	asprint
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 3824b05bd93d..a350468aa46d 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	auctex
 PORTVERSION=	11.88
 PORTREVISION=	2
 CATEGORIES=	print elisp
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 PKGNAMESUFFIX=		-${EMACS_PORT_NAME}
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index 57c1ee2253ab..02fb1c3270be 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bibview
 PORTVERSION=	2.2
 PORTREVISION=	2
 CATEGORIES=	print databases
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
+MASTER_SITES=	TEX_CTAN/biblio/bibtex/utils/bibview-2.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface for manipulating BibTeX bibliography databases
diff --git a/print/cm-super/Makefile b/print/cm-super/Makefile
index a4df3fee4947..ad1ae767c836 100644
--- a/print/cm-super/Makefile
+++ b/print/cm-super/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	cm-super
 PORTVERSION=	0.3.4
 PORTREVISION=	5
 CATEGORIES=	print x11-fonts
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	hrs
-#MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-#MASTER_SITE_SUBDIR=	fonts/ps-type1
+MASTER_SITES=	LOCAL/hrs
+#MASTER_SITES=	TEX_CTAN/fonts/ps-type1
 #DISTNAME=	${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/print/dot2tex/Makefile b/print/dot2tex/Makefile
index b3fd70de5b89..bfbb51fed3e0 100644
--- a/print/dot2tex/Makefile
+++ b/print/dot2tex/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	dot2tex
 PORTVERSION=	2.8.7
 PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Graphviz to LaTeX converter
diff --git a/print/font-amsfonts/Makefile b/print/font-amsfonts/Makefile
index d04bf56829a4..aa91b66bc34b 100644
--- a/print/font-amsfonts/Makefile
+++ b/print/font-amsfonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	amsfonts
 PORTVERSION=	3.02
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	font-
 DIST_SUBDIR=	teTeX
 
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 6e04742c7b01..e15f03d81bfa 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	foo2zjs
 PORTVERSION=	20140417
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		${MASTER_SITE_LOCAL:S,$,bsam/${PORTNAME}/,}  \
+MASTER_SITES=	GOOGLE_CODE \
+		LOCAL/bsam/${PORTNAME}  \
 		ftp://ftp.wart.ru/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 51e5f1ff2967..f3eadd698d0e 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	db
 PORTVERSION=	20150415
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	danilo
+MASTER_SITES=	LOCAL/danilo
 		
 PKGNAMEPREFIX=	foomatic-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
diff --git a/print/foxitreader/Makefile b/print/foxitreader/Makefile
index 5f1545df8171..4484fd448aee 100644
--- a/print/foxitreader/Makefile
+++ b/print/foxitreader/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	foxitreader
 PORTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	http://cdn04.foxitsoftware.com/pub/foxit/%SUBDIR%/:reader,manual
-MASTER_SITE_SUBDIR=	reader/desktop/linux/1.x/${PORTVERSION:R}/enu/:reader \
-			manual/enu/:manual
+MASTER_SITES=	http://cdn04.foxitsoftware.com/pub/foxit/reader/desktop/linux/1.x/${PORTVERSION:R}/enu/:reader
+			
 DISTFILES=	FoxitReader-${PORTVERSION}.tar.bz2:reader
 EXTRACT_ONLY=	FoxitReader-${PORTVERSION}.tar.bz2
 
@@ -33,6 +32,7 @@ WRKSRC=	${WRKDIR}/${PORTVERSION:R}-release
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
+MASTER_SITES+=	http://cdn04.foxitsoftware.com/pub/foxit/manual/enu/:manual
 DISTFILES+=	FoxitReader${PORTVERSION:R}ForLinux_Manual.pdf:manual
 .endif
 
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 8417584dc73e..4faa29c3c65f 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,10 +7,7 @@ PORTREVISION=	31
 CATEGORIES=	print
 MASTER_SITES=	SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs \
-		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/}
-MASTER_SITE_SUBDIR= \
-		ghostscript/:gs_srcs \
-		./:ports_jp
+		PORTS_JP:ports_jp,ports_jp_gs
 PKGNAMESUFFIX=	7
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs
 DIST_SUBDIR=	${PORTNAME}
diff --git a/print/ghostscript7/files/Makefile.bjc250 b/print/ghostscript7/files/Makefile.bjc250
index 222c9e289c2e..bafe557b6c1d 100644
--- a/print/ghostscript7/files/Makefile.bjc250
+++ b/print/ghostscript7/files/Makefile.bjc250
@@ -2,8 +2,7 @@
 # BJC250 - additional driver for Canon BJC-210/240/250/265/1000
 # http://bjc250gs.sourceforge.net/
 
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:bjc250/}
-MASTER_SITE_SUBDIR+=	bjc250gs/:bjc250
+MASTER_SITES+=	SOURCEFORGE/bjc250gs/:bjc250
 DISTFILES+=	gs7.05-bjc250-v0.756.diff.gz:bjc250
 EXTRADEVMKFILE+=	${FILESDIR}/bjc250.contrib.mak
 
diff --git a/print/ghostscript7/files/Makefile.cpca b/print/ghostscript7/files/Makefile.cpca
index e48516153ece..b819d75d290b 100644
--- a/print/ghostscript7/files/Makefile.cpca
+++ b/print/ghostscript7/files/Makefile.cpca
@@ -2,7 +2,7 @@
 # CPCA - additional driver for Canon CPCA printers
 # http://cweb.canon.jp/open-mie/technical/index-j.html
 
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/:S/$/:cpca/}
+MASTER_SITES+=	LOCAL/pav:cpca
 DISTFILES+=	canon-lips4-1.0.0-651.tgz:cpca
 EXTRADEVMKFILE+=${WRKSRC}/src/cpca_gdev.mak
 
diff --git a/print/ghostscript7/files/Makefile.eplaser b/print/ghostscript7/files/Makefile.eplaser
index 7a5debd2f3fe..9aa186dd9e60 100644
--- a/print/ghostscript7/files/Makefile.eplaser
+++ b/print/ghostscript7/files/Makefile.eplaser
@@ -2,8 +2,7 @@
 # EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp.
 # http://www.avasys.jp/english/linux_e/index.html
 
-MASTER_SITES+=	${MASTER_SITE_LOCAL}:eplaser
-MASTER_SITE_SUBDIR+=	arved/:eplaser
+MASTER_SITES+=	LOCAL/arved/:eplaser
 DISTFILES+=	eplaser-3.1.4-705.tgz:eplaser
 EXTRADEVMKFILE+=	${WRKSRC}/eplaser/gdevescv7.mak	\
 			${WRKSRC}/eplaser/gdevesmv7.mak
diff --git a/print/ghostscript7/files/Makefile.gprint b/print/ghostscript7/files/Makefile.gprint
index 11ab9689135a..f6d304b56133 100644
--- a/print/ghostscript7/files/Makefile.gprint
+++ b/print/ghostscript7/files/Makefile.gprint
@@ -9,8 +9,7 @@
 #
 # For that reason, integration of stp driver is disabled by default.
 
-MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/gimp-print/:S/$/:gprint/} \
-MASTER_SITE_SUBDIR=	gimp-print/:gprint
+MASTER_SITES+=		SOURCEFORGE/gimp-print/:gprint
 DISTFILES+=		gimp-print-4.2.7.tar.gz:gprint
 EXTRADEVMKFILE+=	${FILESDIR}/stp.contrib.mak
 
diff --git a/print/ghostscript7/files/Makefile.lex7000 b/print/ghostscript7/files/Makefile.lex7000
index 48377a06aff9..9c72af416840 100644
--- a/print/ghostscript7/files/Makefile.lex7000
+++ b/print/ghostscript7/files/Makefile.lex7000
@@ -2,7 +2,7 @@
 # LEX7000 - additional driver for Lexmark 2050/3200/5700/7000
 # http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
 
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/:S/$/:lex7000/}
+MASTER_SITES+=	LOCAL/pav:lex7000
 DISTFILES+=	gs6.0.lexmark7000.patch:lex7000
 EXTRADEVMKFILE+=	${FILESDIR}/lex7000.contrib.mak
 
diff --git a/print/ghostscript7/files/Makefile.lx5000 b/print/ghostscript7/files/Makefile.lx5000
index bf636d65805c..b80198913a42 100644
--- a/print/ghostscript7/files/Makefile.lx5000
+++ b/print/ghostscript7/files/Makefile.lx5000
@@ -2,7 +2,7 @@
 # LX5000 - additional driver for Lexmark 5000/Z51/Z82
 # http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html
 
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/:S/$/:lx5000/}
+MASTER_SITES+=	LOCAL/pav:lx5000
 DISTFILES+=	gdevlx50.c:lx5000
 EXTRADEVMKFILE+=	${FILESDIR}/lx5000.contrib.mak
 
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 9b29feec2c28..f7b79758ac6a 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
 		http://www.humblesoft.com/pub/:epag
-MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs
 PKGNAMESUFFIX=	8
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
 DIST_SUBDIR=	${PORTNAME}
diff --git a/print/ghostscript9-agpl/Makefile b/print/ghostscript9-agpl/Makefile
index a95c28306f33..31cd9df0b04e 100644
--- a/print/ghostscript9-agpl/Makefile
+++ b/print/ghostscript9-agpl/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
 		http://www.humblesoft.com/pub/:epag
-MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs
 PKGNAMESUFFIX=	9-agpl
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
 DIST_SUBDIR=	${PORTNAME}
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 8cc82c8f5c50..a051395bd726 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
 		http://www.humblesoft.com/pub/:epag
-MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs
 PKGNAMESUFFIX=	9
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
 DIST_SUBDIR=	${PORTNAME}
diff --git a/print/html2latex/Makefile b/print/html2latex/Makefile
index 9deddc0a6d3e..850d418afe50 100644
--- a/print/html2latex/Makefile
+++ b/print/html2latex/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	html2latex
 PORTVERSION=	0.9c
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Convert HTML document into LaTeX
diff --git a/print/kde_poster/Makefile b/print/kde_poster/Makefile
index 98350e52f31a..47e080c77230 100644
--- a/print/kde_poster/Makefile
+++ b/print/kde_poster/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	kde_poster
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	print kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	printing
+MASTER_SITES=	KDE/printing
 DISTNAME=	poster
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/print/latex-ltablex/Makefile b/print/latex-ltablex/Makefile
index b6a25496c2cf..0373f44c2d4f 100644
--- a/print/latex-ltablex/Makefile
+++ b/print/latex-ltablex/Makefile
@@ -6,10 +6,8 @@ PORTREVISION=	2
 CATEGORIES=	print
 # As of 2012-08-24, some mirrors are returning a tarball with a
 # different checksum, so I am mirroring it locally instead.
-# MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-# MASTER_SITE_SUBDIR=	macros/latex/contrib
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	rakuco/latex
+# MASTER_SITES=	TEX_CTAN/macros/latex/contrib
+MASTER_SITES=	LOCAL/rakuco/latex
 PKGNAMEPREFIX=	latex-
 DIST_SUBDIR=	latex
 
diff --git a/print/latex-resume/Makefile b/print/latex-resume/Makefile
index d58ccf60c8f6..0d3c4c0a51a3 100644
--- a/print/latex-resume/Makefile
+++ b/print/latex-resume/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	resume
 PORTVERSION=	20010823
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	macros/latex/contrib/${PORTNAME}
+MASTER_SITES=	TEX_CTAN/macros/latex/contrib/${PORTNAME}
 PKGNAMEPREFIX=	latex-
 DISTNAME=	res
 EXTRACT_SUFX=	.cls
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index 328829ab35b1..f371a909dcc7 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	latex2rtf
 PORTVERSION=	2.3.8
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION} \
-		${MASTER_SITE_TEX_CTAN}
+		TEX_CTAN
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Translator from LaTeX to RTF
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index 85f030fe99be..b24872476190 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	libotf
 PORTVERSION=	0.9.13
 PORTREVISION=	2
 CATEGORIES=	print devel textproc
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}:m17n
-MASTER_SITE_SUBDIR=	m17n
+MASTER_SITES=	SAVANNAH/m17n
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Library for handling OpenType fonts
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 96934ca3a9e1..5f7a4804effe 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	libpaper
 PORTVERSION=	1.1.24.3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/libp/libpaper
+MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION:C/.([0-9]+)$/+nmu\1/}
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 50d3e3eed283..fc5419dfc98a 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	openprinting
 PORTVERSION=	1.0
 PORTREVISION=	4
 CATEGORIES=	print net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=\
-		openprinting/papi/1.0%20Beta
+MASTER_SITES=	SF/openprinting/papi/1.0%20Beta
 DISTNAME=	papi-${PORTVERSION}_beta
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index 5fd5b7a84a3e..522e91d3bad5 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	pdfbox
 PORTVERSION=	1.8.9
 CATEGORIES=	print textproc java
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,pdfbox/${PORTVERSION},}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	APACHE/pdfbox/${PORTVERSION}
 DISTFILES=	${JAR_NAMES:S/$/-${PORTVERSION}.jar/}
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/print/pic2fig/Makefile b/print/pic2fig/Makefile
index cd44f959d6fc..05440b056b55 100644
--- a/print/pic2fig/Makefile
+++ b/print/pic2fig/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	pic2fig
 PORTVERSION=	1.4
 PORTREVISION=	2
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	XCONTRIB/utilities
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pic format to fig format converter
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index 3ad7cb18f5b1..5673760e86a7 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	pkfonts${RESOLUTION}
 PORTVERSION=	1.0
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
-MASTER_SITE_SUBDIR=	pkfonts
+MASTER_SITES=	PORTS_JP/pkfonts
 DISTFILES=	pk${RESOLUTION}.tar.gz
 # see below for RESOLUTION definition
 
diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index 4b6816123cc4..06387a57608c 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -5,11 +5,10 @@ PORTNAME=	pstotext
 PORTVERSION=	1.9
 PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	http://ftp.gwdg.de/pub/%SUBDIR%/ \
-		http://ftp.sunet.se/pub/text-processing/postscript/interpreters/%SUBDIR%/ \
-		http://gd.tuwien.ac.at/pub/publishing/%SUBDIR%/ \
+MASTER_SITES=	http://ftp.gwdg.de/pub/ghostscript/contrib/ \
+		http://ftp.sunet.se/pub/text-processing/postscript/interpreters/ghostscript/contrib/ \
+		http://gd.tuwien.ac.at/pub/publishing/ghostscript/contrib/ \
 		http://fossies.org/unix/misc/
-MASTER_SITE_SUBDIR=	ghostscript/contrib
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PostScript to Text converter
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 7183abce40e6..302d44644fd1 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \
 		ftp://ftp.knackered.org/pub/psutils/ \
-		${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	support/psutils
+		TEX_CTAN/support/psutils
 DISTNAME=	psutils-p17
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/print/py-reportlab1/Makefile b/print/py-reportlab1/Makefile
index 544f3c4a857b..135c4d99293b 100644
--- a/print/py-reportlab1/Makefile
+++ b/print/py-reportlab1/Makefile
@@ -6,9 +6,8 @@ PORTVERSION=	1.21.2
 PORTREVISION=	3
 CATEGORIES=	print python
 MASTER_SITES=	http://www.reportlab.com/ftp/ \
-		${MASTER_SITE_LOCAL:S/$/:accel/} \
+		LOCAL/erwin/:accel \
 		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/:accel
-MASTER_SITE_SUBDIR=	erwin/:accel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	1
 DISTFILES=	reportlab-${PORTVERSION}.tar.gz \
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 7280d84e2ac0..35241ab90fbe 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	tex
 PORTVERSION=	3.14159
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mikeh
-#${MASTER_SITE_TEX_CTAN} XXX distfiles disappeared/moved?
-#MASTER_SITE_SUBDIR=	systems/web2c
+MASTER_SITES=	LOCAL/mikeh
+#TEX_CTAN/systems/web2c XXX distfiles disappeared/moved?
 DISTNAME=	web2c-7.2
 DISTFILES=	web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
 		mf_lib.tar.gz cm_mf.tar.gz modes.mf
diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile
index a9da3f498df9..cb929977bc8a 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	trueprint
 PORTVERSION=	5.4
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	trueprint
+MASTER_SITES=	GNU
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Print program listings on postscript printer