7 files changed, 208 insertions, 25 deletions

diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 301b4a5eaa26..08c616138bca 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.7
+PORTVERSION=	2.3.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
+MASTER_SITE_SUBDIR=	wxpython
 DISTNAME=	wxGTK-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
@@ -20,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
@@ -31,12 +33,13 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
 			  -I${LOCALBASE}/include \
 			  -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib \
-			 -L${X11BASE}/lib"
+			 -L${X11BASE}/lib" \
+		GTK_CONFIG_2_0="no"
 
-AUTOCONF=	autoconf && \
-			${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \
-					s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \
-						${WRKSRC}/configure
+pre-patch:
+	@${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \
+			 s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \
+				${WRKSRC}/configure
 
 post-install:
 	@${RM} -rf ${PREFIX}/include/wx/motif
diff --git a/x11-toolkits/wxgtk24/distinfo b/x11-toolkits/wxgtk24/distinfo
index 0b003ee855af..6e08b37f8059 100644
--- a/x11-toolkits/wxgtk24/distinfo
+++ b/x11-toolkits/wxgtk24/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.2.7.tar.gz) = 042ba034e2bc31ca1df74f6f9f60fe57
+MD5 (wxGTK-2.3.0.tar.gz) = 9dfbe08a7f574ed3b187bc361012981d
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac
index 1657f8b71cb3..e9cf29bb3964 100644
--- a/x11-toolkits/wxgtk24/files/patch-ac
+++ b/x11-toolkits/wxgtk24/files/patch-ac
@@ -1,6 +1,9 @@
---- Makefile.in.orig	Mon May  7 07:14:03 2001
-+++ Makefile.in	Mon May  7 07:14:46 2001
-@@ -365,39 +365,23 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri May 25 05:55:33 2001
++++ Makefile.in	Mon May 28 19:47:06 2001
+@@ -379,39 +379,23 @@
  
  CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1@
@@ -44,7 +47,24 @@
  
  $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -499,13 +483,9 @@
+@@ -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@
+ 
+-	$(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 $(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 $(includedir)/wx
+ 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+@@ -513,13 +497,9 @@
  	@echo " Removing library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
diff --git a/x11-toolkits/wxgtk24/files/patch-configure b/x11-toolkits/wxgtk24/files/patch-configure
new file mode 100644
index 000000000000..05998ba6dfaa
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-configure
@@ -0,0 +1,111 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon May 28 20:11:23 2001
++++ configure	Mon May 28 20:14:20 2001
+@@ -7606,10 +7606,10 @@
+   else
+      echo "$ac_t""no" 1>&6
+      if test "$GTK_CONFIG_2_0" = "no" ; then
+-       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
+-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
+-       echo "*** full path to gtk-config-2.0."
++#       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
++#       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
++#       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
++#       echo "*** full path to gtk-config-2.0."
+      else
+        if test -f conf.gtktest ; then
+         :
+@@ -7941,14 +7941,14 @@
+     TOOLKIT=GTK
+     GUIDIST=GTK_DIST
+ 
+-        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+-echo "configure:7946: checking for gdk_im_open in -lgdk" >&5
++        echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
++echo "configure:7946: 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 7954 "configure"
+ #include "confdefs.h"
+@@ -9207,16 +9207,12 @@
+ 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}-${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"
+ 
++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
++       
+ SHARED_LD=
+ PIC_FLAG=
+ WX_ALL=
+@@ -12945,6 +12941,7 @@
+   fi
+ fi
+ 
++WXGTK20=
+ if test "$WXGTK20" = 1 ; then
+   cat >> confdefs.h <<EOF
+ #define __WXGTK20__ $WXGTK20
+@@ -13115,24 +13112,6 @@
+ 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
+-
+-
+ ZLIB_INCLUDE=
+ if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
+   cat >> confdefs.h <<\EOF
+@@ -15947,8 +15926,6 @@
+ s%@WX_LIBRARY@%$WX_LIBRARY%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
+@@ -15956,8 +15933,6 @@
+ s%@WX_LIBRARY_GL@%$WX_LIBRARY_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/wxgtk24/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
new file mode 100644
index 000000000000..498d218439b2
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- include/wx/wxchar.h.orig	Fri May 25 05:55:35 2001
++++ include/wx/wxchar.h	Mon May 28 22:12:39 2001
+@@ -276,12 +276,7 @@
+ #    ifdef HAVE_WCSTR_H
+ #      include <wcstr.h>
+ #    else
+-#      ifndef __FreeBSD__
+ #        include <wchar.h>
+-#      else
+-#        include <stdlib.h>
+-#        define wxNEED_WCSLEN
+-#      endif
+ #    endif
+ #  endif
+ 
+@@ -511,11 +506,11 @@
+ #endif
+ 
+ // 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; }
+ 
+ #ifndef wxNEED_WX_STRING_H
+ // safe version of strlen() (returns 0 if passed NULL pointer)
+-inline size_t wxStrlen(const wxChar *psz)
++WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
+    { return psz ? wxStrlen_(psz) : 0; }
+ #endif
+ 
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 000000000000..89574988948a
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-wx-config.in
@@ -0,0 +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
+     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@
+ }
+ 
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
index 4903b5527aac..0627aeab4d0a 100644
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -24,6 +24,7 @@ include/wx/combobox.h
 include/wx/confbase.h
 include/wx/config.h
 include/wx/control.h
+include/wx/cshelp.h
 include/wx/ctrlsub.h
 include/wx/cursor.h
 include/wx/dataobj.h
@@ -60,6 +61,7 @@ include/wx/file.h
 include/wx/fileconf.h
 include/wx/filedlg.h
 include/wx/filefn.h
+include/wx/filename.h
 include/wx/filesys.h
 include/wx/font.h
 include/wx/fontdlg.h
@@ -79,6 +81,7 @@ include/wx/generic/caret.h
 include/wx/generic/choicdgg.h
 include/wx/generic/colrdlgg.h
 include/wx/generic/dcpsg.h
+include/wx/generic/dirctrlg.h
 include/wx/generic/dirdlgg.h
 include/wx/generic/dragimgg.h
 include/wx/generic/filedlgg.h
@@ -94,18 +97,19 @@ include/wx/generic/laywin.h
 include/wx/generic/listctrl.h
 include/wx/generic/msgdlgg.h
 include/wx/generic/notebook.h
+include/wx/generic/paletteg.h
 include/wx/generic/panelg.h
-include/wx/generic/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/splash.h
 include/wx/generic/splitter.h
 include/wx/generic/statusbr.h
 include/wx/generic/tabg.h
 include/wx/generic/textdlgg.h
-include/wx/generic/treectrl.h
+include/wx/generic/treectlg.h
 include/wx/generic/wizard.h
 include/wx/geometry.h
 include/wx/gifdecod.h
@@ -150,22 +154,24 @@ 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/scrolwin.h
 include/wx/gtk/settings.h
 include/wx/gtk/slider.h
 include/wx/gtk/spinbutt.h
 include/wx/gtk/spinctrl.h
+include/wx/gtk/setup.h
 include/wx/gtk/statbmp.h
 include/wx/gtk/statbox.h
 include/wx/gtk/statline.h
 include/wx/gtk/stattext.h
 include/wx/gtk/tbargtk.h
 include/wx/gtk/textctrl.h
+include/wx/gtk/tglbtn.h
 include/wx/gtk/timer.h
 include/wx/gtk/tooltip.h
 include/wx/gtk/treectrl.h
@@ -201,6 +207,7 @@ include/wx/imagpcx.h
 include/wx/imagpng.h
 include/wx/imagpnm.h
 include/wx/imagtiff.h
+include/wx/imagxpm.h
 include/wx/intl.h
 include/wx/ioswrap.h
 include/wx/ipcbase.h
@@ -236,7 +243,6 @@ 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
@@ -267,6 +273,7 @@ include/wx/slider.h
 include/wx/socket.h
 include/wx/spinbutt.h
 include/wx/spinctrl.h
+include/wx/splash.h
 include/wx/splitter.h
 include/wx/statbmp.h
 include/wx/statbox.h
@@ -284,13 +291,16 @@ include/wx/tbarsmpl.h
 include/wx/textctrl.h
 include/wx/textdlg.h
 include/wx/textfile.h
+include/wx/tglbtn.h
 include/wx/thread.h
 include/wx/time.h
 include/wx/timer.h
 include/wx/tipdlg.h
+include/wx/tipwin.h
 include/wx/tokenzr.h
 include/wx/toolbar.h
 include/wx/tooltip.h
+include/wx/treebase.h
 include/wx/treectrl.h
 include/wx/txtstrm.h
 include/wx/types.h
@@ -317,25 +327,22 @@ include/wx/wxchar.h
 include/wx/wxexpr.h
 include/wx/wxhtml.h
 include/wx/wxprec.h
-include/wx/xpmhand.h
+include/wx/xpmdecod.h
 include/wx/zipstrm.h
 include/wx/zstream.h
 lib/libwx_gtk.so
 lib/libwx_gtk.so.2
 lib/libwx_gtk_gl.so
 lib/libwx_gtk_gl.so.2
-lib/wx/include/wx/gtk/setup.h
 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
@@ -365,10 +372,6 @@ share/wx/gs_afm/Zapf.afm
 @dirrm share/wx/gs_afm
 @dirrm share/wx/afm
 @dirrm share/wx
-@dirrm lib/wx/include/wx/gtk
-@dirrm lib/wx/include/wx
-@dirrm lib/wx/include
-@dirrm lib/wx
 @dirrm include/wx/unix
 @dirrm include/wx/protocol
 @dirrm include/wx/html