5 files changed, 20 insertions, 66 deletions

diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index fa2594c8b2a1..1ecd16e3a876 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.6.3
-PORTREVISION?=	1
+PORTVERSION=	2.6.4
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/wxwindows
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
@@ -49,7 +49,6 @@ PLIST=		${.CURDIR}/pkg-plist
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	5
 CONFLICTS=	wxgtk2-contrib-devel-2.5.2*
 .endif
 
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
index e65efb62fc87..48618c7fa9e2 100644
--- a/x11-toolkits/wxgtk26/distinfo
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.6.3.tar.bz2) = 3cd76c3c47913e52a3175dd47239c6ec
-SHA256 (wxGTK-2.6.3.tar.bz2) = 29902dc4600182edc2efa20b84e6f9a2bf88fa3c4b2b29f497b83b79c29dab10
-SIZE (wxGTK-2.6.3.tar.bz2) = 7213119
+MD5 (wxGTK-2.6.4.tar.bz2) = ce0fd2b425bc98957cf70eea5f154b49
+SHA256 (wxGTK-2.6.4.tar.bz2) = 96edce3000611b83c28e50f8ae0bdff235a079e30e8a83769d32367702df1144
+SIZE (wxGTK-2.6.4.tar.bz2) = 7209941
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp
deleted file mode 100644
index 1568c514b291..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/gtk/clipbrd.cpp.orig	Wed Mar 22 05:42:16 2006
-+++ src/gtk/clipbrd.cpp	Sun Apr  2 17:51:17 2006
-@@ -494,16 +494,21 @@
- 
-     delete[] array;
- 
-+#ifdef __WXGTK20__
-     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
-                         "selection_get",
-                         GTK_SIGNAL_FUNC(selection_handler),
-                         GUINT_TO_POINTER(
--#ifdef __WXGTK20__
-                                 gtk_get_current_event_time()
-+                                        ) );
- #else
-+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
-+                        "selection_get",
-+                        GTK_SIGNAL_FUNC(selection_handler),
-+                        GUINT_TO_POINTER(
-                                 gdk_event_get_time(gtk_get_current_event())
--#endif
-                                         ) );
-+#endif
- 
- #if wxUSE_THREADS
-     /* disable GUI threads */
diff --git a/x11-toolkits/wxgtk26/files/patch-wx-config.in b/x11-toolkits/wxgtk26/files/patch-wx-config.in
index a36b094b2dad..91a9738d856b 100644
--- a/x11-toolkits/wxgtk26/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk26/files/patch-wx-config.in
@@ -1,30 +1,11 @@
---- wx-config.in.orig	Wed Mar 22 05:42:05 2006
-+++ wx-config.in	Tue Nov 28 23:49:30 2006
-@@ -25,15 +25,15 @@
- 
- if [ ~ = '~' ]
- then
--    if (bash -c echo) >/dev/null 2>&1
-+    if (/bin/sh -c echo) >/dev/null 2>&1
-     then
--        exec bash "$0" "$@"
-+        exec /bin/sh "$0" "$@"
-     fi
-     if (ksh -c echo) >/dev/null 2>&1
-     then
-         exec ksh "$0" "$@"
-     fi
--    echo "$0: this script requires bash or ksh"
-+    echo "$0: this script requires bourne shell or ksh"
-     exit 1
- fi
-  
-@@ -1143,7 +1143,7 @@
+--- wx-config.in.orig	2007-03-20 21:49:55.000000000 +0600
++++ wx-config.in	2009-03-15 14:05:53.000000000 +0600
+@@ -1129,7 +1129,7 @@
      _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
  fi
  
--_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
-+_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
+-_cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@"`
++_cppflags=`echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@"`
  
  # now without further ado, we can answer these too.
  [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk26/pkg-plist b/x11-toolkits/wxgtk26/pkg-plist
index f97ace59bb87..b116faa0cac8 100644
--- a/x11-toolkits/wxgtk26/pkg-plist
+++ b/x11-toolkits/wxgtk26/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.3.1
+lib/libwx_base-2.6.so.0.4.0
 lib/libwx_base_net-2.6.so
 lib/libwx_base_net-2.6.so.0
-lib/libwx_base_net-2.6.so.0.3.1
+lib/libwx_base_net-2.6.so.0.4.0
 lib/libwx_base_xml-2.6.so
 lib/libwx_base_xml-2.6.so.0
-lib/libwx_base_xml-2.6.so.0.3.1
+lib/libwx_base_xml-2.6.so.0.4.0
 lib/libwx_gtk2_adv-2.6.so
 lib/libwx_gtk2_adv-2.6.so.0
-lib/libwx_gtk2_adv-2.6.so.0.3.1
+lib/libwx_gtk2_adv-2.6.so.0.4.0
 lib/libwx_gtk2_core-2.6.so
 lib/libwx_gtk2_core-2.6.so.0
-lib/libwx_gtk2_core-2.6.so.0.3.1
+lib/libwx_gtk2_core-2.6.so.0.4.0
 lib/libwx_gtk2_gl-2.6.so
 lib/libwx_gtk2_gl-2.6.so.0
-lib/libwx_gtk2_gl-2.6.so.0.3.1
+lib/libwx_gtk2_gl-2.6.so.0.4.0
 lib/libwx_gtk2_html-2.6.so
 lib/libwx_gtk2_html-2.6.so.0
-lib/libwx_gtk2_html-2.6.so.0.3.1
+lib/libwx_gtk2_html-2.6.so.0.4.0
 lib/libwx_gtk2_media-2.6.so
 lib/libwx_gtk2_media-2.6.so.0
-lib/libwx_gtk2_media-2.6.so.0.3.1
+lib/libwx_gtk2_media-2.6.so.0.4.0
 lib/libwx_gtk2_qa-2.6.so
 lib/libwx_gtk2_qa-2.6.so.0
-lib/libwx_gtk2_qa-2.6.so.0.3.1
+lib/libwx_gtk2_qa-2.6.so.0.4.0
 lib/libwx_gtk2_xrc-2.6.so
 lib/libwx_gtk2_xrc-2.6.so.0
-lib/libwx_gtk2_xrc-2.6.so.0.3.1
+lib/libwx_gtk2_xrc-2.6.so.0.4.0
 @dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
 @dirrm include/wx-2.6/gtk2-ansi-release-2.6