28 files changed, 150 insertions, 158 deletions

diff --git a/x11-toolkits/wxgtk28-contrib/pkg-plist b/x11-toolkits/wxgtk28-contrib/pkg-plist
index 96be3a41cc2a..c81f50bea613 100644
--- a/x11-toolkits/wxgtk28-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib/pkg-plist
@@ -1,21 +1,21 @@
 lib/libwx_gtk2_fl-2.8.so
 lib/libwx_gtk2_fl-2.8.so.0
-lib/libwx_gtk2_fl-2.8.so.0.5.0
+lib/libwx_gtk2_fl-2.8.so.0.6.0
 lib/libwx_gtk2_gizmos-2.8.so
 lib/libwx_gtk2_gizmos-2.8.so.0
-lib/libwx_gtk2_gizmos-2.8.so.0.5.0
+lib/libwx_gtk2_gizmos-2.8.so.0.6.0
 lib/libwx_gtk2_gizmos_xrc-2.8.so
 lib/libwx_gtk2_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2_gizmos_xrc-2.8.so.0.5.0
+lib/libwx_gtk2_gizmos_xrc-2.8.so.0.6.0
 lib/libwx_gtk2_ogl-2.8.so
 lib/libwx_gtk2_ogl-2.8.so.0
-lib/libwx_gtk2_ogl-2.8.so.0.5.0
+lib/libwx_gtk2_ogl-2.8.so.0.6.0
 lib/libwx_gtk2_plot-2.8.so
 lib/libwx_gtk2_plot-2.8.so.0
-lib/libwx_gtk2_plot-2.8.so.0.5.0
+lib/libwx_gtk2_plot-2.8.so.0.6.0
 lib/libwx_gtk2_stc-2.8.so
 lib/libwx_gtk2_stc-2.8.so.0
-lib/libwx_gtk2_stc-2.8.so.0.5.0
+lib/libwx_gtk2_stc-2.8.so.0.6.0
 lib/libwx_gtk2_svg-2.8.so
 lib/libwx_gtk2_svg-2.8.so.0
-lib/libwx_gtk2_svg-2.8.so.0.5.0
+lib/libwx_gtk2_svg-2.8.so.0.6.0
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
index 2ec18897b24c..4309991abc6d 100644
--- a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
@@ -1,21 +1,21 @@
 lib/libwx_gtk2u_fl-2.8.so
 lib/libwx_gtk2u_fl-2.8.so.0
-lib/libwx_gtk2u_fl-2.8.so.0.5.0
+lib/libwx_gtk2u_fl-2.8.so.0.6.0
 lib/libwx_gtk2u_gizmos-2.8.so
 lib/libwx_gtk2u_gizmos-2.8.so.0
-lib/libwx_gtk2u_gizmos-2.8.so.0.5.0
+lib/libwx_gtk2u_gizmos-2.8.so.0.6.0
 lib/libwx_gtk2u_gizmos_xrc-2.8.so
 lib/libwx_gtk2u_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.5.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.6.0
 lib/libwx_gtk2u_ogl-2.8.so
 lib/libwx_gtk2u_ogl-2.8.so.0
-lib/libwx_gtk2u_ogl-2.8.so.0.5.0
+lib/libwx_gtk2u_ogl-2.8.so.0.6.0
 lib/libwx_gtk2u_plot-2.8.so
 lib/libwx_gtk2u_plot-2.8.so.0
-lib/libwx_gtk2u_plot-2.8.so.0.5.0
+lib/libwx_gtk2u_plot-2.8.so.0.6.0
 lib/libwx_gtk2u_stc-2.8.so
 lib/libwx_gtk2u_stc-2.8.so.0
-lib/libwx_gtk2u_stc-2.8.so.0.5.0
+lib/libwx_gtk2u_stc-2.8.so.0.6.0
 lib/libwx_gtk2u_svg-2.8.so
 lib/libwx_gtk2u_svg-2.8.so.0
-lib/libwx_gtk2u_svg-2.8.so.0.5.0
+lib/libwx_gtk2u_svg-2.8.so.0.6.0
diff --git a/x11-toolkits/wxgtk28-unicode/pkg-plist b/x11-toolkits/wxgtk28-unicode/pkg-plist
index b9c6cdd51dd7..d2cf7a84ea99 100644
--- a/x11-toolkits/wxgtk28-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode/pkg-plist
@@ -2,40 +2,40 @@ bin/wxgtk2u-2.8-config
 bin/wxrc-gtk2u-2.8
 lib/libwx_baseu-2.8.so
 lib/libwx_baseu-2.8.so.0
