wxGTK30: update to 3.0.4.

Switch to gtk3.
Remove libtool patch, the maintenance effort is too high.

3.0.4: (released 2018-03-08)
----------------------------

All (non-GUI):

- Don't crash on trailing '%' in wxDateTime::Format().
- Fix various problems when parsing invalid ZIP files.
- Fix generic wxTimePickerCtrl to accept max values from keyboard.
- Multiple surrogate-related fixes in UTF-16 support.
- Fix reading wide character data in wxFile::ReadAll().
- Make parsing WAV data more robust.
- Fix copy ctor in numeric validators classes.

All (GUI):

- Fix wxListbook::GetPageImage() to not always return -1 (Kinaou Hervé).
- Don't reset scroll position to zero when window size changes.
- Prevent use of deleted wxDocMDIChildFrame in wxView dtor.
- Avoid delayed destruction if TLW was never created.
- Fix possible crash when destroying wxTextCtrl using hints.
- Fix display of non-breaking spaces in wxHTML non-Unicode build.
- Fix memory leak of wxClientData when wxChoice is deleted.
- Draw a point instead of a line in wxGCDC::DrawPoint().
- Set wxPG cell background colour as wxPGComboBox background colour.
- Fix ribbon page issues.
- Avoid permanently setting text hint color when using generic text entry hints.
- Avoid overriding text control color in generic wxSearchCtrl.
- Fix auto-sizing multiline wxGrid column labels with empty lines.
- Fix displaying labels of wxRadioBox items.
- Update selection in wxAuiNotebook correctly after tab move.

wxGTK:

- Allow using more recent WebKit2GTK+ in wxWebView (Scott Talbert).
- Fix displaying wxRadioBox items labels containing ampersands.
- Fix creating cursor from XBM data with GTK3.
- Fix wxComboBox entry sizing with GTK+ >= 3.20.
- Fix drawing miniframe resize grip with GTK3.
- Fix unresponsive frame after using wxHtmlHelpFrame from a dialog.
- Fix SetPen() with a re-used user dash array.
- Fix memory leak when wxDataViewCtrl is deleted.
- Avoid some GTK+ run-time errors when using wx{File,Dir}PickerCtrl.
- Avoid crashing when wxTaskBarIcon is used with a non-X11 display.
- Hide wxSpinButton's underlying GtkEntry using CSS on GTK+ >= 3.20.
- Fix wxButton::SetBitmapPosition() with GTK+ 3.
- Use CSS for window font and colors on GTK3.
- Fix keyboard navigation for controls which are initially disabled.
- Don't destroy clipping region if empty clipping region is required.
- Fix for modified state not set after next change following a ChangeValue().
- Avoid invisible wxTextCtrl selection with GTK+3.
- Fix non-default background issues with GTK+2.
- Apply current style to wxStaticBox container when it's created.
- Prevent widgets from drawing outside their allocation with GTK+3.
- Fix custom scheme handling in wxWebView WebKit2 implementation.

wxMSW:

- Fix BSTR memory leaks in wxMediaCtrl and wxWebView (PB).

wxOSX:

- Fix build with 10.13 (High Sierra) SDK (François-Xavier Coudert).
- Fix removing tools from wxToolBar.
- Fix crash when switching between monitors.
- Handle stand-alone weekday and month names in macOS date formats.

- Disable use of AVKit is 32 bit wxOSX builds.

7 files changed, 223 insertions, 195 deletions

diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile
index 32ee2e4090b..1eb83fcb6e3 100644
--- a/x11/wxGTK30/Makefile
+++ b/x11/wxGTK30/Makefile
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2018/04/16 14:34:03 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/04/29 05:39:33 wiz Exp $
 
-DISTNAME=	wxWidgets-3.0.3.1
+DISTNAME=	wxWidgets-3.0.4
 PKGNAME=	${DISTNAME:S/wxWidgets/wxGTK30/}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=wxWidgets/}
 GITHUB_PROJECT=	wxWidgets
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.bz2
 
