Update to 2.4.0. Changes from 2.2.7 include lots of bugfixes and new features.

Patch provided in PR pkg/20640 by Hiramatsu Yoshifumi.

8 files changed, 347 insertions, 332 deletions

diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 4e9a01a40e8..bed82451413 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2003/01/10 08:00:21 cjep Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/31 17:44:21 jmmv Exp $
 #
 
-DISTNAME=		wxGTK-2.2.7
-PKGREVISION=		1
+DISTNAME=		wxGTK-2.4.0
 CATEGORIES=		x11
-MASTER_SITES=		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
+MASTER_SITES=		ftp://biolpc22.york.ac.uk/pub/2.4.0/
 
 MAINTAINER=		tsarna@netbsd.org
-HOMEPAGE=		http://www.freiburg.linux.de/~wxxt/
+HOMEPAGE=		http://www.wxwindows.org
 COMMENT=		GTK-based implementation of the wxWindows GUI library
 
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
-USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-gtk
@@ -31,7 +29,6 @@ DOCDIR=			${PREFIX}/share/doc/wx/gtk
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
-	${INSTALL_DATA} ${WRKSRC}/SYMBOLS.txt ${DOCDIR}/SYMBOLS
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/x11/wxGTK/PLIST b/x11/wxGTK/PLIST
index 3d6340b42e8..1c303276f45 100644
--- a/x11/wxGTK/PLIST
+++ b/x11/wxGTK/PLIST
@@ -1,30 +1,37 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/31 17:44:21 jmmv Exp $
 bin/wx-config
-bin/wxgtk-config
+bin/wxgtk-2.4-config
 include/wx/accel.h
 include/wx/app.h
 include/wx/arrimpl.cpp
+include/wx/artprov.h
 include/wx/bitmap.h
 include/wx/bmpbuttn.h
 include/wx/brush.h
 include/wx/buffer.h
+include/wx/build.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/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
 include/wx/cursor.h
 include/wx/dataobj.h
@@ -33,8 +40,11 @@ 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/dcbuffer.h
 include/wx/dcclient.h
 include/wx/dcmemory.h
 include/wx/dcprint.h
@@ -46,6 +56,7 @@ include/wx/defs.h
 include/wx/dialog.h
 include/wx/dialup.h
 include/wx/dir.h
+include/wx/dirctrl.h
 include/wx/dirdlg.h
 include/wx/dnd.h
 include/wx/docmdi.h
@@ -53,14 +64,19 @@ include/wx/docview.h
 include/wx/dragimag.h
 include/wx/dynarray.h
 include/wx/dynlib.h
+include/wx/dynload.h
+include/wx/effects.h
 include/wx/encconv.h
 include/wx/event.h
 include/wx/expr.h
+include/wx/fdrepdlg.h
+include/wx/features.h
 include/wx/ffile.h
 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
@@ -75,38 +91,43 @@ 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
 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/fdrepdlg.h
 include/wx/generic/filedlgg.h
 include/wx/generic/fontdlgg.h
 include/wx/generic/grid.h
+include/wx/generic/gridctrl.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/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/spinctlg.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/timer.h
+include/wx/generic/treectlg.h
 include/wx/generic/wizard.h
 include/wx/geometry.h
 include/wx/gifdecod.h
@@ -151,13 +172,13 @@ 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/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/settings.h
+include/wx/gtk/scrolwin.h
 include/wx/gtk/slider.h
 include/wx/gtk/spinbutt.h
 include/wx/gtk/spinctrl.h
@@ -167,18 +188,20 @@ 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/toplevel.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/hashmap.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
@@ -193,17 +216,21 @@ include/wx/html/htmprint.h
 include/wx/html/m_templ.h
 include/wx/html/winpars.h
 include/wx/icon.h
+include/wx/iconbndl.h
 include/wx/imagbmp.h
 include/wx/image.h
 include/wx/imaggif.h
+include/wx/imagiff.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/imagxpm.h
 include/wx/intl.h
 include/wx/ioswrap.h
+include/wx/ipc.h
 include/wx/ipcbase.h
 include/wx/isql.h
 include/wx/isqlext.h
