7 files changed, 44 insertions, 61 deletions

diff --git a/x11-toolkits/wxgtk28-contrib/pkg-plist b/x11-toolkits/wxgtk28-contrib/pkg-plist
index c81f50bea613..e628de06e699 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.6.0
+lib/libwx_gtk2_fl-2.8.so.0.7.0
 lib/libwx_gtk2_gizmos-2.8.so
 lib/libwx_gtk2_gizmos-2.8.so.0
-lib/libwx_gtk2_gizmos-2.8.so.0.6.0
+lib/libwx_gtk2_gizmos-2.8.so.0.7.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.6.0
+lib/libwx_gtk2_gizmos_xrc-2.8.so.0.7.0
 lib/libwx_gtk2_ogl-2.8.so
 lib/libwx_gtk2_ogl-2.8.so.0
-lib/libwx_gtk2_ogl-2.8.so.0.6.0
+lib/libwx_gtk2_ogl-2.8.so.0.7.0
 lib/libwx_gtk2_plot-2.8.so
 lib/libwx_gtk2_plot-2.8.so.0
-lib/libwx_gtk2_plot-2.8.so.0.6.0
+lib/libwx_gtk2_plot-2.8.so.0.7.0
 lib/libwx_gtk2_stc-2.8.so
 lib/libwx_gtk2_stc-2.8.so.0
-lib/libwx_gtk2_stc-2.8.so.0.6.0
+lib/libwx_gtk2_stc-2.8.so.0.7.0
 lib/libwx_gtk2_svg-2.8.so
 lib/libwx_gtk2_svg-2.8.so.0
-lib/libwx_gtk2_svg-2.8.so.0.6.0
+lib/libwx_gtk2_svg-2.8.so.0.7.0
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
index 4309991abc6d..caac3f1f723b 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.6.0
+lib/libwx_gtk2u_fl-2.8.so.0.7.0
 lib/libwx_gtk2u_gizmos-2.8.so
 lib/libwx_gtk2u_gizmos-2.8.so.0
-lib/libwx_gtk2u_gizmos-2.8.so.0.6.0
+lib/libwx_gtk2u_gizmos-2.8.so.0.7.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.6.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.7.0
 lib/libwx_gtk2u_ogl-2.8.so
 lib/libwx_gtk2u_ogl-2.8.so.0
-lib/libwx_gtk2u_ogl-2.8.so.0.6.0
+lib/libwx_gtk2u_ogl-2.8.so.0.7.0
 lib/libwx_gtk2u_plot-2.8.so
 lib/libwx_gtk2u_plot-2.8.so.0
-lib/libwx_gtk2u_plot-2.8.so.0.6.0
+lib/libwx_gtk2u_plot-2.8.so.0.7.0
 lib/libwx_gtk2u_stc-2.8.so
 lib/libwx_gtk2u_stc-2.8.so.0
-lib/libwx_gtk2u_stc-2.8.so.0.6.0
+lib/libwx_gtk2u_stc-2.8.so.0.7.0
 lib/libwx_gtk2u_svg-2.8.so
 lib/libwx_gtk2u_svg-2.8.so.0
-lib/libwx_gtk2u_svg-2.8.so.0.6.0
+lib/libwx_gtk2u_svg-2.8.so.0.7.0
diff --git a/x11-toolkits/wxgtk28-unicode/pkg-plist b/x11-toolkits/wxgtk28-unicode/pkg-plist
index 64b1f837e93d..76ccc6f894d6 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.6.0
+lib/libwx_baseu-2.8.so.0.7.0
 lib/libwx_baseu_net-2.8.so
 lib/libwx_baseu_net-2.8.so.0
-lib/libwx_baseu_net-2.8.so.0.6.0
+lib/libwx_baseu_net-2.8.so.0.7.0
 lib/libwx_baseu_xml-2.8.so
 lib/libwx_baseu_xml-2.8.so.0
-lib/libwx_baseu_xml-2.8.so.0.6.0
+lib/libwx_baseu_xml-2.8.so.0.7.0
 lib/libwx_gtk2u_adv-2.8.so
 lib/libwx_gtk2u_adv-2.8.so.0
-lib/libwx_gtk2u_adv-2.8.so.0.6.0
+lib/libwx_gtk2u_adv-2.8.so.0.7.0
 lib/libwx_gtk2u_aui-2.8.so
 lib/libwx_gtk2u_aui-2.8.so.0
-lib/libwx_gtk2u_aui-2.8.so.0.6.0
+lib/libwx_gtk2u_aui-2.8.so.0.7.0
 lib/libwx_gtk2u_core-2.8.so
 lib/libwx_gtk2u_core-2.8.so.0
-lib/libwx_gtk2u_core-2.8.so.0.6.0
+lib/libwx_gtk2u_core-2.8.so.0.7.0
 lib/libwx_gtk2u_gl-2.8.so
 lib/libwx_gtk2u_gl-2.8.so.0
-lib/libwx_gtk2u_gl-2.8.so.0.6.0
+lib/libwx_gtk2u_gl-2.8.so.0.7.0
 lib/libwx_gtk2u_html-2.8.so
 lib/libwx_gtk2u_html-2.8.so.0
-lib/libwx_gtk2u_html-2.8.so.0.6.0
+lib/libwx_gtk2u_html-2.8.so.0.7.0
 %%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so
 %%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.6.0
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.7.0
 lib/libwx_gtk2u_qa-2.8.so
 lib/libwx_gtk2u_qa-2.8.so.0
-lib/libwx_gtk2u_qa-2.8.so.0.6.0
+lib/libwx_gtk2u_qa-2.8.so.0.7.0
 lib/libwx_gtk2u_richtext-2.8.so
 lib/libwx_gtk2u_richtext-2.8.so.0
-lib/libwx_gtk2u_richtext-2.8.so.0.6.0
+lib/libwx_gtk2u_richtext-2.8.so.0.7.0
 lib/libwx_gtk2u_xrc-2.8.so
 lib/libwx_gtk2u_xrc-2.8.so.0
-lib/libwx_gtk2u_xrc-2.8.so.0.6.0
+lib/libwx_gtk2u_xrc-2.8.so.0.7.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 a7509d695eda..fd1724a3cfb2 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.8.10
-PORTREVISION?=	4
+PORTVERSION=	2.8.11
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
+MASTER_SITES=	SF/wxwindows/${PORTVERSION}
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
-DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
+DISTNAME=	wxGTK-${PORTVERSION}
 
 MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index 6b1855837fc8..97b6f6bb5464 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/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 (wxGTK-2.8.11.tar.bz2) = 0dab1ac107d50f132e3b292711dc637f3d19d166c19821cbb62ab7d5acdabc5c
+SIZE (wxGTK-2.8.11.tar.bz2) = 9396807
diff --git a/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp
deleted file mode 100644
index 113f73e51ced..000000000000
--- a/x11-toolkits/wxgtk28/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/wxgtk28/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist
index 2da4031d912d..975dc832242b 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.6.0
+lib/libwx_base-2.8.so.0.7.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_net-2.8.so.0.7.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_base_xml-2.8.so.0.7.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_adv-2.8.so.0.7.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_aui-2.8.so.0.7.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_core-2.8.so.0.7.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_gl-2.8.so.0.7.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
+lib/libwx_gtk2_html-2.8.so.0.7.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
+%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0.7.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_qa-2.8.so.0.7.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_richtext-2.8.so.0.7.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/libwx_gtk2_xrc-2.8.so.0.7.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