diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2015-07-23 01:44:51 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2015-07-23 01:44:51 +0000 |
| commit | df9e65d9e9aae2c02188d6742d5a7291d89e7a66 (patch) | |
| tree | 50184cfa4b9aa355f340f4caab215bc95bef7e37 /Mk | |
| parent | 1f9d1528bcd34f5b8605fa377becf1dda2fb0ad0 (diff) | |
| download | ports-df9e65d9e9aae2c02188d6742d5a7291d89e7a66.tar.gz ports-df9e65d9e9aae2c02188d6742d5a7291d89e7a66.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/ghostscript.mk | 11 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index f92527093034..e4881db8926d 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -28,18 +28,18 @@ _INCLUDE_USES_GHOSTSCRIPT_MK= yes # allowed versions -_GS_VERSION= 7 8 9 9.06 9.16 agpl +_GS_VERSION= 7 8 9 agpl _GS_ARGS= ${ghostscript_ARGS} -.if ${_GS_ARGS:N[789]:N9.06:N9.16:Nnox11:Nbuild:Nrun} +.if ${_GS_ARGS:N[789]: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 ${GHOSTSCRIPT_DEFAULT:N[789]:N9.06:N9.16:Nagpl} +.if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl} IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION} .endif @@ -67,11 +67,6 @@ _GS_RUN_DEP= yes _V=${V} .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} _GS_AGPL_SUFFIX?= -agpl .if defined(_GS_SELECTED) && ${_GS_SELECTED:N9} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index e1fb7cfd9e91..3e6c85cbc280 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.06 +GHOSTSCRIPT_DEFAULT?= 9 # Version of lang/gcc. Do not override! LANG_GCC_IS= 4.8 |