-PATCHFILES=		wxWidgets-3.0.3-libtool.1.diff.bz2
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_DIST_STRIP.wxWidgets-3.0.3-libtool.1.diff.bz2= -p1
-
 MAINTAINER=	dbj@NetBSD.org
 HOMEPAGE=	http://www.wxwidgets.org/
 COMMENT=	Cross-platform wxWidgets GUI library
@@ -20,7 +15,6 @@ COMMENT=	Cross-platform wxWidgets GUI library
 LICENSE=	gnu-lgpl-v2
 
 USE_TOOLS+=		pkg-config msgfmt
-USE_LIBTOOL=		YES
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_GNU_CONFIGURE_HOST=	no
@@ -57,18 +51,14 @@ SUBST_SED.fix-paths+=		-e 's,@PREFIX@,${PREFIX},g'
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_SRC+=             ${PLIST_SRC_DFLT}
-PLIST_VARS+=		notdarwin
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-osx_cocoa
 CONFIGURE_ARGS+=	--without-macosx-sdk
 CONFIGURE_ARGS+=	--without-macosx-version-min
 CPPFLAGS+=		-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
-PLIST_SRC+=		PLIST.cocoa
 .else
-PLIST.notdarwin=	yes
-
-PLIST_SRC+=		PLIST.gtk2
-CONFIGURE_ARGS+=	--with-gtk=2
+PLIST_SRC+=		PLIST.gtk3
+CONFIGURE_ARGS+=	--with-gtk=3
 .endif
 
 CONFIGURE_ARGS.SunOS+=	--disable-xlocale
@@ -111,7 +101,7 @@ post-install:
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
diff --git a/x11/wxGTK30/PLIST b/x11/wxGTK30/PLIST
index ff4fe4a918d..e5226b67803 100644
--- a/x11/wxGTK30/PLIST
+++ b/x11/wxGTK30/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/02/17 10:16:05 dbj Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/04/29 05:39:33 wiz Exp $
 bin/wx-config-3.0
 bin/wxrc-3.0
 include/wx-3.0/wx/aboutdlg.h
@@ -178,7 +178,6 @@ include/wx-3.0/wx/generic/dvrenderers.h
 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
@@ -489,7 +488,6 @@ include/wx-3.0/wx/unix/apptrait.h
 include/wx-3.0/wx/unix/chkconf.h
 include/wx-3.0/wx/unix/evtloop.h
 include/wx-3.0/wx/unix/evtloopsrc.h
-${PLIST.notdarwin}include/wx-3.0/wx/unix/fswatcher_inotify.h
 include/wx-3.0/wx/unix/fswatcher_kqueue.h
 include/wx-3.0/wx/unix/pipe.h
 include/wx-3.0/wx/unix/stackwalk.h
@@ -614,10 +612,6 @@ include/wx-3.0/wx/xtitypes.h
 include/wx-3.0/wx/xtixml.h
 include/wx-3.0/wx/zipstrm.h
 include/wx-3.0/wx/zstream.h
-lib/libwx_baseu-3.0.la
-lib/libwx_baseu_net-3.0.la
-lib/libwx_baseu_xml-3.0.la
-lib/libwxregexu-3.0.la
 libexec/wx-3.0/wx-config
 libexec/wx-3.0/wxrc
 libexec/wx-3.0/wxrc-3.0
