Page MenuHomeFreeBSD
Files F111401964

D2938.id6534.diff
No OneTemporary
Actions

D2938.id6534.diff
View Options

Index: CHANGES
===================================================================
--- CHANGES
+++ CHANGES
@@ -10,6 +10,13 @@
All ports committers are allowed to commit to this file.
+20150629:
+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.
+
20150622:
AUTHOR: bapt@FreeBSD.org
Index: Mk/Uses/ghostscript.mk
===================================================================
--- /dev/null
+++ Mk/Uses/ghostscript.mk
@@ -0,0 +1,99 @@
+# $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 (doceng@ or hrs@? doceng@ already has the ghostscript ports.)
+
+.if !defined(_INCLUDE_USES_GHOSTSCRIPT_MK)
+_INCLUDE_USES_GHOSTSCRIPT_MK= yes
+
+# Make sure that no dependency or some other environment variable
+# pollutes the build/run dependency detection
+.undef _GS_BUILD_DEP
+.undef _GS_RUN_DEP
+_GS_ARGS= ${ghostscript_ARGS:S/,/ /g}
+.if ${_GS_ARGS:Mbuild}
+_GS_BUILD_DEP= yes
+_GS_ARGS:= ${_GS_ARGS:Nbuild}
+.endif
+.if ${_GS_ARGS:Mrun}
+_GS_RUN_DEP= yes
+_GS_ARGS:= ${_GS_ARGS:Nrun}
+.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
+
+# Determine version number of Ghostscript to use
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+_GS_SELECTED= ${GHOSTSCRIPT_DEFAULT}
+.if ${_GS_ARGS:M9}
+_GS_SELECTED:= 9
+_GS_ARGS:= ${_GS_ARGS:N9}
+.elif ${_GS_ARGS:M8}
+_GS_SELECTED:= 8
+_GS_ARGS:= ${_GS_ARGS:N8}
+.elif ${_GS_ARGS:M7}
+_GS_SELECTED:= 7
+_GS_ARGS:= ${_GS_ARGS:N7}
+.else
+IGNORE= Unsupported Ghostscript version
+.endif # ${_GS_ARGS} == "9"
+
+.undef _GS_AGPL_SUFFIX
+.if ${_GS_ARGS:Magpl}
+. if ${_GS_SELECTED} == "9"
+_GS_AGPL_SUFFIX= -agpl
+_GS_ARGS:= ${_GS_ARGS:Nagpl}
+. else
+IGNORE= Ghostscript-agpl is only available in version 9
+. endif
+.endif
+
+.undef _GS_NOX11_SUFFIX
+.if ${_GS_ARGS:Mnox11}
+_GS_NOX11_SUFFIX= -nox11
+_GS_ARGS:= ${_GS_ARGS:Nnox11}
+.endif
+
+.if ${_GS_ARGS} != ""
+IGNORE= Unknown ghostscript argument ${_GS_ARGS}
+.endif
+
+# 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 # _INCLUDE_USES_GHOSTSCRIPT_MK
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ 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: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -345,27 +345,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
@@ -1933,58 +1912,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: print/libspectre/Makefile
===================================================================
--- print/libspectre/Makefile
+++ print/libspectre/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libspectre
PORTVERSION= 0.2.7
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://libspectre.freedesktop.org/releases/
@@ -12,10 +13,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

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 4, 8:04 AM (15 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16965624
Default Alt Text
D2938.id6534.diff (7 KB)

Event Timeline