wxWidgets-2.8.11

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

wxWidgets-2.8.11

David Coppa
Hi,

This diff updates wxWidgets to its latest stable release.

A short summary of what I've done:

Adjusted WANTLIB
Tightened CONFIGURE_ARGS
Removed "mmedia" contrib library (see comments inside the patch)
Zapped useless patches
Corrected handling of thread priority min/max
Fixed regress target
Various nits fixed here and there

Besides the several bugfixes, this release also fixes a problem with
garbled fonts (maybe related to cairo-1.10.0, but not the xlib-xcb one)
that I was experiencing when using the aMule GUI.

There are some tests that still fail... No sufficient time and power to
further investigate. I've seen a load of improvements to the testsuite
in upstream trunk: maybe things are better in latest snapshots
(btw 9 failures over 902 tests it's not a big deal ;) )

Cheers,
David

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 24 Oct 2010 21:15:35 -0000 1.27
+++ Makefile 29 Oct 2010 07:36:39 -0000
@@ -4,10 +4,9 @@ SHARED_ONLY= Yes
 
 COMMENT= c++ cross-platform GUI toolkit
 
-V= 2.8.10
+V= 2.8.11
 DISTNAME= wxWidgets-${V}
 PKGNAME= wxWidgets-gtk2-${V}
-REVISION= 4
 
 SHARED_LIBS= wx_base 2.0 \
  wx_base_net 2.0 \
@@ -22,7 +21,6 @@ SHARED_LIBS= wx_base 2.0 \
  wx_gtk2_gizmos_xrc 2.0 \
  wx_gtk2_gl 2.0 \
  wx_gtk2_html 2.0 \
- wx_gtk2_mmedia 2.0 \
  wx_gtk2_ogl 2.0 \
  wx_gtk2_plot 2.0 \
  wx_gtk2_qa 2.0 \
@@ -50,38 +48,49 @@ BUILD_DEPENDS= ::devel/cppunit
 LIB_DEPENDS= ::archivers/libmspack \
  ::devel/sdl \
  ::x11/gtk+2 \
- ::databases/iodbc \
- ::audio/esound
+ ::databases/iodbc
 
 WANTLIB += GL GLU SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
-WANTLIB += c expat fontconfig freetype gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ossaudio esd
-WANTLIB += pango-1.0 pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
-WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-render-util mspack
+WANTLIB += c drm expat fontconfig freetype gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m pango-1.0
+WANTLIB += pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
+WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-shm mspack
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
 
 AUTOCONF_VERSION=2.59
 CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include"
+ CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
+ ac_cv_lib_esd_esd_close=no
 CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ARGS= --disable-stl \
- --with-odbc \
- --with-libjpeg \
- --with-libtiff \
- --with-expat \
- --with-sdl \
+CONFIGURE_ARGS= --with-expat=sys \
+ --with-odbc=sys \
+ --with-libjpeg=sys \
+ --with-libpng=sys \
+ --with-libtiff=sys \
+ --with-libxpm=sys \
+ --with-zlib=sys \
+ --with-regex=builtin \
  --with-gtk \
+ --with-opengl \
+ --with-sdl \
  --without-gnomeprint \
+ --without-gnomevfs \
  --without-hildon \
- --with-opengl \
+ --enable-gui \
+ --enable-sound \
+ --enable-unicode \
  --disable-backtrace \
- --enable-unicode
+ --disable-stl
 
 .for _l _v in ${SHARED_LIBS}
 MAKE_ENV+= LIB${_l}_VERSION=${_v}
 .endfor
 
 MAKE_FLAGS= WXUNICODEFLAG=""
+
+do-regress:
+ @cd ${WRKSRC}/tests && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} && ./test
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 10 Sep 2009 21:23:28 -0000 1.7
+++ distinfo 29 Oct 2010 07:36:39 -0000
@@ -1,5 +1,5 @@
-MD5 (wxWidgets-2.8.10.tar.gz) = BbMsoFFlH0sYhakPYpafrw==
-RMD160 (wxWidgets-2.8.10.tar.gz) = CWX8lYbyUM5wtRjpB8bsX9ujUTE=
-SHA1 (wxWidgets-2.8.10.tar.gz) = KipXEDBx+hWAh3rnF87XgObWQQE=
-SHA256 (wxWidgets-2.8.10.tar.gz) = SmVXO8EuFbIaSs3Oiefmtx7b4hSBdFf5D8+FUiC6/mY=
-SIZE (wxWidgets-2.8.10.tar.gz) = 19357950
+MD5 (wxWidgets-2.8.11.tar.gz) = zoA4nhtw1qUYyAt7cVt2Pg==
+RMD160 (wxWidgets-2.8.11.tar.gz) = 3k45vlS9x77F19ENnNotlXJ1kd8=
+SHA1 (wxWidgets-2.8.11.tar.gz) = lrT/gn1e2WAZ26gX6dZpWpsMFaA=
+SHA256 (wxWidgets-2.8.11.tar.gz) = Uk9R3WkQlnWHMNnEieMAlTorAb8T6ueDFaSh8IJonUU=
+SIZE (wxWidgets-2.8.11.tar.gz) = 19464848
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 2 May 2010 16:09:55 -0000 1.7
+++ patches/patch-Makefile_in 29 Oct 2010 07:36:42 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.7 2010/05/02 16:09:55 landry Exp $
---- Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ Makefile.in Sun May  2 11:17:20 2010
-@@ -1586,7 +1586,7 @@ LOCALE_MSW_LINGUAS =  it
+--- Makefile.in.orig Thu Apr 15 11:03:41 2010
++++ Makefile.in Wed Oct 27 13:47:32 2010
+@@ -1595,7 +1595,7 @@ LOCALE_MSW_LINGUAS =  it
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -6806,7 +6806,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
+@@ -6833,7 +6833,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
  COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll
  @COND_MONOLITHIC_0_SHARED_1@__uninstall_basedll___depname \
-@@ -7174,7 +7174,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
+@@ -7217,7 +7217,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_MAC@ baselib_carbon_utils.o baselib_uma.o
  COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
@@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll
  @COND_MONOLITHIC_0_SHARED_1@__uninstall_netdll___depname = uninstall_netdll
-@@ -7254,7 +7254,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
+@@ -7312,7 +7312,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
  @COND_PLATFORM_WIN32_1@ $(__NET_WINCE_SRC_OBJECTS_3)
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_3 = netlib_net.o
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
@@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_coredll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll
-@@ -10212,7 +10212,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
+@@ -10288,7 +10288,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
  corelib_x11_window.o
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
@@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
-@@ -10382,7 +10382,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
+@@ -10473,7 +10473,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
@@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__install_mediadll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ = install_mediadll
-@@ -10492,7 +10492,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
+@@ -10600,7 +10600,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_X11@ medialib_unix_mediactrl.o
  COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
@@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ = install_odbcdll
-@@ -10556,7 +10556,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depn
+@@ -10680,7 +10680,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depn
  @COND_USE_PCH_1@_____pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_odbclib/wx/wxprec.h.gch
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
@@ -73,7 +73,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_dbgriddll
-@@ -10620,7 +10620,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgr
+@@ -10761,7 +10761,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgr
  @COND_USE_PCH_1@_____pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_dbgridlib/wx/wxprec.h.gch
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
@@ -82,7 +82,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = install_htmldll
-@@ -10690,7 +10690,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___html
+@@ -10847,7 +10847,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___html
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
  @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
@@ -91,7 +91,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__install_qadll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ = install_qadll
-@@ -10754,7 +10754,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib_
+@@ -10926,7 +10926,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib_
  @COND_USE_PCH_1@_____pch_wxprec_qalib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_qalib/wx/wxprec.h.gch
  COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
@@ -100,7 +100,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
  @COND_MONOLITHIC_0_SHARED_1@__uninstall_xmldll___depname = uninstall_xmldll
-@@ -10814,7 +10814,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
+@@ -11001,7 +11001,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
  @COND_USE_PCH_1@_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_xmllib/wx/wxprec.h.gch
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
@@ -109,7 +109,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
-@@ -10878,7 +10878,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depnam
+@@ -11080,7 +11080,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depnam
  @COND_USE_PCH_1@_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_xrclib/wx/wxprec.h.gch
  COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
@@ -118,8 +118,8 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__auidll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__install_auidll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ = install_auidll
-@@ -10930,7 +10930,7 @@ COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cm
- @COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cmd)
+@@ -11147,7 +11147,7 @@ COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_
+ @COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
 - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -127,7 +127,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__install_auilib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
-@@ -10942,7 +10942,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depnam
+@@ -11159,7 +11159,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depnam
  @COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname = \
@@ -136,7 +136,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__richtextdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__install_richtextdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ = install_richtextdll
-@@ -11007,7 +11007,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextli
+@@ -11242,7 +11242,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextli
  @COND_USE_PCH_1@_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
@@ -145,7 +145,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
-@@ -11070,10 +11070,10 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd
+@@ -11320,10 +11320,10 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_c
  @COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_msw_glcanvas.o
  @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_x11_glcanvas.o
  COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
@@ -158,7 +158,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@@ -11442,7 +11442,12 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -11693,7 +11693,12 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  ### Targets: ###
 
  all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
@@ -171,7 +171,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
  $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
  (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-@@ -11455,13 +11460,14 @@ install: $(__install_wxregex___depname) $(__install_wx
+@@ -11706,13 +11711,14 @@ install: $(__install_wxregex___depname) $(__install_wx
  fi; \
  $(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
  done
@@ -190,7 +190,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @echo " "
  @echo " ------------------------------------------------------"
  @echo " "
-@@ -11669,7 +11675,7 @@ distclean: clean
+@@ -11920,7 +11926,7 @@ distclean: clean
  @COND_SHARED_0_wxUSE_EXPAT_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
  @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__monodll___win32rc)
@@ -199,7 +199,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_1_SHARED_1@
  @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
 
-@@ -11702,15 +11708,14 @@ distclean: clean
+@@ -11953,15 +11959,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_monolib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
 
@@ -218,7 +218,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll:
-@@ -11736,15 +11741,14 @@ distclean: clean
+@@ -11987,15 +11992,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_baselib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
 
@@ -237,7 +237,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll:
-@@ -11770,15 +11774,14 @@ distclean: clean
+@@ -12021,15 +12025,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_netlib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
 
@@ -256,7 +256,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll:
-@@ -11804,15 +11807,14 @@ distclean: clean
+@@ -12055,15 +12058,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_corelib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
 
@@ -275,7 +275,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll:
-@@ -11838,15 +11840,14 @@ distclean: clean
+@@ -12089,15 +12091,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_advlib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
 
@@ -294,7 +294,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll:
-@@ -11872,15 +11873,14 @@ distclean: clean
+@@ -12123,15 +12124,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_medialib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
 
@@ -313,7 +313,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@uninstall_odbcdll:
-@@ -11906,15 +11906,14 @@ distclean: clean
+@@ -12157,15 +12157,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_odbclib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
 
@@ -332,7 +332,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@uninstall_dbgriddll:
-@@ -11940,15 +11939,14 @@ distclean: clean
+@@ -12191,15 +12190,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_dbgridlib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
 
@@ -351,7 +351,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll:
-@@ -11974,15 +11972,14 @@ distclean: clean
+@@ -12225,15 +12223,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_htmllib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
 
@@ -370,7 +370,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll:
-@@ -12008,15 +12005,14 @@ distclean: clean
+@@ -12259,15 +12256,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_qalib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
 
@@ -389,7 +389,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll:
-@@ -12042,15 +12038,14 @@ distclean: clean
+@@ -12293,15 +12289,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_xmllib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
 
@@ -408,7 +408,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll:
-@@ -12076,15 +12071,14 @@ distclean: clean
+@@ -12327,15 +12322,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_xrclib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
 
@@ -427,7 +427,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll:
-@@ -12110,15 +12104,14 @@ distclean: clean
+@@ -12361,15 +12355,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_auilib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
 
@@ -446,13 +446,13 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd))
 
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll:
-@@ -12144,15 +12137,14 @@ distclean: clean
+@@ -12395,15 +12388,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_richtextlib/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
 
--@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
+-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
 -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
-+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(LIBwx_gtk2_gl_VERSION): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
++@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(LIBwx_gtk2_gl_VERSION): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
 +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
Index: patches/patch-autoconf_inc_m4
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-autoconf_inc_m4,v
retrieving revision 1.1
diff -u -p -r1.1 patch-autoconf_inc_m4
--- patches/patch-autoconf_inc_m4 10 Sep 2009 21:23:28 -0000 1.1
+++ patches/patch-autoconf_inc_m4 29 Oct 2010 07:36:42 -0000
@@ -1,26 +1,26 @@
 $OpenBSD: patch-autoconf_inc_m4,v 1.1 2009/09/10 21:23:28 landry Exp $
 Don't use evil ln -s between lib.so.x.y and lib.so.x and lib.so
---- autoconf_inc.m4.orig Fri Mar  6 13:10:54 2009
-+++ autoconf_inc.m4 Sun Sep  6 11:21:56 2009
-@@ -281,7 +281,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVE
- dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
-     COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
-     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
--        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
-+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
+--- autoconf_inc.m4.orig Wed Oct 27 12:30:11 2010
++++ autoconf_inc.m4 Wed Oct 27 12:32:43 2010
+@@ -275,7 +275,7 @@ dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_
+ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+     COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
+     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
+-        COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1=""
++        COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
      fi
-     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
- dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-@@ -851,7 +851,7 @@ dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/b
- dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
-     COND_USE_SOSYMLINKS_1="#"
-     if test "x$USE_SOSYMLINKS" = "x1" ; then
--        COND_USE_SOSYMLINKS_1=""
-+        COND_USE_SOSYMLINKS_1="#"
+     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1)
+ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+@@ -857,7 +857,7 @@ dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/b
+ dnl ### begin block 20_COND_USE_SOTWOSYMLINKS_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+     COND_USE_SOTWOSYMLINKS_1="#"
+     if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
+-        COND_USE_SOTWOSYMLINKS_1=""
++        COND_USE_SOTWOSYMLINKS_1="#"
      fi
-     AC_SUBST(COND_USE_SOSYMLINKS_1)
+     AC_SUBST(COND_USE_SOTWOSYMLINKS_1)
  dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
-@@ -867,7 +867,7 @@ dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../con
+@@ -873,7 +873,7 @@ dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../con
      fi
      AC_SUBST(COND_USE_SOVERLINUX_1)
  dnl ### begin block 20_COND_USE_SOVERSION_0[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-configure_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure_in
--- patches/patch-configure_in 10 Sep 2009 21:23:28 -0000 1.4
+++ patches/patch-configure_in 29 Oct 2010 07:36:42 -0000
@@ -1,6 +1,24 @@
 $OpenBSD: patch-configure_in,v 1.4 2009/09/10 21:23:28 landry Exp $
---- configure.in.orig Fri Mar  6 13:10:54 2009
-+++ configure.in Fri Sep  4 23:57:38 2009
+--- configure.in.orig Thu Apr 15 11:02:51 2010
++++ configure.in Thu Oct 28 16:27:20 2010
+@@ -3090,7 +3090,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
+             dnl HAVE_STDLIB_H which are already defined and this provokes
+             dnl a compiler warning which configure considers as an error...
+             AC_MSG_CHECKING(for jpeglib.h)
+-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
++            AC_CACHE_VAL(ac_cv_header_jpeglib_h,[
+                 AC_TRY_COMPILE(
+                     [
+                         #undef HAVE_STDLIB_H
+@@ -3102,7 +3102,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
+                     ac_cv_header_jpeglib_h=yes,
+                     ac_cv_header_jpeglib_h=no
+                 )
+-            )
++            ])
+             AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+
+             if test "$ac_cv_header_jpeglib_h" = "yes"; then
 @@ -4154,7 +4154,7 @@ if test "$TOOLKIT" != "MSW" ; then
 
          AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
@@ -54,41 +72,25 @@ $OpenBSD: patch-configure_in,v 1.4 2009/
  else
      AC_MSG_WARN([Wide character support is unavailable])
  fi
-@@ -6116,8 +6108,37 @@ if test "$USE_UNIX" = "1" ; then
-         ])
-     fi
+@@ -5609,8 +5601,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
+       dnl      (this one can be in either libpthread or libposix4 (under Solaris))
+       dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
+       HAVE_PRIOR_FUNCS=0
++      if test "$USE_OPENBSD" = 1; then
+       AC_CHECK_FUNC(pthread_attr_getschedpolicy,
+                      [AC_CHECK_FUNC(pthread_attr_setschedparam,
++                         HAVE_PRIOR_FUNCS=1)])
++      else
++      AC_CHECK_FUNC(pthread_attr_getschedpolicy,
++                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
+                        [AC_CHECK_FUNC(sched_get_priority_max,
+                            HAVE_PRIOR_FUNCS=1,
+                            [AC_CHECK_LIB([posix4], sched_get_priority_max,
+@@ -5622,6 +5619,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
+                        )]
+                      )]
+                    )
++      fi
 
-+    AC_CACHE_CHECK([for ioctl() in soundcard.h], ac_cv_header_soundcard, [
-+        AC_TRY_LINK([
-+                #include <soundcard.h>
-+            ],
-+            [
-+                ioctl(0, SNDCTL_DSP_SYNC, 0);
-+            ],
-+            ac_cv_header_soundcard=yes,
-+            [
-+                saveLibs="$LIBS"
-+                LIBS="$saveLibs -lossaudio"
-+                AC_TRY_LINK([
-+                        #include <soundcard.h>
-+                    ],
-+                    [
-+                        ioctl(0, SNDCTL_DSP_SYNC, 0);
-+                    ],
-+                    ac_cv_header_soundcard=yes,
-+                    [
-+                        LIBS="$saveLibs"
-+                        ac_cv_header_soundcard=no
-+                    ]
-+                )
-+            ]
-+        )
-+    ])
-+
-     if test "$ac_cv_header_sys_soundcard" = "yes"; then
-         AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
-+    elif test "$ac_cv_header_soundcard" = "yes"; then
-+        AC_DEFINE(HAVE_SOUNDCARD_H)
-     else
-         DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
-     fi
+       if test "$HAVE_PRIOR_FUNCS" = 1; then
+         AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
Index: patches/patch-contrib_src_Makefile_in
===================================================================
RCS file: patches/patch-contrib_src_Makefile_in
diff -N patches/patch-contrib_src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-contrib_src_Makefile_in 29 Oct 2010 07:36:42 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Zap mmedia contrib library.
+It contains deprecated and/or linux-only code, it's not used by any
+port and it's already gone bye-bye in upstream svn trunk as well.
+And we avoid depending on ossaudio and esound, which is also good.
+
+--- contrib/src/Makefile.in.orig Thu Apr 15 11:03:42 2010
++++ contrib/src/Makefile.in Thu Oct 28 11:21:55 2010
+@@ -2,3 +2,3 @@
+
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet #mmedia
+
Index: patches/patch-contrib_src_deprecated_Makefile_in
===================================================================
RCS file: patches/patch-contrib_src_deprecated_Makefile_in
diff -N patches/patch-contrib_src_deprecated_Makefile_in
--- patches/patch-contrib_src_deprecated_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-$OpenBSD: patch-contrib_src_deprecated_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/deprecated/Makefile.in.orig Fri Mar  6 13:11:17 2009
-+++ contrib/src/deprecated/Makefile.in Sun May  2 10:39:23 2010
-@@ -120,14 +120,14 @@ DEPRECATEDLIB_ODEP = \
- @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
- @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
- @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
--@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
- @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
- @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
- @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
- @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
- @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
- COND_SHARED_1___deprecateddll___depname = \
-- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(LIBwx_gtk2_deprecated_VERSION)
- @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
- @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
- @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -220,10 +220,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- @COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \
- @COND_PLATFORM_WIN32_1@ deprecateddll_version_rc.o
- COND_MONOLITHIC_0___WXLIB_CORE_p = \
-- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
- @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
- COND_MONOLITHIC_0___WXLIB_BASE_p = \
-- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
- @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
- COND_SHARED_0___deprecatedlib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -246,12 +246,11 @@ COND_SHARED_0___deprecatedlib___depname = \
- all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
- install: $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
-- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
-- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
-+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
- fi; \
-- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
- done
-
- uninstall: $(__uninstall_deprecateddll___depname) $(__uninstall_deprecatedlib___depname)
-@@ -273,15 +272,14 @@ clean:
- distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
--@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
--@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS)    -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
-+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(LIBwx_gtk2_deprecated_VERSION): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
-+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS)    -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
- @COND_SHARED_1@
- @COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd)
-
- @COND_SHARED_1@install_deprecateddll: $(__deprecateddll___depname)
- @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
--@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
--@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
-+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_deprecated_VERSION) $(DESTDIR)$(libdir)
- @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
-
- @COND_SHARED_1@uninstall_deprecateddll:
Index: patches/patch-contrib_src_fl_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_fl_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_src_fl_Makefile_in
--- patches/patch-contrib_src_fl_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ patches/patch-contrib_src_fl_Makefile_in 29 Oct 2010 07:36:42 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-contrib_src_fl_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/fl/Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ contrib/src/fl/Makefile.in Sun May  2 10:38:03 2010
-@@ -123,14 +123,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
+--- contrib/src/fl/Makefile.in.orig Thu Apr 15 11:03:43 2010
++++ contrib/src/fl/Makefile.in Wed Oct 27 12:36:07 2010
+@@ -124,14 +124,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
  @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -220,10 +220,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -238,10 +238,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  COND_SHARED_0___fllib___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -245,12 +245,11 @@ COND_SHARED_0___fllib___depname = \
+@@ -263,12 +263,11 @@ COND_SHARED_0___fllib___depname = \
  all: $(__fldll___depname) $(__fllib___depname)
 
  install: $(__install_fldll___depname) $(__install_fllib___depname)
@@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
  done
 
  uninstall: $(__uninstall_fldll___depname) $(__uninstall_fllib___depname)
-@@ -272,15 +271,14 @@ clean:
+@@ -290,15 +289,14 @@ clean:
  distclean: clean
  rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
Index: patches/patch-contrib_src_gizmos_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_gizmos_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_src_gizmos_Makefile_in
--- patches/patch-contrib_src_gizmos_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ patches/patch-contrib_src_gizmos_Makefile_in 29 Oct 2010 07:36:42 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-contrib_src_gizmos_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/gizmos/Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ contrib/src/gizmos/Makefile.in Sun May  2 10:38:39 2010
-@@ -118,14 +118,14 @@ GIZMOS_XRCLIB_ODEP = \
+--- contrib/src/gizmos/Makefile.in.orig Thu Apr 15 11:03:43 2010
++++ contrib/src/gizmos/Makefile.in Wed Oct 27 12:36:07 2010
+@@ -121,14 +121,14 @@ GIZMOS_XRCLIB_ODEP = \
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -18,8 +18,8 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
  @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
  @COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
  @COND_SHARED_1@__uninstall_gizmosdll___depname = uninstall_gizmosdll
-@@ -175,7 +175,7 @@ COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst
- @COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd)
+@@ -195,7 +195,7 @@ COND_USE_SOVERSOLARIS_1___gizmosdll___so_symlinks_unin
+ @COND_USE_SOVERSOLARIS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___gizmosdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
  COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
 - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
@@ -27,7 +27,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
  @COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
  @COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
  @COND_SHARED_1_USE_XRC_1@ = install_gizmos_xrcdll
-@@ -229,10 +229,10 @@ COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_un
+@@ -266,10 +266,10 @@ COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___so_symlinks_
  @COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
  @COND_PLATFORM_WIN32_1@ gizmos_xrcdll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_XRC_p = \
@@ -40,7 +40,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
  @COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
  COND_SHARED_0___gizmoslib___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -293,10 +293,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -332,10 +332,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
  @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -53,7 +53,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@@ -308,12 +308,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
+@@ -347,12 +347,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
  all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
 
  install: $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
@@ -69,7 +69,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
  done
 
  uninstall: $(__uninstall_gizmosdll___depname) $(__uninstall_gizmos_xrcdll___depname) $(__uninstall_gizmoslib___depname) $(__uninstall_gizmos_xrclib___depname)
-@@ -340,15 +339,14 @@ clean:
+@@ -379,15 +378,14 @@ clean:
  distclean: clean
  rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
@@ -88,7 +88,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
  @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
 
  @COND_SHARED_1@uninstall_gizmosdll:
-@@ -359,15 +357,14 @@ distclean: clean
+@@ -398,15 +396,14 @@ distclean: clean
  @COND_USE_PCH_1@./.pch/wxprec_gizmosdll/wx/wxprec.h.gch:
  @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
 
Index: patches/patch-contrib_src_mmedia_Makefile_in
===================================================================
RCS file: patches/patch-contrib_src_mmedia_Makefile_in
diff -N patches/patch-contrib_src_mmedia_Makefile_in
--- patches/patch-contrib_src_mmedia_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-$OpenBSD: patch-contrib_src_mmedia_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/mmedia/Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ contrib/src/mmedia/Makefile.in Sun May  2 10:39:07 2010
-@@ -126,14 +126,14 @@ MMEDIALIB_ODEP =  $(_____pch_wxprec_mmedialib_wx_wxpre
- @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
- @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
- @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
--@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
- @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
- @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
- @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
- @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
- @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
- COND_SHARED_1___mmediadll___depname = \
-- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(LIBwx_gtk2_mmedia_VERSION)
- @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
- @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
- @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -232,10 +232,10 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS =  
- @COND_PLATFORM_WIN32_1@ = mmediadll_cdwin.o mmediadll_sndwin.o \
- @COND_PLATFORM_WIN32_1@ mmediadll_vidwin.o
- COND_MONOLITHIC_0___WXLIB_CORE_p = \
-- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
- @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
- COND_MONOLITHIC_0___WXLIB_BASE_p = \
-- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
- @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
- COND_SHARED_0___mmedialib___depname = \
- $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -266,12 +266,11 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =
- all: $(__mmediadll___depname) $(__mmedialib___depname)
-
- install: $(__install_mmediadll___depname) $(__install_mmedialib___depname)
-- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
-- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
-+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
- fi; \
-- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
- done
-
- uninstall: $(__uninstall_mmediadll___depname) $(__uninstall_mmedialib___depname)
-@@ -293,15 +292,14 @@ clean:
- distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
--@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
--@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS)    -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
-+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(LIBwx_gtk2_mmedia_VERSION): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
-+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS)    -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
- @COND_SHARED_1@
- @COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd)
-
- @COND_SHARED_1@install_mmediadll: $(__mmediadll___depname)
- @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
--@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
--@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
-+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_mmedia_VERSION) $(DESTDIR)$(libdir)
- @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
-
- @COND_SHARED_1@uninstall_mmediadll:
Index: patches/patch-contrib_src_mmedia_sndoss_cpp
===================================================================
RCS file: patches/patch-contrib_src_mmedia_sndoss_cpp
diff -N patches/patch-contrib_src_mmedia_sndoss_cpp
--- patches/patch-contrib_src_mmedia_sndoss_cpp 23 Oct 2007 11:28:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_src_mmedia_sndoss_cpp,v 1.2 2007/10/23 11:28:10 steven Exp $
---- contrib/src/mmedia/sndoss.cpp.orig Tue Sep 25 10:52:15 2007
-+++ contrib/src/mmedia/sndoss.cpp Tue Oct  2 11:53:18 2007
-@@ -11,7 +11,7 @@
- // System dependent headers
- // --------------------------------------------------------------------------
-
--#include <sys/soundcard.h>
-+#include <soundcard.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
Index: patches/patch-contrib_src_ogl_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_ogl_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_src_ogl_Makefile_in
--- patches/patch-contrib_src_ogl_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ patches/patch-contrib_src_ogl_Makefile_in 29 Oct 2010 07:36:42 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-contrib_src_ogl_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/ogl/Makefile.in.orig Sun May  2 10:37:48 2010
-+++ contrib/src/ogl/Makefile.in Sun May  2 10:36:43 2010
-@@ -113,14 +113,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
+--- contrib/src/ogl/Makefile.in.orig Thu Apr 15 11:03:57 2010
++++ contrib/src/ogl/Makefile.in Thu Oct 28 10:02:00 2010
+@@ -61,7 +61,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
+ OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+ -DWXBUILDING -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
+- $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
++ -DwxUSE_PROLOGIO=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ OGLDLL_OBJECTS =  \
+ $(__ogldll___win32rc) \
+ ogldll_basic2.o \
+@@ -114,14 +114,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -18,7 +27,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
  @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -210,10 +210,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -228,10 +228,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -31,7 +40,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  COND_SHARED_0___ogllib___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -235,12 +235,11 @@ COND_SHARED_0___ogllib___depname = \
+@@ -253,12 +253,11 @@ COND_SHARED_0___ogllib___depname = \
  all: $(__ogldll___depname) $(__ogllib___depname)
 
  install: $(__install_ogldll___depname) $(__install_ogllib___depname)
@@ -47,7 +56,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
  done
 
  uninstall: $(__uninstall_ogldll___depname) $(__uninstall_ogllib___depname)
-@@ -262,15 +261,14 @@ clean:
+@@ -280,15 +279,14 @@ clean:
  distclean: clean
  rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
Index: patches/patch-contrib_src_plot_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_plot_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_src_plot_Makefile_in
--- patches/patch-contrib_src_plot_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ patches/patch-contrib_src_plot_Makefile_in 29 Oct 2010 07:36:42 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-contrib_src_plot_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/plot/Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ contrib/src/plot/Makefile.in Sun May  2 10:39:38 2010
-@@ -91,14 +91,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
+--- contrib/src/plot/Makefile.in.orig Thu Apr 15 11:03:43 2010
++++ contrib/src/plot/Makefile.in Wed Oct 27 12:36:07 2010
+@@ -93,14 +93,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
  @COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -188,10 +188,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -208,10 +208,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  COND_SHARED_0___plotlib___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -213,12 +213,11 @@ COND_SHARED_0___plotlib___depname = \
+@@ -233,12 +233,11 @@ COND_SHARED_0___plotlib___depname = \
  all: $(__plotdll___depname) $(__plotlib___depname)
 
  install: $(__install_plotdll___depname) $(__install_plotlib___depname)
@@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
  done
 
  uninstall: $(__uninstall_plotdll___depname) $(__uninstall_plotlib___depname)
-@@ -240,15 +239,14 @@ clean:
+@@ -260,15 +259,14 @@ clean:
  distclean: clean
  rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
Index: patches/patch-contrib_src_stc_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_stc_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_src_stc_Makefile_in
--- patches/patch-contrib_src_stc_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ patches/patch-contrib_src_stc_Makefile_in 29 Oct 2010 07:36:43 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-contrib_src_stc_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/stc/Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ contrib/src/stc/Makefile.in Sun May  2 10:39:59 2010
+--- contrib/src/stc/Makefile.in.orig Thu Apr 15 11:03:43 2010
++++ contrib/src/stc/Makefile.in Wed Oct 27 12:36:07 2010
 @@ -257,14 +257,14 @@ STCLIB_OBJECTS =  \
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
  @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -349,10 +349,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -366,10 +366,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  COND_SHARED_0___stclib___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -369,12 +369,11 @@ COND_SHARED_0___stclib___depname = \
+@@ -386,12 +386,11 @@ COND_SHARED_0___stclib___depname = \
  all: $(__stcdll___depname) $(__stclib___depname)
 
  install: $(__install_stcdll___depname) $(__install_stclib___depname)
@@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
  done
 
  uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
-@@ -396,15 +395,14 @@ clean:
+@@ -413,15 +412,14 @@ clean:
  distclean: clean
  rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
Index: patches/patch-contrib_src_svg_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_svg_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-contrib_src_svg_Makefile_in
--- patches/patch-contrib_src_svg_Makefile_in 2 May 2010 16:09:55 -0000 1.4
+++ patches/patch-contrib_src_svg_Makefile_in 29 Oct 2010 07:36:43 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-contrib_src_svg_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
---- contrib/src/svg/Makefile.in.orig Fri Mar  6 13:11:17 2009
-+++ contrib/src/svg/Makefile.in Sun May  2 10:38:53 2010
-@@ -91,14 +91,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
+--- contrib/src/svg/Makefile.in.orig Thu Apr 15 11:03:43 2010
++++ contrib/src/svg/Makefile.in Wed Oct 27 12:36:07 2010
+@@ -92,14 +92,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
  @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@@ -188,10 +188,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+@@ -206,10 +206,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
  @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_PLATFORM_WIN32_1@__svgdll___win32rc = svgdll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  COND_SHARED_0___svglib___depname = \
  $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -213,12 +213,11 @@ COND_SHARED_0___svglib___depname = \
