Update to 2.3.2.

Submitted by:	tg (mostly)

10 files changed, 230 insertions, 171 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index e4d692045300..3bacc7c93bb6 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
-MASTER_SITE_SUBDIR=	wxpython
+MASTER_SITE_SUBDIR=	wxwindows
 DISTNAME=	wxGTK-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		giconv.2:${PORTSDIR}/converters/libiconv
 
 NO_LATEST_LINK=	"Unstable, development version."
 
@@ -34,7 +35,7 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
 			  -I${LOCALBASE}/include \
 			  -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib \
+		LDFLAGS="-L${LOCALBASE}/lib -lgiconv \
 			 -L${X11BASE}/lib" \
 		GTK_CONFIG_2_0="no"
 
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 1faaa0c02d77..630d423090e3 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.3.1.tar.gz) = 4f442ef443e6c4914148de6a01dcafe4
+MD5 (wxGTK-2.3.2.tar.gz) = b85e06fcd149dd74fae0762a5130d8ec
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index e4156f619bad..7907a232b39a 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -1,46 +1,39 @@
 
 $FreeBSD$
 
---- configure.in.orig	Tue May 22 17:27:55 2001
-+++ configure.in	Mon May 28 17:26:14 2001
-@@ -1968,16 +1968,12 @@
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+--- configure.in.orig	Mon Dec 10 20:07:00 2001
++++ configure.in	Sat Jan 19 14:34:28 2002
+@@ -2393,8 +2393,8 @@
+     lib_debug_suffix=d
+ fi
+ 
+-TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
++TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
++TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl"
+ 
+ if test "$cross_compiling" = "yes"; then
+     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
+@@ -2406,14 +2406,12 @@
+ WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
  
  dnl the name of the shared library
--WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2"
  
  dnl the name of the links to the shared library
--WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
--WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
-+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
+-WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+-WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
  
- dnl shared library settings
- SHARED_LD=
-@@ -2074,8 +2070,13 @@
-       *-*-freebsd* | *-*-openbsd* | *-*-netbsd*)
-         SHARED_LD="${CC} -shared -o"
-         PIC_FLAG="-fPIC"
--        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
--        WX_ALL="CREATE_LINKS"
-+	if test "$wxUSE_OPENGL" = "yes"; then
-+	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-+	    WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-+	else
-+	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-+	    WX_ALL="CREATE_LINKS"
-+	fi
-       ;;
-       *-*-osf* )
-         SHARED_LD="${CXX} -shared -o"
-@@ -2749,24 +2750,6 @@
+ dnl the name of the resources file for wxMac
+ WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
+@@ -3522,24 +3520,6 @@
      fi
  fi
  
@@ -62,24 +55,22 @@ $FreeBSD$
 -    fi
 -fi
 -
- dnl ---------------------------------------------------------------------------
- dnl Optional libraries
- dnl ---------------------------------------------------------------------------
-@@ -3808,8 +3791,6 @@
- AC_SUBST(WX_LIBRARY)
+ if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+     AC_DEFINE(WXWIN_COMPATIBILITY_2)
+ 
+@@ -4792,7 +4772,6 @@
+ AC_SUBST(WX_LIBRARY_IMPORTLIB)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
 -AC_SUBST(WX_LIBRARY_LINK2)