diff --git a/x11/wxGTK30/PLIST.Darwin b/x11/wxGTK30/PLIST.Darwin
index c590416d3e8..125efaa6b62 100644
--- a/x11/wxGTK30/PLIST.Darwin
+++ b/x11/wxGTK30/PLIST.Darwin
@@ -1,9 +1,170 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2014/07/21 06:53:24 dbj Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.2 2018/04/29 05:39:33 wiz Exp $
+include/wx-3.0/wx/generic/animate.h
+include/wx-3.0/wx/generic/clrpickerg.h
+include/wx-3.0/wx/generic/collpaneg.h
+include/wx-3.0/wx/generic/dirdlgg.h
+include/wx-3.0/wx/generic/filedlgg.h
+include/wx-3.0/wx/generic/fontdlgg.h
+include/wx-3.0/wx/generic/fontpickerg.h
+include/wx-3.0/wx/generic/region.h
+include/wx-3.0/wx/html/webkit.h
+include/wx-3.0/wx/osx/accel.h
+include/wx-3.0/wx/osx/anybutton.h
+include/wx-3.0/wx/osx/app.h
+include/wx-3.0/wx/osx/bitmap.h
+include/wx-3.0/wx/osx/bmpbuttn.h
+include/wx-3.0/wx/osx/brush.h
+include/wx-3.0/wx/osx/button.h
+include/wx-3.0/wx/osx/carbon/chkconf.h
+include/wx-3.0/wx/osx/carbon/evtloop.h
+include/wx-3.0/wx/osx/carbon/private.h
+include/wx-3.0/wx/osx/carbon/region.h
+include/wx-3.0/wx/osx/carbon/statbmp.h
+include/wx-3.0/wx/osx/carbon/uma.h
+include/wx-3.0/wx/osx/checkbox.h
+include/wx-3.0/wx/osx/checklst.h
+include/wx-3.0/wx/osx/chkconf.h
+include/wx-3.0/wx/osx/choice.h
+include/wx-3.0/wx/osx/clipbrd.h
+include/wx-3.0/wx/osx/cocoa/chkconf.h
+include/wx-3.0/wx/osx/cocoa/dataview.h
+include/wx-3.0/wx/osx/cocoa/evtloop.h
+include/wx-3.0/wx/osx/cocoa/private.h
+include/wx-3.0/wx/osx/colordlg.h
+include/wx-3.0/wx/osx/colour.h
+include/wx-3.0/wx/osx/combobox.h
+include/wx-3.0/wx/osx/control.h
 include/wx-3.0/wx/osx/core/cfdataref.h
 include/wx-3.0/wx/osx/core/cfref.h
 include/wx-3.0/wx/osx/core/cfstring.h
+include/wx-3.0/wx/osx/core/colour.h
 include/wx-3.0/wx/osx/core/evtloop.h
 include/wx-3.0/wx/osx/core/hid.h
+include/wx-3.0/wx/osx/core/joystick.h
 include/wx-3.0/wx/osx/core/objcid.h
 include/wx-3.0/wx/osx/core/private.h
 include/wx-3.0/wx/osx/core/stdpaths.h
