svn commit: r392603 - in head/Mk: . Uses
Hiroki Sato
hrs at FreeBSD.org
Mon Jul 20 21:07:10 UTC 2015
Author: hrs
Date: Mon Jul 20 21:07:08 2015
New Revision: 392603
URL: https://svnweb.freebsd.org/changeset/ports/392603
Log:
Allow support of minor version number in GHOSTSCRIPT_DEFAULT since
there are two packages for Ghostscript 9.x, 9.06 and 9.16.
Modified:
head/Mk/Uses/ghostscript.mk
head/Mk/bsd.default-versions.mk
Modified: head/Mk/Uses/ghostscript.mk
==============================================================================
--- head/Mk/Uses/ghostscript.mk Mon Jul 20 21:03:37 2015 (r392602)
+++ head/Mk/Uses/ghostscript.mk Mon Jul 20 21:07:08 2015 (r392603)
@@ -29,11 +29,11 @@
_INCLUDE_USES_GHOSTSCRIPT_MK= yes
# allowed versions
-_GS_VERSION= 7 8 9
+_GS_VERSION= 7 8 9 9.06 9.16
_GS_ARGS= ${ghostscript_ARGS}
-.if ${_GS_ARGS:N[789]:Nnox11:Nagpl:Nbuild:Nrun}
+.if ${_GS_ARGS:N[789]:N9.06:N9.16:Nnox11:Nagpl:Nbuild:Nrun}
IGNORE= Unknown ghostscript argument ${_GS_ARGS}
.endif
@@ -62,22 +62,26 @@ _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
+.undef _GS_SELECTED
+.for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT}
+.if ${V:M9}
+_GS_SELECTED?= 9
+.elif ${V:M9.06}
+_GS_SELECTED?= 9
+.elif ${V:M9.16}
+_GS_SELECTED?= 9
+_GS_AGPL_SUFFIX?= -agpl
+.elif ${V:Magpl} && defined(_GS_SELECTED) && !empty(_GS_SELECTED:N9)
IGNORE= Ghostscript-agpl is only available in version 9
-. endif
+.elif ${V:M8}
+_GS_SELECTED?= 8
+.elif ${V:M7}
+_GS_SELECTED?= 7
+.endif
+.endfor
+.if !defined(_GS_SELECTED)
+IGNORE= Invalid ghostscript argument or GHOSTSCRIPT_DEFAULT
.endif
.undef _GS_NOX11_SUFFIX
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Mon Jul 20 21:03:37 2015 (r392602)
+++ head/Mk/bsd.default-versions.mk Mon Jul 20 21:07:08 2015 (r392603)
@@ -32,7 +32,7 @@ PYTHON3_DEFAULT?= 3.4
RUBY_DEFAULT?= 2.1
TCLTK_DEFAULT?= 8.6
FIREBIRD_DEFAULT?= 2.5
-GHOSTSCRIPT_DEFAULT?= 9
+GHOSTSCRIPT_DEFAULT?= 9.06
# Version of lang/gcc. Do not override!
LANG_GCC_IS= 4.8
More information about the svn-ports-all
mailing list