Use the new ghostscript options.

Submitted by:	linimon

38 files changed, 70 insertions, 295 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index f601dc5bbd45..fb63a301bfa3 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -15,14 +15,6 @@ MASTER_SITES=	http://xcircuit.ece.jhu.edu/archive/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 drawing program [especially for circuit schematics]
 
-.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_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
@@ -34,6 +26,8 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
+USE_GHOSTSCRIPT_RUN=	yes
+
 WISH=		${LOCALBASE}/bin/wish8.4
 
 .if defined(WITH_TCLTK)
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
index 97ec2971f63a..d155d713ffb8 100644
--- a/chinese/enscript/Makefile
+++ b/chinese/enscript/Makefile
@@ -12,19 +12,14 @@ MASTERDIR=	${.CURDIR}/../../print/enscript-letter
 
 MAINTAINER=	keith@FreeBSD.org
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm \
-		gs:${PORTSDIR}/${GSPORT}
+RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
 
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 PLIST=		${WRKDIR}/pkg-plist
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
+USE_GHOSTSCRIPT_RUN=	yes
+
 pre-fetch:
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile
index 8eb3cbfe12b3..5faabc2e161a 100644
--- a/chinese/moefonts-cid/Makefile
+++ b/chinese/moefonts-cid/Makefile
@@ -18,17 +18,12 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MOE CIDFonts converted by Adobe
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT} \
-		${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 
 NO_BUILD=	YES
 
+USE_GHOSTSCRIPT_RUN=	yes
+
 pre-fetch:
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 935732509fc4..4f2b03e5d781 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -14,15 +14,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tcl/tk interface to Sam Leffler's fax package
 
-.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=	wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
 		sendfax:${PORTSDIR}/comms/hylafax \
-		gs:${PORTSDIR}/${GSPORT} \
 		gv:${PORTSDIR}/print/gv
 
 WRKSRC=		${WRKDIR}/tkhylafax
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index cf62854a6c93..4ac986643fff 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -27,17 +27,10 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 MAKEFILE=	GNUmakefile
 
-.ifdef WITHOUT_GHOSTSCRIPT
-PLIST_SUB+=	PDFVIEW="@comment "
-.else
-.if defined(WITH_GHOSTSCRIPT_AFP1)
-GSPORT?=	print/ghostscript-afp1
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-BUILD_DEPENDS+=	gs:${PORTSDIR}/${GSPORT}
-RUN_DEPENDS+=	gs:${PORTSDIR}/${GSPORT}
+.ifdef USE_GHOSTSCRIPT
 PLIST_SUB+=	PDFVIEW=""
+.else
+PLIST_SUB+=	PDFVIEW="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 747978a8b68f..8b2b86c14b30 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -28,7 +28,7 @@ ALL_TARGET+=	pdf
 PLIST_SUB+=	HAVE_LATEX=""
 GSPORT?=	print/ghostscript-gnu
 BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX \
-		gs:${PORTSDIR}/${GSPORT}
+		gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}
 MAKE_ARGS+=	HAVE_LATEX=yes
 .else # !defined(WITHOUT_LATEX)
 PLIST_SUB+=	HAVE_LATEX="@comment "
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 479e0c7e35f7..c7902f2ba36d 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -155,7 +155,7 @@ CONFIGURE_ARGS+=	--without-lcms
 .if !defined(WITHOUT_IMAGEMAGICK_TTF)
 BUILD_DEPENDS+=		freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
-NEED_GS=                yes
+USE_GHOSTSCRIPT=	yes
 .else
 CONFIGURE_ARGS+=	--without-ttf
 .endif
@@ -188,7 +188,7 @@ CONFIGURE_ARGS+=	--without-dps
 # PDF (Adobe Portable Document Format) support
 .if !defined(WITHOUT_IMAGEMAGICK_PDF)
 CONFIGURE_ARGS+=	--with-gslib
-NEED_GS=                yes
+USE_GHOSTSCRIPT=	yes
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
@@ -211,22 +211,6 @@ CONFIGURE_ARGS+=	--without-mpeg2
 .endif
 .endif
 
