svn commit: r392322 - in head: . Mk Mk/Uses cad/xcircuit chinese/enscript comms/efax-gtk comms/hylafax comms/tkhylafax deskutils/etask deskutils/gworkspace devel/doxygen devel/gdcm devel/libexplain...

Koop Mast kwm at FreeBSD.org
Thu Jul 16 20:53:55 UTC 2015 

Author: kwm
Date: Thu Jul 16 20:53:28 2015
New Revision: 392322
URL: https://svnweb.freebsd.org/changeset/ports/392322

Log:
  Convert code in bsd.port.mk for USE_GHOSTSCRIPT* to USES=ghostscript.
  
  Add GHOSTSCRIPT_DEFAULT to bsd.default-versions.mk for easy version selection.
  Arguments supported: <empty>, build, run, nox11 and agpl
  
  PR:		201201 (exp-run)
  Approved by:	portmgr (mat@)
  Exp run by:	antione@ (previous patch)
  Differential Revision:	https://reviews.freebsd.org/D2938

Added:
  head/Mk/Uses/ghostscript.mk   (contents, props changed)
Modified:
  head/CHANGES
  head/Mk/bsd.default-versions.mk
  head/Mk/bsd.port.mk
  head/Mk/bsd.sanity.mk
  head/cad/xcircuit/Makefile
  head/chinese/enscript/Makefile
  head/comms/efax-gtk/Makefile
  head/comms/hylafax/Makefile
  head/comms/tkhylafax/Makefile
  head/deskutils/etask/Makefile
  head/deskutils/gworkspace/Makefile
  head/devel/doxygen/Makefile
  head/devel/gdcm/Makefile
  head/devel/libexplain/Makefile
  head/editors/ted/Makefile
  head/editors/texmacs/Makefile
  head/editors/texmaker/Makefile
  head/editors/texstudio/Makefile
  head/graphics/GraphicsMagick/Makefile
  head/graphics/ImageMagick/Makefile
  head/graphics/cinepaint/Makefile
  head/graphics/eps2png/Makefile
  head/graphics/epstool/Makefile
  head/graphics/gimp-app/Makefile
  head/graphics/gle-graphics/Makefile
  head/graphics/graphviz/Makefile
  head/graphics/imgtops/Makefile
  head/graphics/impressive/Makefile
  head/graphics/klatexformula/Makefile
  head/graphics/ocaml-images/Makefile
  head/graphics/ocrfeeder/Makefile
  head/graphics/peps/Makefile
  head/graphics/pstoedit/Makefile
  head/graphics/pstoepsi/Makefile
  head/graphics/py-chart/Makefile
  head/graphics/sam2p/Makefile
  head/graphics/xournal/Makefile
  head/graphics/xpaint/Makefile
  head/mail/claws-mail-pdf_viewer/Makefile
  head/mail/courier/Makefile
  head/math/R/Makefile
  head/math/asymptote/Makefile
  head/math/plplot/Makefile
  head/misc/pspresent/Makefile
  head/multimedia/lives/Makefile
  head/print/auctex/Makefile
  head/print/cups-filters/Makefile
  head/print/cups-fxlinuxprint/Makefile
  head/print/cups-pdf/Makefile
  head/print/cups-pstoraster/Makefile
  head/print/dvisvg/Makefile
  head/print/epsonepl/Makefile
  head/print/flpsed/Makefile
  head/print/font2svg/Makefile
  head/print/foo2zjs/Makefile
  head/print/foomatic-filters/Makefile
  head/print/ggv/Makefile
  head/print/ghostscript7-commfont/Makefile
  head/print/ghostscript7-jpnfont/Makefile
  head/print/ghostscript7-korfont/Makefile
  head/print/gspdf/Makefile
  head/print/gsview/Makefile
  head/print/gv/Makefile
  head/print/hpijs/Makefile
  head/print/hplip/Makefile
  head/print/html2ps/Makefile
  head/print/kpdftool/Makefile
  head/print/libspectre/Makefile
  head/print/lilypond-devel/Makefile
  head/print/lilypond/Makefile
  head/print/lpr-wrapper/Makefile
  head/print/magicfilter/Makefile
  head/print/ps2eps/Makefile
  head/print/psdim/Makefile
  head/print/pstotext/Makefile
  head/print/scribus/Makefile
  head/print/texlive-base/Makefile
  head/print/texvc/Makefile
  head/print/transfig/Makefile
  head/sysutils/LPRngTool/Makefile
  head/textproc/docproj/Makefile
  head/textproc/groff/Makefile
  head/textproc/latex2html/Makefile
  head/textproc/pdftohtml/Makefile
  head/textproc/prosper/Makefile
  head/textproc/sowing/Makefile
  head/textproc/tth/Makefile
  head/x11/dgs/Makefile

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/CHANGES	Thu Jul 16 20:53:28 2015	(r392322)
@@ -10,6 +10,13 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20150716:
+AUTHOR:	kwm at FreeBSD.org
+
+  USE_GHOSTSCRIPT was replaced by USES=ghostscript. The ghostscript USES
+  accepts version, build, run, nox11 and for version 9 the agpl argument.
+  If no version is specified, the default 9 for GHOSTSCRIPT_DEFAULT is honored.
+
 20150701:
 AUTHOR: mat at FreeBSD.org
 

