<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16bebd03086d9deba25111f7eb406dfd2536191f">https://github.com/macports/macports-ports/commit/16bebd03086d9deba25111f7eb406dfd2536191f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 16bebd03086 octave-symbolic: fix python variants, add py39 subport
</span>16bebd03086 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16bebd03086d9deba25111f7eb406dfd2536191f
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Dec 20 12:55:40 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> octave-symbolic: fix python variants, add py39 subport
</span>---
math/octave-symbolic/Portfile | 46 ++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symbolic/Portfile b/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c3af9464a9..75455ad0582 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup symbolic 2.9.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-3
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,40 +18,28 @@ checksums rmd160 c2f03a1e09bc0e8f05d98b0f522b8d20e422be73 \
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description "Use Python 2.7 SymPy" conflicts python36 python37 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 python37 python38 python39 description {Use Python 2.7 SymPy} {
</span> # remove after 2021-03-09
ui_error "Python 2.7 is no longer supported."
return -code error
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 description "Use Python 3.6 SymPy" conflicts python27 python37 python38 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python36 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 description "Use Python 3.7 SymPy" conflicts python27 python36 python38 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py37-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 description "Use Python 3.8 SymPy" conflicts python27 python36 python37 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python37 python38 python39 description {Use Python 3.6 SymPy} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python36 python38 python39 description {Use Python 3.7 SymPy} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python36 python37 python39 description {Use Python 3.8 SymPy} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python27 python37 python36 python38 description {Use Python 3.9 SymPy} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python36] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &&![variant_isset python37] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python38
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# make sure a python variant is selected
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select one of the python variants.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv {39 38 37 36 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pv}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${pv} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pv}-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# see https://trac.macports.org/ticket/55361
</pre><pre style='margin:0'>
</pre>