-.if defined(NEED_GS)
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-.if defined(WITHOUT_X11)
-BUILD_DEPENDS+=		gs:${PORTSDIR}/${GSPORT}-nox11
-RUN_DEPENDS+=		gs:${PORTSDIR}/${GSPORT}-nox11
-.else
-BUILD_DEPENDS+=		gs:${PORTSDIR}/${GSPORT}
-RUN_DEPENDS+=		gs:${PORTSDIR}/${GSPORT}
-.endif
-.endif
-
 .if defined(NOPORTDOCS)
 INSTALL_TARGET=	install
 .else
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index b8fad6d096d1..93c3b968cc77 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -15,13 +15,7 @@ MASTER_SITE_SUBDIR=	../../authors/Johan_Vromans
 MAINTAINER=	nik@freebsd.org
 COMMENT=	Converts EPS images to PNG
 
-.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
 
 PERL_CONFIGURE=	yes
 
diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 9b5f72fcd42e..c966c17cdc02 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -13,13 +13,7 @@ MASTER_SITES=	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create or extract preview bitmaps in EPS files
 
-.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
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 5643f98eaf21..2bc2ba50bc56 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -15,15 +15,9 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	bremner@unb.ca
 COMMENT=	Extensible drawing editor
 
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT} \
-		latex:${PORTSDIR}/print/teTeX
-
-.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=	latex:${PORTSDIR}/print/teTeX
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_QT_VER=	3
 MAKE_ENV+=	QTDIR=${QTDIR}
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 840e16de274c..0cb8a2e75710 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -18,18 +18,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Objective Caml image processing library
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT=	yes
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
-		gs:${PORTSDIR}/${GSPORT}
+		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
 RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
-		gs:${PORTSDIR}/${GSPORT}
+		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
 LIB_DEPENDS=	ungif:${PORTSDIR}/graphics/libungif \
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile
index e944bdccd93b..8673245f49bd 100644
--- a/graphics/peps/Makefile
+++ b/graphics/peps/Makefile
@@ -15,14 +15,9 @@ MASTER_SITE_SUBDIR=	petef
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Converts EPS images to anti-aliased PGM bitmaps
 
-.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} \
-		pnmtopng:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	pnmtopng:${PORTSDIR}/graphics/netpbm
 
 USE_REINPLACE=	yes
 
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index e55620250df4..5ba056e22e53 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -14,17 +14,11 @@ MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PostScript to other vector graphic formats
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT=	yes
 
-BUILD_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 LIB_DEPENDS=	Magick++.6:${PORTSDIR}/graphics/ImageMagick \
 		ming.3:${PORTSDIR}/graphics/ming \
 		plotter.4:${PORTSDIR}/graphics/plotutils
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 
 USE_GNOME=	gnometarget pkgconfig
 USE_LIBTOOL=	yes
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index f09367980c3c..058a4cba88a2 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -16,14 +16,9 @@ EXTRACT_ONLY=	#empty
 MAINTAINER=	mita@FreeBSD.org
 COMMENT=	Wiliam Chia-Wei Cheng's yet another PS to EPSI 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=	pbmtoepsi:${PORTSDIR}/graphics/netpbm \
-		gs:${PORTSDIR}/${GSPORT}
+RUN_DEPENDS=	pbmtoepsi:${PORTSDIR}/graphics/netpbm
 
 NO_WRKSUBDIR=	yes
 
diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile
index a02ef19d0005..1f9448ef2cb1 100644
--- a/graphics/py-chart/Makefile
+++ b/graphics/py-chart/Makefile
@@ -16,13 +16,7 @@ DISTNAME=	PyChart-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create high quality Encapsulated Postscript, PDF, or PNG charts
 
-.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
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 875108888e4c..819f235d2a74 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -15,15 +15,10 @@ MASTER_SITES=	http://www.inf.bme.hu/~pts/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts raster (bitmap) image formats into PS or PDF files
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
+USE_GHOSTSCRIPT_RUN=	yes
 
 BUILD_DEPENDS=	tif22pnm:${PORTSDIR}/graphics/tif22pnm \
 		tifftopnm:${PORTSDIR}/graphics/netpbm \
-		gs:${PORTSDIR}/${GSPORT} \
 		zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash2
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index 6b4881abd4fb..e49e0e6afc07 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -20,14 +20,9 @@ BUILD_DEPENDS=  emacs:${PORTSDIR}/editors/emacs
 .endif
 .if defined(WITH_FULL_DOCS)
 .undef NOPORTDOCS
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
 
 BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \
-		ps2pdf:${PORTSDIR}/${GSPORT}
+		ps2pdf:${PORTSDIR}/${GHOSTSCRIPT_PORT}
 .endif
 
 USE_XLIB=	yes
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 3e981484efba..4f865b3f9338 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -18,14 +18,8 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 
-# XXX ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
+# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
+USE_GHOSTSCRIPT_RUN=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -33,7 +27,7 @@ RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 STRIP=
 .endif
 
