Remove those, they have been merged into offical ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5015 df743ca5-7f9a-e211-a948-0013205c9059

35 files changed, 0 insertions, 1319 deletions

diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
deleted file mode 100644
index 83d800688..000000000
--- a/x11-toolkits/wxgtk24/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for:	wxGTK
-# Date created:         		September 18, 1999
-# Whom:					nectar@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wx
-PORTVERSION=	2.4.2
-PORTREVISION?=	10
-PKGNAMESUFFIX=	${WXGTK_FLAVOR}
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
-DISTNAME=	wxGTK-${PORTVERSION}
-
-MAINTAINER?=	fjoe@FreeBSD.org
-COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
-
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GL=		yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--with-libpng=sys \
-		--with-libjpeg=sys \
-		--with-libtiff=sys \
-		--with-zlib=sys \
-		--with-opengl\
-		--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
-			  -I${LOCALBASE}/include \
-			  -I${X11BASE}/include \
-			  ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv \
-			 -L${X11BASE}/lib \
-			 ${PTHREAD_LIBS}"
-NO_LATEST_LINK=	yes
-PLIST=		${.CURDIR}/pkg-plist
-
-WXGTK_FLAVOR?=	gtk2
-
-.include <bsd.port.pre.mk>
-
-pre-patch:
-	@${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
-		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
-			${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk24/distinfo b/x11-toolkits/wxgtk24/distinfo
deleted file mode 100644
index ef14fe7e7..000000000
--- a/x11-toolkits/wxgtk24/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (wxGTK-2.4.2.tar.bz2) = cdadfe82fc93f8a65a2ae18a95b0b0e3
-SIZE (wxGTK-2.4.2.tar.bz2) = 5381935
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac
deleted file mode 100644
index 416b9fe2a..000000000
--- a/x11-toolkits/wxgtk24/files/patch-ac
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.in.orig	Sun Sep 21 18:31:27 2003
-+++ Makefile.in	Sat May  7 01:10:14 2005
-@@ -332,17 +332,13 @@
- 
- $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
- 	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
--	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
- 	cd $(build_libdir) \
--		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
--		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
-+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- 
- $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
- 	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
--	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
- 	cd $(build_libdir) \
--		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
--		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
-+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
- 
- $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
- 
-@@ -371,26 +367,21 @@
- 
- CREATE_INSTALLED_LINKS: preinstall
- 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
- 	cd $(libdir) \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
-+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
- 
- CREATE_INSTALLED_LINKS_GL: preinstall_gl
- 	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
- 	cd $(libdir) \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
-+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
- 
- afminstall: preinstall
- 	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
- 	$(INSTALL) -d $(datadir)/wx
--	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
--	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
--	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
--	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
--	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-+	$(INSTALL) -d $(datadir)/wx/afm
-+	$(INSTALL) -d $(datadir)/wx/gs_afm
-+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
- 
- m4datainstall: preinstall
- 	$(INSTALL) -d $(datadir)/aclocal
-@@ -420,25 +411,19 @@
- 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
- 
- 	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
--	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
- 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
- 	@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
- 		$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
--
--	$(INSTALL) -d $(libdir)/wx
--	$(INSTALL) -d $(libdir)/wx/include
--	$(INSTALL) -d $(libdir)/wx/include/univ
--	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
--	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
-+	$(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@
-+	$(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx
- 	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
--                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
-+	             $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h
- 
- 	$(INSTALL) -d $(includedir)/wx
- 	@# FIXME: This will erroneously install a wx/base dir for wxBase..
- 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
- 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
- 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
--	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi
- 	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
- 
- 	@# always install msw headers for wxBase, it's much simpler
diff --git a/x11-toolkits/wxgtk24/files/patch-configure b/x11-toolkits/wxgtk24/files/patch-configure
deleted file mode 100644
index 2236f9eda..000000000
--- a/x11-toolkits/wxgtk24/files/patch-configure
+++ /dev/null
@@ -1,73 +0,0 @@
---- configure.orig	Tue Nov  4 19:54:04 2003
-+++ configure	Tue Nov  4 20:12:59 2003
-@@ -11731,7 +11731,7 @@
- 
- 
-     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
--                                                if test "$USE_DARWIN" = 1; then
-+                                                if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then
-             system_zlib_h_ok="yes"
-         else
-                                                                                     echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
-@@ -16099,6 +16099,13 @@
-             WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
-         fi
-         ;;
-+
-+      *-*-freebsd* )
-+	WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
-+	WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
-+	WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
-+	WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-+      	;;
- esac
- 
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
-@@ -18679,7 +18686,7 @@
-                 ;;
-         esac
- 
--                                THREAD_OPTS="$THREAD_OPTS pthread none"
-+                                THREAD_OPTS=
- 
-                 THREADS_OK=no
-         for flag in $THREAD_OPTS; do
-@@ -18736,6 +18743,8 @@
-               THREADS_CFLAGS=""
-       done
- 
-+      THREADS_OK=yes
-+
-       if test "x$THREADS_OK" != "xyes"; then
-           wxUSE_THREADS=no
-           echo "configure: warning: No thread support on this system... disabled" 1>&2
-@@ -18752,7 +18761,6 @@
-                 flag="-D_THREAD_SAFE"
-                 ;;
-             *-freebsd*)
--                flag="-D_THREAD_SAFE"
-                 ;;
-             *-hp-hpux* )
-                 flag="-D_REENTRANT"
-@@ -19529,21 +19537,6 @@
-         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
-         ;;
-     esac
--fi
--
--if test "$wxUSE_OPTIMISE" = "no" ; then
--    OPTIMISE=
--else
--    if test "$GCC" = yes ; then
--        OPTIMISE="-O2"
--        case "${host}" in
--            i586-*-*|i686-*-* )
--            OPTIMISE="${OPTIMISE} "
--        ;;
--        esac
--    else
--        OPTIMISE="-O"
--    fi
- fi
- 
- if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h b/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h
deleted file mode 100644
index 57217e446..000000000
--- a/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/include/wx/fl/frmview.h.orig	Wed Nov  5 00:02:21 2003
-+++ contrib/include/wx/fl/frmview.h	Wed Nov  5 00:03:08 2003
-@@ -114,7 +114,7 @@
- 
-     // if file name is empty, views are are not saved/loaded
- 
--    virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" );
-+    virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = wxEmptyString );
- 
-     // synonyms
-     wxFrame* GetParentFrame();
diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in
deleted file mode 100644
index 6fbb58222..000000000
--- a/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/src/Makefile.in.orig	Sun Sep 21 18:32:39 2003
-+++ contrib/src/Makefile.in	Tue Nov  4 22:30:37 2003
-@@ -1,6 +1,6 @@
- # $Id: patch-contrib-src-Makefile.in,v 1.1 2005-09-20 17:56:55 mezz Exp $
- 
--CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet
-+CONTRIB_SUBDIRS=canvas fl gizmos net ogl plot stc svg xrc #animate applet mmedia
- 
- all:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp
deleted file mode 100644
index 88d677891..000000000
--- a/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- contrib/src/gizmos/multicell.cpp.orig	Wed Nov  5 00:04:44 2003
-+++ contrib/src/gizmos/multicell.cpp	Wed Nov  5 00:06:11 2003
-@@ -633,17 +633,12 @@
- 	m_minCellSize = wxSize(5, 5);
- }
- //---------------------------------------------------------------------------
--wxString itoa(int x)
--{
--	char    bfr[255];
--	sprintf(bfr, "%d", x);
--	return bfr;
--}
--//---------------------------------------------------------------------------
- void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col)
- {
--	wxASSERT_MSG(row >= 0 && row < m_maxRows, wxString("Row ") + itoa(row) + " out of bounds (" + itoa(m_maxRows) + ")");
--	wxASSERT_MSG(col >= 0 && col < m_maxCols, wxString("Column ") + itoa(col) + " out of bounds (" + itoa(m_maxCols) + ")");
-+	wxASSERT_MSG(row >= 0 && row < m_maxRows,
-+		wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) );
-+	wxASSERT_MSG(col >= 0 && col < m_maxCols,
-+		wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) );
- 	wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied"));
- 
- 	wxCell *newCell = new wxCell(win);
-@@ -660,7 +655,7 @@
- 			if (!m_cells[CELL_LOC(row, col)])
- 			{
- 				// Create an empty static text field as a placeholder
--				m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, ""));
-+				m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, wxT("")));
- 			}
- 			wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window);
- 		}
diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-src-plot-plot.cpp b/x11-toolkits/wxgtk24/files/patch-contrib-src-plot-plot.cpp
deleted file mode 100644
index ff6fc281b..000000000
--- a/x11-toolkits/wxgtk24/files/patch-contrib-src-plot-plot.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- contrib/src/plot/plot.cpp.orig	Wed Nov  5 00:03:37 2003
-+++ contrib/src/plot/plot.cpp	Wed Nov  5 00:04:27 2003
-@@ -204,7 +204,7 @@
- END_EVENT_TABLE()
- 
- wxPlotArea::wxPlotArea( wxPlotWindow *parent )
--        : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, "plotarea" )
-+        : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") )
- {
-     m_owner = parent;
-     
-@@ -462,7 +462,7 @@
- END_EVENT_TABLE()
- 
- wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent )
--        : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, "plotxaxisarea" )
-+        : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, _T("plotxaxisarea") )
- {
-     m_owner = parent;
-     
-@@ -589,7 +589,7 @@
- END_EVENT_TABLE()
- 
- wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent )
--        : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, "plotyaxisarea" )
-+        : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, _T("plotyaxisarea") )
- {
-     m_owner = parent;
-     
-@@ -713,7 +713,7 @@
- END_EVENT_TABLE()
- 
- wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag )
--        : wxScrolledWindow( parent, id, pos, size, flag, "plotcanvas" )
-+        : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") )
- {
-     m_xUnitsPerValue = 1.0;
-     m_xZoom = 1.0;
diff --git a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
deleted file mode 100644
index 39470600b..000000000
--- a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-$MCom$
-
---- include/wx/wxchar.h.orig	Sun Sep 15 21:19:48 2002
-+++ include/wx/wxchar.h	Sat Oct 26 18:06:12 2002
-@@ -554,10 +554,10 @@
- #endif // wxUSE_WCHAR_T
- 
- // checks whether the passed in pointer is NULL and if the string is empty
--inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
-+WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
- 
- // safe version of strlen() (returns 0 if passed NULL pointer)
--inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
-+WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
- 
- WXDLLEXPORT bool wxOKlibc(); // for internal use
- 
diff --git a/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp b/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp
deleted file mode 100644
index f4931273f..000000000
--- a/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/common/datetime.cpp.orig	Tue Nov  4 09:50:09 2003
-+++ src/common/datetime.cpp	Tue Nov  4 09:52:02 2003
-@@ -349,6 +349,35 @@
-     return wxString(buf);
- }
- 
-+#ifdef HAVE_STRPTIME
-+  	 
-+// Unicode-friendly strptime() wrapper
-+static const wxChar *
-+CallStrptime(const wxChar *input, const char *fmt, tm *tm)
-+{
-+    // the problem here is that strptime() returns pointer into the string we
-+    // passed to it while we're really interested in the pointer into the
-+    // original, Unicode, string so we try to transform the pointer back
-+#if wxUSE_UNICODE
-+    wxCharBuffer inputMB(wxConvertWX2MB(input));
-+#else // ASCII
-+    const char * const inputMB = input;
-+#endif // Unicode/Ascii
-+
-+    const char *result = strptime(inputMB, fmt, tm);
-+    if ( !result )
-+        return NULL;
-+  	 
-+#if wxUSE_UNICODE
-+    // FIXME: this is wrong in presence of surrogates &c
-+    return input + (result - inputMB.data());
-+#else // ASCII
-+    return result;
-+#endif // Unicode/Ascii
-+}
-+
-+#endif // HAVE_STRPTIME
-+
- // if year and/or month have invalid values, replace them with the current ones
- static void ReplaceDefaultYearMonthWithCurrent(int *year,
-                                                wxDateTime::Month *month)
-@@ -2920,7 +2949,7 @@
-                 // to our generic code anyhow (FIXME !Unicode friendly)
-                 {
-                     struct tm tm;
--                    const wxChar *result = strptime(input, "%x", &tm);
-+                    const wxChar *result = CallStrptime(input, "%x", &tm);
-                     if ( result )
-                     {
-                         input = result;
-@@ -2985,7 +3014,7 @@
-                 {
-                     // use strptime() to do it for us (FIXME !Unicode friendly)
-                     struct tm tm;
--                    input = strptime(input, "%X", &tm);
-+                    input = CallStrptime(input, "%X", &tm);
-                     if ( !input )
-                     {
-                         return (wxChar *)NULL;
diff --git a/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp
deleted file mode 100644
index 1aae1c52f..000000000
--- a/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtk/notebook.cpp.orig	Sun Sep 21 18:31:57 2003
-+++ src/gtk/notebook.cpp	Mon Nov 10 03:26:16 2003
-@@ -643,7 +643,7 @@
-     nb_page->m_text = text;
-     if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
-   
--    nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) );
-+    nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
-     gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
-   
-     /* show the label */
diff --git a/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in
deleted file mode 100644
index af05f435d..000000000
--- a/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/makelib.env.in.orig	Sun Sep 21 18:31:38 2003
-+++ src/makelib.env.in	Sat May  7 00:33:13 2005
-@@ -35,8 +35,8 @@
- INSTALL_DATA = @INSTALL_DATA@
- 
- TARGETLIB_STATIC = $(TARGET_LIBNAME).a
--TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
--TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
-+TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
-+TARGETLIB_LINK1 = $(TARGET_LIBNAME).so
- TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
- 
- TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
-@@ -72,9 +72,8 @@
- 	@$(INSTALL) -d $(top_builddir)/lib
- 	$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING)
- 	cd $(top_builddir)/lib \
--		&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
-+		&& $(RM) $(TARGETLIB_LINK1) \
-+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1)
- 
- $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
- 	@$(INSTALL) -d $(top_builddir)/lib
-@@ -86,10 +85,9 @@
- 
- install_so:
- 	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
--	@$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
-+	@$(RM) $(libdir)/$(TARGETLIB_LINK1)
- 	cd $(libdir) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
-+		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1)
- 
- install_a:
- 	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
-@@ -105,7 +103,6 @@
- 	$(RM) $(libdir)/$(TARGETLIB_STATIC)
- 	$(RM) $(libdir)/$(TARGETLIB_SHARED)
- 	$(RM) $(libdir)/$(TARGETLIB_LINK1)
--	$(RM) $(libdir)/$(TARGETLIB_LINK2)
- 	@echo "removing headers"
- 	@for h in $(HEADERS); do \
- 	  $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
-@@ -118,7 +115,6 @@
- clean:
- 	$(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \
- 	      $(top_builddir)/lib/$(TARGETLIB_LINK1) \
--	      $(top_builddir)/lib/$(TARGETLIB_LINK2) \
- 	      $(top_builddir)/lib/$(TARGETLIB_STATIC) core
- 
- .PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean
diff --git a/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp b/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp
deleted file mode 100644
index f8e465e4c..000000000
--- a/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/common/intl.cpp.orig	Sat Oct  4 23:10:24 2003
-+++ src/common/intl.cpp	Sun Oct  5 21:35:30 2003
-@@ -743,8 +742,18 @@
-     }
-     if ( !retloc )
-     {
-+        wxString langFull;
-+        if (wxGetEnv(wxT("LC_ALL"), &langFull)|| 
-+            wxGetEnv(wxT("LC_MESSAGES"), &langFull) ||
-+            wxGetEnv(wxT("LANG"), &langFull))
-+	{
-+	    retloc = wxSetlocale(LC_ALL, langFull);
-+	}
-+    }
-+    if ( !retloc )
-+    {
-         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
--        return FALSE;
-+        //return FALSE;
-     }
- #elif defined(__WIN32__)
- 
diff --git a/x11-toolkits/wxgtk24/files/patch-wx-config.in b/x11-toolkits/wxgtk24/files/patch-wx-config.in
deleted file mode 100644
index a7ed9b679..000000000
--- a/x11-toolkits/wxgtk24/files/patch-wx-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- wx-config.in.orig	Wed Nov  5 00:19:46 2003
-+++ wx-config.in	Wed Nov  5 00:20:14 2003
-@@ -66,7 +66,7 @@
-     if test $inplace_flag = yes ; then
- 	includes="-I$inplace_builddir/lib/wx/include/@TOOLCHAIN_NAME@ -I$inplace_include"
-     else
--	includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@$includes"
-+	includes="-I@prefix@/include/wx/@TOOLCHAIN_NAME@$includes"
-     fi
- 
-     if test $static_flag = yes ; then
diff --git a/x11-toolkits/wxgtk24/pkg-descr b/x11-toolkits/wxgtk24/pkg-descr
deleted file mode 100644
index 67f1f41d3..000000000
--- a/x11-toolkits/wxgtk24/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-wxWidgets (formerly known as wxWindows) is a C++ GUI framework for platform
-independent software development. On FreeBSD the Gtk toolkit is used.
-
-WWW: http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
deleted file mode 100644
index 426a83b11..000000000
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ /dev/null
@@ -1,423 +0,0 @@
-bin/wxgtk2-2.4-config
-include/wx/accel.h
-include/wx/app.h
-include/wx/arrimpl.cpp
-include/wx/artprov.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/brush.h
-include/wx/buffer.h
-include/wx/build.h
-include/wx/busyinfo.h
-include/wx/button.h
-include/wx/calctrl.h
-include/wx/caret.h
-include/wx/checkbox.h
-include/wx/checklst.h
-include/wx/chkconf.h
-include/wx/choicdlg.h
-include/wx/choice.h
-include/wx/clipbrd.h
-include/wx/clntdata.h
-include/wx/cmdline.h
-include/wx/cmdproc.h
-include/wx/cmndata.h
-include/wx/colordlg.h
-include/wx/colour.h
-include/wx/combobox.h
-include/wx/confbase.h
-include/wx/config.h
-include/wx/containr.h
-include/wx/control.h
-include/wx/cshelp.h
-include/wx/ctrlsub.h
-include/wx/cursor.h
-include/wx/dataobj.h
-include/wx/date.h
-include/wx/datetime.h
-include/wx/datetime.inl
-include/wx/datstrm.h
-include/wx/db.h
-include/wx/dbgrid.h
-include/wx/dbkeyg.h
-include/wx/dbtable.h
-include/wx/dc.h
-include/wx/dcbuffer.h
-include/wx/dcclient.h
-include/wx/dcmemory.h
-include/wx/dcprint.h
-include/wx/dcps.h
-include/wx/dcscreen.h
-include/wx/dde.h
-include/wx/debug.h
-include/wx/defs.h
-include/wx/dialog.h
-include/wx/dialup.h
-include/wx/dir.h
-include/wx/dirctrl.h
-include/wx/dirdlg.h
-include/wx/dnd.h
-include/wx/docmdi.h
-include/wx/docview.h
-include/wx/dragimag.h
-include/wx/dynarray.h
-include/wx/dynlib.h
-include/wx/dynload.h
-include/wx/effects.h
-include/wx/encconv.h
-include/wx/event.h
-include/wx/expr.h
-include/wx/fdrepdlg.h
-include/wx/features.h
-include/wx/ffile.h
-include/wx/file.h
-include/wx/fileconf.h
-include/wx/filedlg.h
-include/wx/filefn.h
-include/wx/filename.h
-include/wx/filesys.h
-include/wx/font.h
-include/wx/fontdlg.h
-include/wx/fontenc.h
-include/wx/fontenum.h
-include/wx/fontmap.h
-include/wx/fontutil.h
-include/wx/frame.h
-include/wx/fs_inet.h
-include/wx/fs_mem.h
-include/wx/fs_zip.h
-include/wx/gauge.h
-include/wx/gdicmn.h
-include/wx/gdiobj.h
-include/wx/generic/accel.h
-include/wx/generic/calctrl.h
-include/wx/generic/caret.h
-include/wx/generic/choicdgg.h
-include/wx/generic/colrdlgg.h
-include/wx/generic/dcpsg.h
-include/wx/generic/dirctrlg.h
-include/wx/generic/dirdlgg.h
-include/wx/generic/dragimgg.h
-include/wx/generic/fdrepdlg.h
-include/wx/generic/filedlgg.h
-include/wx/generic/fontdlgg.h
-include/wx/generic/grid.h
-include/wx/generic/gridctrl.h
-include/wx/generic/gridg.h
-include/wx/generic/helpext.h
-include/wx/generic/helphtml.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/paletteg.h
-include/wx/generic/panelg.h
-include/wx/generic/printps.h
-include/wx/generic/prntdlgg.h
-include/wx/generic/progdlgg.h
-include/wx/generic/sashwin.h
-include/wx/generic/scrolwin.h
-include/wx/generic/spinctlg.h
-include/wx/generic/splash.h
-include/wx/generic/splitter.h
-include/wx/generic/statusbr.h
-include/wx/generic/tabg.h
-include/wx/generic/textdlgg.h
-include/wx/generic/timer.h
-include/wx/generic/treectlg.h
-include/wx/generic/wizard.h
-include/wx/geometry.h
-include/wx/gifdecod.h
-include/wx/glcanvas.h
-include/wx/grid.h
-include/wx/gsocket.h
-include/wx/gtk/accel.h
-include/wx/gtk/app.h
-include/wx/gtk/bitmap.h
-include/wx/gtk/bmpbuttn.h
-include/wx/gtk/brush.h
-include/wx/gtk/button.h
-include/wx/gtk/checkbox.h
-include/wx/gtk/checklst.h
-include/wx/gtk/choice.h
-include/wx/gtk/clipbrd.h
-include/wx/gtk/colour.h
-include/wx/gtk/combobox.h
-include/wx/gtk/control.h
-include/wx/gtk/cursor.h
-include/wx/gtk/dataform.h
-include/wx/gtk/dataobj.h
-include/wx/gtk/dataobj2.h
-include/wx/gtk/dc.h
-include/wx/gtk/dcclient.h
-include/wx/gtk/dcmemory.h
-include/wx/gtk/dcscreen.h
-include/wx/gtk/dialog.h
-include/wx/gtk/dnd.h
-include/wx/gtk/filedlg.h
-include/wx/gtk/font.h
-include/wx/gtk/fontdlg.h
-include/wx/gtk/frame.h
-include/wx/gtk/gauge.h
-include/wx/gtk/gdiobj.h
-include/wx/gtk/glcanvas.h
-include/wx/gtk/icon.h
-include/wx/gtk/joystick.h
-include/wx/gtk/listbox.h
-include/wx/gtk/mdi.h
-include/wx/gtk/menu.h
-include/wx/gtk/menuitem.h
-include/wx/gtk/minifram.h
-include/wx/gtk/notebook.h
-include/wx/gtk/pen.h
-include/wx/gtk/popupwin.h
-include/wx/gtk/radiobox.h
-include/wx/gtk/radiobut.h
-include/wx/gtk/region.h
-include/wx/gtk/scrolbar.h
-include/wx/gtk/scrolwin.h
-include/wx/gtk/slider.h
-include/wx/gtk/spinbutt.h
-include/wx/gtk/spinctrl.h
-include/wx/gtk/statbmp.h
-include/wx/gtk/statbox.h
-include/wx/gtk/statline.h
-include/wx/gtk/stattext.h
-include/wx/gtk/tbargtk.h
-include/wx/gtk/textctrl.h
-include/wx/gtk/tglbtn.h
-include/wx/gtk/timer.h
-include/wx/gtk/tooltip.h
-include/wx/gtk/toplevel.h
-include/wx/gtk/treectrl.h
-include/wx/gtk/wave.h
-include/wx/gtk/win_gtk.h
-include/wx/gtk/window.h
-include/wx/gtk2-2.4/wx/setup.h
-include/wx/hash.h
-include/wx/hashmap.h
-include/wx/help.h
-include/wx/helpbase.h
-include/wx/helphtml.h
-include/wx/helpwin.h
-include/wx/html/forcelnk.h
-include/wx/html/helpctrl.h
-include/wx/html/helpdata.h
-include/wx/html/helpfrm.h
-include/wx/html/htmlcell.h
-include/wx/html/htmldefs.h
-include/wx/html/htmlfilt.h
-include/wx/html/htmlpars.h
-include/wx/html/htmltag.h
-include/wx/html/htmlwin.h
-include/wx/html/htmprint.h
-include/wx/html/m_templ.h
-include/wx/html/winpars.h
-include/wx/icon.h
-include/wx/iconbndl.h
-include/wx/imagbmp.h
-include/wx/image.h
-include/wx/imaggif.h
-include/wx/imagiff.h
-include/wx/imagjpeg.h
-include/wx/imaglist.h
-include/wx/imagpcx.h
-include/wx/imagpng.h
-include/wx/imagpnm.h
-include/wx/imagtiff.h
-include/wx/imagxpm.h
-include/wx/intl.h
-include/wx/ioswrap.h
-include/wx/ipc.h
-include/wx/ipcbase.h
-include/wx/isql.h
-include/wx/isqlext.h
-include/wx/joystick.h
-include/wx/layout.h
-include/wx/laywin.h
-include/wx/list.h
-include/wx/listbase.h
-include/wx/listbox.h
-include/wx/listctrl.h
-include/wx/listimpl.cpp
-include/wx/log.h
-include/wx/longlong.h
-include/wx/matrix.h
-include/wx/mdi.h
-include/wx/memconf.h
-include/wx/memory.h
-include/wx/memtext.h
-include/wx/menu.h
-include/wx/menuitem.h
-include/wx/metafile.h
-include/wx/mimetype.h
-include/wx/minifram.h
-include/wx/module.h
-include/wx/msgdlg.h
-include/wx/msgout.h
-include/wx/mstream.h
-include/wx/notebook.h
-include/wx/object.h
-include/wx/odbc.h
-include/wx/ownerdrw.h
-include/wx/palette.h
-include/wx/panel.h
-include/wx/paper.h
-include/wx/pen.h
-include/wx/platform.h
-include/wx/popupwin.h
-include/wx/print.h
-include/wx/printdlg.h
-include/wx/prntbase.h
-include/wx/process.h
-include/wx/progdlg.h
-include/wx/prop.h
-include/wx/propform.h
-include/wx/proplist.h
-include/wx/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/quantize.h
-include/wx/radiobox.h
-include/wx/radiobut.h
-include/wx/regex.h
-include/wx/region.h
-include/wx/resource.h
-include/wx/sashwin.h
-include/wx/sckaddr.h
-include/wx/sckipc.h
-include/wx/sckstrm.h
-include/wx/scrolbar.h
-include/wx/scrolwin.h
-include/wx/settings.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/snglinst.h
-include/wx/socket.h
-include/wx/spinbutt.h
-include/wx/spinctrl.h
-include/wx/splash.h
-include/wx/splitter.h
-include/wx/stack.h
-include/wx/statbmp.h
-include/wx/statbox.h
-include/wx/statline.h
-include/wx/stattext.h
-include/wx/statusbr.h
-include/wx/strconv.h
-include/wx/stream.h
-include/wx/string.h
-include/wx/sysopt.h
-include/wx/tab.h
-include/wx/tabctrl.h
-include/wx/taskbar.h
-include/wx/tbarbase.h
-include/wx/tbarsmpl.h
-include/wx/textbuf.h
-include/wx/textctrl.h
-include/wx/textdlg.h
-include/wx/textfile.h
-include/wx/tglbtn.h
-include/wx/thread.h
-include/wx/thrimpl.cpp
-include/wx/time.h
-include/wx/timer.h
-include/wx/tipdlg.h
-include/wx/tipwin.h
-include/wx/tokenzr.h
-include/wx/toolbar.h
-include/wx/tooltip.h
-include/wx/toplevel.h
-include/wx/treebase.h
-include/wx/treectrl.h
-include/wx/txtstrm.h
-include/wx/types.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/mimetype.h
-include/wx/unix/utilsx11.h
-include/wx/url.h
-include/wx/utils.h
-include/wx/valgen.h
-include/wx/validate.h
-include/wx/valtext.h
-include/wx/variant.h
-include/wx/vector.h
-include/wx/version.h
-include/wx/volume.h
-include/wx/wave.h
-include/wx/wfstream.h
-include/wx/window.h
-include/wx/wizard.h
-include/wx/wx.h
-include/wx/wx_cw.h
-include/wx/wx_cw_cm.h
-include/wx/wx_cw_d.h
-include/wx/wxchar.h
-include/wx/wxexpr.h
-include/wx/wxhtml.h
-include/wx/wxprec.h
-include/wx/xpmdecod.h
-include/wx/zipstrm.h
-include/wx/zstream.h
-lib/libwx_gtk2-2.4.so
-lib/libwx_gtk2-2.4.so.0
-lib/libwx_gtk2_gl-2.4.so
-lib/libwx_gtk2_gl-2.4.so.0
-share/aclocal/wxwin.m4
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/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/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/zh/LC_MESSAGES/wxstd.mo
-share/wx/afm/Cour.afm
-share/wx/afm/CourBo.afm
-share/wx/afm/CourBoO.afm
-share/wx/afm/CourO.afm
-share/wx/afm/Helv.afm
-share/wx/afm/HelvBo.afm
-share/wx/afm/HelvBoO.afm
-share/wx/afm/HelvO.afm
-share/wx/afm/TimesBo.afm
-share/wx/afm/TimesBoO.afm
-share/wx/afm/TimesO.afm
-share/wx/afm/TimesRo.afm
-share/wx/afm/Zapf.afm
-share/wx/gs_afm/Cour.afm
-share/wx/gs_afm/CourBo.afm
-share/wx/gs_afm/CourBoO.afm
-share/wx/gs_afm/CourO.afm
-share/wx/gs_afm/Helv.afm
-share/wx/gs_afm/HelvBo.afm
-share/wx/gs_afm/HelvBoO.afm
-share/wx/gs_afm/HelvO.afm
-share/wx/gs_afm/TimesBo.afm
-share/wx/gs_afm/TimesBoO.afm
-share/wx/gs_afm/TimesO.afm
-share/wx/gs_afm/TimesRo.afm
-share/wx/gs_afm/Zapf.afm
-@dirrm share/wx/gs_afm
-@dirrm share/wx/afm
-@dirrm share/wx
-@dirrm include/wx/unix
-@dirrm include/wx/protocol
-@dirrm include/wx/html
-@dirrm include/wx/gtk2-2.4/wx
-@dirrm include/wx/gtk2-2.4
-@dirrm include/wx/gtk
-@dirrm include/wx/generic
-@dirrm include/wx
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
deleted file mode 100644
index 409de50b9..000000000
--- a/x11-toolkits/wxgtk26/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# New ports collection makefile for:	wxgtk26
-# Date created:         		June 27, 2004
-# Whom:					fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wx
-PORTVERSION=	2.6.1
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
-PKGNAMESUFFIX=	${WXGTK_FLAVOR}
-DISTNAME=	wxGTK-${PORTVERSION}
-
-MAINTAINER?=	fjoe@FreeBSD.org
-COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
-
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png\
-		jpeg.9:${PORTSDIR}/graphics/jpeg\
-		tiff.4:${PORTSDIR}/graphics/tiff\
-		expat.5:${PORTSDIR}/textproc/expat2\
-		mspack.1:${PORTSDIR}/archivers/libmspack
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GL=		yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_GNOME=	gtk20
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libpng=sys\
-		--with-libjpeg=sys\
-		--with-libtiff=sys\
-		--with-zlib=sys\
-		--with-expat=sys\
-		--with-opengl\
-		--with-mspack\
-		--with-gtk\
-		--disable-backtrace
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			  -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv \
-			 -L${X11BASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-PLIST=		${.CURDIR}/pkg-plist
-
-WXGTK_FLAVOR?=	gtk2
-
-.if ${WXGTK_FLAVOR} == "gtk2"
-CONFLICTS=	wxgtk2-contrib-devel-2.5.2*
-.endif
-
-.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
-.endif
-
-.if ${WXGTK_FLAVOR:M*-common} != ""
-NO_BUILD=	yes
-INSTALL_TARGET=	install-common
-.else
-INSTALLS_SHLIB=	yes
-.endif # *-common
-
-.if ${WXGTK_FLAVOR:M*-contrib*} != ""
-BUILD_WRKSRC=	${WRKSRC}/contrib
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-
-.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
-
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+=	wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-.else
-LIB_DEPENDS+=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-.endif
-
-pre-configure:
-	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e "s|@CXXFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cxxflags`|" \
-		-e "s|@CFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cflags`|" \
-		-e "s|@CPPFLAGS@||"
-
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
-		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
-			${WRKSRC}/configure
-
-.include <bsd.port.pre.mk>
-
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-.if ${OSVERSION} < 500000
-IGNORE=		Systems prior to FreeBSD 5.0 currently out of support
-.else
-CONFIGURE_ARGS+=--enable-unicode
-.endif
-
-WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
-.else
-WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
-.endif # *-unicode*
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
deleted file mode 100644
index 141c24089..000000000
--- a/x11-toolkits/wxgtk26/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (wxGTK-2.6.1.tar.bz2) = dd348a6f825d502b497a085b190b7a27
-SIZE (wxGTK-2.6.1.tar.bz2) = 7205374
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
deleted file mode 100644
index 00bd63328..000000000
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.in.orig	Thu Apr 21 00:32:34 2005
-+++ Makefile.in	Thu May  5 16:11:02 2005
-@@ -23,6 +23,7 @@
- SONAME_FLAG = @SONAME_FLAG@
- STRIP = @STRIP@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
- srcdir = @srcdir@
-@@ -9127,11 +9128,13 @@
- 
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
--install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install $(__cocoa_res_install___depname)
-+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__cocoa_res_install___depname)
-+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
-+	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
-+
-+install-common: locale_install
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- 	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
--	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
--	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in $(ALL_HEADERS); do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -9664,9 +9667,7 @@
- 
- install-wxconfig: 
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
--	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
--	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
- 
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure
deleted file mode 100644
index 33327df19..000000000
--- a/x11-toolkits/wxgtk26/files/patch-configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.orig	Thu Jun  2 23:03:05 2005
-+++ configure	Wed Aug 31 23:48:02 2005
-@@ -34396,7 +34396,7 @@
-                 fi
-                 ;;
-           *-*-freebsd*)
--                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+                                                THREAD_OPTS="$PTHREAD_LIBS"
-                 ;;
-           *-*-darwin* | *-*-cygwin* )
-                                                 THREAD_OPTS=""
-@@ -34433,6 +34433,12 @@
- echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
-                     ;;
- 
-+                -pthread|-l*)
-+                    echo "$as_me:$LINENO: checking for the pthreads library $flag" >&5
-+echo $ECHO_N "checking for the pthreads library $flag... $ECHO_C" >&6
-+                    THREADS_LINK="$flag"
-+                    ;;
-+
-                 -*)
-                     echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
- echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
-@@ -34515,7 +34521,7 @@
-           { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
- echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
-       else
--                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
-+                              LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS"
-           LIBS="$THREADS_LINK $LIBS"
- 
-           echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
-@@ -35701,6 +35707,7 @@
-     fi
-   fi
- fi
-+TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}"
- 
- if test "$WXGTK20" = 1 ; then
-   cat >>confdefs.h <<_ACEOF
-@@ -35823,7 +35830,7 @@
-         OPTIMISE="-O"
-     fi
- fi
--
-+OPTIMISE=
- 
- if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
-     cat >>confdefs.h <<\_ACEOF
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in
deleted file mode 100644
index 20b4b5800..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- contrib/Makefile.in.orig	Sun Jun 27 21:46:24 2004
-+++ contrib/Makefile.in	Sun Jun 27 21:46:44 2004
-@@ -16,3 +16,6 @@
- 
- install:
- 	cd src; $(MAKE) install
-+
-+install-common:
-+	cd src; $(MAKE) install-common
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
deleted file mode 100644
index 79e8fc3c5..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- contrib/src/Makefile.in.orig	Sun Oct 10 22:18:48 2004
-+++ contrib/src/Makefile.in	Fri Nov 26 00:20:35 2004
-@@ -1,15 +1,24 @@
- # $Id: patch-contrib-src-Makefile.in,v 1.1 2005-08-16 21:26:32 mezz Exp $
- 
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
- 
--all:
-+WX_RELEASE=	@WX_RELEASE@
-+@COND_UNICODE_1@wxregexu_depname=	wxregexu
-+
-+all:	$(wxregexu_depname)
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
- 
-+wxregexu:
-+	@cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a
-+
- clean:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
- 
- install:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done
-+
-+install-common:
-+	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done
- 
- uninstall:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
deleted file mode 100644
index abfc81a61..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/animate/Makefile.in.orig	Sun Oct 10 22:18:48 2004
-+++ contrib/src/animate/Makefile.in	Wed Nov 24 21:37:14 2004
-@@ -180,6 +180,8 @@
- all: $(__animatedll___depname) $(__animatelib___depname)
- 
- install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/animate/animate.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
deleted file mode 100644
index 0c492341c..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/deprecated/Makefile.in.orig	Sun Oct 10 22:18:54 2004
-+++ contrib/src/deprecated/Makefile.in	Wed Nov 24 21:39:56 2004
-@@ -207,6 +207,8 @@
- all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
- 
- install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
deleted file mode 100644
index 2de711cc3..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/fl/Makefile.in.orig	Sun Oct 10 22:18:49 2004
-+++ contrib/src/fl/Makefile.in	Wed Nov 24 21:40:16 2004
-@@ -211,6 +211,8 @@
- all: $(__fldll___depname) $(__fllib___depname)
- 
- install: all $(__install_fldll___depname) $(__install_fllib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
deleted file mode 100644
index 51b5ab5ee..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/gizmos/Makefile.in.orig	Thu Apr 21 00:33:08 2005
-+++ contrib/src/gizmos/Makefile.in	Thu May  5 16:22:48 2005
-@@ -277,6 +277,8 @@
- all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
- 
- install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
deleted file mode 100644
index 2be3bdbe7..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/ogl/Makefile.in.orig	Sun Oct 10 22:18:52 2004
-+++ contrib/src/ogl/Makefile.in	Wed Nov 24 21:41:00 2004
-@@ -201,6 +201,8 @@
- all: $(__ogldll___depname) $(__ogllib___depname)
- 
- install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
deleted file mode 100644
index 802b4f093..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/plot/Makefile.in.orig	Sun Oct 10 22:18:52 2004
-+++ contrib/src/plot/Makefile.in	Wed Nov 24 21:41:16 2004
-@@ -179,6 +179,8 @@
- all: $(__plotdll___depname) $(__plotlib___depname)
- 
- install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
deleted file mode 100644
index c41d5cbfe..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/stc/Makefile.in.orig	Sun Oct 10 22:18:53 2004
-+++ contrib/src/stc/Makefile.in	Wed Nov 24 21:41:31 2004
-@@ -310,6 +310,8 @@
- all: $(__stcdll___depname) $(__stclib___depname)
- 
- install: all $(__install_stcdll___depname) $(__install_stclib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/stc/stc.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
deleted file mode 100644
index 213aef13d..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/svg/Makefile.in.orig	Sun Oct 10 22:18:54 2004
-+++ contrib/src/svg/Makefile.in	Wed Nov 24 21:41:44 2004
-@@ -179,6 +179,8 @@
- all: $(__svgdll___depname) $(__svglib___depname)
- 
- install: all $(__install_svgdll___depname) $(__install_svglib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- 	for f in wx/svg/dcsvg.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in
deleted file mode 100644
index acbcfacb0..000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- contrib/utils/Makefile.in.orig	Mon Jun 28 03:47:07 2004
-+++ contrib/utils/Makefile.in	Mon Jun 28 03:47:23 2004
-@@ -5,6 +5,9 @@
- all:
- 	@for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE)); done
- 
-+install:
-+	@for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE) install); done
-+
- clean:
- 	@for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE) clean); done
- 
diff --git a/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in
deleted file mode 100644
index 353821f40..000000000
--- a/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- utils/wxrc/Makefile.in.orig	Thu Nov 25 21:52:45 2004
-+++ utils/wxrc/Makefile.in	Thu Nov 25 21:58:43 2004
-@@ -28,6 +28,7 @@
- TOOLKIT = @TOOLKIT@
- TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
- TOOLKIT_VERSION = @TOOLKIT_VERSION@
-+TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
- EXTRALIBS = @EXTRALIBS@
- EXTRALIBS_XML = @EXTRALIBS_XML@
- HOST_SUFFIX = @HOST_SUFFIX@
-@@ -113,9 +114,7 @@
- 
- @COND_USE_XRC_1@install_wxrc: 
- @COND_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
-+@COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
- 
- wxrc_wxrc.o: $(srcdir)/wxrc.cpp
- 	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/x11-toolkits/wxgtk26/files/patch-wx-config.in b/x11-toolkits/wxgtk26/files/patch-wx-config.in
deleted file mode 100644
index 434032d26..000000000
--- a/x11-toolkits/wxgtk26/files/patch-wx-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- wx-config.in.orig	Thu Apr 21 00:32:34 2005
-+++ wx-config.in	Thu May  5 16:36:09 2005
-@@ -1142,7 +1142,7 @@
-     _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
- fi
- 
--_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
-+_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
- 
- # now without further ado, we can answer these too.
- [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk26/pkg-descr b/x11-toolkits/wxgtk26/pkg-descr
deleted file mode 100644
index 67f1f41d3..000000000
--- a/x11-toolkits/wxgtk26/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-wxWidgets (formerly known as wxWindows) is a C++ GUI framework for platform
-independent software development. On FreeBSD the Gtk toolkit is used.
-
-WWW: http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk26/pkg-plist b/x11-toolkits/wxgtk26/pkg-plist
deleted file mode 100644
index f21ae0c20..000000000
--- a/x11-toolkits/wxgtk26/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-bin/wxgtk2-2.6-config
-bin/wxrc-gtk2-2.6
-include/wx-2.6/gtk2-ansi-release-2.6/wx/setup.h
-lib/libwx_base-2.6.so
-lib/libwx_base-2.6.so.0
-lib/libwx_base-2.6.so.0.0.0
-lib/libwx_base_net-2.6.so
-lib/libwx_base_net-2.6.so.0
-lib/libwx_base_net-2.6.so.0.0.0
-lib/libwx_base_xml-2.6.so
-lib/libwx_base_xml-2.6.so.0
-lib/libwx_base_xml-2.6.so.0.0.0
-lib/libwx_gtk2_adv-2.6.so
-lib/libwx_gtk2_adv-2.6.so.0
-lib/libwx_gtk2_adv-2.6.so.0.0.0
-lib/libwx_gtk2_core-2.6.so
-lib/libwx_gtk2_core-2.6.so.0
-lib/libwx_gtk2_core-2.6.so.0.0.0
-lib/libwx_gtk2_gl-2.6.so
-lib/libwx_gtk2_gl-2.6.so.0
-lib/libwx_gtk2_gl-2.6.so.0.0.0
-lib/libwx_gtk2_html-2.6.so
-lib/libwx_gtk2_html-2.6.so.0
-lib/libwx_gtk2_html-2.6.so.0.0.0
-lib/libwx_gtk2_media-2.6.so
-lib/libwx_gtk2_media-2.6.so.0
-lib/libwx_gtk2_media-2.6.so.0.0.0
-lib/libwx_gtk2_qa-2.6.so
-lib/libwx_gtk2_qa-2.6.so.0
-lib/libwx_gtk2_qa-2.6.so.0.0.0
-lib/libwx_gtk2_xrc-2.6.so
-lib/libwx_gtk2_xrc-2.6.so.0
-lib/libwx_gtk2_xrc-2.6.so.0.0.0
-@dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
-@dirrm include/wx-2.6/gtk2-ansi-release-2.6