@@ -211,6 +238,7 @@ include/wx/joystick.h
 include/wx/layout.h
 include/wx/laywin.h
 include/wx/list.h
+include/wx/listbase.h
 include/wx/listbox.h
 include/wx/listctrl.h
 include/wx/listimpl.cpp
@@ -220,6 +248,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
@@ -227,17 +256,18 @@ include/wx/mimetype.h
 include/wx/minifram.h
 include/wx/module.h
 include/wx/msgdlg.h
+include/wx/msgout.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/platform.h
+include/wx/popupwin.h
 include/wx/print.h
 include/wx/printdlg.h
 include/wx/prntbase.h
@@ -252,6 +282,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
@@ -260,15 +291,16 @@ 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/snglinst.h
 include/wx/socket.h
 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
@@ -277,21 +309,28 @@ 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
+include/wx/tglbtn.h
 include/wx/thread.h
+include/wx/thrimpl.cpp
 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/toplevel.h
+include/wx/treebase.h
 include/wx/treectrl.h
 include/wx/txtstrm.h
 include/wx/types.h
@@ -299,13 +338,16 @@ include/wx/unix/execute.h
 include/wx/unix/fontutil.h
 include/wx/unix/gsockunx.h
 include/wx/unix/mimetype.h
+include/wx/unix/utilsx11.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/vector.h
 include/wx/version.h
+include/wx/volume.h
 include/wx/wave.h
 include/wx/wfstream.h
 include/wx/window.h
@@ -318,7 +360,7 @@ 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.a
@@ -326,58 +368,66 @@ lib/libwx_gtk.la
 lib/libwx_gtk.so
 lib/libwx_gtk.so.0
 lib/libwx_gtk.so.0.1
-lib/wx/include/wx/gtk/setup.h
+lib/wx/include/gtk-2.4/wx/setup.h
+share/aclocal/wxwin.m4
 share/doc/wx/gtk/LICENSE
-share/doc/wx/gtk/SYMBOLS
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/wxstd.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/wxstd.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/wxstd.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wxstd.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/wxstd.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/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
+share/wx/2.4/afm/Cour.afm
+share/wx/2.4/afm/CourBo.afm
+share/wx/2.4/afm/CourBoO.afm
+share/wx/2.4/afm/CourO.afm
+share/wx/2.4/afm/Helv.afm
+share/wx/2.4/afm/HelvBo.afm
+share/wx/2.4/afm/HelvBoO.afm
+share/wx/2.4/afm/HelvO.afm
+share/wx/2.4/afm/TimesBo.afm
+share/wx/2.4/afm/TimesBoO.afm
+share/wx/2.4/afm/TimesO.afm
+share/wx/2.4/afm/TimesRo.afm
+share/wx/2.4/afm/Zapf.afm
+share/wx/2.4/gs_afm/Cour.afm
+share/wx/2.4/gs_afm/CourBo.afm
+share/wx/2.4/gs_afm/CourBoO.afm
+share/wx/2.4/gs_afm/CourO.afm
+share/wx/2.4/gs_afm/Helv.afm
+share/wx/2.4/gs_afm/HelvBo.afm
+share/wx/2.4/gs_afm/HelvBoO.afm
+share/wx/2.4/gs_afm/HelvO.afm
+share/wx/2.4/gs_afm/TimesBo.afm
+share/wx/2.4/gs_afm/TimesBoO.afm
+share/wx/2.4/gs_afm/TimesO.afm
+share/wx/2.4/gs_afm/TimesRo.afm
+share/wx/2.4/gs_afm/Zapf.afm
+@dirrm share/wx/2.4/gs_afm
+@dirrm share/wx/2.4/afm
+@dirrm share/wx/2.4
+@unexec ${RMDIR} %D/share/wx 2>/dev/null || ${TRUE}
 @dirrm share/doc/wx/gtk
 @dirrm share/doc/wx
-@dirrm lib/wx/include/wx/gtk
-@dirrm lib/wx/include/wx
-@dirrm lib/wx/include
-@dirrm lib/wx
+@dirrm lib/wx/include/gtk-2.4/wx
+@dirrm lib/wx/include/gtk-2.4
+@unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE}
 @dirrm include/wx/unix