+include/wx-3.0/wx/osx/cursor.h
+include/wx-3.0/wx/osx/dataform.h
+include/wx-3.0/wx/osx/dataobj.h
+include/wx-3.0/wx/osx/dataobj2.h
+include/wx-3.0/wx/osx/dataview.h
+include/wx-3.0/wx/osx/datectrl.h
+include/wx-3.0/wx/osx/datetimectrl.h
+include/wx-3.0/wx/osx/dc.h
+include/wx-3.0/wx/osx/dcclient.h
+include/wx-3.0/wx/osx/dcmemory.h
+include/wx-3.0/wx/osx/dcprint.h
+include/wx-3.0/wx/osx/dcscreen.h
+include/wx-3.0/wx/osx/dialog.h
+include/wx-3.0/wx/osx/dirdlg.h
+include/wx-3.0/wx/osx/dnd.h
+include/wx-3.0/wx/osx/dvrenderer.h
+include/wx-3.0/wx/osx/dvrenderers.h
+include/wx-3.0/wx/osx/evtloop.h
+include/wx-3.0/wx/osx/evtloopsrc.h
+include/wx-3.0/wx/osx/filedlg.h
+include/wx-3.0/wx/osx/font.h
+include/wx-3.0/wx/osx/fontdlg.h
+include/wx-3.0/wx/osx/frame.h
+include/wx-3.0/wx/osx/gauge.h
+include/wx-3.0/wx/osx/glcanvas.h
+include/wx-3.0/wx/osx/helpxxxx.h
+include/wx-3.0/wx/osx/icon.h
+include/wx-3.0/wx/osx/imaglist.h
+include/wx-3.0/wx/osx/joystick.h
+include/wx-3.0/wx/osx/listbox.h
+include/wx-3.0/wx/osx/listctrl.h
+include/wx-3.0/wx/osx/mdi.h
+include/wx-3.0/wx/osx/menu.h
+include/wx-3.0/wx/osx/menuitem.h
+include/wx-3.0/wx/osx/metafile.h
+include/wx-3.0/wx/osx/mimetype.h
+include/wx-3.0/wx/osx/minifram.h
+include/wx-3.0/wx/osx/msgdlg.h
+include/wx-3.0/wx/osx/nonownedwnd.h
+include/wx-3.0/wx/osx/notebook.h
+include/wx-3.0/wx/osx/palette.h
+include/wx-3.0/wx/osx/pen.h
+include/wx-3.0/wx/osx/pnghand.h
+include/wx-3.0/wx/osx/pngread.h
+include/wx-3.0/wx/osx/popupwin.h
+include/wx-3.0/wx/osx/printdlg.h
+include/wx-3.0/wx/osx/printmac.h
+include/wx-3.0/wx/osx/private.h
+include/wx-3.0/wx/osx/radiobox.h
+include/wx-3.0/wx/osx/radiobut.h
+include/wx-3.0/wx/osx/region.h
+include/wx-3.0/wx/osx/scrolbar.h
+include/wx-3.0/wx/osx/slider.h
+include/wx-3.0/wx/osx/sound.h
+include/wx-3.0/wx/osx/spinbutt.h
+include/wx-3.0/wx/osx/srchctrl.h
+include/wx-3.0/wx/osx/statbmp.h
+include/wx-3.0/wx/osx/statbox.h
+include/wx-3.0/wx/osx/statline.h
+include/wx-3.0/wx/osx/stattext.h
+include/wx-3.0/wx/osx/statusbr.h
+include/wx-3.0/wx/osx/taskbarosx.h
+include/wx-3.0/wx/osx/textctrl.h
+include/wx-3.0/wx/osx/textentry.h
+include/wx-3.0/wx/osx/tglbtn.h
+include/wx-3.0/wx/osx/timectrl.h
+include/wx-3.0/wx/osx/toolbar.h
+include/wx-3.0/wx/osx/tooltip.h
+include/wx-3.0/wx/osx/toplevel.h
+include/wx-3.0/wx/osx/treectrl.h
+include/wx-3.0/wx/osx/uma.h
+include/wx-3.0/wx/osx/webview_webkit.h
+include/wx-3.0/wx/osx/webviewhistoryitem_webkit.h
+include/wx-3.0/wx/osx/window.h
+lib/libwx_baseu-3.0.0.4.0.dylib
+lib/libwx_baseu-3.0.0.dylib
+lib/libwx_baseu-3.0.dylib
+lib/libwx_baseu_net-3.0.0.4.0.dylib
+lib/libwx_baseu_net-3.0.0.dylib
+lib/libwx_baseu_net-3.0.dylib
+lib/libwx_baseu_xml-3.0.0.4.0.dylib
+lib/libwx_baseu_xml-3.0.0.dylib
+lib/libwx_baseu_xml-3.0.dylib
+lib/libwx_osx_cocoau_adv-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_adv-3.0.0.dylib
+lib/libwx_osx_cocoau_adv-3.0.dylib
+lib/libwx_osx_cocoau_aui-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_aui-3.0.0.dylib
+lib/libwx_osx_cocoau_aui-3.0.dylib
+lib/libwx_osx_cocoau_core-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_core-3.0.0.dylib
+lib/libwx_osx_cocoau_core-3.0.dylib
+lib/libwx_osx_cocoau_gl-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_gl-3.0.0.dylib
+lib/libwx_osx_cocoau_gl-3.0.dylib
+lib/libwx_osx_cocoau_html-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_html-3.0.0.dylib
+lib/libwx_osx_cocoau_html-3.0.dylib
+lib/libwx_osx_cocoau_media-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_media-3.0.0.dylib
+lib/libwx_osx_cocoau_media-3.0.dylib
+lib/libwx_osx_cocoau_propgrid-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_propgrid-3.0.0.dylib
+lib/libwx_osx_cocoau_propgrid-3.0.dylib
+lib/libwx_osx_cocoau_qa-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_qa-3.0.0.dylib
+lib/libwx_osx_cocoau_qa-3.0.dylib
+lib/libwx_osx_cocoau_ribbon-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_ribbon-3.0.0.dylib
+lib/libwx_osx_cocoau_ribbon-3.0.dylib
+lib/libwx_osx_cocoau_richtext-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_richtext-3.0.0.dylib
+lib/libwx_osx_cocoau_richtext-3.0.dylib
+lib/libwx_osx_cocoau_stc-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_stc-3.0.0.dylib
+lib/libwx_osx_cocoau_stc-3.0.dylib
+lib/libwx_osx_cocoau_webview-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_webview-3.0.0.dylib
+lib/libwx_osx_cocoau_webview-3.0.dylib
+lib/libwx_osx_cocoau_xrc-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_xrc-3.0.0.dylib
+lib/libwx_osx_cocoau_xrc-3.0.dylib
+lib/wx/config/osx_cocoa-unicode-3.0
+lib/wx/include/osx_cocoa-unicode-3.0/wx/setup.h
diff --git a/x11/wxGTK30/PLIST.cocoa b/x11/wxGTK30/PLIST.cocoa
deleted file mode 100644
index 4b8ec36e3cb..00000000000
--- a/x11/wxGTK30/PLIST.cocoa
+++ /dev/null
@@ -1,152 +0,0 @@
-@comment $NetBSD: PLIST.cocoa,v 1.2 2016/02/18 06:20:45 dbj Exp $
-include/wx-3.0/wx/generic/animate.h
-include/wx-3.0/wx/generic/clrpickerg.h
-include/wx-3.0/wx/generic/collpaneg.h
-include/wx-3.0/wx/generic/dirdlgg.h
-include/wx-3.0/wx/generic/filedlgg.h
-include/wx-3.0/wx/generic/fontpickerg.h
-include/wx-3.0/wx/generic/region.h
-include/wx-3.0/wx/html/webkit.h
-include/wx-3.0/wx/osx/accel.h
-include/wx-3.0/wx/osx/anybutton.h
-include/wx-3.0/wx/osx/app.h
-include/wx-3.0/wx/osx/bitmap.h
-include/wx-3.0/wx/osx/bmpbuttn.h
-include/wx-3.0/wx/osx/brush.h
-include/wx-3.0/wx/osx/button.h
-include/wx-3.0/wx/osx/carbon/chkconf.h
-include/wx-3.0/wx/osx/carbon/evtloop.h
-include/wx-3.0/wx/osx/carbon/private.h
-include/wx-3.0/wx/osx/carbon/region.h
-include/wx-3.0/wx/osx/carbon/statbmp.h
-include/wx-3.0/wx/osx/carbon/uma.h
-include/wx-3.0/wx/osx/checkbox.h
-include/wx-3.0/wx/osx/checklst.h
-include/wx-3.0/wx/osx/chkconf.h
-include/wx-3.0/wx/osx/choice.h
-include/wx-3.0/wx/osx/clipbrd.h
-include/wx-3.0/wx/osx/cocoa/chkconf.h
-include/wx-3.0/wx/osx/cocoa/dataview.h
-include/wx-3.0/wx/osx/cocoa/evtloop.h
-include/wx-3.0/wx/osx/cocoa/private.h
-include/wx-3.0/wx/osx/colordlg.h
-include/wx-3.0/wx/osx/colour.h
-include/wx-3.0/wx/osx/combobox.h
-include/wx-3.0/wx/osx/control.h
-include/wx-3.0/wx/osx/core/colour.h
-include/wx-3.0/wx/osx/core/joystick.h
-include/wx-3.0/wx/osx/cursor.h
-include/wx-3.0/wx/osx/dataform.h
-include/wx-3.0/wx/osx/dataobj.h
-include/wx-3.0/wx/osx/dataobj2.h
-include/wx-3.0/wx/osx/dataview.h
-include/wx-3.0/wx/osx/datectrl.h
-include/wx-3.0/wx/osx/datetimectrl.h
-include/wx-3.0/wx/osx/dc.h
-include/wx-3.0/wx/osx/dcclient.h
-include/wx-3.0/wx/osx/dcmemory.h
-include/wx-3.0/wx/osx/dcprint.h
-include/wx-3.0/wx/osx/dcscreen.h
-include/wx-3.0/wx/osx/dialog.h
-include/wx-3.0/wx/osx/dirdlg.h
-include/wx-3.0/wx/osx/dnd.h
-include/wx-3.0/wx/osx/dvrenderer.h
-include/wx-3.0/wx/osx/dvrenderers.h
-include/wx-3.0/wx/osx/evtloop.h
-include/wx-3.0/wx/osx/evtloopsrc.h
-include/wx-3.0/wx/osx/filedlg.h
-include/wx-3.0/wx/osx/font.h
-include/wx-3.0/wx/osx/fontdlg.h
-include/wx-3.0/wx/osx/frame.h
-include/wx-3.0/wx/osx/gauge.h
-include/wx-3.0/wx/osx/glcanvas.h
-include/wx-3.0/wx/osx/helpxxxx.h
-include/wx-3.0/wx/osx/icon.h
-include/wx-3.0/wx/osx/imaglist.h
-include/wx-3.0/wx/osx/joystick.h
-include/wx-3.0/wx/osx/listbox.h
-include/wx-3.0/wx/osx/listctrl.h
-include/wx-3.0/wx/osx/mdi.h
-include/wx-3.0/wx/osx/menu.h
-include/wx-3.0/wx/osx/menuitem.h
-include/wx-3.0/wx/osx/metafile.h
-include/wx-3.0/wx/osx/mimetype.h
-include/wx-3.0/wx/osx/minifram.h
-include/wx-3.0/wx/osx/msgdlg.h
-include/wx-3.0/wx/osx/nonownedwnd.h
-include/wx-3.0/wx/osx/notebook.h
-include/wx-3.0/wx/osx/palette.h
-include/wx-3.0/wx/osx/pen.h
-include/wx-3.0/wx/osx/pnghand.h
-include/wx-3.0/wx/osx/pngread.h
-include/wx-3.0/wx/osx/popupwin.h
-include/wx-3.0/wx/osx/printdlg.h
-include/wx-3.0/wx/osx/printmac.h
-include/wx-3.0/wx/osx/private.h
-include/wx-3.0/wx/osx/radiobox.h
-include/wx-3.0/wx/osx/radiobut.h
-include/wx-3.0/wx/osx/region.h
-include/wx-3.0/wx/osx/scrolbar.h
-include/wx-3.0/wx/osx/slider.h
-include/wx-3.0/wx/osx/sound.h
-include/wx-3.0/wx/osx/spinbutt.h
-include/wx-3.0/wx/osx/srchctrl.h
-include/wx-3.0/wx/osx/statbmp.h
-include/wx-3.0/wx/osx/statbox.h
-include/wx-3.0/wx/osx/statline.h
-include/wx-3.0/wx/osx/stattext.h
-include/wx-3.0/wx/osx/statusbr.h
-include/wx-3.0/wx/osx/taskbarosx.h
-include/wx-3.0/wx/osx/textctrl.h
-include/wx-3.0/wx/osx/textentry.h
-include/wx-3.0/wx/osx/tglbtn.h
-include/wx-3.0/wx/osx/timectrl.h
-include/wx-3.0/wx/osx/toolbar.h
-include/wx-3.0/wx/osx/tooltip.h
-include/wx-3.0/wx/osx/toplevel.h
-include/wx-3.0/wx/osx/treectrl.h
-include/wx-3.0/wx/osx/uma.h
-include/wx-3.0/wx/osx/webview_webkit.h
-include/wx-3.0/wx/osx/webviewhistoryitem_webkit.h
-include/wx-3.0/wx/osx/window.h
-lib/libwx_osx_cocoau_adv-3.0.0.dylib
-lib/libwx_osx_cocoau_adv-3.0.dylib
-lib/libwx_osx_cocoau_adv-3.0.la
-lib/libwx_osx_cocoau_aui-3.0.0.dylib
-lib/libwx_osx_cocoau_aui-3.0.dylib
-lib/libwx_osx_cocoau_aui-3.0.la
-lib/libwx_osx_cocoau_core-3.0.0.dylib
-lib/libwx_osx_cocoau_core-3.0.dylib
-lib/libwx_osx_cocoau_core-3.0.la
-lib/libwx_osx_cocoau_gl-3.0.0.dylib
-lib/libwx_osx_cocoau_gl-3.0.dylib
-lib/libwx_osx_cocoau_gl-3.0.la
-lib/libwx_osx_cocoau_html-3.0.0.dylib
-lib/libwx_osx_cocoau_html-3.0.dylib
-lib/libwx_osx_cocoau_html-3.0.la
-lib/libwx_osx_cocoau_media-3.0.0.dylib
-lib/libwx_osx_cocoau_media-3.0.dylib
-lib/libwx_osx_cocoau_media-3.0.la
-lib/libwx_osx_cocoau_propgrid-3.0.0.dylib
-lib/libwx_osx_cocoau_propgrid-3.0.dylib
-lib/libwx_osx_cocoau_propgrid-3.0.la
-lib/libwx_osx_cocoau_qa-3.0.0.dylib
-lib/libwx_osx_cocoau_qa-3.0.dylib
-lib/libwx_osx_cocoau_qa-3.0.la
-lib/libwx_osx_cocoau_ribbon-3.0.0.dylib
-lib/libwx_osx_cocoau_ribbon-3.0.dylib
-lib/libwx_osx_cocoau_ribbon-3.0.la
-lib/libwx_osx_cocoau_richtext-3.0.0.dylib
-lib/libwx_osx_cocoau_richtext-3.0.dylib
-lib/libwx_osx_cocoau_richtext-3.0.la
-lib/libwx_osx_cocoau_stc-3.0.0.dylib
-lib/libwx_osx_cocoau_stc-3.0.dylib
-lib/libwx_osx_cocoau_stc-3.0.la
-lib/libwx_osx_cocoau_webview-3.0.0.dylib
-lib/libwx_osx_cocoau_webview-3.0.dylib
-lib/libwx_osx_cocoau_webview-3.0.la
-lib/libwx_osx_cocoau_xrc-3.0.0.dylib
-lib/libwx_osx_cocoau_xrc-3.0.dylib
-lib/libwx_osx_cocoau_xrc-3.0.la
-lib/wx/config/osx_cocoa-unicode-3.0
-lib/wx/include/osx_cocoa-unicode-3.0/wx/setup.h
diff --git a/x11/wxGTK30/PLIST.gtk2 b/x11/wxGTK30/PLIST.gtk2
index 9dacc1959ce..c1004f0e4b7 100644
--- a/x11/wxGTK30/PLIST.gtk2
+++ b/x11/wxGTK30/PLIST.gtk2
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST.gtk2,v 1.2 2016/02/18 06:20:45 dbj Exp $
+@comment $NetBSD: PLIST.gtk2,v 1.3 2018/04/29 05:39:33 wiz Exp $
 include/wx-3.0/wx/aui/tabartgtk.h