--AC_SUBST(WX_LIBRARY_LINK3)
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3819,8 +3800,6 @@
- AC_SUBST(WX_LIBRARY_GL)
+@@ -4800,7 +4779,6 @@
+ AC_SUBST(WX_LIBRARY_NAME_SHARED_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
 -AC_SUBST(WX_LIBRARY_LINK2_GL)
--AC_SUBST(WX_LIBRARY_LINK3_GL)
  
  dnl are we supposed to create the links?
  AC_SUBST(WX_ALL)
diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac
index e9cf29bb3964..b1d381546c6b 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-ac
+++ b/x11-toolkits/wxgtk-devel/files/patch-ac
@@ -1,80 +1,89 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Fri May 25 05:55:33 2001
-+++ Makefile.in	Mon May 28 19:47:06 2001
-@@ -379,39 +379,23 @@
+--- Makefile.in.orig	Mon Dec 10 20:07:01 2001
++++ Makefile.in	Sat Jan 19 16:58:06 2002
+@@ -340,17 +340,13 @@
  
- CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
- 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
--	@$(RM) ./lib/@WX_LIBRARY_LINK2@
--	@$(RM) ./lib/@WX_LIBRARY_LINK3@
- 	cd lib \
+ $(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_LINK3@
+-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
 +		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
  
- CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
- 	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
--	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
--	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
- 	cd lib \
+ $(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_LINK3_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
+ 
+@@ -380,26 +376,21 @@
+ 
  CREATE_INSTALLED_LINKS: preinstall
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
  	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_LINK3@
+-		&& $(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@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK3_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_LINK3_GL@
+-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
  
- $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
- 
-@@ -461,11 +445,11 @@
- 	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
- 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+ 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
+@@ -422,12 +413,10 @@
+ 	@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/wx
--	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
--	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
-+#	$(INSTALL) -d $(libdir)/wx
-+#	$(INSTALL) -d $(libdir)/wx/include
+-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
+-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
 +	$(INSTALL) -d $(prefix)/include/wx
-+	$(INSTALL) -d $(prefix)/include/wx/@TOOLKIT_NAME@
-+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(prefix)/include/wx/@TOOLKIT_NAME@/setup.h
++	$(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@
+ 	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
+-                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
++                    $(prefix)/include/wx/setup.h
  
  	$(INSTALL) -d $(includedir)/wx
- 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
-@@ -513,13 +497,9 @@
+ 	@# FIXME: This will erroneously install a wx/base dir for wxBase..
+@@ -485,13 +474,11 @@
  	@echo " Removing library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
--	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
  	@echo " Removing GL library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
--	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
  	@echo " Removing helper files..."
- 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+-	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
++	@$(RM) $(prefix)/include/wx/@TOOLCHAIN_NAME@/setup.h
  	@$(RM) $(bindir)/wx-config
+ 	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
+ 	@$(RM) $(datadir)/wx/afm/*
diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index eb1343aead3e..6c8ac364caa6 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Nov 27 13:14:10 2001
-+++ configure	Tue Nov 27 13:18:58 2001
-@@ -7657,10 +7657,10 @@
+--- configure.orig	Thu Jan 31 12:17:48 2002
++++ configure	Thu Jan 31 13:45:16 2002
+@@ -10036,10 +10036,10 @@
    else
       echo "$ac_t""no" 1>&6
       if test "$GTK_CONFIG_2_0" = "no" ; then
@@ -18,14 +18,14 @@ $FreeBSD$
       else
         if test -f conf.gtktest ; then
          :
-@@ -7992,14 +7992,14 @@
-     TOOLKIT=GTK
-     GUIDIST=GTK_DIST
+@@ -10397,16 +10397,16 @@
+         TOOLKIT=GTK
+         GUIDIST=GTK_DIST
  
--        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:7997: checking for gdk_im_open in -lgdk" >&5
-+        echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:7997: checking for gdk_im_open in -lgdk12" >&5
+-                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+-echo "configure:10402: checking for gdk_im_open in -lgdk" >&5
++                echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
++echo "configure:10413: checking for gdk_im_open in -lgdk12" >&5
  ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -34,31 +34,59 @@ $FreeBSD$
 -LIBS="-lgdk  $LIBS"
 +LIBS="-lgdk12  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8005 "configure"
+-#line 10410 "configure"
++#line 10421 "configure"
  #include "confdefs.h"
-@@ -9258,16 +9258,12 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11862,8 +11862,8 @@
+     lib_debug_suffix=d
+ fi
  
--WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--
--WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
--WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
-+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
+-TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
++TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
++TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl"
+ 
+ if test "$cross_compiling" = "yes"; then
+     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
+@@ -11873,13 +11873,11 @@
+ WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
+ WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+ 
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2"
+ 
+-WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+-WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+ 
+ WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
+ WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
+@@ -12478,7 +12476,7 @@
+ fi
+ done
  
-+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
-+       
- SHARED_LD=
- PIC_FLAG=
- WX_ALL=
-@@ -13135,6 +13131,7 @@
+-for ac_hdr in iconv.h
++for ac_hdr in giconv.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -14244,7 +14242,7 @@
+     cat > conftest.$ac_ext <<EOF
+ #line 14246 "configure"
+ #include "confdefs.h"
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+ 
+         char **inbuf, **outbuf;
+@@ -16167,6 +16165,7 @@
    fi
  fi
  
@@ -66,10 +94,11 @@ $FreeBSD$
  if test "$WXGTK20" = 1 ; then
    cat >> confdefs.h <<EOF
  #define __WXGTK20__ $WXGTK20
-@@ -13305,24 +13302,6 @@
+@@ -16256,24 +16255,6 @@
+     fi
  fi
  
- 
+-
 -CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 -CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
 -if test "$wxUSE_OPTIMISE" = "no" ; then
@@ -87,33 +116,20 @@ $FreeBSD$
 -    fi
 -fi
 -
--
- ZLIB_INCLUDE=
- if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
-   cat >> confdefs.h <<\EOF
-@@ -13526,6 +13505,7 @@
-   cat > conftest.$ac_ext <<EOF
- #line 13528 "configure"
- #include "confdefs.h"
-+#undef HAVE_STDLIB_H
- #include <jpeglib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-@@ -16156,8 +16136,6 @@
- s%@WX_LIBRARY@%$WX_LIBRARY%g
+ if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+     cat >> confdefs.h <<\EOF
+ #define WXWIN_COMPATIBILITY_2 1
+@@ -18935,13 +18916,11 @@
+ s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
  s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
  s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
 -s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g
--s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g
  s%@PROGRAM_EXT@%$PROGRAM_EXT%g
- s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
  s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
-@@ -16165,8 +16143,6 @@
- s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
+ s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g
  s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
  s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
 -s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g
--s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g
  s%@WX_ALL@%$WX_ALL%g
  s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
  s%@SHARED_LD@%$SHARED_LD%g
diff --git a/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
index b9a5d54bfff3..8baf181b9029 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
+++ b/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
@@ -1,23 +1,10 @@
 
 $FreeBSD$
 
---- include/wx/wxchar.h.orig	Thu Jul  5 06:24:14 2001
-+++ include/wx/wxchar.h	Tue Nov 27 13:13:28 2001
-@@ -288,12 +288,7 @@
- #    ifdef HAVE_WCSTR_H
- #      include <wcstr.h>
- #    else
--#      if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
--#        include <stdlib.h>
--#        define wxNEED_WCSLEN
--#      else
- #        include <wchar.h>
--#      endif
- #    endif
- #  endif
- 
-@@ -523,11 +518,11 @@
- #endif
+--- include/wx/wxchar.h.orig	Mon Dec 10 20:07:02 2001
++++ include/wx/wxchar.h	Sat Jan 19 12:14:57 2002
+@@ -532,11 +532,11 @@
+ #endif //!Unicode
  
  // checks whether the passed in pointer is NULL and if the string is empty
 -inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
diff --git a/x11-toolkits/wxgtk-devel/files/patch-setup.h.in b/x11-toolkits/wxgtk-devel/files/patch-setup.h.in
new file mode 100644
index 000000000000..c1d1ae20362d
--- /dev/null
+++ b/x11-toolkits/wxgtk-devel/files/patch-setup.h.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- setup.h.in	2002/01/31 11:53:03	1.1
++++ setup.h.in	2002/01/31 11:55:49
+@@ -1030,8 +1030,12 @@
+ /* Define if you have the <wctype.h> header file.  */
+ #undef HAVE_WCTYPE_H
+ 
+-/* Define if you have the <iconv.h> header file.  */
+-#undef HAVE_ICONV_H
++/* Define if you have the <giconv.h> header file.  */
++#undef HAVE_GICONV_H
++
++#ifdef HAVE_GICONV_H
++  #define HAVE_ICONV_H
++#endif
+ 
+ /* Test for GLIBC 2.2 iconv() */
+ #undef WX_ICONV_TAKES_CHAR
diff --git a/x11-toolkits/wxgtk-devel/files/patch-src::common::strconv.cpp b/x11-toolkits/wxgtk-devel/files/patch-src::common::strconv.cpp
new file mode 100644
index 000000000000..0f2fc0c9c8dd
--- /dev/null
+++ b/x11-toolkits/wxgtk-devel/files/patch-src::common::strconv.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/common/strconv.cpp	2002/01/31 11:51:35	1.1
++++ src/common/strconv.cpp	2002/01/31 11:51:48
+@@ -61,7 +61,7 @@
+ #endif
+ 
+ #ifdef HAVE_ICONV_H
+-  #include <iconv.h>
++  #include <giconv.h>
+ #endif
+ 
+ #ifdef __WXMSW__
diff --git a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
index 89574988948a..fa2ce1da9e63 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- wx-config.in	2001/05/28 16:47:21	1.1
-+++ wx-config.in	2001/05/28 16:50:00
-@@ -31,7 +31,7 @@
-             includes=-I@includedir@
-         fi
+--- wx-config.in.orig	Mon Dec 10 20:07:01 2001
++++ wx-config.in	Sat Jan 19 12:19:14 2002
+@@ -37,7 +37,7 @@
+         includes=-I@includedir@
      fi
--    includes="$includes -I@libdir@/wx/include -D__USE_WXCONFIG__"
-+    includes="$includes -I@prefix@/include -D__USE_WXCONFIG__"
-     echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
- }
  
+-    includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
++    includes="-I@prefix@/include $includes"
+ 
+     if test $static_flag = yes ; then
+         echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist
index 7845c1aa5913..dbf6f0321a6e 100644
--- a/x11-toolkits/wxgtk-devel/pkg-plist
+++ b/x11-toolkits/wxgtk-devel/pkg-plist
@@ -13,16 +13,20 @@ 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
@@ -33,6 +37,8 @@ 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/dcclient.h
@@ -56,6 +62,7 @@ include/wx/dynlib.h
 include/wx/encconv.h
 include/wx/event.h
 include/wx/expr.h
+include/wx/fdrepdlg.h
 include/wx/ffile.h
 include/wx/file.h
 include/wx/fileconf.h
@@ -76,6 +83,7 @@ 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
@@ -84,6 +92,7 @@ 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
@@ -92,7 +101,6 @@ include/wx/generic/gridg.h
 include/wx/generic/helpext.h
 include/wx/generic/helphtml.h
 include/wx/generic/helpwxht.h
-include/wx/generic/helpxlp.h
 include/wx/generic/imaglist.h
 include/wx/generic/laywin.h
 include/wx/generic/listctrl.h
@@ -105,6 +113,7 @@ 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
@@ -156,13 +165,13 @@ 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/settings.h
-include/wx/gtk/setup.h
 include/wx/gtk/slider.h
 include/wx/gtk/spinbutt.h
 include/wx/gtk/spinctrl.h
@@ -175,6 +184,7 @@ 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
@@ -184,7 +194,6 @@ include/wx/help.h
 include/wx/helpbase.h
 include/wx/helphtml.h
 include/wx/helpwin.h
-include/wx/helpxlp.h
 include/wx/html/forcelnk.h
 include/wx/html/helpctrl.h
 include/wx/html/helpdata.h
@@ -227,6 +236,7 @@ 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
@@ -244,6 +254,8 @@ 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
@@ -258,6 +270,7 @@ include/wx/protocol/http.h
 include/wx/protocol/protocol.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
@@ -277,6 +290,7 @@ 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
@@ -285,11 +299,13 @@ 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
@@ -302,6 +318,7 @@ 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
@@ -316,6 +333,7 @@ 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/wave.h
 include/wx/wfstream.h
@@ -336,15 +354,18 @@ lib/libwx_gtk.so
 lib/libwx_gtk.so.2
 lib/libwx_gtk_gl.so
 lib/libwx_gtk_gl.so.2
+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/it/LC_MESSAGES/wxstd.mo
 share/locale/nl/LC_MESSAGES/wxstd.mo
 share/locale/ru/LC_MESSAGES/wxstd.mo
 share/locale/sv/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