<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f564833fda44e715f61fe9c5e34e521a7ddc1882">https://github.com/macports/macports-ports/commit/f564833fda44e715f61fe9c5e34e521a7ddc1882</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 f564833 wxMaxima: update to 18.02.0 & development subport
</span>f564833 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f564833fda44e715f61fe9c5e34e521a7ddc1882
</span>Author: tomio-arisaka <tomio_041001@icloud.com>
AuthorDate: Thu Jun 28 14:57:45 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> wxMaxima: update to 18.02.0 & development subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update wxMaxima from version 15.04.0 to 18.02.0.
</span><span style='display:block; white-space:pre;color:#404040;'> * Change the value of homepage to 'http://andrejv.github.io/wxmaxima/'.
</span><span style='display:block; white-space:pre;color:#404040;'> * Use 'cmake' instead of 'autoconf' because current version of wxMaxima
</span><span style='display:block; white-space:pre;color:#404040;'> does not support 'autoconf' any more.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch to avoid an error when launching.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add 'wx32' variant to be able to choose wxWidgets-3.1 instead of 3.0.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add 'wxMaxima-devel' subport to be able to get a development version.
</span><span style='display:block; white-space:pre;color:#404040;'> * Closes: https://trac.macports.org/ticket/53732
</span>---
math/wxMaxima/Portfile | 153 ++++++++++++++-------
.../files/patch-devel-src_Dirstructure.cpp.diff | 15 ++
.../wxMaxima/files/patch-src_Dirstructure.cpp.diff | 37 +++++
3 files changed, 154 insertions(+), 51 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 434a2b9..648d7db 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,59 +1,110 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name wxMaxima
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 15.04.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license gpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories math aqua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Graphical user interface for Maxima
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxMaxima is a cross platform GUI for the computer algebra \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system maxima based on wxWidgets.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://wxmaxima.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/[string tolower ${name}]/${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex (?:[string tolower ${name}]|${name})-(\[a-z0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 04295f10ccd074d7069d00b1a0fe41884817687c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0005029798703470333309fda29c731e79c85de1c7fc09b16cb87045a03aa4ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream changed the distname's spelling some time after 13.x.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname wxmaxima-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-patchfiles patch-src_main.cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_Dirstructure.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_wxMaxima.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:maxima
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants gnuplot wxwidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/src/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name wxMaxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 18.02.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# openssl is a dependency of curl in cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories math aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Graphical user interface for Maxima based on wxWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://andrejv.github.io/wxmaxima/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport wxMaxima-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts wxMaxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Provides the development version, which is typically updated every day.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # git describe --tags : Version-16.12.x-1834-gb32fed0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup andrejv wxmaxima b32fed0d535c05d589d1f573d2c0f4f839180d18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 86fcf85ddae42e84884a708d55acff393152ed23 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e34256294c51a37d80947b92d3cd979456bf0c8ae53a21ce6cbab63d99143bf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12739940
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 18.02-dev-20180616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-devel-src_Dirstructure.cpp.diff
</span><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|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Dirstructure.cpp
</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;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_skip_archcheck maxima
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-printing --with-wxdir=${wxWidgets.wxdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target-append wxMaxima.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts wxMaxima-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Provides the release version, which is typically updated every four months.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/wxMaxima.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # get the source tarball from github.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup andrejv wxmaxima 18.02.0 Version-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d1017d56bfd76e9c51dcc3230be89ebca1724560 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 77f0414be54d8ea15acedfc3cedf72a57cc2b3ba5d4835a53f3009e050c05483 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10131293
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set docPath ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${docPath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { AUTHORS COPYING README } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/${f} ${destroot}${docPath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src_Dirstructure.cpp.diff
</span><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|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Dirstructure.cpp
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant wx32 description {Use wxWidgets 3.2 - experimental!} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_exists wx32] && [variant_isset wx32]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we want to use the wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.0
</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;'>+depends_lib port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run bin:maxima:maxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -Np0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "mkdir ./build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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 --build ."
</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;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/build/wxMaxima.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Be careful: \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If you want to use wxMaxima with default setting, \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ you should enter the command \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"open -a ${applications_dir}/wxMaxima.app\" \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on Terminal.app in order to launch wxMaxima. \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Because you must let wxMaxima know the path to software \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed with MacPorts. \n\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ On the other hand, \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when you launch directly wxMaxima on the Finder, \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the path to maxima (e.g. \"${prefix}/bin/maxima\") is automatically set \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on the configuration dialog. \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ But you should enter the maxima expression \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnuplot_command:\"${prefix}/bin/gnuplot\"\$ \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in order to use gnuplot. \n\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Some configuration files are automatically created by wxMaxima. \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can enter the command \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"find \$HOME/Library -name '*wxMaxima*'\" \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on Terminal.app in order to find them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a29a801
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/wxMaxima/files/patch-devel-src_Dirstructure.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Dirstructure.cpp.orig 2018-06-01 18:24:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Dirstructure.cpp 2018-06-03 23:04:26.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,10 +296,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = wxT("/Applications/Maxima.app");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (wxFileExists("/Applications/maxima.app"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = wxT("/Applications/maxima.app");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (wxFileExists("/usr/local/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command = wxT("/usr/local/bin/maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (wxFileExists("/usr/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command = wxT("/usr/bin/maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (wxFileExists("@@PREFIX@@/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command = wxT("@@PREFIX@@/bin/maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = wxT("maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c761bd9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/wxMaxima/files/patch-src_Dirstructure.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Dirstructure.cpp.orig 2018-02-17 23:54:32.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Dirstructure.cpp 2018-05-31 23:28:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,7 +249,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxFileName maximaName(result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- maximaName.RemoveLastDir();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(maximaName.GetDirCount() > 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ maximaName.RemoveLastDir();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wxArrayString output;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wxExecute(wxT("which maxima"), output, (wxEXEC_SYNC | wxEXEC_NOEVENTS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(output.GetCount() > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wxFileName fullpath(output[0] ,wxPATH_NATIVE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return fullpath.GetPath();
</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;'>+ return maximaName.GetPath();
</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;'>+@@ -279,10 +292,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = wxT("/Applications/Maxima.app");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (wxFileExists("/Applications/maxima.app"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = wxT("/Applications/maxima.app");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (wxFileExists("/usr/local/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command = wxT("/usr/local/bin/maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (wxFileExists("/usr/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command = wxT("/usr/bin/maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (wxFileExists("@@PREFIX@@/bin/maxima"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ command = wxT("@@PREFIX@@/bin/maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command = wxT("maxima");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return command;
</span></pre><pre style='margin:0'>
</pre>