<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/76fc6aa932eed737bffec7936b5220db09bd5305">https://github.com/macports/macports-ports/commit/76fc6aa932eed737bffec7936b5220db09bd5305</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 76fc6aa octave-symbolic: update to 2.7.0
</span>76fc6aa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 76fc6aa932eed737bffec7936b5220db09bd5305
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Jul 27 08:44:55 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave-symbolic: update to 2.7.0
</span>---
math/octave-symbolic/Portfile | 59 +++++++++++++++++-----------
math/octave-symbolic/files/patch-python.diff | 11 ------
2 files changed, 37 insertions(+), 33 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 58e60fd..d8b16cf 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;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup symbolic 2.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup symbolic 2.7.0
</span> platforms darwin
license GPL-3
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,46 +11,62 @@ description Symbolic toolbox based on SymPy.
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 759cdeeca1799e3ffad88354a90e61d9dd4d540b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a278d4b07822f39f9351c31333dc5ce51f396013264f231d738a9f158c9a4d5d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5ffe9f4dceb801468ea9d7e0e6b810c4a1d36a86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 46222cdf04e888b555ccf7426ad363837fc9c66a3533fff59f3fc400e91ab83e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 251049
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description "Use Python 2.7 SymPy" conflicts python35 python36 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description "Use Python 2.7 SymPy" conflicts python35 python36 python37 {
</span> depends_lib-append port:python27 \
port:py27-sympy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+setenv PYTHON ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 description "Use Python 3.5 SymPy" conflicts python27 python36 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 description "Use Python 3.5 SymPy" conflicts python27 python36 python37 {
</span> depends_lib-append port:python35 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+setenv PYTHON ${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 description "Use Python 3.6 SymPy" conflicts python27 python35 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 description "Use Python 3.6 SymPy" conflicts python27 python35 python37 {
</span> depends_lib-append port:python36 \
<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:#e0ffe0;'>+ port:py36-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+setenv PYTHON ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python35] && ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description "Use Python 3.7 SymPy" conflicts python27 python35 python36 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+setenv PYTHON ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 python35] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</span> }
# make sure -python27 was not specified alone
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python35] && ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
</span>
ui_error "\n\nYou must select one of the python variants.\n"
return -code error "Invalid variant selection"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/55361
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-python.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_PYTHON__|${configure.python}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/inst/sympref.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symbolic/files/patch-python.diff b/math/octave-symbolic/files/patch-python.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3a9a4e5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inst/sympref.m.orig 2017-07-27 11:56:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/sympref.m 2017-11-19 11:14:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,7 +261,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nargin ~= 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error('old syntax ''sympref python'' removed; use ''setenv PYTHON'' instead')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DEFAULTPYTHON = 'python';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DEFAULTPYTHON = '__MACPORTS_PYTHON__';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyexec = getenv('PYTHON');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (isempty(pyexec))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyexec = DEFAULTPYTHON;
</span></pre><pre style='margin:0'>
</pre>