-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/misc/instant-workstation/Makefile b/misc/instant-workstation/Makefile
index 60e86b3276f2..22c07691a232 100644
--- a/misc/instant-workstation/Makefile
+++ b/misc/instant-workstation/Makefile
@@ -14,11 +14,7 @@ MASTER_SITES=	ftp://ftp.lemis.com/pub/
 MAINTAINER=	grog@lemis.com
 COMMENT=	Instant workstation installs a typical set of ports for a workstation
 
-.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=	acroread:${PORTSDIR}/print/acroread5 \
 		bash:${PORTSDIR}/shells/bash2 \
@@ -26,7 +22,6 @@ RUN_DEPENDS=	acroread:${PORTSDIR}/print/acroread5 \
 		dos2unix:${PORTSDIR}/converters/unix2dos \
 		emacs:${PORTSDIR}/editors/emacs20 \
 		fetchmail:${PORTSDIR}/mail/fetchmail \
-		gs:${PORTSDIR}/${GSPORT} \
 		grip:${PORTSDIR}/audio/grip \
 		gimp:${PORTSDIR}/graphics/gimp1 \
 		gv:${PORTSDIR}/print/gv \
@@ -50,7 +45,7 @@ NO_BUILD=	YES
 RUN_DEPENDS+=	mount_smbfs:${PORTSDIR}/net/smbfs
 .endif
 
-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/net/wb/Makefile b/net/wb/Makefile
index 3e981484efba..4f865b3f9338 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -18,14 +18,8 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 
-# XXX ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
+# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
+USE_GHOSTSCRIPT_RUN=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -33,7 +27,7 @@ RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 STRIP=
 .endif
 
-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/apsfilter/Makefile b/print/apsfilter/Makefile
index 4b97b799d10c..b2851b579717 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 93e1302dda0c..c77c056d815f 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 1ab3bf4a476f..bd997ab4a7fb 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 7278ed3c91b7..d9b1bfcb4e8c 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 28e5fce1207f..8f6f1d5784fa 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 28e5fce1207f..8f6f1d5784fa 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 142259b2d9a3..4cbed6dda03a 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 130ef16f6648..707783a9e72d 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 5beba20d658f..f73ac20abcad 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 0fdd3e441309..8802867b5f44 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 d6a70beea282..f1cd66e579a5 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 79f0f1dbba9d..a8cfdf6ae662 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 79f0f1dbba9d..a8cfdf6ae662 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 b2a4af1e12a7..74ff8c7cf51b 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
diff --git a/sysutils/LPRngTool/Makefile b/sysutils/LPRngTool/Makefile
index 1e5ce4058589..ff4f45d51144 100644
--- a/sysutils/LPRngTool/Makefile
+++ b/sysutils/LPRngTool/Makefile
@@ -19,8 +19,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	papowell@astart.com
 COMMENT=	Configuration Tool for LPRng
 
+USE_GHOSTSCRIPT_AFPL=	yes
+USE_GHOSTSCRIPT_BUILD=	yes
+
 BUILD_DEPENDS=	\
-	gs:${PORTSDIR}/print/ghostscript-afpl \
 	wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
 	a2ps:${PORTSDIR}/print/a2ps-letter
 
diff --git a/textproc/prosper/Makefile b/textproc/prosper/Makefile
index 88d62e88a5f7..655df9a9d994 100644
--- a/textproc/prosper/Makefile
+++ b/textproc/prosper/Makefile
@@ -17,15 +17,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Prosper is a LaTeX class for writing transparencies
 
-.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
-.else
-GSPORT?=	print/ghostscript-gnu
-.endif
-
 BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
-		ps2pdf:${PORTSDIR}/${GSPORT}
+		ps2pdf:${PORTSDIR}/${GHOSTSCRIPT_PORT}
 
 NO_BUILD=	yes
 
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index c19dc4f9f13a..491c35e189dc 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -17,14 +17,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A TeX to HTML translator
 
-.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} \
-		latex:${PORTSDIR}/print/teTeX \
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		ppmtogif:${PORTSDIR}/graphics/netpbm
 
 MAN1=		tth.1
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index d8fb08f2efb6..c1d14615ec97 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -14,16 +14,11 @@ MASTER_SITE_SUBDIR=	dgs
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A display ghostscript system
 
-.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= 	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	gs:${PORTSDIR}/${GSPORT}
 
 USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes