Ticket #48468: wxmaxima-update.diff

math/wxMaxima/Portfile

@@ -5 +5 @@
 PortGroup       wxWidgets 1.0
 
 name            wxMaxima
-version         13.04.2
-revision        1
+version         15.04.0
+revision        0
 maintainers     mk openmaintainer
 license         gpl
 platforms       darwin
@@ -18 +18 @@
 homepage        http://wxmaxima.sourceforge.net/
 master_sites    sourceforge:project/[string tolower ${name}]/${name}/${version}
 livecheck.regex (?:[string tolower ${name}]|${name})-(\[a-z0-9.\]+)${extract.suffix}
-checksums       rmd160  9712bcd5ea8b84e247591d11634bde71b00f7a3e \
-                sha256  29352db75dd3ff27393ab0971543fd0b3c3a9c330c2c8d07ebfd373741ded4eb
+checksums       rmd160  04295f10ccd074d7069d00b1a0fe41884817687c \
+                sha256  0005029798703470333309fda29c731e79c85de1c7fc09b16cb87045a03aa4ba
+
+# Upstream changed the distname's spelling some time after 13.x.
+distname        wxmaxima-${version}
 
 wxWidgets.use   wxWidgets-3.0
 
 patchfiles      patch-src_main.cpp.diff \
-                patch-src_Config.cpp.diff \
+                patch-src_Dirstructure.h.diff \
                 patch-src_wxMaxima.cpp.diff
 
 depends_lib     port:libiconv \
@@ -41 +44 @@
 }
 
 depends_skip_archcheck  maxima
-configure.args  --enable-dnd --enable-printing --enable-unicode-glyphs --with-wxdir=${wxWidgets.wxdir}
+configure.args  --enable-printing --with-wxdir=${wxWidgets.wxdir}
 build.target-append wxMaxima.app
 
 destroot {

math/wxMaxima/files/patch-src_Config.cpp.diff

@@ -1 @@
---- src/Config.cpp.old  2014-04-25 01:17:40.000000000 +0200
-+++ src/Config.cpp      2014-04-25 01:18:24.000000000 +0200
-@@ -191,8 +191,7 @@
-   if (mp.Length())
-     m_maximaProgram->SetValue(mp);
-   else
--    // this is where the mac installer installs maxima
--    m_maximaProgram->SetValue(wxT("/Applications/Maxima.app"));
-+    m_maximaProgram->SetValue(wxT("maxima"));
- #else
-   if (mp.Length())
-     m_maximaProgram->SetValue(mp);

math/wxMaxima/files/patch-src_Dirstructure.h.diff

@@ +1 @@
+--- 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

math/wxMaxima/files/patch-src_main.cpp.diff

@@ -1 @@
---- 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 @@
+--- 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 @@
  
  bool MyApp::OnInit()
  {
@@ -16 +16 @@
 +
    int lang = wxLANGUAGE_UNKNOWN;
  
- #if defined __WXMSW__
+   wxCmdLineParser cmdLineParser(argc, argv);

math/wxMaxima/files/patch-src_wxMaxima.cpp.diff

@@ -1 @@
---- 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 @@
+--- 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
    if (!have_config || (have_config && command.IsSameAs (wxT("1"))))
    {
- #if defined (__WXMAC__)
--    command = wxT("/Applications/Maxima.app");
-+    command = wxT("maxima");
- #else
+-#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
      command = wxT("maxima");
- #endif
+-#endif
+     config->Write(wxT("maxima"), command);
+   }
+