Update 2.0.1 -> 2.1.0b9.

This port was apparently broken and unusable previously. If you
wanted to check out wxWindows and couldn't before, go ahead and
give it another try.

6 files changed, 186 insertions, 137 deletions

diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 985c49054a7..07e51eeaced 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -1,32 +1,31 @@
-# New ports collection makefile for:	wxGTK
-# Version required:	2.0.2
-# Date created:		18 Jun 1999
-# Whom:			Alexander Langer <alex@cichlids.com>
+# New ports collection makefile for:    wxGTK
+# Version required:     		2.1.0b9
+# Date created:         		September 18, 1999
+# Whom:					nectar@FreeBSD.ORG
 #
 # $FreeBSD$
 #
 
-DISTNAME=	wxGTK-2.0.1
-PKGNAME=	wxgtk-2.0.1
-CATEGORIES= 	x11-toolkits
-MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
-EXTRACT_SUFX=	.tgz
+DISTNAME=	wxGTK-2.1.0-b9
+PKGNAME=	wxgtk-2.1.0b9
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
+		http://www.nectar.com/distfiles/
+EXTRACT_SUFX=   .tgz
 
-MAINTAINER= 	alex@cichlids.com
+MAINTAINER=	nectar@FreeBSD.ORG
 
-LIB_DEPENDS=	gtk10:${PORTSDIR}/x11-toolkits/gtk10:install
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	OSTYPE="${OPSYS}"
 USE_GMAKE=	yes
-MAKE_ENV=	OSTYPE="${OPSYS}"
 
-WRKSRC=		${WRKDIR}/wxGTK
+WRKSRC=         ${WRKDIR}/wxGTK
+
+CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 
 post-install:
-# There are two empty directories that make problems
-# while deinstalling if installed as a .tgz-package.
-	${TOUCH} ${PREFIX}/include/wx/motif/.placeholder
-	${TOUCH} ${PREFIX}/include/wx/common/.placeholder
+	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk24/distinfo b/x11-toolkits/wxgtk24/distinfo
index bfa312fad14..c85ac8eec3a 100644
--- a/x11-toolkits/wxgtk24/distinfo
+++ b/x11-toolkits/wxgtk24/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.0.1.tgz) = 732f51f9227a6e95711ea40ac110c4d6
+MD5 (wxGTK-2.1.0-b9.tgz) = 6fe66991925952f68bc8e5c3bc6a3ae5
diff --git a/x11-toolkits/wxgtk24/files/patch-aa b/x11-toolkits/wxgtk24/files/patch-aa
index ee9147edcbb..c2d2fde6c6e 100644
--- a/x11-toolkits/wxgtk24/files/patch-aa
+++ b/x11-toolkits/wxgtk24/files/patch-aa
@@ -1,24 +1,34 @@
---- configure.orig	Sat Jun 19 14:34:17 1999
-+++ configure	Sat Jun 19 14:34:30 1999
-@@ -6424,18 +6424,18 @@
-   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/gtk10-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/gtk10-config
-      fi
-   fi
+--- configure.orig	Thu Aug 26 11:03:32 1999
++++ configure	Sun Sep 19 13:24:58 1999
+@@ -6730,7 +6730,7 @@
+     fi
  
-   # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
-+set dummy gtk10-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:6441: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+     TOOLKIT_INCLUDE="$GTK_CFLAGS"
+-    GUI_TK_LIBRARY="$GTK_LIBS -ldl"
++    GUI_TK_LIBRARY="$GTK_LIBS"
+     TOOLKIT=GTK
+   
+     GUIHEADERS=GTK_HEADERS
+@@ -7834,11 +7834,8 @@
+ 
+ WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
+ 
+-WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-
+-WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so"
+-WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so"
++WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.so.1"
++WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}.so"
+ 
+ SHARED_LD=
+ PIC_FLAG=
+@@ -12035,8 +12032,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_CREATE_LINKS@%$WX_CREATE_LINKS%g
+ s%@WX_CREATE_INSTALLED_LINKS@%$WX_CREATE_INSTALLED_LINKS%g
diff --git a/x11-toolkits/wxgtk24/pkg-comment b/x11-toolkits/wxgtk24/pkg-comment
index d46c511936d..cb87719eb98 100644
--- a/x11-toolkits/wxgtk24/pkg-comment
+++ b/x11-toolkits/wxgtk24/pkg-comment
@@ -1 +1 @@
-wxWindows is a C++ cross-platform GUI toolkit (this is wxGTK)
+The wxWindows GUI toolkit with GTK+ bindings.
diff --git a/x11-toolkits/wxgtk24/pkg-descr b/x11-toolkits/wxgtk24/pkg-descr
index bf4ffc9b66c..bf3c65b64f1 100644
--- a/x11-toolkits/wxgtk24/pkg-descr
+++ b/x11-toolkits/wxgtk24/pkg-descr
@@ -1,24 +1,3 @@
-The wxWindows project is a C++ cross-platform GUI toolkit which
-was started by Julian Smart.
+A C++ package for platform independed program development.
 
-Currently, work is being done on these ports of wxWindows 2.X: 
-        Windows (wxMSW, finished) 
-        Unix, GTK+ (wxGTK, finished) 
-        Unix, Motif (wxMotif, finished) 
-        Macintosh (wxMac, advanced and preview available) 
-        OS/2 (wxOS2, just started) 
-        BeOS (wxBeOS, just started) 
-        SciTech's MGL library (wxMGL, started a few months ago) 
-
-This is the current stable (2.0.1) version of the GTK port.  There
-is also a "CVS-Version" that is considered beta.
-
-After installing, look in samples/ of the work directory (assuming
-you did not install this as a package --- the package of this port
-is broken in that the samples/ are not installed).  The samples
-are very helpful.
-
-WWW: http://www.freiburg.linux.de/~wxxt/
-     http://web.ukonline.co.uk/julian.smart/wxwin/
-
-- Alexander Langer <alex@cichlids.com>
+WWW:http://wesley.informatik.uni-freiburg.de/~wxxt/
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
index 9c370840eaf..508f6394ae6 100644
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -1,13 +1,76 @@
 bin/wx-config
-include/wx/common/.placeholder
+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/caret.h
+include/wx/checkbox.h
+include/wx/checklst.h
+include/wx/choicdlg.h
+include/wx/choice.h
+include/wx/clipbrd.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/cursor.h
+include/wx/dataobj.h
+include/wx/date.h
+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/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/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/frame.h
+include/wx/fs_inet.h
+include/wx/fs_zip.h
+include/wx/gauge.h
+include/wx/gdicmn.h
+include/wx/gdiobj.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/filedlgg.h
 include/wx/generic/fontdlgg.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
@@ -17,6 +80,7 @@ include/wx/generic/notebook.h
 include/wx/generic/panelg.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
@@ -24,6 +88,9 @@ include/wx/generic/statusbr.h
 include/wx/generic/tabg.h
 include/wx/generic/textdlgg.h
 include/wx/generic/treectrl.h
+include/wx/gifdecod.h
+include/wx/grid.h
+include/wx/gsocket.h
 include/wx/gtk/accel.h
 include/wx/gtk/app.h
 include/wx/gtk/bitmap.h
@@ -42,12 +109,12 @@ include/wx/gtk/dataobj.h
 include/wx/gtk/dc.h
 include/wx/gtk/dcclient.h
 include/wx/gtk/dcmemory.h
-include/wx/gtk/dcps.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
@@ -70,6 +137,7 @@ include/wx/gtk/slider.h
 include/wx/gtk/spinbutt.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
@@ -79,70 +147,23 @@ include/wx/gtk/treectrl.h
 include/wx/gtk/wave.h
 include/wx/gtk/win_gtk.h
 include/wx/gtk/window.h
-include/wx/motif/.placeholder
-include/wx/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/accel.h
-include/wx/app.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/brush.h
-include/wx/button.h
-include/wx/checkbox.h
-include/wx/checklst.h
-include/wx/choicdlg.h
-include/wx/choice.h
-include/wx/clipbrd.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/cursor.h
-include/wx/dataobj.h
-include/wx/date.h
-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/dirdlg.h
-include/wx/dnd.h
-include/wx/docmdi.h
-include/wx/docview.h
-include/wx/dynarray.h
-include/wx/dynlib.h
-include/wx/event.h
-include/wx/expr.h
-include/wx/file.h
-include/wx/fileconf.h
-include/wx/filedlg.h
-include/wx/filefn.h
-include/wx/font.h
-include/wx/fontdlg.h
-include/wx/frame.h
-include/wx/gauge.h
-include/wx/gdicmn.h
-include/wx/gdiobj.h
-include/wx/grid.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/forcelink.h
+include/wx/html/htmlcell.h
+include/wx/html/htmldefs.h
+include/wx/html/htmlfilter.h
+include/wx/html/htmlhelp.h
+include/wx/html/htmlparser.h
+include/wx/html/htmltag.h
+include/wx/html/htmlwin.h
+include/wx/html/htmlwinparser.h
+include/wx/html/mod_templ.h
+include/wx/html/version.h
 include/wx/icon.h
 include/wx/image.h
 include/wx/imaglist.h
@@ -155,12 +176,13 @@ 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/memory.h
 include/wx/menu.h
-include/wx/odbc.h
 include/wx/menuitem.h
 include/wx/metafile.h
 include/wx/mimetype.h
@@ -171,18 +193,25 @@ 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/pnghand.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
@@ -196,14 +225,17 @@ 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/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
@@ -219,11 +251,14 @@ 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/url.h
 include/wx/utils.h
 include/wx/valgen.h
@@ -240,19 +275,45 @@ 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
-include/wx/arrimpl.cpp
-include/wx/listimpl.cpp
-lib/wx/include/wx/gtk/setup.h
-@dirrm include/wx/gtk
-@dirrm include/wx/motif
-@dirrm include/wx/common
+lib/libwx_gtk.so
+lib/libwx_gtk.so.1
+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/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
 @dirrm include/wx/generic
+@dirrm include/wx/gtk
+@dirrm include/wx/html
 @dirrm include/wx/protocol
+@dirrm include/wx/unix
 @dirrm include/wx
-@dirrm lib/wx/include/wx/gtk
-@dirrm lib/wx/include/wx
-@dirrm lib/wx/include
-@dirrm lib/wx
+@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