5 files changed, 93 insertions, 64 deletions

diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 2aed603137c5..cbd0e36203d9 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.1.11
+PORTVERSION= 	2.1.15
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
-		http://www.nectar.com/distfiles/
+MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo
index 14aaa4ac7666..e242a6636e21 100644
--- a/x11-toolkits/wxgtk/distinfo
+++ b/x11-toolkits/wxgtk/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.1.11.tgz) = a897a00260879ef527dd77bdda0fc2c5
+MD5 (wxGTK-2.1.15.tgz) = 4d4845a68d9e34c27560b9e0c8117ef7
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
index d83cf9891695..fb3c109b989b 100644
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ b/x11-toolkits/wxgtk/files/patch-aa
@@ -1,51 +1,27 @@
---- configure.in.orig	Tue Nov  9 10:48:20 1999
-+++ configure.in	Mon Jan 17 09:13:20 2000
-@@ -22,17 +22,17 @@
-   if test x$gtk_config_exec_prefix != x ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
-      fi
-   fi
- 
--  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+  AC_PATH_PROG(GTK_CONFIG, gtk12-config, no)
-   min_gtk_version=ifelse([$1], ,0.99.7,$1)
-   AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-   no_gtk=""
-@@ -1501,7 +1501,7 @@
- if test "$wxUSE_GTK" = 1; then
-     dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
-     dnl only then, if it wasn't found, for an older one
--    AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
-+    AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk12-config in path and GTK+ is version 1.2.1 or above?))
- 
-     TOOLKIT_INCLUDE="$GTK_CFLAGS"
-     GUI_TK_LIBRARY="$GTK_LIBS"
-@@ -1701,12 +1701,10 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+--- configure.in.orig	Sun Apr 23 07:59:54 2000
++++ configure.in	Sun Apr 23 08:04:06 2000
+@@ -1974,16 +1974,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}-${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"
  
  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"
  
  dnl shared library settings
  SHARED_LD=
-@@ -2964,8 +2962,6 @@
+@@ -3645,8 +3641,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -53,4 +29,13 @@
 -AC_SUBST(WX_LIBRARY_LINK3)
  AC_SUBST(PROGRAM_EXT)
  
+ dnl global gl options
+@@ -3656,8 +3650,6 @@
+ AC_SUBST(WX_LIBRARY_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/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac
index 6af51255b4b9..ae25a9c7982d 100644
--- a/x11-toolkits/wxgtk/files/patch-ac
+++ b/x11-toolkits/wxgtk/files/patch-ac
@@ -1,41 +1,60 @@
---- Makefile.in.orig	Fri Jan 14 09:27:03 2000
-+++ Makefile.in	Fri Jan 14 09:27:48 2000
-@@ -2050,19 +2050,11 @@
+--- Makefile.in.orig	Wed Mar 22 13:12:38 2000
++++ Makefile.in	Sun Apr 23 08:08:08 2000
+@@ -311,39 +311,23 @@
  	
  CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK3@
- 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
--	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
--	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+ 	cd lib \
+-		&& $(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_LINK1@
  	
- CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+ 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 \
+-		&& $(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_LINK1_GL@
+ 	
+ CREATE_INSTALLED_LINKS: preinstall
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
- 	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
--	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
--	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(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_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_LINK1_GL@
  	
  $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -2115,9 +2107,7 @@
- 	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
- 	
- 	$(INSTALL) -d $(includedir)/wx
--	$(INSTALL) -d $(includedir)/wx/msw
- 	$(INSTALL) -d $(includedir)/wx/gtk
--	$(INSTALL) -d $(includedir)/wx/motif
- 	$(INSTALL) -d $(includedir)/wx/html
- 	$(INSTALL) -d $(includedir)/wx/protocol
- 	$(INSTALL) -d $(includedir)/wx/unix
-@@ -2148,8 +2138,6 @@
+@@ -437,13 +421,9 @@
  	@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_DIR@/setup.h
  	@$(RM) $(bindir)/wx-config
diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist
index b2538cbca939..f89fded1a714 100644
--- a/x11-toolkits/wxgtk/pkg-plist
+++ b/x11-toolkits/wxgtk/pkg-plist
@@ -1,4 +1,5 @@
 bin/wx-config
+bin/wxgtk-config
 include/wx/accel.h
 include/wx/app.h
 include/wx/arrimpl.cpp
@@ -8,12 +9,14 @@ 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
@@ -25,6 +28,8 @@ 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
@@ -39,6 +44,7 @@ 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
@@ -46,6 +52,7 @@ 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
@@ -61,15 +68,18 @@ 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
@@ -84,6 +94,7 @@ 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
@@ -94,7 +105,10 @@ 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
@@ -126,6 +140,7 @@ 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
@@ -176,11 +191,20 @@ 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
@@ -192,6 +216,7 @@ 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
@@ -210,7 +235,7 @@ include/wx/palette.h
 include/wx/panel.h
 include/wx/paper.h
 include/wx/pen.h
-include/wx/pnghand.h
+include/wx/plot.h
 include/wx/print.h
 include/wx/printdlg.h
 include/wx/prntbase.h
@@ -253,9 +278,7 @@ include/wx/string.h
 include/wx/tab.h
 include/wx/tabctrl.h
 include/wx/taskbar.h
-include/wx/tbar95.h
 include/wx/tbarbase.h
-include/wx/tbarmsw.h
 include/wx/tbarsmpl.h
 include/wx/textctrl.h
 include/wx/textdlg.h
@@ -272,6 +295,8 @@ 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
@@ -282,6 +307,7 @@ 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
@@ -330,8 +356,8 @@ share/wx/gs_afm/TimesRo.afm
 @dirrm lib/wx/include/wx
 @dirrm lib/wx/include
 @dirrm lib/wx
-@dirrm share/wx/gs_afm
 @dirrm share/wx/afm
+@dirrm share/wx/gs_afm
 @dirrm share/wx
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R