octave-symbolic: update to version 2.5.0

remove obsolete patch add python 3.6 support update maintainer address
macports · Feb 4, 2017 · bcf2128 · bcf2128
1 parent ba4194b
commit bcf2128
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 37 deletions.
diff --git a/math/octave-symbolic/Portfile b/math/octave-symbolic/Portfile
@@ -3,67 +3,58 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        symbolic 2.4.0
-revision 1
+octave.setup        symbolic 2.5.0
 platforms           darwin
 license             GPL-3
-maintainers         gmail.com:mschamschula openmaintainer
+maintainers         {mps @Schamschula} openmaintainer
 description         Symbolic toolbox based on SymPy.
 
 long_description    ${description}
 
-checksums           rmd160 9c7144e1e6b24d1c28ebaecfdb622c482664b616 \
-                    sha256 beb51d20679db7abc85e8f065c0acae23615139e9fe2b290418230b585f76ed6
+checksums           rmd160 e7b85abbd2fa204c16a287cd7a58121c86a021eb \
+                    sha256 d8b3d10c3e04214b8aebb9de90f6df258e2baedd4b36feb4673c7d1d28c752ba
 
 supported_archs     noarch
 
-# fix default Python to be within MacPorts
-
-patchfiles-append   patch-inst_sympref.m.diff
-
-variant python27 description "Use Python 2.7 SymPy" conflicts python34 python35 {
+variant python27 description "Use Python 2.7 SymPy" conflicts python34 python35 python36 {
     depends_lib-append  port:python27 \
                         port:py27-sympy
 
-    post-patch {
-        reinplace "s|@PYTHON@|${prefix}/bin/python2.7|g" \
-            ${worksrcpath}/inst/sympref.m
-    }
     configure.env-append \
         PYTHON=${prefix}/bin/python2.7
 }
 
-variant python34 description "Use Python 3.4 SymPy" conflicts python27 python35 {
+variant python34 description "Use Python 3.4 SymPy" conflicts python27 python35 python36 {
     depends_lib-append  port:python34 \
                         port:py34-sympy
 
-    post-patch {
-        reinplace "s|@PYTHON@|${prefix}/bin/python3.4|g" \
-            ${worksrcpath}/inst/sympref.m
-    }
     configure.env-append \
         PYTHON=${prefix}/bin/python3.4
 }
 
-variant python35 description "Use Python 3.5 SymPy" conflicts python27 python34 {
+variant python35 description "Use Python 3.5 SymPy" conflicts python27 python34 python36 {
     depends_lib-append  port:python35 \
         port:py35-sympy
 
-    post-patch {
-        reinplace "s|@PYTHON@|${prefix}/bin/python3.5|g" \
-            ${worksrcpath}/inst/sympref.m
-    }
     configure.env-append \
         PYTHON=${prefix}/bin/python3.5
 }
 
-if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
+variant python36 description "Use Python 3.6 SymPy" conflicts python27 python34 python35 {
+    depends_lib-append  port:python35 \
+        port:py35-sympy
+
+    configure.env-append \
+        PYTHON=${prefix}/bin/python3.6
+}
+
+if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
     default_variants +python27
 }
 
 # make sure -python27 was not specified alone
 
-if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
+if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
 
     ui_error "\n\nYou must select one of the python variants.\n"
     return -code error "Invalid variant selection"

diff --git a/math/octave-symbolic/files/patch-inst_sympref.m.diff b/math/octave-symbolic/files/patch-inst_sympref.m.diff