<!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>[112161] trunk/dports</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/112161">112161</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2013-10-14 05:45:56 -0700 (Mon, 14 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>wxWidgets-3.0, wxPython-3.0, py-wxpython-3.0: upgrade to 3.0.0-rc1 &amp; 2.9.5.0 (#40727, #40743)

  * wxWidgets-3.0: upgrade from 2.9.5 to 3.0.0-rc1
  * wxPython-3.0, py27-wxpython-3.0: upgrade from 2.9.4.0 to 2.9.5.0
  * enable AUI by default (remove the +aui variant)
  * wxPython includes an upstream patch for #38850</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupwxWidgets10tcl">trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30Portfile">trunk/dports/graphics/wxWidgets-3.0/Portfile</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchconfigurediff">trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchsdldiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff</a></li>
<li><a href="#trunkdportspythonpywxpython30Portfile">trunk/dports/python/py-wxpython-3.0/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchconfigure295diff">trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchupstreamsrcosxcocoawindowmmdiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchincludewxmathhdiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchsrcosxcocoawindowmmdiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchupstreampsndiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupwxWidgets10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -87,11 +87,11 @@
</span><span class="cx">         wxWidgets.port      &quot;wxgtk-2.8&quot;
</span><span class="cx">     } elseif {${args} == &quot;wxGTK-3.0&quot;} {
</span><span class="cx">         wxWidgets.name      &quot;wxGTK&quot;
</span><del>-        wxWidgets.version   &quot;2.9&quot;
</del><ins>+        wxWidgets.version   &quot;3.0&quot;
</ins><span class="cx">         wxWidgets.port      &quot;wxgtk-3.0&quot;
</span><span class="cx">     } elseif {${args} == &quot;wxWidgets-3.0&quot;} {
</span><span class="cx">         wxWidgets.name      &quot;wxWidgets&quot;
</span><del>-        wxWidgets.version   &quot;2.9&quot;
</del><ins>+        wxWidgets.version   &quot;3.0&quot;
</ins><span class="cx">         wxWidgets.port      &quot;wxWidgets-3.0&quot;
</span><span class="cx">         if {${os.major} &lt; 9} {
</span><span class="cx">             pre-fetch {
</span></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/Portfile        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> name                wxWidgets-3.0
</span><span class="cx"> subport             wxPython-3.0 {}
</span><span class="cx"> subport             wxgtk-3.0 {}
</span><del>-version             2.9.5
-revision            1
</del><ins>+version             3.0.0
+set version_rc      ${version}-rc1
</ins><span class="cx"> 
</span><span class="cx"> set installname     wxWidgets
</span><span class="cx"> set wxtype          osx_cocoa
</span><span class="lines">@@ -19,7 +19,8 @@
</span><span class="cx">     wxWidgets.use   wxWidgets-3.0
</span><span class="cx"> } elseif {$subport == &quot;wxPython-3.0&quot;} {
</span><span class="cx">     wxWidgets.use   wxPython-3.0
</span><del>-    version         2.9.4
</del><ins>+    version         2.9.5
+    set version_rc  ${version}
</ins><span class="cx"> } elseif {$subport == &quot;wxgtk-3.0&quot;} {
</span><span class="cx">     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
</span><span class="cx">     # wxgtk-3.0 is here mainly for testing purposes
</span><span class="lines">@@ -43,18 +44,20 @@
</span><span class="cx"> 
</span><span class="cx"> homepage            http://www.wxwidgets.org/
</span><span class="cx"> distname            wxWidgets
</span><del>-master_sites        sourceforge:project/wxwindows/${version} \
-                    http://biolpc22.york.ac.uk/pub/${version}/ \
</del><ins>+master_sites        sourceforge:project/wxwindows/${version_rc} \
+                    http://biolpc22.york.ac.uk/pub/${version_rc}/ \
</ins><span class="cx">                     http://trac.macports.org/raw-attachment/ticket/19190/:trac
</span><span class="cx"> 
</span><span class="cx"> use_bzip2           yes
</span><span class="cx"> 
</span><del>-distfiles           ${distname}-${version}${extract.suffix}
</del><ins>+distfiles           ${distname}-${version_rc}${extract.suffix}
</ins><span class="cx"> dist_subdir         ${distname}/${version}
</span><span class="cx"> 
</span><del>-checksums           rmd160  f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
-                    sha256  b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02
</del><ins>+checksums           ${distname}-${version_rc}${extract.suffix} \
+                    rmd160  ff4140476d9fce142b2b53a20ba6c6362dd92c6b \
+                    sha256  4b54bf4c4635f936a3c4dcb2bfccf6bf10df80f993c0dce5ec0318c46a22a25a
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> depends_lib         port:jpeg \
</span><span class="cx">                     port:tiff \
</span><span class="cx">                     port:libpng \
</span><span class="lines">@@ -67,12 +70,10 @@
</span><span class="cx"> select.group        wxWidgets
</span><span class="cx"> select.file         ${filespath}/${subport}
</span><span class="cx"> 
</span><del>-worksrcdir          ${distname}-${version}/build
</del><ins>+worksrcdir          ${distname}-${version_rc}/build
</ins><span class="cx"> 
</span><span class="cx"> patch.dir           ${worksrcpath}/..
</span><span class="cx"> 
</span><del>-# without (the second part of) this patch wxrc-2.9 ends up linking to libraries in workdir
-# http://trac.wxwidgets.org/ticket/15452
</del><span class="cx"> patchfiles-append   patch-configure.diff
</span><span class="cx"> 
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -89,6 +90,7 @@
</span><span class="cx">                     --with-opengl \
</span><span class="cx">                     --with-cocoa \
</span><span class="cx">                     --without-sdl \
</span><ins>+                    --enable-aui \
</ins><span class="cx">                     --disable-sdltest \
</span><span class="cx">                     --enable-unicode \
</span><span class="cx">                     --enable-display \
</span><span class="lines">@@ -98,26 +100,25 @@
</span><span class="cx">                     --with-macosx-version-min=no
</span><span class="cx"> 
</span><span class="cx"> if {$subport == &quot;wxPython-3.0&quot;} {
</span><del>-    set wxpythonsubset      wxPython-2.9.4.0-MacPorts-subset
</del><ins>+    set wxpythonsubset      wxPython-2.9.5.0-MacPorts-subset
</ins><span class="cx">     distfiles-append        ${wxpythonsubset}${extract.suffix}:trac
</span><span class="cx"> 
</span><del>-    # patch-src-osx-cocoa-window.mm.diff: http://trac.wxwidgets.org/changeset/72195 (only needed for 2.9.4)
-    # patch-include-wx-math.h.diff:       http://trac.wxwidgets.org/changeset/74456 (only needed for 2.9.4)
-    patchfiles-append       patch-src-osx-cocoa-window.mm.diff \
-                            patch-include-wx-math.h.diff
-
</del><span class="cx">     description             wxWidgets ${branch} for the wxPython distribution
</span><span class="cx">     long_description        The port installs wxWidgets ${branch} for wxPython \
</span><span class="cx">                             to guarantee compatibility even when the upstream versions \
</span><span class="cx">                             of wxWidgets and wxPython differ.
</span><span class="cx"> 
</span><span class="cx">     checksums               ${distname}-${version}${extract.suffix} \
</span><del>-                            rmd160  62301f8ce39a8aa96e65318f9d1e947c9dc09c50 \
-                            sha256  6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12 \
</del><ins>+                            rmd160  f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
+                            sha256  b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02 \
</ins><span class="cx">                             ${wxpythonsubset}${extract.suffix} \
</span><del>-                            rmd160  7831cee8185c521d8b565b56555b3005dee1d53d \
-                            sha256  971b644768d4010b38acf7232deb8cf3c91921ca8b09dec82c1616b93c751f4c
</del><ins>+                            rmd160  936858d5856adde043d107164b1b53d3209eb76d \
+                            sha256  c892f257b151726a70886c7cffda51554b48b8e9cc7cfcc962d6988c5fe81856
</ins><span class="cx"> 
</span><ins>+    patchfiles-delete       patch-configure.diff
+    patchfiles-append       patch-configure295.diff \
+                            patch-upstream-src-osx-cocoa-window.mm.diff
+
</ins><span class="cx">     post-destroot {
</span><span class="cx">         # copy a subset of wxPython to wxWidgets to prevent a conflict
</span><span class="cx">         # between py2X-wxpython-3.0 and py2Y-wxpython-3.0
</span><span class="lines">@@ -127,12 +128,9 @@
</span><span class="cx">     livecheck.type          none
</span><span class="cx"> } elseif {$subport == &quot;wxgtk-3.0&quot;} {
</span><span class="cx">     # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
</span><del>-    # and might need changes for wxWidgets 2.9.4
</del><span class="cx">     #
</span><span class="cx">     # patch-sdl.diff: the patch allows using --wxth-sdl
</span><del>-    # patch-upstream-psn.diff: http://trac.wxwidgets.org/changeset/74703
-    patchfiles-append       patch-sdl.diff \
-                            patch-upstream-psn.diff
</del><ins>+    patchfiles-append       patch-sdl.diff
</ins><span class="cx"> 
</span><span class="cx">     depends_build-append    path:bin/pkg-config:pkgconfig
</span><span class="cx">     depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
</span><span class="lines">@@ -214,10 +212,6 @@
</span><span class="cx">                             --enable-std_string_conv_in_wxstring
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant aui description {add support for AUI docking library} {
-    configure.args-append   --enable-aui
-}
-
</del><span class="cx"> livecheck.type      regex
</span><span class="cx"> livecheck.url       ${homepage}/downloads/
</span><span class="cx"> livecheck.regex     Release.*(\[23\]\\.\[0-9\]\\.\[0-9\]+)
</span></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.diff (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.diff        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -1,8 +1,7 @@
</span><del>-The first part is for GTK and makes sure that the port finds the right OpenGL library
-The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452)
</del><ins>+This patch is needed for GTK to make sure that the port finds the right OpenGL library
</ins><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><del>-@@ -22038,48 +22038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</del><ins>+@@ -21900,48 +21900,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</ins><span class="cx">  
</span><span class="cx">  
</span><span class="cx">  
</span><span class="lines">@@ -52,28 +51,3 @@
</span><span class="cx">  
</span><span class="cx">  { $as_echo &quot;$as_me:${as_lineno-$LINENO}: checking for libraries directories&quot; &gt;&amp;5
</span><span class="cx">  $as_echo_n &quot;checking for libraries directories... &quot; &gt;&amp;6; }
</span><del>-@@ -29402,24 +29361,6 @@ rm -f core conftest.err conftest.$ac_objext \
-       ;;

-       *-*-darwin* )
--        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
--        if test &quot;$install_name_tool&quot; -a -x &quot;$install_name_tool&quot;; then
--            DYLIB_RPATH_POSTLINK=&quot;${HOST_PREFIX}install_name_tool -id \$@ \$@&quot;
--            cat &lt;&lt;EOF &gt;change-install-names
--#!/bin/sh
--libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
--for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
--    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
--    done
--done
--EOF
--            chmod +x change-install-names
--            DYLIB_RPATH_INSTALL=&quot;\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}&quot;
--        fi
--
--                                        HEADER_PAD_OPTION=&quot;-headerpad_max_install_names&quot;
-       ;;

-       *-*-cygwin* | *-*-mingw32* )
</del></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchconfigure295difffromrev112085trunkdportsgraphicswxWidgets30filespatchconfigurediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff (from rev 112085, trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.diff) (0 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff                                (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+The first part is for GTK and makes sure that the port finds the right OpenGL library
+The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452)
+--- configure.orig
++++ configure
+@@ -22038,48 +22038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



+-SEARCH_INCLUDE=&quot;\
+-    /usr/local/include        \
+-    /usr/local/X11/include    \
+-    /usr/local/include/X11    \
+-    /usr/local/X11R7/include  \
+-    /usr/local/X11R6/include  \
+-    /usr/local/include/X11R7  \
+-    /usr/local/include/X11R6  \
+-                              \
+-    /usr/Motif-2.1/include    \
+-    /usr/Motif-1.2/include    \
+-    /usr/include/Motif1.2     \
+-                              \
+-    /usr/dt/include           \
+-    /usr/openwin/include      \
+-                              \
+-    /usr/include/Xm           \
+-                              \
+-    /usr/X11R7/include        \
+-    /usr/X11R6/include        \
+-    /usr/X11R6.4/include      \
+-                              \
+-    /usr/include/X11R7        \
+-    /usr/include/X11R6        \
+-                              \
+-    /usr/X11/include          \
+-    /usr/include/X11          \
+-                              \
+-    /usr/XFree86/include/X11  \
+-    /usr/pkg/include          \
+-                              \
+-    /usr/local/X1R5/include  \
+-    /usr/local/include/X11R5  \
+-    /usr/X11R5/include        \
+-    /usr/include/X11R5        \
+-                              \
+-    /usr/local/X11R4/include  \
+-    /usr/local/include/X11R4  \
+-    /usr/X11R4/include        \
+-    /usr/include/X11R4        \
+-                              \
+-    /usr/openwin/share/include&quot;
++SEARCH_INCLUDE=&quot;@@PREFIX@@/include&quot;

+ { $as_echo &quot;$as_me:${as_lineno-$LINENO}: checking for libraries directories&quot; &gt;&amp;5
+ $as_echo_n &quot;checking for libraries directories... &quot; &gt;&amp;6; }
+@@ -29402,24 +29361,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       ;;

+       *-*-darwin* )
+-        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
+-        if test &quot;$install_name_tool&quot; -a -x &quot;$install_name_tool&quot;; then
+-            DYLIB_RPATH_POSTLINK=&quot;${HOST_PREFIX}install_name_tool -id \$@ \$@&quot;
+-            cat &lt;&lt;EOF &gt;change-install-names
+-#!/bin/sh
+-libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+-for i in \${libnames} ; do
+-    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
+-    for dep in \${libnames} ; do
+-        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
+-    done
+-done
+-EOF
+-            chmod +x change-install-names
+-            DYLIB_RPATH_INSTALL=&quot;\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}&quot;
+-        fi
+-
+-                                        HEADER_PAD_OPTION=&quot;-headerpad_max_install_names&quot;
+       ;;

+       *-*-cygwin* | *-*-mingw32* )
</ins></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchincludewxmathhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>-Upstream: http://trac.wxwidgets.org/changeset/74456
---- include/wx/math.h (revision 73280)
-+++ include/wx/math.h (revision 74456)
-@@ -62,7 +62,12 @@
-         add more compilers with C99 support here: using C99 isfinite() is
-         preferable to using BSD-ish finite()
-      */
--    #define wxFinite(x) isfinite(x)
-+    #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH)
-+        // these &lt;cmath&gt; headers #undef isfinite
-+        #define wxFinite(x) std::isfinite(x)
-+    #else
-+        #define wxFinite(x) isfinite(x)
-+    #endif
- #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
-       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
-       defined(__HPUX__) ) &amp;&amp; ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
</del></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchsdldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> http://trac.wxwidgets.org/ticket/15453
</span><span class="cx"> --- Makefile.in.orig
</span><span class="cx"> +++ Makefile.in
</span><del>-@@ -6719,8 +6719,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
</del><ins>+@@ -6725,8 +6725,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
</ins><span class="cx">  @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
</span><span class="cx">  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
</span><span class="cx">  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@        = monodll_tabartgtk.o
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">  @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
</span><span class="cx">  @COND_USE_STC_1@__wxscintilla_library_link_DEP = $(__wxscintilla___depname)
</span><span class="cx">  @COND_USE_STC_1@__wxscintilla_library_link_LIBR = -L$(LIBDIRNAME)
</span><del>-@@ -8970,8 +8970,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
</del><ins>+@@ -8975,8 +8975,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
</ins><span class="cx">  @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
</span><span class="cx">  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
</span><span class="cx">  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@        = monolib_tabartgtk.o
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">  COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
</span><span class="cx">          $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
</span><span class="cx">  @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
</span><del>-@@ -13111,8 +13111,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
</del><ins>+@@ -13114,8 +13114,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
</ins><span class="cx">  @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
</span><span class="cx">  @COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
</span><span class="cx">  @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
</span><span class="cx">          $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
</span><span class="cx">  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
</span><del>-@@ -13424,8 +13424,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
</del><ins>+@@ -13427,8 +13427,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
</ins><span class="cx">  @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</span><span class="cx">  @COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</span><span class="cx">  @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</span></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchsrcosxcocoawindowmmdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-Upstream: http://trac.wxwidgets.org/changeset/72195
---- src/osx/cocoa/window.mm (revision 72169)
-+++ src/osx/cocoa/window.mm (revision 72195)
-@@ -456,4 +456,9 @@
- - (CGFloat)deviceDeltaX;
- - (CGFloat)deviceDeltaY;
-+
-+// 10.7+
-+- (BOOL)hasPreciseScrollingDeltas;
-+- (CGFloat)scrollingDeltaX;
-+- (CGFloat)scrollingDeltaY;
- @end

