Use the new ghostscript options.

Submitted by:	linimon

14 files changed, 25 insertions, 119 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 4b97b799d10..b2851b57971 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -35,11 +35,7 @@ MAKE_ENV+=      NO_X=true
 # define WITH_GHOSTSCRIPT_AFPL=yes for AFPL Postscript interpreter
 # instead of GNU one
 #
-.if defined(WITH_GHOSTSCRIPT_AFPL)
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 #
 # hint: for batch mode you can now draw the following decisions
@@ -53,11 +49,6 @@ GSPORT?=	print/ghostscript-gnu
 #
 # Build and install all filter apsfilter knows about (rather expensive)
 #
-# ps emulator
-.if defined(WITHOUT_X11)
-GSPORT:=		${GSPORT}-nox11
-.endif
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 # all needed decompression utilities
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
@@ -104,11 +95,6 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 # don't build too many dependencies
 # since apsfilter should fit easily on installation CD 1...
 #
-# ps emulator
-.if defined(WITHOUT_X11)
-GSPORT:=		${GSPORT}-nox11
-.endif
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 # most important "xxx to ps" filter utilities
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
@@ -126,13 +112,13 @@ MAN5=		apsfilterrc.5
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/apsfilter
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" GSPORT="${GSPORT}"
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" GHOSTSCRIPT_PORT="${GHOSTSCRIPT_PORT}"
 
 # make a2ps port happy in this early stage
 PAPERSIZE?=letter
 
-pre-fetch:
-.if !defined(WITH_GHOSTSCRIPT_AFPL)
+pre-everything::
+.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
 	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
 	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
diff --git a/print/epsonepl/Makefile b/print/epsonepl/Makefile
index 93e1302dda0..c77c056d815 100644
--- a/print/epsonepl/Makefile
+++ b/print/epsonepl/Makefile
@@ -16,8 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	corecode@corecode.ath.cx
 COMMENT=	"Printer filter for EPSON EPL-5700L etc"
 
+USE_GHOSTSCRIPT_RUN=	yes
+
 LIB_DEPENDS=	ijs.1:${PORTSDIR}/print/libijs
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 MAKEFILE=	${FILESDIR}/Makefile
 
diff --git a/print/font2svg/Makefile b/print/font2svg/Makefile
index 1ab3bf4a476..bd997ab4a7f 100644
--- a/print/font2svg/Makefile
+++ b/print/font2svg/Makefile
@@ -15,14 +15,9 @@ MASTER_SITES=	http://www.gdv.uni-hannover.de/~peinecke/font2svg/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	All font to svg-font converter
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
-		gs:${PORTSDIR}/${GSPORT}
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 USE_REINPLACE=	yes
 NO_BUILD=	yes
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 7278ed3c91b..d9b1bfcb4e8 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -16,18 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 ghostscript viewer
 
-.if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-BUILD_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
+USE_GHOSTSCRIPT=	yes
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 28e5fce1207..8f6f1d5784f 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -16,19 +16,10 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome print support library
 
-.if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 28e5fce1207..8f6f1d5784f 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -16,19 +16,10 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome print support library
 
-.if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index 142259b2d9a..4cbed6dda03 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -15,22 +15,16 @@ DISTNAME=	html2ps-1.0b3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML to PostScript converter
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_BUILD=	yes
 
 BUILD_DEPENDS=	mogrify:${PORTSDIR}/graphics/ImageMagick \
 		djpeg:${PORTSDIR}/graphics/jpeg \
 		giftopnm:${PORTSDIR}/graphics/netpbm \
-		gs:${PORTSDIR}/${GSPORT} \
 		tex:${PORTSDIR}/print/teTeX \
-		${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		weblint:${PORTSDIR}/www/weblint
 RUN_DEPENDS=	mogrify:${PORTSDIR}/graphics/ImageMagick
 
-site_perl=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 USE_PERL5=	YES
 NO_BUILD=	YES
 
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 130ef16f664..707783a9e72 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -14,16 +14,7 @@ MASTER_SITE_SUBDIR= system/printing
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Customizable, extensible automatic printer filter
 
-# at least, gs must exist in many case
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-BUILD_DEPENDS=	${PREFIX}/bin/gs:${PORTSDIR}/${GSPORT}
-# to give freedom to choose your favor gs..
-#RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
+USE_GHOSTSCRIPT=	yes
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -31,7 +22,7 @@ MAN8=		magicfilter.8
 
 .include <bsd.port.pre.mk>
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
 	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 5beba20d658..f73ac20abca 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -14,14 +14,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PNM images to PPA for some HP printers
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT} \
-		enscript:${PORTSDIR}/print/enscript-letter
+RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-letter
 
 USE_GETOPT_LONG=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
diff --git a/print/preview-latex/Makefile b/print/preview-latex/Makefile
index 0fdd3e44130..8802867b5f4 100644
--- a/print/preview-latex/Makefile
+++ b/print/preview-latex/Makefile
@@ -16,16 +16,10 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LaTeX previewer on Emacs
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT=	yes
 
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex \
-		gs:${PORTSDIR}/${GSPORT}
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex
 RUN_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex \
-		gs:${PORTSDIR}/${GSPORT} \
 		mktexlsr:${PORTSDIR}/print/teTeX
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index d6a70beea28..f1cd66e579a 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -15,17 +15,11 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ob@breuninger.org
 COMMENT=	A PostScript to Text converter
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
+USE_GHOSTSCRIPT_RUN=	yes
 
 MAN1=		pstotext.1
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
 	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 79f0f1dbba9..a8cfdf6ae66 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -15,14 +15,9 @@ MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 
 USE_QT_VER=	3
 USE_REINPLACE=	yes
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 79f0f1dbba9..a8cfdf6ae66 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -15,14 +15,9 @@ MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 
 USE_QT_VER=	3
 USE_REINPLACE=	yes
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index b2a4af1e12a..74ff8c7cf51 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -17,15 +17,10 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools to convert Xfig's .fig files
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm \
-		gs:${PORTSDIR}/${GSPORT}
+RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 
 USE_IMAKE=	yes
 USE_XPM=	yes