4 files changed, 21 insertions, 20 deletions

diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 32607492ebd1..074af7a1ec6a 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.6.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxwindows
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index 141c24089db1..43386a5ce1c8 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.6.1.tar.bz2) = dd348a6f825d502b497a085b190b7a27
-SIZE (wxGTK-2.6.1.tar.bz2) = 7205374
+MD5 (wxGTK-2.6.2.tar.bz2) = ba2afe7bd028062c5fff6d5ef3249c67
+SIZE (wxGTK-2.6.2.tar.bz2) = 7328807
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index 00bd63328a1d..d63613ccefb5 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Apr 21 00:32:34 2005
-+++ Makefile.in	Thu May  5 16:11:02 2005
+--- Makefile.in.orig	Tue Sep 20 22:03:25 2005
++++ Makefile.in	Wed Oct 12 23:21:27 2005
 @@ -23,6 +23,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -8,24 +8,26 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
  srcdir = @srcdir@
-@@ -9127,11 +9128,13 @@
+@@ -9153,13 +9154,15 @@
  
  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) $(__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_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install $(__cocoa_res_install___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_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___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_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__cocoa_res_install___depname)
 +	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
 +	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
 +
-+install-common: locale_install
++install-common: locale_install locale_msw_install
  	$(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_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
 -	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
  	$(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 \
-@@ -9664,9 +9667,7 @@
+@@ -9692,9 +9695,7 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk29/pkg-plist b/x11-toolkits/wxgtk29/pkg-plist
index f21ae0c20c86..9601a2533669 100644
--- a/x11-toolkits/wxgtk29/pkg-plist
+++ b/x11-toolkits/wxgtk29/pkg-plist
@@ -3,33 +3,33 @@ bin/wxrc-gtk2-2.6
 include/wx-2.6/gtk2-ansi-release-2.6/wx/setup.h
 lib/libwx_base-2.6.so
 lib/libwx_base-2.6.so.0
-lib/libwx_base-2.6.so.0.0.0
+lib/libwx_base-2.6.so.0.2.0
 lib/libwx_base_net-2.6.so
 lib/libwx_base_net-2.6.so.0
-lib/libwx_base_net-2.6.so.0.0.0
+lib/libwx_base_net-2.6.so.0.2.0
 lib/libwx_base_xml-2.6.so
 lib/libwx_base_xml-2.6.so.0
-lib/libwx_base_xml-2.6.so.0.0.0
+lib/libwx_base_xml-2.6.so.0.2.0
 lib/libwx_gtk2_adv-2.6.so
 lib/libwx_gtk2_adv-2.6.so.0
-lib/libwx_gtk2_adv-2.6.so.0.0.0
+lib/libwx_gtk2_adv-2.6.so.0.2.0
 lib/libwx_gtk2_core-2.6.so
 lib/libwx_gtk2_core-2.6.so.0
-lib/libwx_gtk2_core-2.6.so.0.0.0
+lib/libwx_gtk2_core-2.6.so.0.2.0
 lib/libwx_gtk2_gl-2.6.so
 lib/libwx_gtk2_gl-2.6.so.0
-lib/libwx_gtk2_gl-2.6.so.0.0.0
+lib/libwx_gtk2_gl-2.6.so.0.2.0
 lib/libwx_gtk2_html-2.6.so
 lib/libwx_gtk2_html-2.6.so.0
-lib/libwx_gtk2_html-2.6.so.0.0.0
+lib/libwx_gtk2_html-2.6.so.0.2.0
 lib/libwx_gtk2_media-2.6.so
 lib/libwx_gtk2_media-2.6.so.0
-lib/libwx_gtk2_media-2.6.so.0.0.0
+lib/libwx_gtk2_media-2.6.so.0.2.0
 lib/libwx_gtk2_qa-2.6.so
 lib/libwx_gtk2_qa-2.6.so.0
-lib/libwx_gtk2_qa-2.6.so.0.0.0
+lib/libwx_gtk2_qa-2.6.so.0.2.0
 lib/libwx_gtk2_xrc-2.6.so
 lib/libwx_gtk2_xrc-2.6.so.0
-lib/libwx_gtk2_xrc-2.6.so.0.0.0
+lib/libwx_gtk2_xrc-2.6.so.0.2.0
 @dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
 @dirrm include/wx-2.6/gtk2-ansi-release-2.6