Update to 2.4.2.

author: fjoe <fjoe@FreeBSD.org> 2003-11-09 19:23:40 +0000
committer: fjoe <fjoe@FreeBSD.org> 2003-11-09 19:23:40 +0000
commit: bccff2b3aa3fe627b36f02b3c90a3e79397c1404 (patch)
tree: 2a916623c315c30aa34cc8f494d3473a17b90f0f /x11-toolkits/wxgtk
parent: 2a0481246db1b6b90ffe5e7eb7fc1398c54b8d62 (diff)
download: FreeBSD-ports-bccff2b3aa3fe627b36f02b3c90a3e79397c1404.zip
FreeBSD-ports-bccff2b3aa3fe627b36f02b3c90a3e79397c1404.tar.gz
19 files changed, 467 insertions, 615 deletions
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 0cc28e7..b176a9a 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -5,49 +5,95 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wxgtk
-PORTVERSION=	2.2.9
-PORTEPOCH=	1
+PORTNAME=	wx
+PORTVERSION=	2.4.2
+PORTREVISION?=	0
+PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 MASTER_SITE_SUBDIR=	wxwindows
 DISTNAME=	wxGTK-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The wxWindows GUI toolkit with GTK+ bindings
+MAINTAINER?=	fjoe@FreeBSD.org
+COMMENT?=	The wxWindows GUI toolkit with GTK+ bindings
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
 		--with-libtiff=sys \
 		--with-zlib=sys \
-		--with-opengl \
-		--host=${CONFIGURE_TARGET} \
-		--build=${CONFIGURE_TARGET}
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
-			  -I${WRKSRC}/include \
+		--with-opengl
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
 			  -I${LOCALBASE}/include \
-			  -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib \
-			 -L${X11BASE}/lib -lm"
+			  -I${X11BASE}/include \
+			  ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv \
+			 -L${X11BASE}/lib \
+			 ${PTHREAD_LIBS}"
+MAKE_ENV=	WXGTK_FLAVOR="${WXGTK_FLAVOR}"
+PLIST=		${.CURDIR}/pkg-plist
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-l[$$]THREADS_LIB|${PTHREAD_LIBS}|g ; \
-			 s|-l[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \
-				${WRKSRC}/configure
+WXGTK_FLAVOR?=	gtk
+
+.if ${WXGTK_FLAVOR} != "gtk-common"
+RUN_DEPENDS=	${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common
+.endif
+
+.if ${WXGTK_FLAVOR:M*-common} != ""
+NO_BUILD=	yes
+INSTALL_TARGET=	install-common
+.endif # *-common
+
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
+BUILD_WRKSRC=	${WRKSRC}/contrib/src
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+.if ${WXGTK_FLAVOR} != "gtk-contrib-common"
+RUN_DEPENDS=	${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk-contrib-common
+.if ${WXGTK_FLAVOR} == "gtk-contrib"
+LIB_DEPENDS+=	wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk-devel
+.elif ${WXGTK_FLAVOR} == "gtk2-contrib"
+LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+.elif ${WXGTK_FLAVOR} == "gtk2-unicode-contrib"
+LIB_DEPENDS+=	wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode
+.endif
+.endif # !gtk-contrib-common
+.endif # *-contrib*
 
-post-install:
-	@${RM} -rf ${PREFIX}/include/wx/motif
-	@${RM} -rf ${PREFIX}/include/wx/msw
+.include <bsd.port.pre.mk>
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+.if ${OSVERSION} < 500000
+BROKEN=		Systems prior to FreeBSD 5.0 currently out of support
+.else
+CONFIGURE_ARGS+=--enable-unicode
+.endif
+.endif # *-unicode*
+
+.if ${WXGTK_FLAVOR:Mgtk2*} != ""
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
+.else
+USE_GNOME=	gtk12
+CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET}
+.endif
+
+pre-patch:
+.if ${WXGTK_FLAVOR:Mgtk2*} != ""
+	@${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure
+.else
+	@${REINPLACE_CMD} -e 's|lgdk|lgdk12|g' ${WRKSRC}/configure
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo
index a934a39..d33ca38 100644
--- a/x11-toolkits/wxgtk/distinfo
+++ b/x11-toolkits/wxgtk/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.2.9.tar.bz2) = f9bf738050fca93e33a65081b1c55905
+MD5 (wxGTK-2.4.2.tar.bz2) = cdadfe82fc93f8a65a2ae18a95b0b0e3
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
deleted file mode 100644
index e2a9492..0000000
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ /dev/null
@@ -1,65 +0,0 @@
-
-$FreeBSD$
-
---- configure.in.orig	Fri Jan  4 17:47:57 2002
-+++ configure.in	Mon Sep  9 13:59:17 2002
-@@ -2206,14 +2206,12 @@
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
- 
- dnl the name of the shared library
--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.2"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
- 
- dnl the name of the links to the shared library
--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"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
- 
- 
- dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
-@@ -2994,24 +3000,6 @@
-     fi
- fi
- 
--
--CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
--CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
--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
--
- dnl ---------------------------------------------------------------------------
- dnl the library may be built without GUI classes at all
- dnl ---------------------------------------------------------------------------
-@@ -3960,7 +3948,6 @@
- AC_SUBST(WX_LIBRARY_NAME_SHARED)
- AC_SUBST(WX_TARGET_LIBRARY)
- AC_SUBST(WX_LIBRARY_LINK1)
--AC_SUBST(WX_LIBRARY_LINK2)
- AC_SUBST(PROGRAM_EXT)
- 
- dnl global gl options
-@@ -3968,7 +3955,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)
- 
- dnl are we supposed to create the links?
- AC_SUBST(WX_ALL)
diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac
index 2991131..9513e8f 100644
--- a/x11-toolkits/wxgtk/files/patch-ac
+++ b/x11-toolkits/wxgtk/files/patch-ac
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Fri Jan  4 17:47:57 2002
-+++ Makefile.in	Mon Sep  9 15:55:57 2002
-@@ -342,17 +342,13 @@
+--- Makefile.in.orig	Sun Sep 21 18:31:27 2003
++++ Makefile.in	Tue Nov  4 22:33:54 2003
+@@ -332,17 +332,13 @@
  
  $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
  	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
@@ -21,9 +18,9 @@ $FreeBSD$
 -		&& $(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
+ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -382,17 +378,13 @@
+@@ -371,28 +367,23 @@
  
  CREATE_INSTALLED_LINKS: preinstall
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
@@ -41,49 +38,87 @@ $FreeBSD$
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
  
- afminstall: preinstall
- 	$(INSTALL) -d $(datadir)
-@@ -404,7 +396,7 @@
+-afminstall: preinstall
++afminstall:
+ 	@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
++m4datainstall:
+ 	$(INSTALL) -d $(datadir)/aclocal
+ 	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
+ 
+@@ -410,7 +401,7 @@
  
  # this is the real install target: copies the library, wx-config and the
  # headers to the installation directory
--preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
-+preinstall:
+-preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
++install-common: @AFMINSTALL@ m4datainstall @WIN32INSTALL@
  	@echo " "
  	@echo " Installing wxWindows..."
  	@echo " "
-@@ -421,11 +413,8 @@
- 	@# import livraru name
- 	@if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi
+@@ -419,26 +410,11 @@
+ 	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
+ 	@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_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
-+	$(INSTALL) -d $(prefix)/include/wx
-+	$(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(prefix)/include/wx/setup.h
- 
+-	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
+-                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+-
  	$(INSTALL) -d $(includedir)/wx
  	@# FIXME: This will erroneously install a wx/base dir for wxBase..
-@@ -449,7 +438,7 @@
+ 	@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
+@@ -459,6 +435,19 @@
  	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
  	done
  
--preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
-+preinstall_gl:
++preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
++	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
++	@if test "$(WXGTK_FLAVOR)" = "gtk"; then \
++		cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \
++	fi
++	@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 $(prefix)/include/wx/@TOOLCHAIN_NAME@
++	$(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx
++	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
++		    $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h
++
+ preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@
  	@echo " "
- 	@echo " Installing wxWindows OpenGl add-on..."
+ 	@echo " Installing wxWindows Mac resource ..."
+@@ -474,7 +463,7 @@
+ 	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+ 	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+ 
+-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
++install: @WX_ALL_INSTALLED@
  	@echo " "
-@@ -476,11 +465,9 @@
- 	@echo " Removing library..."
- 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
- 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
--	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
- 	@echo " Removing GL library..."
- 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
- 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
--	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
- 	@echo " Removing helper files..."
- 	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
- 	@$(RM) $(bindir)/wx-config
+ 	@echo " The installation of wxWindows is finished.  On certain"
+ 	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
diff --git a/x11-toolkits/wxgtk/files/patch-configure b/x11-toolkits/wxgtk/files/patch-configure
index 9f94e41..2236f9e 100644
--- a/x11-toolkits/wxgtk/files/patch-configure
+++ b/x11-toolkits/wxgtk/files/patch-configure
@@ -1,50 +1,60 @@
-
-$FreeBSD$
-
---- configure.orig	Mon Sep  9 14:00:36 2002
-+++ configure	Mon Sep  9 14:20:43 2002
-@@ -7993,14 +7993,14 @@
-         TOOLKIT=GTK
-         GUIDIST=GTK_DIST
+--- configure.orig	Tue Nov  4 19:54:04 2003
++++ configure	Tue Nov  4 20:12:59 2003
+@@ -11731,7 +11731,7 @@
  
--                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:7998: checking for gdk_im_open in -lgdk" >&5
-+                echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:7998: 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
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgdk  $LIBS"
-+LIBS="-lgdk12  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 8006 "configure"
- #include "confdefs.h"
-@@ -9395,13 +9395,11 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
- 
--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.2"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.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"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
  
+     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
  
-@@ -12796,24 +12802,6 @@
- fi
+-                                THREAD_OPTS="$THREAD_OPTS pthread none"
++                                THREAD_OPTS=
  
+                 THREADS_OK=no
+         for flag in $THREAD_OPTS; do
+@@ -18736,6 +18743,8 @@
+               THREADS_CFLAGS=""
+       done
  
--CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
--CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
++      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
@@ -58,23 +68,6 @@ $FreeBSD$
 -    else
 -        OPTIMISE="-O"
 -    fi
--fi
--
--
- if test "$wxUSE_GUI" = "yes"; then
-   cat >> confdefs.h <<\EOF
- #define wxUSE_GUI 1
-@@ -14995,13 +14983,11 @@
- s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%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%@PROGRAM_EXT@%$PROGRAM_EXT%g
- s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_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_ALL@%$WX_ALL%g
- s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
- s%@SHARED_LD@%$SHARED_LD%g
+ fi
+ 
+ if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
diff --git a/x11-toolkits/wxgtk/files/patch-contrib-include-wx-fl-frmview.h b/x11-toolkits/wxgtk/files/patch-contrib-include-wx-fl-frmview.h
new file mode 100644
index 0000000..57217e4
--- /dev/null
+++ b/x11-toolkits/wxgtk/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/wxgtk/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk/files/patch-contrib-src-Makefile.in
new file mode 100644
index 0000000..5d9fe04
--- /dev/null
+++ b/x11-toolkits/wxgtk/files/patch-contrib-src-Makefile.in
@@ -0,0 +1,20 @@
+--- 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: Makefile.in,v 1.13.2.1 2003/07/28 08:23:09 VS 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
+@@ -10,6 +10,9 @@
+ 
+ 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/wxgtk/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk/files/patch-contrib-src-gizmos-multicell.cpp
new file mode 100644
index 0000000..88d6778
--- /dev/null
+++ b/x11-toolkits/wxgtk/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/wxgtk/files/patch-contrib-src-plot-plot.cpp b/x11-toolkits/wxgtk/files/patch-contrib-src-plot-plot.cpp
new file mode 100644
index 0000000..ff6fc28
--- /dev/null
+++ b/x11-toolkits/wxgtk/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/wxgtk/files/patch-include::wx::gtk::menu.h b/x11-toolkits/wxgtk/files/patch-include::wx::gtk::menu.h
deleted file mode 100644
index 94cee68..0000000
--- a/x11-toolkits/wxgtk/files/patch-include::wx::gtk::menu.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- include/wx/gtk/menu.h	2002/09/09 11:38:53	1.1
-+++ include/wx/gtk/menu.h	2002/09/09 11:39:09
-@@ -85,7 +85,9 @@
-     {
-         Init();
- 
-+#if wxUSE_MENU_CALLBACK
-         Callback(func);
-+#endif // wxUSE_MENU_CALLBACK
-     }
- 
-     // implementation
diff --git a/x11-toolkits/wxgtk/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk/files/patch-include::wx::wxchar.h
new file mode 100644
index 0000000..f0fd474
--- /dev/null
+++ b/x11-toolkits/wxgtk/files/patch-include::wx::wxchar.h
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- 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/wxgtk/files/patch-src-common-datetime.cpp b/x11-toolkits/wxgtk/files/patch-src-common-datetime.cpp
new file mode 100644
index 0000000..f493127
--- /dev/null
+++ b/x11-toolkits/wxgtk/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/wxgtk/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk/files/patch-src-makelib.env.in
new file mode 100644
index 0000000..17ce4b3
--- /dev/null
+++ b/x11-toolkits/wxgtk/files/patch-src-makelib.env.in
@@ -0,0 +1,61 @@
+--- src/makelib.env.in.orig	Sun Sep 21 18:31:38 2003
++++ src/makelib.env.in	Tue Nov  4 22:33:31 2003
+@@ -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
+@@ -82,14 +81,15 @@
+ 	$(AR) $(AROPTIONS) $@ $(OBJECTS)
+ 	$(RANLIB) $@
+ 
+-install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
++install: install_@WX_TARGET_LIBRARY_TYPE@
++
++install-common: install_headers
+ 
+ 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 +105,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 +117,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/wxgtk/files/patch-src::common::parser.y b/x11-toolkits/wxgtk/files/patch-src::common::parser.y
deleted file mode 100644
index 6aa7142..0000000
--- a/x11-toolkits/wxgtk/files/patch-src::common::parser.y
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/parser.y.orig	Fri Jan  4 07:47:57 2002
-+++ src/common/parser.y	Sat Dec 14 14:49:19 2002
-@@ -98,6 +98,7 @@
-                          free($1); }
- 	|	arg1
- 			{$$ = $1; }
-+	;
- 
- arg1	:	WORD
- 			{$$ = wxmake_word($1); free($1);}
diff --git a/x11-toolkits/wxgtk/files/patch-src::common::strconv.cpp b/x11-toolkits/wxgtk/files/patch-src::common::strconv.cpp
deleted file mode 100644
index 67d30a0..0000000
--- a/x11-toolkits/wxgtk/files/patch-src::common::strconv.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/common/strconv.cpp	2002/09/09 13:18:00	1.1
-+++ src/common/strconv.cpp	2002/09/09 13:18:10
-@@ -358,7 +358,7 @@
- #if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
-   return std::wcslen(psz);
- #else
--  return ::wcslen(psz);
-+  return wcslen(psz);
- #endif
- }
- 
diff --git a/x11-toolkits/wxgtk/files/patch-src_common_intl.cpp b/x11-toolkits/wxgtk/files/patch-src_common_intl.cpp
new file mode 100644
index 0000000..f8e465e
--- /dev/null
+++ b/x11-toolkits/wxgtk/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/wxgtk/files/patch-wx-config.in b/x11-toolkits/wxgtk/files/patch-wx-config.in
deleted file mode 100644
index 7a36184..0000000
--- a/x11-toolkits/wxgtk/files/patch-wx-config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- wx-config.in.orig	Fri Jan  4 17:47:57 2002
-+++ wx-config.in	Mon Sep  9 14:22:16 2002
-@@ -35,7 +35,7 @@
-     then
-         includes=-I@includedir@
-     fi
--    includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
-+    includes="-I@prefix@/include/@TOOLCHAIN_NAME@ $includes"
-     echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
- }
- 
diff --git a/x11-toolkits/wxgtk/pkg-descr b/x11-toolkits/wxgtk/pkg-descr
index 42dcdd8..6ce99d6 100644
--- a/x11-toolkits/wxgtk/pkg-descr
+++ b/x11-toolkits/wxgtk/pkg-descr
@@ -1,3 +1,4 @@
-A C++ package for platform independent software development.
+wxWindows is a C++ GUI framework for platform independent software
+development. On FreeBSD the Gtk toolkit is used.
 
-WWW: http://wesley.informatik.uni-freiburg.de/~wxxt/
+WWW: http://www.wxwindows.org/
diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist
index 3068dc3..1db0937 100644
--- a/x11-toolkits/wxgtk/pkg-plist
+++ b/x11-toolkits/wxgtk/pkg-plist
@@ -1,373 +1,9 @@
 bin/wx-config
-bin/wxgtk-2.2-config
-include/wx/accel.h
-include/wx/app.h
-include/wx/arrimpl.cpp
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/brush.h
-include/wx/buffer.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/choicdlg.h
-include/wx/choice.h
-include/wx/clipbrd.h
-include/wx/cmdline.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/control.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/dbtable.h
-include/wx/dc.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/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/encconv.h
-include/wx/event.h
-include/wx/expr.h
-include/wx/ffile.h
-include/wx/file.h
-include/wx/fileconf.h
-include/wx/filedlg.h
-include/wx/filefn.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/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/dirdlgg.h
-include/wx/generic/dragimgg.h
-include/wx/generic/filedlgg.h
-include/wx/generic/fontdlgg.h
-include/wx/generic/grid.h
-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
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/panelg.h
-include/wx/generic/plot.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/splitter.h
-include/wx/generic/statusbr.h
-include/wx/generic/tabg.h
-include/wx/generic/textdlgg.h
-include/wx/generic/treectrl.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/palette.h
-include/wx/gtk/pen.h
-include/wx/gtk/radiobox.h
-include/wx/gtk/radiobut.h
-include/wx/gtk/region.h
-include/wx/gtk/scrolbar.h
-include/wx/gtk/settings.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/timer.h
-include/wx/gtk/tooltip.h
-include/wx/gtk/treectrl.h
-include/wx/gtk/wave.h
-include/wx/gtk/win_gtk.h
-include/wx/gtk/window.h
-include/wx/hash.h
-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
-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/imagbmp.h
-include/wx/image.h
-include/wx/imaggif.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/intl.h
-include/wx/ioswrap.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/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/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/mstream.h
-include/wx/notebook.h
-include/wx/object.h
-include/wx/objstrm.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/plot.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/radiobox.h
-include/wx/radiobut.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/serbase.h
-include/wx/settings.h
-include/wx/setup.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/socket.h
-include/wx/spinbutt.h
-include/wx/spinctrl.h
-include/wx/splitter.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/tab.h
-include/wx/tabctrl.h
-include/wx/taskbar.h
-include/wx/tbarbase.h
-include/wx/tbarsmpl.h
-include/wx/textctrl.h
-include/wx/textdlg.h
-include/wx/textfile.h
-include/wx/thread.h
-include/wx/time.h
-include/wx/timer.h
-include/wx/tipdlg.h
-include/wx/tokenzr.h
-include/wx/toolbar.h
-include/wx/tooltip.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/url.h
-include/wx/utils.h
-include/wx/valgen.h
-include/wx/validate.h
-include/wx/valtext.h
-include/wx/variant.h
-include/wx/version.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/xpmhand.h
-include/wx/zipstrm.h
-include/wx/zstream.h
-lib/libwx_gtk-2.2.so
-lib/libwx_gtk-2.2.so.2
-lib/libwx_gtk-2.2_gl.so
-lib/libwx_gtk-2.2_gl.so.2
-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/sl/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
-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/gtk
-@dirrm include/wx/generic
-@dirrm include/wx
+bin/wxgtk-2.4-config
+include/wx/gtk-2.4/wx/setup.h
+lib/libwx_gtk-2.4.so
+lib/libwx_gtk-2.4.so.0
+lib/libwx_gtk_gl-2.4.so
+lib/libwx_gtk_gl-2.4.so.0
+@dirrm include/wx/gtk-2.4/wx
+@dirrm include/wx/gtk-2.4
author	fjoe <fjoe@FreeBSD.org>	2003-11-09 19:23:40 +0000
committer	fjoe <fjoe@FreeBSD.org>	2003-11-09 19:23:40 +0000
commit	bccff2b3aa3fe627b36f02b3c90a3e79397c1404 (patch)
tree	2a916623c315c30aa34cc8f494d3473a17b90f0f /x11-toolkits/wxgtk
parent	2a0481246db1b6b90ffe5e7eb7fc1398c54b8d62 (diff)
download	FreeBSD-ports-bccff2b3aa3fe627b36f02b3c90a3e79397c1404.zip FreeBSD-ports-bccff2b3aa3fe627b36f02b3c90a3e79397c1404.tar.gz