From 4490d4bc75707dbdea79b297aac91b4ce174c25f Mon Sep 17 00:00:00 2001 From: kwm Date: Thu, 16 Jul 2015 20:53:28 +0000 Subject: 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: , 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 --- graphics/GraphicsMagick/Makefile | 3 +-- graphics/ImageMagick/Makefile | 10 +++++++--- graphics/cinepaint/Makefile | 5 ++--- graphics/eps2png/Makefile | 3 +-- graphics/epstool/Makefile | 4 +--- graphics/gimp-app/Makefile | 2 +- graphics/gle-graphics/Makefile | 3 ++- graphics/graphviz/Makefile | 2 +- graphics/imgtops/Makefile | 3 +-- graphics/impressive/Makefile | 3 +-- graphics/klatexformula/Makefile | 4 ++-- graphics/ocaml-images/Makefile | 5 +---- graphics/ocrfeeder/Makefile | 4 ++-- graphics/peps/Makefile | 2 +- graphics/pstoedit/Makefile | 3 +-- graphics/pstoepsi/Makefile | 2 +- graphics/py-chart/Makefile | 3 +-- graphics/sam2p/Makefile | 3 +-- graphics/xournal/Makefile | 6 ++---- graphics/xpaint/Makefile | 3 +-- 20 files changed, 31 insertions(+), 42 deletions(-) (limited to 'graphics') diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index a1119f145718..aeb3115b6b1e 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -21,9 +21,8 @@ LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \ 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 \ diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 47459ec91868..cd7c01d2be91 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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: diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index 24e06fe74cf6..4093446143ce 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -25,11 +25,10 @@ OYRANOS_DESC= ICC profile support via Oyranos 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 diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile index 4f82fb4991e8..4afe0811c061 100644 --- a/graphics/eps2png/Makefile +++ b/graphics/eps2png/Makefile @@ -11,8 +11,7 @@ MASTER_SITE_SUBDIR= CPAN:JV 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" diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile index 498eb374b2b3..ec03ec0cf269 100644 --- a/graphics/epstool/Makefile +++ b/graphics/epstool/Makefile @@ -12,9 +12,7 @@ COMMENT= Create or extract preview bitmaps in EPS files 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="" \ diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 4d37fae6f571..8a84082ccbc1 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -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 diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile index 526b6b701707..d0f9f4da6be3 100644 --- a/graphics/gle-graphics/Makefile +++ b/graphics/gle-graphics/Makefile @@ -32,7 +32,8 @@ DOCS_USE= tex=latex:build tex=dvipsk:build 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 diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index deeba50bed2d..3561332af6c3 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -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 diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile index 9f4af620b327..8e2ffe631170 100644 --- a/graphics/imgtops/Makefile +++ b/graphics/imgtops/Makefile @@ -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: diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile index 74bbf9d146ce..f627ea378efb 100644 --- a/graphics/impressive/Makefile +++ b/graphics/impressive/Makefile @@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \ 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 diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile index 478cc213e3f5..cd5756df3845 100644 --- a/graphics/klatexformula/Makefile +++ b/graphics/klatexformula/Makefile @@ -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 \ diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index ffad2a05a787..87f1b5f46f51 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -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}/x11-toolkits/ocaml-lablgtk2 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) diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile index ee2ebe483d33..b52880b899d7 100644 --- a/graphics/ocrfeeder/Makefile +++ b/graphics/ocrfeeder/Makefile @@ -24,9 +24,9 @@ RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \ 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 diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile index 59814388febb..381ccf527308 100644 --- a/graphics/peps/Makefile +++ b/graphics/peps/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= http://peps.redprince.net/peps/ \ 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" diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 436a5426243c..24b14524e0d7 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -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 diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile index 6ddbcfc41ef2..b507509a5d64 100644 --- a/graphics/pstoepsi/Makefile +++ b/graphics/pstoepsi/Makefile @@ -15,7 +15,7 @@ COMMENT= Wiliam Chia-Wei Cheng's yet another PS to EPSI converter RUN_DEPENDS= pbmtoepsi:${PORTSDIR}/graphics/netpbm -USE_GHOSTSCRIPT_RUN= yes +USES= ghostscript:run NO_WRKSUBDIR= yes pre-patch: diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile index c02c911dd9c1..271c7a3117d3 100644 --- a/graphics/py-chart/Makefile +++ b/graphics/py-chart/Makefile @@ -14,8 +14,7 @@ COMMENT= Create high quality Encapsulated Postscript, PDF, or PNG charts LICENSE= GPLv2 -USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= distutils autoplist -USES= python:2.7 +USES= ghostscript:run python:2.7 .include diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile index ff4635f62874..33173fb318c4 100644 --- a/graphics/sam2p/Makefile +++ b/graphics/sam2p/Makefile @@ -17,10 +17,9 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ 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 diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile index f4e3aeee325e..4b8a23083027 100644 --- a/graphics/xournal/Makefile +++ b/graphics/xournal/Makefile @@ -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 -.if ${PORT_OPTIONS:MGHOSTSCRIPT} -USE_GHOSTSCRIPT_RUN= yes -.endif - post-patch: @${REINPLACE_CMD} \ -e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \ diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index f458436412d0..f116330d955f 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -21,9 +21,8 @@ RUN_DEPENDS= psselect:${PORTSDIR}/print/psutils \ 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 \ -- cgit