Added: head/Mk/Uses/ghostscript.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/ghostscript.mk	Thu Jul 16 20:53:28 2015	(r392322)
@@ -0,0 +1,104 @@
+# $FreeBSD$
+#
+# Provide support for ghostscript ports.
+#
+# Feature:	ghostscript
+# Usage:	USES=ghostscript or USES=ghostscript:args
+# Valid ARGS:	<version>, build, run, nox11, agpl
+#
+# version 	The chooseable versions are 7, 8 and 9. If no version is
+#		specified version 9 is selected.
+#
+#		USES=ghostscript:7	# Use Ghostscript 7
+#		USES=ghostscript:run	# Use the set default Ghostscript as a run dependancy
+#		USES=ghostscript:8,build # Use ghostscript 8 as a build dependancy.
+#
+# nox11		Indicate that the Ghostscript nox11 port is required.
+# agpl		Indicate that the Ghostscript apgl port is required.
+# build		Indicates that Ghostscript is needed at build time and adds
+#		it as BUILD_DEPENDS.
+# run		Indicates that Ghostscript is needed at run time and adds
+#		it as RUN_DEPENDS.
+#
+# If build and run are omitted, Ghostscript will be added as BUILD_DEPENDS and
+# RUN_DEPENDS.
+#
+# MAINTAINER: ports at FreeBSD.org
+
+.if !defined(_INCLUDE_USES_GHOSTSCRIPT_MK)
+_INCLUDE_USES_GHOSTSCRIPT_MK=	yes
+
+# allowed versions
+_GS_VERSION=	7 8 9
+
+_GS_ARGS=		${ghostscript_ARGS}
+
+.if ${_GS_ARGS:N[789]:Nnox11:Nagpl:Nbuild:Nrun}
+IGNORE=		Unknown ghostscript argument ${_GS_ARGS}
+.endif
+
+# Determine version number of Ghostscript to use
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+.if ${_GS_VERSION:M${GHOSTSCRIPT_DEFAULT}} == ""
+IGNORE=		Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
+.endif
+
+# Make sure that no dependency or some other environment variable
+# pollutes the build/run dependency detection
+.undef _GS_BUILD_DEP
+.undef _GS_RUN_DEP
+.if ${_GS_ARGS:Mbuild}
+_GS_BUILD_DEP=	yes
+.endif
+.if ${_GS_ARGS:Mrun}
+_GS_RUN_DEP=	yes
+.endif
+
+# The port does not specify a build or run dependency, assume both are
+# required.
+.if !defined(_GS_BUILD_DEP) && !defined(_GS_RUN_DEP)
+_GS_BUILD_DEP=	yes
+_GS_RUN_DEP=	yes
+.endif
+
+_GS_SELECTED=	${GHOSTSCRIPT_DEFAULT}
+.if ${_GS_ARGS:M9}
+_GS_SELECTED:=		9
+.elif ${_GS_ARGS:M8}
+_GS_SELECTED:=		8
+.elif ${_GS_ARGS:M7}
+_GS_SELECTED:=		7
+.endif
+
+.undef _GS_AGPL_SUFFIX
+.if ${_GS_ARGS:Magpl}
+. if ${_GS_SELECTED} == "9"
+_GS_AGPL_SUFFIX=	-agpl
+. else
+IGNORE=		Ghostscript-agpl is only available in version 9
+. endif
+.endif
+
+.undef _GS_NOX11_SUFFIX
+.if ${_GS_ARGS:Mnox11} || defined(WITHOUT_X11)
+_GS_NOX11_SUFFIX=	-nox11
+.endif
+
+.endif # _INCLUDE_USES_GHOSTSCRIPT_MK
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GHOSTSCRIPT_POST_MK)
+_INCLUDE_USES_GHOSTSCRIPT_POST_MK=   yes
+
+# dependencies
+_GS_PORT=	ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}${_GS_NOX11_SUFFIX}
+
+.if defined(_GS_BUILD_DEP)
+BUILD_DEPENDS+=	${_GS_PORT}>=0:${PORTSDIR}/print/${_GS_PORT}
+.endif
+.if defined(_GS_RUN_DEP)
+RUN_DEPENDS+=	${_GS_PORT}>=0:${PORTSDIR}/print/${_GS_PORT}
+.endif
+
+
+.endif

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/Mk/bsd.default-versions.mk	Thu Jul 16 20:53:28 2015	(r392322)
@@ -32,6 +32,7 @@ PYTHON3_DEFAULT?=	3.4
 RUBY_DEFAULT?=		2.1
 TCLTK_DEFAULT?=		8.6
 FIREBIRD_DEFAULT?=	2.5
+GHOSTSCRIPT_DEFAULT?=	9
 
 # Version of lang/gcc.  Do not override!
 LANG_GCC_IS=		4.8

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/Mk/bsd.port.mk	Thu Jul 16 20:53:28 2015	(r392322)
@@ -342,27 +342,6 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 # CXXFLAGS_${ARCH}
 #				 Append the cxxflags to CXXFLAGS only on the specified architecture
 ##
-# USE_GHOSTSCRIPT
-#				- If set, this port needs ghostscript to both
-#				  build and run.  If a number is specified,
-#				  the specified version will be used.
-#				  The valid value is '7', '8', or '9' in that case.
-# USE_GHOSTSCRIPT_BUILD
-#				- If set, this port needs ghostscript to build.
-# USE_GHOSTSCRIPT_RUN
-#				- If set, this port needs ghostscript to run.
-# GHOSTSCRIPT_PORT
-#				- The port that provides postscript functionality.
-#				  Some installations may wish to override the default
-#				  to specify a version without X11 and/or localized
-#				  versions for their nationality.
-#				  Default: print/ghostscript9
-# WITH_GHOSTSCRIPT_VER
-#				- If set, the specified version of ghostscript will be
-#				  used.  The valid value is "7", "8", or "9".  Note that
-#				  this is for users, not for port maintainers.  This
-#				  should not be used in Makefile.
-##
 # USE_GL		- A list of Mesa or GL related dependencies needed by the port.
 #				  Supported components are: egl, glesv2, glut, glu, glw, and gl.
 #				  If set to "yes", this is equivalent to "glu". Note that
