Update to 2.9.1.

PR:		151222

16 files changed, 751 insertions, 268 deletions

diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index a7509d695ed..f7f09e7b3d3 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.8.10
-PORTREVISION?=	4
+PORTVERSION=	2.9.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
-PKGNAMESUFFIX=	${WXGTK_FLAVOR}
-DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
+MASTER_SITES=	SF/wxwindows/${PORTVERSION}
+PKGNAMESUFFIX=	gtk2
+DISTNAME=	wxWidgets-${PORTVERSION}
 
 MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
@@ -27,6 +27,7 @@ USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GNOME=	gtk20
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-libjpeg=sys\
@@ -41,12 +42,8 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--enable-graphics_ctx
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
-		WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
 		X11BASE="${LOCALBASE}"
-PLIST=		${.CURDIR}/pkg-plist
-
-WXGTK_FLAVOR?=	gtk2
 
 OPTIONS=	GSTREAMER "media support" on\
 		MSPACK "MS archives support" on
@@ -57,10 +54,8 @@ OPTIONS=	GSTREAMER "media support" on\
 CONFIGURE_ARGS+=--enable-mediactrl
 USE_GNOME+=	gconf2
 USE_GSTREAMER=	yes
-PLIST_SUB+=     GSTREAMER=""
 .else
 CONFIGURE_ARGS+=--disable-mediactrl
-PLIST_SUB+=     GSTREAMER="@comment "
 .endif
 
 .if defined(WITH_MSPACK)
@@ -70,46 +65,4 @@ LIB_DEPENDS+=	mspack.1:${PORTSDIR}/archivers/libmspack
 CONFIGURE_ARGS+=--without-libmspack
 .endif
 
-.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
-.endif
-
-.if ${WXGTK_FLAVOR:M*-common} != ""
-NO_BUILD=	yes
-INSTALL_TARGET=	install-common
-.else
-USE_LDCONFIG=	yes
-.endif # *-common
-
-.if ${WXGTK_FLAVOR:M*-contrib*} != ""
-BUILD_WRKSRC=	${WRKSRC}/contrib
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-
-.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-USE_WX=		2.8
-RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
-
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-WX_UNICODE=	yes
-.endif
-
-pre-configure:
-	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e "s|@CXXFLAGS@|${CFLAGS} `${WX_CONFIG} --cxxflags`|" \
-		-e "s|@CFLAGS@|${CFLAGS} `${WX_CONFIG} --cflags`|" \
-		-e "s|@CPPFLAGS@||"
-
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-CONFIGURE_ARGS+=--enable-unicode
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
-		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
-		-e 's|png_check_sig|png_sig_cmp|g' \
-			${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index 6b1855837fc..db75686acdd 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,3 +1,2 @@
-MD5 (wxGTK-2.8.10.tar.bz2) = 88b867bc118a183af56efc67014bdf27
-SHA256 (wxGTK-2.8.10.tar.bz2) = 697569f3c029da68a6f5e95ad01e6ae26cf86e3776fcbfc8671de2e688099a98
-SIZE (wxGTK-2.8.10.tar.bz2) = 9365627
+SHA256 (wxWidgets-2.9.1.tar.bz2) = 6895f37d5fd9e11e50a02fe3282c228fbc610305b3c60a4fd01072253f6dd7b8
+SIZE (wxWidgets-2.9.1.tar.bz2) = 16297766
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index bc15e07934e..823a0ea64a7 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2009-03-06 18:17:59.000000000 +0600
-+++ Makefile.in	2009-03-20 00:04:22.000000000 +0600
+--- Makefile.in.orig	2010-07-18 20:39:20.000000000 +0700
++++ Makefile.in	2011-02-18 15:33:56.000000000 +0600
 @@ -25,6 +25,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -7,34 +7,20 @@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
- BK_DEPS = @BK_DEPS@
-@@ -11443,11 +11444,7 @@
+ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
+@@ -13465,9 +13466,9 @@
  
- 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)
- 
--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
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_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_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
-+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 $(__cocoa_res_install___depname)
++	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
+ 	$(DYLIB_RPATH_INSTALL)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
  	for f in setup.h $(RCDEFS_H); do \
- 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -11455,6 +11452,12 @@
- 	fi; \
- 	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
- 	done
-+
-+install-common: locale_install
-+	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
-+	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
-+	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in $(ALL_HEADERS); do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -12202,17 +12205,16 @@
+@@ -14308,9 +14309,7 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -44,9 +30,8 @@
 +	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
  
  locale_install: 