+@@ -231,12 +231,11 @@ COND_SHARED_0___svglib___depname = \
  all: $(__svgdll___depname) $(__svglib___depname)
 
  install: $(__install_svgdll___depname) $(__install_svglib___depname)
@@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
  done
 
  uninstall: $(__uninstall_svgdll___depname) $(__uninstall_svglib___depname)
-@@ -240,15 +239,14 @@ clean:
+@@ -258,15 +257,14 @@ clean:
  distclean: clean
  rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
Index: patches/patch-include_wx_wxchar_h
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-include_wx_wxchar_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-include_wx_wxchar_h
--- patches/patch-include_wx_wxchar_h 10 Sep 2009 21:23:28 -0000 1.4
+++ patches/patch-include_wx_wxchar_h 29 Oct 2010 07:36:43 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-include_wx_wxchar_h,v 1.4 2009/09/10 21:23:28 landry Exp $
---- include/wx/wxchar.h.orig Fri Mar  6 13:10:53 2009
-+++ include/wx/wxchar.h Fri Sep  4 23:57:40 2009
-@@ -454,6 +454,8 @@
+--- include/wx/wxchar.h.orig Thu Apr 15 11:02:48 2010
++++ include/wx/wxchar.h Wed Oct 27 12:35:46 2010
+@@ -466,6 +466,8 @@
          #endif
      #endif
 