+@exec ${MKDIR} %D/include/wx/univ
+@dirrm include/wx/univ
 @dirrm include/wx/protocol
 @dirrm include/wx/html
 @dirrm include/wx/gtk
 @dirrm include/wx/generic
-@dirrm include/wx
+@unexec ${RMDIR} %D/include/wx 2>/dev/null || ${TRUE}
diff --git a/x11/wxGTK/buildlink2.mk b/x11/wxGTK/buildlink2.mk
index 879a356ab29..1652110e79b 100644
--- a/x11/wxGTK/buildlink2.mk
+++ b/x11/wxGTK/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:49 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/03/31 17:44:21 jmmv Exp $
 
 .if !defined(WXGTK_BUILDLINK2_MK)
 WXGTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		wxGTK
-BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.2.7nb1
+BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.4.0
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wxGTK=wxGTK
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo
index d1861d040ca..ae4e4d183b9 100644
--- a/x11/wxGTK/distinfo
+++ b/x11/wxGTK/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/06/29 08:58:17 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/03/31 17:44:21 jmmv Exp $
 
-SHA1 (wxGTK-2.2.7.tar.gz) = f14685db47581a1024b36fa7611f8838223fff18
-Size (wxGTK-2.2.7.tar.gz) = 4732358 bytes
-SHA1 (patch-aa) = 1aa3a1d065bb03415572440f373fddbefa46e380
-SHA1 (patch-ab) = da0dc828097b03555d570dc034bb0ea8a8c1416d
-SHA1 (patch-ac) = 5dfa4e3c4c7c682f957846da31615d14dc589f3e
-SHA1 (patch-ad) = 5ed8a10d6d9cb2b0ef05ca053e3efa2030bcde22
+SHA1 (wxGTK-2.4.0.tar.gz) = fe01881af71c9f8ae9210d06cad7adf7f0b0662d
+Size (wxGTK-2.4.0.tar.gz) = 6605789 bytes
+SHA1 (patch-aa) = 5602ed3a9c15eab638f270990b91edc844a1e6e3
+SHA1 (patch-ab) = 6417fc7faaa0b8db5f2bc6d54c7e0bf48b78370a
+SHA1 (patch-ac) = 3405f5d82ba84fabd555bc240fce47b166d8efc0
+SHA1 (patch-ad) = 1ee314f895451dfab8bf56952ad2822b8530590f
diff --git a/x11/wxGTK/patches/patch-aa b/x11/wxGTK/patches/patch-aa
index 3df14df8ac5..593449510b1 100644
--- a/x11/wxGTK/patches/patch-aa
+++ b/x11/wxGTK/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2000/08/31 22:56:37 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/31 17:44:22 jmmv Exp $
 
-We're Unix-like, not Windows-like.
-
---- include/wx/defs.h.orig	Wed Jul 26 20:36:00 2000
-+++ include/wx/defs.h	Wed Jul 26 20:36:21 2000
-@@ -25,7 +25,8 @@
- #if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
-     defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
-     defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
--    defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
-+    defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || \
-+    defined(__NetBSD__)
+--- configure.orig	Mon Mar 10 00:42:05 2003
++++ configure	Mon Mar 10 00:42:20 2003
+@@ -15920,8 +15920,8 @@
+ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
  
-     #define __UNIX_LIKE__
+-WXCONFIG_LIBS="-l${WX_LIBRARY}"
+-WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
++WXCONFIG_LIBS="-l${WX_LIBRARY_BASENAME}"
++WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY_BASENAME}.a"
  
+ if test "$wxUSE_OPENGL" = "yes"; then
+     WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
index ff7984b9cfc..a78339a601b 100644
--- a/x11/wxGTK/patches/patch-ab
+++ b/x11/wxGTK/patches/patch-ab
@@ -1,73 +1,64 @@
-$NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2003/03/31 17:44:22 jmmv Exp $
 
---- Makefile.in.orig	Tue May 22 10:27:56 2001
+--- Makefile.in.orig	2003-01-05 12:54:59.000000000 +0100
 +++ Makefile.in