-lib/libwx_baseu-2.8.so.0.5.0
+lib/libwx_baseu-2.8.so.0.6.0
 lib/libwx_baseu_net-2.8.so
 lib/libwx_baseu_net-2.8.so.0
-lib/libwx_baseu_net-2.8.so.0.5.0
+lib/libwx_baseu_net-2.8.so.0.6.0
 lib/libwx_baseu_xml-2.8.so
 lib/libwx_baseu_xml-2.8.so.0
-lib/libwx_baseu_xml-2.8.so.0.5.0
+lib/libwx_baseu_xml-2.8.so.0.6.0
 lib/libwx_gtk2u_adv-2.8.so
 lib/libwx_gtk2u_adv-2.8.so.0
-lib/libwx_gtk2u_adv-2.8.so.0.5.0
+lib/libwx_gtk2u_adv-2.8.so.0.6.0
 lib/libwx_gtk2u_aui-2.8.so
 lib/libwx_gtk2u_aui-2.8.so.0
-lib/libwx_gtk2u_aui-2.8.so.0.5.0
+lib/libwx_gtk2u_aui-2.8.so.0.6.0
 lib/libwx_gtk2u_core-2.8.so
 lib/libwx_gtk2u_core-2.8.so.0
-lib/libwx_gtk2u_core-2.8.so.0.5.0
+lib/libwx_gtk2u_core-2.8.so.0.6.0
 lib/libwx_gtk2u_gl-2.8.so
 lib/libwx_gtk2u_gl-2.8.so.0
-lib/libwx_gtk2u_gl-2.8.so.0.5.0
+lib/libwx_gtk2u_gl-2.8.so.0.6.0
 lib/libwx_gtk2u_html-2.8.so
 lib/libwx_gtk2u_html-2.8.so.0
-lib/libwx_gtk2u_html-2.8.so.0.5.0
+lib/libwx_gtk2u_html-2.8.so.0.6.0
 lib/libwx_gtk2u_media-2.8.so
 lib/libwx_gtk2u_media-2.8.so.0
-lib/libwx_gtk2u_media-2.8.so.0.5.0
+lib/libwx_gtk2u_media-2.8.so.0.6.0
 lib/libwx_gtk2u_qa-2.8.so
 lib/libwx_gtk2u_qa-2.8.so.0
-lib/libwx_gtk2u_qa-2.8.so.0.5.0
+lib/libwx_gtk2u_qa-2.8.so.0.6.0
 lib/libwx_gtk2u_richtext-2.8.so
 lib/libwx_gtk2u_richtext-2.8.so.0
-lib/libwx_gtk2u_richtext-2.8.so.0.5.0
+lib/libwx_gtk2u_richtext-2.8.so.0.6.0
 lib/libwx_gtk2u_xrc-2.8.so
 lib/libwx_gtk2u_xrc-2.8.so.0
-lib/libwx_gtk2u_xrc-2.8.so.0.5.0
+lib/libwx_gtk2u_xrc-2.8.so.0.6.0
 lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
 @dirrm lib/wx/include/gtk2-unicode-release-2.8/wx
 @dirrm lib/wx/include/gtk2-unicode-release-2.8
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 5a380c87c11f..2adff3490fe4 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.8.9
+PORTVERSION=	2.8.10
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/wxwindows
@@ -50,10 +50,6 @@ PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
 
-.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	0
-.endif
-
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
 .endif
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index c4ce5fd9a814..6b1855837fc8 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.8.9.tar.bz2) = 495c0287e102c8864eb5237a279ce9c2
-SHA256 (wxGTK-2.8.9.tar.bz2) = 2f71ef4b9b7beecf415ed082b01f11bfe071d699a75cade8172a0393a131c131
-SIZE (wxGTK-2.8.9.tar.bz2) = 9276025
+MD5 (wxGTK-2.8.10.tar.bz2) = 88b867bc118a183af56efc67014bdf27
+SHA256 (wxGTK-2.8.10.tar.bz2) = 697569f3c029da68a6f5e95ad01e6ae26cf86e3776fcbfc8671de2e688099a98
+SIZE (wxGTK-2.8.10.tar.bz2) = 9365627
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
index 3296343e77e4..bc15e07934ed 100644
--- a/x11-toolkits/wxgtk28/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-06-20 16:07:44.000000000 +0700
-+++ Makefile.in	2008-07-07 22:40:13.000000000 +0700
+--- Makefile.in.orig	2009-03-06 18:17:59.000000000 +0600
++++ Makefile.in	2009-03-20 00:04:22.000000000 +0600
 @@ -25,6 +25,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -8,20 +8,20 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
  BK_DEPS = @BK_DEPS@
