[115276] trunk/dports
mojca at macports.org
mojca at macports.org
Mon Dec 30 07:35:14 PST 2013
Revision: 115276
https://trac.macports.org/changeset/115276
Author: mojca at macports.org
Date: 2013-12-30 07:35:14 -0800 (Mon, 30 Dec 2013)
Log Message:
-----------
wxPython-3.0: upgrade to version 3.0.0.0 (#41927)
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl
trunk/dports/graphics/wxWidgets-3.0/Portfile
trunk/dports/graphics/wxWidgets-3.0/files/wxPython-3.0
trunk/dports/python/py-wxpython-3.0/Portfile
Modified: trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl 2013-12-30 15:20:02 UTC (rev 115275)
+++ trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl 2013-12-30 15:35:14 UTC (rev 115276)
@@ -101,7 +101,7 @@
}
} 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 {
Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile 2013-12-30 15:20:02 UTC (rev 115275)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2013-12-30 15:35:14 UTC (rev 115276)
@@ -10,6 +10,7 @@
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,8 +20,7 @@
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,7 +106,7 @@
--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,21 +114,10 @@
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
Modified: trunk/dports/graphics/wxWidgets-3.0/files/wxPython-3.0
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/wxPython-3.0 2013-12-30 15:20:02 UTC (rev 115275)
+++ trunk/dports/graphics/wxWidgets-3.0/files/wxPython-3.0 2013-12-30 15:35:14 UTC (rev 115276)
@@ -1,8 +1,8 @@
-${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
Modified: trunk/dports/python/py-wxpython-3.0/Portfile
===================================================================
--- trunk/dports/python/py-wxpython-3.0/Portfile 2013-12-30 15:20:02 UTC (rev 115275)
+++ trunk/dports/python/py-wxpython-3.0/Portfile 2013-12-30 15:35:14 UTC (rev 115276)
@@ -6,7 +6,7 @@
PortGroup wxWidgets 1.0
name py-wxpython-3.0
-version 2.9.5.0
+version 3.0.0.0
set wx_version [join [lrange [split ${version} .] 0 2] .]
set branch [join [lrange [split ${version} .] 0 1] .]
categories-append graphics devel
@@ -28,8 +28,8 @@
distname wxPython
use_bzip2 yes
-checksums rmd160 4d54edc5437fbe14e552bfc6feeeb4fb74d10cd0 \
- sha256 1a5b7e771eff467538d0834136188e8a7506a4fe6e85d0a46c40158cdbd4c48c
+checksums rmd160 75661f0552e9bf3e86002c96fdc9a01157ef791e \
+ sha256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11
python.versions 27
python.default_version 27
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131230/9c56a7b3/attachment.html>
More information about the macports-changes
mailing list