Index: patches/patch-src_common_imagpng_cpp
===================================================================
RCS file: patches/patch-src_common_imagpng_cpp
diff -N patches/patch-src_common_imagpng_cpp
--- patches/patch-src_common_imagpng_cpp 10 Sep 2009 21:23:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_common_imagpng_cpp,v 1.2 2009/09/10 21:23:28 landry Exp $
-
-Security fix for part 1 or SA35292 (wxWidgets Double Free Vulnerability).
-Patch from upstream svn -r60875.
-
---- src/common/imagpng.cpp.orig Fri Mar  6 13:10:56 2009
-+++ src/common/imagpng.cpp Fri Sep  4 23:57:40 2009
-@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
-     if (!image->Ok())
-         goto error;
-
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
-
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
-
-     png_read_image( png_ptr, lines );
Index: patches/patch-src_common_imagtiff_cpp
===================================================================
RCS file: patches/patch-src_common_imagtiff_cpp
diff -N patches/patch-src_common_imagtiff_cpp
--- patches/patch-src_common_imagtiff_cpp 11 Jun 2009 08:32:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-src_common_imagtiff_cpp,v 1.1 2009/06/11 08:32:42 jasper Exp $
-
-Security fix for part 2 or SA35292 (wxWidgets Double Free Vulnerability).
-Patch from upstream svn -r60879 and -r60897.
-
---- src/common/imagtiff.cpp.orig Wed Nov 21 13:41:57 2007
-+++ src/common/imagtiff.cpp Thu Jun 11 10:12:09 2009
-@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputS
-     }
-
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
-
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputS
-                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
-
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+        if ( verbose )
-+            wxLogError( _("TIFF: Image size is abnormally big.") );
-
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+        TIFFClose(tif);
-+
-+        return false;
-+    }
-+
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
-
-     if (!raster)
-     {
Index: patches/patch-src_common_strconv_cpp
===================================================================
RCS file: patches/patch-src_common_strconv_cpp
diff -N patches/patch-src_common_strconv_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_strconv_cpp 29 Oct 2010 07:36:43 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/common/strconv.cpp.orig Thu Oct 28 18:02:15 2010
++++ src/common/strconv.cpp Thu Oct 28 18:02:50 2010
+@@ -1676,7 +1676,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
+         {
+ #if SIZEOF_WCHAR_T == 4
+             _T("UCS-4"),
+-#elif SIZEOF_WCHAR_T = 2
++#elif SIZEOF_WCHAR_T == 2
+             _T("UCS-2"),
+ #endif
+             NULL
Index: patches/patch-src_common_uri_cpp
===================================================================
RCS file: patches/patch-src_common_uri_cpp
diff -N patches/patch-src_common_uri_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_uri_cpp 29 Oct 2010 07:36:43 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+gcc4 fix
+
+--- src/common/uri.cpp.orig Wed Oct 27 13:29:20 2010
++++ src/common/uri.cpp Wed Oct 27 13:30:27 2010
+@@ -886,7 +886,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
+                     op += 3;
+             }
+
+-            m_path = base.m_path.substr(0, bp - base.m_path.c_str()) +
++            m_path = (const wxString)base.m_path.substr(0, bp - base.m_path.c_str()) +
+                     m_path.substr((op - m_path.c_str()), m_path.Length());
+         }
+     }
Index: patches/patch-src_gtk_assertdlg_gtk_c
===================================================================
RCS file: patches/patch-src_gtk_assertdlg_gtk_c
diff -N patches/patch-src_gtk_assertdlg_gtk_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gtk_assertdlg_gtk_c 29 Oct 2010 07:36:43 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/gtk/assertdlg_gtk.c.orig Wed Oct 27 16:02:54 2010
++++ src/gtk/assertdlg_gtk.c Wed Oct 27 16:03:38 2010
+@@ -90,7 +90,7 @@ void gtk_assert_dialog_append_text_column (GtkWidget *
+
+     renderer = gtk_cell_renderer_text_new ();
+     column = gtk_tree_view_column_new_with_attributes (name, renderer,
+-                                                       "text", index, NULL);
++                                                       "text", index, (char *)NULL);
+     gtk_tree_view_insert_column (GTK_TREE_VIEW (treeview), column, index);
+     gtk_tree_view_column_set_resizable (column, TRUE);
+     gtk_tree_view_column_set_reorderable (column, TRUE);
+@@ -172,7 +172,7 @@ void gtk_assert_dialog_save_backtrace_callback (GtkWid
+                                           GTK_FILE_CHOOSER_ACTION_SAVE,
+                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+-                                          NULL);
++                                          (char *)NULL);
+
+     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+     {
Index: patches/patch-src_gtk_gsockgtk_cpp
===================================================================
RCS file: patches/patch-src_gtk_gsockgtk_cpp
diff -N patches/patch-src_gtk_gsockgtk_cpp
--- patches/patch-src_gtk_gsockgtk_cpp 4 Oct 2009 18:22:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gtk_gsockgtk_cpp,v 1.1 2009/10/04 18:22:31 ajacoutot Exp $
---- src/gtk/gsockgtk.cpp.orig Fri Mar  6 13:11:40 2009
-+++ src/gtk/gsockgtk.cpp Fri Oct  2 09:58:20 2009
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// // name in our own (semi-)public header and so can't change it -- rename glib
-+// // one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
-
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
Index: patches/patch-src_unix_dialup_cpp
===================================================================
RCS file: patches/patch-src_unix_dialup_cpp
diff -N patches/patch-src_unix_dialup_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_unix_dialup_cpp 29 Oct 2010 07:36:43 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/unix/dialup.cpp.orig Wed Oct 27 16:33:47 2010
++++ src/unix/dialup.cpp Wed Oct 27 16:35:11 2010
+@@ -681,7 +681,7 @@ wxDialUpManagerImpl::CheckIfconfig()
+     defined(__SOLARIS__) || defined (__SUNOS__)
+         // need to add -a flag
+         cmd << wxT(" -a");
+-#elif defined(__LINUX__) || defined(__SGI__)
++#elif defined(__LINUX__) || defined(__SGI__) || defined(__OPENBSD__)
+         // nothing to be added to ifconfig
+ #elif defined(__FREEBSD__) || defined(__DARWIN__)
+         // add -l flag
+@@ -722,7 +722,7 @@ wxDialUpManagerImpl::CheckIfconfig()
+                     // dialup device under SunOS/Solaris
+                     hasModem = strstr(output.fn_str(),"ipdptp") != (char *)NULL;
+                     hasLAN = strstr(output.fn_str(), "hme") != (char *)NULL;
+-#elif defined(__LINUX__) || defined (__FREEBSD__)
++#elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__OPENBSD__)
+                     hasModem = strstr(output.fn_str(),"ppp")    // ppp
+                         || strstr(output.fn_str(),"sl")  // slip
+                         || strstr(output.fn_str(),"pl"); // plip
Index: patches/patch-src_unix_fontutil_cpp
===================================================================
RCS file: patches/patch-src_unix_fontutil_cpp
diff -N patches/patch-src_unix_fontutil_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_unix_fontutil_cpp 29 Oct 2010 07:36:43 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/unix/fontutil.cpp.orig Wed Oct 27 13:30:36 2010
++++ src/unix/fontutil.cpp Wed Oct 27 13:31:00 2010
+@@ -51,6 +51,7 @@
+ #else
+     #include "wx/x11/private.h"
+     #include "wx/gtk/private/string.h"
++    #include "wx/app.h"
+
+     #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
+ #endif
Index: patches/patch-src_unix_sound_cpp
===================================================================
RCS file: patches/patch-src_unix_sound_cpp
diff -N patches/patch-src_unix_sound_cpp
--- patches/patch-src_unix_sound_cpp 23 Oct 2007 11:28:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_unix_sound_cpp,v 1.2 2007/10/23 11:28:10 steven Exp $
---- src/unix/sound.cpp.orig Tue Sep 25 10:52:38 2007
-+++ src/unix/sound.cpp Tue Oct  2 11:53:18 2007
-@@ -27,6 +27,10 @@
- #include <sys/soundcard.h>
- #endif
-
-+#ifdef HAVE_SOUNDCARD_H
-+#include <soundcard.h>
-+#endif
-+
- #ifndef WX_PRECOMP
-     #include "wx/event.h"
-     #include "wx/intl.h"
-@@ -95,10 +99,10 @@ class wxSoundBackendNull : public wxSoundBackend (publ
- // wxSoundBackendOSS, for Linux
- // ----------------------------------------------------------------------------
-
--#ifdef HAVE_SYS_SOUNDCARD_H
-+#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_SOUNDCARD_H)
-
- #ifndef AUDIODEV
--#define AUDIODEV   "/dev/dsp"    // Default path for audio device
-+#define AUDIODEV   "/dev/audio"    // Default path for audio device
- #endif
-
- class wxSoundBackendOSS : public wxSoundBackend
Index: patches/patch-src_unix_threadpsx_cpp
===================================================================
RCS file: patches/patch-src_unix_threadpsx_cpp
diff -N patches/patch-src_unix_threadpsx_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_unix_threadpsx_cpp 29 Oct 2010 07:36:43 -0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- src/unix/threadpsx.cpp.orig Thu Apr 15 11:04:33 2010
++++ src/unix/threadpsx.cpp Thu Oct 28 07:27:58 2010
+@@ -1109,19 +1109,29 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_S
+         wxLogError(_("Cannot retrieve thread scheduling policy."));
+     }
+
+-#ifdef __VMS__
++#if defined(__VMS__) || defined (__OPENBSD__)
+    /* the pthread.h contains too many spaces. This is a work-around */
++   /* on OpenBSD, priority min/max are declared in libpthread private hdr */
+ # undef sched_get_priority_max
+ #undef sched_get_priority_min
++#endif
++#ifdef __VMS__
+ #define sched_get_priority_max(_pol_) \
+      (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
+ #define sched_get_priority_min(_pol_) \
+      (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
+ #endif
+
++#ifdef __OPENBSD__
++// on OpenBSD, priority min/max are declared in libpthread private hdr
++    int max_prio = 31,
++        min_prio = 0,
++        prio = m_internal->GetPriority();
++#else
+     int max_prio = sched_get_priority_max(policy),
+         min_prio = sched_get_priority_min(policy),
+         prio = m_internal->GetPriority();
++#endif
+
+     if ( min_prio == -1 || max_prio == -1 )
+     {
Index: patches/patch-tests_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-tests_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tests_Makefile_in
--- patches/patch-tests_Makefile_in 10 Sep 2009 21:23:28 -0000 1.3
+++ patches/patch-tests_Makefile_in 29 Oct 2010 07:36:43 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-tests_Makefile_in,v 1.3 2009/09/10 21:23:28 landry Exp $
---- tests/Makefile.in.orig Fri Mar  6 13:11:16 2009
-+++ tests/Makefile.in Fri Sep  4 23:57:40 2009
-@@ -91,7 +91,7 @@ TEST_OBJECTS =  \
+--- tests/Makefile.in.orig Thu Apr 15 11:03:41 2010
++++ tests/Makefile.in Thu Oct 28 12:27:04 2010
+@@ -92,7 +92,7 @@ TEST_OBJECTS =  \
  TEST_ODEP =  $(_____pch_testprec_test_testprec_h_gch___depname)
  TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \
  $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -10,7 +10,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
  $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  TEST_GUI_OBJECTS =  \
  $(__test_gui___win32rc) \
-@@ -133,7 +133,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_tes
+@@ -134,7 +134,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_tes
  @COND_USE_PCH_1@_____pch_testprec_test_testprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch
  COND_MONOLITHIC_0___WXLIB_NET_p = \
@@ -19,7 +19,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
  @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
  @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
  @COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true
-@@ -171,7 +171,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
+@@ -172,7 +172,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
  @COND_USE_PCH_1@_____pch_testprec_test_gui_testprec_h_gch___depname \
  @COND_USE_PCH_1@ = ./.pch/testprec_test_gui/testprec.h.gch
  COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -28,7 +28,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
  @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
  @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
  @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
-@@ -202,7 +202,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __
+@@ -204,7 +204,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __
  @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
  @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
  COND_MONOLITHIC_0___WXLIB_BASE_p = \
@@ -37,3 +37,12 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@@ -221,7 +221,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+
+ ### Targets: ###
+
+-all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data printfbench$(EXEEXT)
++all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data
+
+ install:
+
Index: patches/patch-wx-config_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-wx-config_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-wx-config_in
--- patches/patch-wx-config_in 10 Sep 2009 21:23:28 -0000 1.3
+++ patches/patch-wx-config_in 29 Oct 2010 07:36:43 -0000
@@ -1,13 +1,13 @@
 $OpenBSD: patch-wx-config_in,v 1.3 2009/09/10 21:23:28 landry Exp $
---- wx-config.in.orig Fri Mar  6 13:10:54 2009
-+++ wx-config.in Fri Sep  4 23:57:40 2009
+--- wx-config.in.orig Thu Apr 15 11:02:51 2010
++++ wx-config.in Wed Oct 27 12:35:47 2010
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/ksh
  #
  # Name:        wx-config{.in,}
  # Purpose:     wx configuration search and query tool {template,}
-@@ -566,8 +566,8 @@ find_best_delegate()
+@@ -610,8 +610,8 @@ find_best_delegate()
  get_legacy_mask()
  {
      [ $# -gt 0 ] || set m
@@ -18,7 +18,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
      eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
  }
 
-@@ -996,7 +996,7 @@ lib_flags_for()
+@@ -1043,7 +1043,7 @@ lib_flags_for()
              _libname="@WX_LIBRARY_BASENAME_GUI@"
          fi
          [ $lib = base ] || _libname="${_libname}_$lib"
@@ -27,7 +27,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
 
          if is_static; then
              _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
-@@ -1055,7 +1055,7 @@ link_deps_for()
+@@ -1102,7 +1102,7 @@ link_deps_for()
              _libname="@WX_LIBRARY_BASENAME_GUI@"
          fi
          [ $lib = base ] || _libname="${_libname}_$lib"
@@ -36,7 +36,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
 
          _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
      done
-@@ -1136,7 +1136,7 @@ fi
+@@ -1183,7 +1183,7 @@ fi
  [ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
 
  if is_installed; then
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 10 Sep 2009 21:23:28 -0000 1.5
+++ pkg/PLIST 29 Oct 2010 07:36:43 -0000
@@ -380,26 +380,6 @@ include/wx/menuitem.h
 include/wx/metafile.h
 include/wx/mimetype.h
 include/wx/minifram.h
-include/wx/mmedia/
-include/wx/mmedia/cdbase.h
-include/wx/mmedia/cdunix.h
-include/wx/mmedia/cdwin.h
-include/wx/mmedia/sndaiff.h
-include/wx/mmedia/sndbase.h
-include/wx/mmedia/sndcodec.h
-include/wx/mmedia/sndcpcm.h
-include/wx/mmedia/sndesd.h
-include/wx/mmedia/sndfile.h
-include/wx/mmedia/sndg72x.h
-include/wx/mmedia/sndmsad.h
-include/wx/mmedia/sndoss.h
-include/wx/mmedia/sndpcm.h
-include/wx/mmedia/sndulaw.h
-include/wx/mmedia/sndwav.h
-include/wx/mmedia/sndwin.h
-include/wx/mmedia/vidbase.h
-include/wx/mmedia/vidwin.h
-include/wx/mmedia/vidxanm.h
 include/wx/module.h
 include/wx/msgdlg.h
 include/wx/msgout.h
@@ -654,7 +634,6 @@ include/wx/zstream.h
 @lib lib/libwx_gtk2_gizmos_xrc.so.${LIBwx_gtk2_gizmos_xrc_VERSION}
 @lib lib/libwx_gtk2_gl.so.${LIBwx_gtk2_gl_VERSION}
 @lib lib/libwx_gtk2_html.so.${LIBwx_gtk2_html_VERSION}
-@lib lib/libwx_gtk2_mmedia.so.${LIBwx_gtk2_mmedia_VERSION}
 @lib lib/libwx_gtk2_ogl.so.${LIBwx_gtk2_ogl_VERSION}
 @lib lib/libwx_gtk2_plot.so.${LIBwx_gtk2_plot_VERSION}
 @lib lib/libwx_gtk2_qa.so.${LIBwx_gtk2_qa_VERSION}

wxWidgets-2.8.11.diff (100K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: wxWidgets-2.8.11 (py-wxWidgets)

Remi Pointel
On Fri, 29 Oct 2010 09:46:11 +0200
David Coppa <[hidden email]> wrote:

> Hi,
>
> This diff updates wxWidgets to its latest stable release.
>
> A short summary of what I've done:
>
> Adjusted WANTLIB
> Tightened CONFIGURE_ARGS
> Removed "mmedia" contrib library (see comments inside the patch)
> Zapped useless patches
> Corrected handling of thread priority min/max
> Fixed regress target
> Various nits fixed here and there
>
> Besides the several bugfixes, this release also fixes a problem with
> garbled fonts (maybe related to cairo-1.10.0, but not the xlib-xcb one)
> that I was experiencing when using the aMule GUI.
>
> There are some tests that still fail... No sufficient time and power to
> further investigate. I've seen a load of improvements to the testsuite
> in upstream trunk: maybe things are better in latest snapshots
> (btw 9 failures over 902 tests it's not a big deal ;) )
>
> Cheers,
> David
Hi,
tested on amd64, seems to work but make regress fails too.

I updated py-wxPython to have the same version, this is the diff.

I just have this warning at the end of make update-plist :
make-plist: pkg/PLIST may contain arch-dependent
        lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.py
make-plist: pkg/PLIST may contain arch-dependent
        lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.pyc

Thanks for your remarks,

Remi.

py-wxPython-2.8.11.0.diff (155K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: wxWidgets-2.8.11 (py-wxWidgets)

David Coppa
On Sun, 31 Oct 2010, Remi Pointel wrote:

> Hi,
> tested on amd64, seems to work but make regress fails too.
>
> I updated py-wxPython to have the same version, this is the diff.
>
> I just have this warning at the end of make update-plist :
> make-plist: pkg/PLIST may contain arch-dependent
>         lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.py
> make-plist: pkg/PLIST may contain arch-dependent
>         lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.pyc
>
> Thanks for your remarks,

Hi,
I've reworked your patch a little: fixed some spacing issues (tabs vs spaces) and added
a missing entry into PLIST.

Other than those, it's ok for me.

ciao,
david

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/py-wxPython/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 30 Aug 2010 21:47:46 -0000 1.8
+++ Makefile 1 Nov 2010 13:36:10 -0000
@@ -4,10 +4,9 @@ SHARED_ONLY= Yes
 
 COMMENT= Python bindings for wxWidgets C++ class library
 
-V= 2.8.6.0
+V= 2.8.11.0
 DISTNAME= wxPython-src-$V
 PKGNAME= py-wxPython-$V
-REVISION= 1
 CATEGORIES= x11 devel
 
 HOMEPAGE= http://www.wxpython.org/
@@ -24,7 +23,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
 EXTRACT_SUFX= .tar.bz2
 
 MODULES= lang/python
-LIB_DEPENDS=    wx_gtk2_aui,wx_gtk2_richtext,wx_gtk2_gizmos,wx_gtk2_stc,wx_base_xml,wx_gtk2_qa,wx_base_odbc,wx_gtk2_html,wx_gtk2_gl,wx_base,wx_gtk2_adv,wx_gtk2_xrc,wx_gtk2_core,wx_base_net,wx_gtk2_dbgrid:wxWidgets-gtk2->=2.8.6:x11/wxWidgets
+
+LIB_DEPENDS = ::x11/wxWidgets
+WANTLIB += wx_gtk2_aui wx_gtk2_richtext wx_gtk2_gizmos wx_gtk2_stc
+WANTLIB += wx_base_xml wx_gtk2_qa wx_base_odbc wx_gtk2_html wx_gtk2_gl
+WANTLIB += wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core wx_base_net
+WANTLIB += wx_gtk2_dbgrid m stdc++
 
 WRKSRC= ${WRKDIST}/wxPython
 NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/py-wxPython/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 23 Oct 2007 11:45:14 -0000 1.3
+++ distinfo 1 Nov 2010 13:36:10 -0000
@@ -1,5 +1,5 @@
-MD5 (wxPython-src-2.8.6.0.tar.bz2) = llnW3QQ4NH2e5L3bie+rvw==
-RMD160 (wxPython-src-2.8.6.0.tar.bz2) = yTVzBAtav+Pma0BBq3lUJNp5h5s=
-SHA1 (wxPython-src-2.8.6.0.tar.bz2) = 2iulsQ1wivmkc13yq5iK8y42fmQ=
-SHA256 (wxPython-src-2.8.6.0.tar.bz2) = uEsMDA2aZbaA6b1VT8li9b/NxzEWjNp8yfMHhNEEbRc=
-SIZE (wxPython-src-2.8.6.0.tar.bz2) = 25192541
+MD5 (wxPython-src-2.8.11.0.tar.bz2) = Y/c6rknlMIUttWoxtXUp+g==
+RMD160 (wxPython-src-2.8.11.0.tar.bz2) = npOwrK+FuhpL6cMkqHIDfESnaUo=
+SHA1 (wxPython-src-2.8.11.0.tar.bz2) = GJgu3CNqHYfk7vAYkoNYySWqWxc=
+SHA256 (wxPython-src-2.8.11.0.tar.bz2) = IQxWi97IEbEPv4J06WWcjlKCPTH92pAQ27pyUZT2ZmE=
+SIZE (wxPython-src-2.8.11.0.tar.bz2) = 30604503
Index: patches/patch-wxPython_config_py
===================================================================
RCS file: /cvs/ports/x11/py-wxPython/patches/patch-wxPython_config_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wxPython_config_py
--- patches/patch-wxPython_config_py 23 Oct 2007 11:45:14 -0000 1.2
+++ patches/patch-wxPython_config_py 1 Nov 2010 13:36:10 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
---- wxPython/config.py.orig Wed Oct  3 11:20:46 2007
-+++ wxPython/config.py Wed Oct  3 11:21:52 2007
-@@ -121,7 +121,7 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by defau
+$OpenBSD$
+--- wxPython/config.py.orig Thu May 20 21:17:29 2010
++++ wxPython/config.py Mon Nov  1 12:18:15 2010
+@@ -132,7 +132,7 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by defau
  NO_SCRIPTS = 0     # Don't install the tool scripts
  NO_HEADERS = 0     # Don't install the wxPython *.h and *.i files
 
@@ -10,7 +10,7 @@ $OpenBSD: patch-wxPython_config_py,v 1.2
                     # can co-exist.  When turned on the wx and wxPython
                     # pacakges will be installed in a versioned subdir
                     # of site-packages, and a *.pth file will be
-@@ -134,7 +134,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
+@@ -145,7 +145,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
  FLAVOUR = ""       # Optional flavour string to be appended to VERSION
                     # in MULTIVERSION installs
 
@@ -19,16 +19,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.2
                     # ansi/unicode settings can optionally be added to the
                     # subdir path used in site-packages
 
-@@ -486,7 +486,7 @@ class wx_install_headers(distutils.command.install_hea
+@@ -520,7 +520,7 @@ class wx_install_headers(distutils.command.install_hea
          if not headers:
              return
 
 -        root = self.root
-+        root = "!!WRKINST!!"
++        root = "/usr/ports/pobj/py-wxPython-2.8.11.0/fake-i386"
          #print "WXPREFIX is %s, root is %s" % (WXPREFIX, root)
          # hack for universal builds, which append i386/ppc
          # to the root
-@@ -495,7 +495,7 @@ class wx_install_headers(distutils.command.install_hea
+@@ -529,7 +529,7 @@ class wx_install_headers(distutils.command.install_hea
          for header, location in headers:
              install_dir = os.path.normpath(root +
                                             WXPREFIX +
@@ -37,16 +37,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.2
                                             location)
              self.mkpath(install_dir)
              (out, _) = self.copy_file(header, install_dir)
-@@ -549,7 +549,7 @@ def find_data_files(srcdir, *wildcards):
+@@ -594,7 +594,7 @@ def find_data_files(srcdir, *wildcards, **kw):
 
  def makeLibName(name):
-     if os.name == 'posix':
+     if os.name == 'posix' or COMPILER == 'mingw32':
 -        libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
 +        libname = '%s_%s' % (WXBASENAME, name)
      elif name:
          libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
      else:
-@@ -893,8 +893,6 @@ elif os.name == 'posix':
+@@ -990,8 +990,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
      if debug:
          cflags.append('-g')
          cflags.append('-O0')
Index: patches/patch-wxPython_setup_py
===================================================================
RCS file: /cvs/ports/x11/py-wxPython/patches/patch-wxPython_setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wxPython_setup_py
--- patches/patch-wxPython_setup_py 23 Oct 2007 11:45:14 -0000 1.2
+++ patches/patch-wxPython_setup_py 1 Nov 2010 13:36:10 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-wxPython_setup_py,v 1.2 2007/10/23 11:45:14 steven Exp $
---- wxPython/setup.py.orig Thu Jul 19 00:33:55 2007
-+++ wxPython/setup.py Wed Oct  3 11:08:48 2007
-@@ -912,7 +912,7 @@ if __name__ == "__main__":
-                   packages = ['wxaddons']
-              )
+$OpenBSD$
+--- wxPython/setup.py.orig Thu Apr 15 06:26:34 2010
++++ wxPython/setup.py Mon Nov  1 12:18:14 2010
+@@ -1046,7 +1046,7 @@ if __name__ == "__main__":
+               )
 
--        if INSTALL_MULTIVERSION:
-+        if 1:
-             setup(name             = 'wxPython-common',
-                   version          = VERSION,
-                   description      = DESCRIPTION,
+         if not EGGing:
+-            if INSTALL_MULTIVERSION:
++            if 1:
+                 setup(name             = 'wxPython-common',
+                       version          = VERSION,
+                       description      = DESCRIPTION,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-wxPython/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 23 Oct 2007 11:45:14 -0000 1.3
+++ pkg/PLIST 1 Nov 2010 13:36:14 -0000
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/10/23 11:45:14 steven Exp $
+@comment $OpenBSD$
+bin/editra
 bin/helpviewer
 bin/img2png
 bin/img2py
@@ -19,6 +20,7 @@ include/wx/wxPython/i_files/_app.i
 include/wx/wxPython/i_files/_app_ex.py
 include/wx/wxPython/i_files/_artprov.i
 include/wx/wxPython/i_files/_aui_docstrings.i
+include/wx/wxPython/i_files/_axbase.i
 include/wx/wxPython/i_files/_bitmap.i
 include/wx/wxPython/i_files/_brush.i
 include/wx/wxPython/i_files/_button.i
@@ -92,6 +94,7 @@ include/wx/wxPython/i_files/_renderer.i
 include/wx/wxPython/i_files/_richtextbuffer.i
 include/wx/wxPython/i_files/_richtextctrl.i
 include/wx/wxPython/i_files/_richtexthtml.i
+include/wx/wxPython/i_files/_richtextprint.i
 include/wx/wxPython/i_files/_richtextxml.i
 include/wx/wxPython/i_files/_sashwin.i
 include/wx/wxPython/i_files/_scrolbar.i
@@ -220,8 +223,129 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/ClickableHtmlWindow.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/activex.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/activex.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/activexwrapper.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/activexwrapper.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/advancedsplash.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/advancedsplash.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aquabutton.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aquabutton.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/artmanager.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/artmanager.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_constants.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_constants.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_switcherdialog.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_switcherdialog.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_utilities.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_utilities.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibar.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibook.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibook.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/dockart.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/dockart.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/framemanager.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/framemanager.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabart.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabart.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabmdi.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabmdi.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/balloontip.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/balloontip.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/buttonpanel.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/buttonpanel.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/cubecolourdialog.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/cubecolourdialog.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/customtreectrl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/customtreectrl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatmenu.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatmenu.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatnotebook.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatnotebook.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/floatspin.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/floatspin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmcustomizedlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmcustomizedlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmresources.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmresources.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/foldpanelbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/foldpanelbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fourwaysplitter.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fourwaysplitter.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/genericmessagedialog.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/genericmessagedialog.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/gradientbutton.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/gradientbutton.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hyperlink.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hyperlink.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hypertreelist.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hypertreelist.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/knobctrl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/knobctrl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/labelbook.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/labelbook.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/multidirdialog.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/multidirdialog.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/peakmeter.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/peakmeter.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/piectrl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/piectrl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pybusyinfo.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pybusyinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pycollapsiblepane.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pycollapsiblepane.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pyprogress.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pyprogress.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_aui.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_aui.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_default.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_default.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_internal.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_internal.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_msw.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_msw.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/bar.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/bar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/buttonbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/buttonbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/control.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/control.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/gallery.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/gallery.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/page.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/page.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/panel.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/panel.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/toolbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/toolbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/rulerctrl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/rulerctrl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/shapedbutton.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/shapedbutton.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/speedmeter.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/speedmeter.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/supertooltip.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/supertooltip.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/thumbnailctrl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/thumbnailctrl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/toasterbox.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/toasterbox.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ultimatelistctrl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ultimatelistctrl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/zoombar.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/zoombar.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/analogclock/
 lib/python${MODPY_VERSION}/site-packages/wx/lib/analogclock/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/analogclock/__init__.pyc
@@ -276,6 +400,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/colourdb.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/colourselect.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/colourselect.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/colourutils.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/colourutils.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/combotreebox.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/combotreebox.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/customtreectrl.py
@@ -298,6 +424,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/editor/images.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/editor/selection.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/editor/selection.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/embeddedimage.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/embeddedimage.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/eventStack.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/eventStack.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/eventwatcher.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/eventwatcher.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/evtmgr.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/evtmgr.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/expando.py
@@ -308,6 +440,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/filebrowsebutton.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin_old.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin_old.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/flatnotebook.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/flatnotebook.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatbar.py
@@ -321,11 +455,15 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/NavCanvas.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Resources.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Resources.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/ScreenShot.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/ScreenShot.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBox.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBox.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBoxTest.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBoxTest.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/Colors.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/Colors.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/GUI.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/GUI.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/__init__.py
@@ -338,6 +476,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/foldpanelbar.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/gestures.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/gestures.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/graphics.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/graphics.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/gridmovers.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/gridmovers.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/grids.py
@@ -346,6 +486,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/hyperlink.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin_old.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin_old.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/imagebrowser.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/imagebrowser.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/imageutils.py
@@ -382,6 +524,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/grid.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/grid.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/gridlabelrenderer.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/gridlabelrenderer.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/imagelist.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/imagelist.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/inspection.py
@@ -392,6 +536,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/rubberband.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/treemixin.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/treemixin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/msgpanel.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/msgpanel.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/multisash.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/multisash.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/mvctree.py
@@ -421,20 +567,131 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/ogl/_oglmisc.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin_old.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin_old.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/platebtn.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/platebtn.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/plot.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/plot.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/popupctl.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/popupctl.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/printout.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/printout.pyc
-lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub.py
-lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/autosetuppubsubv1.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/autosetuppubsubv1.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/listenerimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/listenerimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publisher.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publisher.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publishermixin.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publishermixin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicargspecimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicargspecimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicmgrimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicmgrimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/callables.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/callables.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/datamsg.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/datamsg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/listenerimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/listenerimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publisher.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publisher.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publishermixin.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publishermixin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicargspecimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicargspecimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicmgrimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicmgrimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listener.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listener.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listenerbase.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listenerbase.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr_old.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr_old.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/policies.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/policies.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/publisherbase.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/publisherbase.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicargspec.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicargspec.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicdefnprovider.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicdefnprovider.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicexc.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicexc.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicmgr.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicmgr.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicobj.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicobj.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topictreetraverser.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topictreetraverser.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicutils.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicutils.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/treeconfig.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/treeconfig.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/validatedefnargs.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/validatedefnargs.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/weakmethod.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/weakmethod.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pub.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pub.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/pub.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/pub.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/utils.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/pub.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/pub.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/utils.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsubconf.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsubconf.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setuparg1.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setuparg1.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupkwargs.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupkwargs.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv1.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv1.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv2.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv2.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/exchandling.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/exchandling.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/globalsettings.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/globalsettings.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/misc.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/misc.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/notification.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/notification.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreeprinter.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreeprinter.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreevisitor.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreevisitor.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/pydocview.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/pydocview.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/pyshell.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/pyshell.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/rcsizer.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/rcsizer.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/resizewidget.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/resizewidget.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/rightalign.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/rightalign.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/rpcMixin.py
@@ -445,6 +702,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/sheet.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/shell.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/shell.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/sized_controls.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/sized_controls.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/splashscreen.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/splashscreen.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/splitter.py
@@ -459,12 +718,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/lib/ticker.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/ticker_xrc.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/ticker_xrc.pyc
-lib/python${MODPY_VERSION}/site-packages/wx/lib/vtk.py
-lib/python${MODPY_VERSION}/site-packages/wx/lib/vtk.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/utils.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/wordwrap.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/wordwrap.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/wxPlotCanvas.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/wxPlotCanvas.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/lib/wxcairo.py
+lib/python${MODPY_VERSION}/site-packages/wx/lib/wxcairo.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/lib/wxpTag.py
 lib/python${MODPY_VERSION}/site-packages/wx/lib/wxpTag.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/media.py
@@ -485,6 +746,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/py/PyFilling.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/PyShell.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/PyShell.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/PySlices.ico
+lib/python${MODPY_VERSION}/site-packages/wx/py/PySlices.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/PySlices.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/PySlicesShell.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/PySlicesShell.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/PyWrap.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/PyWrap.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/README.txt
@@ -494,6 +760,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/py/buffer.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/crust.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/crust.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/crustslices.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/crustslices.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/dispatcher.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/dispatcher.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/document.py
@@ -512,10 +780,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/py/interpreter.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/introspect.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/introspect.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/magic.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/magic.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/parse.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/parse.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/path.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/path.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/pseudo.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/pseudo.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/shell.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/shell.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/py/sliceshell.py
+lib/python${MODPY_VERSION}/site-packages/wx/py/sliceshell.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/py/version.py
 lib/python${MODPY_VERSION}/site-packages/wx/py/version.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/richtext.py
@@ -523,34 +799,778 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/stc.py
 lib/python${MODPY_VERSION}/site-packages/wx/stc.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/CHANGELOG
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/COPYING
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/Editra
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/Editra.pyw
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/FAQ
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/INSTALL
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/MANIFEST.in
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/NEWS
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/README
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/THANKS
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/TODO
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/docs/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/docs/editra_style_sheets.txt
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/launcher.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/launcher.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ca_ES@valencia/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/cs_CZ/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/cs_CZ/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/cs_CZ/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/da_DK/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/da_DK/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/da_DK/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/de_DE/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/de_DE/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/de_DE/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/en_US/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/en_US/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/en_US/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/es_ES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/es_ES/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/es_ES/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/fr_FR/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/fr_FR/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/fr_FR/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/gl_ES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/gl_ES/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/gl_ES/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hr_HR/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hr_HR/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hr_HR/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hu_HU/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hu_HU/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hu_HU/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/it_IT/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/it_IT/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/it_IT/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ja_JP/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ja_JP/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ja_JP/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/lv_LV/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/lv_LV/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/lv_LV/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nl_NL/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nl_NL/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nl_NL/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nn_NO/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nn_NO/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nn_NO/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pl_PL/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pl_PL/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pl_PL/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pt_BR/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pt_BR/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pt_BR/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ru_RU/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ru_RU/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ru_RU/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sk_SK/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sk_SK/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sk_SK/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sl_SI/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sl_SI/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sl_SI/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sr_RS/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sr_RS/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sr_RS/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sv_SE/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sv_SE/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sv_SE/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/tr_TR/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/tr_TR/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/tr_TR/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/uk_UA/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/uk_UA/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/uk_UA/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_CN/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_CN/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_CN/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_TW/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_TW/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_TW/LC_MESSAGES/Editra.mo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/Editra.icns
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra.ico
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra_doc.icns
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra_doc.ico
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra_doc.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/splashwarn.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Default/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Default/README
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/COPYING
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/about.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/advanced.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/attribute.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/backward.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bin_file.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bmark_add.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bmark_next.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bmark_pre.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/cdrom.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/class.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/computer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/copy.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/cut.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/delete.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/down.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/element.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/file.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/find.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/findr.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/floppy.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/folder.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/font.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/forward.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/function.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/harddisk.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/html_gen.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/indent.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/log.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/mail.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/method.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/new.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/newwin.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/open.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/outdent.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/paste.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/plugin.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/pref.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/print.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/printpre.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/property.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/pyshell.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/quit.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/readonly.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/redo.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/refresh.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/rtf_gen.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/save.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/saveas.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/selectall.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/stop.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/style_edit.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/tex_gen.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/undo.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/up.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/usb.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/variable.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/web.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/boo.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/css.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/html.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/java.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/php.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/python.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/ruby.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/shell.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/text.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/other/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/other/doc_props.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/advanced.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/backward.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/copy.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/cut.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/doc_props.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/find.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/findr.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/forward.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/new.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/open.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/package.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/paste.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/pref.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/print.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/redo.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/save.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/theme.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/undo.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/web.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/CodeBrowser-1.0-py2.5.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/CodeBrowser-1.0-py${MODPY_VERSION}.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/FileBrowser-1.5-py2.5.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/FileBrowser-1.5-py${MODPY_VERSION}.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/Launch-1.6-py2.5.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/Launch-1.6-py${MODPY_VERSION}.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/PyShell-0.8-py2.5.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/PyShell-0.8-py${MODPY_VERSION}.egg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/setup.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/setup.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/Editra.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/Editra.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/autocomp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/autocomp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/completer.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/completer.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/csscomp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/csscomp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/htmlcomp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/htmlcomp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/pycomp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/pycomp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/simplecomp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/simplecomp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/dev_tool.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/dev_tool.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/doctools.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/doctools.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/backupmgr.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/backupmgr.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/clipboard.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/clipboard.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/cmenumgr.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/cmenumgr.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fchecker.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fchecker.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileimpl.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileimpl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileutil.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileutil.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/histcache.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/histcache.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/miscutil.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/miscutil.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/searcheng.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/searcheng.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/txtutil.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/txtutil.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/auinavi.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/auinavi.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/choicedlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/choicedlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/colorsetter.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/colorsetter.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ctrlbox.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ctrlbox.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecbasewin.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecbasewin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/eclutil.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/eclutil.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecpickers.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecpickers.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/elistmix.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/elistmix.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/encdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/encdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/errdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/errdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filemgrdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filemgrdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filterdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filterdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/finddlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/finddlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/infodlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/infodlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/outbuff.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/outbuff.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/panelbox.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/panelbox.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/platebtn.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/platebtn.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/pstatbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/pstatbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/segmentbk.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/segmentbk.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/txtentry.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/txtentry.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_art.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_art.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_basestc.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_basestc.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_cmdbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_cmdbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_crypt.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_crypt.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_editv.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_editv.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_event.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_event.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_glob.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_glob.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_i18n.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_i18n.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_ipc.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_ipc.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_keyh.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_keyh.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_log.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_log.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_main.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_main.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_menu.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_menu.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mpane.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mpane.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_msg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_msg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_pages.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_pages.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_print.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_print.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_script.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_script.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_search.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_search.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_shelf.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_shelf.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_statbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_statbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_stc.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_stc.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_style.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_style.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_tab.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_tab.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_theme.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_theme.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_toolbar.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_toolbar.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_txt.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_txt.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_vim.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_vim.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/edimage.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/edimage.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/README
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/decorlib.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/decorlib.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/embeddedimage.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/embeddedimage.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/events.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/events.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/ez_setup.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/ez_setup.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/flatnotebook.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/flatnotebook.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pkg_resources.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pkg_resources.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pubsub.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pubsub.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/stcspellcheck.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/stcspellcheck.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/vertedit.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/vertedit.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/generator.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/generator.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/iface.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/iface.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/info.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/info.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/perspective.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/perspective.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugin.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/prefdlg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/prefdlg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/profiler.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/profiler.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/style_editor.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/style_editor.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/README
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/__init__.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_actionscript.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_actionscript.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ada.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ada.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_apache.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_apache.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_batch.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_batch.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_boo.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_boo.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_caml.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_caml.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cobra.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cobra.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cpp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cpp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_css.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_css.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_d.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_d.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_diff.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_diff.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_django.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_django.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_dot.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_dot.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_editra_ss.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_editra_ss.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_edje.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_edje.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_eiffel.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_eiffel.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_erlang.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_erlang.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ferite.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ferite.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_flagship.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_flagship.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_forth.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_forth.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_fortran.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_fortran.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_groovy.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_groovy.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_gui4cli.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_gui4cli.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haskell.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haskell.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haxe.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haxe.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_html.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_html.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_inno.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_inno.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_issuelist.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_issuelist.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_java.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_java.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_javascript.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_javascript.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_kix.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_kix.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_latex.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_latex.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lisp.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lisp.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lout.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lout.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lua.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lua.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_make.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_make.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mako.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mako.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_masm.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_masm.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_matlab.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_matlab.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mssql.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mssql.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nasm.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nasm.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nsis.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nsis.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pascal.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pascal.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_perl.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_perl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_php.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_php.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pike.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pike.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_postscript.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_postscript.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_progress.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_progress.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_props.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_props.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_python.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_python.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ruby.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ruby.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_s.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_s.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sh.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sh.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_smalltalk.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_smalltalk.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sql.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sql.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_squirrel.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_squirrel.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_stata.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_stata.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_tcl.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_tcl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vbscript.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vbscript.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_verilog.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_verilog.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vhdl.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vhdl.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_visualbasic.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_visualbasic.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xml.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xml.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xtext.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xtext.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_yaml.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_yaml.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syndata.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syndata.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synextreg.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synextreg.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synglob.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synglob.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syntax.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syntax.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synxml.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synxml.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/updater.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/updater.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/util.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/util.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/wxcompat.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/wxcompat.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/BlackBoard.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/BlueMonday.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Cream.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Dessert.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Guepardo.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Mocha.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/blue.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/default.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/midnight.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/68k_assembly.68k
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/Xtext.xtext
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/actionscript.as
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/ada.adb
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/apache_conf.conf
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/bash_shell_script.sh
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/boo.boo
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/c-shell_script.csh
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/c.c
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/caml.ml
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/cascading_style_sheet.css
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/cobra.cobra
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/coldfusion.cfm
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/cpp.cpp
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/csharp.cs
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/d.d
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/diff_file.diff
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/django.django
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/dos_batch_script.bat
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/dot.dot
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/editra_style_sheet.ess
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/edje.edc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/eiffel.e
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/erlang.erl
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/ferite.fe
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/flagship.prg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/forth.4th
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/fortran_77.for
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/fortran_95.f95
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/groovy.groovy
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/gui4cli.gui
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/haskell.hs
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/haxe.hx
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/html.html
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/inno_setup_script.iss
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/issuelist.isl
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/java.java
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/javascript.js
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/kix.kix
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/korn_shell_script.ksh
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/latex.tex
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/lisp.lisp
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/lout.lt
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/lua.lua
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/makefile.mak
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/mako.mako
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/masm.masm
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/matlab.matlab
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/microsoft_sql.sql
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/netwide_assembler.nasm
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/newlisp.lsp
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/nullsoft_installer_script.nsi
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/objective_c.mm
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/octave.oct
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/pascal.pas
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/perl.pl
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/php.php
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/pike.pike
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/pl_sql.plsql
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/plain_text.txt
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/postscript.ps
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/progress_4gl.4gl
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/properties.ini
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/python.python
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/r.r
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/ruby.rb
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/s.s
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/scheme.scm
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/smalltalk.st
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/sql.sql
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/squirrel.nut
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/stata.do
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/svg.svg
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/system_verilog.sv
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/tcl_tk.tcl
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/unicode_text.txt
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/vala.vala
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/vbscript.vbs
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/verilog.v
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/vhdl.vhdl
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/visual_basic.vb
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/xml.xml
+lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/yaml.yaml
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/AttributePanel.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/AttributePanel.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/CHANGES.txt
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/README.txt
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/TODO.txt
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/TestWin.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/TestWin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTree.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTree.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTreeMenu.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTreeMenu.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/attribute.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/attribute.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/component.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/component.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/encode_bitmaps.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/encode_bitmaps.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/generate.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/generate.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/globals.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/globals.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images_32x32.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images_32x32.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/license.txt
-lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/panel.py
-lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/panel.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/listener.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/listener.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/meta.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/meta.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/test.xrc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/test_wxlib.xrc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/tools.xrc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/model.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/model.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/params.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/params.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugin.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugin.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/_bitmaps.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/_bitmaps.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/DynamicSashWindow.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/EditableListBox.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/LEDNumberCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/TreeListCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/separator.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/sizer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/spacer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/tool.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxBitmapButton.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxBoxSizer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxButton.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxCheckBox.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxChoice.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxChoicebook.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxComboBox.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxDialog.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxFilePickerCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxFlexGridSizer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxFrame.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGauge.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGrid.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGridBagSizer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGridSizer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGrid_bad.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxHyperlinkCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxListBox.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxListCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxListbook.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxMenu.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxMenuBar.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxMenuItem.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxNotebook.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxRadioButton.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxScrollBar.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxScrolledWindow.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSlider.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSpinButton.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSpinCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSplitterWindow.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticBitmap.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticBox.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticBoxSizer.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticLine.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticText.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStatusBar.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxTextCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxToggleButton.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxToolBar.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxTreeCtrl.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxTreebook.png
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/controls.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/controls.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/core.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/core.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/gizmos.crx
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/wxlib.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/wxlib.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_gizmos.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_gizmos.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_wxlib.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_wxlib.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/presenter.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/presenter.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tools.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tools.pyc
-lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tree.py
-lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tree.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/undo.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/undo.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/view.py
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/view.pyc
+lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.htb
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.xrc
-lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xxx.py
-lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xxx.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wx/tools/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/wx/tools/dbg.py
@@ -576,6 +1596,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wx/xrc.py
 lib/python${MODPY_VERSION}/site-packages/wx/xrc.pyc
 lib/python${MODPY_VERSION}/site-packages/wxPython/
+lib/python${MODPY_VERSION}/site-packages/wxPython-2.8.11.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/wxPython/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wxPython/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/wxPython/_controls.py
@@ -740,8 +1761,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wxPython/lib/throbber.pyc
 lib/python${MODPY_VERSION}/site-packages/wxPython/lib/timectrl.py
 lib/python${MODPY_VERSION}/site-packages/wxPython/lib/timectrl.pyc
-lib/python${MODPY_VERSION}/site-packages/wxPython/lib/vtk.py
-lib/python${MODPY_VERSION}/site-packages/wxPython/lib/vtk.pyc
 lib/python${MODPY_VERSION}/site-packages/wxPython/lib/wxPlotCanvas.py
 lib/python${MODPY_VERSION}/site-packages/wxPython/lib/wxPlotCanvas.pyc
 lib/python${MODPY_VERSION}/site-packages/wxPython/lib/wxpTag.py
@@ -771,15 +1790,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/wxPython/wizard.pyc
 lib/python${MODPY_VERSION}/site-packages/wxPython/xrc.py
 lib/python${MODPY_VERSION}/site-packages/wxPython/xrc.pyc
-lib/python${MODPY_VERSION}/site-packages/wxaddons/
-lib/python${MODPY_VERSION}/site-packages/wxaddons/__init__.py
-lib/python${MODPY_VERSION}/site-packages/wxaddons/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/wxaddons/setup.py
-lib/python${MODPY_VERSION}/site-packages/wxaddons/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/wxaddons/sized_controls.py
-lib/python${MODPY_VERSION}/site-packages/wxaddons/sized_controls.pyc
+lib/python${MODPY_VERSION}/site-packages/wxPython_common-2.8.11.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/wxversion.py
 lib/python${MODPY_VERSION}/site-packages/wxversion.pyc
+share/doc/pkg-readmes/
 share/examples/py-wxPython/
 share/examples/py-wxPython/demo/
 share/examples/py-wxPython/demo/AUI_DockingWindowMgr.py
@@ -792,6 +1806,7 @@ share/examples/py-wxPython/demo/ActiveXW
 share/examples/py-wxPython/demo/ActiveX_FlashWindow.py
 share/examples/py-wxPython/demo/ActiveX_IEHtmlWindow.py
 share/examples/py-wxPython/demo/ActiveX_PDFWindow.py
+share/examples/py-wxPython/demo/AdjustChannels.py
 share/examples/py-wxPython/demo/AlphaDrawing.py
 share/examples/py-wxPython/demo/AnalogClock.py
 share/examples/py-wxPython/demo/AnimateCtrl.py
@@ -800,7 +1815,8 @@ share/examples/py-wxPython/demo/BitmapBu
 share/examples/py-wxPython/demo/BitmapComboBox.py
 share/examples/py-wxPython/demo/BitmapFromBuffer.py
 share/examples/py-wxPython/demo/Button.py
-share/examples/py-wxPython/demo/ButtonPanel.py
+share/examples/py-wxPython/demo/Cairo.py
+share/examples/py-wxPython/demo/Cairo_Snippets.py
 share/examples/py-wxPython/demo/Calendar.py
 share/examples/py-wxPython/demo/CalendarCtrl.py
 share/examples/py-wxPython/demo/CheckBox.py
@@ -819,7 +1835,6 @@ share/examples/py-wxPython/demo/ComboTre
 share/examples/py-wxPython/demo/ContextHelp.py
 share/examples/py-wxPython/demo/Cursor.py
 share/examples/py-wxPython/demo/CustomDragAndDrop.py
-share/examples/py-wxPython/demo/CustomTreeCtrl.py
 share/examples/py-wxPython/demo/DatePickerCtrl.py
 share/examples/py-wxPython/demo/DelayedResult.py
 share/examples/py-wxPython/demo/Dialog.py
@@ -839,10 +1854,8 @@ share/examples/py-wxPython/demo/FileBrow
 share/examples/py-wxPython/demo/FileDialog.py
 share/examples/py-wxPython/demo/FileHistory.py
 share/examples/py-wxPython/demo/FindReplaceDialog.py
-share/examples/py-wxPython/demo/FlatNotebook.py
 share/examples/py-wxPython/demo/FloatBar.py
 share/examples/py-wxPython/demo/FloatCanvas.py
-share/examples/py-wxPython/demo/FoldPanelBar.py
 share/examples/py-wxPython/demo/FontDialog.py
 share/examples/py-wxPython/demo/FontEnumerator.py
 share/examples/py-wxPython/demo/Frame.py
@@ -861,11 +1874,11 @@ share/examples/py-wxPython/demo/GridDrag
 share/examples/py-wxPython/demo/GridDragable.py
 share/examples/py-wxPython/demo/GridEnterHandler.py
 share/examples/py-wxPython/demo/GridHugeTable.py
+share/examples/py-wxPython/demo/GridLabelRenderer.py
 share/examples/py-wxPython/demo/GridSimple.py
 share/examples/py-wxPython/demo/GridStdEdRend.py
 share/examples/py-wxPython/demo/Grid_MegaExample.py
 share/examples/py-wxPython/demo/HtmlWindow.py
-share/examples/py-wxPython/demo/HyperLinkCtrl.py
 share/examples/py-wxPython/demo/I18N.py
 share/examples/py-wxPython/demo/Image.py
 share/examples/py-wxPython/demo/ImageAlpha.py
@@ -907,6 +1920,7 @@ share/examples/py-wxPython/demo/OGL.py
 share/examples/py-wxPython/demo/OwnerDrawnComboBox.py
 share/examples/py-wxPython/demo/PageSetupDialog.py
 share/examples/py-wxPython/demo/Pickers.py
+share/examples/py-wxPython/demo/PlateButton.py
 share/examples/py-wxPython/demo/PopupControl.py
 share/examples/py-wxPython/demo/PopupMenu.py
 share/examples/py-wxPython/demo/PopupWindow.py
@@ -924,6 +1938,8 @@ share/examples/py-wxPython/demo/README.t
 share/examples/py-wxPython/demo/RadioBox.py
 share/examples/py-wxPython/demo/RadioButton.py
 share/examples/py-wxPython/demo/RawBitmapAccess.py
+share/examples/py-wxPython/demo/RendererNative.py
+share/examples/py-wxPython/demo/ResizeWidget.py
 share/examples/py-wxPython/demo/RichTextCtrl.py
 share/examples/py-wxPython/demo/RightTextCtrl.py
 share/examples/py-wxPython/demo/RowColSizer.py
@@ -950,6 +1966,7 @@ share/examples/py-wxPython/demo/StatusBa
 share/examples/py-wxPython/demo/StockButtons.py
 share/examples/py-wxPython/demo/StyledTextCtrl_1.py
 share/examples/py-wxPython/demo/StyledTextCtrl_2.py
+share/examples/py-wxPython/demo/SystemSettings.py
 share/examples/py-wxPython/demo/TablePrint.py
 share/examples/py-wxPython/demo/TestTable.txt
 share/examples/py-wxPython/demo/TextCtrl.py
@@ -975,6 +1992,149 @@ share/examples/py-wxPython/demo/XMLtreev
 share/examples/py-wxPython/demo/XmlResource.py
 share/examples/py-wxPython/demo/XmlResourceHandler.py
 share/examples/py-wxPython/demo/XmlResourceSubclass.py
+share/examples/py-wxPython/demo/agw/
+share/examples/py-wxPython/demo/agw/AUI.py
+share/examples/py-wxPython/demo/agw/AdvancedSplash.py
+share/examples/py-wxPython/demo/agw/AquaButton.py
+share/examples/py-wxPython/demo/agw/BalloonTip.py
+share/examples/py-wxPython/demo/agw/ButtonPanel.py
+share/examples/py-wxPython/demo/agw/CubeColourDialog.py
+share/examples/py-wxPython/demo/agw/CustomTreeCtrl.py
+share/examples/py-wxPython/demo/agw/FlatMenu.py
+share/examples/py-wxPython/demo/agw/FlatNotebook.py
+share/examples/py-wxPython/demo/agw/FloatSpin.py
+share/examples/py-wxPython/demo/agw/FoldPanelBar.py
+share/examples/py-wxPython/demo/agw/FourWaySplitter.py
+share/examples/py-wxPython/demo/agw/GenericMessageDialog.py
+share/examples/py-wxPython/demo/agw/GradientButton.py
+share/examples/py-wxPython/demo/agw/HyperLinkCtrl.py
+share/examples/py-wxPython/demo/agw/HyperTreeList.py
+share/examples/py-wxPython/demo/agw/KnobCtrl.py
+share/examples/py-wxPython/demo/agw/LabelBook.py
+share/examples/py-wxPython/demo/agw/ListCtrl.py
+share/examples/py-wxPython/demo/agw/MacLargeDemo.py
+share/examples/py-wxPython/demo/agw/MultiDirDialog.py
+share/examples/py-wxPython/demo/agw/PeakMeter.py
+share/examples/py-wxPython/demo/agw/PieCtrl.py
+share/examples/py-wxPython/demo/agw/PyBusyInfo.py
+share/examples/py-wxPython/demo/agw/PyCollapsiblePane.py
+share/examples/py-wxPython/demo/agw/PyProgress.py
+share/examples/py-wxPython/demo/agw/RibbonBar.py
+share/examples/py-wxPython/demo/agw/RulerCtrl.py
+share/examples/py-wxPython/demo/agw/ShapedButton.py
+share/examples/py-wxPython/demo/agw/SpeedMeter.py
+share/examples/py-wxPython/demo/agw/SuperToolTip.py
+share/examples/py-wxPython/demo/agw/ThumbnailCtrl.py
+share/examples/py-wxPython/demo/agw/ToasterBox.py
+share/examples/py-wxPython/demo/agw/UltimateListCtrl.py
+share/examples/py-wxPython/demo/agw/UltimateListIconDemo.py
+share/examples/py-wxPython/demo/agw/UltimateListListDemo.py
+share/examples/py-wxPython/demo/agw/UltimateReportDemo.py
+share/examples/py-wxPython/demo/agw/UltimateVirtualDemo.py
+share/examples/py-wxPython/demo/agw/ZoomBar.py
+share/examples/py-wxPython/demo/agw/__demo__.py
+share/examples/py-wxPython/demo/agw/bitmaps/
+share/examples/py-wxPython/demo/agw/bitmaps/Explorer96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Explorer96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/Folder96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Folder96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/Monitor96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Monitor96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/Music96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Music96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/Photo96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Photo96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/Search96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Search96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/Wizard96.png
+share/examples/py-wxPython/demo/agw/bitmaps/Wizard96Flip40.png
+share/examples/py-wxPython/demo/agw/bitmaps/advancedsplash.png
+share/examples/py-wxPython/demo/agw/bitmaps/aquabutton.png
+share/examples/py-wxPython/demo/agw/bitmaps/aquachecked.ico
+share/examples/py-wxPython/demo/agw/bitmaps/aquaflagged.ico
+share/examples/py-wxPython/demo/agw/bitmaps/aquanotchecked.ico
+share/examples/py-wxPython/demo/agw/bitmaps/aquanotflagged.ico
+share/examples/py-wxPython/demo/agw/bitmaps/canada.gif
+share/examples/py-wxPython/demo/agw/bitmaps/checked.ico
+share/examples/py-wxPython/demo/agw/bitmaps/columns.png
+share/examples/py-wxPython/demo/agw/bitmaps/contexthelp-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/contexthelp.png
+share/examples/py-wxPython/demo/agw/bitmaps/copy.png
+share/examples/py-wxPython/demo/agw/bitmaps/cut.png
+share/examples/py-wxPython/demo/agw/bitmaps/editcopy.png
+share/examples/py-wxPython/demo/agw/bitmaps/editcut.png
+share/examples/py-wxPython/demo/agw/bitmaps/editpaste.png
+share/examples/py-wxPython/demo/agw/bitmaps/exit-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/exit.ico
+share/examples/py-wxPython/demo/agw/bitmaps/ffwd.png
+share/examples/py-wxPython/demo/agw/bitmaps/ffwddisabled.png
+share/examples/py-wxPython/demo/agw/bitmaps/field-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/filenew.png
+share/examples/py-wxPython/demo/agw/bitmaps/fileopen.png
+share/examples/py-wxPython/demo/agw/bitmaps/filesave.png
+share/examples/py-wxPython/demo/agw/bitmaps/flagged.ico
+share/examples/py-wxPython/demo/agw/bitmaps/folder_new.png
+share/examples/py-wxPython/demo/agw/bitmaps/ghost.png
+share/examples/py-wxPython/demo/agw/bitmaps/gradientbutton.png
+share/examples/py-wxPython/demo/agw/bitmaps/help-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/help.ico
+share/examples/py-wxPython/demo/agw/bitmaps/italy.gif
+share/examples/py-wxPython/demo/agw/bitmaps/lbadd.png
+share/examples/py-wxPython/demo/agw/bitmaps/lbcharge.png
+share/examples/py-wxPython/demo/agw/bitmaps/lbdecrypted.png
+share/examples/py-wxPython/demo/agw/bitmaps/lbnews.png
+share/examples/py-wxPython/demo/agw/bitmaps/lbroll.png
+share/examples/py-wxPython/demo/agw/bitmaps/minus1.ico
+share/examples/py-wxPython/demo/agw/bitmaps/minus2.ico
+share/examples/py-wxPython/demo/agw/bitmaps/minus3.ico
+share/examples/py-wxPython/demo/agw/bitmaps/minus4.ico
+share/examples/py-wxPython/demo/agw/bitmaps/minus5.ico
+share/examples/py-wxPython/demo/agw/bitmaps/month-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/new_file.png
+share/examples/py-wxPython/demo/agw/bitmaps/new_folder.png
+share/examples/py-wxPython/demo/agw/bitmaps/notchecked.ico
+share/examples/py-wxPython/demo/agw/bitmaps/notflagged.ico
+share/examples/py-wxPython/demo/agw/bitmaps/ok-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/open_folder.png
+share/examples/py-wxPython/demo/agw/bitmaps/paste.png
+share/examples/py-wxPython/demo/agw/bitmaps/pause.png
+share/examples/py-wxPython/demo/agw/bitmaps/pausedisabled.png
+share/examples/py-wxPython/demo/agw/bitmaps/play.png
+share/examples/py-wxPython/demo/agw/bitmaps/playdisabled.png
+share/examples/py-wxPython/demo/agw/bitmaps/plus1.ico
+share/examples/py-wxPython/demo/agw/bitmaps/plus2.ico
+share/examples/py-wxPython/demo/agw/bitmaps/plus3.ico
+share/examples/py-wxPython/demo/agw/bitmaps/plus4.ico
+share/examples/py-wxPython/demo/agw/bitmaps/plus5.ico
+share/examples/py-wxPython/demo/agw/bitmaps/record.png
+share/examples/py-wxPython/demo/agw/bitmaps/recorddisabled.png
+share/examples/py-wxPython/demo/agw/bitmaps/rewind.png
+share/examples/py-wxPython/demo/agw/bitmaps/rewinddisabled.png
+share/examples/py-wxPython/demo/agw/bitmaps/round.png
+share/examples/py-wxPython/demo/agw/bitmaps/save.png
+share/examples/py-wxPython/demo/agw/bitmaps/separator.gif
+share/examples/py-wxPython/demo/agw/bitmaps/separatorflip.png
+share/examples/py-wxPython/demo/agw/bitmaps/smfuel.ico
+share/examples/py-wxPython/demo/agw/bitmaps/smpi.ico
+share/examples/py-wxPython/demo/agw/bitmaps/smtemp.ico
+share/examples/py-wxPython/demo/agw/bitmaps/stop.png
+share/examples/py-wxPython/demo/agw/bitmaps/stopdisabled.png
+share/examples/py-wxPython/demo/agw/bitmaps/sttbutton.png
+share/examples/py-wxPython/demo/agw/bitmaps/sttfont.png
+share/examples/py-wxPython/demo/agw/bitmaps/sttheader.png
+share/examples/py-wxPython/demo/agw/bitmaps/stthelp.png
+share/examples/py-wxPython/demo/agw/bitmaps/view1.png
+share/examples/py-wxPython/demo/agw/bitmaps/view2.png
+share/examples/py-wxPython/demo/agw/bitmaps/view_choose.png
+share/examples/py-wxPython/demo/agw/bitmaps/view_detailed.png
+share/examples/py-wxPython/demo/agw/bitmaps/view_icon.png
+share/examples/py-wxPython/demo/agw/bitmaps/view_multicolumn.png
+share/examples/py-wxPython/demo/agw/bitmaps/viewmag-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/viewmag-m-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/viewmag-p-16.png
+share/examples/py-wxPython/demo/agw/bitmaps/viewmagfit-16.png
+share/examples/py-wxPython/demo/agw/images.py
+share/examples/py-wxPython/demo/agw/run.py
 share/examples/py-wxPython/demo/b
 share/examples/py-wxPython/demo/bitmaps/
 share/examples/py-wxPython/demo/bitmaps/AG00028_.gif
@@ -1171,6 +2331,7 @@ share/examples/py-wxPython/demo/data/pla
 share/examples/py-wxPython/demo/data/proclamation.txt
 share/examples/py-wxPython/demo/data/resource.wdr
 share/examples/py-wxPython/demo/data/resource_wdr.xrc
+share/examples/py-wxPython/demo/data/romedalen.png
 share/examples/py-wxPython/demo/data/stc.h.html
 share/examples/py-wxPython/demo/data/tables.htm
 share/examples/py-wxPython/demo/data/test.htm
@@ -1192,8 +2353,35 @@ share/examples/py-wxPython/demo/paper.xm
 share/examples/py-wxPython/demo/pyTree.py
 share/examples/py-wxPython/demo/quotes.xml
 share/examples/py-wxPython/demo/run.py
+share/examples/py-wxPython/demo/snippets/
+share/examples/py-wxPython/demo/snippets/__init__.py
+share/examples/py-wxPython/demo/snippets/arc.py
+share/examples/py-wxPython/demo/snippets/arc_negative.py
+share/examples/py-wxPython/demo/snippets/clip.py
+share/examples/py-wxPython/demo/snippets/clip_image.py
+share/examples/py-wxPython/demo/snippets/curve_rectangle.py
+share/examples/py-wxPython/demo/snippets/curve_to.py
+share/examples/py-wxPython/demo/snippets/dash.py
+share/examples/py-wxPython/demo/snippets/ellipse.py
+share/examples/py-wxPython/demo/snippets/fill_and_stroke.py
+share/examples/py-wxPython/demo/snippets/fill_and_stroke2.py
+share/examples/py-wxPython/demo/snippets/fill_style.py
+share/examples/py-wxPython/demo/snippets/glyph_path.py
+share/examples/py-wxPython/demo/snippets/gradient.py
+share/examples/py-wxPython/demo/snippets/gradient_mask.py
+share/examples/py-wxPython/demo/snippets/group.py
+share/examples/py-wxPython/demo/snippets/image.py
+share/examples/py-wxPython/demo/snippets/imagepattern.py
+share/examples/py-wxPython/demo/snippets/path.py
+share/examples/py-wxPython/demo/snippets/set_line_cap.py
+share/examples/py-wxPython/demo/snippets/set_line_join.py
+share/examples/py-wxPython/demo/snippets/show_glyphs.py
+share/examples/py-wxPython/demo/snippets/text.py
+share/examples/py-wxPython/demo/snippets/text_align_center.py
+share/examples/py-wxPython/demo/snippets/text_extents.py
 share/examples/py-wxPython/demo/template.py
 share/examples/py-wxPython/demo/throbImages.py
+share/examples/py-wxPython/demo/version.py
 share/examples/py-wxPython/demo/viewer.py
 share/examples/py-wxPython/demo/viewer_basics.py
 share/examples/py-wxPython/demo/widgetTest.py

Reply | Threaded
Open this post in threaded view
|

Re: wxWidgets-2.8.11

Landry Breuil-5
In reply to this post by David Coppa
On Fri, Oct 29, 2010 at 09:46:11AM +0200, David Coppa wrote:

> Hi,
>
> This diff updates wxWidgets to its latest stable release.
>
> A short summary of what I've done:
>
> Adjusted WANTLIB
> Tightened CONFIGURE_ARGS
> Removed "mmedia" contrib library (see comments inside the patch)
> Zapped useless patches
> Corrected handling of thread priority min/max
> Fixed regress target
> Various nits fixed here and there
>
> Besides the several bugfixes, this release also fixes a problem with
> garbled fonts (maybe related to cairo-1.10.0, but not the xlib-xcb one)
> that I was experiencing when using the aMule GUI.
>
> There are some tests that still fail... No sufficient time and power to
> further investigate. I've seen a load of improvements to the testsuite
> in upstream trunk: maybe things are better in latest snapshots
> (btw 9 failures over 902 tests it's not a big deal ;) )

This went into a bulk build without fallouts, so ok for me.

Landry

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile 24 Oct 2010 21:15:35 -0000 1.27
> +++ Makefile 29 Oct 2010 07:36:39 -0000
> @@ -4,10 +4,9 @@ SHARED_ONLY= Yes
>  
>  COMMENT= c++ cross-platform GUI toolkit
>  
> -V= 2.8.10
> +V= 2.8.11
>  DISTNAME= wxWidgets-${V}
>  PKGNAME= wxWidgets-gtk2-${V}
> -REVISION= 4
>  
>  SHARED_LIBS= wx_base 2.0 \
>   wx_base_net 2.0 \
> @@ -22,7 +21,6 @@ SHARED_LIBS= wx_base 2.0 \
>   wx_gtk2_gizmos_xrc 2.0 \
>   wx_gtk2_gl 2.0 \
>   wx_gtk2_html 2.0 \
> - wx_gtk2_mmedia 2.0 \
>   wx_gtk2_ogl 2.0 \
>   wx_gtk2_plot 2.0 \
>   wx_gtk2_qa 2.0 \
> @@ -50,38 +48,49 @@ BUILD_DEPENDS= ::devel/cppunit
>  LIB_DEPENDS= ::archivers/libmspack \
>   ::devel/sdl \
>   ::x11/gtk+2 \
> - ::databases/iodbc \
> - ::audio/esound
> + ::databases/iodbc
>  
>  WANTLIB += GL GLU SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
>  WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
> -WANTLIB += c expat fontconfig freetype gio-2.0 glib-2.0
> -WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ossaudio esd
> -WANTLIB += pango-1.0 pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
> -WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-render-util mspack
> +WANTLIB += c drm expat fontconfig freetype gio-2.0 glib-2.0
> +WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m pango-1.0
> +WANTLIB += pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
> +WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-shm mspack
>  WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
>  
>  AUTOCONF_VERSION=2.59
>  CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
> - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include"
> + CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
> + ac_cv_lib_esd_esd_close=no
>  CONFIGURE_STYLE=autoconf no-autoheader
> -CONFIGURE_ARGS= --disable-stl \
> - --with-odbc \
> - --with-libjpeg \
> - --with-libtiff \
> - --with-expat \
> - --with-sdl \
> +CONFIGURE_ARGS= --with-expat=sys \
> + --with-odbc=sys \
> + --with-libjpeg=sys \
> + --with-libpng=sys \
> + --with-libtiff=sys \
> + --with-libxpm=sys \
> + --with-zlib=sys \
> + --with-regex=builtin \
>   --with-gtk \
> + --with-opengl \
> + --with-sdl \
>   --without-gnomeprint \
> + --without-gnomevfs \
>   --without-hildon \
> - --with-opengl \
> + --enable-gui \
> + --enable-sound \
> + --enable-unicode \
>   --disable-backtrace \
> - --enable-unicode
> + --disable-stl
>  
>  .for _l _v in ${SHARED_LIBS}
>  MAKE_ENV+= LIB${_l}_VERSION=${_v}
>  .endfor
>  
>  MAKE_FLAGS= WXUNICODEFLAG=""
> +
> +do-regress:
> + @cd ${WRKSRC}/tests && \
> + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} && ./test
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 10 Sep 2009 21:23:28 -0000 1.7
> +++ distinfo 29 Oct 2010 07:36:39 -0000
> @@ -1,5 +1,5 @@
> -MD5 (wxWidgets-2.8.10.tar.gz) = BbMsoFFlH0sYhakPYpafrw==
> -RMD160 (wxWidgets-2.8.10.tar.gz) = CWX8lYbyUM5wtRjpB8bsX9ujUTE=
> -SHA1 (wxWidgets-2.8.10.tar.gz) = KipXEDBx+hWAh3rnF87XgObWQQE=
> -SHA256 (wxWidgets-2.8.10.tar.gz) = SmVXO8EuFbIaSs3Oiefmtx7b4hSBdFf5D8+FUiC6/mY=
> -SIZE (wxWidgets-2.8.10.tar.gz) = 19357950
> +MD5 (wxWidgets-2.8.11.tar.gz) = zoA4nhtw1qUYyAt7cVt2Pg==
> +RMD160 (wxWidgets-2.8.11.tar.gz) = 3k45vlS9x77F19ENnNotlXJ1kd8=
> +SHA1 (wxWidgets-2.8.11.tar.gz) = lrT/gn1e2WAZ26gX6dZpWpsMFaA=
> +SHA256 (wxWidgets-2.8.11.tar.gz) = Uk9R3WkQlnWHMNnEieMAlTorAb8T6ueDFaSh8IJonUU=
> +SIZE (wxWidgets-2.8.11.tar.gz) = 19464848
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-Makefile_in
> --- patches/patch-Makefile_in 2 May 2010 16:09:55 -0000 1.7
> +++ patches/patch-Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-Makefile_in,v 1.7 2010/05/02 16:09:55 landry Exp $
> ---- Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ Makefile.in Sun May  2 11:17:20 2010
> -@@ -1586,7 +1586,7 @@ LOCALE_MSW_LINGUAS =  it
> +--- Makefile.in.orig Thu Apr 15 11:03:41 2010
> ++++ Makefile.in Wed Oct 27 13:47:32 2010
> +@@ -1595,7 +1595,7 @@ LOCALE_MSW_LINGUAS =  it
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
>   COND_wxUSE_REGEX_builtin___wxregex___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -6806,7 +6806,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
> +@@ -6833,7 +6833,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
>   COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
> @@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
>   @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll
>   @COND_MONOLITHIC_0_SHARED_1@__uninstall_basedll___depname \
> -@@ -7174,7 +7174,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
> +@@ -7217,7 +7217,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
>   @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
>   @COND_TOOLKIT_MAC@ baselib_carbon_utils.o baselib_uma.o
>   COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
> @@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll
>   @COND_MONOLITHIC_0_SHARED_1@__uninstall_netdll___depname = uninstall_netdll
> -@@ -7254,7 +7254,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
> +@@ -7312,7 +7312,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
>   @COND_PLATFORM_WIN32_1@ $(__NET_WINCE_SRC_OBJECTS_3)
>   @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_3 = netlib_net.o
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
> @@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_coredll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll
> -@@ -10212,7 +10212,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
> +@@ -10288,7 +10288,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
>   corelib_x11_window.o
>   @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
> @@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
> -@@ -10382,7 +10382,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
> +@@ -10473,7 +10473,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
> @@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__install_mediadll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ = install_mediadll
> -@@ -10492,7 +10492,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
> +@@ -10600,7 +10600,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
>   @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
>   @COND_TOOLKIT_X11@ medialib_unix_mediactrl.o
>   COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
> @@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ = install_odbcdll
> -@@ -10556,7 +10556,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depn
> +@@ -10680,7 +10680,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depn
>   @COND_USE_PCH_1@_____pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_odbclib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
> @@ -73,7 +73,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_dbgriddll
> -@@ -10620,7 +10620,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgr
> +@@ -10761,7 +10761,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgr
>   @COND_USE_PCH_1@_____pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_dbgridlib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
> @@ -82,7 +82,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = install_htmldll
> -@@ -10690,7 +10690,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___html
> +@@ -10847,7 +10847,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___html
>   @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
>   @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
> @@ -91,7 +91,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__install_qadll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ = install_qadll
> -@@ -10754,7 +10754,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib_
> +@@ -10926,7 +10926,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib_
>   @COND_USE_PCH_1@_____pch_wxprec_qalib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_qalib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
> @@ -100,7 +100,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
>   @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
>   @COND_MONOLITHIC_0_SHARED_1@__uninstall_xmldll___depname = uninstall_xmldll
> -@@ -10814,7 +10814,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
> +@@ -11001,7 +11001,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
>   @COND_USE_PCH_1@_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_xmllib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
> @@ -109,7 +109,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
> -@@ -10878,7 +10878,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depnam
> +@@ -11080,7 +11080,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depnam
>   @COND_USE_PCH_1@_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_xrclib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
> @@ -118,8 +118,8 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__auidll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__install_auidll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ = install_auidll
> -@@ -10930,7 +10930,7 @@ COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cm
> - @COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cmd)
> +@@ -11147,7 +11147,7 @@ COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_
> + @COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd)
>   @COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o
>   COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
>  - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> @@ -127,7 +127,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname)
>   @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__install_auilib___depname \
>   @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
> -@@ -10942,7 +10942,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depnam
> +@@ -11159,7 +11159,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depnam
>   @COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname = \
> @@ -136,7 +136,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__richtextdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__install_richtextdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ = install_richtextdll
> -@@ -11007,7 +11007,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextli
> +@@ -11242,7 +11242,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextli
>   @COND_USE_PCH_1@_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
>   COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
> @@ -145,7 +145,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
> -@@ -11070,10 +11070,10 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd
> +@@ -11320,10 +11320,10 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_c
>   @COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_msw_glcanvas.o
>   @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_x11_glcanvas.o
>   COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
> @@ -158,7 +158,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
>   COND_MONOLITHIC_1___WXLIB_MONO_p = \
>   -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> -@@ -11442,7 +11442,12 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -11693,7 +11693,12 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   ### Targets: ###
>  
>   all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
> @@ -171,7 +171,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
>   $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
>   (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
> -@@ -11455,13 +11460,14 @@ install: $(__install_wxregex___depname) $(__install_wx
> +@@ -11706,13 +11711,14 @@ install: $(__install_wxregex___depname) $(__install_wx
>   fi; \
>   $(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
>   done
> @@ -190,7 +190,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @echo " "
>   @echo " ------------------------------------------------------"
>   @echo " "
> -@@ -11669,7 +11675,7 @@ distclean: clean
> +@@ -11920,7 +11926,7 @@ distclean: clean
>   @COND_SHARED_0_wxUSE_EXPAT_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
>  
>   @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__monodll___win32rc)
> @@ -199,7 +199,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_1_SHARED_1@
>   @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
>  
> -@@ -11702,15 +11708,14 @@ distclean: clean
> +@@ -11953,15 +11959,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_monolib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
>  
> @@ -218,7 +218,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll:
> -@@ -11736,15 +11741,14 @@ distclean: clean
> +@@ -11987,15 +11992,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_baselib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
>  
> @@ -237,7 +237,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll:
> -@@ -11770,15 +11774,14 @@ distclean: clean
> +@@ -12021,15 +12025,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_netlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
>  
> @@ -256,7 +256,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll:
> -@@ -11804,15 +11807,14 @@ distclean: clean
> +@@ -12055,15 +12058,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_corelib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
>  
> @@ -275,7 +275,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll:
> -@@ -11838,15 +11840,14 @@ distclean: clean
> +@@ -12089,15 +12091,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_advlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
>  
> @@ -294,7 +294,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll:
> -@@ -11872,15 +11873,14 @@ distclean: clean
> +@@ -12123,15 +12124,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_medialib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
>  
> @@ -313,7 +313,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@uninstall_odbcdll:
> -@@ -11906,15 +11906,14 @@ distclean: clean
> +@@ -12157,15 +12157,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_odbclib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
>  
> @@ -332,7 +332,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@uninstall_dbgriddll:
> -@@ -11940,15 +11939,14 @@ distclean: clean
> +@@ -12191,15 +12190,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_dbgridlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
>  
> @@ -351,7 +351,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll:
> -@@ -11974,15 +11972,14 @@ distclean: clean
> +@@ -12225,15 +12223,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_htmllib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
>  
> @@ -370,7 +370,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll:
> -@@ -12008,15 +12005,14 @@ distclean: clean
> +@@ -12259,15 +12256,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_qalib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
>  
> @@ -389,7 +389,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll:
> -@@ -12042,15 +12038,14 @@ distclean: clean
> +@@ -12293,15 +12289,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_xmllib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
>  
> @@ -408,7 +408,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll:
> -@@ -12076,15 +12071,14 @@ distclean: clean
> +@@ -12327,15 +12322,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_xrclib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
>  
> @@ -427,7 +427,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll:
> -@@ -12110,15 +12104,14 @@ distclean: clean
> +@@ -12361,15 +12355,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_auilib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
>  
> @@ -446,13 +446,13 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll:
> -@@ -12144,15 +12137,14 @@ distclean: clean
> +@@ -12395,15 +12388,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_richtextlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
>  
> --@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
> +-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
>  -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
> -+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(LIBwx_gtk2_gl_VERSION): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
> ++@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(LIBwx_gtk2_gl_VERSION): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
>  +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
> Index: patches/patch-autoconf_inc_m4
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-autoconf_inc_m4,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-autoconf_inc_m4
> --- patches/patch-autoconf_inc_m4 10 Sep 2009 21:23:28 -0000 1.1
> +++ patches/patch-autoconf_inc_m4 29 Oct 2010 07:36:42 -0000
> @@ -1,26 +1,26 @@
>  $OpenBSD: patch-autoconf_inc_m4,v 1.1 2009/09/10 21:23:28 landry Exp $
>  Don't use evil ln -s between lib.so.x.y and lib.so.x and lib.so
> ---- autoconf_inc.m4.orig Fri Mar  6 13:10:54 2009
> -+++ autoconf_inc.m4 Sun Sep  6 11:21:56 2009
> -@@ -281,7 +281,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVE
> - dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> -     COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
> -     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
> --        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
> -+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
> +--- autoconf_inc.m4.orig Wed Oct 27 12:30:11 2010
> ++++ autoconf_inc.m4 Wed Oct 27 12:32:43 2010
> +@@ -275,7 +275,7 @@ dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_
> + dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> +     COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
> +     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
> +-        COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1=""
> ++        COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
>       fi
> -     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
> - dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
> -@@ -851,7 +851,7 @@ dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/b
> - dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> -     COND_USE_SOSYMLINKS_1="#"
> -     if test "x$USE_SOSYMLINKS" = "x1" ; then
> --        COND_USE_SOSYMLINKS_1=""
> -+        COND_USE_SOSYMLINKS_1="#"
> +     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1)
> + dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> +@@ -857,7 +857,7 @@ dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/b
> + dnl ### begin block 20_COND_USE_SOTWOSYMLINKS_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> +     COND_USE_SOTWOSYMLINKS_1="#"
> +     if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
> +-        COND_USE_SOTWOSYMLINKS_1=""
> ++        COND_USE_SOTWOSYMLINKS_1="#"
>       fi
> -     AC_SUBST(COND_USE_SOSYMLINKS_1)
> +     AC_SUBST(COND_USE_SOTWOSYMLINKS_1)
>   dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> -@@ -867,7 +867,7 @@ dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../con
> +@@ -873,7 +873,7 @@ dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../con
>       fi
>       AC_SUBST(COND_USE_SOVERLINUX_1)
>   dnl ### begin block 20_COND_USE_SOVERSION_0[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> Index: patches/patch-configure_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-configure_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-configure_in
> --- patches/patch-configure_in 10 Sep 2009 21:23:28 -0000 1.4
> +++ patches/patch-configure_in 29 Oct 2010 07:36:42 -0000
> @@ -1,6 +1,24 @@
>  $OpenBSD: patch-configure_in,v 1.4 2009/09/10 21:23:28 landry Exp $
> ---- configure.in.orig Fri Mar  6 13:10:54 2009
> -+++ configure.in Fri Sep  4 23:57:38 2009
> +--- configure.in.orig Thu Apr 15 11:02:51 2010
> ++++ configure.in Thu Oct 28 16:27:20 2010
> +@@ -3090,7 +3090,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
> +             dnl HAVE_STDLIB_H which are already defined and this provokes
> +             dnl a compiler warning which configure considers as an error...
> +             AC_MSG_CHECKING(for jpeglib.h)
> +-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
> ++            AC_CACHE_VAL(ac_cv_header_jpeglib_h,[
> +                 AC_TRY_COMPILE(
> +                     [
> +                         #undef HAVE_STDLIB_H
> +@@ -3102,7 +3102,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
> +                     ac_cv_header_jpeglib_h=yes,
> +                     ac_cv_header_jpeglib_h=no
> +                 )
> +-            )
> ++            ])
> +             AC_MSG_RESULT($ac_cv_header_jpeglib_h)
> +
> +             if test "$ac_cv_header_jpeglib_h" = "yes"; then
>  @@ -4154,7 +4154,7 @@ if test "$TOOLKIT" != "MSW" ; then
>  
>           AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
> @@ -54,41 +72,25 @@ $OpenBSD: patch-configure_in,v 1.4 2009/
>   else
>       AC_MSG_WARN([Wide character support is unavailable])
>   fi
> -@@ -6116,8 +6108,37 @@ if test "$USE_UNIX" = "1" ; then
> -         ])
> -     fi
> +@@ -5609,8 +5601,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
> +       dnl      (this one can be in either libpthread or libposix4 (under Solaris))
> +       dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
> +       HAVE_PRIOR_FUNCS=0
> ++      if test "$USE_OPENBSD" = 1; then
> +       AC_CHECK_FUNC(pthread_attr_getschedpolicy,
> +                      [AC_CHECK_FUNC(pthread_attr_setschedparam,
> ++                         HAVE_PRIOR_FUNCS=1)])
> ++      else
> ++      AC_CHECK_FUNC(pthread_attr_getschedpolicy,
> ++                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
> +                        [AC_CHECK_FUNC(sched_get_priority_max,
> +                            HAVE_PRIOR_FUNCS=1,
> +                            [AC_CHECK_LIB([posix4], sched_get_priority_max,
> +@@ -5622,6 +5619,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
> +                        )]
> +                      )]
> +                    )
> ++      fi
>  
> -+    AC_CACHE_CHECK([for ioctl() in soundcard.h], ac_cv_header_soundcard, [
> -+        AC_TRY_LINK([
> -+                #include <soundcard.h>
> -+            ],
> -+            [
> -+                ioctl(0, SNDCTL_DSP_SYNC, 0);
> -+            ],
> -+            ac_cv_header_soundcard=yes,
> -+            [
> -+                saveLibs="$LIBS"
> -+                LIBS="$saveLibs -lossaudio"
> -+                AC_TRY_LINK([
> -+                        #include <soundcard.h>
> -+                    ],
> -+                    [
> -+                        ioctl(0, SNDCTL_DSP_SYNC, 0);
> -+                    ],
> -+                    ac_cv_header_soundcard=yes,
> -+                    [
> -+                        LIBS="$saveLibs"
> -+                        ac_cv_header_soundcard=no
> -+                    ]
> -+                )
> -+            ]
> -+        )
> -+    ])
> -+
> -     if test "$ac_cv_header_sys_soundcard" = "yes"; then
> -         AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
> -+    elif test "$ac_cv_header_soundcard" = "yes"; then
> -+        AC_DEFINE(HAVE_SOUNDCARD_H)
> -     else
> -         DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
> -     fi
> +       if test "$HAVE_PRIOR_FUNCS" = 1; then
> +         AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
> Index: patches/patch-contrib_src_Makefile_in
> ===================================================================
> RCS file: patches/patch-contrib_src_Makefile_in
> diff -N patches/patch-contrib_src_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-contrib_src_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Zap mmedia contrib library.
> +It contains deprecated and/or linux-only code, it's not used by any
> +port and it's already gone bye-bye in upstream svn trunk as well.
> +And we avoid depending on ossaudio and esound, which is also good.
> +
> +--- contrib/src/Makefile.in.orig Thu Apr 15 11:03:42 2010
> ++++ contrib/src/Makefile.in Thu Oct 28 11:21:55 2010
> +@@ -2,3 +2,3 @@
> +
> +-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
> ++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet #mmedia
> +
> Index: patches/patch-contrib_src_deprecated_Makefile_in
> ===================================================================
> RCS file: patches/patch-contrib_src_deprecated_Makefile_in
> diff -N patches/patch-contrib_src_deprecated_Makefile_in
> --- patches/patch-contrib_src_deprecated_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,68 +0,0 @@
> -$OpenBSD: patch-contrib_src_deprecated_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/deprecated/Makefile.in.orig Fri Mar  6 13:11:17 2009
> -+++ contrib/src/deprecated/Makefile.in Sun May  2 10:39:23 2010
> -@@ -120,14 +120,14 @@ DEPRECATEDLIB_ODEP = \
> - @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
> - @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
> - @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> --@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
> -+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
> - @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
> - COND_SHARED_1___deprecateddll___depname = \
> -- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
> -+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(LIBwx_gtk2_deprecated_VERSION)
> - @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
> - @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
> - @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -220,10 +220,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> - @COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \
> - @COND_PLATFORM_WIN32_1@ deprecateddll_version_rc.o
> - COND_MONOLITHIC_0___WXLIB_CORE_p = \
> -- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
> - @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
> - COND_MONOLITHIC_0___WXLIB_BASE_p = \
> -- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
> - @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
> - COND_SHARED_0___deprecatedlib___depname = \
> - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -246,12 +246,11 @@ COND_SHARED_0___deprecatedlib___depname = \
> - all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
> -
> - install: $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
> - for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
> -- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
> -+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
> -+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
> - fi; \
> -- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
> -+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
> - done
> -
> - uninstall: $(__uninstall_deprecateddll___depname) $(__uninstall_deprecatedlib___depname)
> -@@ -273,15 +272,14 @@ clean:
> - distclean: clean
> - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
> -
> --@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
> --@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS)    -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> -+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(LIBwx_gtk2_deprecated_VERSION): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
> -+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS)    -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> - @COND_SHARED_1@
> - @COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd)
> -
> - @COND_SHARED_1@install_deprecateddll: $(__deprecateddll___depname)
> - @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
> -+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_deprecated_VERSION) $(DESTDIR)$(libdir)
> - @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
> -
> - @COND_SHARED_1@uninstall_deprecateddll:
> Index: patches/patch-contrib_src_fl_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_fl_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_fl_Makefile_in
> --- patches/patch-contrib_src_fl_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_fl_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_fl_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/fl/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/fl/Makefile.in Sun May  2 10:38:03 2010
> -@@ -123,14 +123,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
> +--- contrib/src/fl/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/fl/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -124,14 +124,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
>   @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -220,10 +220,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -238,10 +238,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___fllib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -245,12 +245,11 @@ COND_SHARED_0___fllib___depname = \
> +@@ -263,12 +263,11 @@ COND_SHARED_0___fllib___depname = \
>   all: $(__fldll___depname) $(__fllib___depname)
>  
>   install: $(__install_fldll___depname) $(__install_fllib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
>   done
>  
>   uninstall: $(__uninstall_fldll___depname) $(__uninstall_fllib___depname)
> -@@ -272,15 +271,14 @@ clean:
> +@@ -290,15 +289,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_gizmos_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_gizmos_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_gizmos_Makefile_in
> --- patches/patch-contrib_src_gizmos_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_gizmos_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_gizmos_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/gizmos/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/gizmos/Makefile.in Sun May  2 10:38:39 2010
> -@@ -118,14 +118,14 @@ GIZMOS_XRCLIB_ODEP = \
> +--- contrib/src/gizmos/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/gizmos/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -121,14 +121,14 @@ GIZMOS_XRCLIB_ODEP = \
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,8 +18,8 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
>   @COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
>   @COND_SHARED_1@__uninstall_gizmosdll___depname = uninstall_gizmosdll
> -@@ -175,7 +175,7 @@ COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst
> - @COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd)
> +@@ -195,7 +195,7 @@ COND_USE_SOVERSOLARIS_1___gizmosdll___so_symlinks_unin
> + @COND_USE_SOVERSOLARIS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___gizmosdll___so_symlinks_uninst_cmd)
>   @COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
>   COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
>  - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
> @@ -27,7 +27,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
>   @COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
>   @COND_SHARED_1_USE_XRC_1@ = install_gizmos_xrcdll
> -@@ -229,10 +229,10 @@ COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_un
> +@@ -266,10 +266,10 @@ COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___so_symlinks_
>   @COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
>   @COND_PLATFORM_WIN32_1@ gizmos_xrcdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_XRC_p = \
> @@ -40,7 +40,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
>   COND_SHARED_0___gizmoslib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -293,10 +293,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -332,10 +332,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -53,7 +53,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
> -@@ -308,12 +308,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
> +@@ -347,12 +347,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
>   all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
>  
>   install: $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
> @@ -69,7 +69,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   done
>  
>   uninstall: $(__uninstall_gizmosdll___depname) $(__uninstall_gizmos_xrcdll___depname) $(__uninstall_gizmoslib___depname) $(__uninstall_gizmos_xrclib___depname)
> -@@ -340,15 +339,14 @@ clean:
> +@@ -379,15 +378,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> @@ -88,7 +88,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
>  
>   @COND_SHARED_1@uninstall_gizmosdll:
> -@@ -359,15 +357,14 @@ distclean: clean
> +@@ -398,15 +396,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_gizmosdll/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
>  
> Index: patches/patch-contrib_src_mmedia_Makefile_in
> ===================================================================
> RCS file: patches/patch-contrib_src_mmedia_Makefile_in
> diff -N patches/patch-contrib_src_mmedia_Makefile_in
> --- patches/patch-contrib_src_mmedia_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,68 +0,0 @@
> -$OpenBSD: patch-contrib_src_mmedia_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/mmedia/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/mmedia/Makefile.in Sun May  2 10:39:07 2010
> -@@ -126,14 +126,14 @@ MMEDIALIB_ODEP =  $(_____pch_wxprec_mmedialib_wx_wxpre
> - @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
> - @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
> - @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> --@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
> -+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
> - @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
> - COND_SHARED_1___mmediadll___depname = \
> -- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
> -+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(LIBwx_gtk2_mmedia_VERSION)
> - @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
> - @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
> - @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -232,10 +232,10 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS =  
> - @COND_PLATFORM_WIN32_1@ = mmediadll_cdwin.o mmediadll_sndwin.o \
> - @COND_PLATFORM_WIN32_1@ mmediadll_vidwin.o
> - COND_MONOLITHIC_0___WXLIB_CORE_p = \
> -- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
> - @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
> - COND_MONOLITHIC_0___WXLIB_BASE_p = \
> -- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
> - @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
> - COND_SHARED_0___mmedialib___depname = \
> - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -266,12 +266,11 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =
> - all: $(__mmediadll___depname) $(__mmedialib___depname)
> -
> - install: $(__install_mmediadll___depname) $(__install_mmedialib___depname)
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
> - for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
> -- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
> -+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
> -+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
> - fi; \
> -- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
> -+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
> - done
> -
> - uninstall: $(__uninstall_mmediadll___depname) $(__uninstall_mmedialib___depname)
> -@@ -293,15 +292,14 @@ clean:
> - distclean: clean
> - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
> -
> --@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
> --@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS)    -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> -+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(LIBwx_gtk2_mmedia_VERSION): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
> -+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS)    -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> - @COND_SHARED_1@
> - @COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd)
> -
> - @COND_SHARED_1@install_mmediadll: $(__mmediadll___depname)
> - @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
> -+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_mmedia_VERSION) $(DESTDIR)$(libdir)
> - @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
> -
> - @COND_SHARED_1@uninstall_mmediadll:
> Index: patches/patch-contrib_src_mmedia_sndoss_cpp
> ===================================================================
> RCS file: patches/patch-contrib_src_mmedia_sndoss_cpp
> diff -N patches/patch-contrib_src_mmedia_sndoss_cpp
> --- patches/patch-contrib_src_mmedia_sndoss_cpp 23 Oct 2007 11:28:10 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-contrib_src_mmedia_sndoss_cpp,v 1.2 2007/10/23 11:28:10 steven Exp $
> ---- contrib/src/mmedia/sndoss.cpp.orig Tue Sep 25 10:52:15 2007
> -+++ contrib/src/mmedia/sndoss.cpp Tue Oct  2 11:53:18 2007
> -@@ -11,7 +11,7 @@
> - // System dependent headers
> - // --------------------------------------------------------------------------
> -
> --#include <sys/soundcard.h>
> -+#include <soundcard.h>
> - #include <sys/types.h>
> - #include <sys/stat.h>
> - #include <sys/ioctl.h>
> Index: patches/patch-contrib_src_ogl_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_ogl_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_ogl_Makefile_in
> --- patches/patch-contrib_src_ogl_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_ogl_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,16 @@
>  $OpenBSD: patch-contrib_src_ogl_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/ogl/Makefile.in.orig Sun May  2 10:37:48 2010
> -+++ contrib/src/ogl/Makefile.in Sun May  2 10:36:43 2010
> -@@ -113,14 +113,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
> +--- contrib/src/ogl/Makefile.in.orig Thu Apr 15 11:03:57 2010
> ++++ contrib/src/ogl/Makefile.in Thu Oct 28 10:02:00 2010
> +@@ -61,7 +61,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
> + OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
> + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
> + -DWXBUILDING -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
> +- $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
> ++ -DwxUSE_PROLOGIO=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
> + OGLDLL_OBJECTS =  \
> + $(__ogldll___win32rc) \
> + ogldll_basic2.o \
> +@@ -114,14 +114,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +27,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
>   @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -210,10 +210,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -228,10 +228,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +40,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___ogllib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -235,12 +235,11 @@ COND_SHARED_0___ogllib___depname = \
> +@@ -253,12 +253,11 @@ COND_SHARED_0___ogllib___depname = \
>   all: $(__ogldll___depname) $(__ogllib___depname)
>  
>   install: $(__install_ogldll___depname) $(__install_ogllib___depname)
> @@ -47,7 +56,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
>   done
>  
>   uninstall: $(__uninstall_ogldll___depname) $(__uninstall_ogllib___depname)
> -@@ -262,15 +261,14 @@ clean:
> +@@ -280,15 +279,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_plot_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_plot_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_plot_Makefile_in
> --- patches/patch-contrib_src_plot_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_plot_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_plot_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/plot/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/plot/Makefile.in Sun May  2 10:39:38 2010
> -@@ -91,14 +91,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
> +--- contrib/src/plot/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/plot/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -93,14 +93,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
>   @COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -188,10 +188,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -208,10 +208,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___plotlib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -213,12 +213,11 @@ COND_SHARED_0___plotlib___depname = \
> +@@ -233,12 +233,11 @@ COND_SHARED_0___plotlib___depname = \
>   all: $(__plotdll___depname) $(__plotlib___depname)
>  
>   install: $(__install_plotdll___depname) $(__install_plotlib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
>   done
>  
>   uninstall: $(__uninstall_plotdll___depname) $(__uninstall_plotlib___depname)
> -@@ -240,15 +239,14 @@ clean:
> +@@ -260,15 +259,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_stc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_stc_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_stc_Makefile_in
> --- patches/patch-contrib_src_stc_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_stc_Makefile_in 29 Oct 2010 07:36:43 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-contrib_src_stc_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/stc/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/stc/Makefile.in Sun May  2 10:39:59 2010
> +--- contrib/src/stc/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/stc/Makefile.in Wed Oct 27 12:36:07 2010
>  @@ -257,14 +257,14 @@ STCLIB_OBJECTS =  \
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
>   @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -349,10 +349,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -366,10 +366,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___stclib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -369,12 +369,11 @@ COND_SHARED_0___stclib___depname = \
> +@@ -386,12 +386,11 @@ COND_SHARED_0___stclib___depname = \
>   all: $(__stcdll___depname) $(__stclib___depname)
>  
>   install: $(__install_stcdll___depname) $(__install_stclib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
>   done
>  
>   uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
> -@@ -396,15 +395,14 @@ clean:
> +@@ -413,15 +412,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_svg_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_svg_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_svg_Makefile_in
> --- patches/patch-contrib_src_svg_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_svg_Makefile_in 29 Oct 2010 07:36:43 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_svg_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/svg/Makefile.in.orig Fri Mar  6 13:11:17 2009
> -+++ contrib/src/svg/Makefile.in Sun May  2 10:38:53 2010
> -@@ -91,14 +91,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
> +--- contrib/src/svg/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/svg/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -92,14 +92,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
>   @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -188,10 +188,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -206,10 +206,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__svgdll___win32rc = svgdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___svglib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -213,12 +213,11 @@ COND_SHARED_0___svglib___depname = \
> +@@ -231,12 +231,11 @@ COND_SHARED_0___svglib___depname = \
>   all: $(__svgdll___depname) $(__svglib___depname)
>  
>   install: $(__install_svgdll___depname) $(__install_svglib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
>   done
>  
>   uninstall: $(__uninstall_svgdll___depname) $(__uninstall_svglib___depname)
> -@@ -240,15 +239,14 @@ clean:
> +@@ -258,15 +257,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-include_wx_wxchar_h
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-include_wx_wxchar_h,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-include_wx_wxchar_h
> --- patches/patch-include_wx_wxchar_h 10 Sep 2009 21:23:28 -0000 1.4
> +++ patches/patch-include_wx_wxchar_h 29 Oct 2010 07:36:43 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-include_wx_wxchar_h,v 1.4 2009/09/10 21:23:28 landry Exp $
> ---- include/wx/wxchar.h.orig Fri Mar  6 13:10:53 2009
> -+++ include/wx/wxchar.h Fri Sep  4 23:57:40 2009
> -@@ -454,6 +454,8 @@
> +--- include/wx/wxchar.h.orig Thu Apr 15 11:02:48 2010
> ++++ include/wx/wxchar.h Wed Oct 27 12:35:46 2010
> +@@ -466,6 +466,8 @@
>           #endif
>       #endif
>  
> Index: patches/patch-src_common_imagpng_cpp
> ===================================================================
> RCS file: patches/patch-src_common_imagpng_cpp
> diff -N patches/patch-src_common_imagpng_cpp
> --- patches/patch-src_common_imagpng_cpp 10 Sep 2009 21:23:28 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-src_common_imagpng_cpp,v 1.2 2009/09/10 21:23:28 landry Exp $
> -
> -Security fix for part 1 or SA35292 (wxWidgets Double Free Vulnerability).
> -Patch from upstream svn -r60875.
> -
> ---- src/common/imagpng.cpp.orig Fri Mar  6 13:10:56 2009
> -+++ src/common/imagpng.cpp Fri Sep  4 23:57:40 2009
> -@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
> -     if (!image->Ok())
> -         goto error;
> -
> --    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
> -+    // initialize all line pointers to NULL to ensure that they can be safely
> -+    // free()d if an error occurs before all of them could be allocated
> -+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
> -     if ( !lines )
> -         goto error;
> -
> -     for (i = 0; i < height; i++)
> -     {
> -         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
> --        {
> --            for ( unsigned int n = 0; n < i; n++ )
> --                free( lines[n] );
> -             goto error;
> --        }
> -     }
> -
> -     png_read_image( png_ptr, lines );
> Index: patches/patch-src_common_imagtiff_cpp
> ===================================================================
> RCS file: patches/patch-src_common_imagtiff_cpp
> diff -N patches/patch-src_common_imagtiff_cpp
> --- patches/patch-src_common_imagtiff_cpp 11 Jun 2009 08:32:42 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,38 +0,0 @@
> -$OpenBSD: patch-src_common_imagtiff_cpp,v 1.1 2009/06/11 08:32:42 jasper Exp $
> -
> -Security fix for part 2 or SA35292 (wxWidgets Double Free Vulnerability).
> -Patch from upstream svn -r60879 and -r60897.
> -
> ---- src/common/imagtiff.cpp.orig Wed Nov 21 13:41:57 2007
> -+++ src/common/imagtiff.cpp Thu Jun 11 10:12:09 2009
> -@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputS
> -     }
> -
> -     uint32 w, h;
> --    uint32 npixels;
> -     uint32 *raster;
> -
> -     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
> -@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputS
> -                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
> -                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
> -
> --    npixels = w * h;
> -+    // guard against integer overflow during multiplication which could result
> -+    // in allocating a too small buffer and then overflowing it
> -+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
> -+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
> -+    {
> -+        if ( verbose )
> -+            wxLogError( _("TIFF: Image size is abnormally big.") );
> -
> --    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
> -+        TIFFClose(tif);
> -+
> -+        return false;
> -+    }
> -+
> -+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
> -
> -     if (!raster)
> -     {
> Index: patches/patch-src_common_strconv_cpp
> ===================================================================
> RCS file: patches/patch-src_common_strconv_cpp
> diff -N patches/patch-src_common_strconv_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_common_strconv_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/common/strconv.cpp.orig Thu Oct 28 18:02:15 2010
> ++++ src/common/strconv.cpp Thu Oct 28 18:02:50 2010
> +@@ -1676,7 +1676,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
> +         {
> + #if SIZEOF_WCHAR_T == 4
> +             _T("UCS-4"),
> +-#elif SIZEOF_WCHAR_T = 2
> ++#elif SIZEOF_WCHAR_T == 2
> +             _T("UCS-2"),
> + #endif
> +             NULL
> Index: patches/patch-src_common_uri_cpp
> ===================================================================
> RCS file: patches/patch-src_common_uri_cpp
> diff -N patches/patch-src_common_uri_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_common_uri_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +gcc4 fix
> +
> +--- src/common/uri.cpp.orig Wed Oct 27 13:29:20 2010
> ++++ src/common/uri.cpp Wed Oct 27 13:30:27 2010
> +@@ -886,7 +886,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
> +                     op += 3;
> +             }
> +
> +-            m_path = base.m_path.substr(0, bp - base.m_path.c_str()) +
> ++            m_path = (const wxString)base.m_path.substr(0, bp - base.m_path.c_str()) +
> +                     m_path.substr((op - m_path.c_str()), m_path.Length());
> +         }
> +     }
> Index: patches/patch-src_gtk_assertdlg_gtk_c
> ===================================================================
> RCS file: patches/patch-src_gtk_assertdlg_gtk_c
> diff -N patches/patch-src_gtk_assertdlg_gtk_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_gtk_assertdlg_gtk_c 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/gtk/assertdlg_gtk.c.orig Wed Oct 27 16:02:54 2010
> ++++ src/gtk/assertdlg_gtk.c Wed Oct 27 16:03:38 2010
> +@@ -90,7 +90,7 @@ void gtk_assert_dialog_append_text_column (GtkWidget *
> +
> +     renderer = gtk_cell_renderer_text_new ();
> +     column = gtk_tree_view_column_new_with_attributes (name, renderer,
> +-                                                       "text", index, NULL);
> ++                                                       "text", index, (char *)NULL);
> +     gtk_tree_view_insert_column (GTK_TREE_VIEW (treeview), column, index);
> +     gtk_tree_view_column_set_resizable (column, TRUE);
> +     gtk_tree_view_column_set_reorderable (column, TRUE);
> +@@ -172,7 +172,7 @@ void gtk_assert_dialog_save_backtrace_callback (GtkWid
> +                                           GTK_FILE_CHOOSER_ACTION_SAVE,
> +                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> +                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
> +-                                          NULL);
> ++                                          (char *)NULL);
> +
> +     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
> +     {
> Index: patches/patch-src_gtk_gsockgtk_cpp
> ===================================================================
> RCS file: patches/patch-src_gtk_gsockgtk_cpp
> diff -N patches/patch-src_gtk_gsockgtk_cpp
> --- patches/patch-src_gtk_gsockgtk_cpp 4 Oct 2009 18:22:31 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-src_gtk_gsockgtk_cpp,v 1.1 2009/10/04 18:22:31 ajacoutot Exp $
> ---- src/gtk/gsockgtk.cpp.orig Fri Mar  6 13:11:40 2009
> -+++ src/gtk/gsockgtk.cpp Fri Oct  2 09:58:20 2009
> -@@ -15,8 +15,13 @@
> - #include <stdlib.h>
> - #include <stdio.h>
> -
> -+// newer versions of glib define its own GSocket but we unfortunately use this
> -+// // name in our own (semi-)public header and so can't change it -- rename glib
> -+// // one instead
> -+#define GSocket GlibGSocket
> - #include <gdk/gdk.h>
> - #include <glib.h>
> -+#undef GSocket
> -
> - #include "wx/gsocket.h"
> - #include "wx/unix/gsockunx.h"
> Index: patches/patch-src_unix_dialup_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_dialup_cpp
> diff -N patches/patch-src_unix_dialup_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_unix_dialup_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/unix/dialup.cpp.orig Wed Oct 27 16:33:47 2010
> ++++ src/unix/dialup.cpp Wed Oct 27 16:35:11 2010
> +@@ -681,7 +681,7 @@ wxDialUpManagerImpl::CheckIfconfig()
> +     defined(__SOLARIS__) || defined (__SUNOS__)
> +         // need to add -a flag
> +         cmd << wxT(" -a");
> +-#elif defined(__LINUX__) || defined(__SGI__)
> ++#elif defined(__LINUX__) || defined(__SGI__) || defined(__OPENBSD__)
> +         // nothing to be added to ifconfig
> + #elif defined(__FREEBSD__) || defined(__DARWIN__)
> +         // add -l flag
> +@@ -722,7 +722,7 @@ wxDialUpManagerImpl::CheckIfconfig()
> +                     // dialup device under SunOS/Solaris
> +                     hasModem = strstr(output.fn_str(),"ipdptp") != (char *)NULL;
> +                     hasLAN = strstr(output.fn_str(), "hme") != (char *)NULL;
> +-#elif defined(__LINUX__) || defined (__FREEBSD__)
> ++#elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__OPENBSD__)
> +                     hasModem = strstr(output.fn_str(),"ppp")    // ppp
> +                         || strstr(output.fn_str(),"sl")  // slip
> +                         || strstr(output.fn_str(),"pl"); // plip
> Index: patches/patch-src_unix_fontutil_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_fontutil_cpp
> diff -N patches/patch-src_unix_fontutil_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_unix_fontutil_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/unix/fontutil.cpp.orig Wed Oct 27 13:30:36 2010
> ++++ src/unix/fontutil.cpp Wed Oct 27 13:31:00 2010
> +@@ -51,6 +51,7 @@
> + #else
> +     #include "wx/x11/private.h"
> +     #include "wx/gtk/private/string.h"
> ++    #include "wx/app.h"
> +
> +     #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
> + #endif
> Index: patches/patch-src_unix_sound_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_sound_cpp
> diff -N patches/patch-src_unix_sound_cpp
> --- patches/patch-src_unix_sound_cpp 23 Oct 2007 11:28:10 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,27 +0,0 @@
> -$OpenBSD: patch-src_unix_sound_cpp,v 1.2 2007/10/23 11:28:10 steven Exp $
> ---- src/unix/sound.cpp.orig Tue Sep 25 10:52:38 2007
> -+++ src/unix/sound.cpp Tue Oct  2 11:53:18 2007
> -@@ -27,6 +27,10 @@
> - #include <sys/soundcard.h>
> - #endif
> -
> -+#ifdef HAVE_SOUNDCARD_H
> -+#include <soundcard.h>
> -+#endif
> -+
> - #ifndef WX_PRECOMP
> -     #include "wx/event.h"
> -     #include "wx/intl.h"
> -@@ -95,10 +99,10 @@ class wxSoundBackendNull : public wxSoundBackend (publ
> - // wxSoundBackendOSS, for Linux
> - // ----------------------------------------------------------------------------
> -
> --#ifdef HAVE_SYS_SOUNDCARD_H
> -+#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_SOUNDCARD_H)
> -
> - #ifndef AUDIODEV
> --#define AUDIODEV   "/dev/dsp"    // Default path for audio device
> -+#define AUDIODEV   "/dev/audio"    // Default path for audio device
> - #endif
> -
> - class wxSoundBackendOSS : public wxSoundBackend
> Index: patches/patch-src_unix_threadpsx_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_threadpsx_cpp
> diff -N patches/patch-src_unix_threadpsx_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_unix_threadpsx_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,34 @@
> +$OpenBSD$
> +--- src/unix/threadpsx.cpp.orig Thu Apr 15 11:04:33 2010
> ++++ src/unix/threadpsx.cpp Thu Oct 28 07:27:58 2010
> +@@ -1109,19 +1109,29 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_S
> +         wxLogError(_("Cannot retrieve thread scheduling policy."));
> +     }
> +
> +-#ifdef __VMS__
> ++#if defined(__VMS__) || defined (__OPENBSD__)
> +    /* the pthread.h contains too many spaces. This is a work-around */
> ++   /* on OpenBSD, priority min/max are declared in libpthread private hdr */
> + # undef sched_get_priority_max
> + #undef sched_get_priority_min
> ++#endif
> ++#ifdef __VMS__
> + #define sched_get_priority_max(_pol_) \
> +      (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
> + #define sched_get_priority_min(_pol_) \
> +      (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
> + #endif
> +
> ++#ifdef __OPENBSD__
> ++// on OpenBSD, priority min/max are declared in libpthread private hdr
> ++    int max_prio = 31,
> ++        min_prio = 0,
> ++        prio = m_internal->GetPriority();
> ++#else
> +     int max_prio = sched_get_priority_max(policy),
> +         min_prio = sched_get_priority_min(policy),
> +         prio = m_internal->GetPriority();
> ++#endif
> +
> +     if ( min_prio == -1 || max_prio == -1 )
> +     {
> Index: patches/patch-tests_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-tests_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-tests_Makefile_in
> --- patches/patch-tests_Makefile_in 10 Sep 2009 21:23:28 -0000 1.3
> +++ patches/patch-tests_Makefile_in 29 Oct 2010 07:36:43 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-tests_Makefile_in,v 1.3 2009/09/10 21:23:28 landry Exp $
> ---- tests/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ tests/Makefile.in Fri Sep  4 23:57:40 2009
> -@@ -91,7 +91,7 @@ TEST_OBJECTS =  \
> +--- tests/Makefile.in.orig Thu Apr 15 11:03:41 2010
> ++++ tests/Makefile.in Thu Oct 28 12:27:04 2010
> +@@ -92,7 +92,7 @@ TEST_OBJECTS =  \
>   TEST_ODEP =  $(_____pch_testprec_test_testprec_h_gch___depname)
>   TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \
>   $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
> @@ -10,7 +10,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
>   TEST_GUI_OBJECTS =  \
>   $(__test_gui___win32rc) \
> -@@ -133,7 +133,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_tes
> +@@ -134,7 +134,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_tes
>   @COND_USE_PCH_1@_____pch_testprec_test_testprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch
>   COND_MONOLITHIC_0___WXLIB_NET_p = \
> @@ -19,7 +19,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
>   @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
>   @COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true
> -@@ -171,7 +171,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
> +@@ -172,7 +172,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
>   @COND_USE_PCH_1@_____pch_testprec_test_gui_testprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/testprec_test_gui/testprec.h.gch
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -28,7 +28,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
>   @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
>   @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
> -@@ -202,7 +202,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __
> +@@ -204,7 +204,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __
>   @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
>   @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
>   COND_MONOLITHIC_0___WXLIB_BASE_p = \
> @@ -37,3 +37,12 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_MONOLITHIC_1___WXLIB_MONO_p = \
>   -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> +@@ -221,7 +221,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +
> + ### Targets: ###
> +
> +-all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data printfbench$(EXEEXT)
> ++all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data
> +
> + install:
> +
> Index: patches/patch-wx-config_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-wx-config_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-wx-config_in
> --- patches/patch-wx-config_in 10 Sep 2009 21:23:28 -0000 1.3
> +++ patches/patch-wx-config_in 29 Oct 2010 07:36:43 -0000
> @@ -1,13 +1,13 @@
>  $OpenBSD: patch-wx-config_in,v 1.3 2009/09/10 21:23:28 landry Exp $
> ---- wx-config.in.orig Fri Mar  6 13:10:54 2009
> -+++ wx-config.in Fri Sep  4 23:57:40 2009
> +--- wx-config.in.orig Thu Apr 15 11:02:51 2010
> ++++ wx-config.in Wed Oct 27 12:35:47 2010
>  @@ -1,4 +1,4 @@
>  -#!/bin/sh
>  +#!/bin/ksh
>   #
>   # Name:        wx-config{.in,}
>   # Purpose:     wx configuration search and query tool {template,}
> -@@ -566,8 +566,8 @@ find_best_delegate()
> +@@ -610,8 +610,8 @@ find_best_delegate()
>   get_legacy_mask()
>   {
>       [ $# -gt 0 ] || set m
> @@ -18,7 +18,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
>       eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
>   }
>  
> -@@ -996,7 +996,7 @@ lib_flags_for()
> +@@ -1043,7 +1043,7 @@ lib_flags_for()
>               _libname="@WX_LIBRARY_BASENAME_GUI@"
>           fi
>           [ $lib = base ] || _libname="${_libname}_$lib"
> @@ -27,7 +27,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
>  
>           if is_static; then
>               _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
> -@@ -1055,7 +1055,7 @@ link_deps_for()
> +@@ -1102,7 +1102,7 @@ link_deps_for()
>               _libname="@WX_LIBRARY_BASENAME_GUI@"
>           fi
>           [ $lib = base ] || _libname="${_libname}_$lib"
> @@ -36,7 +36,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
>  
>           _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
>       done
> -@@ -1136,7 +1136,7 @@ fi
> +@@ -1183,7 +1183,7 @@ fi
>   [ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
>  
>   if is_installed; then
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 10 Sep 2009 21:23:28 -0000 1.5
> +++ pkg/PLIST 29 Oct 2010 07:36:43 -0000
> @@ -380,26 +380,6 @@ include/wx/menuitem.h
>  include/wx/metafile.h
>  include/wx/mimetype.h
>  include/wx/minifram.h
> -include/wx/mmedia/
> -include/wx/mmedia/cdbase.h
> -include/wx/mmedia/cdunix.h
> -include/wx/mmedia/cdwin.h
> -include/wx/mmedia/sndaiff.h
> -include/wx/mmedia/sndbase.h
> -include/wx/mmedia/sndcodec.h
> -include/wx/mmedia/sndcpcm.h
> -include/wx/mmedia/sndesd.h
> -include/wx/mmedia/sndfile.h
> -include/wx/mmedia/sndg72x.h
> -include/wx/mmedia/sndmsad.h
> -include/wx/mmedia/sndoss.h
> -include/wx/mmedia/sndpcm.h
> -include/wx/mmedia/sndulaw.h
> -include/wx/mmedia/sndwav.h
> -include/wx/mmedia/sndwin.h
> -include/wx/mmedia/vidbase.h
> -include/wx/mmedia/vidwin.h
> -include/wx/mmedia/vidxanm.h
>  include/wx/module.h
>  include/wx/msgdlg.h
>  include/wx/msgout.h
> @@ -654,7 +634,6 @@ include/wx/zstream.h
>  @lib lib/libwx_gtk2_gizmos_xrc.so.${LIBwx_gtk2_gizmos_xrc_VERSION}
>  @lib lib/libwx_gtk2_gl.so.${LIBwx_gtk2_gl_VERSION}
>  @lib lib/libwx_gtk2_html.so.${LIBwx_gtk2_html_VERSION}
> -@lib lib/libwx_gtk2_mmedia.so.${LIBwx_gtk2_mmedia_VERSION}
>  @lib lib/libwx_gtk2_ogl.so.${LIBwx_gtk2_ogl_VERSION}
>  @lib lib/libwx_gtk2_plot.so.${LIBwx_gtk2_plot_VERSION}
>  @lib lib/libwx_gtk2_qa.so.${LIBwx_gtk2_qa_VERSION}

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile 24 Oct 2010 21:15:35 -0000 1.27
> +++ Makefile 29 Oct 2010 07:36:39 -0000
> @@ -4,10 +4,9 @@ SHARED_ONLY= Yes
>  
>  COMMENT= c++ cross-platform GUI toolkit
>  
> -V= 2.8.10
> +V= 2.8.11
>  DISTNAME= wxWidgets-${V}
>  PKGNAME= wxWidgets-gtk2-${V}
> -REVISION= 4
>  
>  SHARED_LIBS= wx_base 2.0 \
>   wx_base_net 2.0 \
> @@ -22,7 +21,6 @@ SHARED_LIBS= wx_base 2.0 \
>   wx_gtk2_gizmos_xrc 2.0 \
>   wx_gtk2_gl 2.0 \
>   wx_gtk2_html 2.0 \
> - wx_gtk2_mmedia 2.0 \
>   wx_gtk2_ogl 2.0 \
>   wx_gtk2_plot 2.0 \
>   wx_gtk2_qa 2.0 \
> @@ -50,38 +48,49 @@ BUILD_DEPENDS= ::devel/cppunit
>  LIB_DEPENDS= ::archivers/libmspack \
>   ::devel/sdl \
>   ::x11/gtk+2 \
> - ::databases/iodbc \
> - ::audio/esound
> + ::databases/iodbc
>  
>  WANTLIB += GL GLU SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
>  WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
> -WANTLIB += c expat fontconfig freetype gio-2.0 glib-2.0
> -WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ossaudio esd
> -WANTLIB += pango-1.0 pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
> -WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-render-util mspack
> +WANTLIB += c drm expat fontconfig freetype gio-2.0 glib-2.0
> +WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m pango-1.0
> +WANTLIB += pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
> +WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-shm mspack
>  WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
>  
>  AUTOCONF_VERSION=2.59
>  CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
> - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include"
> + CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
> + ac_cv_lib_esd_esd_close=no
>  CONFIGURE_STYLE=autoconf no-autoheader
> -CONFIGURE_ARGS= --disable-stl \
> - --with-odbc \
> - --with-libjpeg \
> - --with-libtiff \
> - --with-expat \
> - --with-sdl \
> +CONFIGURE_ARGS= --with-expat=sys \
> + --with-odbc=sys \
> + --with-libjpeg=sys \
> + --with-libpng=sys \
> + --with-libtiff=sys \
> + --with-libxpm=sys \
> + --with-zlib=sys \
> + --with-regex=builtin \
>   --with-gtk \
> + --with-opengl \
> + --with-sdl \
>   --without-gnomeprint \
> + --without-gnomevfs \
>   --without-hildon \
> - --with-opengl \
> + --enable-gui \
> + --enable-sound \
> + --enable-unicode \
>   --disable-backtrace \
> - --enable-unicode
> + --disable-stl
>  
>  .for _l _v in ${SHARED_LIBS}
>  MAKE_ENV+= LIB${_l}_VERSION=${_v}
>  .endfor
>  
>  MAKE_FLAGS= WXUNICODEFLAG=""
> +
> +do-regress:
> + @cd ${WRKSRC}/tests && \
> + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} && ./test
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 10 Sep 2009 21:23:28 -0000 1.7
> +++ distinfo 29 Oct 2010 07:36:39 -0000
> @@ -1,5 +1,5 @@
> -MD5 (wxWidgets-2.8.10.tar.gz) = BbMsoFFlH0sYhakPYpafrw==
> -RMD160 (wxWidgets-2.8.10.tar.gz) = CWX8lYbyUM5wtRjpB8bsX9ujUTE=
> -SHA1 (wxWidgets-2.8.10.tar.gz) = KipXEDBx+hWAh3rnF87XgObWQQE=
> -SHA256 (wxWidgets-2.8.10.tar.gz) = SmVXO8EuFbIaSs3Oiefmtx7b4hSBdFf5D8+FUiC6/mY=
> -SIZE (wxWidgets-2.8.10.tar.gz) = 19357950
> +MD5 (wxWidgets-2.8.11.tar.gz) = zoA4nhtw1qUYyAt7cVt2Pg==
> +RMD160 (wxWidgets-2.8.11.tar.gz) = 3k45vlS9x77F19ENnNotlXJ1kd8=
> +SHA1 (wxWidgets-2.8.11.tar.gz) = lrT/gn1e2WAZ26gX6dZpWpsMFaA=
> +SHA256 (wxWidgets-2.8.11.tar.gz) = Uk9R3WkQlnWHMNnEieMAlTorAb8T6ueDFaSh8IJonUU=
> +SIZE (wxWidgets-2.8.11.tar.gz) = 19464848
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-Makefile_in
> --- patches/patch-Makefile_in 2 May 2010 16:09:55 -0000 1.7
> +++ patches/patch-Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-Makefile_in,v 1.7 2010/05/02 16:09:55 landry Exp $
> ---- Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ Makefile.in Sun May  2 11:17:20 2010
> -@@ -1586,7 +1586,7 @@ LOCALE_MSW_LINGUAS =  it
> +--- Makefile.in.orig Thu Apr 15 11:03:41 2010
> ++++ Makefile.in Wed Oct 27 13:47:32 2010
> +@@ -1595,7 +1595,7 @@ LOCALE_MSW_LINGUAS =  it
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
>   COND_wxUSE_REGEX_builtin___wxregex___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -6806,7 +6806,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
> +@@ -6833,7 +6833,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
>   COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
> @@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
>   @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll
>   @COND_MONOLITHIC_0_SHARED_1@__uninstall_basedll___depname \
> -@@ -7174,7 +7174,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
> +@@ -7217,7 +7217,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
>   @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
>   @COND_TOOLKIT_MAC@ baselib_carbon_utils.o baselib_uma.o
>   COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
> @@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll
>   @COND_MONOLITHIC_0_SHARED_1@__uninstall_netdll___depname = uninstall_netdll
> -@@ -7254,7 +7254,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
> +@@ -7312,7 +7312,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
>   @COND_PLATFORM_WIN32_1@ $(__NET_WINCE_SRC_OBJECTS_3)
>   @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_3 = netlib_net.o
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
> @@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_coredll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll
> -@@ -10212,7 +10212,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
> +@@ -10288,7 +10288,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
>   corelib_x11_window.o
>   @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
> @@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
> -@@ -10382,7 +10382,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
> +@@ -10473,7 +10473,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
>   @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
> @@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__install_mediadll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ = install_mediadll
> -@@ -10492,7 +10492,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
> +@@ -10600,7 +10600,7 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
>   @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
>   @COND_TOOLKIT_X11@ medialib_unix_mediactrl.o
>   COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
> @@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ = install_odbcdll
> -@@ -10556,7 +10556,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depn
> +@@ -10680,7 +10680,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depn
>   @COND_USE_PCH_1@_____pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_odbclib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
> @@ -73,7 +73,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_dbgriddll
> -@@ -10620,7 +10620,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgr
> +@@ -10761,7 +10761,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgr
>   @COND_USE_PCH_1@_____pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_dbgridlib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
> @@ -82,7 +82,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = install_htmldll
> -@@ -10690,7 +10690,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___html
> +@@ -10847,7 +10847,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___html
>   @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
>   @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
>   COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
> @@ -91,7 +91,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__install_qadll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ = install_qadll
> -@@ -10754,7 +10754,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib_
> +@@ -10926,7 +10926,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib_
>   @COND_USE_PCH_1@_____pch_wxprec_qalib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_qalib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
> @@ -100,7 +100,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
>   @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
>   @COND_MONOLITHIC_0_SHARED_1@__uninstall_xmldll___depname = uninstall_xmldll
> -@@ -10814,7 +10814,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
> +@@ -11001,7 +11001,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
>   @COND_USE_PCH_1@_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_xmllib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
> @@ -109,7 +109,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
> -@@ -10878,7 +10878,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depnam
> +@@ -11080,7 +11080,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depnam
>   @COND_USE_PCH_1@_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_xrclib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
> @@ -118,8 +118,8 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__auidll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__install_auidll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ = install_auidll
> -@@ -10930,7 +10930,7 @@ COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cm
> - @COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cmd)
> +@@ -11147,7 +11147,7 @@ COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_
> + @COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd)
>   @COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o
>   COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
>  - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> @@ -127,7 +127,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname)
>   @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__install_auilib___depname \
>   @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
> -@@ -10942,7 +10942,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depnam
> +@@ -11159,7 +11159,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depnam
>   @COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch
>   COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname = \
> @@ -136,7 +136,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__richtextdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname)
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__install_richtextdll___depname \
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ = install_richtextdll
> -@@ -11007,7 +11007,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextli
> +@@ -11242,7 +11242,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextli
>   @COND_USE_PCH_1@_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
>   COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
> @@ -145,7 +145,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
> -@@ -11070,10 +11070,10 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd
> +@@ -11320,10 +11320,10 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_c
>   @COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_msw_glcanvas.o
>   @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_x11_glcanvas.o
>   COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
> @@ -158,7 +158,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
>   COND_MONOLITHIC_1___WXLIB_MONO_p = \
>   -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> -@@ -11442,7 +11442,12 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -11693,7 +11693,12 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   ### Targets: ###
>  
>   all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
> @@ -171,7 +171,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
>   $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
>   (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
> -@@ -11455,13 +11460,14 @@ install: $(__install_wxregex___depname) $(__install_wx
> +@@ -11706,13 +11711,14 @@ install: $(__install_wxregex___depname) $(__install_wx
>   fi; \
>   $(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
>   done
> @@ -190,7 +190,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @echo " "
>   @echo " ------------------------------------------------------"
>   @echo " "
> -@@ -11669,7 +11675,7 @@ distclean: clean
> +@@ -11920,7 +11926,7 @@ distclean: clean
>   @COND_SHARED_0_wxUSE_EXPAT_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
>  
>   @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__monodll___win32rc)
> @@ -199,7 +199,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_1_SHARED_1@
>   @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
>  
> -@@ -11702,15 +11708,14 @@ distclean: clean
> +@@ -11953,15 +11959,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_monolib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
>  
> @@ -218,7 +218,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1@uninstall_basedll:
> -@@ -11736,15 +11741,14 @@ distclean: clean
> +@@ -11987,15 +11992,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_baselib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
>  
> @@ -237,7 +237,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1@uninstall_netdll:
> -@@ -11770,15 +11774,14 @@ distclean: clean
> +@@ -12021,15 +12025,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_netlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
>  
> @@ -256,7 +256,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll:
> -@@ -11804,15 +11807,14 @@ distclean: clean
> +@@ -12055,15 +12058,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_corelib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
>  
> @@ -275,7 +275,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll:
> -@@ -11838,15 +11840,14 @@ distclean: clean
> +@@ -12089,15 +12091,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_advlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
>  
> @@ -294,7 +294,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll:
> -@@ -11872,15 +11873,14 @@ distclean: clean
> +@@ -12123,15 +12124,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_medialib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
>  
> @@ -313,7 +313,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@uninstall_odbcdll:
> -@@ -11906,15 +11906,14 @@ distclean: clean
> +@@ -12157,15 +12157,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_odbclib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
>  
> @@ -332,7 +332,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@uninstall_dbgriddll:
> -@@ -11940,15 +11939,14 @@ distclean: clean
> +@@ -12191,15 +12190,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_dbgridlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
>  
> @@ -351,7 +351,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll:
> -@@ -11974,15 +11972,14 @@ distclean: clean
> +@@ -12225,15 +12223,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_htmllib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
>  
> @@ -370,7 +370,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll:
> -@@ -12008,15 +12005,14 @@ distclean: clean
> +@@ -12259,15 +12256,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_qalib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
>  
> @@ -389,7 +389,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll:
> -@@ -12042,15 +12038,14 @@ distclean: clean
> +@@ -12293,15 +12289,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_xmllib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
>  
> @@ -408,7 +408,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll:
> -@@ -12076,15 +12071,14 @@ distclean: clean
> +@@ -12327,15 +12322,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_xrclib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
>  
> @@ -427,7 +427,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll:
> -@@ -12110,15 +12104,14 @@ distclean: clean
> +@@ -12361,15 +12355,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_auilib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
>  
> @@ -446,13 +446,13 @@ $OpenBSD: patch-Makefile_in,v 1.7 2010/0
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd))
>  
>   @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll:
> -@@ -12144,15 +12137,14 @@ distclean: clean
> +@@ -12395,15 +12388,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_richtextlib/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
>  
> --@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
> +-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
>  -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
> -+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(LIBwx_gtk2_gl_VERSION): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
> ++@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3).$(LIBwx_gtk2_gl_VERSION): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
>  +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@
>   @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
> Index: patches/patch-autoconf_inc_m4
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-autoconf_inc_m4,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-autoconf_inc_m4
> --- patches/patch-autoconf_inc_m4 10 Sep 2009 21:23:28 -0000 1.1
> +++ patches/patch-autoconf_inc_m4 29 Oct 2010 07:36:42 -0000
> @@ -1,26 +1,26 @@
>  $OpenBSD: patch-autoconf_inc_m4,v 1.1 2009/09/10 21:23:28 landry Exp $
>  Don't use evil ln -s between lib.so.x.y and lib.so.x and lib.so
> ---- autoconf_inc.m4.orig Fri Mar  6 13:10:54 2009
> -+++ autoconf_inc.m4 Sun Sep  6 11:21:56 2009
> -@@ -281,7 +281,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVE
> - dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> -     COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
> -     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
> --        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
> -+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
> +--- autoconf_inc.m4.orig Wed Oct 27 12:30:11 2010
> ++++ autoconf_inc.m4 Wed Oct 27 12:32:43 2010
> +@@ -275,7 +275,7 @@ dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_
> + dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> +     COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
> +     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
> +-        COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1=""
> ++        COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
>       fi
> -     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
> - dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
> -@@ -851,7 +851,7 @@ dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/b
> - dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> -     COND_USE_SOSYMLINKS_1="#"
> -     if test "x$USE_SOSYMLINKS" = "x1" ; then
> --        COND_USE_SOSYMLINKS_1=""
> -+        COND_USE_SOSYMLINKS_1="#"
> +     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1)
> + dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> +@@ -857,7 +857,7 @@ dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/b
> + dnl ### begin block 20_COND_USE_SOTWOSYMLINKS_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> +     COND_USE_SOTWOSYMLINKS_1="#"
> +     if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
> +-        COND_USE_SOTWOSYMLINKS_1=""
> ++        COND_USE_SOTWOSYMLINKS_1="#"
>       fi
> -     AC_SUBST(COND_USE_SOSYMLINKS_1)
> +     AC_SUBST(COND_USE_SOTWOSYMLINKS_1)
>   dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> -@@ -867,7 +867,7 @@ dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../con
> +@@ -873,7 +873,7 @@ dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../con
>       fi
>       AC_SUBST(COND_USE_SOVERLINUX_1)
>   dnl ### begin block 20_COND_USE_SOVERSION_0[../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
> Index: patches/patch-configure_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-configure_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-configure_in
> --- patches/patch-configure_in 10 Sep 2009 21:23:28 -0000 1.4
> +++ patches/patch-configure_in 29 Oct 2010 07:36:42 -0000
> @@ -1,6 +1,24 @@
>  $OpenBSD: patch-configure_in,v 1.4 2009/09/10 21:23:28 landry Exp $
> ---- configure.in.orig Fri Mar  6 13:10:54 2009
> -+++ configure.in Fri Sep  4 23:57:38 2009
> +--- configure.in.orig Thu Apr 15 11:02:51 2010
> ++++ configure.in Thu Oct 28 16:27:20 2010
> +@@ -3090,7 +3090,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
> +             dnl HAVE_STDLIB_H which are already defined and this provokes
> +             dnl a compiler warning which configure considers as an error...
> +             AC_MSG_CHECKING(for jpeglib.h)
> +-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
> ++            AC_CACHE_VAL(ac_cv_header_jpeglib_h,[
> +                 AC_TRY_COMPILE(
> +                     [
> +                         #undef HAVE_STDLIB_H
> +@@ -3102,7 +3102,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
> +                     ac_cv_header_jpeglib_h=yes,
> +                     ac_cv_header_jpeglib_h=no
> +                 )
> +-            )
> ++            ])
> +             AC_MSG_RESULT($ac_cv_header_jpeglib_h)
> +
> +             if test "$ac_cv_header_jpeglib_h" = "yes"; then
>  @@ -4154,7 +4154,7 @@ if test "$TOOLKIT" != "MSW" ; then
>  
>           AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
> @@ -54,41 +72,25 @@ $OpenBSD: patch-configure_in,v 1.4 2009/
>   else
>       AC_MSG_WARN([Wide character support is unavailable])
>   fi
> -@@ -6116,8 +6108,37 @@ if test "$USE_UNIX" = "1" ; then
> -         ])
> -     fi
> +@@ -5609,8 +5601,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
> +       dnl      (this one can be in either libpthread or libposix4 (under Solaris))
> +       dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
> +       HAVE_PRIOR_FUNCS=0
> ++      if test "$USE_OPENBSD" = 1; then
> +       AC_CHECK_FUNC(pthread_attr_getschedpolicy,
> +                      [AC_CHECK_FUNC(pthread_attr_setschedparam,
> ++                         HAVE_PRIOR_FUNCS=1)])
> ++      else
> ++      AC_CHECK_FUNC(pthread_attr_getschedpolicy,
> ++                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
> +                        [AC_CHECK_FUNC(sched_get_priority_max,
> +                            HAVE_PRIOR_FUNCS=1,
> +                            [AC_CHECK_LIB([posix4], sched_get_priority_max,
> +@@ -5622,6 +5619,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
> +                        )]
> +                      )]
> +                    )
> ++      fi
>  
> -+    AC_CACHE_CHECK([for ioctl() in soundcard.h], ac_cv_header_soundcard, [
> -+        AC_TRY_LINK([
> -+                #include <soundcard.h>
> -+            ],
> -+            [
> -+                ioctl(0, SNDCTL_DSP_SYNC, 0);
> -+            ],
> -+            ac_cv_header_soundcard=yes,
> -+            [
> -+                saveLibs="$LIBS"
> -+                LIBS="$saveLibs -lossaudio"
> -+                AC_TRY_LINK([
> -+                        #include <soundcard.h>
> -+                    ],
> -+                    [
> -+                        ioctl(0, SNDCTL_DSP_SYNC, 0);
> -+                    ],
> -+                    ac_cv_header_soundcard=yes,
> -+                    [
> -+                        LIBS="$saveLibs"
> -+                        ac_cv_header_soundcard=no
> -+                    ]
> -+                )
> -+            ]
> -+        )
> -+    ])
> -+
> -     if test "$ac_cv_header_sys_soundcard" = "yes"; then
> -         AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
> -+    elif test "$ac_cv_header_soundcard" = "yes"; then
> -+        AC_DEFINE(HAVE_SOUNDCARD_H)
> -     else
> -         DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
> -     fi
> +       if test "$HAVE_PRIOR_FUNCS" = 1; then
> +         AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
> Index: patches/patch-contrib_src_Makefile_in
> ===================================================================
> RCS file: patches/patch-contrib_src_Makefile_in
> diff -N patches/patch-contrib_src_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-contrib_src_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Zap mmedia contrib library.
> +It contains deprecated and/or linux-only code, it's not used by any
> +port and it's already gone bye-bye in upstream svn trunk as well.
> +And we avoid depending on ossaudio and esound, which is also good.
> +
> +--- contrib/src/Makefile.in.orig Thu Apr 15 11:03:42 2010
> ++++ contrib/src/Makefile.in Thu Oct 28 11:21:55 2010
> +@@ -2,3 +2,3 @@
> +
> +-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
> ++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet #mmedia
> +
> Index: patches/patch-contrib_src_deprecated_Makefile_in
> ===================================================================
> RCS file: patches/patch-contrib_src_deprecated_Makefile_in
> diff -N patches/patch-contrib_src_deprecated_Makefile_in
> --- patches/patch-contrib_src_deprecated_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,68 +0,0 @@
> -$OpenBSD: patch-contrib_src_deprecated_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/deprecated/Makefile.in.orig Fri Mar  6 13:11:17 2009
> -+++ contrib/src/deprecated/Makefile.in Sun May  2 10:39:23 2010
> -@@ -120,14 +120,14 @@ DEPRECATEDLIB_ODEP = \
> - @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
> - @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
> - @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> --@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
> -+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
> - @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
> - COND_SHARED_1___deprecateddll___depname = \
> -- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
> -+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(LIBwx_gtk2_deprecated_VERSION)
> - @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
> - @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
> - @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -220,10 +220,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> - @COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \
> - @COND_PLATFORM_WIN32_1@ deprecateddll_version_rc.o
> - COND_MONOLITHIC_0___WXLIB_CORE_p = \
> -- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
> - @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
> - COND_MONOLITHIC_0___WXLIB_BASE_p = \
> -- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
> - @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
> - COND_SHARED_0___deprecatedlib___depname = \
> - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -246,12 +246,11 @@ COND_SHARED_0___deprecatedlib___depname = \
> - all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
> -
> - install: $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
> - for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
> -- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
> -+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
> -+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
> - fi; \
> -- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
> -+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
> - done
> -
> - uninstall: $(__uninstall_deprecateddll___depname) $(__uninstall_deprecatedlib___depname)
> -@@ -273,15 +272,14 @@ clean:
> - distclean: clean
> - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
> -
> --@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
> --@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS)    -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> -+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3).$(LIBwx_gtk2_deprecated_VERSION): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
> -+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS)    -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> - @COND_SHARED_1@
> - @COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd)
> -
> - @COND_SHARED_1@install_deprecateddll: $(__deprecateddll___depname)
> - @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
> -+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_deprecated_VERSION) $(DESTDIR)$(libdir)
> - @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
> -
> - @COND_SHARED_1@uninstall_deprecateddll:
> Index: patches/patch-contrib_src_fl_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_fl_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_fl_Makefile_in
> --- patches/patch-contrib_src_fl_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_fl_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_fl_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/fl/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/fl/Makefile.in Sun May  2 10:38:03 2010
> -@@ -123,14 +123,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
> +--- contrib/src/fl/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/fl/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -124,14 +124,14 @@ FLLIB_ODEP =  $(_____pch_wxprec_fllib_wx_wxprec_h_gch_
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
>   @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -220,10 +220,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -238,10 +238,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___fllib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -245,12 +245,11 @@ COND_SHARED_0___fllib___depname = \
> +@@ -263,12 +263,11 @@ COND_SHARED_0___fllib___depname = \
>   all: $(__fldll___depname) $(__fllib___depname)
>  
>   install: $(__install_fldll___depname) $(__install_fllib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_fl_Makefile_
>   done
>  
>   uninstall: $(__uninstall_fldll___depname) $(__uninstall_fllib___depname)
> -@@ -272,15 +271,14 @@ clean:
> +@@ -290,15 +289,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_gizmos_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_gizmos_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_gizmos_Makefile_in
> --- patches/patch-contrib_src_gizmos_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_gizmos_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_gizmos_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/gizmos/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/gizmos/Makefile.in Sun May  2 10:38:39 2010
> -@@ -118,14 +118,14 @@ GIZMOS_XRCLIB_ODEP = \
> +--- contrib/src/gizmos/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/gizmos/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -121,14 +121,14 @@ GIZMOS_XRCLIB_ODEP = \
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,8 +18,8 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
>   @COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
>   @COND_SHARED_1@__uninstall_gizmosdll___depname = uninstall_gizmosdll
> -@@ -175,7 +175,7 @@ COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst
> - @COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd)
> +@@ -195,7 +195,7 @@ COND_USE_SOVERSOLARIS_1___gizmosdll___so_symlinks_unin
> + @COND_USE_SOVERSOLARIS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___gizmosdll___so_symlinks_uninst_cmd)
>   @COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
>   COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
>  - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
> @@ -27,7 +27,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
>   @COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
>   @COND_SHARED_1_USE_XRC_1@ = install_gizmos_xrcdll
> -@@ -229,10 +229,10 @@ COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_un
> +@@ -266,10 +266,10 @@ COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___so_symlinks_
>   @COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
>   @COND_PLATFORM_WIN32_1@ gizmos_xrcdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_XRC_p = \
> @@ -40,7 +40,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
>   COND_SHARED_0___gizmoslib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -293,10 +293,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -332,10 +332,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -53,7 +53,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
> -@@ -308,12 +308,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
> +@@ -347,12 +347,11 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
>   all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
>  
>   install: $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
> @@ -69,7 +69,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   done
>  
>   uninstall: $(__uninstall_gizmosdll___depname) $(__uninstall_gizmos_xrcdll___depname) $(__uninstall_gizmoslib___depname) $(__uninstall_gizmos_xrclib___depname)
> -@@ -340,15 +339,14 @@ clean:
> +@@ -379,15 +378,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> @@ -88,7 +88,7 @@ $OpenBSD: patch-contrib_src_gizmos_Makef
>   @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
>  
>   @COND_SHARED_1@uninstall_gizmosdll:
> -@@ -359,15 +357,14 @@ distclean: clean
> +@@ -398,15 +396,14 @@ distclean: clean
>   @COND_USE_PCH_1@./.pch/wxprec_gizmosdll/wx/wxprec.h.gch:
>   @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
>  
> Index: patches/patch-contrib_src_mmedia_Makefile_in
> ===================================================================
> RCS file: patches/patch-contrib_src_mmedia_Makefile_in
> diff -N patches/patch-contrib_src_mmedia_Makefile_in
> --- patches/patch-contrib_src_mmedia_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,68 +0,0 @@
> -$OpenBSD: patch-contrib_src_mmedia_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/mmedia/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/mmedia/Makefile.in Sun May  2 10:39:07 2010
> -@@ -126,14 +126,14 @@ MMEDIALIB_ODEP =  $(_____pch_wxprec_mmedialib_wx_wxpre
> - @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
> - @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
> - @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> --@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
> -+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
> - @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
> - @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
> - COND_SHARED_1___mmediadll___depname = \
> -- $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
> -+ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(LIBwx_gtk2_mmedia_VERSION)
> - @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
> - @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
> - @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -232,10 +232,10 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS =  
> - @COND_PLATFORM_WIN32_1@ = mmediadll_cdwin.o mmediadll_sndwin.o \
> - @COND_PLATFORM_WIN32_1@ mmediadll_vidwin.o
> - COND_MONOLITHIC_0___WXLIB_CORE_p = \
> -- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
> - @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
> - COND_MONOLITHIC_0___WXLIB_BASE_p = \
> -- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> -+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
> - @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
> - COND_SHARED_0___mmedialib___depname = \
> - $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -266,12 +266,11 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =
> - all: $(__mmediadll___depname) $(__mmedialib___depname)
> -
> - install: $(__install_mmediadll___depname) $(__install_mmedialib___depname)
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
> - for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
> -- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
> -- $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
> -+ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
> -+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
> - fi; \
> -- $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
> -+ $(INSTALL_DATA) $(srcdir)/../../include/$$f $(DESTDIR)$(includedir)/$$f; \
> - done
> -
> - uninstall: $(__uninstall_mmediadll___depname) $(__uninstall_mmedialib___depname)
> -@@ -293,15 +292,14 @@ clean:
> - distclean: clean
> - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
> -
> --@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
> --@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS)    -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> -+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3).$(LIBwx_gtk2_mmedia_VERSION): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
> -+@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS)    -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(LDFLAGS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(LIBS)
> - @COND_SHARED_1@
> - @COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd)
> -
> - @COND_SHARED_1@install_mmediadll: $(__mmediadll___depname)
> - @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
> --@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
> -+@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.$(DLLIMP_SUFFIX).$(LIBwx_gtk2_mmedia_VERSION) $(DESTDIR)$(libdir)
> - @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
> -
> - @COND_SHARED_1@uninstall_mmediadll:
> Index: patches/patch-contrib_src_mmedia_sndoss_cpp
> ===================================================================
> RCS file: patches/patch-contrib_src_mmedia_sndoss_cpp
> diff -N patches/patch-contrib_src_mmedia_sndoss_cpp
> --- patches/patch-contrib_src_mmedia_sndoss_cpp 23 Oct 2007 11:28:10 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-contrib_src_mmedia_sndoss_cpp,v 1.2 2007/10/23 11:28:10 steven Exp $
> ---- contrib/src/mmedia/sndoss.cpp.orig Tue Sep 25 10:52:15 2007
> -+++ contrib/src/mmedia/sndoss.cpp Tue Oct  2 11:53:18 2007
> -@@ -11,7 +11,7 @@
> - // System dependent headers
> - // --------------------------------------------------------------------------
> -
> --#include <sys/soundcard.h>
> -+#include <soundcard.h>
> - #include <sys/types.h>
> - #include <sys/stat.h>
> - #include <sys/ioctl.h>
> Index: patches/patch-contrib_src_ogl_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_ogl_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_ogl_Makefile_in
> --- patches/patch-contrib_src_ogl_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_ogl_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,16 @@
>  $OpenBSD: patch-contrib_src_ogl_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/ogl/Makefile.in.orig Sun May  2 10:37:48 2010
> -+++ contrib/src/ogl/Makefile.in Sun May  2 10:36:43 2010
> -@@ -113,14 +113,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
> +--- contrib/src/ogl/Makefile.in.orig Thu Apr 15 11:03:57 2010
> ++++ contrib/src/ogl/Makefile.in Thu Oct 28 10:02:00 2010
> +@@ -61,7 +61,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
> + OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
> + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
> + -DWXBUILDING -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
> +- $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
> ++ -DwxUSE_PROLOGIO=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
> + OGLDLL_OBJECTS =  \
> + $(__ogldll___win32rc) \
> + ogldll_basic2.o \
> +@@ -114,14 +114,14 @@ OGLLIB_ODEP =  $(_____pch_wxprec_ogllib_wx_wxprec_h_gc
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +27,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
>   @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -210,10 +210,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -228,10 +228,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +40,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___ogllib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -235,12 +235,11 @@ COND_SHARED_0___ogllib___depname = \
> +@@ -253,12 +253,11 @@ COND_SHARED_0___ogllib___depname = \
>   all: $(__ogldll___depname) $(__ogllib___depname)
>  
>   install: $(__install_ogldll___depname) $(__install_ogllib___depname)
> @@ -47,7 +56,7 @@ $OpenBSD: patch-contrib_src_ogl_Makefile
>   done
>  
>   uninstall: $(__uninstall_ogldll___depname) $(__uninstall_ogllib___depname)
> -@@ -262,15 +261,14 @@ clean:
> +@@ -280,15 +279,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_plot_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_plot_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_plot_Makefile_in
> --- patches/patch-contrib_src_plot_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_plot_Makefile_in 29 Oct 2010 07:36:42 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_plot_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/plot/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/plot/Makefile.in Sun May  2 10:39:38 2010
> -@@ -91,14 +91,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
> +--- contrib/src/plot/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/plot/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -93,14 +93,14 @@ PLOTLIB_ODEP =  $(_____pch_wxprec_plotlib_wx_wxprec_h_
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
>   @COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -188,10 +188,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -208,10 +208,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___plotlib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -213,12 +213,11 @@ COND_SHARED_0___plotlib___depname = \
> +@@ -233,12 +233,11 @@ COND_SHARED_0___plotlib___depname = \
>   all: $(__plotdll___depname) $(__plotlib___depname)
>  
>   install: $(__install_plotdll___depname) $(__install_plotlib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_plot_Makefil
>   done
>  
>   uninstall: $(__uninstall_plotdll___depname) $(__uninstall_plotlib___depname)
> -@@ -240,15 +239,14 @@ clean:
> +@@ -260,15 +259,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_stc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_stc_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_stc_Makefile_in
> --- patches/patch-contrib_src_stc_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_stc_Makefile_in 29 Oct 2010 07:36:43 -0000
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-contrib_src_stc_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/stc/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ contrib/src/stc/Makefile.in Sun May  2 10:39:59 2010
> +--- contrib/src/stc/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/stc/Makefile.in Wed Oct 27 12:36:07 2010
>  @@ -257,14 +257,14 @@ STCLIB_OBJECTS =  \
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
>   @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -349,10 +349,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -366,10 +366,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___stclib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -369,12 +369,11 @@ COND_SHARED_0___stclib___depname = \
> +@@ -386,12 +386,11 @@ COND_SHARED_0___stclib___depname = \
>   all: $(__stcdll___depname) $(__stclib___depname)
>  
>   install: $(__install_stcdll___depname) $(__install_stclib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_stc_Makefile
>   done
>  
>   uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
> -@@ -396,15 +395,14 @@ clean:
> +@@ -413,15 +412,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-contrib_src_svg_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-contrib_src_svg_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-contrib_src_svg_Makefile_in
> --- patches/patch-contrib_src_svg_Makefile_in 2 May 2010 16:09:55 -0000 1.4
> +++ patches/patch-contrib_src_svg_Makefile_in 29 Oct 2010 07:36:43 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-contrib_src_svg_Makefile_in,v 1.4 2010/05/02 16:09:55 landry Exp $
> ---- contrib/src/svg/Makefile.in.orig Fri Mar  6 13:11:17 2009
> -+++ contrib/src/svg/Makefile.in Sun May  2 10:38:53 2010
> -@@ -91,14 +91,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
> +--- contrib/src/svg/Makefile.in.orig Thu Apr 15 11:03:43 2010
> ++++ contrib/src/svg/Makefile.in Wed Oct 27 12:36:07 2010
> +@@ -92,14 +92,14 @@ SVGLIB_ODEP =  $(_____pch_wxprec_svglib_wx_wxprec_h_gc
>   @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
>   @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
>   @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
>   @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname)
>   @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
>   @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
> -@@ -188,10 +188,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +@@ -206,10 +206,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
>   @COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
>   @COND_PLATFORM_WIN32_1@__svgdll___win32rc = svgdll_version_rc.o
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -31,7 +31,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_SHARED_0___svglib___depname = \
>   $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
> -@@ -213,12 +213,11 @@ COND_SHARED_0___svglib___depname = \
> +@@ -231,12 +231,11 @@ COND_SHARED_0___svglib___depname = \
>   all: $(__svgdll___depname) $(__svglib___depname)
>  
>   install: $(__install_svgdll___depname) $(__install_svglib___depname)
> @@ -47,7 +47,7 @@ $OpenBSD: patch-contrib_src_svg_Makefile
>   done
>  
>   uninstall: $(__uninstall_svgdll___depname) $(__uninstall_svglib___depname)
> -@@ -240,15 +239,14 @@ clean:
> +@@ -258,15 +257,14 @@ clean:
>   distclean: clean
>   rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
>  
> Index: patches/patch-include_wx_wxchar_h
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-include_wx_wxchar_h,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-include_wx_wxchar_h
> --- patches/patch-include_wx_wxchar_h 10 Sep 2009 21:23:28 -0000 1.4
> +++ patches/patch-include_wx_wxchar_h 29 Oct 2010 07:36:43 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-include_wx_wxchar_h,v 1.4 2009/09/10 21:23:28 landry Exp $
> ---- include/wx/wxchar.h.orig Fri Mar  6 13:10:53 2009
> -+++ include/wx/wxchar.h Fri Sep  4 23:57:40 2009
> -@@ -454,6 +454,8 @@
> +--- include/wx/wxchar.h.orig Thu Apr 15 11:02:48 2010
> ++++ include/wx/wxchar.h Wed Oct 27 12:35:46 2010
> +@@ -466,6 +466,8 @@
>           #endif
>       #endif
>  
> Index: patches/patch-src_common_imagpng_cpp
> ===================================================================
> RCS file: patches/patch-src_common_imagpng_cpp
> diff -N patches/patch-src_common_imagpng_cpp
> --- patches/patch-src_common_imagpng_cpp 10 Sep 2009 21:23:28 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-src_common_imagpng_cpp,v 1.2 2009/09/10 21:23:28 landry Exp $
> -
> -Security fix for part 1 or SA35292 (wxWidgets Double Free Vulnerability).
> -Patch from upstream svn -r60875.
> -
> ---- src/common/imagpng.cpp.orig Fri Mar  6 13:10:56 2009
> -+++ src/common/imagpng.cpp Fri Sep  4 23:57:40 2009
> -@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
> -     if (!image->Ok())
> -         goto error;
> -
> --    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
> -+    // initialize all line pointers to NULL to ensure that they can be safely
> -+    // free()d if an error occurs before all of them could be allocated
> -+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
> -     if ( !lines )
> -         goto error;
> -
> -     for (i = 0; i < height; i++)
> -     {
> -         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
> --        {
> --            for ( unsigned int n = 0; n < i; n++ )
> --                free( lines[n] );
> -             goto error;
> --        }
> -     }
> -
> -     png_read_image( png_ptr, lines );
> Index: patches/patch-src_common_imagtiff_cpp
> ===================================================================
> RCS file: patches/patch-src_common_imagtiff_cpp
> diff -N patches/patch-src_common_imagtiff_cpp
> --- patches/patch-src_common_imagtiff_cpp 11 Jun 2009 08:32:42 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,38 +0,0 @@
> -$OpenBSD: patch-src_common_imagtiff_cpp,v 1.1 2009/06/11 08:32:42 jasper Exp $
> -
> -Security fix for part 2 or SA35292 (wxWidgets Double Free Vulnerability).
> -Patch from upstream svn -r60879 and -r60897.
> -
> ---- src/common/imagtiff.cpp.orig Wed Nov 21 13:41:57 2007
> -+++ src/common/imagtiff.cpp Thu Jun 11 10:12:09 2009
> -@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputS
> -     }
> -
> -     uint32 w, h;
> --    uint32 npixels;
> -     uint32 *raster;
> -
> -     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
> -@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputS
> -                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
> -                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
> -
> --    npixels = w * h;
> -+    // guard against integer overflow during multiplication which could result
> -+    // in allocating a too small buffer and then overflowing it
> -+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
> -+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
> -+    {
> -+        if ( verbose )
> -+            wxLogError( _("TIFF: Image size is abnormally big.") );
> -
> --    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
> -+        TIFFClose(tif);
> -+
> -+        return false;
> -+    }
> -+
> -+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
> -
> -     if (!raster)
> -     {
> Index: patches/patch-src_common_strconv_cpp
> ===================================================================
> RCS file: patches/patch-src_common_strconv_cpp
> diff -N patches/patch-src_common_strconv_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_common_strconv_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/common/strconv.cpp.orig Thu Oct 28 18:02:15 2010
> ++++ src/common/strconv.cpp Thu Oct 28 18:02:50 2010
> +@@ -1676,7 +1676,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
> +         {
> + #if SIZEOF_WCHAR_T == 4
> +             _T("UCS-4"),
> +-#elif SIZEOF_WCHAR_T = 2
> ++#elif SIZEOF_WCHAR_T == 2
> +             _T("UCS-2"),
> + #endif
> +             NULL
> Index: patches/patch-src_common_uri_cpp
> ===================================================================
> RCS file: patches/patch-src_common_uri_cpp
> diff -N patches/patch-src_common_uri_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_common_uri_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +gcc4 fix
> +
> +--- src/common/uri.cpp.orig Wed Oct 27 13:29:20 2010
> ++++ src/common/uri.cpp Wed Oct 27 13:30:27 2010
> +@@ -886,7 +886,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
> +                     op += 3;
> +             }
> +
> +-            m_path = base.m_path.substr(0, bp - base.m_path.c_str()) +
> ++            m_path = (const wxString)base.m_path.substr(0, bp - base.m_path.c_str()) +
> +                     m_path.substr((op - m_path.c_str()), m_path.Length());
> +         }
> +     }
> Index: patches/patch-src_gtk_assertdlg_gtk_c
> ===================================================================
> RCS file: patches/patch-src_gtk_assertdlg_gtk_c
> diff -N patches/patch-src_gtk_assertdlg_gtk_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_gtk_assertdlg_gtk_c 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/gtk/assertdlg_gtk.c.orig Wed Oct 27 16:02:54 2010
> ++++ src/gtk/assertdlg_gtk.c Wed Oct 27 16:03:38 2010
> +@@ -90,7 +90,7 @@ void gtk_assert_dialog_append_text_column (GtkWidget *
> +
> +     renderer = gtk_cell_renderer_text_new ();
> +     column = gtk_tree_view_column_new_with_attributes (name, renderer,
> +-                                                       "text", index, NULL);
> ++                                                       "text", index, (char *)NULL);
> +     gtk_tree_view_insert_column (GTK_TREE_VIEW (treeview), column, index);
> +     gtk_tree_view_column_set_resizable (column, TRUE);
> +     gtk_tree_view_column_set_reorderable (column, TRUE);
> +@@ -172,7 +172,7 @@ void gtk_assert_dialog_save_backtrace_callback (GtkWid
> +                                           GTK_FILE_CHOOSER_ACTION_SAVE,
> +                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
> +                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
> +-                                          NULL);
> ++                                          (char *)NULL);
> +
> +     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
> +     {
> Index: patches/patch-src_gtk_gsockgtk_cpp
> ===================================================================
> RCS file: patches/patch-src_gtk_gsockgtk_cpp
> diff -N patches/patch-src_gtk_gsockgtk_cpp
> --- patches/patch-src_gtk_gsockgtk_cpp 4 Oct 2009 18:22:31 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-src_gtk_gsockgtk_cpp,v 1.1 2009/10/04 18:22:31 ajacoutot Exp $
> ---- src/gtk/gsockgtk.cpp.orig Fri Mar  6 13:11:40 2009
> -+++ src/gtk/gsockgtk.cpp Fri Oct  2 09:58:20 2009
> -@@ -15,8 +15,13 @@
> - #include <stdlib.h>
> - #include <stdio.h>
> -
> -+// newer versions of glib define its own GSocket but we unfortunately use this
> -+// // name in our own (semi-)public header and so can't change it -- rename glib
> -+// // one instead
> -+#define GSocket GlibGSocket
> - #include <gdk/gdk.h>
> - #include <glib.h>
> -+#undef GSocket
> -
> - #include "wx/gsocket.h"
> - #include "wx/unix/gsockunx.h"
> Index: patches/patch-src_unix_dialup_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_dialup_cpp
> diff -N patches/patch-src_unix_dialup_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_unix_dialup_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/unix/dialup.cpp.orig Wed Oct 27 16:33:47 2010
> ++++ src/unix/dialup.cpp Wed Oct 27 16:35:11 2010
> +@@ -681,7 +681,7 @@ wxDialUpManagerImpl::CheckIfconfig()
> +     defined(__SOLARIS__) || defined (__SUNOS__)
> +         // need to add -a flag
> +         cmd << wxT(" -a");
> +-#elif defined(__LINUX__) || defined(__SGI__)
> ++#elif defined(__LINUX__) || defined(__SGI__) || defined(__OPENBSD__)
> +         // nothing to be added to ifconfig
> + #elif defined(__FREEBSD__) || defined(__DARWIN__)
> +         // add -l flag
> +@@ -722,7 +722,7 @@ wxDialUpManagerImpl::CheckIfconfig()
> +                     // dialup device under SunOS/Solaris
> +                     hasModem = strstr(output.fn_str(),"ipdptp") != (char *)NULL;
> +                     hasLAN = strstr(output.fn_str(), "hme") != (char *)NULL;
> +-#elif defined(__LINUX__) || defined (__FREEBSD__)
> ++#elif defined(__LINUX__) || defined (__FREEBSD__) || defined(__OPENBSD__)
> +                     hasModem = strstr(output.fn_str(),"ppp")    // ppp
> +                         || strstr(output.fn_str(),"sl")  // slip
> +                         || strstr(output.fn_str(),"pl"); // plip
> Index: patches/patch-src_unix_fontutil_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_fontutil_cpp
> diff -N patches/patch-src_unix_fontutil_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_unix_fontutil_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/unix/fontutil.cpp.orig Wed Oct 27 13:30:36 2010
> ++++ src/unix/fontutil.cpp Wed Oct 27 13:31:00 2010
> +@@ -51,6 +51,7 @@
> + #else
> +     #include "wx/x11/private.h"
> +     #include "wx/gtk/private/string.h"
> ++    #include "wx/app.h"
> +
> +     #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
> + #endif
> Index: patches/patch-src_unix_sound_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_sound_cpp
> diff -N patches/patch-src_unix_sound_cpp
> --- patches/patch-src_unix_sound_cpp 23 Oct 2007 11:28:10 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,27 +0,0 @@
> -$OpenBSD: patch-src_unix_sound_cpp,v 1.2 2007/10/23 11:28:10 steven Exp $
> ---- src/unix/sound.cpp.orig Tue Sep 25 10:52:38 2007
> -+++ src/unix/sound.cpp Tue Oct  2 11:53:18 2007
> -@@ -27,6 +27,10 @@
> - #include <sys/soundcard.h>
> - #endif
> -
> -+#ifdef HAVE_SOUNDCARD_H
> -+#include <soundcard.h>
> -+#endif
> -+
> - #ifndef WX_PRECOMP
> -     #include "wx/event.h"
> -     #include "wx/intl.h"
> -@@ -95,10 +99,10 @@ class wxSoundBackendNull : public wxSoundBackend (publ
> - // wxSoundBackendOSS, for Linux
> - // ----------------------------------------------------------------------------
> -
> --#ifdef HAVE_SYS_SOUNDCARD_H
> -+#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_SOUNDCARD_H)
> -
> - #ifndef AUDIODEV
> --#define AUDIODEV   "/dev/dsp"    // Default path for audio device
> -+#define AUDIODEV   "/dev/audio"    // Default path for audio device
> - #endif
> -
> - class wxSoundBackendOSS : public wxSoundBackend
> Index: patches/patch-src_unix_threadpsx_cpp
> ===================================================================
> RCS file: patches/patch-src_unix_threadpsx_cpp
> diff -N patches/patch-src_unix_threadpsx_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_unix_threadpsx_cpp 29 Oct 2010 07:36:43 -0000
> @@ -0,0 +1,34 @@
> +$OpenBSD$
> +--- src/unix/threadpsx.cpp.orig Thu Apr 15 11:04:33 2010
> ++++ src/unix/threadpsx.cpp Thu Oct 28 07:27:58 2010
> +@@ -1109,19 +1109,29 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_S
> +         wxLogError(_("Cannot retrieve thread scheduling policy."));
> +     }
> +
> +-#ifdef __VMS__
> ++#if defined(__VMS__) || defined (__OPENBSD__)
> +    /* the pthread.h contains too many spaces. This is a work-around */
> ++   /* on OpenBSD, priority min/max are declared in libpthread private hdr */
> + # undef sched_get_priority_max
> + #undef sched_get_priority_min
> ++#endif
> ++#ifdef __VMS__
> + #define sched_get_priority_max(_pol_) \
> +      (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
> + #define sched_get_priority_min(_pol_) \
> +      (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
> + #endif
> +
> ++#ifdef __OPENBSD__
> ++// on OpenBSD, priority min/max are declared in libpthread private hdr
> ++    int max_prio = 31,
> ++        min_prio = 0,
> ++        prio = m_internal->GetPriority();
> ++#else
> +     int max_prio = sched_get_priority_max(policy),
> +         min_prio = sched_get_priority_min(policy),
> +         prio = m_internal->GetPriority();
> ++#endif
> +
> +     if ( min_prio == -1 || max_prio == -1 )
> +     {
> Index: patches/patch-tests_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-tests_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-tests_Makefile_in
> --- patches/patch-tests_Makefile_in 10 Sep 2009 21:23:28 -0000 1.3
> +++ patches/patch-tests_Makefile_in 29 Oct 2010 07:36:43 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-tests_Makefile_in,v 1.3 2009/09/10 21:23:28 landry Exp $
> ---- tests/Makefile.in.orig Fri Mar  6 13:11:16 2009
> -+++ tests/Makefile.in Fri Sep  4 23:57:40 2009
> -@@ -91,7 +91,7 @@ TEST_OBJECTS =  \
> +--- tests/Makefile.in.orig Thu Apr 15 11:03:41 2010
> ++++ tests/Makefile.in Thu Oct 28 12:27:04 2010
> +@@ -92,7 +92,7 @@ TEST_OBJECTS =  \
>   TEST_ODEP =  $(_____pch_testprec_test_testprec_h_gch___depname)
>   TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \
>   $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
> @@ -10,7 +10,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
>   TEST_GUI_OBJECTS =  \
>   $(__test_gui___win32rc) \
> -@@ -133,7 +133,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_tes
> +@@ -134,7 +134,7 @@ PRINTFBENCH_ODEP = $(_____pch_testprec_printfbench_tes
>   @COND_USE_PCH_1@_____pch_testprec_test_testprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch
>   COND_MONOLITHIC_0___WXLIB_NET_p = \
> @@ -19,7 +19,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
>   @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
>   @COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true
> -@@ -171,7 +171,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
> +@@ -172,7 +172,7 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
>   @COND_USE_PCH_1@_____pch_testprec_test_gui_testprec_h_gch___depname \
>   @COND_USE_PCH_1@ = ./.pch/testprec_test_gui/testprec.h.gch
>   COND_MONOLITHIC_0___WXLIB_CORE_p = \
> @@ -28,7 +28,7 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
>   @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
>   @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
> -@@ -202,7 +202,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __
> +@@ -204,7 +204,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __
>   @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
>   @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
>   COND_MONOLITHIC_0___WXLIB_BASE_p = \
> @@ -37,3 +37,12 @@ $OpenBSD: patch-tests_Makefile_in,v 1.3
>   @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
>   COND_MONOLITHIC_1___WXLIB_MONO_p = \
>   -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
> +@@ -221,7 +221,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
> +
> + ### Targets: ###
> +
> +-all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data printfbench$(EXEEXT)
> ++all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data
> +
> + install:
> +
> Index: patches/patch-wx-config_in
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/patches/patch-wx-config_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-wx-config_in
> --- patches/patch-wx-config_in 10 Sep 2009 21:23:28 -0000 1.3
> +++ patches/patch-wx-config_in 29 Oct 2010 07:36:43 -0000
> @@ -1,13 +1,13 @@
>  $OpenBSD: patch-wx-config_in,v 1.3 2009/09/10 21:23:28 landry Exp $
> ---- wx-config.in.orig Fri Mar  6 13:10:54 2009
> -+++ wx-config.in Fri Sep  4 23:57:40 2009
> +--- wx-config.in.orig Thu Apr 15 11:02:51 2010
> ++++ wx-config.in Wed Oct 27 12:35:47 2010
>  @@ -1,4 +1,4 @@
>  -#!/bin/sh
>  +#!/bin/ksh
>   #
>   # Name:        wx-config{.in,}
>   # Purpose:     wx configuration search and query tool {template,}
> -@@ -566,8 +566,8 @@ find_best_delegate()
> +@@ -610,8 +610,8 @@ find_best_delegate()
>   get_legacy_mask()
>   {
>       [ $# -gt 0 ] || set m
> @@ -18,7 +18,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
>       eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
>   }
>  
> -@@ -996,7 +996,7 @@ lib_flags_for()
> +@@ -1043,7 +1043,7 @@ lib_flags_for()
>               _libname="@WX_LIBRARY_BASENAME_GUI@"
>           fi
>           [ $lib = base ] || _libname="${_libname}_$lib"
> @@ -27,7 +27,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
>  
>           if is_static; then
>               _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
> -@@ -1055,7 +1055,7 @@ link_deps_for()
> +@@ -1102,7 +1102,7 @@ link_deps_for()
>               _libname="@WX_LIBRARY_BASENAME_GUI@"
>           fi
>           [ $lib = base ] || _libname="${_libname}_$lib"
> @@ -36,7 +36,7 @@ $OpenBSD: patch-wx-config_in,v 1.3 2009/
>  
>           _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
>       done
> -@@ -1136,7 +1136,7 @@ fi
> +@@ -1183,7 +1183,7 @@ fi
>   [ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
>  
>   if is_installed; then
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 10 Sep 2009 21:23:28 -0000 1.5
> +++ pkg/PLIST 29 Oct 2010 07:36:43 -0000
> @@ -380,26 +380,6 @@ include/wx/menuitem.h
>  include/wx/metafile.h
>  include/wx/mimetype.h
>  include/wx/minifram.h
> -include/wx/mmedia/
> -include/wx/mmedia/cdbase.h
> -include/wx/mmedia/cdunix.h
> -include/wx/mmedia/cdwin.h
> -include/wx/mmedia/sndaiff.h
> -include/wx/mmedia/sndbase.h
> -include/wx/mmedia/sndcodec.h
> -include/wx/mmedia/sndcpcm.h
> -include/wx/mmedia/sndesd.h
> -include/wx/mmedia/sndfile.h
> -include/wx/mmedia/sndg72x.h
> -include/wx/mmedia/sndmsad.h
> -include/wx/mmedia/sndoss.h
> -include/wx/mmedia/sndpcm.h
> -include/wx/mmedia/sndulaw.h
> -include/wx/mmedia/sndwav.h
> -include/wx/mmedia/sndwin.h
> -include/wx/mmedia/vidbase.h
> -include/wx/mmedia/vidwin.h
> -include/wx/mmedia/vidxanm.h
>  include/wx/module.h
>  include/wx/msgdlg.h
>  include/wx/msgout.h
> @@ -654,7 +634,6 @@ include/wx/zstream.h
>  @lib lib/libwx_gtk2_gizmos_xrc.so.${LIBwx_gtk2_gizmos_xrc_VERSION}
>  @lib lib/libwx_gtk2_gl.so.${LIBwx_gtk2_gl_VERSION}
>  @lib lib/libwx_gtk2_html.so.${LIBwx_gtk2_html_VERSION}
> -@lib lib/libwx_gtk2_mmedia.so.${LIBwx_gtk2_mmedia_VERSION}
>  @lib lib/libwx_gtk2_ogl.so.${LIBwx_gtk2_ogl_VERSION}
>  @lib lib/libwx_gtk2_plot.so.${LIBwx_gtk2_plot_VERSION}
>  @lib lib/libwx_gtk2_qa.so.${LIBwx_gtk2_qa_VERSION}

Reply | Threaded
Open this post in threaded view
|

Re: wxWidgets-2.8.11 (py-wxWidgets)

Landry Breuil-6
In reply to this post by David Coppa
On Mon, Nov 01, 2010 at 03:48:50PM +0100, David Coppa wrote:

> On Sun, 31 Oct 2010, Remi Pointel wrote:
>
> > Hi,
> > tested on amd64, seems to work but make regress fails too.
> >
> > I updated py-wxPython to have the same version, this is the diff.
> >
> > I just have this warning at the end of make update-plist :
> > make-plist: pkg/PLIST may contain arch-dependent
> >         lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.py
> > make-plist: pkg/PLIST may contain arch-dependent
> >         lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.pyc
> >
> > Thanks for your remarks,
>
> Hi,
> I've reworked your patch a little: fixed some spacing issues (tabs vs spaces) and added
> a missing entry into PLIST.
>
> Other than those, it's ok for me.
>

> -+        root = "!!WRKINST!!"
> ++        root = "/usr/ports/pobj/py-wxPython-2.8.11.0/fake-i386"

Sounds wrong :)

Landry

Reply | Threaded
Open this post in threaded view
|

Re: wxWidgets-2.8.11 (py-wxWidgets)

Marcus MERIGHI
In reply to this post by David Coppa
Hello,

as far as I can tell x11/py-wxPython is currently not available as a
package (for -current as of today, ``OpenBSD 4.9-current (GENERIC) #66:
Sun May  1 13:45:41 MDT 2011'').

Therefore I ran ``env CVSROOT=[hidden email]:/cvs cvs -q
-[hidden email]:/cvs update -Pd ports'' this afternoon and tried to
build from ports. No success. Error messages will be provided if asked.

Searched the archives and found the message below. Applied the patch and
ran "make install". No success. Error messages will be provided if
asked.

Becoming a bit desperate I tried the package from 4.9-stable [1] which
installs but ``import wx'' in python shell does not succeed. Error
messages will be provided if asked.

Any pointers apart of ``run 4.9 instead of -current''?

Thanks in advance,

Marcus

[1]
http://ftp.openbsd.org/pub/OpenBSD/4.9/packages/i386/py-wxPython-2.8.6.0p1.tgz

[hidden email] (David Coppa), 2010.11.01 (Mon) 15:48 (CET):

> On Sun, 31 Oct 2010, Remi Pointel wrote:
>
> > Hi,
> > tested on amd64, seems to work but make regress fails too.
> >
> > I updated py-wxPython to have the same version, this is the diff.
> >
> > I just have this warning at the end of make update-plist :
> > make-plist: pkg/PLIST may contain arch-dependent
> >         lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.py
> > make-plist: pkg/PLIST may contain arch-dependent
> >         lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.pyc
> >
> > Thanks for your remarks,
>
> Hi,
> I've reworked your patch a little: fixed some spacing issues (tabs vs spaces) and added
> a missing entry into PLIST.
>
> Other than those, it's ok for me.
>
> ciao,
> david
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/py-wxPython/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 30 Aug 2010 21:47:46 -0000 1.8
> +++ Makefile 1 Nov 2010 13:36:10 -0000
> @@ -4,10 +4,9 @@ SHARED_ONLY= Yes
>  
>  COMMENT= Python bindings for wxWidgets C++ class library
>  
> -V= 2.8.6.0
> +V= 2.8.11.0
>  DISTNAME= wxPython-src-$V
>  PKGNAME= py-wxPython-$V
> -REVISION= 1
>  CATEGORIES= x11 devel
>  
>  HOMEPAGE= http://www.wxpython.org/
> @@ -24,7 +23,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>  EXTRACT_SUFX= .tar.bz2
>  
>  MODULES= lang/python
> -LIB_DEPENDS=    wx_gtk2_aui,wx_gtk2_richtext,wx_gtk2_gizmos,wx_gtk2_stc,wx_base_xml,wx_gtk2_qa,wx_base_odbc,wx_gtk2_html,wx_gtk2_gl,wx_base,wx_gtk2_adv,wx_gtk2_xrc,wx_gtk2_core,wx_base_net,wx_gtk2_dbgrid:wxWidgets-gtk2->=2.8.6:x11/wxWidgets
> +
> +LIB_DEPENDS = ::x11/wxWidgets
> +WANTLIB += wx_gtk2_aui wx_gtk2_richtext wx_gtk2_gizmos wx_gtk2_stc
> +WANTLIB += wx_base_xml wx_gtk2_qa wx_base_odbc wx_gtk2_html wx_gtk2_gl
> +WANTLIB += wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core wx_base_net
> +WANTLIB += wx_gtk2_dbgrid m stdc++
>  
>  WRKSRC= ${WRKDIST}/wxPython
>  NO_REGRESS= Yes
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/py-wxPython/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 23 Oct 2007 11:45:14 -0000 1.3
> +++ distinfo 1 Nov 2010 13:36:10 -0000
> @@ -1,5 +1,5 @@
> -MD5 (wxPython-src-2.8.6.0.tar.bz2) = llnW3QQ4NH2e5L3bie+rvw==
> -RMD160 (wxPython-src-2.8.6.0.tar.bz2) = yTVzBAtav+Pma0BBq3lUJNp5h5s=
> -SHA1 (wxPython-src-2.8.6.0.tar.bz2) = 2iulsQ1wivmkc13yq5iK8y42fmQ=
> -SHA256 (wxPython-src-2.8.6.0.tar.bz2) = uEsMDA2aZbaA6b1VT8li9b/NxzEWjNp8yfMHhNEEbRc=
> -SIZE (wxPython-src-2.8.6.0.tar.bz2) = 25192541
> +MD5 (wxPython-src-2.8.11.0.tar.bz2) = Y/c6rknlMIUttWoxtXUp+g==
> +RMD160 (wxPython-src-2.8.11.0.tar.bz2) = npOwrK+FuhpL6cMkqHIDfESnaUo=
> +SHA1 (wxPython-src-2.8.11.0.tar.bz2) = GJgu3CNqHYfk7vAYkoNYySWqWxc=
> +SHA256 (wxPython-src-2.8.11.0.tar.bz2) = IQxWi97IEbEPv4J06WWcjlKCPTH92pAQ27pyUZT2ZmE=
> +SIZE (wxPython-src-2.8.11.0.tar.bz2) = 30604503
> Index: patches/patch-wxPython_config_py
> ===================================================================
> RCS file: /cvs/ports/x11/py-wxPython/patches/patch-wxPython_config_py,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-wxPython_config_py
> --- patches/patch-wxPython_config_py 23 Oct 2007 11:45:14 -0000 1.2
> +++ patches/patch-wxPython_config_py 1 Nov 2010 13:36:10 -0000
> @@ -1,7 +1,7 @@
> -$OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
> ---- wxPython/config.py.orig Wed Oct  3 11:20:46 2007
> -+++ wxPython/config.py Wed Oct  3 11:21:52 2007
> -@@ -121,7 +121,7 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by defau
> +$OpenBSD$
> +--- wxPython/config.py.orig Thu May 20 21:17:29 2010
> ++++ wxPython/config.py Mon Nov  1 12:18:15 2010
> +@@ -132,7 +132,7 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by defau
>   NO_SCRIPTS = 0     # Don't install the tool scripts
>   NO_HEADERS = 0     # Don't install the wxPython *.h and *.i files
>  
> @@ -10,7 +10,7 @@ $OpenBSD: patch-wxPython_config_py,v 1.2
>                      # can co-exist.  When turned on the wx and wxPython
>                      # pacakges will be installed in a versioned subdir
>                      # of site-packages, and a *.pth file will be
> -@@ -134,7 +134,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
> +@@ -145,7 +145,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
>   FLAVOUR = ""       # Optional flavour string to be appended to VERSION
>                      # in MULTIVERSION installs
>  
> @@ -19,16 +19,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.2
>                      # ansi/unicode settings can optionally be added to the
>                      # subdir path used in site-packages
>  
> -@@ -486,7 +486,7 @@ class wx_install_headers(distutils.command.install_hea
> +@@ -520,7 +520,7 @@ class wx_install_headers(distutils.command.install_hea
>           if not headers:
>               return
>  
>  -        root = self.root
> -+        root = "!!WRKINST!!"
> ++        root = "/usr/ports/pobj/py-wxPython-2.8.11.0/fake-i386"
>           #print "WXPREFIX is %s, root is %s" % (WXPREFIX, root)
>           # hack for universal builds, which append i386/ppc
>           # to the root
> -@@ -495,7 +495,7 @@ class wx_install_headers(distutils.command.install_hea
> +@@ -529,7 +529,7 @@ class wx_install_headers(distutils.command.install_hea
>           for header, location in headers:
>               install_dir = os.path.normpath(root +
>                                              WXPREFIX +
> @@ -37,16 +37,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.2
>                                              location)
>               self.mkpath(install_dir)
>               (out, _) = self.copy_file(header, install_dir)
> -@@ -549,7 +549,7 @@ def find_data_files(srcdir, *wildcards):
> +@@ -594,7 +594,7 @@ def find_data_files(srcdir, *wildcards, **kw):
>  
>   def makeLibName(name):
> -     if os.name == 'posix':
> +     if os.name == 'posix' or COMPILER == 'mingw32':
>  -        libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
>  +        libname = '%s_%s' % (WXBASENAME, name)
>       elif name:
>           libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
>       else:
> -@@ -893,8 +893,6 @@ elif os.name == 'posix':
> +@@ -990,8 +990,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
>       if debug:
>           cflags.append('-g')
>           cflags.append('-O0')
> Index: patches/patch-wxPython_setup_py
> ===================================================================
> RCS file: /cvs/ports/x11/py-wxPython/patches/patch-wxPython_setup_py,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-wxPython_setup_py
> --- patches/patch-wxPython_setup_py 23 Oct 2007 11:45:14 -0000 1.2
> +++ patches/patch-wxPython_setup_py 1 Nov 2010 13:36:10 -0000
> @@ -1,12 +1,12 @@
> -$OpenBSD: patch-wxPython_setup_py,v 1.2 2007/10/23 11:45:14 steven Exp $
> ---- wxPython/setup.py.orig Thu Jul 19 00:33:55 2007
> -+++ wxPython/setup.py Wed Oct  3 11:08:48 2007
> -@@ -912,7 +912,7 @@ if __name__ == "__main__":
> -                   packages = ['wxaddons']
> -              )
> +$OpenBSD$
> +--- wxPython/setup.py.orig Thu Apr 15 06:26:34 2010
> ++++ wxPython/setup.py Mon Nov  1 12:18:14 2010
> +@@ -1046,7 +1046,7 @@ if __name__ == "__main__":
> +               )
>  
> --        if INSTALL_MULTIVERSION:
> -+        if 1:
> -             setup(name             = 'wxPython-common',
> -                   version          = VERSION,
> -                   description      = DESCRIPTION,
> +         if not EGGing:
> +-            if INSTALL_MULTIVERSION:
> ++            if 1:
> +                 setup(name             = 'wxPython-common',
> +                       version          = VERSION,
> +                       description      = DESCRIPTION,
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/py-wxPython/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 23 Oct 2007 11:45:14 -0000 1.3
> +++ pkg/PLIST 1 Nov 2010 13:36:14 -0000
> @@ -1,4 +1,5 @@
> -@comment $OpenBSD: PLIST,v 1.3 2007/10/23 11:45:14 steven Exp $
> +@comment $OpenBSD$
> +bin/editra
>  bin/helpviewer
>  bin/img2png
>  bin/img2py
> @@ -19,6 +20,7 @@ include/wx/wxPython/i_files/_app.i
>  include/wx/wxPython/i_files/_app_ex.py
>  include/wx/wxPython/i_files/_artprov.i
>  include/wx/wxPython/i_files/_aui_docstrings.i
> +include/wx/wxPython/i_files/_axbase.i
>  include/wx/wxPython/i_files/_bitmap.i
>  include/wx/wxPython/i_files/_brush.i
>  include/wx/wxPython/i_files/_button.i
> @@ -92,6 +94,7 @@ include/wx/wxPython/i_files/_renderer.i
>  include/wx/wxPython/i_files/_richtextbuffer.i
>  include/wx/wxPython/i_files/_richtextctrl.i
>  include/wx/wxPython/i_files/_richtexthtml.i
> +include/wx/wxPython/i_files/_richtextprint.i
>  include/wx/wxPython/i_files/_richtextxml.i
>  include/wx/wxPython/i_files/_sashwin.i
>  include/wx/wxPython/i_files/_scrolbar.i
> @@ -220,8 +223,129 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/ClickableHtmlWindow.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/activex.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/activex.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/activexwrapper.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/activexwrapper.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/advancedsplash.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/advancedsplash.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aquabutton.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aquabutton.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/artmanager.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/artmanager.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_constants.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_constants.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_switcherdialog.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_switcherdialog.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_utilities.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/aui_utilities.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibook.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/auibook.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/dockart.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/dockart.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/framemanager.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/framemanager.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabart.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabart.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabmdi.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/aui/tabmdi.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/balloontip.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/balloontip.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/buttonpanel.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/buttonpanel.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/cubecolourdialog.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/cubecolourdialog.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/customtreectrl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/customtreectrl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatmenu.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatmenu.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatnotebook.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/flatnotebook.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/floatspin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/floatspin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmcustomizedlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmcustomizedlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmresources.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fmresources.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/foldpanelbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/foldpanelbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fourwaysplitter.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/fourwaysplitter.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/genericmessagedialog.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/genericmessagedialog.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/gradientbutton.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/gradientbutton.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hyperlink.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hyperlink.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hypertreelist.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/hypertreelist.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/knobctrl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/knobctrl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/labelbook.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/labelbook.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/multidirdialog.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/multidirdialog.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/peakmeter.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/peakmeter.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/piectrl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/piectrl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pybusyinfo.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pybusyinfo.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pycollapsiblepane.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pycollapsiblepane.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pyprogress.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/pyprogress.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_aui.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_aui.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_default.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_default.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_internal.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_internal.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_msw.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/art_msw.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/bar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/bar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/buttonbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/buttonbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/control.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/control.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/gallery.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/gallery.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/page.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/page.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/panel.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/panel.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/toolbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ribbon/toolbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/rulerctrl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/rulerctrl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/shapedbutton.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/shapedbutton.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/speedmeter.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/speedmeter.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/supertooltip.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/supertooltip.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/thumbnailctrl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/thumbnailctrl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/toasterbox.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/toasterbox.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ultimatelistctrl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/ultimatelistctrl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/zoombar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/agw/zoombar.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/analogclock/
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/analogclock/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/analogclock/__init__.pyc
> @@ -276,6 +400,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/colourdb.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/colourselect.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/colourselect.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/colourutils.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/colourutils.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/combotreebox.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/combotreebox.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/customtreectrl.py
> @@ -298,6 +424,12 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/editor/images.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/editor/selection.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/editor/selection.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/embeddedimage.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/embeddedimage.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/eventStack.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/eventStack.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/eventwatcher.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/eventwatcher.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/evtmgr.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/evtmgr.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/expando.py
> @@ -308,6 +440,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/filebrowsebutton.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin_old.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/flashwin_old.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/flatnotebook.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/flatnotebook.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatbar.py
> @@ -321,11 +455,15 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/NavCanvas.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Resources.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Resources.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/ScreenShot.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/ScreenShot.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBox.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBox.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBoxTest.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/BBoxTest.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/Colors.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/Colors.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/GUI.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/GUI.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/floatcanvas/Utilities/__init__.py
> @@ -338,6 +476,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/foldpanelbar.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/gestures.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/gestures.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/graphics.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/graphics.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/gridmovers.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/gridmovers.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/grids.py
> @@ -346,6 +486,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/hyperlink.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin_old.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/iewin_old.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/imagebrowser.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/imagebrowser.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/imageutils.py
> @@ -382,6 +524,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/__init__.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/grid.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/grid.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/gridlabelrenderer.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/gridlabelrenderer.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/imagelist.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/imagelist.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/inspection.py
> @@ -392,6 +536,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/rubberband.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/treemixin.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mixins/treemixin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/msgpanel.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/msgpanel.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/multisash.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/multisash.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/mvctree.py
> @@ -421,20 +567,131 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/ogl/_oglmisc.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin_old.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pdfwin_old.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/platebtn.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/platebtn.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/plot.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/plot.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/popupctl.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/popupctl.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/printout.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/printout.pyc
> -lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub.py
> -lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/autosetuppubsubv1.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/autosetuppubsubv1.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/listenerimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/listenerimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publisher.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publisher.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publishermixin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/publishermixin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicargspecimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicargspecimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicmgrimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/arg1/topicmgrimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/callables.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/callables.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/datamsg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/datamsg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/listenerimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/listenerimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publisher.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publisher.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publishermixin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/publishermixin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicargspecimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicargspecimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicmgrimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/kwargs/topicmgrimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listener.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listener.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listenerbase.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/listenerbase.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr_old.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/notificationmgr_old.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/policies.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/policies.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/publisherbase.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/publisherbase.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicargspec.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicargspec.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicdefnprovider.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicdefnprovider.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicexc.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicexc.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicmgr.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicmgr.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicobj.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicobj.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topictreetraverser.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topictreetraverser.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicutils.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/topicutils.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/treeconfig.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/treeconfig.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/validatedefnargs.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/validatedefnargs.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/weakmethod.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/core/weakmethod.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pub.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pub.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/pub.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/pub.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/utils.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub1/utils.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/pub.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/pub.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/utils.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsub2/utils.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsubconf.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/pubsubconf.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setuparg1.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setuparg1.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupkwargs.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupkwargs.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv1.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv1.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv2.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/setupv2.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/exchandling.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/exchandling.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/globalsettings.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/globalsettings.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/misc.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/misc.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/notification.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/notification.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreeprinter.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreeprinter.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreevisitor.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/pubsub/utils/topictreevisitor.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/pydocview.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/pydocview.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/pyshell.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/pyshell.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/rcsizer.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/rcsizer.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/resizewidget.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/resizewidget.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/rightalign.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/rightalign.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/rpcMixin.py
> @@ -445,6 +702,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/sheet.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/shell.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/shell.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/sized_controls.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/sized_controls.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/splashscreen.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/splashscreen.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/splitter.py
> @@ -459,12 +718,14 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/ticker.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/ticker_xrc.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/ticker_xrc.pyc
> -lib/python${MODPY_VERSION}/site-packages/wx/lib/vtk.py
> -lib/python${MODPY_VERSION}/site-packages/wx/lib/vtk.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/utils.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/utils.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/wordwrap.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/wordwrap.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/wxPlotCanvas.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/wxPlotCanvas.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/wxcairo.py
> +lib/python${MODPY_VERSION}/site-packages/wx/lib/wxcairo.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/wxpTag.py
>  lib/python${MODPY_VERSION}/site-packages/wx/lib/wxpTag.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/media.py
> @@ -485,6 +746,11 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/py/PyFilling.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/PyShell.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/PyShell.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/PySlices.ico
> +lib/python${MODPY_VERSION}/site-packages/wx/py/PySlices.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/PySlices.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/PySlicesShell.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/PySlicesShell.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/PyWrap.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/PyWrap.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/README.txt
> @@ -494,6 +760,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/py/buffer.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/crust.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/crust.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/crustslices.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/crustslices.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/dispatcher.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/dispatcher.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/document.py
> @@ -512,10 +780,18 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/py/interpreter.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/introspect.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/introspect.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/magic.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/magic.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/parse.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/parse.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/path.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/path.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/pseudo.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/pseudo.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/shell.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/shell.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/py/sliceshell.py
> +lib/python${MODPY_VERSION}/site-packages/wx/py/sliceshell.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/py/version.py
>  lib/python${MODPY_VERSION}/site-packages/wx/py/version.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/richtext.py
> @@ -523,34 +799,778 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/stc.py
>  lib/python${MODPY_VERSION}/site-packages/wx/stc.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/AUTHORS
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/CHANGELOG
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/COPYING
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/Editra
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/Editra.pyw
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/FAQ
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/INSTALL
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/MANIFEST.in
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/NEWS
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/README
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/THANKS
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/TODO
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/docs/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/docs/editra_style_sheets.txt
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/launcher.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/launcher.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ca_ES@valencia/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/cs_CZ/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/cs_CZ/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/cs_CZ/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/da_DK/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/da_DK/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/da_DK/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/de_DE/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/de_DE/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/de_DE/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/en_US/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/en_US/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/en_US/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/es_ES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/es_ES/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/es_ES/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/fr_FR/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/fr_FR/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/fr_FR/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/gl_ES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/gl_ES/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/gl_ES/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hr_HR/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hr_HR/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hr_HR/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hu_HU/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hu_HU/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/hu_HU/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/it_IT/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/it_IT/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/it_IT/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ja_JP/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ja_JP/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ja_JP/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/lv_LV/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/lv_LV/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/lv_LV/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nl_NL/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nl_NL/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nl_NL/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nn_NO/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nn_NO/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/nn_NO/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pl_PL/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pl_PL/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pl_PL/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pt_BR/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pt_BR/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/pt_BR/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ru_RU/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ru_RU/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/ru_RU/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sk_SK/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sk_SK/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sk_SK/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sl_SI/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sl_SI/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sl_SI/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sr_RS/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sr_RS/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sr_RS/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sv_SE/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sv_SE/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/sv_SE/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/tr_TR/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/tr_TR/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/tr_TR/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/uk_UA/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/uk_UA/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/uk_UA/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_CN/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_CN/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_CN/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_TW/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_TW/LC_MESSAGES/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/locale/zh_TW/LC_MESSAGES/Editra.mo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/Editra.icns
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra.ico
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra_doc.icns
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra_doc.ico
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/editra_doc.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/splashwarn.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Default/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Default/README
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/AUTHORS
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/COPYING
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/about.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/advanced.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/attribute.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/backward.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bin_file.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bmark_add.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bmark_next.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/bmark_pre.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/cdrom.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/class.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/computer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/copy.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/cut.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/delete.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/down.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/element.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/file.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/find.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/findr.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/floppy.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/folder.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/font.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/forward.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/function.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/harddisk.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/html_gen.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/indent.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/log.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/mail.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/method.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/new.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/newwin.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/open.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/outdent.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/paste.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/plugin.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/pref.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/print.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/printpre.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/property.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/pyshell.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/quit.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/readonly.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/redo.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/refresh.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/rtf_gen.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/save.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/saveas.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/selectall.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/stop.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/style_edit.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/tex_gen.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/undo.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/up.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/usb.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/variable.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/menu/web.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/boo.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/css.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/html.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/java.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/php.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/python.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/ruby.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/shell.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/mime/text.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/other/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/other/doc_props.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/advanced.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/backward.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/copy.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/cut.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/doc_props.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/find.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/findr.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/forward.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/new.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/open.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/package.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/paste.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/pref.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/print.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/redo.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/save.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/theme.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/undo.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/pixmaps/theme/Tango/toolbar/web.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/CodeBrowser-1.0-py2.5.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/CodeBrowser-1.0-py${MODPY_VERSION}.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/FileBrowser-1.5-py2.5.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/FileBrowser-1.5-py${MODPY_VERSION}.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/Launch-1.6-py2.5.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/Launch-1.6-py${MODPY_VERSION}.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/PyShell-0.8-py2.5.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/plugins/PyShell-0.8-py${MODPY_VERSION}.egg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/setup.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/setup.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/Editra.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/Editra.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/autocomp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/autocomp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/completer.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/completer.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/csscomp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/csscomp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/htmlcomp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/htmlcomp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/pycomp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/pycomp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/simplecomp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/autocomp/simplecomp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/dev_tool.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/dev_tool.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/doctools.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/doctools.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/backupmgr.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/backupmgr.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/clipboard.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/clipboard.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/cmenumgr.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/cmenumgr.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fchecker.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fchecker.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileimpl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileimpl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileutil.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/fileutil.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/histcache.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/histcache.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/miscutil.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/miscutil.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/searcheng.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/searcheng.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/txtutil.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ebmlib/txtutil.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/auinavi.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/auinavi.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/choicedlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/choicedlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/colorsetter.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/colorsetter.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ctrlbox.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ctrlbox.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecbasewin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecbasewin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/eclutil.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/eclutil.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecpickers.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/ecpickers.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/elistmix.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/elistmix.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/encdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/encdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/errdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/errdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filemgrdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filemgrdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filterdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/filterdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/finddlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/finddlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/infodlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/infodlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/outbuff.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/outbuff.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/panelbox.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/panelbox.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/platebtn.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/platebtn.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/pstatbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/pstatbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/segmentbk.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/segmentbk.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/txtentry.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/eclib/txtentry.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_art.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_art.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_basestc.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_basestc.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_cmdbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_cmdbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_crypt.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_crypt.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_editv.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_editv.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_event.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_event.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_glob.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_glob.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_i18n.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_i18n.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_ipc.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_ipc.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_keyh.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_keyh.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_log.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_log.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_main.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_main.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_menu.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_menu.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mpane.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_mpane.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_msg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_msg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_pages.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_pages.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_print.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_print.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_script.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_script.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_search.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_search.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_shelf.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_shelf.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_statbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_statbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_stc.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_stc.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_style.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_style.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_tab.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_tab.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_theme.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_theme.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_toolbar.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_toolbar.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_txt.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_txt.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_vim.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/ed_vim.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/edimage.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/edimage.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/README
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/decorlib.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/decorlib.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/embeddedimage.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/embeddedimage.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/events.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/events.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/ez_setup.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/ez_setup.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/flatnotebook.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/flatnotebook.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pkg_resources.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pkg_resources.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pubsub.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/pubsub.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/stcspellcheck.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/stcspellcheck.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/vertedit.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/extern/vertedit.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/generator.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/generator.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/iface.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/iface.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/info.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/info.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/perspective.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/perspective.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/plugin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/prefdlg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/prefdlg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/profiler.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/profiler.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/style_editor.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/style_editor.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/README
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_actionscript.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_actionscript.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ada.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ada.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_apache.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_apache.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_asm68k.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_batch.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_batch.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_boo.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_boo.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_caml.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_caml.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cobra.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cobra.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cpp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_cpp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_css.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_css.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_d.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_d.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_diff.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_diff.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_django.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_django.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_dot.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_dot.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_editra_ss.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_editra_ss.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_edje.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_edje.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_eiffel.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_eiffel.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_erlang.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_erlang.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ferite.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ferite.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_flagship.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_flagship.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_forth.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_forth.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_fortran.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_fortran.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_groovy.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_groovy.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_gui4cli.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_gui4cli.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haskell.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haskell.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haxe.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_haxe.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_html.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_html.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_inno.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_inno.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_issuelist.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_issuelist.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_java.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_java.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_javascript.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_javascript.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_kix.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_kix.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_latex.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_latex.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lisp.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lisp.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lout.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lout.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lua.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_lua.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_make.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_make.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mako.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mako.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_masm.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_masm.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_matlab.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_matlab.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mssql.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_mssql.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nasm.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nasm.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nsis.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_nsis.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pascal.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pascal.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_perl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_perl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_php.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_php.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pike.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_pike.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_postscript.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_postscript.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_progress.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_progress.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_props.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_props.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_python.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_python.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ruby.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_ruby.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_s.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_s.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sh.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sh.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_smalltalk.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_smalltalk.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sql.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_sql.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_squirrel.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_squirrel.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_stata.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_stata.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_tcl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_tcl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vbscript.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vbscript.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_verilog.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_verilog.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vhdl.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_vhdl.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_visualbasic.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_visualbasic.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xml.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xml.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xtext.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_xtext.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_yaml.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/_yaml.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syndata.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syndata.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synextreg.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synextreg.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synglob.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synglob.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syntax.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/syntax.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synxml.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/syntax/synxml.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/updater.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/updater.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/util.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/util.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/wxcompat.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/src/wxcompat.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/BlackBoard.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/BlueMonday.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Cream.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Dessert.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Guepardo.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/Mocha.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/blue.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/default.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/styles/midnight.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/68k_assembly.68k
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/Xtext.xtext
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/actionscript.as
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/ada.adb
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/apache_conf.conf
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/bash_shell_script.sh
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/boo.boo
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/c-shell_script.csh
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/c.c
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/caml.ml
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/cascading_style_sheet.css
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/cobra.cobra
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/coldfusion.cfm
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/cpp.cpp
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/csharp.cs
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/d.d
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/diff_file.diff
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/django.django
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/dos_batch_script.bat
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/dot.dot
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/editra_style_sheet.ess
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/edje.edc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/eiffel.e
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/erlang.erl
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/ferite.fe
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/flagship.prg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/forth.4th
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/fortran_77.for
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/fortran_95.f95
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/groovy.groovy
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/gui4cli.gui
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/haskell.hs
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/haxe.hx
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/html.html
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/inno_setup_script.iss
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/issuelist.isl
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/java.java
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/javascript.js
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/kix.kix
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/korn_shell_script.ksh
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/latex.tex
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/lisp.lisp
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/lout.lt
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/lua.lua
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/makefile.mak
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/mako.mako
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/masm.masm
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/matlab.matlab
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/microsoft_sql.sql
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/netwide_assembler.nasm
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/newlisp.lsp
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/nullsoft_installer_script.nsi
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/objective_c.mm
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/octave.oct
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/pascal.pas
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/perl.pl
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/php.php
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/pike.pike
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/pl_sql.plsql
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/plain_text.txt
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/postscript.ps
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/progress_4gl.4gl
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/properties.ini
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/python.python
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/r.r
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/ruby.rb
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/s.s
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/scheme.scm
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/smalltalk.st
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/sql.sql
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/squirrel.nut
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/stata.do
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/svg.svg
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/system_verilog.sv
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/tcl_tk.tcl
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/unicode_text.txt
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/vala.vala
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/vbscript.vbs
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/verilog.v
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/vhdl.vhdl
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/visual_basic.vb
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/xml.xml
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/Editra/tests/syntax/yaml.yaml
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/AttributePanel.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/AttributePanel.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/CHANGES.txt
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/README.txt
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/TODO.txt
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/TestWin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/TestWin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTree.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTree.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTreeMenu.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/XMLTreeMenu.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/attribute.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/attribute.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/component.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/component.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/encode_bitmaps.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/encode_bitmaps.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/generate.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/generate.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/globals.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/globals.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images_32x32.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/images_32x32.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/license.txt
> -lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/panel.py
> -lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/panel.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/listener.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/listener.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/meta.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/meta.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/test.xrc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/test_wxlib.xrc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/misc/tools.xrc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/model.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/model.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/params.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/params.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugin.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugin.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/_bitmaps.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/_bitmaps.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/DynamicSashWindow.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/EditableListBox.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/LEDNumberCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/TreeListCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/separator.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/sizer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/spacer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/tool.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxBitmapButton.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxBoxSizer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxButton.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxCheckBox.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxChoice.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxChoicebook.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxComboBox.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxDialog.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxFilePickerCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxFlexGridSizer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxFrame.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGauge.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGrid.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGridBagSizer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGridSizer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxGrid_bad.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxHyperlinkCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxListBox.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxListCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxListbook.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxMenu.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxMenuBar.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxMenuItem.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxNotebook.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxRadioButton.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxScrollBar.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxScrolledWindow.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSlider.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSpinButton.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSpinCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxSplitterWindow.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticBitmap.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticBox.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticBoxSizer.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticLine.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStaticText.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxStatusBar.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxTextCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxToggleButton.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxToolBar.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxTreeCtrl.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/bitmaps/wxTreebook.png
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/controls.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/controls.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/core.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/core.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/gizmos.crx
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/wxlib.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/wxlib.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_gizmos.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_gizmos.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_wxlib.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/plugins/xh_wxlib.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/presenter.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/presenter.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tools.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tools.pyc
> -lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tree.py
> -lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/tree.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/undo.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/undo.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/view.py
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/view.pyc
> +lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.htb
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xrced.xrc
> -lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xxx.py
> -lib/python${MODPY_VERSION}/site-packages/wx/tools/XRCed/xxx.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/__init__.pyc
>  lib/python${MODPY_VERSION}/site-packages/wx/tools/dbg.py
> @@ -576,6 +1596,7 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wx/xrc.py
>  lib/python${MODPY_VERSION}/site-packages/wx/xrc.pyc
>  lib/python${MODPY_VERSION}/site-packages/wxPython/
> +lib/python${MODPY_VERSION}/site-packages/wxPython-2.8.11.0-py${MODPY_VERSION}.egg-info
>  lib/python${MODPY_VERSION}/site-packages/wxPython/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/wxPython/__init__.pyc
>  lib/python${MODPY_VERSION}/site-packages/wxPython/_controls.py
> @@ -740,8 +1761,6 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wxPython/lib/throbber.pyc
>  lib/python${MODPY_VERSION}/site-packages/wxPython/lib/timectrl.py
>  lib/python${MODPY_VERSION}/site-packages/wxPython/lib/timectrl.pyc
> -lib/python${MODPY_VERSION}/site-packages/wxPython/lib/vtk.py
> -lib/python${MODPY_VERSION}/site-packages/wxPython/lib/vtk.pyc
>  lib/python${MODPY_VERSION}/site-packages/wxPython/lib/wxPlotCanvas.py
>  lib/python${MODPY_VERSION}/site-packages/wxPython/lib/wxPlotCanvas.pyc
>  lib/python${MODPY_VERSION}/site-packages/wxPython/lib/wxpTag.py
> @@ -771,15 +1790,10 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/wxPython/wizard.pyc
>  lib/python${MODPY_VERSION}/site-packages/wxPython/xrc.py
>  lib/python${MODPY_VERSION}/site-packages/wxPython/xrc.pyc
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/__init__.pyc
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/setup.py
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/setup.pyc
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/sized_controls.py
> -lib/python${MODPY_VERSION}/site-packages/wxaddons/sized_controls.pyc
> +lib/python${MODPY_VERSION}/site-packages/wxPython_common-2.8.11.0-py${MODPY_VERSION}.egg-info
>  lib/python${MODPY_VERSION}/site-packages/wxversion.py
>  lib/python${MODPY_VERSION}/site-packages/wxversion.pyc
> +share/doc/pkg-readmes/
>  share/examples/py-wxPython/
>  share/examples/py-wxPython/demo/
>  share/examples/py-wxPython/demo/AUI_DockingWindowMgr.py
> @@ -792,6 +1806,7 @@ share/examples/py-wxPython/demo/ActiveXW
>  share/examples/py-wxPython/demo/ActiveX_FlashWindow.py
>  share/examples/py-wxPython/demo/ActiveX_IEHtmlWindow.py
>  share/examples/py-wxPython/demo/ActiveX_PDFWindow.py
> +share/examples/py-wxPython/demo/AdjustChannels.py
>  share/examples/py-wxPython/demo/AlphaDrawing.py
>  share/examples/py-wxPython/demo/AnalogClock.py
>  share/examples/py-wxPython/demo/AnimateCtrl.py
> @@ -800,7 +1815,8 @@ share/examples/py-wxPython/demo/BitmapBu
>  share/examples/py-wxPython/demo/BitmapComboBox.py
>  share/examples/py-wxPython/demo/BitmapFromBuffer.py
>  share/examples/py-wxPython/demo/Button.py
> -share/examples/py-wxPython/demo/ButtonPanel.py
> +share/examples/py-wxPython/demo/Cairo.py
> +share/examples/py-wxPython/demo/Cairo_Snippets.py
>  share/examples/py-wxPython/demo/Calendar.py
>  share/examples/py-wxPython/demo/CalendarCtrl.py
>  share/examples/py-wxPython/demo/CheckBox.py
> @@ -819,7 +1835,6 @@ share/examples/py-wxPython/demo/ComboTre
>  share/examples/py-wxPython/demo/ContextHelp.py
>  share/examples/py-wxPython/demo/Cursor.py
>  share/examples/py-wxPython/demo/CustomDragAndDrop.py
> -share/examples/py-wxPython/demo/CustomTreeCtrl.py
>  share/examples/py-wxPython/demo/DatePickerCtrl.py
>  share/examples/py-wxPython/demo/DelayedResult.py
>  share/examples/py-wxPython/demo/Dialog.py
> @@ -839,10 +1854,8 @@ share/examples/py-wxPython/demo/FileBrow
>  share/examples/py-wxPython/demo/FileDialog.py
>  share/examples/py-wxPython/demo/FileHistory.py
>  share/examples/py-wxPython/demo/FindReplaceDialog.py
> -share/examples/py-wxPython/demo/FlatNotebook.py
>  share/examples/py-wxPython/demo/FloatBar.py
>  share/examples/py-wxPython/demo/FloatCanvas.py
> -share/examples/py-wxPython/demo/FoldPanelBar.py
>  share/examples/py-wxPython/demo/FontDialog.py
>  share/examples/py-wxPython/demo/FontEnumerator.py
>  share/examples/py-wxPython/demo/Frame.py
> @@ -861,11 +1874,11 @@ share/examples/py-wxPython/demo/GridDrag
>  share/examples/py-wxPython/demo/GridDragable.py
>  share/examples/py-wxPython/demo/GridEnterHandler.py
>  share/examples/py-wxPython/demo/GridHugeTable.py
> +share/examples/py-wxPython/demo/GridLabelRenderer.py
>  share/examples/py-wxPython/demo/GridSimple.py
>  share/examples/py-wxPython/demo/GridStdEdRend.py
>  share/examples/py-wxPython/demo/Grid_MegaExample.py
>  share/examples/py-wxPython/demo/HtmlWindow.py
> -share/examples/py-wxPython/demo/HyperLinkCtrl.py
>  share/examples/py-wxPython/demo/I18N.py
>  share/examples/py-wxPython/demo/Image.py
>  share/examples/py-wxPython/demo/ImageAlpha.py
> @@ -907,6 +1920,7 @@ share/examples/py-wxPython/demo/OGL.py
>  share/examples/py-wxPython/demo/OwnerDrawnComboBox.py
>  share/examples/py-wxPython/demo/PageSetupDialog.py
>  share/examples/py-wxPython/demo/Pickers.py
> +share/examples/py-wxPython/demo/PlateButton.py
>  share/examples/py-wxPython/demo/PopupControl.py
>  share/examples/py-wxPython/demo/PopupMenu.py
>  share/examples/py-wxPython/demo/PopupWindow.py
> @@ -924,6 +1938,8 @@ share/examples/py-wxPython/demo/README.t
>  share/examples/py-wxPython/demo/RadioBox.py
>  share/examples/py-wxPython/demo/RadioButton.py
>  share/examples/py-wxPython/demo/RawBitmapAccess.py
> +share/examples/py-wxPython/demo/RendererNative.py
> +share/examples/py-wxPython/demo/ResizeWidget.py
>  share/examples/py-wxPython/demo/RichTextCtrl.py
>  share/examples/py-wxPython/demo/RightTextCtrl.py
>  share/examples/py-wxPython/demo/RowColSizer.py
> @@ -950,6 +1966,7 @@ share/examples/py-wxPython/demo/StatusBa
>  share/examples/py-wxPython/demo/StockButtons.py
>  share/examples/py-wxPython/demo/StyledTextCtrl_1.py
>  share/examples/py-wxPython/demo/StyledTextCtrl_2.py
> +share/examples/py-wxPython/demo/SystemSettings.py
>  share/examples/py-wxPython/demo/TablePrint.py
>  share/examples/py-wxPython/demo/TestTable.txt
>  share/examples/py-wxPython/demo/TextCtrl.py
> @@ -975,6 +1992,149 @@ share/examples/py-wxPython/demo/XMLtreev
>  share/examples/py-wxPython/demo/XmlResource.py
>  share/examples/py-wxPython/demo/XmlResourceHandler.py
>  share/examples/py-wxPython/demo/XmlResourceSubclass.py
> +share/examples/py-wxPython/demo/agw/
> +share/examples/py-wxPython/demo/agw/AUI.py
> +share/examples/py-wxPython/demo/agw/AdvancedSplash.py
> +share/examples/py-wxPython/demo/agw/AquaButton.py
> +share/examples/py-wxPython/demo/agw/BalloonTip.py
> +share/examples/py-wxPython/demo/agw/ButtonPanel.py
> +share/examples/py-wxPython/demo/agw/CubeColourDialog.py
> +share/examples/py-wxPython/demo/agw/CustomTreeCtrl.py
> +share/examples/py-wxPython/demo/agw/FlatMenu.py
> +share/examples/py-wxPython/demo/agw/FlatNotebook.py
> +share/examples/py-wxPython/demo/agw/FloatSpin.py
> +share/examples/py-wxPython/demo/agw/FoldPanelBar.py
> +share/examples/py-wxPython/demo/agw/FourWaySplitter.py
> +share/examples/py-wxPython/demo/agw/GenericMessageDialog.py
> +share/examples/py-wxPython/demo/agw/GradientButton.py
> +share/examples/py-wxPython/demo/agw/HyperLinkCtrl.py
> +share/examples/py-wxPython/demo/agw/HyperTreeList.py
> +share/examples/py-wxPython/demo/agw/KnobCtrl.py
> +share/examples/py-wxPython/demo/agw/LabelBook.py
> +share/examples/py-wxPython/demo/agw/ListCtrl.py
> +share/examples/py-wxPython/demo/agw/MacLargeDemo.py
> +share/examples/py-wxPython/demo/agw/MultiDirDialog.py
> +share/examples/py-wxPython/demo/agw/PeakMeter.py
> +share/examples/py-wxPython/demo/agw/PieCtrl.py
> +share/examples/py-wxPython/demo/agw/PyBusyInfo.py
> +share/examples/py-wxPython/demo/agw/PyCollapsiblePane.py
> +share/examples/py-wxPython/demo/agw/PyProgress.py
> +share/examples/py-wxPython/demo/agw/RibbonBar.py
> +share/examples/py-wxPython/demo/agw/RulerCtrl.py
> +share/examples/py-wxPython/demo/agw/ShapedButton.py
> +share/examples/py-wxPython/demo/agw/SpeedMeter.py
> +share/examples/py-wxPython/demo/agw/SuperToolTip.py
> +share/examples/py-wxPython/demo/agw/ThumbnailCtrl.py
> +share/examples/py-wxPython/demo/agw/ToasterBox.py
> +share/examples/py-wxPython/demo/agw/UltimateListCtrl.py
> +share/examples/py-wxPython/demo/agw/UltimateListIconDemo.py
> +share/examples/py-wxPython/demo/agw/UltimateListListDemo.py
> +share/examples/py-wxPython/demo/agw/UltimateReportDemo.py
> +share/examples/py-wxPython/demo/agw/UltimateVirtualDemo.py
> +share/examples/py-wxPython/demo/agw/ZoomBar.py
> +share/examples/py-wxPython/demo/agw/__demo__.py
> +share/examples/py-wxPython/demo/agw/bitmaps/
> +share/examples/py-wxPython/demo/agw/bitmaps/Explorer96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Explorer96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Folder96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Folder96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Monitor96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Monitor96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Music96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Music96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Photo96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Photo96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Search96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Search96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Wizard96.png
> +share/examples/py-wxPython/demo/agw/bitmaps/Wizard96Flip40.png
> +share/examples/py-wxPython/demo/agw/bitmaps/advancedsplash.png
> +share/examples/py-wxPython/demo/agw/bitmaps/aquabutton.png
> +share/examples/py-wxPython/demo/agw/bitmaps/aquachecked.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/aquaflagged.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/aquanotchecked.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/aquanotflagged.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/canada.gif
> +share/examples/py-wxPython/demo/agw/bitmaps/checked.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/columns.png
> +share/examples/py-wxPython/demo/agw/bitmaps/contexthelp-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/contexthelp.png
> +share/examples/py-wxPython/demo/agw/bitmaps/copy.png
> +share/examples/py-wxPython/demo/agw/bitmaps/cut.png
> +share/examples/py-wxPython/demo/agw/bitmaps/editcopy.png
> +share/examples/py-wxPython/demo/agw/bitmaps/editcut.png
> +share/examples/py-wxPython/demo/agw/bitmaps/editpaste.png
> +share/examples/py-wxPython/demo/agw/bitmaps/exit-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/exit.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/ffwd.png
> +share/examples/py-wxPython/demo/agw/bitmaps/ffwddisabled.png
> +share/examples/py-wxPython/demo/agw/bitmaps/field-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/filenew.png
> +share/examples/py-wxPython/demo/agw/bitmaps/fileopen.png
> +share/examples/py-wxPython/demo/agw/bitmaps/filesave.png
> +share/examples/py-wxPython/demo/agw/bitmaps/flagged.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/folder_new.png
> +share/examples/py-wxPython/demo/agw/bitmaps/ghost.png
> +share/examples/py-wxPython/demo/agw/bitmaps/gradientbutton.png
> +share/examples/py-wxPython/demo/agw/bitmaps/help-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/help.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/italy.gif
> +share/examples/py-wxPython/demo/agw/bitmaps/lbadd.png
> +share/examples/py-wxPython/demo/agw/bitmaps/lbcharge.png
> +share/examples/py-wxPython/demo/agw/bitmaps/lbdecrypted.png
> +share/examples/py-wxPython/demo/agw/bitmaps/lbnews.png
> +share/examples/py-wxPython/demo/agw/bitmaps/lbroll.png
> +share/examples/py-wxPython/demo/agw/bitmaps/minus1.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/minus2.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/minus3.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/minus4.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/minus5.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/month-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/new_file.png
> +share/examples/py-wxPython/demo/agw/bitmaps/new_folder.png
> +share/examples/py-wxPython/demo/agw/bitmaps/notchecked.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/notflagged.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/ok-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/open_folder.png
> +share/examples/py-wxPython/demo/agw/bitmaps/paste.png
> +share/examples/py-wxPython/demo/agw/bitmaps/pause.png
> +share/examples/py-wxPython/demo/agw/bitmaps/pausedisabled.png
> +share/examples/py-wxPython/demo/agw/bitmaps/play.png
> +share/examples/py-wxPython/demo/agw/bitmaps/playdisabled.png
> +share/examples/py-wxPython/demo/agw/bitmaps/plus1.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/plus2.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/plus3.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/plus4.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/plus5.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/record.png
> +share/examples/py-wxPython/demo/agw/bitmaps/recorddisabled.png
> +share/examples/py-wxPython/demo/agw/bitmaps/rewind.png
> +share/examples/py-wxPython/demo/agw/bitmaps/rewinddisabled.png
> +share/examples/py-wxPython/demo/agw/bitmaps/round.png
> +share/examples/py-wxPython/demo/agw/bitmaps/save.png
> +share/examples/py-wxPython/demo/agw/bitmaps/separator.gif
> +share/examples/py-wxPython/demo/agw/bitmaps/separatorflip.png
> +share/examples/py-wxPython/demo/agw/bitmaps/smfuel.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/smpi.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/smtemp.ico
> +share/examples/py-wxPython/demo/agw/bitmaps/stop.png
> +share/examples/py-wxPython/demo/agw/bitmaps/stopdisabled.png
> +share/examples/py-wxPython/demo/agw/bitmaps/sttbutton.png
> +share/examples/py-wxPython/demo/agw/bitmaps/sttfont.png
> +share/examples/py-wxPython/demo/agw/bitmaps/sttheader.png
> +share/examples/py-wxPython/demo/agw/bitmaps/stthelp.png
> +share/examples/py-wxPython/demo/agw/bitmaps/view1.png
> +share/examples/py-wxPython/demo/agw/bitmaps/view2.png
> +share/examples/py-wxPython/demo/agw/bitmaps/view_choose.png
> +share/examples/py-wxPython/demo/agw/bitmaps/view_detailed.png
> +share/examples/py-wxPython/demo/agw/bitmaps/view_icon.png
> +share/examples/py-wxPython/demo/agw/bitmaps/view_multicolumn.png
> +share/examples/py-wxPython/demo/agw/bitmaps/viewmag-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/viewmag-m-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/viewmag-p-16.png
> +share/examples/py-wxPython/demo/agw/bitmaps/viewmagfit-16.png
> +share/examples/py-wxPython/demo/agw/images.py
> +share/examples/py-wxPython/demo/agw/run.py
>  share/examples/py-wxPython/demo/b
>  share/examples/py-wxPython/demo/bitmaps/
>  share/examples/py-wxPython/demo/bitmaps/AG00028_.gif
> @@ -1171,6 +2331,7 @@ share/examples/py-wxPython/demo/data/pla
>  share/examples/py-wxPython/demo/data/proclamation.txt
>  share/examples/py-wxPython/demo/data/resource.wdr
>  share/examples/py-wxPython/demo/data/resource_wdr.xrc
> +share/examples/py-wxPython/demo/data/romedalen.png
>  share/examples/py-wxPython/demo/data/stc.h.html
>  share/examples/py-wxPython/demo/data/tables.htm
>  share/examples/py-wxPython/demo/data/test.htm
> @@ -1192,8 +2353,35 @@ share/examples/py-wxPython/demo/paper.xm
>  share/examples/py-wxPython/demo/pyTree.py
>  share/examples/py-wxPython/demo/quotes.xml
>  share/examples/py-wxPython/demo/run.py
> +share/examples/py-wxPython/demo/snippets/
> +share/examples/py-wxPython/demo/snippets/__init__.py
> +share/examples/py-wxPython/demo/snippets/arc.py
> +share/examples/py-wxPython/demo/snippets/arc_negative.py
> +share/examples/py-wxPython/demo/snippets/clip.py
> +share/examples/py-wxPython/demo/snippets/clip_image.py
> +share/examples/py-wxPython/demo/snippets/curve_rectangle.py
> +share/examples/py-wxPython/demo/snippets/curve_to.py
> +share/examples/py-wxPython/demo/snippets/dash.py
> +share/examples/py-wxPython/demo/snippets/ellipse.py
> +share/examples/py-wxPython/demo/snippets/fill_and_stroke.py
> +share/examples/py-wxPython/demo/snippets/fill_and_stroke2.py
> +share/examples/py-wxPython/demo/snippets/fill_style.py
> +share/examples/py-wxPython/demo/snippets/glyph_path.py
> +share/examples/py-wxPython/demo/snippets/gradient.py
> +share/examples/py-wxPython/demo/snippets/gradient_mask.py
> +share/examples/py-wxPython/demo/snippets/group.py
> +share/examples/py-wxPython/demo/snippets/image.py
> +share/examples/py-wxPython/demo/snippets/imagepattern.py
> +share/examples/py-wxPython/demo/snippets/path.py
> +share/examples/py-wxPython/demo/snippets/set_line_cap.py
> +share/examples/py-wxPython/demo/snippets/set_line_join.py
> +share/examples/py-wxPython/demo/snippets/show_glyphs.py
> +share/examples/py-wxPython/demo/snippets/text.py
> +share/examples/py-wxPython/demo/snippets/text_align_center.py
> +share/examples/py-wxPython/demo/snippets/text_extents.py
>  share/examples/py-wxPython/demo/template.py
>  share/examples/py-wxPython/demo/throbImages.py
> +share/examples/py-wxPython/demo/version.py
>  share/examples/py-wxPython/demo/viewer.py
>  share/examples/py-wxPython/demo/viewer_basics.py
>  share/examples/py-wxPython/demo/widgetTest.py