@@ -1927,58 +1906,6 @@ CONFIGURE_ARGS+=--x-libraries=${LOCALBAS
 .endif
 .endif
 
-# Set the default for the installation of Postscript(TM)-
-# compatible functionality.
-.if !defined(USE_GHOSTSCRIPT)
-.	if defined(USE_GHOSTSCRIPT_BUILD)
-_USE_GHOSTSCRIPT=	${USE_GHOSTSCRIPT_BUILD}
-.	elif defined(USE_GHOSTSCRIPT_RUN)
-_USE_GHOSTSCRIPT=	${USE_GHOSTSCRIPT_RUN}
-.	endif
-.else
-_USE_GHOSTSCRIPT=	${USE_GHOSTSCRIPT}
-.endif
-
-.if defined(WITH_GHOSTSCRIPT_VER) && !empty(WITH_GHOSTSCRIPT_VER:M[789])
-_USE_GHOSTSCRIPT_DEFAULT_VER=	${WITH_GHOSTSCRIPT_VER}
-.else
-_USE_GHOSTSCRIPT_DEFAULT_VER=	9
-.endif
-
-.if defined(_USE_GHOSTSCRIPT)
-.	if !defined(WITHOUT_X11)
-_USE_GHOSTSCRIPT_PKGNAME_SUFFIX=
-.	else
-_USE_GHOSTSCRIPT_PKGNAME_SUFFIX=-nox11
-.	endif
-.	if !empty(_USE_GHOSTSCRIPT:M[789])
-_USE_GHOSTSCRIPT_VER=${_USE_GHOSTSCRIPT:M[789]}
-.	else
-_USE_GHOSTSCRIPT_VER=${_USE_GHOSTSCRIPT_DEFAULT_VER}
-.	endif
-.else
-_USE_GHOSTSCRIPT_VER=${_USE_GHOSTSCRIPT_DEFAULT_VER}
-.endif
-
-# Sanity check
-.if defined(_USE_GHOSTSCRIPT) && defined(WITH_GHOSTSCRIPT_VER)
-.	if empty(WITH_GHOSTSCRIPT_VER:M[789])
-.		error You set an invalid value "${WITH_GHOSTSCRIPT_VER}" in WITH_GHOSTSCRIPT_VER.  Abort.
-.	elif ${_USE_GHOSTSCRIPT_VER} != ${WITH_GHOSTSCRIPT_VER}
-.		error You set WITH_GHOSTSCRIPT_VER as ${WITH_GHOSTSCRIPT_VER} but ${PKGNAME} requires print/ghostscript${_USE_GHOSTSCRIPT_VER}.  Abort.
-.	endif
-.endif
-
-GHOSTSCRIPT_PORT?=	print/ghostscript${_USE_GHOSTSCRIPT_VER}${_USE_GHOSTSCRIPT_PKGNAME_SUFFIX}
-
-# Set up the ghostscript dependencies.
-.if defined(USE_GHOSTSCRIPT) || defined(USE_GHOSTSCRIPT_BUILD)
-BUILD_DEPENDS+=	gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}
-.endif
-.if defined(USE_GHOSTSCRIPT) || defined(USE_GHOSTSCRIPT_RUN)
-RUN_DEPENDS+=	gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}
-.endif
-
 # Macro for doing in-place file editing using regexps
 REINPLACE_ARGS?=	-i.bak
 REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/Mk/bsd.sanity.mk	Thu Jul 16 20:53:28 2015	(r392322)
@@ -47,6 +47,10 @@ DEV_ERROR+=	"USE_KDELIBS_VER is unsuppor
 DEV_ERROR+=	"USE_QT_VER is unsupported"
 .endif
 