+include/wx-3.0/wx/generic/fontdlgg.h
 include/wx-3.0/wx/generic/icon.h
 include/wx-3.0/wx/generic/imaglist.h
 include/wx-3.0/wx/generic/paletteg.h
@@ -89,6 +90,7 @@ include/wx-3.0/wx/private/pipestream.h
 include/wx-3.0/wx/private/streamtempinput.h
 include/wx-3.0/wx/unix/execute.h
 include/wx-3.0/wx/unix/fontutil.h
+include/wx-3.0/wx/unix/fswatcher_inotify.h
 include/wx-3.0/wx/unix/glx11.h
 include/wx-3.0/wx/unix/joystick.h
 include/wx-3.0/wx/unix/mimetype.h
@@ -96,17 +98,50 @@ include/wx-3.0/wx/unix/private/pipestream.h
 include/wx-3.0/wx/unix/sound.h
 include/wx-3.0/wx/unix/taskbarx11.h
 include/wx-3.0/wx/unix/utilsx11.h
-lib/libwx_gtk2u_adv-3.0.la
-lib/libwx_gtk2u_aui-3.0.la
-lib/libwx_gtk2u_core-3.0.la
-lib/libwx_gtk2u_gl-3.0.la
-lib/libwx_gtk2u_html-3.0.la
-lib/libwx_gtk2u_media-3.0.la
-lib/libwx_gtk2u_propgrid-3.0.la
-lib/libwx_gtk2u_qa-3.0.la
-lib/libwx_gtk2u_ribbon-3.0.la
-lib/libwx_gtk2u_richtext-3.0.la
-lib/libwx_gtk2u_stc-3.0.la
-lib/libwx_gtk2u_xrc-3.0.la
+lib/libwx_baseu-3.0.so
+lib/libwx_baseu-3.0.so.0
+lib/libwx_baseu-3.0.so.0.4.0
+lib/libwx_baseu_net-3.0.so
+lib/libwx_baseu_net-3.0.so.0
+lib/libwx_baseu_net-3.0.so.0.4.0
+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
+lib/libwx_gtk2u_media-3.0.so
+lib/libwx_gtk2u_media-3.0.so.0
+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
+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/config/gtk2-unicode-3.0
 lib/wx/include/gtk2-unicode-3.0/wx/setup.h