-+	(cd $(srcdir)/locale && $(MAKE) allmo)
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
- 	for l in $(LOCALE_LINGUAS) ; do \
+@@ -14318,7 +14317,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/$$l.mo ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-Makefile.in
deleted file mode 100644
index 20b4b5800f8..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- contrib/Makefile.in.orig	Sun Jun 27 21:46:24 2004
-+++ contrib/Makefile.in	Sun Jun 27 21:46:44 2004
-@@ -16,3 +16,6 @@
- 
- install:
- 	cd src; $(MAKE) install
-+
-+install-common:
-+	cd src; $(MAKE) install-common
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
deleted file mode 100644
index 78773088be8..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- contrib/src/Makefile.in.orig	2009-03-06 18:18:00.000000000 +0600
-+++ contrib/src/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -2,15 +2,25 @@
- 
- CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
- 
--all:
-+WX_RELEASE=		@WX_RELEASE@
-+wx_top_builddir=	@wx_top_builddir@
-+@COND_UNICODE_1@wxregexu_depname=	wxregexu
-+
-+all:	$(wxregexu_depname)
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
- 
-+wxregexu:
-+	@cd ../.. && $(MAKE) $(wx_top_builddir)/lib/libwxregexu-$(WX_RELEASE).a
-+
- clean:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
- 
- install:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done
- 
-+
-+install-common:
-+	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done
- uninstall:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done
- 
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
deleted file mode 100644
index cd1f741c59c..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/fl/Makefile.in.orig	2009-03-06 18:18:00.000000000 +0600
-+++ contrib/src/fl/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -245,6 +245,8 @@
- all: $(__fldll___depname) $(__fllib___depname)
- 
- install: $(__install_fldll___depname) $(__install_fllib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
deleted file mode 100644
index c71e4ee1ed7..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/gizmos/Makefile.in.orig	2009-03-06 18:18:00.000000000 +0600
-+++ contrib/src/gizmos/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -308,6 +308,8 @@
- 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)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
deleted file mode 100644
index 5039cab2373..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/ogl/Makefile.in.orig	2009-03-06 18:18:06.000000000 +0600
-+++ contrib/src/ogl/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -235,6 +235,8 @@
- all: $(__ogldll___depname) $(__ogllib___depname)
- 
- install: $(__install_ogldll___depname) $(__install_ogllib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
deleted file mode 100644
index 1089e735172..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/plot/Makefile.in.orig	2009-03-06 18:18:00.000000000 +0600
-+++ contrib/src/plot/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -213,6 +213,8 @@
- all: $(__plotdll___depname) $(__plotlib___depname)
- 
- install: $(__install_plotdll___depname) $(__install_plotlib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
deleted file mode 100644
index b665ce68fe6..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/stc/Makefile.in.orig	2009-03-06 18:18:00.000000000 +0600
-+++ contrib/src/stc/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -369,6 +369,8 @@
- all: $(__stcdll___depname) $(__stclib___depname)
- 
- install: $(__install_stcdll___depname) $(__install_stclib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/stc/stc.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
deleted file mode 100644
index 1210c887991..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/svg/Makefile.in.orig	2009-03-06 18:18:00.000000000 +0600
-+++ contrib/src/svg/Makefile.in	2009-03-20 00:07:59.000000000 +0600
-@@ -213,6 +213,8 @@
- all: $(__svgdll___depname) $(__svglib___depname)
- 
- install: $(__install_svgdll___depname) $(__install_svglib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/svg/dcsvg.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h b/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h
deleted file mode 100644
index d9c66f279be..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/wx/gtk/win_gtk.h.orig	2009-11-27 01:59:18.000000000 +0100
-+++ include/wx/gtk/win_gtk.h	2009-11-27 01:59:33.000000000 +0100
-@@ -15,7 +15,9 @@
- extern "C" {
- #endif /* __cplusplus */
- 
-+#define GSocket GlibGSocket
- #include <gtk/gtkcontainer.h>
-+#undef GSocket
- 
- #include "wx/dlimpexp.h"
- 
diff --git a/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
deleted file mode 100644
index 5d205cecb55..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/intl.cpp.orig	Mon Jan  8 21:27:30 2007
-+++ src/common/intl.cpp	Mon Jan  8 21:27:18 2007
-@@ -1585,7 +1585,7 @@
-   bool bOk = true;
-   if ( bLoadDefault )
-   {
--    bOk = AddCatalog(wxT("wxstd"));
-+    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
- 
-     // there may be a catalog with toolkit specific overrides, it is not
-     // an error if this does not exist
diff --git a/x11-toolkits/wxgtk29/files/patch-src-common-translation.cpp b/x11-toolkits/wxgtk29/files/patch-src-common-translation.cpp
new file mode 100644
index 00000000000..5002755f854
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-src-common-translation.cpp
@@ -0,0 +1,11 @@
+--- src/common/translation.cpp.orig	2011-02-18 15:12:53.000000000 +0600
++++ src/common/translation.cpp	2011-02-18 15:15:10.000000000 +0600
+@@ -1302,7 +1302,7 @@
+ 
+ bool wxTranslations::AddStdCatalog()
+ {
+-    if ( !AddCatalog(wxS("wxstd")) )
++    if ( !AddCatalog(wxS("wxstd") wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)) )
+         return false;
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
diff --git a/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp
deleted file mode 100644
index 113f73e51ce..00000000000
--- a/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/gtk//gsockgtk.cpp.orig	2007-03-20 16:50:07.000000000 +0100
-+++ src/gtk/gsockgtk.cpp	2009-09-18 14:46:47.000000000 +0200
-@@ -14,8 +14,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"
diff --git a/x11-toolkits/wxgtk29/pkg-plist b/x11-toolkits/wxgtk29/pkg-plist
index 2da4031d912..2b386a6209c 100644
--- a/x11-toolkits/wxgtk29/pkg-plist
+++ b/x11-toolkits/wxgtk29/pkg-plist
@@ -1,43 +1,721 @@
-bin/wxgtk2-2.8-config
-bin/wxrc-gtk2-2.8
-lib/libwx_base-2.8.so
-lib/libwx_base-2.8.so.0
-lib/libwx_base-2.8.so.0.6.0
-lib/libwx_base_net-2.8.so
-lib/libwx_base_net-2.8.so.0
-lib/libwx_base_net-2.8.so.0.6.0
-lib/libwx_base_xml-2.8.so
-lib/libwx_base_xml-2.8.so.0
-lib/libwx_base_xml-2.8.so.0.6.0
-lib/libwx_gtk2_adv-2.8.so
-lib/libwx_gtk2_adv-2.8.so.0
-lib/libwx_gtk2_adv-2.8.so.0.6.0
-lib/libwx_gtk2_aui-2.8.so
-lib/libwx_gtk2_aui-2.8.so.0
-lib/libwx_gtk2_aui-2.8.so.0.6.0
-lib/libwx_gtk2_core-2.8.so
-lib/libwx_gtk2_core-2.8.so.0
-lib/libwx_gtk2_core-2.8.so.0.6.0
-lib/libwx_gtk2_gl-2.8.so
-lib/libwx_gtk2_gl-2.8.so.0
-lib/libwx_gtk2_gl-2.8.so.0.6.0
-lib/libwx_gtk2_html-2.8.so
-lib/libwx_gtk2_html-2.8.so.0
-lib/libwx_gtk2_html-2.8.so.0.6.0
-%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so
-%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0
-%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0.6.0
-lib/libwx_gtk2_qa-2.8.so
-lib/libwx_gtk2_qa-2.8.so.0
-lib/libwx_gtk2_qa-2.8.so.0.6.0
-lib/libwx_gtk2_richtext-2.8.so
-lib/libwx_gtk2_richtext-2.8.so.0
-lib/libwx_gtk2_richtext-2.8.so.0.6.0
-lib/libwx_gtk2_xrc-2.8.so
-lib/libwx_gtk2_xrc-2.8.so.0
-lib/libwx_gtk2_xrc-2.8.so.0.6.0
-lib/wx/include/gtk2-ansi-release-2.8/wx/setup.h
-@dirrm lib/wx/include/gtk2-ansi-release-2.8/wx
-@dirrm lib/wx/include/gtk2-ansi-release-2.8
+bin/wxgtk2u-2.9-config
+bin/wxrc-gtk2u-2.9
+include/wx-2.9/wx/aboutdlg.h
+include/wx-2.9/wx/accel.h
+include/wx-2.9/wx/access.h
+include/wx-2.9/wx/afterstd.h
+include/wx-2.9/wx/anidecod.h
+include/wx-2.9/wx/animate.h
+include/wx-2.9/wx/animdecod.h
+include/wx-2.9/wx/any.h
+include/wx-2.9/wx/anystr.h
+include/wx-2.9/wx/app.h
+include/wx-2.9/wx/apptrait.h
+include/wx-2.9/wx/archive.h
+include/wx-2.9/wx/arrimpl.cpp
+include/wx-2.9/wx/arrstr.h
+include/wx-2.9/wx/artprov.h
+include/wx-2.9/wx/atomic.h
+include/wx-2.9/wx/aui/aui.h
+include/wx-2.9/wx/aui/auibar.h
+include/wx-2.9/wx/aui/auibook.h
+include/wx-2.9/wx/aui/dockart.h
+include/wx-2.9/wx/aui/floatpane.h
+include/wx-2.9/wx/aui/framemanager.h
+include/wx-2.9/wx/aui/tabmdi.h
+include/wx-2.9/wx/base64.h
+include/wx-2.9/wx/beforestd.h
+include/wx-2.9/wx/bitmap.h
+include/wx-2.9/wx/bmpbuttn.h
+include/wx-2.9/wx/bmpcbox.h
+include/wx-2.9/wx/bookctrl.h
+include/wx-2.9/wx/brush.h
+include/wx-2.9/wx/buffer.h
+include/wx-2.9/wx/build.h
+include/wx-2.9/wx/busyinfo.h
+include/wx-2.9/wx/button.h
+include/wx-2.9/wx/cairo.h
+include/wx-2.9/wx/calctrl.h
+include/wx-2.9/wx/caret.h
+include/wx-2.9/wx/chartype.h
+include/wx-2.9/wx/checkbox.h
+include/wx-2.9/wx/checkeddelete.h
+include/wx-2.9/wx/checklst.h
+include/wx-2.9/wx/chkconf.h
+include/wx-2.9/wx/choicdlg.h
+include/wx-2.9/wx/choice.h
+include/wx-2.9/wx/choicebk.h
+include/wx-2.9/wx/clipbrd.h
+include/wx-2.9/wx/clntdata.h
+include/wx-2.9/wx/clrpicker.h
+include/wx-2.9/wx/cmdargs.h
+include/wx-2.9/wx/cmdline.h
+include/wx-2.9/wx/cmdproc.h
+include/wx-2.9/wx/cmndata.h
+include/wx-2.9/wx/collpane.h
+include/wx-2.9/wx/colordlg.h
+include/wx-2.9/wx/colour.h
+include/wx-2.9/wx/combo.h
+include/wx-2.9/wx/combobox.h
+include/wx-2.9/wx/confbase.h
+include/wx-2.9/wx/config.h
+include/wx-2.9/wx/containr.h
+include/wx-2.9/wx/control.h
+include/wx-2.9/wx/convauto.h
+include/wx-2.9/wx/cpp.h
+include/wx-2.9/wx/crt.h
+include/wx-2.9/wx/cshelp.h
+include/wx-2.9/wx/ctrlsub.h
+include/wx-2.9/wx/cursor.h
+include/wx-2.9/wx/dataobj.h
+include/wx-2.9/wx/dataview.h
+include/wx-2.9/wx/datectrl.h
+include/wx-2.9/wx/dateevt.h
+include/wx-2.9/wx/datetime.h
+include/wx-2.9/wx/datstrm.h
+include/wx-2.9/wx/dc.h
+include/wx-2.9/wx/dcbuffer.h
+include/wx-2.9/wx/dcclient.h
+include/wx-2.9/wx/dcgraph.h
+include/wx-2.9/wx/dcmemory.h
+include/wx-2.9/wx/dcmirror.h
+include/wx-2.9/wx/dcprint.h
+include/wx-2.9/wx/dcps.h
+include/wx-2.9/wx/dcscreen.h
+include/wx-2.9/wx/dcsvg.h
+include/wx-2.9/wx/dde.h
+include/wx-2.9/wx/debug.h
+include/wx-2.9/wx/debugrpt.h
+include/wx-2.9/wx/defs.h
+include/wx-2.9/wx/dialog.h
+include/wx-2.9/wx/dialup.h
+include/wx-2.9/wx/dir.h
+include/wx-2.9/wx/dirctrl.h
+include/wx-2.9/wx/dirdlg.h
+include/wx-2.9/wx/display.h
+include/wx-2.9/wx/display_impl.h
+include/wx-2.9/wx/dlimpexp.h
+include/wx-2.9/wx/dlist.h
+include/wx-2.9/wx/dnd.h
+include/wx-2.9/wx/docmdi.h
+include/wx-2.9/wx/docview.h
+include/wx-2.9/wx/dragimag.h
+include/wx-2.9/wx/dvrenderers.h
+include/wx-2.9/wx/dynarray.h
+include/wx-2.9/wx/dynlib.h
+include/wx-2.9/wx/dynload.h
+include/wx-2.9/wx/editlbox.h
+include/wx-2.9/wx/effects.h
+include/wx-2.9/wx/encconv.h
+include/wx-2.9/wx/encinfo.h
+include/wx-2.9/wx/event.h
+include/wx-2.9/wx/evtloop.h
+include/wx-2.9/wx/evtloopsrc.h
+include/wx-2.9/wx/except.h
+include/wx-2.9/wx/fdrepdlg.h
+include/wx-2.9/wx/features.h
+include/wx-2.9/wx/ffile.h
+include/wx-2.9/wx/file.h
+include/wx-2.9/wx/fileconf.h
+include/wx-2.9/wx/filectrl.h
+include/wx-2.9/wx/filedlg.h
+include/wx-2.9/wx/filefn.h
+include/wx-2.9/wx/filehistory.h
+include/wx-2.9/wx/filename.h
+include/wx-2.9/wx/filepicker.h
+include/wx-2.9/wx/filesys.h
+include/wx-2.9/wx/flags.h
+include/wx-2.9/wx/fmappriv.h
+include/wx-2.9/wx/font.h
+include/wx-2.9/wx/fontdlg.h
+include/wx-2.9/wx/fontenc.h
+include/wx-2.9/wx/fontenum.h
+include/wx-2.9/wx/fontmap.h
+include/wx-2.9/wx/fontpicker.h
+include/wx-2.9/wx/fontutil.h
+include/wx-2.9/wx/frame.h
+include/wx-2.9/wx/fs_arc.h
+include/wx-2.9/wx/fs_filter.h
+include/wx-2.9/wx/fs_inet.h
+include/wx-2.9/wx/fs_mem.h
+include/wx-2.9/wx/fs_zip.h
+include/wx-2.9/wx/fswatcher.h
+include/wx-2.9/wx/gauge.h
+include/wx-2.9/wx/gbsizer.h
+include/wx-2.9/wx/gdicmn.h
+include/wx-2.9/wx/gdiobj.h
+include/wx-2.9/wx/generic/aboutdlgg.h
+include/wx-2.9/wx/generic/accel.h
+include/wx-2.9/wx/generic/bmpcbox.h
+include/wx-2.9/wx/generic/busyinfo.h
+include/wx-2.9/wx/generic/buttonbar.h
+include/wx-2.9/wx/generic/calctrlg.h
+include/wx-2.9/wx/generic/caret.h
+include/wx-2.9/wx/generic/choicdgg.h
+include/wx-2.9/wx/generic/colrdlgg.h
+include/wx-2.9/wx/generic/combo.h
+include/wx-2.9/wx/generic/dataview.h
+include/wx-2.9/wx/generic/datectrl.h
+include/wx-2.9/wx/generic/dcpsg.h
+include/wx-2.9/wx/generic/dirctrlg.h
+include/wx-2.9/wx/generic/dragimgg.h
+include/wx-2.9/wx/generic/dvrenderer.h
+include/wx-2.9/wx/generic/dvrenderers.h
+include/wx-2.9/wx/generic/fdrepdlg.h
+include/wx-2.9/wx/generic/filectrlg.h
+include/wx-2.9/wx/generic/filepickerg.h
+include/wx-2.9/wx/generic/fontdlgg.h
+include/wx-2.9/wx/generic/fswatcher.h
+include/wx-2.9/wx/generic/grid.h
+include/wx-2.9/wx/generic/gridctrl.h
+include/wx-2.9/wx/generic/grideditors.h
+include/wx-2.9/wx/generic/gridsel.h
+include/wx-2.9/wx/generic/headerctrlg.h
+include/wx-2.9/wx/generic/helpext.h
+include/wx-2.9/wx/generic/hyperlink.h
+include/wx-2.9/wx/generic/icon.h
+include/wx-2.9/wx/generic/imaglist.h
+include/wx-2.9/wx/generic/infobar.h
+include/wx-2.9/wx/generic/laywin.h
+include/wx-2.9/wx/generic/listctrl.h
+include/wx-2.9/wx/generic/logg.h
+include/wx-2.9/wx/generic/msgdlgg.h
+include/wx-2.9/wx/generic/notebook.h
+include/wx-2.9/wx/generic/notifmsg.h
+include/wx-2.9/wx/generic/numdlgg.h
+include/wx-2.9/wx/generic/paletteg.h
+include/wx-2.9/wx/generic/panelg.h
+include/wx-2.9/wx/generic/printps.h
+include/wx-2.9/wx/generic/prntdlgg.h
+include/wx-2.9/wx/generic/progdlgg.h
+include/wx-2.9/wx/generic/propdlg.h
+include/wx-2.9/wx/generic/sashwin.h
+include/wx-2.9/wx/generic/scrolwin.h
+include/wx-2.9/wx/generic/spinctlg.h
+include/wx-2.9/wx/generic/splash.h
+include/wx-2.9/wx/generic/splitter.h
+include/wx-2.9/wx/generic/srchctlg.h
+include/wx-2.9/wx/generic/statbmpg.h
+include/wx-2.9/wx/generic/stattextg.h
+include/wx-2.9/wx/generic/statusbr.h
+include/wx-2.9/wx/generic/textdlgg.h
+include/wx-2.9/wx/generic/treectlg.h
+include/wx-2.9/wx/generic/wizard.h
+include/wx-2.9/wx/geometry.h
+include/wx-2.9/wx/gifdecod.h
+include/wx-2.9/wx/glcanvas.h
+include/wx-2.9/wx/graphics.h
+include/wx-2.9/wx/grid.h
+include/wx-2.9/wx/gtk/accel.h
+include/wx-2.9/wx/gtk/animate.h
+include/wx-2.9/wx/gtk/app.h
+include/wx-2.9/wx/gtk/assertdlg_gtk.h
+include/wx-2.9/wx/gtk/bitmap.h
+include/wx-2.9/wx/gtk/bmpbuttn.h
+include/wx-2.9/wx/gtk/bmpcbox.h
+include/wx-2.9/wx/gtk/brush.h
+include/wx-2.9/wx/gtk/button.h
+include/wx-2.9/wx/gtk/calctrl.h
+include/wx-2.9/wx/gtk/checkbox.h
+include/wx-2.9/wx/gtk/checklst.h
+include/wx-2.9/wx/gtk/chkconf.h
+include/wx-2.9/wx/gtk/choice.h
+include/wx-2.9/wx/gtk/clipbrd.h
+include/wx-2.9/wx/gtk/clrpicker.h
+include/wx-2.9/wx/gtk/collpane.h
+include/wx-2.9/wx/gtk/colordlg.h
+include/wx-2.9/wx/gtk/colour.h
+include/wx-2.9/wx/gtk/combobox.h
+include/wx-2.9/wx/gtk/control.h
+include/wx-2.9/wx/gtk/cursor.h
+include/wx-2.9/wx/gtk/dataform.h
+include/wx-2.9/wx/gtk/dataobj.h
+include/wx-2.9/wx/gtk/dataobj2.h
+include/wx-2.9/wx/gtk/dataview.h
+include/wx-2.9/wx/gtk/dc.h
+include/wx-2.9/wx/gtk/dcclient.h
+include/wx-2.9/wx/gtk/dcmemory.h
+include/wx-2.9/wx/gtk/dcscreen.h
+include/wx-2.9/wx/gtk/dialog.h
+include/wx-2.9/wx/gtk/dirdlg.h
+include/wx-2.9/wx/gtk/dnd.h
+include/wx-2.9/wx/gtk/dvrenderer.h
+include/wx-2.9/wx/gtk/dvrenderers.h
+include/wx-2.9/wx/gtk/evtloop.h
+include/wx-2.9/wx/gtk/evtloopsrc.h
+include/wx-2.9/wx/gtk/filectrl.h
+include/wx-2.9/wx/gtk/filedlg.h
+include/wx-2.9/wx/gtk/filehistory.h
+include/wx-2.9/wx/gtk/filepicker.h
+include/wx-2.9/wx/gtk/font.h
+include/wx-2.9/wx/gtk/fontdlg.h
+include/wx-2.9/wx/gtk/fontpicker.h
+include/wx-2.9/wx/gtk/frame.h
+include/wx-2.9/wx/gtk/gauge.h
+include/wx-2.9/wx/gtk/glcanvas.h
+include/wx-2.9/wx/gtk/gnome/gprint.h
+include/wx-2.9/wx/gtk/gnome/gvfs.h
+include/wx-2.9/wx/gtk/hildon/notifmsg.h
+include/wx-2.9/wx/gtk/hyperlink.h
+include/wx-2.9/wx/gtk/infobar.h
+include/wx-2.9/wx/gtk/listbox.h
+include/wx-2.9/wx/gtk/mdi.h
+include/wx-2.9/wx/gtk/menu.h
+include/wx-2.9/wx/gtk/menuitem.h
+include/wx-2.9/wx/gtk/minifram.h
+include/wx-2.9/wx/gtk/msgdlg.h
+include/wx-2.9/wx/gtk/notebook.h
+include/wx-2.9/wx/gtk/pen.h
+include/wx-2.9/wx/gtk/popupwin.h
+include/wx-2.9/wx/gtk/print.h
+include/wx-2.9/wx/gtk/private/win_gtk.h
+include/wx-2.9/wx/gtk/radiobox.h
+include/wx-2.9/wx/gtk/radiobut.h
+include/wx-2.9/wx/gtk/region.h
+include/wx-2.9/wx/gtk/scrolbar.h
+include/wx-2.9/wx/gtk/scrolwin.h
+include/wx-2.9/wx/gtk/slider.h
+include/wx-2.9/wx/gtk/spinbutt.h
+include/wx-2.9/wx/gtk/spinctrl.h
+include/wx-2.9/wx/gtk/statbmp.h
+include/wx-2.9/wx/gtk/statbox.h
+include/wx-2.9/wx/gtk/statline.h
+include/wx-2.9/wx/gtk/stattext.h
+include/wx-2.9/wx/gtk/taskbar.h
+include/wx-2.9/wx/gtk/textctrl.h
+include/wx-2.9/wx/gtk/textentry.h
+include/wx-2.9/wx/gtk/tglbtn.h
+include/wx-2.9/wx/gtk/toolbar.h
+include/wx-2.9/wx/gtk/tooltip.h
+include/wx-2.9/wx/gtk/toplevel.h
+include/wx-2.9/wx/gtk/treeentry_gtk.h
+include/wx-2.9/wx/gtk/window.h
+include/wx-2.9/wx/hash.h
+include/wx-2.9/wx/hashmap.h
+include/wx-2.9/wx/hashset.h
+include/wx-2.9/wx/headercol.h
+include/wx-2.9/wx/headerctrl.h
+include/wx-2.9/wx/help.h
+include/wx-2.9/wx/helpbase.h
+include/wx-2.9/wx/helphtml.h
+include/wx-2.9/wx/helpwin.h
+include/wx-2.9/wx/html/forcelnk.h
+include/wx-2.9/wx/html/helpctrl.h
+include/wx-2.9/wx/html/helpdata.h
+include/wx-2.9/wx/html/helpdlg.h
+include/wx-2.9/wx/html/helpfrm.h
+include/wx-2.9/wx/html/helpwnd.h
+include/wx-2.9/wx/html/htmlcell.h
+include/wx-2.9/wx/html/htmldefs.h
+include/wx-2.9/wx/html/htmlfilt.h
+include/wx-2.9/wx/html/htmlpars.h
+include/wx-2.9/wx/html/htmlproc.h
+include/wx-2.9/wx/html/htmltag.h
+include/wx-2.9/wx/html/htmlwin.h
+include/wx-2.9/wx/html/htmprint.h
+include/wx-2.9/wx/html/m_templ.h
+include/wx-2.9/wx/html/styleparams.h
+include/wx-2.9/wx/html/winpars.h
+include/wx-2.9/wx/htmllbox.h
+include/wx-2.9/wx/hyperlink.h
+include/wx-2.9/wx/icon.h
+include/wx-2.9/wx/iconbndl.h
+include/wx-2.9/wx/iconloc.h
+include/wx-2.9/wx/imagbmp.h
+include/wx-2.9/wx/image.h
+include/wx-2.9/wx/imaggif.h
+include/wx-2.9/wx/imagiff.h
+include/wx-2.9/wx/imagjpeg.h
+include/wx-2.9/wx/imaglist.h
+include/wx-2.9/wx/imagpcx.h
+include/wx-2.9/wx/imagpng.h
+include/wx-2.9/wx/imagpnm.h
+include/wx-2.9/wx/imagtga.h
+include/wx-2.9/wx/imagtiff.h
+include/wx-2.9/wx/imagxpm.h
+include/wx-2.9/wx/infobar.h
+include/wx-2.9/wx/init.h
+include/wx-2.9/wx/intl.h
+include/wx-2.9/wx/iosfwrap.h
+include/wx-2.9/wx/ioswrap.h
+include/wx-2.9/wx/ipc.h
+include/wx-2.9/wx/ipcbase.h
+include/wx-2.9/wx/joystick.h
+include/wx-2.9/wx/kbdstate.h
+include/wx-2.9/wx/language.h
+include/wx-2.9/wx/layout.h
+include/wx-2.9/wx/laywin.h
+include/wx-2.9/wx/link.h
+include/wx-2.9/wx/list.h
+include/wx-2.9/wx/listbase.h
+include/wx-2.9/wx/listbook.h
+include/wx-2.9/wx/listbox.h
+include/wx-2.9/wx/listctrl.h
+include/wx-2.9/wx/listimpl.cpp
+include/wx-2.9/wx/log.h
+include/wx-2.9/wx/longlong.h
+include/wx-2.9/wx/math.h
+include/wx-2.9/wx/matrix.h
+include/wx-2.9/wx/mdi.h
+include/wx-2.9/wx/mediactrl.h
+include/wx-2.9/wx/memconf.h
+include/wx-2.9/wx/memory.h
+include/wx-2.9/wx/memtext.h
+include/wx-2.9/wx/menu.h
+include/wx-2.9/wx/menuitem.h
+include/wx-2.9/wx/meta/convertible.h
+include/wx-2.9/wx/meta/if.h
+include/wx-2.9/wx/meta/int2type.h
+include/wx-2.9/wx/meta/movable.h
+include/wx-2.9/wx/meta/pod.h
+include/wx-2.9/wx/metafile.h
+include/wx-2.9/wx/mimetype.h
+include/wx-2.9/wx/minifram.h
+include/wx-2.9/wx/module.h
+include/wx-2.9/wx/mousemanager.h
+include/wx-2.9/wx/mousestate.h
+include/wx-2.9/wx/msgdlg.h
+include/wx-2.9/wx/msgout.h
+include/wx-2.9/wx/msgqueue.h
+include/wx-2.9/wx/mstream.h
+include/wx-2.9/wx/nativewin.h
+include/wx-2.9/wx/nonownedwnd.h
+include/wx-2.9/wx/notebook.h
+include/wx-2.9/wx/notifmsg.h
+include/wx-2.9/wx/numdlg.h
+include/wx-2.9/wx/object.h
+include/wx-2.9/wx/odcombo.h
+include/wx-2.9/wx/overlay.h
+include/wx-2.9/wx/ownerdrw.h
+include/wx-2.9/wx/palette.h
+include/wx-2.9/wx/panel.h
+include/wx-2.9/wx/paper.h
+include/wx-2.9/wx/pen.h
+include/wx-2.9/wx/persist.h
+include/wx-2.9/wx/persist/bookctrl.h
+include/wx-2.9/wx/persist/toplevel.h
+include/wx-2.9/wx/persist/treebook.h
+include/wx-2.9/wx/persist/window.h
+include/wx-2.9/wx/pickerbase.h
+include/wx-2.9/wx/platform.h
+include/wx-2.9/wx/platinfo.h
+include/wx-2.9/wx/popupwin.h
+include/wx-2.9/wx/position.h
+include/wx-2.9/wx/power.h
+include/wx-2.9/wx/print.h
+include/wx-2.9/wx/printdlg.h
+include/wx-2.9/wx/prntbase.h
+include/wx-2.9/wx/process.h
+include/wx-2.9/wx/progdlg.h
+include/wx-2.9/wx/propdlg.h
+include/wx-2.9/wx/propgrid/advprops.h
+include/wx-2.9/wx/propgrid/editors.h
+include/wx-2.9/wx/propgrid/manager.h
+include/wx-2.9/wx/propgrid/property.h
+include/wx-2.9/wx/propgrid/propgrid.h
+include/wx-2.9/wx/propgrid/propgriddefs.h
+include/wx-2.9/wx/propgrid/propgridiface.h
+include/wx-2.9/wx/propgrid/propgridpagestate.h
+include/wx-2.9/wx/propgrid/props.h
+include/wx-2.9/wx/protocol/file.h
+include/wx-2.9/wx/protocol/ftp.h
+include/wx-2.9/wx/protocol/http.h
+include/wx-2.9/wx/protocol/log.h
+include/wx-2.9/wx/protocol/protocol.h
+include/wx-2.9/wx/ptr_scpd.h
+include/wx-2.9/wx/ptr_shrd.h
+include/wx-2.9/wx/quantize.h
+include/wx-2.9/wx/radiobox.h
+include/wx-2.9/wx/radiobut.h
+include/wx-2.9/wx/rawbmp.h
+include/wx-2.9/wx/rearrangectrl.h
+include/wx-2.9/wx/recguard.h
+include/wx-2.9/wx/regex.h
+include/wx-2.9/wx/region.h
+include/wx-2.9/wx/renderer.h
+include/wx-2.9/wx/ribbon/art.h
+include/wx-2.9/wx/ribbon/art_internal.h
+include/wx-2.9/wx/ribbon/bar.h
+include/wx-2.9/wx/ribbon/buttonbar.h
+include/wx-2.9/wx/ribbon/control.h
+include/wx-2.9/wx/ribbon/gallery.h
+include/wx-2.9/wx/ribbon/page.h
+include/wx-2.9/wx/ribbon/panel.h
+include/wx-2.9/wx/ribbon/toolbar.h
+include/wx-2.9/wx/richtext/richtextbuffer.h
+include/wx-2.9/wx/richtext/richtextctrl.h
+include/wx-2.9/wx/richtext/richtextformatdlg.h
+include/wx-2.9/wx/richtext/richtexthtml.h
+include/wx-2.9/wx/richtext/richtextprint.h
+include/wx-2.9/wx/richtext/richtextstyledlg.h
+include/wx-2.9/wx/richtext/richtextstyles.h
+include/wx-2.9/wx/richtext/richtextsymboldlg.h
+include/wx-2.9/wx/richtext/richtextxml.h
+include/wx-2.9/wx/sashwin.h
+include/wx-2.9/wx/sckaddr.h
+include/wx-2.9/wx/sckipc.h
+include/wx-2.9/wx/sckstrm.h
+include/wx-2.9/wx/scopedarray.h
+include/wx-2.9/wx/scopedptr.h
+include/wx-2.9/wx/scopeguard.h
+include/wx-2.9/wx/scrolbar.h
+include/wx-2.9/wx/scrolwin.h
+include/wx-2.9/wx/selstore.h
+include/wx-2.9/wx/settings.h
+include/wx-2.9/wx/sharedptr.h
+include/wx-2.9/wx/sizer.h
+include/wx-2.9/wx/slider.h
+include/wx-2.9/wx/snglinst.h
+include/wx-2.9/wx/socket.h
+include/wx-2.9/wx/sound.h
+include/wx-2.9/wx/spinbutt.h
+include/wx-2.9/wx/spinctrl.h
+include/wx-2.9/wx/splash.h
+include/wx-2.9/wx/splitter.h
+include/wx-2.9/wx/srchctrl.h
+include/wx-2.9/wx/sstream.h
+include/wx-2.9/wx/stack.h
+include/wx-2.9/wx/stackwalk.h
+include/wx-2.9/wx/statbmp.h
+include/wx-2.9/wx/statbox.h
+include/wx-2.9/wx/statline.h
+include/wx-2.9/wx/stattext.h
+include/wx-2.9/wx/statusbr.h
+include/wx-2.9/wx/stc/stc.h
+include/wx-2.9/wx/stdpaths.h
+include/wx-2.9/wx/stdstream.h
+include/wx-2.9/wx/stockitem.h
+include/wx-2.9/wx/stopwatch.h
+include/wx-2.9/wx/strconv.h
+include/wx-2.9/wx/stream.h
+include/wx-2.9/wx/string.h
+include/wx-2.9/wx/stringimpl.h
+include/wx-2.9/wx/stringops.h
+include/wx-2.9/wx/strvararg.h
+include/wx-2.9/wx/sysopt.h
+include/wx-2.9/wx/tarstrm.h
+include/wx-2.9/wx/taskbar.h
+include/wx-2.9/wx/tbarbase.h
+include/wx-2.9/wx/textbuf.h
+include/wx-2.9/wx/textctrl.h
+include/wx-2.9/wx/textdlg.h
+include/wx-2.9/wx/textentry.h
+include/wx-2.9/wx/textfile.h
+include/wx-2.9/wx/textwrapper.h
+include/wx-2.9/wx/tglbtn.h
+include/wx-2.9/wx/thread.h
+include/wx-2.9/wx/thrimpl.cpp
+include/wx-2.9/wx/timer.h
+include/wx-2.9/wx/tipdlg.h
+include/wx-2.9/wx/tipwin.h
+include/wx-2.9/wx/tls.h
+include/wx-2.9/wx/tokenzr.h
+include/wx-2.9/wx/toolbar.h
+include/wx-2.9/wx/toolbook.h
+include/wx-2.9/wx/tooltip.h
+include/wx-2.9/wx/toplevel.h
+include/wx-2.9/wx/tracker.h
+include/wx-2.9/wx/translation.h
+include/wx-2.9/wx/treebase.h
+include/wx-2.9/wx/treebook.h
+include/wx-2.9/wx/treectrl.h
+include/wx-2.9/wx/txtstrm.h
+include/wx-2.9/wx/typeinfo.h
+include/wx-2.9/wx/types.h
+include/wx-2.9/wx/uiaction.h
+include/wx-2.9/wx/unichar.h
+include/wx-2.9/wx/unix/app.h
+include/wx-2.9/wx/unix/apptbase.h
+include/wx-2.9/wx/unix/apptrait.h
+include/wx-2.9/wx/unix/chkconf.h
+include/wx-2.9/wx/unix/evtloop.h
+include/wx-2.9/wx/unix/evtloopsrc.h
+include/wx-2.9/wx/unix/execute.h
+include/wx-2.9/wx/unix/fontutil.h
+include/wx-2.9/wx/unix/fswatcher_inotify.h
+include/wx-2.9/wx/unix/fswatcher_kqueue.h
+include/wx-2.9/wx/unix/glx11.h
+include/wx-2.9/wx/unix/joystick.h
+include/wx-2.9/wx/unix/mimetype.h
+include/wx-2.9/wx/unix/pipe.h
+include/wx-2.9/wx/unix/sound.h
+include/wx-2.9/wx/unix/stackwalk.h
+include/wx-2.9/wx/unix/stdpaths.h
+include/wx-2.9/wx/unix/taskbarx11.h
+include/wx-2.9/wx/unix/tls.h
+include/wx-2.9/wx/unix/utilsx11.h
+include/wx-2.9/wx/uri.h
+include/wx-2.9/wx/url.h
+include/wx-2.9/wx/ustring.h
+include/wx-2.9/wx/utils.h
+include/wx-2.9/wx/valgen.h
+include/wx-2.9/wx/validate.h
+include/wx-2.9/wx/valtext.h
+include/wx-2.9/wx/variant.h
+include/wx-2.9/wx/vector.h
+include/wx-2.9/wx/version.h
+include/wx-2.9/wx/vidmode.h
+include/wx-2.9/wx/vlbox.h
+include/wx-2.9/wx/vms_x_fix.h
+include/wx-2.9/wx/volume.h
+include/wx-2.9/wx/vscroll.h
+include/wx-2.9/wx/weakref.h
+include/wx-2.9/wx/wfstream.h
+include/wx-2.9/wx/window.h
+include/wx-2.9/wx/windowid.h
+include/wx-2.9/wx/wizard.h
+include/wx-2.9/wx/wrapsizer.h
+include/wx-2.9/wx/wupdlock.h
+include/wx-2.9/wx/wx.h
+include/wx-2.9/wx/wxchar.h
+include/wx-2.9/wx/wxcrt.h
+include/wx-2.9/wx/wxcrtbase.h
+include/wx-2.9/wx/wxcrtvararg.h
+include/wx-2.9/wx/wxhtml.h
+include/wx-2.9/wx/wxprec.h
+include/wx-2.9/wx/xlocale.h
+include/wx-2.9/wx/xml/xml.h
+include/wx-2.9/wx/xpmdecod.h
+include/wx-2.9/wx/xpmhand.h
+include/wx-2.9/wx/xrc/xh_all.h
+include/wx-2.9/wx/xrc/xh_animatctrl.h
+include/wx-2.9/wx/xrc/xh_bmp.h
+include/wx-2.9/wx/xrc/xh_bmpbt.h
+include/wx-2.9/wx/xrc/xh_bmpcbox.h
+include/wx-2.9/wx/xrc/xh_bttn.h
+include/wx-2.9/wx/xrc/xh_cald.h
+include/wx-2.9/wx/xrc/xh_chckb.h
+include/wx-2.9/wx/xrc/xh_chckl.h
+include/wx-2.9/wx/xrc/xh_choic.h
+include/wx-2.9/wx/xrc/xh_choicbk.h
+include/wx-2.9/wx/xrc/xh_clrpicker.h
+include/wx-2.9/wx/xrc/xh_collpane.h
+include/wx-2.9/wx/xrc/xh_combo.h
+include/wx-2.9/wx/xrc/xh_comboctrl.h
+include/wx-2.9/wx/xrc/xh_datectrl.h
+include/wx-2.9/wx/xrc/xh_dirpicker.h
+include/wx-2.9/wx/xrc/xh_dlg.h
+include/wx-2.9/wx/xrc/xh_editlbox.h
+include/wx-2.9/wx/xrc/xh_filectrl.h
+include/wx-2.9/wx/xrc/xh_filepicker.h
+include/wx-2.9/wx/xrc/xh_fontpicker.h
+include/wx-2.9/wx/xrc/xh_frame.h
+include/wx-2.9/wx/xrc/xh_gauge.h
+include/wx-2.9/wx/xrc/xh_gdctl.h
+include/wx-2.9/wx/xrc/xh_grid.h
+include/wx-2.9/wx/xrc/xh_html.h
+include/wx-2.9/wx/xrc/xh_htmllbox.h
+include/wx-2.9/wx/xrc/xh_hyperlink.h
+include/wx-2.9/wx/xrc/xh_listb.h
+include/wx-2.9/wx/xrc/xh_listbk.h
+include/wx-2.9/wx/xrc/xh_listc.h
+include/wx-2.9/wx/xrc/xh_mdi.h
+include/wx-2.9/wx/xrc/xh_menu.h
+include/wx-2.9/wx/xrc/xh_notbk.h
+include/wx-2.9/wx/xrc/xh_odcombo.h
+include/wx-2.9/wx/xrc/xh_panel.h
+include/wx-2.9/wx/xrc/xh_propdlg.h
+include/wx-2.9/wx/xrc/xh_radbt.h
+include/wx-2.9/wx/xrc/xh_radbx.h
+include/wx-2.9/wx/xrc/xh_scrol.h
+include/wx-2.9/wx/xrc/xh_scwin.h
+include/wx-2.9/wx/xrc/xh_sizer.h
+include/wx-2.9/wx/xrc/xh_slidr.h
+include/wx-2.9/wx/xrc/xh_spin.h
+include/wx-2.9/wx/xrc/xh_split.h
+include/wx-2.9/wx/xrc/xh_srchctrl.h
+include/wx-2.9/wx/xrc/xh_statbar.h
+include/wx-2.9/wx/xrc/xh_stbmp.h
+include/wx-2.9/wx/xrc/xh_stbox.h
+include/wx-2.9/wx/xrc/xh_stlin.h
+include/wx-2.9/wx/xrc/xh_sttxt.h
+include/wx-2.9/wx/xrc/xh_text.h
+include/wx-2.9/wx/xrc/xh_tglbtn.h
+include/wx-2.9/wx/xrc/xh_toolb.h
+include/wx-2.9/wx/xrc/xh_tree.h
+include/wx-2.9/wx/xrc/xh_treebk.h
+include/wx-2.9/wx/xrc/xh_unkwn.h
+include/wx-2.9/wx/xrc/xh_wizrd.h
+include/wx-2.9/wx/xrc/xmlres.h
+include/wx-2.9/wx/xti.h
+include/wx-2.9/wx/xtistrm.h
+include/wx-2.9/wx/xtixml.h
+include/wx-2.9/wx/zipstrm.h
+include/wx-2.9/wx/zstream.h
+lib/libwx_baseu-2.9.so
+lib/libwx_baseu-2.9.so.1
+lib/libwx_baseu-2.9.so.1.0.0
+lib/libwx_baseu_net-2.9.so
+lib/libwx_baseu_net-2.9.so.1
+lib/libwx_baseu_net-2.9.so.1.0.0
+lib/libwx_baseu_xml-2.9.so
+lib/libwx_baseu_xml-2.9.so.1
+lib/libwx_baseu_xml-2.9.so.1.0.0
+lib/libwx_gtk2u_adv-2.9.so
+lib/libwx_gtk2u_adv-2.9.so.1
+lib/libwx_gtk2u_adv-2.9.so.1.0.0
+lib/libwx_gtk2u_aui-2.9.so
+lib/libwx_gtk2u_aui-2.9.so.1
+lib/libwx_gtk2u_aui-2.9.so.1.0.0
+lib/libwx_gtk2u_core-2.9.so
+lib/libwx_gtk2u_core-2.9.so.1
+lib/libwx_gtk2u_core-2.9.so.1.0.0
+lib/libwx_gtk2u_gl-2.9.so
+lib/libwx_gtk2u_gl-2.9.so.1
+lib/libwx_gtk2u_gl-2.9.so.1.0.0
+lib/libwx_gtk2u_html-2.9.so
+lib/libwx_gtk2u_html-2.9.so.1
+lib/libwx_gtk2u_html-2.9.so.1.0.0
+lib/libwx_gtk2u_media-2.9.so
+lib/libwx_gtk2u_media-2.9.so.1
+lib/libwx_gtk2u_media-2.9.so.1.0.0
+lib/libwx_gtk2u_propgrid-2.9.so
+lib/libwx_gtk2u_propgrid-2.9.so.1
+lib/libwx_gtk2u_propgrid-2.9.so.1.0.0
+lib/libwx_gtk2u_qa-2.9.so
+lib/libwx_gtk2u_qa-2.9.so.1
+lib/libwx_gtk2u_qa-2.9.so.1.0.0
+lib/libwx_gtk2u_ribbon-2.9.so
+lib/libwx_gtk2u_ribbon-2.9.so.1
+lib/libwx_gtk2u_ribbon-2.9.so.1.0.0
+lib/libwx_gtk2u_richtext-2.9.so
+lib/libwx_gtk2u_richtext-2.9.so.1
+lib/libwx_gtk2u_richtext-2.9.so.1.0.0
+lib/libwx_gtk2u_stc-2.9.so
+lib/libwx_gtk2u_stc-2.9.so.1
+lib/libwx_gtk2u_stc-2.9.so.1.0.0
+lib/libwx_gtk2u_xrc-2.9.so
+lib/libwx_gtk2u_xrc-2.9.so.1
+lib/libwx_gtk2u_xrc-2.9.so.1.0.0
+lib/wx/include/gtk2-unicode-2.9/wx/setup.h
+share/aclocal/wxwin29.m4
+share/bakefile/presets/wx29.bkl
+share/bakefile/presets/wx29_presets.py
+share/bakefile/presets/wx29_unix.bkl
+share/bakefile/presets/wx29_win32.bkl
+share/bakefile/presets/wx29_xrc.bkl
+@dirrmtry share/bakefile/presets
+@dirrmtry share/bakefile
+@dirrm lib/wx/include/gtk2-unicode-2.9/wx
+@dirrm lib/wx/include/gtk2-unicode-2.9
 @dirrmtry lib/wx/include
 @dirrmtry lib/wx
+@dirrm include/wx-2.9/wx/xrc
+@dirrm include/wx-2.9/wx/xml
+@dirrm include/wx-2.9/wx/unix
+@dirrm include/wx-2.9/wx/stc
+@dirrm include/wx-2.9/wx/richtext
+@dirrm include/wx-2.9/wx/ribbon
+@dirrm include/wx-2.9/wx/protocol
+@dirrm include/wx-2.9/wx/propgrid
+@dirrm include/wx-2.9/wx/persist
+@dirrm include/wx-2.9/wx/meta
+@dirrm include/wx-2.9/wx/html
+@dirrm include/wx-2.9/wx/gtk/private
+@dirrm include/wx-2.9/wx/gtk/hildon
+@dirrm include/wx-2.9/wx/gtk/gnome
+@dirrm include/wx-2.9/wx/gtk
+@dirrm include/wx-2.9/wx/generic
+@dirrm include/wx-2.9/wx/aui
+@dirrm include/wx-2.9/wx
+@dirrm include/wx-2.9