svn commit: r392610 - head/Mk/Uses
Hiroki Sato
hrs at FreeBSD.org
Tue Jul 21 03:22:24 UTC 2015
Author: hrs
Date: Tue Jul 21 03:22:23 2015
New Revision: 392610
URL: https://svnweb.freebsd.org/changeset/ports/392610
Log:
- Remove "agpl" keyword in ghostscript arguments.
- Add "agpl" to GHOSTSCRIPT_DEFAULT. GHOSTSCRIPT_DEFAULT="9 agpl" is valid
for print/ghostscript9-agpl.
- Fix GHOSTSCRIPT_DEFAULT validation when using fmake.
Modified:
head/Mk/Uses/ghostscript.mk
Modified: head/Mk/Uses/ghostscript.mk
==============================================================================
--- head/Mk/Uses/ghostscript.mk Tue Jul 21 02:00:40 2015 (r392609)
+++ head/Mk/Uses/ghostscript.mk Tue Jul 21 03:22:23 2015 (r392610)
@@ -4,7 +4,7 @@
#
# Feature: ghostscript
# Usage: USES=ghostscript or USES=ghostscript:args
-# Valid ARGS: <version>, build, run, nox11, agpl
+# Valid ARGS: <version>, build, run, nox11
#
# version The chooseable versions are 7, 8 and 9. If no version is
# specified version 9 is selected.
@@ -14,7 +14,6 @@
# 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
@@ -29,19 +28,19 @@
_INCLUDE_USES_GHOSTSCRIPT_MK= yes
# allowed versions
-_GS_VERSION= 7 8 9 9.06 9.16
+_GS_VERSION= 7 8 9 9.06 9.16 agpl
_GS_ARGS= ${ghostscript_ARGS}
-.if ${_GS_ARGS:N[789]:N9.06:N9.16:Nnox11:Nagpl:Nbuild:Nrun}
-IGNORE= Unknown ghostscript argument ${_GS_ARGS}
+.if ${_GS_ARGS:N[789]:N9.06:N9.16:Nnox11: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}
+.if ${GHOSTSCRIPT_DEFAULT:N[789]:N9.06:N9.16:Nagpl}
+IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
.endif
# Make sure that no dependency or some other environment variable
@@ -73,11 +72,12 @@ _GS_SELECTED?= 9
.elif ${_V:M9.16}
_GS_SELECTED?= 9
_GS_AGPL_SUFFIX?= -agpl
-.elif ${_V:Magpl} && defined(_GS_SELECTED)
-.if ${_GS_SELECTED:M9}
+.elif ${_V:Magpl}
_GS_AGPL_SUFFIX?= -agpl
+.if defined(_GS_SELECTED) && ${_GS_SELECTED:N9}
+IGNORE?= Ghostscript-agpl is only available in version 9
.else
-IGNORE= Ghostscript-agpl is only available in version 9
+_GS_SELECTED?= 9
.endif
.elif ${_V:M8}
_GS_SELECTED?= 8
@@ -86,7 +86,7 @@ _GS_SELECTED?= 7
.endif
.endfor
.if !defined(_GS_SELECTED)
-IGNORE= Invalid ghostscript argument or GHOSTSCRIPT_DEFAULT
+IGNORE?= Invalid ghostscript argument or GHOSTSCRIPT_DEFAULT
.endif
.undef _GS_NOX11_SUFFIX
More information about the svn-ports-head
mailing list