<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/bcf2128b3187f0d9dba49658892061a69200bcff">https://github.com/macports/macports-ports/commit/bcf2128b3187f0d9dba49658892061a69200bcff</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bcf2128b3187f0d9dba49658892061a69200bcff
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat Feb 4 06:10:52 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> octave-symbolic: update to version 2.5.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove obsolete patch
</span><span style='display:block; white-space:pre;color:#404040;'> add python 3.6 support
</span><span style='display:block; white-space:pre;color:#404040;'> update maintainer address
</span>---
math/octave-symbolic/Portfile | 43 +++++++++-------------
.../files/patch-inst_sympref.m.diff | 11 ------
2 files changed, 17 insertions(+), 37 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 fdd0a77..ef5528d 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,67 +3,58 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup symbolic 2.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup symbolic 2.5.0
</span> platforms darwin
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers gmail.com:mschamschula openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mps @Schamschula} openmaintainer
</span> description Symbolic toolbox based on SymPy.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9c7144e1e6b24d1c28ebaecfdb622c482664b616 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 beb51d20679db7abc85e8f065c0acae23615139e9fe2b290418230b585f76ed6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e7b85abbd2fa204c16a287cd7a58121c86a021eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d8b3d10c3e04214b8aebb9de90f6df258e2baedd4b36feb4673c7d1d28c752ba
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix default Python to be within MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-inst_sympref.m.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description "Use Python 2.7 SymPy" conflicts python34 python35 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description "Use Python 2.7 SymPy" conflicts python34 python35 python36 {
</span> depends_lib-append port:python27 \
port:py27-sympy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PYTHON@|${prefix}/bin/python2.7|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> configure.env-append \
PYTHON=${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 description "Use Python 3.4 SymPy" conflicts python27 python35 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 description "Use Python 3.4 SymPy" conflicts python27 python35 python36 {
</span> depends_lib-append port:python34 \
port:py34-sympy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PYTHON@|${prefix}/bin/python3.4|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> configure.env-append \
PYTHON=${prefix}/bin/python3.4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 description "Use Python 3.5 SymPy" conflicts python27 python34 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 description "Use Python 3.5 SymPy" conflicts python27 python34 python36 {
</span> depends_lib-append port:python35 \
port:py35-sympy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PYTHON@|${prefix}/bin/python3.5|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> configure.env-append \
PYTHON=${prefix}/bin/python3.5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 description "Use Python 3.6 SymPy" conflicts python27 python34 python35 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python35 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${prefix}/bin/python3.6
</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 python34] && ![variant_isset python35] && ![variant_isset python36]} {
</span> default_variants +python27
}
# make sure -python27 was not specified alone
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
</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;color:#808080;'>diff --git a/math/octave-symbolic/files/patch-inst_sympref.m.diff b/math/octave-symbolic/files/patch-inst_sympref.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b9ec051..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/files/patch-inst_sympref.m.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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/sympref.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -195,7 +195,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 'defaults'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- settings = [];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- settings.ipc = 'default';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- settings.whichpython = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ settings.whichpython = '@PYTHON@';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sympref ('display', 'default')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sympref ('digits', 'default')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sympref ('snippet', 'default')
</span></pre><pre style='margin:0'>
</pre>