7 files changed, 7 insertions, 13 deletions

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