<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e9cbbc1d3574066ff53b7714a3fffe8e5d41e587">https://github.com/macports/macports-ports/commit/e9cbbc1d3574066ff53b7714a3fffe8e5d41e587</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 e9cbbc1 wxMaxima: update to version 20.04.0 (April 2020) (#6920)
</span>e9cbbc1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e9cbbc1d3574066ff53b7714a3fffe8e5d41e587
</span>Author: MSoegtropIMC <7895506+MSoegtropIMC@users.noreply.github.com>
AuthorDate: Thu May 7 18:47:56 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> wxMaxima: update to version 20.04.0 (April 2020) (#6920)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to Version 20.04.0 with many OSX specific bug fixes
</span><span style='display:block; white-space:pre;color:#404040;'> * removed variants (better have exactly one version which works)
</span><span style='display:block; white-space:pre;color:#404040;'> * removed -devel sub-port
</span><span style='display:block; white-space:pre;color:#404040;'> * merged patches upstream
</span><span style='display:block; white-space:pre;color:#404040;'> * added maintainer
</span>---
math/wxMaxima/Portfile | 126 ++++++++-------------
.../files/patch-devel-src_Dirstructure.cpp.diff | 15 ---
.../wxMaxima/files/patch-src_Dirstructure.cpp.diff | 37 ------
math/wxMaxima/files/patch-src_Dirstructure.h.diff | 11 --
math/wxMaxima/files/patch-src_main.cpp.diff | 19 ----
math/wxMaxima/files/patch-src_wxMaxima.cpp.diff | 19 ----
6 files changed, 49 insertions(+), 178 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/Portfile b/math/wxMaxima/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4670a7e..7392fcd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/wxMaxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,112 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup active_variants 1.1
PortGroup wxWidgets 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wxMaxima-developers wxmaxima 20.04.0 Version-
</span> name wxMaxima
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 18.02.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers @MSoegtropIMC
</span> license GPL-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# openssl is a dependency of curl in cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# openssl is a dependency of curl in cmake, so build only
</span> license_noconflict openssl
platforms darwin
categories math aqua
description Graphical user interface for Maxima based on wxWidgets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://andrejv.github.io/wxmaxima/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport wxMaxima-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts wxMaxima
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Provides the development version, which is typically updated every day.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # git describe --tags : Version-16.12.x-1834-gb32fed0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup andrejv wxmaxima b32fed0d535c05d589d1f573d2c0f4f839180d18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 86fcf85ddae42e84884a708d55acff393152ed23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e34256294c51a37d80947b92d3cd979456bf0c8ae53a21ce6cbab63d99143bf2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12739940
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 18.02-dev-20180616
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-devel-src_Dirstructure.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Dirstructure.cpp
</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;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Maxima is a Computer Algebra System (CAS) and wxMaxima is a work book style \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ graphical front end for it based on wxWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts wxMaxima-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Provides the release version, which is typically updated every four months.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get the source tarball from github.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup andrejv wxmaxima 18.02.0 Version-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d1017d56bfd76e9c51dcc3230be89ebca1724560 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 77f0414be54d8ea15acedfc3cedf72a57cc2b3ba5d4835a53f3009e050c05483 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10131293
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-src_Dirstructure.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Dirstructure.cpp
</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;'>- livecheck.regex Version-(\[a-z0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0c10602f6f1d777ff16fe85500f57222eb07fc27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 055ff34eb98539716a18f7cc11861b5a790fde46aaafabb68f1e690cb649d9df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15314478
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wx32 description {Use wxWidgets 3.2 - experimental!} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex Version-(\[a-z0-9.\]+)${extract.suffix}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_exists wx32] && [variant_isset wx32]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we want to use the wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: as of Match 2020 (1b00466)the build with wxWidgets-3.2 has serious issues with scrolling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wxWidgets.use wxWidgets-3.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib:${prefix}/lib/libomp/libomp:libomp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build path:bin/cmake:cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: the advantage of path:bin/cmake:cmake over port:cmake is that it also allows e.g. cmake-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: the cmake port group seems to have issues with application packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:bin/cmake:cmake
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run bin:maxima:maxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:gnuplot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:maxima
</span>
patch.pre_args -Np0
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|OSX_MACPORTS_PREFIX *\"${prefix}\"|OSX_MACPORTS_PREFIX \"${prefix}\" // patched by MacPorts|" src/Dirstructure.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|OSX_MACPORTS_PREFER 0|OSX_MACPORTS_PREFER 1 // patched by MacPorts|" src/Dirstructure.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {
system -W ${worksrcpath} "mkdir ./build"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/build "cmake -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH=${wxWidgets.wxconfig} .."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/build "cmake -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH=${wxWidgets.wxconfig} -DUSE_CPPCHECK=YES -DUSE_OPENMP=YES -DCMAKE_CXX_FLAGS=-I${prefix}/include/libomp -DOpenMP_CXX_FLAGS='-Xpreprocessor -fopenmp' -DOpenMP_CXX_LIB_NAMES=libomp -DOpenMP_libomp_LIBRARY=${prefix}/lib/libomp/libomp.dylib .."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/build "cmake -LA ."
</span> system -W ${worksrcpath}/build "cmake --build ."
}
destroot {
xinstall -m 755 -d ${destroot}${applications_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/build/wxMaxima.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/build/src/wxMaxima.app ${destroot}${applications_dir}
</span> }
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Be careful: \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- If you want to use wxMaxima with default setting, \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- you should enter the command \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"open -a ${applications_dir}/wxMaxima.app\" \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on Terminal.app in order to launch wxMaxima. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Because you must let wxMaxima know the path to software \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installed with MacPorts. \n\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- On the other hand, \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- when you launch directly wxMaxima on the Finder, \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the path to maxima (e.g. \"${prefix}/bin/maxima\") is automatically set \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on the configuration dialog. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- But you should enter the maxima expression \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnuplot_command:\"${prefix}/bin/gnuplot\"\$ \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in order to use gnuplot. \n\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Some configuration files are automatically created by wxMaxima. \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- You can enter the command \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"find \$HOME/Library -name '*wxMaxima*'\" \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on Terminal.app in order to find them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wxMaxima is installed under '/Applications/MacPorts/wxMaxima.app'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+You can start it from there via Finder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If you want to add wxMaxima to the Dock, start it via Finder,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+right click on the symbol in Dock and select 'Options/Keep in Dock'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wxMaxima should be able to find maxima and gnuplot at the Macports install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+folder '${prefix}/bin/' and also at a few non MacPorts locations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In case you have issues with finding maxima, open wxMaxima Preferences and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+under the second tab (maxima) enter your path to the maxima executable and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in the last tab (startup) add this command:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnuplot_command:\"<yourgnuplotpath>/gnuplot\"$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+You might have to restart wxMaxima for this to take effect.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wxMaxima and Maxima startup files can typically be found in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~/.maxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ATTENTION: On OSX Catalina up to including 10.15.3 there are issues with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menues (they don't work reliably). Please use OSX 10.15.4 or later or 10.14.
</span> "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/files/patch-devel-src_Dirstructure.cpp.diff b/math/wxMaxima/files/patch-devel-src_Dirstructure.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a29a801..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/files/patch-devel-src_Dirstructure.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Dirstructure.cpp.orig 2018-06-01 18:24:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Dirstructure.cpp 2018-06-03 23:04:26.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,10 +296,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("/Applications/Maxima.app");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (wxFileExists("/Applications/maxima.app"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("/Applications/maxima.app");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (wxFileExists("/usr/local/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("/usr/local/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (wxFileExists("/usr/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("/usr/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (wxFileExists("@@PREFIX@@/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ command = wxT("@@PREFIX@@/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return command;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/files/patch-src_Dirstructure.cpp.diff b/math/wxMaxima/files/patch-src_Dirstructure.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c761bd9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/files/patch-src_Dirstructure.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Dirstructure.cpp.orig 2018-02-17 23:54:32.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Dirstructure.cpp 2018-05-31 23:28:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,7 +249,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxFileName maximaName(result);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- maximaName.RemoveLastDir();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(maximaName.GetDirCount() > 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ maximaName.RemoveLastDir();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxArrayString output;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxExecute(wxT("which maxima"), output, (wxEXEC_SYNC | wxEXEC_NOEVENTS));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(output.GetCount() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxFileName fullpath(output[0] ,wxPATH_NATIVE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return fullpath.GetPath();
</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;'>- return maximaName.GetPath();
</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;'>-@@ -279,10 +292,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("/Applications/Maxima.app");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (wxFileExists("/Applications/maxima.app"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("/Applications/maxima.app");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (wxFileExists("/usr/local/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("/usr/local/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (wxFileExists("/usr/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("/usr/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (wxFileExists("@@PREFIX@@/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ command = wxT("@@PREFIX@@/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return command;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/files/patch-src_Dirstructure.h.diff b/math/wxMaxima/files/patch-src_Dirstructure.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ea004ed..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/files/patch-src_Dirstructure.h.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;'>---- src/Dirstructure.h.old 2015-07-31 02:10:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Dirstructure.h 2015-07-31 02:16:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //! The path maxima is found at by default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined __WXMAC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wxString MaximaDefaultName() {return wxT("/Applications/Maxima.app");}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxString MaximaDefaultName() {return wxT("maxima");}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined __WXMSW__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxString MaximaDefaultName() {return wxStandardPaths::Get().GetExecutablePath()+wxT("/bin/maxima.bat");}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/files/patch-src_main.cpp.diff b/math/wxMaxima/files/patch-src_main.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35ec45d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/files/patch-src_main.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main.cpp.old 2015-07-31 02:08:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main.cpp 2015-07-31 02:09:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool MyApp::OnInit()
</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;'>-+ wxString oldpath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxGetEnv(wxT("PATH"), &oldpath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (oldpath.Find(wxT("@@PREFIX@@/bin")) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxString newpath = oldpath.Prepend(wxT("@@PREFIX@@/bin:"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxSetEnv(wxT("PATH"), newpath);
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int lang = wxLANGUAGE_UNKNOWN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxCmdLineParser cmdLineParser(argc, argv);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff b/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c87431..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/wxMaxima.cpp.old 2015-07-31 02:22:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/wxMaxima.cpp 2015-07-31 02:24:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1500,16 +1500,7 @@ wxString wxMaxima::GetCommand(bool param
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //Fix wrong" maxima=1" paraneter in ~/.wxMaxima if upgrading from 0.7.0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!have_config || (have_config && command.IsSameAs (wxT("1"))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined (__WXMAC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (wxFileExists("/Applications/Maxima.app"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("/Applications/Maxima.app");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (wxFileExists("/usr/local/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("/usr/local/bin/maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command = wxT("maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = wxT("maxima");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config->Write(wxT("maxima"), command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>