-@@ -19,13 +19,13 @@
- .SUFFIXES:	.o .cpp .c .cxx
+@@ -21,13 +21,13 @@ include ./src/make.env
+ .SUFFIXES: .o .c .cpp .cxx .rsrc .r
  
- .c.o :
--	$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile $(CCC)  -c @DEP_INFO_FLAGS@ $(CFLAGS) -o $@ $<
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC)  -c $(CFLAGS) -o $@ $<
  
- .cpp.o :
--	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
+ .cpp.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) -o $@ $<
  
- .cxx.o :
--	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
+ .cxx.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) -o $@ $<
  
- ########################### Paths #################################
- 
-@@ -37,10 +37,6 @@
- VP4 = @top_srcdir@/src/generic
- VP5 = @top_srcdir@/src/unix
- VP6 = @top_srcdir@/src/html
--VP7 = @top_srcdir@/src/png
--VP8 = @top_srcdir@/src/jpeg
--VP9 = @top_srcdir@/src/tiff
--VP10 = @top_srcdir@/src/zlib
- VP11 = @top_srcdir@/src/iodbc
- VP12 = @top_srcdir@/src/ole
- 
-@@ -66,7 +62,7 @@
+ .rsrc.r:
+ 	$(DEREZ) $^ Carbon.r -useDF > $@
+@@ -42,10 +42,6 @@ VP2 = @top_srcdir@/src/common
+ VP3 = @top_srcdir@/src/generic
+ VP4 = @top_srcdir@/src/unix
+ VP5 = @top_srcdir@/src/html
+-VP6 = @top_srcdir@/src/png
+-VP7 = @top_srcdir@/src/jpeg
+-VP8 = @top_srcdir@/src/tiff
+-VP9 = @top_srcdir@/src/zlib
+ VPA = @top_srcdir@/src/regex
+ VP10 = @top_srcdir@/src/iodbc
+ VP11 = @top_srcdir@/src/msw/ole
+@@ -53,7 +49,7 @@ VP11 = @top_srcdir@/src/msw/ole
  # the comment at the end of the next line is needed because otherwise autoconf
  # would remove this line completely - it contains a built-in hack to remove
  # any VPATH assignment not containing ':'
--VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
-+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
+-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
++VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
  
- top_srcdir = @top_srcdir@
  prefix = @prefix@
-@@ -87,7 +83,7 @@
- 
- DESTDIR =
+ exec_prefix = @exec_prefix@
+@@ -64,7 +60,7 @@ libdir = @libdir@
+ mandir = @mandir@
+ includedir = @includedir@
  
 -localedir = $(datadir)/locale
-+localedir = $(prefix)/${PKGLOCALEDIR}/locale
- 
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -95,13 +91,16 @@
++localedir = /usr/orinoco/share/locale
  
  top_builddir = .
- 
-+EXTRALIBS=${LDFLAGS} -lz -ljpeg -lpng -ltiff
-+
+ build_libdir = $(top_builddir)/lib
+@@ -72,7 +68,8 @@ build_libdir = $(top_builddir)/lib
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL@
 +INSTALL_DATA_DIR = ${BSD_INSTALL_DATA_DIR}
- # my autoconf doesn't set this
--#INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
- # maybe do an additional chmod if needed?
--INSTALL_SCRIPT = @INSTALL@
-+#INSTALL_SCRIPT = @INSTALL@
- transform = @program_transform_name@
  
- NORMAL_INSTALL = :
-@@ -130,10 +129,6 @@
+ build_alias = @build_alias@
+ build_triplet = @build@
+@@ -94,10 +91,6 @@ GENDIR   = $(WXDIR)/src/generic
  COMMDIR  = $(WXDIR)/src/common
  HTMLDIR  = $(WXDIR)/src/html
  UNIXDIR  = $(WXDIR)/src/unix
@@ -75,16 +66,14 @@ $NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $
 -JPEGDIR  = $(WXDIR)/src/jpeg
 -TIFFDIR  = $(WXDIR)/src/tiff
 -ZLIBDIR  = $(WXDIR)/src/zlib
