Index: Mk/bsd.wx.mk
===================================================================
--- Mk/bsd.wx.mk
+++ Mk/bsd.wx.mk
@@ -405,8 +405,14 @@
 # Set variables.
 #
 
-WX_CONFIG?=		${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
-WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER}
+.if ${_WX_VER:R} == 3
+_GTKVER=	3
+.else
+_GTKVER=	2
+.endif
+
+WX_CONFIG?=		${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config
+WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk${_GTKVER}${_WX_UC}-${_WX_VER}
 WX_VERSION?=		${_WX_VER}
 
 .endif		# _WX_Need_Version
Index: x11-toolkits/py-wxPython30/Makefile
===================================================================
--- x11-toolkits/py-wxPython30/Makefile
+++ x11-toolkits/py-wxPython30/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wxPython
 PORTVERSION=	3.0.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF/wxpython/wxPython/${PORTVERSION}
@@ -36,7 +36,7 @@
 
 .else
 
-WXPORT=		gtk2
+WXPORT=		gtk3
 WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common@${PY_FLAVOR}
Index: x11-toolkits/wxgtk30/Makefile
===================================================================
--- x11-toolkits/wxgtk30/Makefile
+++ x11-toolkits/wxgtk30/Makefile
@@ -3,9 +3,9 @@
 PORTNAME=	wx
 PORTVERSION=	3.0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
-PKGNAMESUFFIX=	30-gtk2
+PKGNAMESUFFIX=	30-gtk3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
@@ -26,7 +26,7 @@
 USES=		compiler:c++11-lib gl gmake gnome iconv jpeg localbase pkgconfig
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		gl glu
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
@@ -36,7 +36,7 @@
 		--with-zlib=sys \
 		--with-expat=sys \
 		--with-opengl \
-		--with-gtk \
+		--with-gtk=3 \
 		--without-gnomevfs \
 		--disable-epollloop \
 		--disable-joystick \
@@ -67,7 +67,7 @@
 MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
 
 WEBKIT_CONFIGURE_ENABLE=	webview
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
+WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 .include <bsd.port.pre.mk>
 
Index: x11-toolkits/wxgtk30/pkg-plist
===================================================================
--- x11-toolkits/wxgtk30/pkg-plist
+++ x11-toolkits/wxgtk30/pkg-plist
@@ -1,5 +1,5 @@
-bin/wxgtk2u-3.0-config
-bin/wxrc-gtk2u-3.0
+bin/wxgtk3u-3.0-config
+bin/wxrc-gtk3u-3.0
 include/wx-3.0/wx/aboutdlg.h
 include/wx-3.0/wx/accel.h
 include/wx-3.0/wx/access.h
@@ -26,7 +26,6 @@
 include/wx-3.0/wx/aui/floatpane.h
 include/wx-3.0/wx/aui/framemanager.h
 include/wx-3.0/wx/aui/tabart.h
-include/wx-3.0/wx/aui/tabartgtk.h
 include/wx-3.0/wx/aui/tabmdi.h
 include/wx-3.0/wx/bannerwindow.h
 include/wx-3.0/wx/base64.h
@@ -178,7 +177,6 @@
 include/wx-3.0/wx/generic/fdrepdlg.h
 include/wx-3.0/wx/generic/filectrlg.h
 include/wx-3.0/wx/generic/filepickerg.h
-include/wx-3.0/wx/generic/fontdlgg.h
 include/wx-3.0/wx/generic/fswatcher.h
 include/wx-3.0/wx/generic/grid.h
 include/wx-3.0/wx/generic/gridctrl.h
@@ -267,7 +265,6 @@
 include/wx-3.0/wx/gtk/gauge.h
 include/wx-3.0/wx/gtk/glcanvas.h
 include/wx-3.0/wx/gtk/gnome/gvfs.h
-include/wx-3.0/wx/gtk/hildon/notifmsg.h
 include/wx-3.0/wx/gtk/hyperlink.h
 include/wx-3.0/wx/gtk/infobar.h
 include/wx-3.0/wx/gtk/listbox.h
@@ -719,46 +716,47 @@
 lib/libwx_baseu_xml-3.0.so
 lib/libwx_baseu_xml-3.0.so.0
 lib/libwx_baseu_xml-3.0.so.0.4.0
-lib/libwx_gtk2u_adv-3.0.so
-lib/libwx_gtk2u_adv-3.0.so.0
-lib/libwx_gtk2u_adv-3.0.so.0.4.0
-lib/libwx_gtk2u_aui-3.0.so
-lib/libwx_gtk2u_aui-3.0.so.0
-lib/libwx_gtk2u_aui-3.0.so.0.4.0
-lib/libwx_gtk2u_core-3.0.so
-lib/libwx_gtk2u_core-3.0.so.0
-lib/libwx_gtk2u_core-3.0.so.0.4.0
-lib/libwx_gtk2u_gl-3.0.so
-lib/libwx_gtk2u_gl-3.0.so.0
-lib/libwx_gtk2u_gl-3.0.so.0.4.0
-lib/libwx_gtk2u_html-3.0.so
-lib/libwx_gtk2u_html-3.0.so.0
-lib/libwx_gtk2u_html-3.0.so.0.4.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so
-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0.4.0
-lib/libwx_gtk2u_propgrid-3.0.so
-lib/libwx_gtk2u_propgrid-3.0.so.0
-lib/libwx_gtk2u_propgrid-3.0.so.0.4.0
-lib/libwx_gtk2u_qa-3.0.so
-lib/libwx_gtk2u_qa-3.0.so.0
-lib/libwx_gtk2u_qa-3.0.so.0.4.0
-lib/libwx_gtk2u_ribbon-3.0.so
-lib/libwx_gtk2u_ribbon-3.0.so.0
-lib/libwx_gtk2u_ribbon-3.0.so.0.4.0
-lib/libwx_gtk2u_richtext-3.0.so
-lib/libwx_gtk2u_richtext-3.0.so.0
-lib/libwx_gtk2u_richtext-3.0.so.0.4.0
-lib/libwx_gtk2u_stc-3.0.so
-lib/libwx_gtk2u_stc-3.0.so.0
-lib/libwx_gtk2u_stc-3.0.so.0.4.0
-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so
-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0
-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0.4.0
-lib/libwx_gtk2u_xrc-3.0.so
-lib/libwx_gtk2u_xrc-3.0.so.0
-lib/libwx_gtk2u_xrc-3.0.so.0.4.0
-lib/wx/include/gtk2-unicode-3.0/wx/setup.h
+lib/libwx_gtk3u_adv-3.0.so
+lib/libwx_gtk3u_adv-3.0.so.0
+lib/libwx_gtk3u_adv-3.0.so.0.4.0
+lib/libwx_gtk3u_aui-3.0.so
+lib/libwx_gtk3u_aui-3.0.so.0
+lib/libwx_gtk3u_aui-3.0.so.0.4.0
+lib/libwx_gtk3u_core-3.0.so
+lib/libwx_gtk3u_core-3.0.so.0
+lib/libwx_gtk3u_core-3.0.so.0.4.0
+lib/libwx_gtk3u_gl-3.0.so
+lib/libwx_gtk3u_gl-3.0.so.0
+lib/libwx_gtk3u_gl-3.0.so.0.4.0
+lib/libwx_gtk3u_html-3.0.so
+lib/libwx_gtk3u_html-3.0.so.0
+lib/libwx_gtk3u_html-3.0.so.0.4.0
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so.0
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so.0.4.0
+lib/libwx_gtk3u_propgrid-3.0.so
+lib/libwx_gtk3u_propgrid-3.0.so.0
+lib/libwx_gtk3u_propgrid-3.0.so.0.4.0
+lib/libwx_gtk3u_qa-3.0.so
+lib/libwx_gtk3u_qa-3.0.so.0
+lib/libwx_gtk3u_qa-3.0.so.0.4.0
+lib/libwx_gtk3u_ribbon-3.0.so
+lib/libwx_gtk3u_ribbon-3.0.so.0
+lib/libwx_gtk3u_ribbon-3.0.so.0.4.0
+lib/libwx_gtk3u_richtext-3.0.so
+lib/libwx_gtk3u_richtext-3.0.so.0
+lib/libwx_gtk3u_richtext-3.0.so.0.4.0
+lib/libwx_gtk3u_stc-3.0.so
+lib/libwx_gtk3u_stc-3.0.so.0
+lib/libwx_gtk3u_stc-3.0.so.0.4.0
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so.0
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so.0.4.0
+lib/libwx_gtk3u_xrc-3.0.so
+lib/libwx_gtk3u_xrc-3.0.so.0
+lib/libwx_gtk3u_xrc-3.0.so.0.4.0
+lib/wx/3.0/web-extensions/webkit2_extu-3.0.so
+lib/wx/include/gtk3-unicode-3.0/wx/setup.h
 share/aclocal/wxwin30.m4
 share/bakefile/presets/wx30.bkl
 share/bakefile/presets/wx30_presets.py