-@@ -610,21 +615,37 @@
-             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;

--            // see http://developer.apple.com/qa/qa2005/qa1453.html
--            // for more details on why we have to look for the exact type
--            
--            const EventRef cEvent = (EventRef) [nsEvent eventRef];
--            bool isMouseScrollEvent = false;
--            if ( cEvent )
--                isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
--                
--            if ( isMouseScrollEvent )
-+            if ( UMAGetSystemVersion() &gt;= 0x1070 )
-             {
--                deltaX = [nsEvent deviceDeltaX];
--                deltaY = [nsEvent deviceDeltaY];
-+                if ( [nsEvent hasPreciseScrollingDeltas] )
-+                {
-+                    deltaX = [nsEvent scrollingDeltaX];
-+                    deltaY = [nsEvent scrollingDeltaY];
-+                }
-+                else
-+                {
-+                    deltaX = [nsEvent scrollingDeltaX] * 10;
-+                    deltaY = [nsEvent scrollingDeltaY] * 10;
-+                }
-             }
-             else
-             {
--                deltaX = ([nsEvent deltaX] * 10);
--                deltaY = ([nsEvent deltaY] * 10);
-+                const EventRef cEvent = (EventRef) [nsEvent eventRef];
-+                // see http://developer.apple.com/qa/qa2005/qa1453.html
-+                // for more details on why we have to look for the exact type
-+
-+                bool isMouseScrollEvent = false;
-+                if ( cEvent )
-+                    isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
-+
-+                if ( isMouseScrollEvent )
-+                {
-+                    deltaX = [nsEvent deviceDeltaX];
-+                    deltaY = [nsEvent deviceDeltaY];
-+                }
-+                else
-+                {
-+                    deltaX = ([nsEvent deltaX] * 10);
-+                    deltaY = ([nsEvent deltaY] * 10);
-+                }
-             }
-             
</del></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchupstreampsndiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-Upstream: http://trac.wxwidgets.org/changeset/74703
---- src/common/appcmn.cpp.orig
-+++ src/common/appcmn.cpp
-@@ -84,6 +84,27 @@ wxAppBase::wxAppBase()