+ REGEXDIR = $(WXDIR)/src/regex
  GTKDIR   = $(WXDIR)/src/gtk
- MOTIFDIR = $(WXDIR)/src/motif
- MSWDIR   = $(WXDIR)/src/msw
-@@ -184,41 +179,6 @@
- OBJECTS = @ALL_OBJECTS@
- DEPFILES = @ALL_DEPFILES@
+ X11DIR   = $(WXDIR)/src/x11
+@@ -161,124 +154,6 @@ REGEXOBJS = \
+ 		regerror.o \
+ 		regfree.o
  
--# the object files of sublibraries (we assume that they don't change [often],
--# so we don't generate these lists with tmake but embed them here)
--ZLIBOBJS    = \
+-ZLIBOBJS = \
 -		adler32.o \
 -		compress.o \
 -		crc32.o \
@@ -100,31 +89,26 @@ $NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $
 -		infutil.o \
 -		inffast.o
 -
--PNGOBJS     = \
+-PNGOBJS = \
 -		png.o \
+-		pngerror.o \
+-		pnggccrd.o \
+-		pngget.o \
+-		pngmem.o \
+-		pngpread.o \
 -		pngread.o \
+-		pngrio.o \
 -		pngrtran.o \
 -		pngrutil.o \
--		pngpread.o \
+-		pngset.o \
 -		pngtrans.o \
+-		pngvcrd.o \
+-		pngwio.o \
 -		pngwrite.o \
 -		pngwtran.o \
--		pngwutil.o \
--		pngerror.o \
--		pngmem.o \
--		pngwio.o \
--		pngrio.o \
--		pngget.o \
--		pngset.o
+-		pngwutil.o
 -
- FREETYPEOBJS = \
- 		ftsystem.o \
- 		autohint.o \
-@@ -238,89 +198,6 @@
- 		type1z.o \
- 		winfnt.o
- 
--JPEGOBJS    = \
+-JPEGOBJS = \
 -		jcomapi.o \
 -		jutils.o \
 -		jerror.o \
@@ -172,7 +156,7 @@ $NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $
 -		jquant2.o \
 -		jdmerge.o
 -
--TIFFOBJS	= \
+-TIFFOBJS = \
 -		tif_aux.o \
 -		tif_close.o \
 -		tif_codec.o \
@@ -210,132 +194,153 @@ $NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $
  IODBCOBJS = \
  		catalog.o \
  		connect.o \
-@@ -345,64 +222,27 @@
+@@ -302,52 +177,33 @@ IODBCOBJS = \
+ SONAME_FLAGS = @SONAME_FLAGS@
+ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
  
- all: @WX_ALL@
+-all: @WX_ALL@
++all: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la
  
--@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
--	@$(INSTALL) -d ./lib
--	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
--	$(RANLIB) ./lib/$@
-+CREATE_LINKS: $(top_builddir)/lib/@WX_LIBRARY_NAME@
-+
-+CREATE_INSTALLED_LINKS: preinstall
-+
-+$(top_builddir)/lib/@WX_LIBRARY_NAME@:  $(OBJECTS)
-+	@$(INSTALL_DATA_DIR) ./lib
-+	${LIBTOOL} --mode=link cc -o $(top_builddir)/lib/@WX_LIBRARY_NAME@  ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1
+-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
+-	@$(INSTALL) -d $(build_libdir)
+-	@$(RM) $@
+-	$(AR) $(AROPTIONS) $@ $(OBJECTS)
+-	$(RANLIB) $@
++$(build_libdir)/lib@WX_LIBRARY_BASENAME@.la: $(OBJECTS)
++	@$(INSTALL_DATA_DIR) $(build_libdir)
++	${LIBTOOL} --mode=link cc -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1
  
- @WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
--	@$(INSTALL) -d ./lib
-+	@$(INSTALL_DATA_DIR) ./lib
- 	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
- 	$(RANLIB) ./lib/$@
+ $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
+-	@$(INSTALL) -d $(build_libdir)
++	@$(INSTALL_DATA_DIR) $(build_libdir)
+ 	@$(RM) $@
+ 	$(AR) $(AROPTIONS) $@ glcanvas.o
+ 	$(RANLIB) $@
  
