Page MenuHomeFreeBSD

D2938.id7030.diff
No OneTemporary

D2938.id7030.diff

Index: head/CHANGES
===================================================================
--- head/CHANGES
+++ head/CHANGES
@@ -10,6 +10,13 @@
All ports committers are allowed to commit to this file.
+20150716:
+AUTHOR: kwm@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@FreeBSD.org
Index: head/Mk/Uses/ghostscript.mk
===================================================================
--- head/Mk/Uses/ghostscript.mk
+++ head/Mk/Uses/ghostscript.mk
@@ -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@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
Index: head/Mk/bsd.default-versions.mk
===================================================================
--- head/Mk/bsd.default-versions.mk
+++ head/Mk/bsd.default-versions.mk
@@ -32,6 +32,7 @@
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
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -342,27 +342,6 @@
# 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 @@
.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}
Index: head/Mk/bsd.sanity.mk
===================================================================
--- head/Mk/bsd.sanity.mk
+++ head/Mk/bsd.sanity.mk
@@ -47,6 +47,10 @@
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
Index: head/cad/xcircuit/Makefile
===================================================================
--- head/cad/xcircuit/Makefile
+++ head/cad/xcircuit/Makefile
@@ -16,8 +16,7 @@
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}
Index: head/chinese/enscript/Makefile
===================================================================
--- head/chinese/enscript/Makefile
+++ head/chinese/enscript/Makefile
@@ -14,7 +14,7 @@
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
Index: head/comms/efax-gtk/Makefile
===================================================================
--- head/comms/efax-gtk/Makefile
+++ head/comms/efax-gtk/Makefile
@@ -17,8 +17,7 @@
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
Index: head/comms/hylafax/Makefile
===================================================================
--- head/comms/hylafax/Makefile
+++ head/comms/hylafax/Makefile
@@ -15,9 +15,8 @@
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" \
Index: head/comms/tkhylafax/Makefile
===================================================================
--- head/comms/tkhylafax/Makefile
+++ head/comms/tkhylafax/Makefile
@@ -14,8 +14,7 @@
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}
Index: head/deskutils/etask/Makefile
===================================================================
--- head/deskutils/etask/Makefile
+++ head/deskutils/etask/Makefile
@@ -14,7 +14,7 @@
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}
Index: head/deskutils/gworkspace/Makefile
===================================================================
--- head/deskutils/gworkspace/Makefile
+++ head/deskutils/gworkspace/Makefile
@@ -23,7 +23,7 @@
PLIST_SUB+= PDFVIEW="@comment "
.else
PLIST_SUB+= PDFVIEW=""
-USE_GHOSTSCRIPT= yes
+USES+= ghostscript
.endif
pre-configure:
Index: head/devel/doxygen/Makefile
===================================================================
--- head/devel/doxygen/Makefile
+++ head/devel/doxygen/Makefile
@@ -65,7 +65,7 @@
.endif
.if ${PORT_OPTIONS:MPDFDOCS}
-USE_GHOSTSCRIPT_BUILD= yes
+USES+= ghostscript:build
.endif
.if ${PORT_OPTIONS:MQT4}
Index: head/devel/gdcm/Makefile
===================================================================
--- head/devel/gdcm/Makefile
+++ head/devel/gdcm/Makefile
@@ -66,7 +66,7 @@
.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 \
Index: head/devel/libexplain/Makefile
===================================================================
--- head/devel/libexplain/Makefile
+++ head/devel/libexplain/Makefile
@@ -17,8 +17,7 @@
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
Index: head/editors/ted/Makefile
===================================================================
--- head/editors/ted/Makefile
+++ head/editors/ted/Makefile
@@ -26,8 +26,7 @@
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}/\\\"\"" \
Index: head/editors/texmacs/Makefile
===================================================================
--- head/editors/texmacs/Makefile
+++ head/editors/texmacs/Makefile
@@ -40,7 +40,7 @@
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
Index: head/editors/texmaker/Makefile
===================================================================
--- head/editors/texmaker/Makefile
+++ head/editors/texmaker/Makefile
@@ -13,8 +13,7 @@
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 \
Index: head/editors/texstudio/Makefile
===================================================================
--- head/editors/texstudio/Makefile
+++ head/editors/texstudio/Makefile
@@ -12,9 +12,9 @@
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
Index: head/graphics/GraphicsMagick/Makefile
===================================================================
--- head/graphics/GraphicsMagick/Makefile
+++ head/graphics/GraphicsMagick/Makefile
@@ -21,9 +21,8 @@
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 \
Index: head/graphics/ImageMagick/Makefile
===================================================================
--- head/graphics/ImageMagick/Makefile
+++ head/graphics/ImageMagick/Makefile
@@ -219,7 +219,11 @@
.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 @@
# PDF (Adobe Portable Document Format) support
.if ${PORT_OPTIONS:MPDF}
-USE_GHOSTSCRIPT= yes
+USES+= ghostscript
.endif
.if ! ${PORT_OPTIONS:MX11}
@@ -375,7 +379,7 @@
.endif
.if ${PORT_OPTIONS:MTESTS}
-USE_GHOSTSCRIPT_BUILD=yes
+USES+= ghostscript:build
.endif
post-patch:
Index: head/graphics/cinepaint/Makefile
===================================================================
--- head/graphics/cinepaint/Makefile
+++ head/graphics/cinepaint/Makefile
@@ -25,11 +25,10 @@
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
Index: head/graphics/eps2png/Makefile
===================================================================
--- head/graphics/eps2png/Makefile
+++ head/graphics/eps2png/Makefile
@@ -11,8 +11,7 @@
MAINTAINER= perl@FreeBSD.org
COMMENT= Converts EPS images to PNG
-USE_GHOSTSCRIPT= yes
-USES= perl5
+USES= ghostscript perl5
USE_PERL5= configure
MAKE_ARGS= INSTLLSCRIPT="${PREFIX}/bin"
Index: head/graphics/epstool/Makefile
===================================================================
--- head/graphics/epstool/Makefile
+++ head/graphics/epstool/Makefile
@@ -12,9 +12,7 @@
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="" \
Index: head/graphics/gimp-app/Makefile
===================================================================
--- head/graphics/gimp-app/Makefile
+++ head/graphics/gimp-app/Makefile
@@ -93,7 +93,7 @@
.endif
.if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USE_GHOSTSCRIPT= yes
+USES+= ghostscript
CONFIGURE_ARGS+= --with-gs
PLIST_SUB+= GS=""
.else
Index: head/graphics/gle-graphics/Makefile
===================================================================
--- head/graphics/gle-graphics/Makefile
+++ head/graphics/gle-graphics/Makefile
@@ -32,7 +32,8 @@
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
Index: head/graphics/graphviz/Makefile
===================================================================
--- head/graphics/graphviz/Makefile
+++ head/graphics/graphviz/Makefile
@@ -90,7 +90,7 @@
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
Index: head/graphics/imgtops/Makefile
===================================================================
--- head/graphics/imgtops/Makefile
+++ head/graphics/imgtops/Makefile
@@ -15,8 +15,7 @@
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:
Index: head/graphics/impressive/Makefile
===================================================================
--- head/graphics/impressive/Makefile
+++ head/graphics/impressive/Makefile
@@ -21,8 +21,7 @@
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
Index: head/graphics/klatexformula/Makefile
===================================================================
--- head/graphics/klatexformula/Makefile
+++ head/graphics/klatexformula/Makefile
@@ -10,11 +10,11 @@
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 \
Index: head/graphics/ocaml-images/Makefile
===================================================================
--- head/graphics/ocaml-images/Makefile
+++ head/graphics/ocaml-images/Makefile
@@ -57,6 +57,7 @@
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 @@
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)
Index: head/graphics/ocrfeeder/Makefile
===================================================================
--- head/graphics/ocrfeeder/Makefile
+++ head/graphics/ocrfeeder/Makefile
@@ -24,9 +24,9 @@
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
Index: head/graphics/peps/Makefile
===================================================================
--- head/graphics/peps/Makefile
+++ head/graphics/peps/Makefile
@@ -11,7 +11,7 @@
MAINTAINER= ports@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"
Index: head/graphics/pstoedit/Makefile
===================================================================
--- head/graphics/pstoedit/Makefile
+++ head/graphics/pstoedit/Makefile
@@ -14,8 +14,7 @@
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
Index: head/graphics/pstoepsi/Makefile
===================================================================
--- head/graphics/pstoepsi/Makefile
+++ head/graphics/pstoepsi/Makefile
@@ -15,7 +15,7 @@
RUN_DEPENDS= pbmtoepsi:${PORTSDIR}/graphics/netpbm
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run
NO_WRKSUBDIR= yes
pre-patch:
Index: head/graphics/py-chart/Makefile
===================================================================
--- head/graphics/py-chart/Makefile
+++ head/graphics/py-chart/Makefile
@@ -14,8 +14,7 @@
LICENSE= GPLv2
-USE_GHOSTSCRIPT_RUN= yes
USE_PYTHON= distutils autoplist
-USES= python:2.7
+USES= ghostscript:run python:2.7
.include <bsd.port.mk>
Index: head/graphics/sam2p/Makefile
===================================================================
--- head/graphics/sam2p/Makefile
+++ head/graphics/sam2p/Makefile
@@ -17,10 +17,9 @@
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
Index: head/graphics/xournal/Makefile
===================================================================
--- head/graphics/xournal/Makefile
+++ head/graphics/xournal/Makefile
@@ -24,6 +24,8 @@
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 @@
.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' \
Index: head/graphics/xpaint/Makefile
===================================================================
--- head/graphics/xpaint/Makefile
+++ head/graphics/xpaint/Makefile
@@ -21,9 +21,8 @@
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 \
Index: head/mail/claws-mail-pdf_viewer/Makefile
===================================================================
--- head/mail/claws-mail-pdf_viewer/Makefile
+++ head/mail/claws-mail-pdf_viewer/Makefile
@@ -8,7 +8,7 @@
LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-USE_GHOSTSCRIPT=yes
+USES+= ghostscript
CLAWS_PLUGINS_BUILD= pdf_viewer
Index: head/mail/courier/Makefile
===================================================================
--- head/mail/courier/Makefile
+++ head/mail/courier/Makefile
@@ -189,7 +189,7 @@
.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}
Index: head/math/R/Makefile
===================================================================
--- head/math/R/Makefile
+++ head/math/R/Makefile
@@ -196,7 +196,7 @@
.else # LIBR_SLAVEPORT
.if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USE_GHOSTSCRIPT_RUN= yes
+USES+= ghostscript
.endif
.if ${PORT_OPTIONS:MJPEG}
Index: head/math/asymptote/Makefile
===================================================================
--- head/math/asymptote/Makefile
+++ head/math/asymptote/Makefile
@@ -34,9 +34,8 @@
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
Index: head/math/plplot/Makefile
===================================================================
--- head/math/plplot/Makefile
+++ head/math/plplot/Makefile
@@ -22,8 +22,7 @@
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 \
Index: head/misc/pspresent/Makefile
===================================================================
--- head/misc/pspresent/Makefile
+++ head/misc/pspresent/Makefile
@@ -13,7 +13,7 @@
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
Index: head/multimedia/lives/Makefile
===================================================================
--- head/multimedia/lives/Makefile
+++ head/multimedia/lives/Makefile
@@ -41,12 +41,12 @@
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
Index: head/print/auctex/Makefile
===================================================================
--- head/print/auctex/Makefile
+++ head/print/auctex/Makefile
@@ -15,7 +15,7 @@
NOT_FOR_ARCHS= ia64
USE_TEX= latex
-USE_GHOSTSCRIPT=yes
+USES= ghostscript
USE_EMACS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${LISPDIR} \
Index: head/print/cups-filters/Makefile
===================================================================
--- head/print/cups-filters/Makefile
+++ head/print/cups-filters/Makefile
@@ -23,11 +23,11 @@
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
Index: head/print/cups-fxlinuxprint/Makefile
===================================================================
--- head/print/cups-fxlinuxprint/Makefile
+++ head/print/cups-fxlinuxprint/Makefile
@@ -14,9 +14,8 @@
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
Index: head/print/cups-pdf/Makefile
===================================================================
--- head/print/cups-pdf/Makefile
+++ head/print/cups-pdf/Makefile
@@ -19,7 +19,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run
OPTIONS_DEFINE= DOCS
OPTIONS_DEFAULT= DOCS
Index: head/print/cups-pstoraster/Makefile
===================================================================
--- head/print/cups-pstoraster/Makefile
+++ head/print/cups-pstoraster/Makefile
@@ -23,9 +23,8 @@
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
Index: head/print/dvisvg/Makefile
===================================================================
--- head/print/dvisvg/Makefile
+++ head/print/dvisvg/Makefile
@@ -13,7 +13,7 @@
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
Index: head/print/epsonepl/Makefile
===================================================================
--- head/print/epsonepl/Makefile
+++ head/print/epsonepl/Makefile
@@ -13,8 +13,7 @@
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
Index: head/print/flpsed/Makefile
===================================================================
--- head/print/flpsed/Makefile
+++ head/print/flpsed/Makefile
@@ -15,8 +15,7 @@
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 \
Index: head/print/font2svg/Makefile
===================================================================
--- head/print/font2svg/Makefile
+++ head/print/font2svg/Makefile
@@ -12,7 +12,7 @@
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
Index: head/print/foo2zjs/Makefile
===================================================================
--- head/print/foo2zjs/Makefile
+++ head/print/foo2zjs/Makefile
@@ -17,8 +17,7 @@
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
Index: head/print/foomatic-filters/Makefile
===================================================================
--- head/print/foomatic-filters/Makefile
+++ head/print/foomatic-filters/Makefile
@@ -15,8 +15,7 @@
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 \
Index: head/print/ggv/Makefile
===================================================================
--- head/print/ggv/Makefile
+++ head/print/ggv/Makefile
@@ -14,9 +14,8 @@
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
Index: head/print/ghostscript7-commfont/Makefile
===================================================================
--- head/print/ghostscript7-commfont/Makefile
+++ head/print/ghostscript7-commfont/Makefile
@@ -23,7 +23,7 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
DEPENDS_ARGS+= -DA4
# set these forcibly
-USE_GHOSTSCRIPT_RUN=7
+USES= ghostscript:7,run
CONFLICTS_INSTALL= \
ghostscript8-[0-9]* \
Index: head/print/ghostscript7-jpnfont/Makefile
===================================================================
--- head/print/ghostscript7-jpnfont/Makefile
+++ head/print/ghostscript7-jpnfont/Makefile
@@ -16,7 +16,7 @@
${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
Index: head/print/ghostscript7-korfont/Makefile
===================================================================
--- head/print/ghostscript7-korfont/Makefile
+++ head/print/ghostscript7-korfont/Makefile
@@ -16,7 +16,7 @@
${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
Index: head/print/gspdf/Makefile
===================================================================
--- head/print/gspdf/Makefile
+++ head/print/gspdf/Makefile
@@ -10,9 +10,8 @@
MAINTAINER= ports@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
Index: head/print/gsview/Makefile
===================================================================
--- head/print/gsview/Makefile
+++ head/print/gsview/Makefile
@@ -18,9 +18,8 @@
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
Index: head/print/gv/Makefile
===================================================================
--- head/print/gv/Makefile
+++ head/print/gv/Makefile
@@ -13,8 +13,7 @@
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
Index: head/print/hpijs/Makefile
===================================================================
--- head/print/hpijs/Makefile
+++ head/print/hpijs/Makefile
@@ -13,8 +13,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-dependency-tracking
-USES= jpeg
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run jpeg
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Index: head/print/hplip/Makefile
===================================================================
--- head/print/hplip/Makefile
+++ head/print/hplip/Makefile
@@ -21,8 +21,8 @@
CONFLICTS_INSTALL= hpijs-[0-9]*
INSTALL_TARGET= install-strip
-USES= dos2unix jpeg libtool pkgconfig python shebangfix
-USE_GHOSTSCRIPT_RUN= yes
+USES= dos2unix ghostscript:run jpeg libtool pkgconfig python \
+ shebangfix
USE_GNOME= pygobject
USE_LDCONFIG= yes
Index: head/print/html2ps/Makefile
===================================================================
--- head/print/html2ps/Makefile
+++ head/print/html2ps/Makefile
@@ -21,8 +21,7 @@
paperconf:${PORTSDIR}/print/libpaper
NO_BUILD= yes
-USES= perl5
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run perl5
SUB_FILES= html2psrc
Index: head/print/kpdftool/Makefile
===================================================================
--- head/print/kpdftool/Makefile
+++ head/print/kpdftool/Makefile
@@ -14,8 +14,7 @@
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
USE_QT4= qt3support moc_build porting_build uic3_build
-USE_GHOSTSCRIPT_RUN= yes
-USES= qmake zip
+USES= ghostscript:run qmake zip
DESKTOP_ENTRIES= "KPDFTool" "${COMMENT}" "kpdftool" \
"kpdftool" "Qt;Utility;" true
Index: head/print/libspectre/Makefile
===================================================================
--- head/print/libspectre/Makefile
+++ head/print/libspectre/Makefile
@@ -12,10 +12,9 @@
LICENSE= GPLv2
-USES= gmake libtool:keepla pathfix pkgconfig
+USES= gmake libtool:keepla pathfix pkgconfig ghostscript
USE_LDCONFIG= yes
USE_GNOME= cairo
-USE_GHOSTSCRIPT=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
Index: head/print/lilypond-devel/Makefile
===================================================================
--- head/print/lilypond-devel/Makefile
+++ head/print/lilypond-devel/Makefile
@@ -47,9 +47,9 @@
lilypond-web \
music-glossary
-USES= bison:build gettext gmake pkgconfig perl5 compiler:c++11-lib python:-3
+USES= bison:build gettext ghostscript:9 gmake pkgconfig perl5 \
+ compiler:c++11-lib python:-3
USE_CXXSTD= c++11
-USE_GHOSTSCRIPT=9
USE_TEX= latex
USE_PERL5= build
USE_GNOME= pango
Index: head/print/lilypond/Makefile
===================================================================
--- head/print/lilypond/Makefile
+++ head/print/lilypond/Makefile
@@ -47,8 +47,8 @@
lilypond-web \
music-glossary
-USES= bison:build gettext gmake pkgconfig perl5 python:-3
-USE_GHOSTSCRIPT=9
+USES= bison:build gettext ghostscript:9 gmake pkgconfig perl5 \
+ python:-3
USE_TEX= latex
USE_PERL5= build
USE_GNOME= pango
Index: head/print/lpr-wrapper/Makefile
===================================================================
--- head/print/lpr-wrapper/Makefile
+++ head/print/lpr-wrapper/Makefile
@@ -16,9 +16,8 @@
mpage:${PORTSDIR}/print/mpage \
pstops:${PORTSDIR}/print/psutils
-USES= shebangfix
+USES= ghostscript:run shebangfix
SHEBANG_FILES= lpr-wrapper.in lpr-wrapper-cups.in lpr-wrapper-features
-USE_GHOSTSCRIPT_RUN= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
Index: head/print/magicfilter/Makefile
===================================================================
--- head/print/magicfilter/Makefile
+++ head/print/magicfilter/Makefile
@@ -10,7 +10,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Customizable, extensible automatic printer filter
-USE_GHOSTSCRIPT= yes
+USES= ghostscript
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.sh
Index: head/print/ps2eps/Makefile
===================================================================
--- head/print/ps2eps/Makefile
+++ head/print/ps2eps/Makefile
@@ -13,8 +13,7 @@
WRKSRC= ${WRKDIR}/ps2eps
-USE_GHOSTSCRIPT_RUN= yes
-USES= perl5
+USES= ghostscript:run perl5
USE_PERL5= run
OPTIONS_DEFINE= DOCS
Index: head/print/psdim/Makefile
===================================================================
--- head/print/psdim/Makefile
+++ head/print/psdim/Makefile
@@ -12,7 +12,7 @@
LICENSE= GPLv2
-USE_GHOSTSCRIPT=yes
+USES= ghostscript
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
Index: head/print/pstotext/Makefile
===================================================================
--- head/print/pstotext/Makefile
+++ head/print/pstotext/Makefile
@@ -18,7 +18,7 @@
LICENSE_FILE= ${WRKSRC}/pstotext.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run
SUB_LIST= LICENSE=${LICENSE} \
LICENSE_DIR=${_LICENSE_DIR}
Index: head/print/scribus/Makefile
===================================================================
--- head/print/scribus/Makefile
+++ head/print/scribus/Makefile
@@ -27,8 +27,8 @@
USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network
USE_GNOME= libartlgpl2 libxml2
-USE_GHOSTSCRIPT_RUN= yes
-USES= cmake desktop-file-utils jpeg pkgconfig python shared-mime-info tar:xz
+USES= cmake desktop-file-utils ghostscript:run jpeg pkgconfig \
+ python shared-mime-info tar:xz
USE_LDCONFIG= yes
CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit
Index: head/print/texlive-base/Makefile
===================================================================
--- head/print/texlive-base/Makefile
+++ head/print/texlive-base/Makefile
@@ -29,9 +29,8 @@
CONFLICTS_INSTALL= texlive-texmf-201[23]*
USE_TEX= web2c kpathsea ptexenc texhash-bootstrap
-USES= gmake pkgconfig perl5 shebangfix tar:xz
+USES= ghostscript gmake pkgconfig perl5 shebangfix tar:xz
USE_AUTOTOOLS= autoconf
-USE_GHOSTSCRIPT=yes
USE_PERL5= run
USE_LDCONFIG= yes
# during build phase gnu configure is run a lot
Index: head/print/texvc/Makefile
===================================================================
--- head/print/texvc/Makefile
+++ head/print/texvc/Makefile
@@ -24,7 +24,7 @@
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MRASTER}
-USE_GHOSTSCRIPT_RUN= yes
+USES+= ghostscript:run
USE_TEX= latex dvipsk
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.endif
Index: head/print/transfig/Makefile
===================================================================
--- head/print/transfig/Makefile
+++ head/print/transfig/Makefile
@@ -14,9 +14,8 @@
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
-USES= alias imake
+USES= alias ghostscript:run imake
CFLAGS+= -Wno-return-type
-USE_GHOSTSCRIPT_RUN= yes
USE_XORG= xpm
MAKE_ARGS+= INSTALLFLAGS="${COPY}" \
Index: head/sysutils/LPRngTool/Makefile
===================================================================
--- head/sysutils/LPRngTool/Makefile
+++ head/sysutils/LPRngTool/Makefile
@@ -15,8 +15,7 @@
BUILD_DEPENDS= a2ps:${PORTSDIR}/print/a2ps \
mpage:${PORTSDIR}/print/mpage
-USES= tar:tgz tk
-USE_GHOSTSCRIPT_BUILD= yes
+USES= ghostscript:build tar:tgz tk
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_WISH=${WISH}
CONFIGURE_ARGS= --with-spool_directory=/var/spool/lpd
Index: head/textproc/docproj/Makefile
===================================================================
--- head/textproc/docproj/Makefile
+++ head/textproc/docproj/Makefile
@@ -28,9 +28,8 @@
p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \
zip:${PORTSDIR}/archivers/zip
-USES= perl5
+USES= ghostscript:run perl5
USE_PERL5= run
-USE_GHOSTSCRIPT_RUN= yes
DEPENDS_ARGS+= BATCH=yes
NO_BUILD= yes
Index: head/textproc/groff/Makefile
===================================================================
--- head/textproc/groff/Makefile
+++ head/textproc/groff/Makefile
@@ -15,8 +15,7 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GHOSTSCRIPT=yes
-USES= cpe gmake perl5 shebangfix
+USES= cpe ghostscript gmake perl5 shebangfix
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-awk=/usr/bin/awk
CONFIGURE_ENV+= PERLPATH=${perl_CMD} # shebangfix
Index: head/textproc/latex2html/Makefile
===================================================================
--- head/textproc/latex2html/Makefile
+++ head/textproc/latex2html/Makefile
@@ -15,8 +15,7 @@
CONFLICTS= ja-latex2html-[0-9]*
-USES= perl5
-USE_GHOSTSCRIPT=yes
+USES= ghostscript perl5
USE_TEX= latex dvipsk texhash
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-perl=${PERL} \
Index: head/textproc/pdftohtml/Makefile
===================================================================
--- head/textproc/pdftohtml/Makefile
+++ head/textproc/pdftohtml/Makefile
@@ -10,8 +10,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line tool for converting pdf-files into html
-USES= gmake
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript gmake
PLIST_FILES= bin/pdf-to-html
Index: head/textproc/prosper/Makefile
===================================================================
--- head/textproc/prosper/Makefile
+++ head/textproc/prosper/Makefile
@@ -14,7 +14,7 @@
COMMENT= LaTeX class for writing transparencies
NO_BUILD= yes
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run
USE_TEX= latex
MKTEXLSR= ${LOCALBASE}/bin/mktexlsr
Index: head/textproc/sowing/Makefile
===================================================================
--- head/textproc/sowing/Makefile
+++ head/textproc/sowing/Makefile
@@ -12,8 +12,7 @@
BUILD_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
-USES= gmake perl5
-USE_GHOSTSCRIPT=yes
+USES= ghostscript gmake perl5
USE_TEX= latex dvipsk
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${DATADIR}
Index: head/textproc/tth/Makefile
===================================================================
--- head/textproc/tth/Makefile
+++ head/textproc/tth/Makefile
@@ -14,8 +14,7 @@
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
-USES= shebangfix tar:tgz
-USE_GHOSTSCRIPT_RUN= yes
+USES= ghostscript:run shebangfix tar:tgz
#USE_TEX= latex
SHEBANG_FILES= Xfonts.fix
Index: head/x11/dgs/Makefile
===================================================================
--- head/x11/dgs/Makefile
+++ head/x11/dgs/Makefile
@@ -15,10 +15,9 @@
MAKE_JOBS_UNSAFE= yes
-USE_GHOSTSCRIPT_RUN= yes
USE_XORG= xt sm ice xext x11
USE_GNOME= glib12
-USES= gmake jpeg libtool makeinfo
+USES= ghostscript:run gmake jpeg libtool makeinfo
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-0.5.9

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 12, 7:47 AM (8 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15292626
Default Alt Text
D2938.id7030.diff (43 KB)

Event Timeline