- bool wxAppBase::Initialize(int&amp; argcOrig, wxChar **argvOrig)
- {
-+#ifdef __WXOSX__
-+    // Mac OS X passes a process serial number command line argument when
-+    // the application is launched from the Finder. This argument must be
-+    // removed from the command line arguments before being handled by the
-+    // application (otherwise applications would need to handle it)
-+    //
-+    // Notice that this has to be done for all ports that can be used under OS
-+    // X (e.g. wxGTK) and not just wxOSX itself, hence this code is here and
-+    // not in a port-specific file.
-+    if ( argcOrig &gt; 1 )
-+    {
-+        static const wxChar *ARG_PSN = wxT(&quot;-psn_&quot;);
-+        if ( wxStrncmp(argvOrig[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
-+        {
-+            // remove this argument
-+            --argcOrig;
-+            memmove(argvOrig + 1, argvOrig + 2, argcOrig * sizeof(wxChar*));
-+        }
-+    }
-+#endif // __WXOSX__
-+
-     if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
-         return false;

---- src/osx/carbon/app.cpp.orig
-+++ src/osx/carbon/app.cpp
-@@ -795,21 +795,6 @@ bool wxApp::Initialize(int&amp; argc, wxChar **argv)
-     InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
- #endif

--    // Mac OS X passes a process serial number command line argument when
--    // the application is launched from the Finder. This argument must be
--    // removed from the command line arguments before being handled by the
--    // application (otherwise applications would need to handle it)
--    if ( argc &gt; 1 )
--    {
--        static const wxChar *ARG_PSN = wxT(&quot;-psn_&quot;);
--        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
--        {
--            // remove this argument
--            --argc;
--            memmove(argv + 1, argv + 2, argc * sizeof(wxChar*));
--        }
--    }
--
-     /*
-      Cocoa supports -Key value options which set the user defaults key &quot;Key&quot;
-      to the value &quot;value&quot;  Some of them are very handy for debugging like
</del></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchupstreamsrcosxcocoawindowmmdifffromrev112085trunkdportsgraphicswxWidgets30filespatchsrcosxcocoawindowmmdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.diff (from rev 112085, trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff) (0 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.diff                                (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.diff        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -0,0 +1,280 @@
</span><ins>+http://trac.wxwidgets.org/ticket/15345
+http://trac.wxwidgets.org/changeset/74613
+http://trac.wxwidgets.org/changeset/74945
+
+--- include/wx/osx/cocoa/private.h.orig
++++ include/wx/osx/cocoa/private.h
+@@ -161,6 +161,7 @@ public :
+     virtual void                cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd);
+     virtual void                keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
+     virtual void                insertText(NSString* text, WXWidget slf, void* _cmd);
++    virtual void                doCommandBySelector(void* sel, WXWidget slf, void* _cmd);
+     virtual bool                performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd);
+     virtual bool                acceptsFirstResponder(WXWidget slf, void* _cmd);
+     virtual bool                becomeFirstResponder(WXWidget slf, void* _cmd);
+--- src/osx/cocoa/window.mm.orig
++++ src/osx/cocoa/window.mm
+@@ -110,6 +110,22 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint&amp; pos , const

+ @end // wxNSView

++@interface wxNSView(TextInput) &lt;NSTextInputClient&gt;
++
++- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange;
++- (void)doCommandBySelector:(SEL)aSelector;
++- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
++- (void)unmarkText;
++- (NSRange)selectedRange;
++- (NSRange)markedRange;
++- (BOOL)hasMarkedText;
++- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
++- (NSArray*)validAttributesForMarkedText;
++- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
++- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint;
++
++@end
++
+ @interface NSView(PossibleMethods)
+ - (void)setTitle:(NSString *)aString;
+ - (void)setStringValue:(NSString *)aString;
+@@ -837,6 +853,73 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &amp;wxevent , NSEvent * nsEve

+ @end // wxNSView

++// We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.
++// Currently, only insertText:(replacementRange:) is
++// implemented here, and the rest of the methods are stubs.
++// It is hoped that someday IME-related functionality is implemented in
++// wxWidgets and the methods of this protocol are fully working.
++
++@implementation wxNSView(TextInput)
++
++void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text);
++
++- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
++{
++    wxOSX_insertText(self, @selector(insertText:), aString);
++}
++
++- (void)doCommandBySelector:(SEL)aSelector
++{
++    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
++    if (impl)
++        impl-&gt;doCommandBySelector(aSelector, self, _cmd);
++}
++
++- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
++{
++}
++
++- (void)unmarkText
++{
++}
++
++- (NSRange)selectedRange
++{    
++    return NSMakeRange(NSNotFound, 0);
++}
++
++- (NSRange)markedRange
++{
++    return NSMakeRange(NSNotFound, 0);
++}
++
++- (BOOL)hasMarkedText
++{
++    return NO;
++}
++
++- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
++{
++    return nil;
++}
++
++- (NSArray*)validAttributesForMarkedText
++{
++    return nil;
++}
++
++- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
++{
++    return NSMakeRect(0, 0, 0, 0);
++}
++- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
++{
++    return NSNotFound;
++}
++
++@end // wxNSView(TextInput)
++
++
+ //
+ // event handlers
+ //
+@@ -1286,13 +1369,80 @@ void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)

+ void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
+ {
+-    if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) )
++    bool result = false;
++    if ( IsUserPane() &amp;&amp; !m_hasEditor &amp;&amp; [text length] &gt; 0)
++    {
++        if ( m_lastKeyDownEvent!=NULL &amp;&amp; [text isEqualToString:[m_lastKeyDownEvent characters]])
++        {
++            // If we have a corresponding key event, send wxEVT_KEY_DOWN now.
++            // (see also: wxWidgetCocoaImpl::DoHandleKeyEvent)
++            {
++                wxKeyEvent wxevent(wxEVT_KEY_DOWN);
++                SetupKeyEvent( wxevent, m_lastKeyDownEvent );
++                result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent);
++            }
++
++            // ...and wxEVT_CHAR.
++            result = result || DoHandleCharEvent(m_lastKeyDownEvent, text);
++        }
++        else
++        {
++            // If we don't have a corresponding key event (e.g. IME-composed
++            // characters), send wxEVT_CHAR without sending wxEVT_KEY_DOWN.
++            for (NSUInteger i = 0; i &lt; [text length]; ++i)
++            {
++                wxKeyEvent wxevent(wxEVT_CHAR);
++                wxevent.m_shiftDown = wxevent.m_controlDown = wxevent.m_altDown = wxevent.m_metaDown = false;
++                wxevent.m_rawCode = 0;
++                wxevent.m_rawFlags = 0;
++                wxevent.SetTimestamp();
++                unichar aunichar = [text characterAtIndex:i];
++                wxevent.m_uniChar = aunichar;
++                wxevent.m_keyCode = aunichar &lt; 0x80 ? aunichar : WXK_NONE;
++                wxWindowMac* peer = GetWXPeer();
++                if ( peer )
++                {
++                    wxevent.SetEventObject(peer);
++                    wxevent.SetId(peer-&gt;GetId());
++                }
++                result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent) || result;
++            }
++        }
++    }
++    if ( !result )
+     {
+         wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+         superimpl(slf, (SEL)_cmd, text);
+     }
+ }

++void wxWidgetCocoaImpl::doCommandBySelector(void* sel, WXWidget slf, void* _cmd)
++{
++    if ( m_lastKeyDownEvent!=NULL )
++    {
++        // If we have a corresponding key event, send wxEVT_KEY_DOWN now.
++        // (see also: wxWidgetCocoaImpl::DoHandleKeyEvent)
++        wxKeyEvent wxevent(wxEVT_KEY_DOWN);
++        SetupKeyEvent( wxevent, m_lastKeyDownEvent );
++        bool result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent);
++
++        if (!result)
++        {
++            // Generate wxEVT_CHAR if wxEVT_KEY_DOWN is not handled.
++
++            long keycode = wxOSXTranslateCocoaKey( m_lastKeyDownEvent, wxEVT_CHAR );
++
++            wxKeyEvent wxevent2(wxevent) ;
++            wxevent2.SetEventType(wxEVT_CHAR);
++            SetupKeyEvent( wxevent2, m_lastKeyDownEvent );
++            if ( (keycode &gt; 0 &amp;&amp; keycode &lt; WXK_SPACE) || keycode == WXK_DELETE || keycode &gt;= WXK_START )
++            {
++                wxevent2.m_keyCode = keycode;
++            }
++            GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent2);
++        }
++    }
++}

+ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
+ {
+@@ -2555,10 +2705,18 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )

+ bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
+ {
+-    wxKeyEvent wxevent(wxEVT_CHAR);
+-    SetupKeyEvent( wxevent, event, text );
++    bool result = false;
++    
++    for (NSUInteger i = 0; i &lt; [text length]; ++i)
++    {
++        wxKeyEvent wxevent(wxEVT_CHAR);
++        unichar c = [text characterAtIndex:i];
++        SetupKeyEvent( wxevent, event, [NSString stringWithCharacters:&amp;c length:1]);

+-    return GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent);
++        result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent) || result;
++    }
++    
++    return result;
+ }

+ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
+@@ -2577,48 +2735,23 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
+             return true;
+     }

+-    bool result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent);
+-
+-    // this will fire higher level events, like insertText, to help
+-    // us handle EVT_CHAR, etc.
++    if ( IsUserPane() &amp;&amp; [event type] == NSKeyDown)
++    {
++        // Don't fire wxEVT_KEY_DOWN here in order to allow IME to intercept
++        // some key events. If the event is not handled by IME, either
++        // insertText: or doCommandBySelector: is called, so we send
++        // wxEVT_KEY_DOWN and wxEVT_CHAR there.

+-    if ( !result )
++        if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
++            [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
++        else
++            [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
++        return true;
++    }
++    else
+     {
+-        if ( [event type] == NSKeyDown)
+-        {
+-            long keycode = wxOSXTranslateCocoaKey( event, wxEVT_CHAR );
+-            
+-            if ( (keycode &gt; 0 &amp;&amp; keycode &lt; WXK_SPACE) || keycode == WXK_DELETE || keycode &gt;= WXK_START )
+-            {
+-                // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
+-                wxKeyEvent wxevent2(wxevent) ;
+-                wxevent2.SetEventType(wxEVT_CHAR);
+-                SetupKeyEvent( wxevent2, event );
+-                wxevent2.m_keyCode = keycode;
+-                result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent2);
+-            }
+-            else if (wxevent.CmdDown())
+-            {
+-                wxKeyEvent wxevent2(wxevent) ;
+-                wxevent2.SetEventType(wxEVT_CHAR);
+-                SetupKeyEvent( wxevent2, event );
+-                result = GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent2);
+-            }
+-            else
+-            {
+-                if ( IsUserPane() &amp;&amp; !wxevent.CmdDown() )
+-                {
+-                    if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+-                        [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+-                    else
+-                        [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+-                    result = true;
+-                }
+-            }
+-        }
++        return GetWXPeer()-&gt;OSXHandleKeyEvent(wxevent);
+     }
+-
+-    return result;
+ }

+ bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
</ins></span></pre></div>
<a id="trunkdportspythonpywxpython30Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-wxpython-3.0/Portfile (112160 => 112161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-wxpython-3.0/Portfile        2013-10-14 11:11:15 UTC (rev 112160)
+++ trunk/dports/python/py-wxpython-3.0/Portfile        2013-10-14 12:45:56 UTC (rev 112161)
</span><span class="lines">@@ -6,7 +6,8 @@
</span><span class="cx"> PortGroup           wxWidgets   1.0
</span><span class="cx"> 
</span><span class="cx"> name                py-wxpython-3.0
</span><del>-version             2.9.4.0
</del><ins>+version             2.9.5.0
+set wx_version      [join [lrange [split ${version} .] 0 2] .]
</ins><span class="cx"> set branch          [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories-append   graphics devel
</span><span class="cx"> license             wxwidgets-3.1
</span><span class="lines">@@ -27,21 +28,24 @@
</span><span class="cx"> distname            wxPython
</span><span class="cx"> use_bzip2           yes
</span><span class="cx"> 
</span><del>-checksums           rmd160  35e823d9161dc99083f3025383567000680e012f \
-                    sha256  78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be
</del><ins>+checksums           rmd160  4d54edc5437fbe14e552bfc6feeeb4fb74d10cd0 \
+                    sha256  1a5b7e771eff467538d0834136188e8a7506a4fe6e85d0a46c40158cdbd4c48c
</ins><span class="cx"> 
</span><span class="cx"> python.versions     27
</span><span class="cx"> python.default_version 27
</span><span class="cx"> 
</span><span class="cx"> distfiles           ${distname}-src-${version}${extract.suffix}
</span><del>-dist_subdir         ${distname}/${version}
</del><span class="cx"> worksrcdir          ${distname}-src-${version}/wxPython
</span><ins>+dist_subdir         wxWidgets/${wx_version}
</ins><span class="cx"> 
</span><span class="cx"> # extract just the docs and wxPython subdir
</span><span class="cx"> extract.post_args   &quot;| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs&quot;
</span><span class="cx"> 
</span><span class="cx"> if {$subport != $name} {
</span><span class="cx">     conflicts           py${python.version}-wxpython-2.8
</span><ins>+    # As long as wxPython and wxWidgets are at the same version,
+    # this port could also depend on wxWidgets-3.0.
+    # A separate port is there just because wxPython usually lags behind.
</ins><span class="cx">     wxWidgets.use       wxPython-3.0
</span><span class="cx">     depends_lib-append  port:${wxWidgets.port}
</span><span class="cx"> 
</span><span class="lines">@@ -52,7 +56,11 @@
</span><span class="cx">     destroot.cmd    ${python.bin} setup.py WX_CONFIG=&quot;${wxWidgets.wxconfig}&quot;
</span><span class="cx"> 
</span><span class="cx">     post-destroot {
</span><del>-        # this has already been added by wxWidgets
</del><ins>+        # When a new release of wxPython comes out, the contents of
+        # ${destroot}${wxWidgets.prefix}/Versions/wxPython/${branch}/include/wx-${branch}/wx/wxPython
+        # should be stored separately into wxPython-${version}-MacPorts-subset.tar.bz2
+        # to be extracted/installed by wxPython-3.0 rather than this port.
+        # This allows parallel installation of several versions of py**-wxpython-3.0.
</ins><span class="cx">         delete      ${destroot}${wxWidgets.prefix}
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>