--@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
--	@$(INSTALL) -d ./lib
--	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
+-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
+-	@$(INSTALL) -d $(build_libdir)
+-	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 -
- @WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
--	@$(INSTALL) -d ./lib
-+	@$(INSTALL_DATA_DIR) ./lib
- 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+ # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
+ #     but this seems to result in problems with libwx_gtk being linked in twice
+ $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
+-	@$(INSTALL) -d $(build_libdir)
++	@$(INSTALL_DATA_DIR) $(build_libdir)
+ 	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
+ 
+ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
+-	@$(INSTALL) -d $(build_libdir)
++	@$(INSTALL_DATA_DIR) $(build_libdir)
+ 	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
  
--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@
 -
--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@
 -
+ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
+ 
+ parser.o: parser.c lexer.c
+ 	$(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c
++	${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c
+ 
+ parser.c: $(COMMDIR)/parser.y lexer.c
+ 	$(YACC) $(COMMDIR)/parser.y
+@@ -369,13 +225,6 @@ lexer.c: $(COMMDIR)/lexer.l
+ 
+ @IF_GNU_MAKE@-include $(OBJECTS:.o=.d)
+ 
 -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@
 -
--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@
--
- $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
- 
- parser.o:    parser.c lexer.c
--	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
-+	${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS) -o $@ parser.c
- 
- parser.c:	$(COMMDIR)/parser.y lexer.c
- 	$(YACC) $(COMMDIR)/parser.y
-@@ -425,49 +265,41 @@
- -include $(DEPFILES)
+ CREATE_INSTALLED_LINKS_GL: preinstall_gl
+ 	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+ 	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+@@ -385,10 +234,10 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
  
  afminstall: preinstall
--	$(INSTALL) -d $(datadir)
+ 	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
 -	$(INSTALL) -d $(datadir)/wx
--	$(INSTALL) -d $(datadir)/wx/afm
--	$(INSTALL) -d $(datadir)/wx/gs_afm
+-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
+-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
+-	$(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
 +	$(INSTALL_DATA_DIR) $(datadir)/wx
-+	$(INSTALL_DATA_DIR) $(datadir)/wx/afm
-+	$(INSTALL_DATA_DIR) $(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
++	$(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN)
++	$(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN)/afm
++	$(INSTALL_DATA_DIR) $(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
+ 
+@@ -410,51 +259,51 @@ win32install: preinstall
  
  # 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@TOOLKIT_NAME@-config
-+preinstall: $(top_builddir)/lib/@WX_LIBRARY_NAME@ $(top_builddir)/wx@TOOLKIT_NAME@-config
+-preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
++preinstall: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(top_builddir)/wx@TOOLCHAIN_NAME@-config
  	@echo " "
  	@echo " Installing wxWindows..."
  	@echo " "
  
--	$(INSTALL) -d $(prefix)
--	$(INSTALL) -d $(bindir)
--	$(INSTALL) -d $(libdir)
--
- 	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
- 	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@
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} $(top_builddir)/lib/@WX_LIBRARY_NAME@ ${libdir}
+-	@if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
+-	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
+-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
++	@if test ! -d $(prefix); then $(INSTALL_DATA_DIR) $(prefix); fi
++	@if test ! -d $(bindir); then $(INSTALL_DATA_DIR) $(bindir); fi
++	@if test ! -d $(libdir); then $(INSTALL_DATA_DIR) $(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@
++	${LIBTOOL} --mode=install ${INSTALL_DATA} $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(libdir)
+ 	@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) -d $(libdir)/wx/include/univ
+-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
+-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
 +	$(INSTALL_DATA_DIR) $(libdir)/wx
 +	$(INSTALL_DATA_DIR) $(libdir)/wx/include
-+	$(INSTALL_DATA_DIR) $(libdir)/wx/include/wx
-+	$(INSTALL_DATA_DIR) $(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_DATA_DIR) $(libdir)/wx/include/univ
++	$(INSTALL_DATA_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@
++	$(INSTALL_DATA_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
+ 	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
+                     $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
  
 -	$(INSTALL) -d $(includedir)/wx
++	$(INSTALL_DATA_DIR) $(includedir)/wx
+ 	@# FIXME: This will erroneously install a wx/base dir for wxBase..
 -	@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
--	$(INSTALL) -d $(includedir)/wx/protocol
--	$(INSTALL) -d $(includedir)/wx/unix
-+	$(INSTALL_DATA_DIR) $(includedir)/wx
+-	@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
 +	@if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/@TOOLKIT_DIR@; fi
 +	@if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/html; fi
 +	@if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/generic; fi
++	@if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/univ; fi
++	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL_DATA_DIR) $(includedir)/wx/msw/ole; fi
+ 
+ 	@# always install msw headers for wxBase, it's much simpler
+-	@if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi
++	@if test "$(USE_GUI)" = 0; then $(INSTALL_DATA_DIR) $(includedir)/wx/msw; fi
+ 
+-	$(INSTALL) -d $(includedir)/wx/protocol
+-	$(INSTALL) -d $(includedir)/wx/unix
 +	$(INSTALL_DATA_DIR) $(includedir)/wx/protocol
 +	$(INSTALL_DATA_DIR) $(includedir)/wx/unix
  	@list='$(HEADERS)'; for p in $$list; do \
@@ -343,47 +348,22 @@ $NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $
  	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
  	done
  
--	$(INSTALL) -d $(localedir)
+-	@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
++	@if test ! -d $(localedir); then $(INSTALL_DATA_DIR) $(localedir); fi
  	@for p in $(WX_LINGUAS); do \
--	  $(INSTALL) -d $(localedir)/$$p; \
--	  $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+-	  if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
+-	  if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
++	  if test ! -d $(localedir)/$$p; then $(INSTALL_DATA_DIR) $(localedir)/$$p; fi;\
++	  if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL_DATA_DIR) $(localedir)/$$p/LC_MESSAGES; fi;\
  	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
  	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
  	done
-@@ -476,7 +308,6 @@
- 	@echo " "
- 	@echo " Installing wxWindows OpenGl add-on..."
- 	@echo " "
--	$(INSTALL) -d $(libdir)
- 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+@@ -474,7 +323,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGE
+ 	@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@
-@@ -565,10 +396,6 @@
- 	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
- 	mkdir $(DISTDIR)/src
- 	mkdir $(DISTDIR)/src/zlib
--	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
--	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
--	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
--	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
- 
- # this target is the common part of distribution script for all GUI toolkits,
- # but is not used when building wxBase distribution
-@@ -600,7 +427,6 @@
- 	mkdir $(DISTDIR)/src/html/bitmaps
- 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
- 	mkdir $(DISTDIR)/src/png
--	mkdir $(DISTDIR)/src/jpeg
- 	mkdir $(DISTDIR)/src/tiff
- 	mkdir $(DISTDIR)/src/iodbc
- 	mkdir $(DISTDIR)/src/unix
-@@ -623,9 +449,6 @@
- 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
- 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
- 	cp $(PNGDIR)/README $(DISTDIR)/src/png
--	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
--	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
--	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
- 	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
- 	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
- 	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
+-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
++install: @AFMINSTALL@ m4datainstall @WIN32INSTALL@
+ 	@echo " "
+ 	@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/wxGTK/patches/patch-ac b/x11/wxGTK/patches/patch-ac
index cd4b1dd8905..dc7e010b71a 100644
--- a/x11/wxGTK/patches/patch-ac
+++ b/x11/wxGTK/patches/patch-ac
@@ -1,71 +1,62 @@
-$NetBSD: patch-ac,v 1.3 2000/09/01 02:45:57 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2003/03/31 17:44:22 jmmv Exp $
 
---- src/makelib.env.in.orig	Sun Aug 20 04:52:57 2000
-+++ src/makelib.env.in	Thu Aug 31 14:03:25 2000
-@@ -34,23 +34,21 @@
+--- src/makelib.env.in.orig	Thu Mar  6 01:16:24 2003
++++ src/makelib.env.in	Thu Mar  6 23:16:16 2003
+@@ -33,6 +33,7 @@
+ INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_DATA = @INSTALL_DATA_DIR@
  
--TARGETLIB_STATIC = $(TARGET_LIBNAME).a
--TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
--TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
--TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
-+#TARGETLIB_STATIC = $(TARGET_LIBNAME).a
-+#TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
+ TARGETLIB_STATIC = $(TARGET_LIBNAME).a
+ TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
+@@ -47,13 +48,13 @@
+ .SUFFIXES: .o .c .cpp .cxx
  
--TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS)  -o $@ $<
  
- # Clears all default suffixes
--.SUFFIXES:	.o .cpp .c .cxx
-+.SUFFIXES:	.o .cpp .c .cxx
- 
--.c.o :
--	$(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
-+.c.o :
-+	${LIBTOOL} --mode=compile $(CCC) -c $(CFLAGS)  -o $@ $<
- 
--.cpp.o :
--	$(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+.cpp.o :
+ .cpp.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 +	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS)  -o $@ $<
  
--.cxx.o :
--	$(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+.cxx.o :
+ .cxx.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 +	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS)  -o $@ $<
  
  # the comment at the end of the next line is needed because otherwise autoconf
-@@ -62,40 +60,19 @@
+ # would remove this line completely - it contains a built-in hack to remove
+@@ -62,40 +63,21 @@
  
+ include $(top_builddir)/src/make.env
  
 -all: libtype_@WX_TARGET_LIBRARY_TYPE@
 +all: $(TARGET_LIBNAME).la 
  
--libtype_so: CREATE_LINKS
- 
--libtype_a: $(TARGETLIB_STATIC)
+-libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
 -
+-libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
 -
--$(TARGETLIB_SHARED): $(OBJECTS)
+-$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
 -	@$(INSTALL) -d $(top_builddir)/lib
--	$(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
--
--CREATE_LINKS: $(TARGETLIB_SHARED)
+-	$(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)
 -
--$(TARGETLIB_STATIC): $(OBJECTS)
+-$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
+-	@$(INSTALL) -d $(top_builddir)/lib
 +$(TARGET_LIBNAME).la: $(OBJECTS)
- 	@$(INSTALL) -d $(top_builddir)/lib
--	ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
--	$(RANLIB) $(top_builddir)/lib/$@
++	@$(INSTALL_DATA_DIR) $(top_builddir)/lib
+ 	@$(RM) $@
+-	$(AR) $(AROPTIONS) $@ $(OBJECTS)
+-	$(RANLIB) $@
 -
 -install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 +	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJECTS:.o=.lo} \
-+	-rpath ${PREFIX}/lib -version-info major:minor \
++	-rpath ${PREFIX}/lib -version-info major:minor
  
 -install_so:
 -	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
@@ -85,3 +76,4 @@ $NetBSD: patch-ac,v 1.3 2000/09/01 02:45:57 dmcmahill Exp $
 +	$(INSTALL_DATA_DIR)  $(includedir)/wx/$(HEADER_SUBDIR)
  	@for h in $(HEADERS); do \
  	  $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+ 	  echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \
diff --git a/x11/wxGTK/patches/patch-ad b/x11/wxGTK/patches/patch-ad
index 7bffdbd2cd6..dcff18682e6 100644
--- a/x11/wxGTK/patches/patch-ad
+++ b/x11/wxGTK/patches/patch-ad
@@ -1,16 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2001/06/15 16:53:27 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2003/03/31 17:44:22 jmmv Exp $
 
---- src/common/unzip.h.orig	Thu Jun 14 23:50:13 2001
-+++ src/common/unzip.h	Fri Jun 15 00:07:59 2001
-@@ -56,6 +56,11 @@
- #include "zlib.h"
- #endif
+--- wx-config.in.orig	Mon Mar 10 01:34:49 2003
++++ wx-config.in	Mon Mar 10 01:35:42 2003
+@@ -139,7 +139,7 @@
+       if test $static_flag = yes ; then
+           echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
+       else
+-          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
++          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@
+       fi
  
-+#ifndef OF
-+#include <ctype.h>
-+#define OF(x) __P(x)
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
+       ;;