Retire wxGTK26.

24 files changed, 1 insertions, 1395 deletions

diff --git a/x11/Makefile b/x11/Makefile
index d0131f6e96e..85db229360d 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.774 2015/10/24 19:14:16 joerg Exp $
+# $NetBSD: Makefile,v 1.775 2015/10/24 19:24:10 joerg Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -496,8 +496,6 @@ SUBDIR+=	wmfstatus
 SUBDIR+=	wmweather
 SUBDIR+=	worker
 SUBDIR+=	wterm
-SUBDIR+=	wxGTK26
-SUBDIR+=	wxGTK26-contrib
 SUBDIR+=	wxGTK28
 SUBDIR+=	wxGTK28-contrib
 SUBDIR+=	wxGTK30
diff --git a/x11/wxGTK26-contrib/DESCR b/x11/wxGTK26-contrib/DESCR
deleted file mode 100644
index dbd8c75a61a..00000000000
--- a/x11/wxGTK26-contrib/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-3rd-party contributed software for the wxWidgets cross-platform
-GUI library (see x11/wxGTK package description for details).
diff --git a/x11/wxGTK26-contrib/Makefile b/x11/wxGTK26-contrib/Makefile
deleted file mode 100644
index a31fe2e7f90..00000000000
--- a/x11/wxGTK26-contrib/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:25:20 tnn Exp $
-#
-
-.include "../../x11/wxGTK26/Makefile.common"
-
-PKGNAME=	${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION=	27
-MAINTAINER=	pkgsrc-users@NetBSD.org
-COMMENT=	Contrib libraries for wxWidgets GTK
-
-USE_TOOLS+=		gmake
-
-BUILD_DIRS=		contrib/src
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../x11/wxGTK26/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK26-contrib/PLIST b/x11/wxGTK26-contrib/PLIST
deleted file mode 100644
index 21158e3a1b6..00000000000
--- a/x11/wxGTK26-contrib/PLIST
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:08 joerg Exp $
-include/wx-2.6/wx/animate/animate.h
-include/wx-2.6/wx/deprecated/expr.h
-include/wx-2.6/wx/deprecated/prop.h
-include/wx-2.6/wx/deprecated/propform.h
-include/wx-2.6/wx/deprecated/proplist.h
-include/wx-2.6/wx/deprecated/resource.h
-include/wx-2.6/wx/deprecated/setup.h
-include/wx-2.6/wx/deprecated/tbarsmpl.h
-include/wx-2.6/wx/deprecated/treelay.h
-include/wx-2.6/wx/deprecated/wxexpr.h
-include/wx-2.6/wx/fl/antiflickpl.h
-include/wx-2.6/wx/fl/bardragpl.h
-include/wx-2.6/wx/fl/barhintspl.h
-include/wx-2.6/wx/fl/cbcustom.h
-include/wx-2.6/wx/fl/controlbar.h
-include/wx-2.6/wx/fl/dynbarhnd.h
-include/wx-2.6/wx/fl/dyntbar.h
-include/wx-2.6/wx/fl/dyntbarhnd.h
-include/wx-2.6/wx/fl/fldefs.h
-include/wx-2.6/wx/fl/frmview.h
-include/wx-2.6/wx/fl/garbagec.h
-include/wx-2.6/wx/fl/gcupdatesmgr.h
-include/wx-2.6/wx/fl/hintanimpl.h
-include/wx-2.6/wx/fl/newbmpbtn.h
-include/wx-2.6/wx/fl/panedrawpl.h
-include/wx-2.6/wx/fl/rowdragpl.h
-include/wx-2.6/wx/fl/rowlayoutpl.h
-include/wx-2.6/wx/fl/toolwnd.h
-include/wx-2.6/wx/fl/updatesmgr.h
-include/wx-2.6/wx/gizmos/dynamicsash.h
-include/wx-2.6/wx/gizmos/editlbox.h
-include/wx-2.6/wx/gizmos/gizmos.h
-include/wx-2.6/wx/gizmos/ledctrl.h
-include/wx-2.6/wx/gizmos/multicell.h
-include/wx-2.6/wx/gizmos/splittree.h
-include/wx-2.6/wx/gizmos/statpict.h
-include/wx-2.6/wx/gizmos/xh_statpict.h
-include/wx-2.6/wx/mmedia/cdbase.h
-include/wx-2.6/wx/mmedia/cdunix.h
-include/wx-2.6/wx/mmedia/cdwin.h
-include/wx-2.6/wx/mmedia/sndaiff.h
-include/wx-2.6/wx/mmedia/sndbase.h
-include/wx-2.6/wx/mmedia/sndcodec.h
-include/wx-2.6/wx/mmedia/sndcpcm.h
-include/wx-2.6/wx/mmedia/sndesd.h
-include/wx-2.6/wx/mmedia/sndfile.h
-include/wx-2.6/wx/mmedia/sndg72x.h
-include/wx-2.6/wx/mmedia/sndmsad.h
-include/wx-2.6/wx/mmedia/sndoss.h
-include/wx-2.6/wx/mmedia/sndpcm.h
-include/wx-2.6/wx/mmedia/sndulaw.h
-include/wx-2.6/wx/mmedia/sndwav.h
-include/wx-2.6/wx/mmedia/sndwin.h
-include/wx-2.6/wx/mmedia/vidbase.h
-include/wx-2.6/wx/mmedia/vidwin.h
-include/wx-2.6/wx/mmedia/vidxanm.h
-include/wx-2.6/wx/ogl/basic.h
-include/wx-2.6/wx/ogl/basicp.h
-include/wx-2.6/wx/ogl/bmpshape.h
-include/wx-2.6/wx/ogl/canvas.h
-include/wx-2.6/wx/ogl/composit.h
-include/wx-2.6/wx/ogl/constrnt.h
-include/wx-2.6/wx/ogl/divided.h
-include/wx-2.6/wx/ogl/drawn.h
-include/wx-2.6/wx/ogl/drawnp.h
-include/wx-2.6/wx/ogl/lines.h
-include/wx-2.6/wx/ogl/linesp.h
-include/wx-2.6/wx/ogl/mfutils.h
-include/wx-2.6/wx/ogl/misc.h
-include/wx-2.6/wx/ogl/ogl.h
-include/wx-2.6/wx/ogl/ogldiag.h
-include/wx-2.6/wx/plot/plot.h
-include/wx-2.6/wx/plot/plot_dwn.bmp
-include/wx-2.6/wx/plot/plot_enl.bmp
-include/wx-2.6/wx/plot/plot_shr.bmp
-include/wx-2.6/wx/plot/plot_up.bmp
-include/wx-2.6/wx/plot/plot_zin.bmp
-include/wx-2.6/wx/plot/plot_zot.bmp
-include/wx-2.6/wx/plot/wxplot.rc
-include/wx-2.6/wx/stc/stc.h
-include/wx-2.6/wx/svg/dcsvg.h
-lib/libwx_gtk2_animate-2.6.la
-lib/libwx_gtk2_deprecated-2.6.la
-lib/libwx_gtk2_fl-2.6.la
-lib/libwx_gtk2_gizmos-2.6.la
-lib/libwx_gtk2_gizmos_xrc-2.6.la
-lib/libwx_gtk2_mmedia-2.6.la
-lib/libwx_gtk2_ogl-2.6.la
-lib/libwx_gtk2_plot-2.6.la
-lib/libwx_gtk2_stc-2.6.la
-lib/libwx_gtk2_svg-2.6.la
diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk
deleted file mode 100644
index af58ac008d4..00000000000
--- a/x11/wxGTK26-contrib/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.28 2015/04/25 14:25:20 tnn Exp $
-
-BUILDLINK_TREE+=	wxGTK-contrib
-
-.if !defined(WXGTK_CONTRIB_BUILDLINK3_MK)
-WXGTK_CONTRIB_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0nb2
-BUILDLINK_ABI_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.3nb27
-BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK26-contrib
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/wxGTK26/buildlink3.mk"
-.endif # WXGTK_CONTRIB_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-wxGTK-contrib
diff --git a/x11/wxGTK26/DESCR b/x11/wxGTK26/DESCR
deleted file mode 100644
index e81d1b332b4..00000000000
--- a/x11/wxGTK26/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-A GTK+-based implementation of the wxWidgets cross-platform GUI library.
-
-wxWidgets is a set of libraries that allows C++ applications to compile and
-run on several different types of computer, with minimal source code changes.
-There is one library per supported GUI (such as Windows, GTK+, Motif, and Mac).
-As well as providing a common API (Application Programming Interface) for GUI
-functionality, it provides functionality for accessing some commonly-used
-operating system facilities, from copying and deleting files to socket and
-thread support. wxWidgets is a 'framework' in the sense that it provides a lot
-of built-in functionality, which the application can use or replace as required,
-thus saving a great deal of coding effort. Basic data structures such as
-strings, arrays, linked lists and hash tables are also supported.
-
-Such a toolkit is not unique - there are others to choose from - but wxWidgets
-is free, well-established, well-documented, and very broad in its coverage of
-GUI functionality. It has some extras that make it stand out from the crowd,
-such as the many convenience dialogs, built-in HTML display and printing,
-virtual filesystems, easy-to-use OLE automation controller class, Open GL
-support, and many other features that make it easier to write modern and
-user-friendly applications.
-
-There is also a python interface available, wxPython (see the py-wxWidgets
-package).
diff --git a/x11/wxGTK26/Makefile b/x11/wxGTK26/Makefile
deleted file mode 100644
index 178b6f4ada1..00000000000
--- a/x11/wxGTK26/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2015/04/25 14:25:20 tnn Exp $
-#
-
-.include "Makefile.common"
-
-PKGREVISION=		30
-COMMENT=		GTK-based implementation of the wxWidgets GUI library
-
-REPLACE_SH=		wx-config.in wx-config-inplace.in
-
-post-configure:
-	echo 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile
-
-post-build:
-	set -e; cd ${WRKSRC}/locale; \
-	for lang in ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk \
-	    zh_CN zh_TW; do \
-		${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
-	done
-	set -e; cd ${WRKSRC}/locale/msw; \
-	for lang in it; do \
-	    ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
-	done
-
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
-
-# for backtrace
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && exists(/usr/include/execinfo.h)
-LIBS+=	-lexecinfo
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK26/Makefile.common b/x11/wxGTK26/Makefile.common
deleted file mode 100644
index 5d692f3feef..00000000000
--- a/x11/wxGTK26/Makefile.common
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2012/10/29 05:06:56 asau Exp $
-#
-# used by x11/wxGTK26/Makefile
-# used by x11/wxGTK26-contrib/Makefile
-
-DISTNAME=		wxGTK-2.6.3
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		joerg@NetBSD.org
-HOMEPAGE=		http://www.wxwidgets.org/
-
-PATCHDIR=		${.CURDIR}/../../x11/wxGTK26/patches
-DISTINFO_FILE=		${.CURDIR}/../../x11/wxGTK26/distinfo
-
-PATCHFILES=		${DISTNAME}-libtool.diff3.bz2
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-
-USE_TOOLS+=		pkg-config msgfmt
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	YES
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		YES
-USE_GNU_CONFIGURE_HOST=	no
-CONFIGURE_ARGS+=	--with-gtk=2
-CONFIGURE_ARGS+=	--with-libjpeg=sys
-CONFIGURE_ARGS+=	--with-libpng=sys
-CONFIGURE_ARGS+=	--with-libtiff=sys
-CONFIGURE_ARGS+=	--with-opengl
-CONFIGURE_ARGS+=	--with-zlib=sys
-CONFIGURE_ARGS+=	--with-regex=builtin
-CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-
-#CONFIGURE_ARGS+=	--enable-unicode
-#PLIST_SUBST+=		UNICODE=u
-PLIST_SUBST+=		UNICODE=
-PLIST_SUBST+=		BUILDTYPE=ansi
-
-CPPFLAGS+=		-Dunix=1	# src/common/unzip.c needs this
-
-DOCDIR=			${PREFIX}/share/doc/wxGTK
-
-.include "../../devel/pangox-compat/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/wxGTK26/PLIST b/x11/wxGTK26/PLIST
deleted file mode 100644
index 954f032ae85..00000000000
--- a/x11/wxGTK26/PLIST
+++ /dev/null
@@ -1,501 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:06:42 joerg Exp $
-bin/wx-config
-bin/wxrc
-bin/wxrc-2.6
-include/wx-2.6/wx/accel.h
-include/wx-2.6/wx/access.h
-include/wx-2.6/wx/afterstd.h
-include/wx-2.6/wx/app.h
-include/wx-2.6/wx/apptrait.h
-include/wx-2.6/wx/archive.h
-include/wx-2.6/wx/arrimpl.cpp
-include/wx-2.6/wx/arrstr.h
-include/wx-2.6/wx/artprov.h
-include/wx-2.6/wx/beforestd.h
-include/wx-2.6/wx/bitmap.h
-include/wx-2.6/wx/bmpbuttn.h
-include/wx-2.6/wx/bookctrl.h
-include/wx-2.6/wx/brush.h
-include/wx-2.6/wx/buffer.h
-include/wx-2.6/wx/build.h
-include/wx-2.6/wx/busyinfo.h
-include/wx-2.6/wx/button.h
-include/wx-2.6/wx/calctrl.h
-include/wx-2.6/wx/caret.h
-include/wx-2.6/wx/checkbox.h
-include/wx-2.6/wx/checklst.h
-include/wx-2.6/wx/chkconf.h
-include/wx-2.6/wx/choicdlg.h
-include/wx-2.6/wx/choice.h
-include/wx-2.6/wx/choicebk.h
-include/wx-2.6/wx/clipbrd.h
-include/wx-2.6/wx/clntdata.h
-include/wx-2.6/wx/cmdline.h
-include/wx-2.6/wx/cmdproc.h
-include/wx-2.6/wx/cmndata.h
-include/wx-2.6/wx/colordlg.h
-include/wx-2.6/wx/colour.h
-include/wx-2.6/wx/combobox.h
-include/wx-2.6/wx/confbase.h
-include/wx-2.6/wx/config.h
-include/wx-2.6/wx/containr.h
-include/wx-2.6/wx/control.h
-include/wx-2.6/wx/cshelp.h
-include/wx-2.6/wx/ctrlsub.h
-include/wx-2.6/wx/cursor.h
-include/wx-2.6/wx/dataobj.h
-include/wx-2.6/wx/datectrl.h
-include/wx-2.6/wx/dateevt.h
-include/wx-2.6/wx/datetime.h
-include/wx-2.6/wx/datstrm.h
-include/wx-2.6/wx/db.h
-include/wx-2.6/wx/dbgrid.h
-include/wx-2.6/wx/dbkeyg.h
-include/wx-2.6/wx/dbtable.h
-include/wx-2.6/wx/dc.h
-include/wx-2.6/wx/dcbuffer.h
-include/wx-2.6/wx/dcclient.h
-include/wx-2.6/wx/dcmemory.h
-include/wx-2.6/wx/dcmirror.h
-include/wx-2.6/wx/dcprint.h
-include/wx-2.6/wx/dcps.h
-include/wx-2.6/wx/dcscreen.h
-include/wx-2.6/wx/dde.h
-include/wx-2.6/wx/debug.h
-include/wx-2.6/wx/debugrpt.h
-include/wx-2.6/wx/defs.h
-include/wx-2.6/wx/dialog.h
-include/wx-2.6/wx/dialup.h
-include/wx-2.6/wx/dir.h
-include/wx-2.6/wx/dirctrl.h
-include/wx-2.6/wx/dirdlg.h
-include/wx-2.6/wx/display.h
-include/wx-2.6/wx/dlimpexp.h
-include/wx-2.6/wx/dnd.h
-include/wx-2.6/wx/docmdi.h
-include/wx-2.6/wx/docview.h
-include/wx-2.6/wx/dragimag.h
-include/wx-2.6/wx/dynarray.h
-include/wx-2.6/wx/dynlib.h
-include/wx-2.6/wx/dynload.h
-include/wx-2.6/wx/effects.h
-include/wx-2.6/wx/encconv.h
-include/wx-2.6/wx/encinfo.h
-include/wx-2.6/wx/event.h
-include/wx-2.6/wx/evtloop.h
-include/wx-2.6/wx/except.h
-include/wx-2.6/wx/fdrepdlg.h
-include/wx-2.6/wx/features.h
-include/wx-2.6/wx/ffile.h
-include/wx-2.6/wx/file.h
-include/wx-2.6/wx/fileconf.h
-include/wx-2.6/wx/filedlg.h
-include/wx-2.6/wx/filefn.h
-include/wx-2.6/wx/filename.h
-include/wx-2.6/wx/filesys.h
-include/wx-2.6/wx/fmappriv.h
-include/wx-2.6/wx/font.h
-include/wx-2.6/wx/fontdlg.h
-include/wx-2.6/wx/fontenc.h
-include/wx-2.6/wx/fontenum.h
-include/wx-2.6/wx/fontmap.h
-include/wx-2.6/wx/fontutil.h
-include/wx-2.6/wx/frame.h
-include/wx-2.6/wx/fs_inet.h
-include/wx-2.6/wx/fs_mem.h
-include/wx-2.6/wx/fs_zip.h
-include/wx-2.6/wx/gauge.h
-include/wx-2.6/wx/gbsizer.h
-include/wx-2.6/wx/gdicmn.h
-include/wx-2.6/wx/gdiobj.h
-include/wx-2.6/wx/generic/accel.h
-include/wx-2.6/wx/generic/calctrl.h
-include/wx-2.6/wx/generic/caret.h
-include/wx-2.6/wx/generic/choicdgg.h
-include/wx-2.6/wx/generic/colrdlgg.h
-include/wx-2.6/wx/generic/datectrl.h
-include/wx-2.6/wx/generic/dcpsg.h
-include/wx-2.6/wx/generic/dirctrlg.h
-include/wx-2.6/wx/generic/dirdlgg.h
-include/wx-2.6/wx/generic/dragimgg.h
-include/wx-2.6/wx/generic/fdrepdlg.h
-include/wx-2.6/wx/generic/filedlgg.h
-include/wx-2.6/wx/generic/fontdlgg.h
-include/wx-2.6/wx/generic/grid.h
-include/wx-2.6/wx/generic/gridctrl.h
-include/wx-2.6/wx/generic/gridsel.h
-include/wx-2.6/wx/generic/helpext.h
-include/wx-2.6/wx/generic/imaglist.h
-include/wx-2.6/wx/generic/laywin.h
-include/wx-2.6/wx/generic/listctrl.h
-include/wx-2.6/wx/generic/logg.h
-include/wx-2.6/wx/generic/msgdlgg.h
-include/wx-2.6/wx/generic/notebook.h
-include/wx-2.6/wx/generic/numdlgg.h
-include/wx-2.6/wx/generic/paletteg.h
-include/wx-2.6/wx/generic/panelg.h
-include/wx-2.6/wx/generic/printps.h
-include/wx-2.6/wx/generic/prntdlgg.h
-include/wx-2.6/wx/generic/progdlgg.h
-include/wx-2.6/wx/generic/propdlg.h
-include/wx-2.6/wx/generic/sashwin.h
-include/wx-2.6/wx/generic/scrolwin.h
-include/wx-2.6/wx/generic/spinctlg.h
-include/wx-2.6/wx/generic/splash.h
-include/wx-2.6/wx/generic/splitter.h
-include/wx-2.6/wx/generic/statusbr.h
-include/wx-2.6/wx/generic/tabg.h
-include/wx-2.6/wx/generic/textdlgg.h
-include/wx-2.6/wx/generic/timer.h
-include/wx-2.6/wx/generic/treectlg.h
-include/wx-2.6/wx/generic/wizard.h
-include/wx-2.6/wx/geometry.h
-include/wx-2.6/wx/gifdecod.h
-include/wx-2.6/wx/glcanvas.h
-include/wx-2.6/wx/grid.h
-include/wx-2.6/wx/gsocket.h
-include/wx-2.6/wx/gtk/accel.h
-include/wx-2.6/wx/gtk/app.h
-include/wx-2.6/wx/gtk/bitmap.h
-include/wx-2.6/wx/gtk/bmpbuttn.h
-include/wx-2.6/wx/gtk/brush.h
-include/wx-2.6/wx/gtk/button.h
-include/wx-2.6/wx/gtk/checkbox.h
-include/wx-2.6/wx/gtk/checklst.h
-include/wx-2.6/wx/gtk/choice.h
-include/wx-2.6/wx/gtk/clipbrd.h
-include/wx-2.6/wx/gtk/colordlg.h
-include/wx-2.6/wx/gtk/colour.h
-include/wx-2.6/wx/gtk/combobox.h
-include/wx-2.6/wx/gtk/control.h
-include/wx-2.6/wx/gtk/cursor.h
-include/wx-2.6/wx/gtk/dataform.h
-include/wx-2.6/wx/gtk/dataobj.h
-include/wx-2.6/wx/gtk/dataobj2.h
-include/wx-2.6/wx/gtk/dc.h
-include/wx-2.6/wx/gtk/dcclient.h
-include/wx-2.6/wx/gtk/dcmemory.h
-include/wx-2.6/wx/gtk/dcscreen.h
-include/wx-2.6/wx/gtk/dialog.h
-include/wx-2.6/wx/gtk/dnd.h
-include/wx-2.6/wx/gtk/filedlg.h
-include/wx-2.6/wx/gtk/font.h
-include/wx-2.6/wx/gtk/fontdlg.h
-include/wx-2.6/wx/gtk/frame.h
-include/wx-2.6/wx/gtk/gauge.h
-include/wx-2.6/wx/gtk/gdiobj.h
-include/wx-2.6/wx/gtk/glcanvas.h
-include/wx-2.6/wx/gtk/gnome/gprint.h
-include/wx-2.6/wx/gtk/icon.h
-include/wx-2.6/wx/gtk/listbox.h
-include/wx-2.6/wx/gtk/mdi.h
-include/wx-2.6/wx/gtk/menu.h
-include/wx-2.6/wx/gtk/menuitem.h
-include/wx-2.6/wx/gtk/minifram.h
-include/wx-2.6/wx/gtk/msgdlg.h
-include/wx-2.6/wx/gtk/notebook.h
-include/wx-2.6/wx/gtk/pen.h
-include/wx-2.6/wx/gtk/popupwin.h
-include/wx-2.6/wx/gtk/radiobox.h
-include/wx-2.6/wx/gtk/radiobut.h
-include/wx-2.6/wx/gtk/region.h
-include/wx-2.6/wx/gtk/scrolbar.h
-include/wx-2.6/wx/gtk/scrolwin.h
-include/wx-2.6/wx/gtk/slider.h
-include/wx-2.6/wx/gtk/spinbutt.h
-include/wx-2.6/wx/gtk/spinctrl.h
-include/wx-2.6/wx/gtk/statbmp.h
-include/wx-2.6/wx/gtk/statbox.h
-include/wx-2.6/wx/gtk/statline.h
-include/wx-2.6/wx/gtk/stattext.h
-include/wx-2.6/wx/gtk/tbargtk.h
-include/wx-2.6/wx/gtk/textctrl.h
-include/wx-2.6/wx/gtk/tglbtn.h
-include/wx-2.6/wx/gtk/timer.h
-include/wx-2.6/wx/gtk/tooltip.h
-include/wx-2.6/wx/gtk/toplevel.h
-include/wx-2.6/wx/gtk/treectrl.h
-include/wx-2.6/wx/gtk/win_gtk.h
-include/wx-2.6/wx/gtk/window.h
-include/wx-2.6/wx/hash.h
-include/wx-2.6/wx/hashmap.h
-include/wx-2.6/wx/hashset.h
-include/wx-2.6/wx/help.h
-include/wx-2.6/wx/helpbase.h
-include/wx-2.6/wx/helphtml.h
-include/wx-2.6/wx/helpwin.h
-include/wx-2.6/wx/html/forcelnk.h
-include/wx-2.6/wx/html/helpctrl.h
-include/wx-2.6/wx/html/helpdata.h
-include/wx-2.6/wx/html/helpfrm.h
-include/wx-2.6/wx/html/htmlcell.h
-include/wx-2.6/wx/html/htmldefs.h
-include/wx-2.6/wx/html/htmlfilt.h
-include/wx-2.6/wx/html/htmlpars.h
-include/wx-2.6/wx/html/htmlproc.h
-include/wx-2.6/wx/html/htmltag.h
-include/wx-2.6/wx/html/htmlwin.h
-include/wx-2.6/wx/html/htmprint.h
-include/wx-2.6/wx/html/m_templ.h
-include/wx-2.6/wx/html/winpars.h
-include/wx-2.6/wx/htmllbox.h
-include/wx-2.6/wx/icon.h
-include/wx-2.6/wx/iconbndl.h
-include/wx-2.6/wx/iconloc.h
-include/wx-2.6/wx/imagbmp.h
-include/wx-2.6/wx/image.h
-include/wx-2.6/wx/imaggif.h
-include/wx-2.6/wx/imagiff.h
-include/wx-2.6/wx/imagjpeg.h
-include/wx-2.6/wx/imaglist.h
-include/wx-2.6/wx/imagpcx.h
-include/wx-2.6/wx/imagpng.h
-include/wx-2.6/wx/imagpnm.h
-include/wx-2.6/wx/imagtiff.h
-include/wx-2.6/wx/imagxpm.h
-include/wx-2.6/wx/init.h
-include/wx-2.6/wx/intl.h
-include/wx-2.6/wx/iosfwrap.h
-include/wx-2.6/wx/ioswrap.h
-include/wx-2.6/wx/ipc.h
-include/wx-2.6/wx/ipcbase.h
-include/wx-2.6/wx/isql.h
-include/wx-2.6/wx/isqlext.h
-include/wx-2.6/wx/joystick.h
-include/wx-2.6/wx/layout.h
-include/wx-2.6/wx/laywin.h
-include/wx-2.6/wx/list.h
-include/wx-2.6/wx/listbase.h
-include/wx-2.6/wx/listbook.h
-include/wx-2.6/wx/listbox.h
-include/wx-2.6/wx/listctrl.h
-include/wx-2.6/wx/listimpl.cpp
-include/wx-2.6/wx/log.h
-include/wx-2.6/wx/longlong.h
-include/wx-2.6/wx/math.h
-include/wx-2.6/wx/matrix.h
-include/wx-2.6/wx/mdi.h
-include/wx-2.6/wx/mediactrl.h
-include/wx-2.6/wx/memconf.h
-include/wx-2.6/wx/memory.h
-include/wx-2.6/wx/memtext.h
-include/wx-2.6/wx/menu.h
-include/wx-2.6/wx/menuitem.h
-include/wx-2.6/wx/metafile.h
-include/wx-2.6/wx/mimetype.h
-include/wx-2.6/wx/minifram.h
-include/wx-2.6/wx/module.h
-include/wx-2.6/wx/msgdlg.h
-include/wx-2.6/wx/msgout.h
-include/wx-2.6/wx/mstream.h
-include/wx-2.6/wx/notebook.h
-include/wx-2.6/wx/numdlg.h
-include/wx-2.6/wx/object.h
-include/wx-2.6/wx/ownerdrw.h
-include/wx-2.6/wx/palette.h
-include/wx-2.6/wx/panel.h
-include/wx-2.6/wx/paper.h
-include/wx-2.6/wx/pen.h
-include/wx-2.6/wx/platform.h
-include/wx-2.6/wx/popupwin.h
-include/wx-2.6/wx/print.h
-include/wx-2.6/wx/printdlg.h
-include/wx-2.6/wx/prntbase.h
-include/wx-2.6/wx/process.h
-include/wx-2.6/wx/progdlg.h
-include/wx-2.6/wx/propdlg.h
-include/wx-2.6/wx/protocol/file.h
-include/wx-2.6/wx/protocol/ftp.h
-include/wx-2.6/wx/protocol/http.h
-include/wx-2.6/wx/protocol/protocol.h
-include/wx-2.6/wx/ptr_scpd.h
-include/wx-2.6/wx/quantize.h
-include/wx-2.6/wx/radiobox.h
-include/wx-2.6/wx/radiobut.h
-include/wx-2.6/wx/rawbmp.h
-include/wx-2.6/wx/recguard.h
-include/wx-2.6/wx/regex.h
-include/wx-2.6/wx/region.h
-include/wx-2.6/wx/renderer.h
-include/wx-2.6/wx/sashwin.h
-include/wx-2.6/wx/sckaddr.h
-include/wx-2.6/wx/sckipc.h
-include/wx-2.6/wx/sckstrm.h
-include/wx-2.6/wx/scopeguard.h
-include/wx-2.6/wx/scrolbar.h
-include/wx-2.6/wx/scrolwin.h
-include/wx-2.6/wx/selstore.h
-include/wx-2.6/wx/settings.h
-include/wx-2.6/wx/sizer.h
-include/wx-2.6/wx/slider.h
-include/wx-2.6/wx/snglinst.h
-include/wx-2.6/wx/socket.h
-include/wx-2.6/wx/sound.h
-include/wx-2.6/wx/spinbutt.h
-include/wx-2.6/wx/spinctrl.h
-include/wx-2.6/wx/splash.h
-include/wx-2.6/wx/splitter.h
-include/wx-2.6/wx/sstream.h
-include/wx-2.6/wx/stack.h
-include/wx-2.6/wx/stackwalk.h
-include/wx-2.6/wx/statbmp.h
-include/wx-2.6/wx/statbox.h
-include/wx-2.6/wx/statline.h
-include/wx-2.6/wx/stattext.h
-include/wx-2.6/wx/statusbr.h
-include/wx-2.6/wx/stdpaths.h
-include/wx-2.6/wx/stockitem.h
-include/wx-2.6/wx/stopwatch.h
-include/wx-2.6/wx/strconv.h
-include/wx-2.6/wx/stream.h
-include/wx-2.6/wx/string.h
-include/wx-2.6/wx/sysopt.h
-include/wx-2.6/wx/tab.h
-include/wx-2.6/wx/tabctrl.h
-include/wx-2.6/wx/taskbar.h
-include/wx-2.6/wx/tbarbase.h
-include/wx-2.6/wx/textbuf.h
-include/wx-2.6/wx/textctrl.h
-include/wx-2.6/wx/textdlg.h
-include/wx-2.6/wx/textfile.h
-include/wx-2.6/wx/tglbtn.h
-include/wx-2.6/wx/thread.h
-include/wx-2.6/wx/thrimpl.cpp
-include/wx-2.6/wx/timer.h
-include/wx-2.6/wx/tipdlg.h
-include/wx-2.6/wx/tipwin.h
-include/wx-2.6/wx/tokenzr.h
-include/wx-2.6/wx/toolbar.h
-include/wx-2.6/wx/tooltip.h
-include/wx-2.6/wx/toplevel.h
-include/wx-2.6/wx/treebase.h
-include/wx-2.6/wx/treectrl.h
-include/wx-2.6/wx/txtstrm.h
-include/wx-2.6/wx/types.h
-include/wx-2.6/wx/unix/apptbase.h
-include/wx-2.6/wx/unix/apptrait.h
-include/wx-2.6/wx/unix/displayx11.h
-include/wx-2.6/wx/unix/execute.h
-include/wx-2.6/wx/unix/fontutil.h
-include/wx-2.6/wx/unix/gsockunx.h
-include/wx-2.6/wx/unix/joystick.h
-include/wx-2.6/wx/unix/mimetype.h
-include/wx-2.6/wx/unix/pipe.h
-include/wx-2.6/wx/unix/sound.h
-include/wx-2.6/wx/unix/stackwalk.h
-include/wx-2.6/wx/unix/stdpaths.h
-include/wx-2.6/wx/unix/taskbarx11.h
-include/wx-2.6/wx/unix/utilsx11.h
-include/wx-2.6/wx/uri.h
-include/wx-2.6/wx/url.h
-include/wx-2.6/wx/utils.h
-include/wx-2.6/wx/valgen.h
-include/wx-2.6/wx/validate.h
-include/wx-2.6/wx/valtext.h
-include/wx-2.6/wx/variant.h
-include/wx-2.6/wx/vector.h
-include/wx-2.6/wx/version.h
-include/wx-2.6/wx/vidmode.h
-include/wx-2.6/wx/vlbox.h
-include/wx-2.6/wx/vms_x_fix.h
-include/wx-2.6/wx/volume.h
-include/wx-2.6/wx/vscroll.h
-include/wx-2.6/wx/wave.h
-include/wx-2.6/wx/wfstream.h
-include/wx-2.6/wx/window.h
-include/wx-2.6/wx/wizard.h
-include/wx-2.6/wx/wx.h
-include/wx-2.6/wx/wxchar.h
-include/wx-2.6/wx/wxhtml.h
-include/wx-2.6/wx/wxprec.h
-include/wx-2.6/wx/xml/xml.h
-include/wx-2.6/wx/xpmdecod.h
-include/wx-2.6/wx/xpmhand.h
-include/wx-2.6/wx/xrc/xh_all.h
-include/wx-2.6/wx/xrc/xh_bmp.h
-include/wx-2.6/wx/xrc/xh_bmpbt.h
-include/wx-2.6/wx/xrc/xh_bttn.h
-include/wx-2.6/wx/xrc/xh_cald.h
-include/wx-2.6/wx/xrc/xh_chckb.h
-include/wx-2.6/wx/xrc/xh_chckl.h
-include/wx-2.6/wx/xrc/xh_choic.h
-include/wx-2.6/wx/xrc/xh_choicbk.h
-include/wx-2.6/wx/xrc/xh_combo.h
-include/wx-2.6/wx/xrc/xh_datectrl.h
-include/wx-2.6/wx/xrc/xh_dlg.h
-include/wx-2.6/wx/xrc/xh_frame.h
-include/wx-2.6/wx/xrc/xh_gauge.h
-include/wx-2.6/wx/xrc/xh_gdctl.h
-include/wx-2.6/wx/xrc/xh_html.h
-include/wx-2.6/wx/xrc/xh_listb.h
-include/wx-2.6/wx/xrc/xh_listbk.h
-include/wx-2.6/wx/xrc/xh_listc.h
-include/wx-2.6/wx/xrc/xh_mdi.h
-include/wx-2.6/wx/xrc/xh_menu.h
-include/wx-2.6/wx/xrc/xh_notbk.h
-include/wx-2.6/wx/xrc/xh_panel.h
-include/wx-2.6/wx/xrc/xh_radbt.h
-include/wx-2.6/wx/xrc/xh_radbx.h
-include/wx-2.6/wx/xrc/xh_scrol.h
-include/wx-2.6/wx/xrc/xh_scwin.h
-include/wx-2.6/wx/xrc/xh_sizer.h
-include/wx-2.6/wx/xrc/xh_slidr.h
-include/wx-2.6/wx/xrc/xh_spin.h
-include/wx-2.6/wx/xrc/xh_split.h
-include/wx-2.6/wx/xrc/xh_statbar.h
-include/wx-2.6/wx/xrc/xh_stbmp.h
-include/wx-2.6/wx/xrc/xh_stbox.h
-include/wx-2.6/wx/xrc/xh_stlin.h
-include/wx-2.6/wx/xrc/xh_sttxt.h
-include/wx-2.6/wx/xrc/xh_text.h
-include/wx-2.6/wx/xrc/xh_tglbtn.h
-include/wx-2.6/wx/xrc/xh_toolb.h
-include/wx-2.6/wx/xrc/xh_tree.h
-include/wx-2.6/wx/xrc/xh_unkwn.h
-include/wx-2.6/wx/xrc/xh_wizrd.h
-include/wx-2.6/wx/xrc/xmlres.h
-include/wx-2.6/wx/xti.h
-include/wx-2.6/wx/xtistrm.h
-include/wx-2.6/wx/xtixml.h
-include/wx-2.6/wx/zipstrm.h
-include/wx-2.6/wx/zstream.h
-lib/libwx_base${UNICODE}-2.6.la
-lib/libwx_base${UNICODE}_net-2.6.la
-lib/libwx_base${UNICODE}_xml-2.6.la
-lib/libwx_gtk2${UNICODE}_adv-2.6.la
-lib/libwx_gtk2${UNICODE}_core-2.6.la
-lib/libwx_gtk2${UNICODE}_gl-2.6.la
-lib/libwx_gtk2${UNICODE}_html-2.6.la
-lib/libwx_gtk2${UNICODE}_media-2.6.la
-lib/libwx_gtk2${UNICODE}_qa-2.6.la
-lib/libwx_gtk2${UNICODE}_xrc-2.6.la
-lib/libwxregex${UNICODE}-2.6.la
-lib/wx/config/gtk2-${BUILDTYPE}-release-2.6
-lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx/setup.h
-share/aclocal/wxwin.m4
-share/bakefile/presets/wx.bkl
-share/bakefile/presets/wx_unix.bkl
-share/bakefile/presets/wx_win32.bkl
-share/doc/wxGTK/LICENSE
-share/locale/ca/LC_MESSAGES/wxstd.mo
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxmsw.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
diff --git a/x11/wxGTK26/PLIST.Darwin b/x11/wxGTK26/PLIST.Darwin
deleted file mode 100644
index 5224cfbef05..00000000000
--- a/x11/wxGTK26/PLIST.Darwin
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $
-include/wx-2.6/wx/mac/corefoundation/cfstring.h
-include/wx-2.6/wx/mac/corefoundation/hid.h
-include/wx-2.6/wx/mac/corefoundation/stdpaths.h
diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk
deleted file mode 100644
index 2e8fba2702e..00000000000
--- a/x11/wxGTK26/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.28 2015/04/25 14:25:20 tnn Exp $
-
-BUILDLINK_TREE+=	wxGTK
-
-.if !defined(WXGTK_BUILDLINK3_MK)
-WXGTK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0nb2
-BUILDLINK_ABI_DEPENDS.wxGTK+=	wxGTK>=2.6.3nb30
-BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK26
-
-.include "../../devel/pangox-compat/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif # WXGTK_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-wxGTK
diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo
deleted file mode 100644
index 76d02536dfd..00000000000
--- a/x11/wxGTK26/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.8 2015/02/20 23:37:51 joerg Exp $
-
-SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2
-RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0
-Size (wxGTK-2.6.3-libtool.diff3.bz2) = 136446 bytes
-SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
-RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
-Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
-SHA1 (patch-aa) = c682754da141ab0a0d8739b9678a914637ad27b3
-SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
-SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01
-SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be
-SHA1 (patch-ae) = d6fcc9b21fd457e79c32f2dc47166dc7afbd65b1
-SHA1 (patch-af) = 3c284feffe3e1c8fae6302dbd86ce8421fd0f6ba
-SHA1 (patch-ag) = ccaac341ecd589dbde465f49064dd2ab480fc639
-SHA1 (patch-ah) = e7da6aacd004048d0d07965df09e97cef5a76551
-SHA1 (patch-include_wx_minifram.h) = 2566389518119291ff187468cebb4f10ec8c74ab
diff --git a/x11/wxGTK26/hacks.mk b/x11/wxGTK26/hacks.mk
deleted file mode 100644
index 424536a0c1d..00000000000
--- a/x11/wxGTK26/hacks.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2012/06/15 23:06:05 dholland Exp $
-#
-# Disable the precompiled headers on NetBSD mipseb and sparc64
-# machines, otherwise wxGTK will not compile there.
-#   mipseb reported by jmcneill@NetBSD.org.
-#   sparc64 reported by jdc@NetBSD.org.
-
-
-.if !defined(WXGTK_HACKS_MK)
-WXGTK_HACKS_MK=		# defined
-
-.if ${OPSYS} == "NetBSD" && \
-    (${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc64")
-PKG_HACKS+=		disable-precomp-headers
-CONFIGURE_ARGS+=	--disable-precomp-headers
-.endif
-
-.endif # WXGTK_HACKS_MK
diff --git a/x11/wxGTK26/patches/manual-bakefile.diff b/x11/wxGTK26/patches/manual-bakefile.diff
deleted file mode 100644
index bc3d6cc1a8f..00000000000
--- a/x11/wxGTK26/patches/manual-bakefile.diff
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl rules/autoconf.bkl
---- ../bakefile-0.2.0.orig/rules/autoconf.bkl	2006-01-22 23:31:00.000000000 +0000
-+++ rules/autoconf.bkl	2006-07-03 20:34:27.000000000 +0000
-@@ -160,61 +160,18 @@
- 
-         <set var="__linkname1">$(__linkname)</set>
-         
--        <set var="__targetsuf2">
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
--                $(DLLEXT).$(__soversion1)
--            </if>
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
--                .$(__soversion1)$(DLLEXT)
--            </if>
--            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
--        </set>
-+        <set var="__targetsuf2">$(DLLEXT)</set>
-         <set var="__linkname2" eval="0">
-             $(DLLPREFIX)$(__dllname)$(__targetsuf2)
-         </set>
-         
--        <set var="__targetsuf3">
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
--                $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
--            </if>
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
--                .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
--            </if>
--            <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
--                -$(__soversion1)$(DLLEXT)
--            </if>
--            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
--        </set>
-+        <set var="__targetsuf3">$(DLLEXT)</set>
-         <set var="__targetname" eval="0">
-             $(DLLPREFIX)$(__dllname)$(__targetsuf3)
-         </set>
-         
--        <set var="__soname_flags">
--            <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
--                $(SONAME_FLAG)$(__linkname2)
--            </if>
--            <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
--                $(SONAME_FLAG)$(__targetname)
--            </if>
--        </set>
-+        <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
-         <ldflags>$(__soname_flags)</ldflags>
--
--        <set var="__so_symlinks_cmd">
--            <if cond="USE_SOSYMLINKS=='1'">
--                (cd $(pathPrefixToPath(__targetdir));
--                $(RM) $(__linkname1) $(__linkname2);
--                $(LN_S) $(__targetname) $(__linkname2);
--                $(LN_S) $(__linkname2) $(__linkname1))
--            </if>
--        </set>
--        <set var="__so_symlinks_inst_cmd">
--            <if cond="USE_SOSYMLINKS=='1'">
--                $(RM) $(__linkname1) $(__linkname2);
--                $(LN_S) $(__targetname) $(__linkname2);
--                $(LN_S) $(__linkname2) $(__linkname1)
--            </if>
--        </set>
--        <__command>$(LF)$(__so_symlinks_cmd)</__command>
-     
-         <set var="__mac_instname">$(__linkname2)</set>
-    
-@@ -238,12 +195,6 @@
-         <set var="__macinstname" eval="0">
-             $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
-         </set>
--        <set var="__macinstnamecmd">
--            <if cond="PLATFORM_MACOSX=='1'">
--                -install_name $(value)/$(__macinstname)
--            </if>
--        </set>
--        <ldflags>$(__macinstnamecmd)</ldflags>
- 
-         <modify-target target="install_$(id)">
-             <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
-diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl rules/makefile.bkl
---- ../bakefile-0.2.0.orig/rules/makefile.bkl	2005-12-08 10:19:46.000000000 +0000
-+++ rules/makefile.bkl	2006-03-20 22:04:43.000000000 +0000
-@@ -604,7 +604,7 @@
-         <define-tag name="install-to" rules="exe">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-@@ -612,8 +612,7 @@
-         <define-tag name="install-to" rules="dll">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(value)
--                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-@@ -621,7 +620,7 @@
-         <define-tag name="install-to" rules="module">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-@@ -629,7 +628,7 @@
-         <define-tag name="install-to" rules="lib">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl
---- ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl	2005-06-16 17:48:03.000000000 +0000
-+++ rules/makefile_defs_gnu.bkl	2006-02-28 22:43:14.000000000 +0000
-@@ -37,12 +37,12 @@
- 
-             <template id="__commands_templ_C">
-                 <set var="__COMPILE_C_CMD" eval="0">
--                    $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
-+                    ${LIBTOOL} --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
-                 </set>
-             </template>
-             <template id="__commands_templ_CXX">
-                 <set var="__COMPILE_CXX_CMD" eval="0">
--                    $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
-+                    ${LIBTOOL} --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
-                 </set>
-             </template>
- 
-diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl
---- ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl	2005-03-13 22:50:03.000000000 +0000
-+++ rules/makefile_defs_unix.bkl	2006-03-20 21:30:47.000000000 +0000
-@@ -15,20 +15,21 @@
- 
-     <set var="DIRSEP">/</set>
- 
--    <set var="OBJEXT">.o</set>
-+    <set var="LIBTOOL">${LIBTOOL}</set>
-+    <set var="OBJEXT">.lo</set>
-     <set var="LIBEXT" overwrite="0">.a</set>
-     <set var="LIBPREFIX" overwrite="0">lib</set>
-     <set var="EXEEXT" overwrite="0"></set>
--    <set var="DLLEXT" overwrite="0">.so</set>
-+    <set var="DLLEXT" overwrite="1">.la</set>
-     <set var="DLLEXT_MODULE" overwrite="0">$(DLLEXT)</set>
-     <set var="DLLIMPEXT" overwrite="0">$(DLLEXT)</set>
-     <set var="DLLPREFIX" overwrite="0">$(LIBPREFIX)</set>
-     <set var="DLLPREFIX_MODULE" overwrite="0">$(DLLPREFIX)</set>
--    <set var="PIC_CFLAGS" overwrite="0">-fPIC -DPIC</set>
-+    <set var="PIC_CFLAGS" overwrite="0"></set>
- 
--    <set var="INSTALL_PROGRAM" overwrite="0">install -c</set>
--    <set var="INSTALL_DATA" overwrite="0">$(INSTALL) -m 644</set>
--    <set var="INSTALL_DIR" overwrite="0">$(INSTALL) -d</set>
-+    <set var="INSTALL_PROGRAM" overwrite="1">${BSD_INSTALL_PROGRAM}</set>
-+    <set var="INSTALL_DATA" overwrite="1">${BSD_INSTALL_DATA}</set>
-+    <set var="INSTALL_DIR" overwrite="1">${BSD_INSTALL_DATA_DIR}</set>
- 
-     <set var="AROPTIONS">rcu</set>
-     <set var="RM">rm -f</set>
-@@ -92,12 +93,12 @@
-     <if cond="FORMAT!='gnu'">
-         <template id="__commands_templ_C">
-             <set var="__COMPILE_C_CMD" eval="0">
--                $(CCC) -c -o $@ $(__cflags) $(src)
-+                $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(src)
-             </set>
-         </template>
-         <template id="__commands_templ_CXX">
-             <set var="__COMPILE_CXX_CMD" eval="0">
--                $(CXXC) -c -o $@ $(__cxxflags) $(src)
-+                $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(src)
-             </set>
-         </template>
-     </if>
-@@ -105,18 +106,16 @@
- 
-     <template id="__commands_templ">
-         <set var="__LINK_EXE_CMD" eval="0">
--            $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>        
-         <set var="__LINK_LIB_CMD" eval="0">
--            $(RM) $@
--            $(AR) $(AROPTIONS) $@ $(__objects_var)
--            $(RANLIB) $@
-+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>
-         <set var="__LINK_DLL_CMD" eval="0">
--            $(__dll_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>
-         <set var="__LINK_MODULE_CMD" eval="0">
--            $(__module_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>
-     </template>
-     
diff --git a/x11/wxGTK26/patches/manual-regen.diff b/x11/wxGTK26/patches/manual-regen.diff
deleted file mode 100644
index 83b129dfc02..00000000000
--- a/x11/wxGTK26/patches/manual-regen.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-To regenerate the patch, get the full wxWidgets tarball, copy build/bakefiles
-and the various *.bkl files into the wxGTK tree and run
-	./bakefile_gen -f autoconf
-in build/bakefiles. manual-bakefile.diff contains the necessary patch for
-the bakefile ruleset to use libtool.
-
---- build/bakefiles/regex.bkl.orig	2006-03-20 20:14:11.000000000 +0000
-+++ build/bakefiles/regex.bkl
-@@ -27,16 +27,13 @@
-         <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
-     </set>
- 
--    <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
-+    <dll id="wxregex" template="msvc_setup_h,anylib"
-          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
--        <libname cond="FORMAT=='autoconf'">
--            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
--        </libname>
--        <libname cond="FORMAT!='autoconf'">
--            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
--        </libname>
--        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
--        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
-+        <dllname>
-+            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)
-+	</dllname>
-+        <version>$(WX_VERSION)</version>
-+        <so_version>$(WXSOVERSION)</so_version>
-         <define>__WX$(TOOLKIT)__</define>
-         <define>$(UNICODE_DEFINE)</define>
-         <dirname>$(LIBDIRNAME)</dirname>
-@@ -48,6 +45,6 @@
-             src/regex/regerror.c
-             src/regex/regfree.c
-         </sources>
--    </lib>
-+    </dll>
- 
- </makefile>
---- build/bakefiles/wx.bkl.orig	2006-02-28 22:50:55.000000000 +0000
-+++ build/bakefiles/wx.bkl
-@@ -96,7 +96,7 @@
-             <command>
-                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
--                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-+                ${BSD_INSTALL_SCRIPT} lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-             </command>
-         </action>
diff --git a/x11/wxGTK26/patches/patch-aa b/x11/wxGTK26/patches/patch-aa
deleted file mode 100644
index f7b182b1f54..00000000000
--- a/x11/wxGTK26/patches/patch-aa
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2012/01/27 07:44:07 sbd Exp $
-
---- configure.orig	2006-03-21 23:42:05.000000000 +0000
-+++ configure
-@@ -1820,7 +1820,7 @@ _ACEOF
- 
-     DEFAULT_DEFAULT_wxUSE_MOTIF=1
-   ;;
--  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     USE_BSD=1
-     USE_FREEBSD=1
-     cat >>confdefs.h <<\_ACEOF
-@@ -23445,7 +23445,8 @@ SEARCH_INCLUDE="\
-     /usr/XFree86/include/X11  \
-     /usr/pkg/include          \
-                               \
--    /usr/openwin/share/include"
-+    /usr/openwin/share/include\
-+    ${BUILDLINK_DIR}/include"
- 
- echo "$as_me:$LINENO: checking for libraries directory" >&5
- echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
-@@ -23532,6 +23533,7 @@ fi
-         wx_cv_std_libpath="lib";
-         ;;
- esac
-+wx_cv_std_libpath="lib"
- 
- echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
- echo "${ECHO_T}$wx_cv_std_libpath" >&6
-@@ -24519,9 +24521,9 @@ fi
- 
- 
-             if test "$ac_cv_header_png_h" = "yes"; then
--                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
--echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
--if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-+                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
-+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
-+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -24539,11 +24541,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char png_check_sig ();
-+char png_sig_cmp ();
- int
- main ()
- {
--png_check_sig ();
-+png_sig_cmp ();
-   ;
-   return 0;
- }
-@@ -24570,20 +24572,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_png_png_check_sig=yes
-+  ac_cv_lib_png_png_sig_cmp=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_png_png_check_sig=no
-+ac_cv_lib_png_png_sig_cmp=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
--if test $ac_cv_lib_png_png_check_sig = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
-+if test $ac_cv_lib_png_png_sig_cmp = yes; then
-   PNG_LINK=" -lpng -lz"
- fi
- 
-@@ -36663,6 +36665,9 @@ echo "$as_me: WARNING: BeOS threads are
-                     THREAD_OPTS="-mt $THREAD_OPTS"
-                 fi
-                 ;;
-+	  *-*-dragonfly*)
-+                THREAD_OPTS="-pthread $THREAD_OPTS"
-+		;;
-           *-*-freebsd*)
-                                                 THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-                 ;;
-@@ -36797,7 +36802,7 @@ echo $ECHO_N "checking if more special f
-                                                                                                                 LDFLAGS="-L/usr/lib/threads $LDFLAGS"
-                 flag="-D_THREAD_SAFE"
-                 ;;
--            *-freebsd*)
-+            *-freebsd*|*-*-dragonfly*)
-                 flag="-D_THREAD_SAFE"
-                 ;;
-             *-hp-hpux* )
-@@ -42959,7 +42964,7 @@ echo "$as_me: WARNING: GStreamer install
- 
- 
- 
--        if test "x$GST_INSPECT" == "x"; then
-+        if test "x$GST_INSPECT" = "x"; then
-             # Extract the first word of "gst-inspect", so it can be a program name with args.
- set dummy gst-inspect; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -44788,7 +44793,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
-             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
-         fi
- 
--        if test "x$GCC" == "xyes"; then
-+        if test "x$GCC" = "xyes"; then
-             PIC_FLAG="-dynamic -fPIC"
-         fi
-         if test "x$XLCC" = "xyes"; then
-@@ -45354,7 +45359,7 @@ EOF
-       ;;
- 
-       powerpc-apple-macos* | \
--      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
-+      *-*-dragonfly* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
-       *-*-sunos4* | \
-       *-*-osf* | \
-       *-*-dgux5* | \
-@@ -45396,7 +45401,7 @@ echo "$as_me: error: unknown system type
-     SONAME_FLAG=
- 
-     case "${BAKEFILE_HOST}" in
--      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
-+      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu | *-*-dragonfly*)
-         SONAME_FLAG="-Wl,-soname,"
-         USE_SOVERSION=1
-         USE_SOVERLINUX=1
diff --git a/x11/wxGTK26/patches/patch-ab b/x11/wxGTK26/patches/patch-ab
deleted file mode 100644
index 21e37845b5a..00000000000
--- a/x11/wxGTK26/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $
-
---- src/gtk/clipbrd.cpp.orig	2006-04-03 18:45:23.000000000 +0200
-+++ src/gtk/clipbrd.cpp
-@@ -494,16 +494,21 @@ bool wxClipboard::AddData( wxDataObject 
- 
-     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/wxGTK26/patches/patch-ac b/x11/wxGTK26/patches/patch-ac
deleted file mode 100644
index bce59206aa7..00000000000
--- a/x11/wxGTK26/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/01/08 21:58:17 shattered Exp $
-
---- src/unix/threadpsx.cpp.orig	2006-03-22 02:42:12.000000000 +0300
-+++ src/unix/threadpsx.cpp
-@@ -66,6 +66,13 @@
-     #define THR_ID(thr) ((long)(thr)->GetId())
- #endif
- 
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ < 499005000 && defined(HAVE_THREAD_PRIORITY_FUNCTIONS)
-+#undef HAVE_THREAD_PRIORITY_FUNCTIONS
-+#endif
-+#endif
-+
- // ----------------------------------------------------------------------------
- // constants
- // ----------------------------------------------------------------------------
diff --git a/x11/wxGTK26/patches/patch-ad b/x11/wxGTK26/patches/patch-ad
deleted file mode 100644
index fd0faf74566..00000000000
--- a/x11/wxGTK26/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/10/23 11:16:55 plunky Exp $
-
-avoid conflicts with GSocket in glib >= 2.21 as per
-
-	http://trac.wxwidgets.org/ticket/10883
-
---- src/gtk/gsockgtk.cpp.orig	2009-10-23 11:43:01.000000000 +0100
-+++ src/gtk/gsockgtk.cpp	2009-10-23 11:43:04.000000000 +0100
-@@ -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/wxGTK26/patches/patch-ae b/x11/wxGTK26/patches/patch-ae
deleted file mode 100644
index bb318721eaf..00000000000
--- a/x11/wxGTK26/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/02/16 17:35:34 taca Exp $
-
-deal with CVE-2009-2369.
-
---- src/common/image.cpp.orig	2006-03-21 23:42:10.000000000 +0000
-+++ src/common/image.cpp
-@@ -192,6 +192,10 @@ bool wxImage::Create( int width, int hei
- 
-     m_refData = new wxImageRefData();
- 
-+    if (width <= 0 || height <= 0 || width > INT_MAX / 3 / height) {
-+	UnRef();
-+	return false;
-+    }
-     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
-     if (!M_IMGDATA->m_data)
-     {
diff --git a/x11/wxGTK26/patches/patch-af b/x11/wxGTK26/patches/patch-af
deleted file mode 100644
index a56491a9daf..00000000000
--- a/x11/wxGTK26/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.2 2011/01/24 09:33:33 wiz Exp $
-
-Fix build with png-1.5.
-deal with CVE-2009-2369.
-
---- src/common/imagpng.cpp.orig	2006-03-21 23:42:10.000000000 +0000
-+++ src/common/imagpng.cpp
-@@ -528,7 +528,7 @@ wxPNGHandler::LoadFile(wxImage *image,
-     png_structp png_ptr = png_create_read_struct
-                           (
-                             PNG_LIBPNG_VER_STRING,
--                            (voidp) NULL,
-+                            NULL,
-                             wx_png_error,
-                             wx_png_warning
-                           );
-@@ -570,18 +570,16 @@ wxPNGHandler::LoadFile(wxImage *image,
-     if (!image->Ok())
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
- 
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-     png_read_image( png_ptr, lines );
diff --git a/x11/wxGTK26/patches/patch-ag b/x11/wxGTK26/patches/patch-ag
deleted file mode 100644
index 57da90631cf..00000000000
--- a/x11/wxGTK26/patches/patch-ag
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/02/16 17:35:34 taca Exp $
-
-deal with CVE-2009-2369.
-
---- src/common/imagtiff.cpp.orig	2006-03-21 23:42:10.000000000 +0000
-+++ src/common/imagtiff.cpp
-@@ -232,15 +232,25 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-     }
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-     TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h );
- 
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+	if ( verbose )
-+	    wxLogError( _("TIFF: Image size is abnormally big.") );
-+
-+	TIFFClose(tif);
-+
-+	return false;
-+    }
- 
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
- 
-     if (!raster)
-     {
diff --git a/x11/wxGTK26/patches/patch-ah b/x11/wxGTK26/patches/patch-ah
deleted file mode 100644
index afcfd151810..00000000000
--- a/x11/wxGTK26/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2010/02/16 17:35:34 taca Exp $
-
-deal with CVE-2009-2625.
-
---- src/expat/lib/xmltok_impl.c.orig	2006-03-21 23:42:06.000000000 +0000
-+++ src/expat/lib/xmltok_impl.c
-@@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e
-                        const char *end,
-                        POSITION *pos)
- {
--  while (ptr != end) {
-+  while (ptr <= end) {
-     switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
-     case BT_LEAD ## n: \
diff --git a/x11/wxGTK26/patches/patch-include_wx_minifram.h b/x11/wxGTK26/patches/patch-include_wx_minifram.h
deleted file mode 100644
index ef95e2d930d..00000000000
--- a/x11/wxGTK26/patches/patch-include_wx_minifram.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_wx_minifram.h,v 1.1 2015/02/20 23:37:51 joerg Exp $
-
---- include/wx/minifram.h.orig	2015-02-20 22:51:24.000000000 +0000
-+++ include/wx/minifram.h
-@@ -10,7 +10,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- #ifndef _WX_MINIFRAM_H_BASE_
--#define _WX_MINIFRAMH_BASE_
-+#define _WX_MINIFRAM_H_BASE_
- 
- #if defined(__WXPALMOS__)
- #include "wx/palmos/minifram.h"