<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[139181] trunk/dports/math/wxMaxima</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/139181">139181</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2015-08-05 16:47:39 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>wxmaxima: update to 15.04.0 (closes #48468)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathwxMaximaPortfile">trunk/dports/math/wxMaxima/Portfile</a></li>
<li><a href="#trunkdportsmathwxMaximafilespatchsrc_maincppdiff">trunk/dports/math/wxMaxima/files/patch-src_main.cpp.diff</a></li>
<li><a href="#trunkdportsmathwxMaximafilespatchsrc_wxMaximacppdiff">trunk/dports/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathwxMaximafilespatchsrc_Dirstructurehdiff">trunk/dports/math/wxMaxima/files/patch-src_Dirstructure.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathwxMaximaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/wxMaxima/Portfile (139180 => 139181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/wxMaxima/Portfile 2015-08-05 23:15:08 UTC (rev 139180)
+++ trunk/dports/math/wxMaxima/Portfile 2015-08-05 23:47:39 UTC (rev 139181)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name wxMaxima
</span><del>-version 13.04.2
-revision 1
</del><ins>+version 15.04.0
+revision 0
</ins><span class="cx"> maintainers mk openmaintainer
</span><span class="cx"> license gpl
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -18,13 +18,16 @@
</span><span class="cx"> homepage http://wxmaxima.sourceforge.net/
</span><span class="cx"> master_sites sourceforge:project/[string tolower ${name}]/${name}/${version}
</span><span class="cx"> livecheck.regex (?:[string tolower ${name}]|${name})-(\[a-z0-9.\]+)${extract.suffix}
</span><del>-checksums rmd160 9712bcd5ea8b84e247591d11634bde71b00f7a3e \
- sha256 29352db75dd3ff27393ab0971543fd0b3c3a9c330c2c8d07ebfd373741ded4eb
</del><ins>+checksums rmd160 04295f10ccd074d7069d00b1a0fe41884817687c \
+ sha256 0005029798703470333309fda29c731e79c85de1c7fc09b16cb87045a03aa4ba
</ins><span class="cx">
</span><ins>+# Upstream changed the distname's spelling some time after 13.x.
+distname wxmaxima-${version}
+
</ins><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src_main.cpp.diff \
</span><del>- patch-src_Config.cpp.diff \
</del><ins>+ patch-src_Dirstructure.h.diff \
</ins><span class="cx"> patch-src_wxMaxima.cpp.diff
</span><span class="cx">
</span><span class="cx"> depends_lib port:libiconv \
</span><span class="lines">@@ -41,7 +44,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> depends_skip_archcheck maxima
</span><del>-configure.args --enable-dnd --enable-printing --enable-unicode-glyphs --with-wxdir=${wxWidgets.wxdir}
</del><ins>+configure.args --enable-printing --with-wxdir=${wxWidgets.wxdir}
</ins><span class="cx"> build.target-append wxMaxima.app
</span><span class="cx">
</span><span class="cx"> destroot {
</span></span></pre></div>
<a id="trunkdportsmathwxMaximafilespatchsrc_Dirstructurehdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/wxMaxima/files/patch-src_Dirstructure.h.diff (0 => 139181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/wxMaxima/files/patch-src_Dirstructure.h.diff (rev 0)
+++ trunk/dports/math/wxMaxima/files/patch-src_Dirstructure.h.diff 2015-08-05 23:47:39 UTC (rev 139181)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- src/Dirstructure.h.old 2015-07-31 02:10:34.000000000 +0200
++++ src/Dirstructure.h 2015-07-31 02:16:47.000000000 +0200
+@@ -110,7 +110,7 @@
+
+ //! The path maxima is found at by default.
+ #if defined __WXMAC__
+- wxString MaximaDefaultName() {return wxT("/Applications/Maxima.app");}
++ wxString MaximaDefaultName() {return wxT("maxima");}
+ #elif defined __WXMSW__
+ wxString MaximaDefaultName() {return wxStandardPaths::Get().GetExecutablePath()+wxT("/bin/maxima.bat");}
+ #else
</ins></span></pre></div>
<a id="trunkdportsmathwxMaximafilespatchsrc_maincppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/wxMaxima/files/patch-src_main.cpp.diff (139180 => 139181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/wxMaxima/files/patch-src_main.cpp.diff 2015-08-05 23:15:08 UTC (rev 139180)
+++ trunk/dports/math/wxMaxima/files/patch-src_main.cpp.diff 2015-08-05 23:47:39 UTC (rev 139181)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/main.cpp.orig 2014-04-25 01:15:35.000000000 +0200
-+++ src/main.cpp 2014-04-25 01:16:30.000000000 +0200
-@@ -46,6 +46,16 @@
</del><ins>+--- src/main.cpp.old 2015-07-31 02:08:46.000000000 +0200
++++ src/main.cpp 2015-07-31 02:09:17.000000000 +0200
+@@ -48,6 +48,16 @@
</ins><span class="cx">
</span><span class="cx"> bool MyApp::OnInit()
</span><span class="cx"> {
</span><span class="lines">@@ -16,4 +16,4 @@
</span><span class="cx"> +
</span><span class="cx"> int lang = wxLANGUAGE_UNKNOWN;
</span><span class="cx">
</span><del>- #if defined __WXMSW__
</del><ins>+ wxCmdLineParser cmdLineParser(argc, argv);
</ins></span></pre></div>
<a id="trunkdportsmathwxMaximafilespatchsrc_wxMaximacppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff (139180 => 139181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff 2015-08-05 23:15:08 UTC (rev 139180)
+++ trunk/dports/math/wxMaxima/files/patch-src_wxMaxima.cpp.diff 2015-08-05 23:47:39 UTC (rev 139181)
</span><span class="lines">@@ -1,11 +1,19 @@
</span><del>---- src/wxMaxima.cpp.orig 2014-04-25 01:20:45.000000000 +0200
-+++ src/wxMaxima.cpp 2014-04-25 01:20:55.000000000 +0200
-@@ -1484,7 +1484,7 @@
</del><ins>+--- src/wxMaxima.cpp.old 2015-07-31 02:22:52.000000000 +0200
++++ src/wxMaxima.cpp 2015-07-31 02:24:21.000000000 +0200
+@@ -1500,16 +1500,7 @@ wxString wxMaxima::GetCommand(bool param
+ //Fix wrong" maxima=1" paraneter in ~/.wxMaxima if upgrading from 0.7.0a
</ins><span class="cx"> if (!have_config || (have_config && command.IsSameAs (wxT("1"))))
</span><span class="cx"> {
</span><del>- #if defined (__WXMAC__)
-- command = wxT("/Applications/Maxima.app");
-+ command = wxT("maxima");
- #else
</del><ins>+-#if defined (__WXMAC__)
+- if (wxFileExists("/Applications/Maxima.app"))
+- command = wxT("/Applications/Maxima.app");
+- else if (wxFileExists("/usr/local/bin/maxima"))
+- command = wxT("/usr/local/bin/maxima");
+- else
+- command = wxT("maxima");
+-#else
</ins><span class="cx"> command = wxT("maxima");
</span><del>- #endif
</del><ins>+-#endif
+ config->Write(wxT("maxima"), command);
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>