+.if defined(USE_GHOSTSCRIPT) || defined(USE_GHOSTSCRIPT_BUILD) || defined(USE_GHOSTSCRIPT_RUN)
+DEV_ERROR+=	"USE_GHOSTSCRIPT is unsupported, please use USES=ghostscript instead"
+.endif
+
 .if !empty(LIB_DEPENDS:M*/../*)
 DEV_ERROR+=	"LIB_DEPENDS contains unsupported relative path to dependency"
 .endif

Modified: head/cad/xcircuit/Makefile
==============================================================================
--- head/cad/xcircuit/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/cad/xcircuit/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -16,8 +16,7 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	EXAMPLES
 
 USE_XORG=	xpm xscrnsaver xt
-USES=	tk gmake tar:tgz
-USE_GHOSTSCRIPT_RUN=	yes
+USES=	tk ghostscript:run gmake tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR}

Modified: head/chinese/enscript/Makefile
==============================================================================
--- head/chinese/enscript/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/chinese/enscript/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,7 +14,7 @@ EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 PLIST=		${WRKDIR}/pkg-plist
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
-USE_GHOSTSCRIPT_RUN=	yes
+USES+=		ghostscript:run
 
 post-patch:
 	@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist

Modified: head/comms/efax-gtk/Makefile
==============================================================================
--- head/comms/efax-gtk/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/comms/efax-gtk/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/
 		libcxx-gtk-utils-2-2.2.so:${PORTSDIR}/x11-toolkits/c++-gtk-utils
 RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
 
-USES=		compiler:c++11-lib pkgconfig
-USE_GHOSTSCRIPT_RUN=yes
+USES=		compiler:c++11-lib ghostscript:run pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 

Modified: head/comms/hylafax/Makefile
==============================================================================
--- head/comms/hylafax/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/comms/hylafax/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -15,9 +15,8 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/grap
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
 MAKE_JOBS_UNSAFE=	yes
-USE_GHOSTSCRIPT=yes
 HAS_CONFIGURE=	yes
-USES=		fakeroot jpeg
+USES=		fakeroot ghostscript jpeg
 
 CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg" \

Modified: head/comms/tkhylafax/Makefile
==============================================================================
--- head/comms/tkhylafax/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/comms/tkhylafax/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,8 +14,7 @@ COMMENT=	Tcl/tk interface to Sam Leffler
 RUN_DEPENDS=	sendfax:${PORTSDIR}/comms/hylafax \
 		gv:${PORTSDIR}/print/gv
 
-USE_GHOSTSCRIPT_RUN=	yes
-USES+=		tk:run
+USES+=		ghostscript:run tk:run
 
 WRKSRC=		${WRKDIR}/tkhylafax
 MAKE_ARGS=	STAGEDIR=${STAGEDIR} PREFIX=${STAGEDIR}${PREFIX} TCLSH=${TCLSH} WISH=${WISH}

Modified: head/deskutils/etask/Makefile
==============================================================================
--- head/deskutils/etask/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/deskutils/etask/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,7 +14,7 @@ COMMENT=	Manage your projects or tasks w
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
 
 USE_EMACS=	yes
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 USE_TEX=	latex dvipsk
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}

Modified: head/deskutils/gworkspace/Makefile
==============================================================================
--- head/deskutils/gworkspace/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/deskutils/gworkspace/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -23,7 +23,7 @@ MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=S
 PLIST_SUB+=	PDFVIEW="@comment "
 .else
 PLIST_SUB+=	PDFVIEW=""
-USE_GHOSTSCRIPT=	yes
+USES+=		ghostscript
 .endif
 
 pre-configure:

Modified: head/devel/doxygen/Makefile
==============================================================================
--- head/devel/doxygen/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/devel/doxygen/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -65,7 +65,7 @@ IGNORE=		PDFDOCS option requires HTMLDOC
 .endif
 
 .if ${PORT_OPTIONS:MPDFDOCS}
-USE_GHOSTSCRIPT_BUILD=	yes
+USES+=		ghostscript:build
 .endif
 
 .if ${PORT_OPTIONS:MQT4}

Modified: head/devel/gdcm/Makefile
==============================================================================
--- head/devel/gdcm/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/devel/gdcm/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -66,7 +66,7 @@ PLIST_SUB+=	GDCM_MAJOR="${GDCM_MAJOR}" \
 
 .if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	latex:build
-USE_GHOSTSCRIPT=yes
+USES+=		ghostscript
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 CMAKE_ARGS+=	-DGDCM_DOCUMENTATION:BOOL=YES \
 		-DGDCM_INSTALL_MAN_DIR:STRING=man \

Modified: head/devel/libexplain/Makefile
==============================================================================
--- head/devel/libexplain/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/devel/libexplain/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -17,8 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
 
-USES=		bison gettext gmake libtool:build
-USE_GHOSTSCRIPT_BUILD=	yes
+USES=		bison gettext ghostscript:build gmake libtool:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_linux_kd_h=no
 USE_LDCONFIG=	yes

Modified: head/editors/ted/Makefile
==============================================================================
--- head/editors/ted/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/editors/ted/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -26,8 +26,7 @@ GTK2_DESC=	Use GTK2 instead of MOTIF
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
 USE_XORG=	xext xft
-USES=		iconv
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run iconv
 GNU_CONFIGURE=	yes
 MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \
 		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \

Modified: head/editors/texmacs/Makefile
==============================================================================
--- head/editors/texmacs/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/editors/texmacs/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -40,7 +40,7 @@ PDF_DESC=	Experimental PDF renderer
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FREETYPE_CONFIGURE_WITH=freetype=linked
 
-GHOSTSCRIPT_USE=	GHOSTSCRIPT=yes
+GHOSTSCRIPT_USES=	ghostscript
 GHOSTSCRIPT_CONFIGURE_WITH=	gs=yes
 
 ICONV_USES=		iconv

Modified: head/editors/texmaker/Makefile
==============================================================================
--- head/editors/texmaker/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/editors/texmaker/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -13,8 +13,7 @@ COMMENT=	LaTeX Development Environment
 
 LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
 
-USES=		desktop-file-utils pkgconfig qmake tar:bzip2
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		desktop-file-utils ghostscript:run pkgconfig qmake tar:bzip2
 _USE_QT4=	gui network xml webkit \
 		moc_build rcc_build uic_build
 _USE_QT5=	concurrent network printsupport script webkit widgets \

Modified: head/editors/texstudio/Makefile
==============================================================================
--- head/editors/texstudio/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/editors/texstudio/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -12,9 +12,9 @@ COMMENT=	Integrated writing environment 
 LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 
-USES=		desktop-file-utils dos2unix execinfo pkgconfig qmake
+USES=		desktop-file-utils dos2unix execinfo ghostscript:run \
+		pkgconfig qmake
 DOS2UNIX_FILES=	${PORTNAME}.pro
-USE_GHOSTSCRIPT_RUN=	yes
 USE_QT4=	gui network script svg xml iconengines_run \
 		designer_build moc_build rcc_build uic_build
 USE_TEX=	latex dvipsk

Modified: head/graphics/GraphicsMagick/Makefile
==============================================================================
--- head/graphics/GraphicsMagick/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/GraphicsMagick/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -21,9 +21,8 @@ LIB_DEPENDS=	libjbig.so:${PORTSDIR}/grap
 
 PORTSCOUT=	limit:^1\.3\.
 
-USES=		iconv jpeg libtool tar:bzip2
+USES=		ghostscript iconv jpeg libtool tar:bzip2
 USE_GNOME=	libxml2
-USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
 CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/ImageMagick/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -219,7 +219,11 @@ PLIST_SUB+=		TIFF="@comment "
 
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
-USE_GHOSTSCRIPT=	yes
+. if ${PORT_OPTIONS:MX11}
+USES+=		ghostscript
+. else
+USES+=		ghostscript:nox11
+. endif
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
@@ -352,7 +356,7 @@ PLIST_SUB+=		PANGO="@comment "
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
-USE_GHOSTSCRIPT=	yes
+USES+=			ghostscript
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
@@ -375,7 +379,7 @@ INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
-USE_GHOSTSCRIPT_BUILD=yes
+USES+=		ghostscript:build
 .endif
 
 post-patch:

Modified: head/graphics/cinepaint/Makefile
==============================================================================
--- head/graphics/cinepaint/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/cinepaint/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -25,11 +25,10 @@ OYRANOS_DESC=	ICC profile support via Oy
 PRINT_DESC=	Gutenprint (gimp-print) plugin
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf desktop-file-utils gettext gmake jpeg libtool \
-		pkgconfig python
+USES=		autoreconf desktop-file-utils gettext ghostscript:run \
+		gmake jpeg libtool pkgconfig python
 USE_XORG=	xmu
 USE_GNOME=	gtk20
-USE_GHOSTSCRIPT_RUN=yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 

Modified: head/graphics/eps2png/Makefile
==============================================================================
--- head/graphics/eps2png/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/eps2png/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -11,8 +11,7 @@ MASTER_SITE_SUBDIR=	CPAN:JV
 MAINTAINER=	perl at FreeBSD.org
 COMMENT=	Converts EPS images to PNG
 
-USE_GHOSTSCRIPT=	yes
-USES=		perl5
+USES=		ghostscript perl5
 USE_PERL5=	configure
 MAKE_ARGS=	INSTLLSCRIPT="${PREFIX}/bin"
 

Modified: head/graphics/epstool/Makefile
==============================================================================
--- head/graphics/epstool/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/epstool/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -12,9 +12,7 @@ COMMENT=	Create or extract preview bitma
 
 LICENSE=	GPLv2
 
-USE_GHOSTSCRIPT_RUN=	yes
-
-USES=		gmake
+USES=		ghostscript:run gmake
 MAKEFILE=	makefile
 MAKE_ARGS=	MAKE="${MAKE_CMD}" GSCDEBUG="" CC="${CC}" CCAUX="${CC}" \
 		CLINK="${CC} ${LDFLAGS}" LINK="${CC} ${LDFLAGS}" EPSLIB="" \

Modified: head/graphics/gimp-app/Makefile
==============================================================================
--- head/graphics/gimp-app/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/gimp-app/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--without-dbus
 .endif
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USE_GHOSTSCRIPT=	yes
+USES+=			ghostscript
 CONFIGURE_ARGS+=	--with-gs
 PLIST_SUB+=		GS=""
 .else

Modified: head/graphics/gle-graphics/Makefile
==============================================================================
--- head/graphics/gle-graphics/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/gle-graphics/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -32,7 +32,8 @@ DOCS_USE=	tex=latex:build tex=dvipsk:bui
 GNU_CONFIGURE=	yes
 
 LATEX_GS_DESC=	Use LaTeX & GhostScript
-LATEX_GS_USE=	tex=latex ghostscript=run
+LATEX_GS_USE=	tex=latex
+LATEX_GS_USES=	ghostscript
 
 MAKE_JOBS_UNSAFE=yes
 

Modified: head/graphics/graphviz/Makefile
==============================================================================
--- head/graphics/graphviz/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/graphviz/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -90,7 +90,7 @@ GNOMEUI_USE=	GNOME=libgnomeui
 SMYRNA_USE=	GNOME=libglade2 GL=glut
 GVEDIT_USE=	qt4=qmake_build,moc_build,rcc_build,uic_build \
 		qt4=linguist_build,corelib,gui
-GHOSTSCRIPT_USE=GHOSTSCRIPT=yes
+GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
 PHP_USE=	PHP=yes PHP_BUILD=yes
 PYTHON_USES=	python:2.7,build

Modified: head/graphics/imgtops/Makefile
==============================================================================
--- head/graphics/imgtops/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/imgtops/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
 
-USES=			python
-USE_GHOSTSCRIPT_RUN=	yes
+USES=			ghostscript:run python
 USE_PYTHON=		distutils
 
 post-install:

Modified: head/graphics/impressive/Makefile
==============================================================================
--- head/graphics/impressive/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/impressive/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -21,8 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}open
 		mplayer:${PORTSDIR}/multimedia/mplayer \
 		${PYGAME}
 
-USES=		python
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run python
 NO_BUILD=	yes
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz

Modified: head/graphics/klatexformula/Makefile
==============================================================================
--- head/graphics/klatexformula/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/klatexformula/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -10,11 +10,11 @@ COMMENT=	Convert LaTeX formula to image
 
 BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 
-USES=		cmake:outsource desktop-file-utils shared-mime-info
+USES=		cmake:outsource desktop-file-utils ghostscript:run \
+		shared-mime-info
 USE_QT4=	gui xml dbus designer_build linguisttools_build \
 		qmake_build moc_build rcc_build uic_build
 USE_TEX=	latex dvipsk
-USE_GHOSTSCRIPT_RUN=	yes
 CMAKE_ARGS=	-DQT_QMAKE_EXECUTABLE_FINDQT=${QMAKE} \
 		-DKLF_BUILD_KTEXTEDITORPLUGIN=off \
 		-DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off \

Modified: head/graphics/ocaml-images/Makefile
==============================================================================
--- head/graphics/ocaml-images/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/ocaml-images/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -57,6 +57,7 @@ FREETYPE_CONFIGURE_WITH=freetype
 FREETYPE_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 
 GHOSTSCRIPT_CONFIGURE_WITH= gs
+GHOSTSCRIPT_USES=	ghostscript
 
 GTK2_CONFIGURE_WITH=	liblgtk2
 GTK2_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
@@ -68,10 +69,6 @@ GTK2_RUN_DEPENDS=	lablgtk2:${PORTSDIR}/x
 USE_XORG=	xpm
 .endif
 
-.if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USE_GHOSTSCRIPT=	yes
-.endif
-
 do-configure:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
 	(cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure)

Modified: head/graphics/ocrfeeder/Makefile
==============================================================================
--- head/graphics/ocrfeeder/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/ocrfeeder/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -24,9 +24,9 @@ RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}lxm
 
 NO_ARCH=	yes
 
-USES=		desktop-file-utils gettext gmake pkgconfig python tar:xz
+USES=		desktop-file-utils gettext ghostscript gmake pkgconfig \
+		python tar:xz
 USE_GNOME=	gnomedocutils gtk30 librsvg2 pygobject3
-USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules
 

Modified: head/graphics/peps/Makefile
==============================================================================
--- head/graphics/peps/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/peps/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -11,7 +11,7 @@ MASTER_SITES=	http://peps.redprince.net/
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Converts EPS images to anti-aliased bitmaps
 
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 MAKE_ENV=	GSPATH="${LOCALBASE}/bin/gs" GZPATH="/usr/bin/gzip" \
 		ETC="${PREFIX}/etc"
 

Modified: head/graphics/pstoedit/Makefile
==============================================================================
--- head/graphics/pstoedit/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/pstoedit/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
 
-USES=		pathfix pkgconfig libtool
-USE_GHOSTSCRIPT=	yes
+USES=		ghostscript pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG="${STRIP}"
 USE_LDCONFIG=	yes

Modified: head/graphics/pstoepsi/Makefile
==============================================================================
--- head/graphics/pstoepsi/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/pstoepsi/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -15,7 +15,7 @@ COMMENT=	Wiliam Chia-Wei Cheng's yet ano
 
 RUN_DEPENDS=	pbmtoepsi:${PORTSDIR}/graphics/netpbm
 
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 NO_WRKSUBDIR=	yes
 
 pre-patch:

Modified: head/graphics/py-chart/Makefile
==============================================================================
--- head/graphics/py-chart/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/py-chart/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,8 +14,7 @@ COMMENT=	Create high quality Encapsulate
 
 LICENSE=	GPLv2
 
-USE_GHOSTSCRIPT_RUN=	yes
 USE_PYTHON=	distutils autoplist
-USES=		python:2.7
+USES=		ghostscript:run python:2.7
 
 .include <bsd.port.mk>

Modified: head/graphics/sam2p/Makefile
==============================================================================
--- head/graphics/sam2p/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/sam2p/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -17,10 +17,9 @@ RUN_DEPENDS=	zip:${PORTSDIR}/archivers/z
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		gmake jpeg:run perl5
+USES=		ghostscript:run gmake jpeg:run perl5
 USE_PERL5=	build
 USE_GCC=	any
-USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_pts_bash="${SH}"
 CONFIGURE_ARGS=	--enable-gif

Modified: head/graphics/xournal/Makefile
==============================================================================
--- head/graphics/xournal/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/xournal/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -24,6 +24,8 @@ OPTIONS_DEFINE=		GHOSTSCRIPT DOCS
 GHOSTSCRIPT_DESC=	Install ghostscript (PS/PDF as bitmap bg)
 OPTIONS_DEFAULT=	GHOSTSCRIPT
 
+GHOSTSCRIPT_USES=	ghostscript:run
+
 PORTDOCS_MAIN=	AUTHORS \
 		ChangeLog \
 		COPYING \
@@ -64,10 +66,6 @@ PORTDOCS=	${PORTDOCS_MAIN} \
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USE_GHOSTSCRIPT_RUN=	yes
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \

Modified: head/graphics/xpaint/Makefile
==============================================================================
--- head/graphics/xpaint/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/graphics/xpaint/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -21,9 +21,8 @@ RUN_DEPENDS=	psselect:${PORTSDIR}/print/
 		bash:${PORTSDIR}/shells/bash
 
 USE_XORG=	xft xmu xpm
-USE_GHOSTSCRIPT_RUN=yes
 GNU_CONFIGURE=	yes
-USES=		jpeg libtool:build shebangfix tar:bzip2
+USES=		ghostscript:run jpeg libtool:build shebangfix tar:bzip2
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \

Modified: head/mail/claws-mail-pdf_viewer/Makefile
==============================================================================
--- head/mail/claws-mail-pdf_viewer/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/mail/claws-mail-pdf_viewer/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -8,7 +8,7 @@ COMMENT=	PDF and PostScript viewer plugi
 
 LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
-USE_GHOSTSCRIPT=yes
+USES+=		ghostscript
 
 CLAWS_PLUGINS_BUILD=	pdf_viewer
 

Modified: head/mail/courier/Makefile
==============================================================================
--- head/mail/courier/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/mail/courier/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -189,7 +189,7 @@ RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/
 .endif
 
 .if ${PORT_OPTIONS:MSENDFAX}
-USE_GHOSTSCRIPT=yes
+USES+=		ghostscript
 SENDFAX_DEPENDS=sendfax:${PORTSDIR}/comms/mgetty+sendfax \
 		pnmscale:${PORTSDIR}/graphics/netpbm
 BUILD_DEPENDS+=	${SENDFAX_DEPENDS}

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/math/R/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -196,7 +196,7 @@ USES+=			readline
 .else # LIBR_SLAVEPORT
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USE_GHOSTSCRIPT_RUN=	yes
+USES+=			ghostscript
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}

Modified: head/math/asymptote/Makefile
==============================================================================
--- head/math/asymptote/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/math/asymptote/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -34,9 +34,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		gmake perl5 python tar:tgz
+USES=		ghostscript gmake perl5 python tar:tgz
 USE_AUTOTOOLS=	autoconf aclocal
-USE_GHOSTSCRIPT=yes
 USE_GL=	glut
 USE_PERL5=	build
 USE_TEX=	dvipsk formats

Modified: head/math/plplot/Makefile
==============================================================================
--- head/math/plplot/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/math/plplot/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -22,8 +22,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 
 USE_GNOME=	pango
 USE_PERL5=	build
-USE_GHOSTSCRIPT=yes
-USES=		cmake gmake perl5 pkgconfig
+USES=		cmake ghostscript gmake perl5 pkgconfig
 CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DENABLE_octave:BOOL=OFF \
 		-DENABLE_pdl:BOOL=OFF \

Modified: head/misc/pspresent/Makefile
==============================================================================
--- head/misc/pspresent/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/misc/pspresent/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -13,7 +13,7 @@ COMMENT=	Full-screen slide shows of post
 LICENSE=	GPLv2
 
 USE_XORG=	x11 xext xinerama
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDLIBS="${LDFLAGS}"
 ALL_TARGET=	pspresent
 

Modified: head/multimedia/lives/Makefile
==============================================================================
--- head/multimedia/lives/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/multimedia/lives/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -41,12 +41,12 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplu
 
 WRKSRC=		${WRKDIR}/${DISTNAME:tl}
 
-USES=		libtool pathfix perl5 pkgconfig python shebangfix tar:bzip2
+USES=		ghostscript:run libtool pathfix perl5 pkgconfig python \
+		shebangfix tar:bzip2
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi \
 		smogrify tools/autolives.pl
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
-USE_GHOSTSCRIPT_RUN=	yes
 USE_GNOME=	gtk30
 USE_LDCONFIG=	yes
 

Modified: head/print/auctex/Makefile
==============================================================================
--- head/print/auctex/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/auctex/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 
 NOT_FOR_ARCHS=	ia64
 USE_TEX=	latex
-USE_GHOSTSCRIPT=yes
+USES=		ghostscript
 USE_EMACS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR} \

Modified: head/print/cups-filters/Makefile
==============================================================================
--- head/print/cups-filters/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/cups-filters/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -23,11 +23,11 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/grap
 		libpoppler.so:${PORTSDIR}/graphics/poppler
 
 MAKE_JOBS_UNSAFE=YES
-USES=		compiler:c++11-lib cpe jpeg libtool pathfix pkgconfig shebangfix tar:xz
+USES=		compiler:c++11-lib cpe ghostscript jpeg libtool pathfix \
+		pkgconfig shebangfix tar:xz
 CPE_VENDOR=	linuxfoundation
 SHEBANG_FILES=	filter/textonly
 USE_GNOME=	glib20
-USE_GHOSTSCRIPT=	yes
 USE_RC_SUBR=	cups_browsed
 GNU_CONFIGURE=	yes
 CUPS_SOCKET?=	/var/run/cups.sock

Modified: head/print/cups-fxlinuxprint/Makefile
==============================================================================
--- head/print/cups-fxlinuxprint/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/cups-fxlinuxprint/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,9 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
 
-USES=		dos2unix
+USES=		dos2unix ghostscript:run
 DOS2UNIX_FILES=	fxlinuxprint.ppd
-USE_GHOSTSCRIPT_RUN=yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/print/cups-pdf/Makefile
==============================================================================
--- head/print/cups-pdf/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/cups-pdf/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/cupsd:${P
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS

Modified: head/print/cups-pstoraster/Makefile
==============================================================================
--- head/print/cups-pstoraster/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/cups-pstoraster/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -23,9 +23,8 @@ WRKSRC=		${WRKDIR}/espgs-${PORTVERSION}
 
 DATADIR=	${PREFIX}/share/espgs
 
-USES=		gmake iconv tar:bzip2
 # We just need the ghostscript fonts, nothing more
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run gmake iconv tar:bzip2
 GNU_CONFIGURE=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/print/dvisvg/Makefile
==============================================================================
--- head/print/dvisvg/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/dvisvg/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -13,7 +13,7 @@ COMMENT=	Converter from DVI to SVG
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 USE_TEX=	base texmf texhash
 ALL_TARGET=	# empty
 # workaround for svgfonts.c not including kpathsea/c-auto.h

Modified: head/print/epsonepl/Makefile
==============================================================================
--- head/print/epsonepl/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/epsonepl/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -13,8 +13,7 @@ COMMENT=	Printer filter for EPSON EPL-57
 
 LIB_DEPENDS=	libijs.so:${PORTSDIR}/print/libijs
 
-USES=		uidfix tar:tgz
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run uidfix tar:tgz
 
 MAKEFILE=	${FILESDIR}/Makefile
 SUB_FILES=	pkg-message

Modified: head/print/flpsed/Makefile
==============================================================================
--- head/print/flpsed/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/flpsed/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -15,8 +15,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS+=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
-USE_GHOSTSCRIPT=yes
-USES=		desktop-file-utils gmake
+USES=		desktop-file-utils ghostscript gmake
 PLIST_FILES=	bin/flpsed \
 		man/man1/flpsed.1.gz \
 		share/applications/flpsed.desktop \

Modified: head/print/font2svg/Makefile
==============================================================================
--- head/print/font2svg/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/font2svg/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -12,7 +12,7 @@ COMMENT=	All font to svg-font converter
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USE_GHOSTSCRIPT_RUN=	yes
+USES=		ghostscript:run
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/font2svg %%DATADIR%%/encodings %%DATADIR%%/font2svg.ps

Modified: head/print/foo2zjs/Makefile
==============================================================================
--- head/print/foo2zjs/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/foo2zjs/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -17,8 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/foomatic
 		gsed:${PORTSDIR}/textproc/gsed
 
 PROJECTHOST=	bsdistfiles
-USE_GHOSTSCRIPT=yes
-USES=		gmake shebangfix
+USES=		ghostscript gmake shebangfix
 SHEBANG_FILES=	msexpand
 SUB_FILES=	pkg-message ${DEVDCONF_FILE}
 EXTRAFILES=	msexpand getweb

Modified: head/print/foomatic-filters/Makefile
==============================================================================
--- head/print/foomatic-filters/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/foomatic-filters/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 
-USES=		autoreconf perl5 pkgconfig
-USE_GHOSTSCRIPT=yes
+USES=		autoreconf ghostscript perl5 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
 		ac_cv_path_CUPS=${LOCALBASE}/libexec/cups \

Modified: head/print/ggv/Makefile
==============================================================================
--- head/print/ggv/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/ggv/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -14,9 +14,8 @@ COMMENT=	GNOME 2 ghostscript viewer
 
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomeprefix intlhack libgnomeui
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		tar:bzip2
-USE_GHOSTSCRIPT=yes
+USES=		desktop-file-utils gettext ghostscript gmake libtool \
+		pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm

Modified: head/print/ghostscript7-commfont/Makefile
==============================================================================
--- head/print/ghostscript7-commfont/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/ghostscript7-commfont/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -23,7 +23,7 @@ PLIST_SUB=	GS_RESDIR="${GS_RESDIR}"
 PKGMESSAGE=	${WRKDIR}/pkg-message
 DEPENDS_ARGS+=	-DA4
 # set these forcibly
-USE_GHOSTSCRIPT_RUN=7
+USES=		ghostscript:7,run
 
 CONFLICTS_INSTALL= \
 		ghostscript8-[0-9]* \

Modified: head/print/ghostscript7-jpnfont/Makefile
==============================================================================
--- head/print/ghostscript7-jpnfont/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/ghostscript7-jpnfont/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/fonts/st
 		${LOCALBASE}/share/ghostscript/Resource/CIDFont/Ryumin-Light:${PORTSDIR}/print/ghostscript7-commfont
 
 # set these forcibly
-USE_GHOSTSCRIPT_RUN=	7
+USES=		ghostscript:7,run
 NO_BUILD=		yes
 DEPENDS_ARGS+=		-DA4
 

Modified: head/print/ghostscript7-korfont/Makefile
==============================================================================
--- head/print/ghostscript7-korfont/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/ghostscript7-korfont/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/fonts/CI
 		${LOCALBASE}/share/ghostscript/Resource/CIDFont/HYSMyeongJo-Medium:${PORTSDIR}/print/ghostscript7-commfont
 
 # set these forcibly
-USE_GHOSTSCRIPT_RUN=	7
+USES=		ghostscript:7,run
 NO_BUILD=		yes
 DEPENDS_ARGS+=		-DA4
 

Modified: head/print/gspdf/Makefile
==============================================================================
--- head/print/gspdf/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/gspdf/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -10,9 +10,8 @@ DISTNAME=	GSPdf-${PORTVERSION}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Postscript and Pdf Viewer for GNUstep
 
-USES=		gnustep
+USES=		ghostscript gnustep
 USE_GNUSTEP=	back build
-USE_GHOSTSCRIPT=	yes
 
 MAKE_ENV=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 

Modified: head/print/gsview/Makefile
==============================================================================
--- head/print/gsview/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/gsview/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -18,9 +18,8 @@ LICENSE_PERMS=	dist-mirror pkg-mirror au
 RUN_DEPENDS+=	epstool:${PORTSDIR}/graphics/epstool \
 		pstotext:${PORTSDIR}/print/pstotext
 
-USES=		cpe
+USES=		cpe ghostscript
 USE_GNOME=	gtk12
-USE_GHOSTSCRIPT=yes
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/print/gv/Makefile
==============================================================================
--- head/print/gv/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/gv/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -13,8 +13,7 @@ COMMENT=	PostScript and PDF previewer
 LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_XORG=	xpm ice sm xext xmu x11
-USE_GHOSTSCRIPT=	yes
-USES=		cpe iconv gmake perl5 shebangfix
+USES=		cpe ghostscript iconv gmake perl5 shebangfix
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/print/hpijs/Makefile
==============================================================================
--- head/print/hpijs/Makefile	Thu Jul 16 20:43:43 2015	(r392321)
+++ head/print/hpijs/Makefile	Thu Jul 16 20:53:28 2015	(r392322)
@@ -13,8 +13,7 @@ CONFLICTS=	hplip-[0-9]*
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list