diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2016-03-24 15:47:50 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2016-03-24 15:47:50 +0000 |
| commit | 77760fcb6307bb10ac6bbf1653f33308bc4ffeb2 (patch) | |
| tree | 9a9bfdddc0d5bd83f4f805c6db760afc834ef9b7 /Mk | |
| parent | Cisco::CopyConfig provides methods for manipulating the (diff) | |
Make print/ghostscript9-agpl-base the default Ghostscript port. Upstream
changed the license to the AGPL 3 in version 9.07 so print/ghostscript9-base
is stuck at 9.06 which is almost 4 years old now.
Fix the logic in Uses/ghostscript.mk so "agpl" is treated as a real version
on its own instead of as a variant of other versions.
Fix print/ghostscript9-agpl-base to install eps2write.
Update math/asymptote to 2.37 to support newer Ghostscript.
PR: 208159
Exp-run by: antoine
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=411798
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/ghostscript.mk | 21 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 4 |
2 files changed, 8 insertions, 17 deletions
diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index 98fd5012fc03..720378f9e207 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -6,8 +6,8 @@ # Usage: USES=ghostscript or USES=ghostscript:args # Valid ARGS: <version>, build, run, x11 # -# version The chooseable versions are 7, 8 and 9. If no version is -# specified version 9 is selected. +# version The chooseable versions are 7, 8, 9 and agpl. If no version is +# specified version agpl is selected. # # USES=ghostscript:7 # Use Ghostscript 7 # USES=ghostscript:run # Use the set default Ghostscript as a run dependancy @@ -61,31 +61,22 @@ _GS_BUILD_DEP= yes _GS_RUN_DEP= yes .endif -.undef _GS_AGPL_SUFFIX .undef _GS_SELECTED .for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT} _V=${V} .if ${_V:M9} _GS_SELECTED?= 9 .elif ${_V:Magpl} -_GS_AGPL_SUFFIX?= -agpl -.if defined(_GS_SELECTED) && ${_GS_SELECTED:N9} -IGNORE?= Ghostscript-agpl is only available in version 9 -.else -_GS_SELECTED?= 9 -.endif +_GS_SELECTED?= 9-agpl .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 # Resolve minor version number for X11.so library. -.if !empty(_GS_SELECTED:M9) && defined(_GS_AGPL_SUFFIX) +.if !empty(_GS_SELECTED:M9-agpl) _GS_VERSION_MINOR= 9.16_2 .elif !empty(_GS_SELECTED:M9) _GS_VERSION_MINOR= 9.06_11 @@ -96,8 +87,8 @@ _GS_VERSION_MINOR= 7.07_32 .endif # dependencies -_GS_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}-base -_GS_X11_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}-x11 +_GS_PORT= ghostscript${_GS_SELECTED}-base +_GS_X11_PORT= ghostscript${_GS_SELECTED}-x11 .for type in BUILD RUN .if defined(_GS_${type}_DEP) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 5f07b7156cdb..d6a397a7c51a 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -19,8 +19,10 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g} .endfor APACHE_DEFAULT?= 2.4 +FIREBIRD_DEFAULT?= 2.5 FPC_DEFAULT?= 3.0.0 GCC_DEFAULT?= 4.8 +GHOSTSCRIPT_DEFAULT?= agpl LUA_DEFAULT?= 5.2 MYSQL_DEFAULT?= 5.6 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ @@ -44,8 +46,6 @@ PYTHON2_DEFAULT?= 2.7 PYTHON3_DEFAULT?= 3.4 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 |