diff --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk
index 8f5c386ff0c..3228cb10e52 100644
--- a/x11/wxGTK30/buildlink3.mk
+++ b/x11/wxGTK30/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2018/04/16 14:34:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/04/29 05:39:33 wiz Exp $
 
 BUILDLINK_TREE+=	wxGTK30
 
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=		--with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo
index eed741603ed..27274fdf174 100644
--- a/x11/wxGTK30/distinfo
+++ b/x11/wxGTK30/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.10 2017/09/17 14:31:27 wiz Exp $
+$NetBSD: distinfo,v 1.11 2018/04/29 05:39:33 wiz Exp $
 
 SHA1 (wxWidgets-3.0.3-libtool.1.diff.bz2) = 7e108d1d58efc23354f5ac8ebe7e0f5938df6f51
 RMD160 (wxWidgets-3.0.3-libtool.1.diff.bz2) = 9a165c89abbe857c042a936a54a5fdf21737ba33
 SHA512 (wxWidgets-3.0.3-libtool.1.diff.bz2) = f7659bb6b2d3262399a6c5eaa4fe16c1204ec80addbfacf5e64052fe2a793f63dc071d7c261252db93556e86e55a2da939875a6f83ff2b1b09fd7d41636f65b3
 Size (wxWidgets-3.0.3-libtool.1.diff.bz2) = 213915 bytes
-SHA1 (wxWidgets-3.0.3.1.tar.bz2) = ea785822d0f1c3290707bda6da570e596b3ec85a
-RMD160 (wxWidgets-3.0.3.1.tar.bz2) = 0dff106be96fc8f14e36531c16f1d69b0cae5003
-SHA512 (wxWidgets-3.0.3.1.tar.bz2) = d22cc0acdbb285952b0f58afcf8394f3c71be32b9e35a33eed98d5a7a4b4bd6200c047e3e4de5aded8e627141a38862ee6f7a380f114ede647b07599f52ceb7b
-Size (wxWidgets-3.0.3.1.tar.bz2) = 20042110 bytes
+SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab
+RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a
+SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
+Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes
 SHA1 (patch-build_aclocal_bakefile.m4) = 7d3d6fb1e6a72e370dc6147010fa5bf2c46f1206
 SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928
 SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99