diff options
| author | hrs <hrs@FreeBSD.org> | 2015-07-21 05:07:08 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2015-07-21 05:07:08 +0800 |
| commit | 860bcd0cc2924d0fbb2791488e13891d5ced44a3 (patch) | |
| tree | f49615214900c7a8fb5b469f899962110e1e2481 | |
| parent | 2d080c7d403514b2bdb1ea6a125f076c9476460f (diff) | |
| download | freebsd-ports-gnome-860bcd0cc2924d0fbb2791488e13891d5ced44a3.tar.gz freebsd-ports-gnome-860bcd0cc2924d0fbb2791488e13891d5ced44a3.tar.zst freebsd-ports-gnome-860bcd0cc2924d0fbb2791488e13891d5ced44a3.zip | |
Allow support of minor version number in GHOSTSCRIPT_DEFAULT since
there are two packages for Ghostscript 9.x, 9.06 and 9.16.
| -rw-r--r-- | Mk/Uses/ghostscript.mk | 36 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 21 insertions, 17 deletions
diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index fd5e1aa46fdb..12f4618f3fc0 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -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 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 3e6c85cbc280..e1fb7cfd9e91 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -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 |