-@@ -11336,11 +11337,7 @@
+@@ -11443,11 +11444,7 @@
  
  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: all $(__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: $(__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)
 -	$(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: all $(__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)
++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)
  	$(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 \
-@@ -11348,6 +11345,12 @@
+@@ -11455,6 +11452,12 @@
  	fi; \
  	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
  	done
@@ -34,7 +34,7 @@
  	$(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 \
-@@ -12095,17 +12098,16 @@
+@@ -12202,17 +12205,16 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
index ec39fc404703..78773088be8a 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
@@ -1,5 +1,5 @@
---- contrib/src/Makefile.in.orig	Fri Dec  1 00:58:54 2006
-+++ contrib/src/Makefile.in	Fri Dec  1 01:39:18 2006
+--- 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
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
index 2de711cc3b1f..cd1f741c59cd 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/fl/Makefile.in.orig	Sun Oct 10 22:18:49 2004
-+++ contrib/src/fl/Makefile.in	Wed Nov 24 21:40:16 2004
-@@ -211,6 +211,8 @@
+--- 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: all $(__install_fldll___depname) $(__install_fllib___depname)
+ install: $(__install_fldll___depname) $(__install_fllib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
index 51b5ab5ee458..c71e4ee1ed72 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/gizmos/Makefile.in.orig	Thu Apr 21 00:33:08 2005
-+++ contrib/src/gizmos/Makefile.in	Thu May  5 16:22:48 2005
-@@ -277,6 +277,8 @@
+--- 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: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_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)
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
index 2be3bdbe7e1c..5039cab23735 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/ogl/Makefile.in.orig	Sun Oct 10 22:18:52 2004
-+++ contrib/src/ogl/Makefile.in	Wed Nov 24 21:41:00 2004
-@@ -201,6 +201,8 @@
+--- 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: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+ install: $(__install_ogldll___depname) $(__install_ogllib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
index 802b4f093baa..1089e7351728 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/plot/Makefile.in.orig	Sun Oct 10 22:18:52 2004
-+++ contrib/src/plot/Makefile.in	Wed Nov 24 21:41:16 2004
-@@ -179,6 +179,8 @@
+--- 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: all $(__install_plotdll___depname) $(__install_plotlib___depname)
+ install: $(__install_plotdll___depname) $(__install_plotlib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
index c41d5cbfec19..b665ce68fe64 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/stc/Makefile.in.orig	Sun Oct 10 22:18:53 2004
-+++ contrib/src/stc/Makefile.in	Wed Nov 24 21:41:31 2004
-@@ -310,6 +310,8 @@
+--- 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: all $(__install_stcdll___depname) $(__install_stclib___depname)
+ install: $(__install_stcdll___depname) $(__install_stclib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
index 213aef13d42c..1210c8879914 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/svg/Makefile.in.orig	Sun Oct 10 22:18:54 2004
-+++ contrib/src/svg/Makefile.in	Wed Nov 24 21:41:44 2004
-@@ -179,6 +179,8 @@
+--- 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: all $(__install_svgdll___depname) $(__install_svglib___depname)
+ install: $(__install_svgdll___depname) $(__install_svglib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk28/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist
index 8499b96a71a4..623210b182ef 100644
--- a/x11-toolkits/wxgtk28/pkg-plist
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -2,40 +2,40 @@ 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.5.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.5.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.5.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.5.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.5.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.5.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.5.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.5.0
+lib/libwx_gtk2_html-2.8.so.0.6.0
 lib/libwx_gtk2_media-2.8.so
 lib/libwx_gtk2_media-2.8.so.0
-lib/libwx_gtk2_media-2.8.so.0.5.0
+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.5.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.5.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.5.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
diff --git a/x11-toolkits/wxgtk29-contrib/pkg-plist b/x11-toolkits/wxgtk29-contrib/pkg-plist
index 96be3a41cc2a..c81f50bea613 100644
--- a/x11-toolkits/wxgtk29-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-contrib/pkg-plist
@@ -1,21 +1,21 @@
 lib/libwx_gtk2_fl-2.8.so
 lib/libwx_gtk2_fl-2.8.so.0
-lib/libwx_gtk2_fl-2.8.so.0.5.0
+lib/libwx_gtk2_fl-2.8.so.0.6.0
 lib/libwx_gtk2_gizmos-2.8.so
 lib/libwx_gtk2_gizmos-2.8.so.0
-lib/libwx_gtk2_gizmos-2.8.so.0.5.0
+lib/libwx_gtk2_gizmos-2.8.so.0.6.0
 lib/libwx_gtk2_gizmos_xrc-2.8.so
 lib/libwx_gtk2_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2_gizmos_xrc-2.8.so.0.5.0
+lib/libwx_gtk2_gizmos_xrc-2.8.so.0.6.0
 lib/libwx_gtk2_ogl-2.8.so
 lib/libwx_gtk2_ogl-2.8.so.0
-lib/libwx_gtk2_ogl-2.8.so.0.5.0
+lib/libwx_gtk2_ogl-2.8.so.0.6.0
 lib/libwx_gtk2_plot-2.8.so
 lib/libwx_gtk2_plot-2.8.so.0
-lib/libwx_gtk2_plot-2.8.so.0.5.0
+lib/libwx_gtk2_plot-2.8.so.0.6.0
 lib/libwx_gtk2_stc-2.8.so
 lib/libwx_gtk2_stc-2.8.so.0
-lib/libwx_gtk2_stc-2.8.so.0.5.0
+lib/libwx_gtk2_stc-2.8.so.0.6.0
 lib/libwx_gtk2_svg-2.8.so
 lib/libwx_gtk2_svg-2.8.so.0
-lib/libwx_gtk2_svg-2.8.so.0.5.0
+lib/libwx_gtk2_svg-2.8.so.0.6.0
diff --git a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
index 2ec18897b24c..4309991abc6d 100644
--- a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
@@ -1,21 +1,21 @@
 lib/libwx_gtk2u_fl-2.8.so
 lib/libwx_gtk2u_fl-2.8.so.0
-lib/libwx_gtk2u_fl-2.8.so.0.5.0
+lib/libwx_gtk2u_fl-2.8.so.0.6.0
 lib/libwx_gtk2u_gizmos-2.8.so
 lib/libwx_gtk2u_gizmos-2.8.so.0
-lib/libwx_gtk2u_gizmos-2.8.so.0.5.0
+lib/libwx_gtk2u_gizmos-2.8.so.0.6.0
 lib/libwx_gtk2u_gizmos_xrc-2.8.so
 lib/libwx_gtk2u_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.5.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.6.0
 lib/libwx_gtk2u_ogl-2.8.so
 lib/libwx_gtk2u_ogl-2.8.so.0
-lib/libwx_gtk2u_ogl-2.8.so.0.5.0
+lib/libwx_gtk2u_ogl-2.8.so.0.6.0
 lib/libwx_gtk2u_plot-2.8.so
 lib/libwx_gtk2u_plot-2.8.so.0
-lib/libwx_gtk2u_plot-2.8.so.0.5.0
+lib/libwx_gtk2u_plot-2.8.so.0.6.0
 lib/libwx_gtk2u_stc-2.8.so
 lib/libwx_gtk2u_stc-2.8.so.0
-lib/libwx_gtk2u_stc-2.8.so.0.5.0
+lib/libwx_gtk2u_stc-2.8.so.0.6.0
 lib/libwx_gtk2u_svg-2.8.so
 lib/libwx_gtk2u_svg-2.8.so.0
-lib/libwx_gtk2u_svg-2.8.so.0.5.0
+lib/libwx_gtk2u_svg-2.8.so.0.6.0
diff --git a/x11-toolkits/wxgtk29-unicode/pkg-plist b/x11-toolkits/wxgtk29-unicode/pkg-plist
index b9c6cdd51dd7..d2cf7a84ea99 100644
--- a/x11-toolkits/wxgtk29-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode/pkg-plist
@@ -2,40 +2,40 @@ bin/wxgtk2u-2.8-config
 bin/wxrc-gtk2u-2.8
 lib/libwx_baseu-2.8.so
 lib/libwx_baseu-2.8.so.0
-lib/libwx_baseu-2.8.so.0.5.0
+lib/libwx_baseu-2.8.so.0.6.0
 lib/libwx_baseu_net-2.8.so
 lib/libwx_baseu_net-2.8.so.0
-lib/libwx_baseu_net-2.8.so.0.5.0
+lib/libwx_baseu_net-2.8.so.0.6.0
 lib/libwx_baseu_xml-2.8.so
 lib/libwx_baseu_xml-2.8.so.0
-lib/libwx_baseu_xml-2.8.so.0.5.0
+lib/libwx_baseu_xml-2.8.so.0.6.0
 lib/libwx_gtk2u_adv-2.8.so
 lib/libwx_gtk2u_adv-2.8.so.0
-lib/libwx_gtk2u_adv-2.8.so.0.5.0
+lib/libwx_gtk2u_adv-2.8.so.0.6.0
 lib/libwx_gtk2u_aui-2.8.so
 lib/libwx_gtk2u_aui-2.8.so.0
-lib/libwx_gtk2u_aui-2.8.so.0.5.0
+lib/libwx_gtk2u_aui-2.8.so.0.6.0
 lib/libwx_gtk2u_core-2.8.so
 lib/libwx_gtk2u_core-2.8.so.0
-lib/libwx_gtk2u_core-2.8.so.0.5.0
+lib/libwx_gtk2u_core-2.8.so.0.6.0
 lib/libwx_gtk2u_gl-2.8.so
 lib/libwx_gtk2u_gl-2.8.so.0
-lib/libwx_gtk2u_gl-2.8.so.0.5.0
+lib/libwx_gtk2u_gl-2.8.so.0.6.0
 lib/libwx_gtk2u_html-2.8.so
 lib/libwx_gtk2u_html-2.8.so.0
-lib/libwx_gtk2u_html-2.8.so.0.5.0
+lib/libwx_gtk2u_html-2.8.so.0.6.0
 lib/libwx_gtk2u_media-2.8.so
 lib/libwx_gtk2u_media-2.8.so.0
-lib/libwx_gtk2u_media-2.8.so.0.5.0
+lib/libwx_gtk2u_media-2.8.so.0.6.0
 lib/libwx_gtk2u_qa-2.8.so
 lib/libwx_gtk2u_qa-2.8.so.0
-lib/libwx_gtk2u_qa-2.8.so.0.5.0
+lib/libwx_gtk2u_qa-2.8.so.0.6.0
 lib/libwx_gtk2u_richtext-2.8.so
 lib/libwx_gtk2u_richtext-2.8.so.0
-lib/libwx_gtk2u_richtext-2.8.so.0.5.0
+lib/libwx_gtk2u_richtext-2.8.so.0.6.0
 lib/libwx_gtk2u_xrc-2.8.so
 lib/libwx_gtk2u_xrc-2.8.so.0
-lib/libwx_gtk2u_xrc-2.8.so.0.5.0
+lib/libwx_gtk2u_xrc-2.8.so.0.6.0
 lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
 @dirrm lib/wx/include/gtk2-unicode-release-2.8/wx
 @dirrm lib/wx/include/gtk2-unicode-release-2.8
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 5a380c87c11f..2adff3490fe4 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.8.9
+PORTVERSION=	2.8.10
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/wxwindows
@@ -50,10 +50,6 @@ PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
 
-.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	0
-.endif
-
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
 .endif
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index c4ce5fd9a814..6b1855837fc8 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.8.9.tar.bz2) = 495c0287e102c8864eb5237a279ce9c2
-SHA256 (wxGTK-2.8.9.tar.bz2) = 2f71ef4b9b7beecf415ed082b01f11bfe071d699a75cade8172a0393a131c131
-SIZE (wxGTK-2.8.9.tar.bz2) = 9276025
+MD5 (wxGTK-2.8.10.tar.bz2) = 88b867bc118a183af56efc67014bdf27
+SHA256 (wxGTK-2.8.10.tar.bz2) = 697569f3c029da68a6f5e95ad01e6ae26cf86e3776fcbfc8671de2e688099a98
+SIZE (wxGTK-2.8.10.tar.bz2) = 9365627
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index 3296343e77e4..bc15e07934ed 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-06-20 16:07:44.000000000 +0700
-+++ Makefile.in	2008-07-07 22:40:13.000000000 +0700
+--- Makefile.in.orig	2009-03-06 18:17:59.000000000 +0600
++++ Makefile.in	2009-03-20 00:04:22.000000000 +0600
 @@ -25,6 +25,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -8,20 +8,20 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
  BK_DEPS = @BK_DEPS@
-@@ -11336,11 +11337,7 @@
+@@ -11443,11 +11444,7 @@
  
  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: all $(__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: $(__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)
 -	$(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: all $(__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)
++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)
  	$(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 \
-@@ -11348,6 +11345,12 @@
+@@ -11455,6 +11452,12 @@
  	fi; \
  	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
  	done
@@ -34,7 +34,7 @@
  	$(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 \
-@@ -12095,17 +12098,16 @@
+@@ -12202,17 +12205,16 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
index ec39fc404703..78773088be8a 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
@@ -1,5 +1,5 @@
---- contrib/src/Makefile.in.orig	Fri Dec  1 00:58:54 2006
-+++ contrib/src/Makefile.in	Fri Dec  1 01:39:18 2006
+--- 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
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
index 2de711cc3b1f..cd1f741c59cd 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/fl/Makefile.in.orig	Sun Oct 10 22:18:49 2004
-+++ contrib/src/fl/Makefile.in	Wed Nov 24 21:40:16 2004
-@@ -211,6 +211,8 @@
+--- 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: all $(__install_fldll___depname) $(__install_fllib___depname)
+ install: $(__install_fldll___depname) $(__install_fllib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
index 51b5ab5ee458..c71e4ee1ed72 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/gizmos/Makefile.in.orig	Thu Apr 21 00:33:08 2005
-+++ contrib/src/gizmos/Makefile.in	Thu May  5 16:22:48 2005
-@@ -277,6 +277,8 @@
+--- 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: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_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)
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
index 2be3bdbe7e1c..5039cab23735 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/ogl/Makefile.in.orig	Sun Oct 10 22:18:52 2004
-+++ contrib/src/ogl/Makefile.in	Wed Nov 24 21:41:00 2004
-@@ -201,6 +201,8 @@
+--- 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: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+ install: $(__install_ogldll___depname) $(__install_ogllib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
index 802b4f093baa..1089e7351728 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/plot/Makefile.in.orig	Sun Oct 10 22:18:52 2004
-+++ contrib/src/plot/Makefile.in	Wed Nov 24 21:41:16 2004
-@@ -179,6 +179,8 @@
+--- 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: all $(__install_plotdll___depname) $(__install_plotlib___depname)
+ install: $(__install_plotdll___depname) $(__install_plotlib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
index c41d5cbfec19..b665ce68fe64 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/stc/Makefile.in.orig	Sun Oct 10 22:18:53 2004
-+++ contrib/src/stc/Makefile.in	Wed Nov 24 21:41:31 2004
-@@ -310,6 +310,8 @@
+--- 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: all $(__install_stcdll___depname) $(__install_stclib___depname)
+ install: $(__install_stcdll___depname) $(__install_stclib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
index 213aef13d42c..1210c8879914 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
@@ -1,9 +1,9 @@
---- contrib/src/svg/Makefile.in.orig	Sun Oct 10 22:18:54 2004
-+++ contrib/src/svg/Makefile.in	Wed Nov 24 21:41:44 2004
-@@ -179,6 +179,8 @@
+--- 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: all $(__install_svgdll___depname) $(__install_svglib___depname)
+ install: $(__install_svgdll___depname) $(__install_svglib___depname)
 +
 +install-common:
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
diff --git a/x11-toolkits/wxgtk29/pkg-plist b/x11-toolkits/wxgtk29/pkg-plist
index 8499b96a71a4..623210b182ef 100644
--- a/x11-toolkits/wxgtk29/pkg-plist
+++ b/x11-toolkits/wxgtk29/pkg-plist
@@ -2,40 +2,40 @@ 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.5.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.5.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.5.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.5.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.5.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.5.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.5.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.5.0
+lib/libwx_gtk2_html-2.8.so.0.6.0
 lib/libwx_gtk2_media-2.8.so
 lib/libwx_gtk2_media-2.8.so.0
-lib/libwx_gtk2_media-2.8.so.0.5.0
+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.5.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.5.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.5.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