Fix build with new glib

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

18 files changed, 982 insertions, 0 deletions

diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
new file mode 100644
index 000000000..d556143c6
--- /dev/null
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for:	wxGTK
+# Date created:         		September 18, 1999
+# Whom:					nectar@FreeBSD.ORG
+#
+# $FreeBSD: ports/x11-toolkits/wxgtk24/Makefile,v 1.62 2009/08/22 00:39:31 amdmi3 Exp $
+#
+
+PORTNAME=	wx
+PORTVERSION=	2.4.2
+PORTREVISION?=	18
+PKGNAMESUFFIX=	${WXGTK_FLAVOR}
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
+DISTNAME=	wxGTK-${PORTVERSION}
+
+MAINTAINER?=	fjoe@FreeBSD.org
+COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
+
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
+		jpeg.10:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff
+
+USE_BZIP2=	yes
+USE_XORG=	x11 sm xxf86vm xinerama
+USE_GL=		glu
+USE_GMAKE=	yes
+USE_ICONV=	yes
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gtk20
+CONFIGURE_ARGS=	--with-libpng=sys \
+		--with-libjpeg=sys \
+		--with-libtiff=sys \
+		--with-zlib=sys \
+		--with-opengl\
+		--enable-gtk2 \
+		--includedir=${PREFIX}/include/wx-2.4
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
+			  -I${LOCALBASE}/include \
+			  ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv \
+			 ${PTHREAD_LIBS}"\
+		X11BASE="${LOCALBASE}"
+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
new file mode 100644
index 000000000..7f5c456ff
--- /dev/null
+++ b/x11-toolkits/wxgtk24/distinfo
@@ -0,0 +1,3 @@
+MD5 (wxGTK-2.4.2.tar.bz2) = cdadfe82fc93f8a65a2ae18a95b0b0e3
+SHA256 (wxGTK-2.4.2.tar.bz2) = 2b057cbd6f5573d2bac2c8af180fcd9f56ad4e27bba44abdd2cb0a6904c725b1
+SIZE (wxGTK-2.4.2.tar.bz2) = 5381935
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac
new file mode 100644
index 000000000..416b9fe2a
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-ac
@@ -0,0 +1,84 @@
+--- 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
new file mode 100644
index 000000000..9fb5e6e49
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-configure
@@ -0,0 +1,81 @@
+--- configure.orig	Tue Nov  4 19:54:04 2003
++++ configure	Tue Nov  4 20:12:59 2003
+@@ -11436,6 +11436,7 @@
+ 
+ 
+ SEARCH_INCLUDE="\
++    $X11BASE/include	      \
+     /usr/local/include        \
+                               \
+     /usr/Motif-1.2/include    \
+@@ -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
new file mode 100644
index 000000000..57217e446
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..bf27c32d7
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in
@@ -0,0 +1,10 @@
+--- 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.5 2009-09-28 11:50:49 kwm 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
new file mode 100644
index 000000000..88d677891
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp
@@ -0,0 +1,33 @@
+--- 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
new file mode 100644
index 000000000..ff6fc281b
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-contrib-src-plot-plot.cpp
@@ -0,0 +1,38 @@
+--- 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
new file mode 100644
index 000000000..57f49cb17
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
@@ -0,0 +1,18 @@
+
+$FreeBSD: ports/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h,v 1.4 2006/10/14 08:52:28 marcus Exp $
+
+--- 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
new file mode 100644
index 000000000..f4931273f
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp
@@ -0,0 +1,56 @@
+--- 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-gsockgtk.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000..9ad23614f
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,18 @@
+--- src/gtk/gsockgtk.c.orig	2003-09-21 13:31:58.000000000 +0200
++++ src/gtk/gsockgtk.c	2009-09-28 13:38:26.000000000 +0200
+@@ -13,8 +13,15 @@
+ #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
++#define _GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
++#undef _GSocket
+ 
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp
new file mode 100644
index 000000000..1aae1c52f
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..af05f435d
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in
@@ -0,0 +1,54 @@
+--- 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
new file mode 100644
index 000000000..f8e465e4c
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp
@@ -0,0 +1,22 @@
+--- 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-src_generic_dcpsg.cpp b/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp
new file mode 100644
index 000000000..2de14ab24
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp
@@ -0,0 +1,44 @@
+--- src/generic/dcpsg.cpp.orig	Fri Sep 29 19:57:20 2006
++++ src/generic/dcpsg.cpp	Fri Sep 29 19:58:00 2006
+@@ -1146,7 +1146,7 @@
+   FILE *file;
+ };
+ 
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ 			 void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1156,7 +1156,7 @@
+   return 0;
+ }
+ 
+-static int paps_line_to( FT_Vector*  to,
++static int paps_line_to( const FT_Vector*  to,
+ 			 void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1166,8 +1166,8 @@
+   return 0;
+ }
+ 
+-static int paps_conic_to( FT_Vector*  control,
+-			  FT_Vector*  to,
++static int paps_conic_to( const FT_Vector*  control,
++			  const FT_Vector*  to,
+ 			  void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1179,9 +1179,9 @@
+   return 0;
+ }
+ 
+-static int paps_cubic_to( FT_Vector*  control1,
+-			  FT_Vector*  control2,
+-			  FT_Vector*  to,
++static int paps_cubic_to( const FT_Vector*  control1,
++			  const FT_Vector*  control2,
++			  const FT_Vector*  to,
+ 			  void *user_data)
+ {
+   OutlineInfo *outline_info = (OutlineInfo*)user_data;
diff --git a/x11-toolkits/wxgtk24/files/patch-wx-config.in b/x11-toolkits/wxgtk24/files/patch-wx-config.in
new file mode 100644
index 000000000..a7ed9b679
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-wx-config.in
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..67f1f41d3
--- /dev/null
+++ b/x11-toolkits/wxgtk24/pkg-descr
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..3142aab31
--- /dev/null
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -0,0 +1,425 @@
+bin/wxgtk2-2.4-config
+include/wx-2.4/wx/accel.h
+include/wx-2.4/wx/app.h
+include/wx-2.4/wx/arrimpl.cpp
+include/wx-2.4/wx/artprov.h
+include/wx-2.4/wx/bitmap.h
+include/wx-2.4/wx/bmpbuttn.h
+include/wx-2.4/wx/brush.h
+include/wx-2.4/wx/buffer.h
+include/wx-2.4/wx/build.h
+include/wx-2.4/wx/busyinfo.h
+include/wx-2.4/wx/button.h
+include/wx-2.4/wx/calctrl.h
+include/wx-2.4/wx/caret.h
+include/wx-2.4/wx/checkbox.h
+include/wx-2.4/wx/checklst.h
+include/wx-2.4/wx/chkconf.h
+include/wx-2.4/wx/choicdlg.h
+include/wx-2.4/wx/choice.h
+include/wx-2.4/wx/clipbrd.h
+include/wx-2.4/wx/clntdata.h
+include/wx-2.4/wx/cmdline.h
+include/wx-2.4/wx/cmdproc.h
+include/wx-2.4/wx/cmndata.h
+include/wx-2.4/wx/colordlg.h
+include/wx-2.4/wx/colour.h
+include/wx-2.4/wx/combobox.h
+include/wx-2.4/wx/confbase.h
+include/wx-2.4/wx/config.h
+include/wx-2.4/wx/containr.h
+include/wx-2.4/wx/control.h
+include/wx-2.4/wx/cshelp.h
+include/wx-2.4/wx/ctrlsub.h
+include/wx-2.4/wx/cursor.h
+include/wx-2.4/wx/dataobj.h
+include/wx-2.4/wx/date.h
+include/wx-2.4/wx/datetime.h
+include/wx-2.4/wx/datetime.inl
+include/wx-2.4/wx/datstrm.h
+include/wx-2.4/wx/db.h
+include/wx-2.4/wx/dbgrid.h
+include/wx-2.4/wx/dbkeyg.h
+include/wx-2.4/wx/dbtable.h
+include/wx-2.4/wx/dc.h
+include/wx-2.4/wx/dcbuffer.h
+include/wx-2.4/wx/dcclient.h
+include/wx-2.4/wx/dcmemory.h
+include/wx-2.4/wx/dcprint.h
+include/wx-2.4/wx/dcps.h
+include/wx-2.4/wx/dcscreen.h
+include/wx-2.4/wx/dde.h
+include/wx-2.4/wx/debug.h
+include/wx-2.4/wx/defs.h
+include/wx-2.4/wx/dialog.h
+include/wx-2.4/wx/dialup.h
+include/wx-2.4/wx/dir.h
+include/wx-2.4/wx/dirctrl.h
+include/wx-2.4/wx/dirdlg.h
+include/wx-2.4/wx/dnd.h
+include/wx-2.4/wx/docmdi.h
+include/wx-2.4/wx/docview.h
+include/wx-2.4/wx/dragimag.h
+include/wx-2.4/wx/dynarray.h
+include/wx-2.4/wx/dynlib.h
+include/wx-2.4/wx/dynload.h
+include/wx-2.4/wx/effects.h
+include/wx-2.4/wx/encconv.h
+include/wx-2.4/wx/event.h
+include/wx-2.4/wx/expr.h
+include/wx-2.4/wx/fdrepdlg.h
+include/wx-2.4/wx/features.h
+include/wx-2.4/wx/ffile.h
+include/wx-2.4/wx/file.h
+include/wx-2.4/wx/fileconf.h
+include/wx-2.4/wx/filedlg.h
+include/wx-2.4/wx/filefn.h
+include/wx-2.4/wx/filename.h
+include/wx-2.4/wx/filesys.h
+include/wx-2.4/wx/font.h
+include/wx-2.4/wx/fontdlg.h
+include/wx-2.4/wx/fontenc.h
+include/wx-2.4/wx/fontenum.h
+include/wx-2.4/wx/fontmap.h
+include/wx-2.4/wx/fontutil.h
+include/wx-2.4/wx/frame.h
+include/wx-2.4/wx/fs_inet.h
+include/wx-2.4/wx/fs_mem.h
+include/wx-2.4/wx/fs_zip.h
+include/wx-2.4/wx/gauge.h
+include/wx-2.4/wx/gdicmn.h
+include/wx-2.4/wx/gdiobj.h
+include/wx-2.4/wx/generic/accel.h
+include/wx-2.4/wx/generic/calctrl.h
+include/wx-2.4/wx/generic/caret.h
+include/wx-2.4/wx/generic/choicdgg.h
+include/wx-2.4/wx/generic/colrdlgg.h
+include/wx-2.4/wx/generic/dcpsg.h
+include/wx-2.4/wx/generic/dirctrlg.h
+include/wx-2.4/wx/generic/dirdlgg.h
+include/wx-2.4/wx/generic/dragimgg.h
+include/wx-2.4/wx/generic/fdrepdlg.h
+include/wx-2.4/wx/generic/filedlgg.h
+include/wx-2.4/wx/generic/fontdlgg.h
+include/wx-2.4/wx/generic/grid.h
+include/wx-2.4/wx/generic/gridctrl.h
+include/wx-2.4/wx/generic/gridg.h
+include/wx-2.4/wx/generic/helpext.h
+include/wx-2.4/wx/generic/helphtml.h
+include/wx-2.4/wx/generic/imaglist.h
+include/wx-2.4/wx/generic/laywin.h
+include/wx-2.4/wx/generic/listctrl.h
+include/wx-2.4/wx/generic/msgdlgg.h
+include/wx-2.4/wx/generic/notebook.h
+include/wx-2.4/wx/generic/paletteg.h
+include/wx-2.4/wx/generic/panelg.h
+include/wx-2.4/wx/generic/printps.h
+include/wx-2.4/wx/generic/prntdlgg.h
+include/wx-2.4/wx/generic/progdlgg.h
+include/wx-2.4/wx/generic/sashwin.h
+include/wx-2.4/wx/generic/scrolwin.h
+include/wx-2.4/wx/generic/spinctlg.h
+include/wx-2.4/wx/generic/splash.h
+include/wx-2.4/wx/generic/splitter.h
+include/wx-2.4/wx/generic/statusbr.h
+include/wx-2.4/wx/generic/tabg.h
+include/wx-2.4/wx/generic/textdlgg.h
+include/wx-2.4/wx/generic/timer.h
+include/wx-2.4/wx/generic/treectlg.h
+include/wx-2.4/wx/generic/wizard.h
+include/wx-2.4/wx/geometry.h
+include/wx-2.4/wx/gifdecod.h
+include/wx-2.4/wx/glcanvas.h
+include/wx-2.4/wx/grid.h
+include/wx-2.4/wx/gsocket.h
+include/wx-2.4/wx/gtk/accel.h
+include/wx-2.4/wx/gtk/app.h
+include/wx-2.4/wx/gtk/bitmap.h
+include/wx-2.4/wx/gtk/bmpbuttn.h
+include/wx-2.4/wx/gtk/brush.h
+include/wx-2.4/wx/gtk/button.h
+include/wx-2.4/wx/gtk/checkbox.h
+include/wx-2.4/wx/gtk/checklst.h
+include/wx-2.4/wx/gtk/choice.h
+include/wx-2.4/wx/gtk/clipbrd.h
+include/wx-2.4/wx/gtk/colour.h
+include/wx-2.4/wx/gtk/combobox.h
+include/wx-2.4/wx/gtk/control.h
+include/wx-2.4/wx/gtk/cursor.h
+include/wx-2.4/wx/gtk/dataform.h
+include/wx-2.4/wx/gtk/dataobj.h
+include/wx-2.4/wx/gtk/dataobj2.h
+include/wx-2.4/wx/gtk/dc.h
+include/wx-2.4/wx/gtk/dcclient.h
+include/wx-2.4/wx/gtk/dcmemory.h
+include/wx-2.4/wx/gtk/dcscreen.h
+include/wx-2.4/wx/gtk/dialog.h
+include/wx-2.4/wx/gtk/dnd.h
+include/wx-2.4/wx/gtk/filedlg.h
+include/wx-2.4/wx/gtk/font.h
+include/wx-2.4/wx/gtk/fontdlg.h
+include/wx-2.4/wx/gtk/frame.h
+include/wx-2.4/wx/gtk/gauge.h
+include/wx-2.4/wx/gtk/gdiobj.h
+include/wx-2.4/wx/gtk/glcanvas.h
+include/wx-2.4/wx/gtk/icon.h
+include/wx-2.4/wx/gtk/joystick.h
+include/wx-2.4/wx/gtk/listbox.h
+include/wx-2.4/wx/gtk/mdi.h
+include/wx-2.4/wx/gtk/menu.h
+include/wx-2.4/wx/gtk/menuitem.h
+include/wx-2.4/wx/gtk/minifram.h
+include/wx-2.4/wx/gtk/notebook.h
+include/wx-2.4/wx/gtk/pen.h
+include/wx-2.4/wx/gtk/popupwin.h
+include/wx-2.4/wx/gtk/radiobox.h
+include/wx-2.4/wx/gtk/radiobut.h
+include/wx-2.4/wx/gtk/region.h
+include/wx-2.4/wx/gtk/scrolbar.h
+include/wx-2.4/wx/gtk/scrolwin.h
+include/wx-2.4/wx/gtk/slider.h
+include/wx-2.4/wx/gtk/spinbutt.h
+include/wx-2.4/wx/gtk/spinctrl.h
+include/wx-2.4/wx/gtk/statbmp.h
+include/wx-2.4/wx/gtk/statbox.h
+include/wx-2.4/wx/gtk/statline.h
+include/wx-2.4/wx/gtk/stattext.h
+include/wx-2.4/wx/gtk/tbargtk.h
+include/wx-2.4/wx/gtk/textctrl.h
+include/wx-2.4/wx/gtk/tglbtn.h
+include/wx-2.4/wx/gtk/timer.h
+include/wx-2.4/wx/gtk/tooltip.h
+include/wx-2.4/wx/gtk/toplevel.h
+include/wx-2.4/wx/gtk/treectrl.h
+include/wx-2.4/wx/gtk/wave.h
+include/wx-2.4/wx/gtk/win_gtk.h
+include/wx-2.4/wx/gtk/window.h
+include/wx-2.4/wx/hash.h
+include/wx-2.4/wx/hashmap.h
+include/wx-2.4/wx/help.h
+include/wx-2.4/wx/helpbase.h
+include/wx-2.4/wx/helphtml.h
+include/wx-2.4/wx/helpwin.h
+include/wx-2.4/wx/html/forcelnk.h
+include/wx-2.4/wx/html/helpctrl.h
+include/wx-2.4/wx/html/helpdata.h
+include/wx-2.4/wx/html/helpfrm.h
+include/wx-2.4/wx/html/htmlcell.h
+include/wx-2.4/wx/html/htmldefs.h
+include/wx-2.4/wx/html/htmlfilt.h
+include/wx-2.4/wx/html/htmlpars.h
+include/wx-2.4/wx/html/htmltag.h
+include/wx-2.4/wx/html/htmlwin.h
+include/wx-2.4/wx/html/htmprint.h
+include/wx-2.4/wx/html/m_templ.h
+include/wx-2.4/wx/html/winpars.h
+include/wx-2.4/wx/icon.h
+include/wx-2.4/wx/iconbndl.h
+include/wx-2.4/wx/imagbmp.h
+include/wx-2.4/wx/image.h
+include/wx-2.4/wx/imaggif.h
+include/wx-2.4/wx/imagiff.h
+include/wx-2.4/wx/imagjpeg.h
+include/wx-2.4/wx/imaglist.h
+include/wx-2.4/wx/imagpcx.h
+include/wx-2.4/wx/imagpng.h
+include/wx-2.4/wx/imagpnm.h
+include/wx-2.4/wx/imagtiff.h
+include/wx-2.4/wx/imagxpm.h
+include/wx-2.4/wx/intl.h
+include/wx-2.4/wx/ioswrap.h
+include/wx-2.4/wx/ipc.h
+include/wx-2.4/wx/ipcbase.h
+include/wx-2.4/wx/isql.h
+include/wx-2.4/wx/isqlext.h
+include/wx-2.4/wx/joystick.h
+include/wx-2.4/wx/layout.h
+include/wx-2.4/wx/laywin.h
+include/wx-2.4/wx/list.h
+include/wx-2.4/wx/listbase.h
+include/wx-2.4/wx/listbox.h
+include/wx-2.4/wx/listctrl.h
+include/wx-2.4/wx/listimpl.cpp
+include/wx-2.4/wx/log.h
+include/wx-2.4/wx/longlong.h
+include/wx-2.4/wx/matrix.h
+include/wx-2.4/wx/mdi.h
+include/wx-2.4/wx/memconf.h
+include/wx-2.4/wx/memory.h
+include/wx-2.4/wx/memtext.h
+include/wx-2.4/wx/menu.h
+include/wx-2.4/wx/menuitem.h
+include/wx-2.4/wx/metafile.h
+include/wx-2.4/wx/mimetype.h
+include/wx-2.4/wx/minifram.h
+include/wx-2.4/wx/module.h
+include/wx-2.4/wx/msgdlg.h
+include/wx-2.4/wx/msgout.h
+include/wx-2.4/wx/mstream.h
+include/wx-2.4/wx/notebook.h
+include/wx-2.4/wx/object.h
+include/wx-2.4/wx/odbc.h
+include/wx-2.4/wx/ownerdrw.h
+include/wx-2.4/wx/palette.h
+include/wx-2.4/wx/panel.h
+include/wx-2.4/wx/paper.h
+include/wx-2.4/wx/pen.h
+include/wx-2.4/wx/platform.h
+include/wx-2.4/wx/popupwin.h
+include/wx-2.4/wx/print.h
+include/wx-2.4/wx/printdlg.h
+include/wx-2.4/wx/prntbase.h
+include/wx-2.4/wx/process.h
+include/wx-2.4/wx/progdlg.h
+include/wx-2.4/wx/prop.h
+include/wx-2.4/wx/propform.h
+include/wx-2.4/wx/proplist.h
+include/wx-2.4/wx/protocol/file.h
+include/wx-2.4/wx/protocol/ftp.h
+include/wx-2.4/wx/protocol/http.h
+include/wx-2.4/wx/protocol/protocol.h
+include/wx-2.4/wx/quantize.h
+include/wx-2.4/wx/radiobox.h
+include/wx-2.4/wx/radiobut.h
+include/wx-2.4/wx/regex.h
+include/wx-2.4/wx/region.h
+include/wx-2.4/wx/resource.h
+include/wx-2.4/wx/sashwin.h
+include/wx-2.4/wx/sckaddr.h
+include/wx-2.4/wx/sckipc.h
+include/wx-2.4/wx/sckstrm.h
+include/wx-2.4/wx/scrolbar.h
+include/wx-2.4/wx/scrolwin.h
+include/wx-2.4/wx/settings.h
+include/wx-2.4/wx/sizer.h
+include/wx-2.4/wx/slider.h
+include/wx-2.4/wx/snglinst.h
+include/wx-2.4/wx/socket.h
+include/wx-2.4/wx/spinbutt.h
+include/wx-2.4/wx/spinctrl.h
+include/wx-2.4/wx/splash.h
+include/wx-2.4/wx/splitter.h
+include/wx-2.4/wx/stack.h
+include/wx-2.4/wx/statbmp.h
+include/wx-2.4/wx/statbox.h
+include/wx-2.4/wx/statline.h
+include/wx-2.4/wx/stattext.h
+include/wx-2.4/wx/statusbr.h
+include/wx-2.4/wx/strconv.h
+include/wx-2.4/wx/stream.h
+include/wx-2.4/wx/string.h
+include/wx-2.4/wx/sysopt.h
+include/wx-2.4/wx/tab.h
+include/wx-2.4/wx/tabctrl.h
+include/wx-2.4/wx/taskbar.h
+include/wx-2.4/wx/tbarbase.h
+include/wx-2.4/wx/tbarsmpl.h
+include/wx-2.4/wx/textbuf.h
+include/wx-2.4/wx/textctrl.h
+include/wx-2.4/wx/textdlg.h
+include/wx-2.4/wx/textfile.h
+include/wx-2.4/wx/tglbtn.h
+include/wx-2.4/wx/thread.h
+include/wx-2.4/wx/thrimpl.cpp
+include/wx-2.4/wx/time.h
+include/wx-2.4/wx/timer.h
+include/wx-2.4/wx/tipdlg.h
+include/wx-2.4/wx/tipwin.h
+include/wx-2.4/wx/tokenzr.h
+include/wx-2.4/wx/toolbar.h
+include/wx-2.4/wx/tooltip.h
+include/wx-2.4/wx/toplevel.h
+include/wx-2.4/wx/treebase.h
+include/wx-2.4/wx/treectrl.h
+include/wx-2.4/wx/txtstrm.h
+include/wx-2.4/wx/types.h
+include/wx-2.4/wx/unix/execute.h
+include/wx-2.4/wx/unix/fontutil.h
+include/wx-2.4/wx/unix/gsockunx.h
+include/wx-2.4/wx/unix/mimetype.h
+include/wx-2.4/wx/unix/utilsx11.h
+include/wx-2.4/wx/url.h
+include/wx-2.4/wx/utils.h
+include/wx-2.4/wx/valgen.h
+include/wx-2.4/wx/validate.h
+include/wx-2.4/wx/valtext.h
+include/wx-2.4/wx/variant.h
+include/wx-2.4/wx/vector.h
+include/wx-2.4/wx/version.h
+include/wx-2.4/wx/volume.h
+include/wx-2.4/wx/wave.h
+include/wx-2.4/wx/wfstream.h
+include/wx-2.4/wx/window.h
+include/wx-2.4/wx/wizard.h
+include/wx-2.4/wx/wx.h
+include/wx-2.4/wx/wx_cw.h
+include/wx-2.4/wx/wx_cw_cm.h
+include/wx-2.4/wx/wx_cw_d.h
+include/wx-2.4/wx/wxchar.h
+include/wx-2.4/wx/wxexpr.h
+include/wx-2.4/wx/wxhtml.h
+include/wx-2.4/wx/wxprec.h
+include/wx-2.4/wx/xpmdecod.h
+include/wx-2.4/wx/zipstrm.h
+include/wx-2.4/wx/zstream.h
+include/wx/gtk2-2.4/wx/setup.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/gtk2-2.4/wx
+@dirrm include/wx/gtk2-2.4
+@dirrm include/wx-2.4/wx/unix
+@dirrm include/wx-2.4/wx/protocol
+@dirrm include/wx-2.4/wx/html
+@dirrm include/wx-2.4/wx/gtk
+@dirrm include/wx-2.4/wx/generic
+@dirrm include/wx-2.4/wx
+@dirrm include/wx-2.4
+@dirrm include/wx