Ticket #41927: wxPython-3.0.0.0.diff

_resources/port1.0/group/wxWidgets-1.0.tcl

@@ -101 +101 @@
         }
     } elseif {${args} eq "wxPython-3.0"} {
         wxWidgets.name      "wxPython"
-        wxWidgets.version   "2.9"
+        wxWidgets.version   "3.0"
         wxWidgets.port      "wxPython-3.0"
         if {${os.major} < 9} {
             pre-fetch {

graphics/wxWidgets-3.0/Portfile

@@ -10 +10 @@
 subport             wxPython-3.0 {}
 subport             wxgtk-3.0 {}
 version             3.0.0
+set wxpython_ver    3.0.0.0
 revision            5
 
 set installname     wxWidgets
@@ -19 +20 @@
     wxWidgets.use   wxWidgets-3.0
 } elseif {${subport} eq "wxPython-3.0"} {
     wxWidgets.use   wxPython-3.0
-    version         2.9.5
-    revision        2
+    revision        0
 } elseif {${subport} eq "wxgtk-3.0"} {
     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
     # wxgtk-3.0 is here mainly for testing purposes
@@ -106 +106 @@
                     --with-macosx-version-min=no
 
 if {${subport} eq "wxPython-3.0"} {
-    set wxpythonsubset      wxPython-2.9.5.0-MacPorts-subset
+    set wxpythonsubset      wxPython-${wxpython_ver}-MacPorts-subset
     distfiles-append        ${wxpythonsubset}${extract.suffix}:trac
 
     description             wxWidgets ${branch} for the wxPython distribution
@@ -114 +114 @@
                             to guarantee compatibility even when the upstream versions \
                             of wxWidgets and wxPython differ.
 
-    checksums               ${distname}-${version}${extract.suffix} \
-                            rmd160  f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
-                            sha256  b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02 \
-                            ${wxpythonsubset}${extract.suffix} \
-                            rmd160  936858d5856adde043d107164b1b53d3209eb76d \
-                            sha256  c892f257b151726a70886c7cffda51554b48b8e9cc7cfcc962d6988c5fe81856
+    checksums-append        ${wxpythonsubset}${extract.suffix} \
+                            rmd160  23a8c977fcc2ebe74d9adc178e243320492a7650 \
+                            sha256  f96bbf9095d30c9cdbe84f7694181a91a92fd0f4a0e87c4f1fa6b6a6d4e7a6ed
 
-    patchfiles-delete       patch-configure.diff
-    patchfiles-append       patch-configure295.diff \
-                            patch-upstream-src-osx-cocoa-textctrl.mm.diff \
-                            patch-upstream-src-osx-cocoa-window.mm.diff
-    if {${os.major} >= 10} {
-        patchfiles-delete   patch-src-osx-cocoa-utils.mm.diff
-    }
-
     post-destroot {
         # copy a subset of wxPython to wxWidgets to prevent a conflict
         # between py2X-wxpython-3.0 and py2Y-wxpython-3.0

graphics/wxWidgets-3.0/files/wxPython-3.0

@@ -1 @@
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/bin/wx-config
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/bin/wxrc-2.9
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/share/aclocal/wxwin.m4
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/share/bakefile/presets/wx.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/share/bakefile/presets/wx_presets.py
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/share/bakefile/presets/wx_unix.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/share/bakefile/presets/wx_win32.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9/share/bakefile/presets/wx_xrc.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/bin/wx-config
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/bin/wxrc-3.0
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/aclocal/wxwin.m4
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_presets.py
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_unix.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_win32.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_xrc.bkl

python/py-wxpython-3.0/Portfile

@@ -6 +6 @@
 PortGroup           wxWidgets   1.0
 
 name                py-wxpython-3.0
-version             2.9.5.0
+version             3.0.0.0.b20131219
 set wx_version      [join [lrange [split ${version} .] 0 2] .]
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories-append   graphics devel
@@ -23 +23 @@
                     the wxWidgets cross platform GUI library, written in C++.
 
 homepage            http://www.wxpython.org/
-master_sites        sourceforge:wxpython
+master_sites        sourceforge:wxpython \
+                    http://wxpython.kosoftworks.com/preview/20131219/
 
 distname            wxPython
 use_bzip2           yes
 
-checksums           rmd160  4d54edc5437fbe14e552bfc6feeeb4fb74d10cd0 \
-                    sha256  1a5b7e771eff467538d0834136188e8a7506a4fe6e85d0a46c40158cdbd4c48c
+checksums           rmd160  b167e2c22cfc377e1f448e97b390aea593338e47 \
+                    sha256  3b960f5c4d00441f88ec28a4380ce69a82a5d55308a3fda38e8ee000a0b6b896
 
 python.versions     27
 python.default_version 27