Import old 2.4 branch of wxGTK as wxGTK24, for packages that still need it.

14 files changed, 1110 insertions, 0 deletions

diff --git a/x11/wxGTK24/DESCR b/x11/wxGTK24/DESCR
new file mode 100644
index 00000000000..9c14979e7d4
--- /dev/null
+++ b/x11/wxGTK24/DESCR
@@ -0,0 +1,25 @@
+A GTK+-based implementation of the wxWidgets cross-platform GUI library.
+This package contains the older 2.4 release.
+
+wxWidgets is a set of libraries that allows C++ applications to compile and
+run on several different types of computer, with minimal source code changes.
+There is one library per supported GUI (such as Windows, GTK+, Motif, and
+Mac). As well as providing a common API (Application Programming Interface)
+for GUI functionality, it provides functionality for accessing some
+commonly-used operating system facilities, from copying and deleting files
+to socket and thread support. wxWidgets is a 'framework' in the sense that
+it provides a lot of built-in functionality, which the application can use
+or replace as required, thus saving a great deal of coding effort. Basic data
+structures such as strings, arrays, linked lists and hash tables are also
+supported.
+
+Such a toolkit is not unique - there are others to choose from - but wxWidgets
+is free, well-established, well-documented, and very broad in its coverage
+of GUI functionality. It has some extras that make it stand out from the
+crowd, such as the many convenience dialogs, built-in HTML display and
+printing, virtual filesystems, easy-to-use OLE automation controller class,
+Open GL support, and many other features that make it easier to write modern
+and user-friendly applications.
+
+There is also a python interface available, wxPython (see the py-wxWidgets
+package).
diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
new file mode 100644
index 00000000000..20d1b23947b
--- /dev/null
+++ b/x11/wxGTK24/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/08/07 11:27:28 wiz Exp $
+#
+
+.include "Makefile.common"
+
+PKGREVISION=		6
+COMMENT=		GTK-based implementation of the wxWidgets GUI library
+CONFLICTS+=		wxGTK<=2.4.2nb5
+
+post-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
+
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common
new file mode 100644
index 00000000000..ce8210c72ed
--- /dev/null
+++ b/x11/wxGTK24/Makefile.common
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2005/08/07 11:27:28 wiz Exp $
+#
+
+DISTNAME=		wxGTK-2.4.2
+PKGNAME=		${DISTNAME:S/wxGTK/wxGTK24/}
+CATEGORIES=		x11
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		tsarna@NetBSD.org
+HOMEPAGE=		http://www.wxwidgets.org/
+
+PATCHDIR=		${.CURDIR}/../../x11/wxGTK24/patches
+DISTINFO_FILE=		${.CURDIR}/../../x11/wxGTK24/distinfo
+
+USE_PKGLOCALEDIR=	YES
+USE_LIBTOOL=		YES
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-opengl
+CONFIGURE_ARGS+=	--with-libjpeg=sys
+CONFIGURE_ARGS+=	--with-zlib=sys
+CONFIGURE_ARGS+=	--with-libpng=sys
+CONFIGURE_ARGS+=	--with-libtiff=sys
+CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
+
+CPPFLAGS+=		-Dunix=1	# src/common/unzip.c needs this
+
+DOCDIR=			${PREFIX}/share/doc/wx/gtk
+
+.include "../../mk/bsd.prefs.mk"
+
+# This is needed for gtk on some platforms and
+# it doesn't hurt on those which don't need it
+CONFIGURE_ARGS+=	--with-gtk
+
+CONFIGURE_ARGS+=	--enable-gtk2
+PLIST_SUBST+=		GTKVER=2
+
+.include "../../devel/pkg-config/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/wxGTK24/PLIST b/x11/wxGTK24/PLIST
new file mode 100644
index 00000000000..a642b085a1e
--- /dev/null
+++ b/x11/wxGTK24/PLIST
@@ -0,0 +1,416 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+bin/wx24-config
+bin/wxgtk${GTKVER}-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
+include/wx/date.h
+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
+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/dirctrl.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/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
+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/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/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/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/timer.h
+include/wx/generic/treectlg.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/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/scrolwin.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/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/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/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
+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
+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/memtext.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/msgout.h
+include/wx/mstream.h
+include/wx/notebook.h
+include/wx/object.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/platform.h
+include/wx/popupwin.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/quantize.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
+include/wx/sckaddr.h
+include/wx/sckipc.h
+include/wx/sckstrm.h
+include/wx/scrolbar.h
+include/wx/scrolwin.h
+include/wx/settings.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
+include/wx/stattext.h
+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
+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
+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/xpmdecod.h
+include/wx/zipstrm.h
+include/wx/zstream.h
+lib/libwx_gtk${GTKVER}.la
+lib/libwx_gtk${GTKVER}_gl-2.4.la
+lib/wx/include/gtk${GTKVER}-2.4/wx/setup.h
+share/doc/wx/gtk/LICENSE
+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/gtk${GTKVER}-2.4/wx
+@dirrm lib/wx/include/gtk${GTKVER}-2.4
+@exec ${MKDIR} %D/lib/wx/include/univ
+@unexec ${RMDIR} %D/lib/wx/include/univ 2>/dev/null || ${TRUE}
+@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
+@unexec ${RMDIR} %D/include/wx 2>/dev/null || ${TRUE}
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
new file mode 100644
index 00000000000..aac1477b649
--- /dev/null
+++ b/x11/wxGTK24/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+WXGTK24_BUILDLINK3_MK:=	${WXGTK24_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	wxGTK24
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK24}
+BUILDLINK_PACKAGES+=	wxGTK24
+
+.if !empty(WXGTK24_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
+BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
+.endif	# WXGTK24_BUILDLINK3_MK
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
new file mode 100644
index 00000000000..978b78f58ca
--- /dev/null
+++ b/x11/wxGTK24/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
+RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
+Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
+SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29
+SHA1 (patch-ab) = dc6cfdc5e21186cfed240e27768ea2c4a6906152
+SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
+SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
+SHA1 (patch-ae) = 81c2e33fbdd4a715da5a14ef3ae0a377d0d9aec2
+SHA1 (patch-af) = 81cddc6dcdf986317f7d62f027515cae6ef2c855
+SHA1 (patch-ag) = ccdaca4030c08aefa922367019e0c9249b810456
+SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253
diff --git a/x11/wxGTK24/patches/patch-aa b/x11/wxGTK24/patches/patch-aa
new file mode 100644
index 00000000000..b918b06bae2
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- configure.orig	Sun Sep 21 11:31:30 2003
++++ configure
+@@ -11498,9 +11498,10 @@ SEARCH_INCLUDE="\
+     /usr/local/x11r5/include  \
+     /usr/lpp/Xamples/include  \
+                               \
+-    /usr/openwin/share/include"
++    /usr/openwin/share/include\
++    ${BUILDLINK_DIR}/include"
+ 
+-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
++SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
+ 
+ 
+ cat > confcache <<\EOF
+@@ -16104,8 +16105,8 @@ esac
+ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
+ 
+-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}"
+@@ -22777,6 +22778,7 @@ s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER
+ s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
+ s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
+ s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
++s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
+ s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
+ s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
+ s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
diff --git a/x11/wxGTK24/patches/patch-ab b/x11/wxGTK24/patches/patch-ab
new file mode 100644
index 00000000000..216a5ce1991
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-ab
@@ -0,0 +1,372 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- Makefile.in.orig	2003-09-21 13:31:27.000000000 +0200
++++ Makefile.in
+@@ -21,13 +21,13 @@ include ./src/make.env
+ .SUFFIXES: .o .c .cpp .cxx .rsrc .r
+ 
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
+ 
+ .cpp.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ .cxx.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ .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@$(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
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -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}
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+ 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
+-PNGDIR   = $(WXDIR)/src/png
+-JPEGDIR  = $(WXDIR)/src/jpeg
+-TIFFDIR  = $(WXDIR)/src/tiff
+-ZLIBDIR  = $(WXDIR)/src/zlib
+ REGEXDIR = $(WXDIR)/src/regex
+ GTKDIR   = $(WXDIR)/src/gtk
+ X11DIR   = $(WXDIR)/src/x11
+@@ -161,124 +154,6 @@ REGEXOBJS = \
+ 		regerror.o \
+ 		regfree.o
+ 
+-ZLIBOBJS = \
+-		adler32.o \
+-		compress.o \
+-		crc32.o \
+-		gzio.o \
+-		uncompr.o \
+-		deflate.o \
+-		trees.o \
+-		zutil.o \
+-		inflate.o \
+-		infblock.o \
+-		inftrees.o \
+-		infcodes.o \
+-		infutil.o \
+-		inffast.o
+-
+-PNGOBJS = \
+-		png.o \
+-		pngerror.o \
+-		pnggccrd.o \
+-		pngget.o \
+-		pngmem.o \
+-		pngpread.o \
+-		pngread.o \
+-		pngrio.o \
+-		pngrtran.o \
+-		pngrutil.o \
+-		pngset.o \
+-		pngtrans.o \
+-		pngvcrd.o \
+-		pngwio.o \
+-		pngwrite.o \
+-		pngwtran.o \
+-		pngwutil.o
+-
+-JPEGOBJS = \
+-		jcomapi.o \
+-		jutils.o \
+-		jerror.o \
+-		jmemmgr.o \
+-		jmemnobs.o \
+-		jcapimin.o \
+-		jcapistd.o \
+-		jctrans.o \
+-		jcparam.o \
+-		jdatadst.o \
+-		jcinit.o \
+-		jcmaster.o \
+-		jcmarker.o \
+-		jcmainct.o \
+-		jcprepct.o \
+-		jccoefct.o \
+-		jccolor.o \
+-		jcsample.o \
+-		jchuff.o \
+-		jcphuff.o \
+-		jcdctmgr.o \
+-		jfdctfst.o \
+-		jfdctflt.o \
+-		jfdctint.o \
+-		jdapimin.o \
+-		jdapistd.o \
+-		jdtrans.o \
+-		jdatasrc.o \
+-		jdmaster.o \
+-		jdinput.o \
+-		jdmarker.o \
+-		jdhuff.o \
+-		jdphuff.o \
+-		jdmainct.o \
+-		jdcoefct.o \
+-		jdpostct.o \
+-		jddctmgr.o \
+-		jidctfst.o \
+-		jidctflt.o \
+-		jidctint.o \
+-		jidctred.o \
+-		jdsample.o \
+-		jdcolor.o \
+-		jquant1.o \
+-		jquant2.o \
+-		jdmerge.o
+-
+-TIFFOBJS = \
+-		tif_aux.o \
+-		tif_close.o \
+-		tif_codec.o \
+-		tif_compress.o \
+-		tif_dir.o \
+-		tif_dirinfo.o \
+-		tif_dirread.o \
+-		tif_dirwrite.o \
+-		tif_dumpmode.o \
+-		tif_error.o \
+-		tif_fax3.o \
+-		tif_fax3sm.o \
+-		tif_getimage.o \
+-		tif_jpeg.o \
+-		tif_flush.o \
+-		tif_lzw.o \
+-		tif_luv.o \
+-		tif_next.o \
+-		tif_open.o \
+-		tif_packbits.o \
+-		tif_pixarlog.o \
+-		tif_predict.o \
+-		tif_print.o \
+-		tif_read.o \
+-		tif_swab.o \
+-		tif_strip.o \
+-		tif_thunder.o \
+-		tif_tile.o \
+-		tif_unix.o \
+-		tif_version.o \
+-		tif_warning.o \
+-		tif_write.o \
+-		tif_zip.o
+-
+ IODBCOBJS = \
+ 		catalog.o \
+ 		connect.o \
+@@ -302,52 +177,27 @@ IODBCOBJS = \
+ SONAME_FLAGS = @SONAME_FLAGS@
+ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
+ 
+-all: @WX_ALL@
++all: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(build_libdir)/lib@WX_LIBRARY_GL@.la
+ 
+-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
+-	@$(INSTALL) -d $(build_libdir)
+-	@$(RM) $@
+-	$(AR) $(AROPTIONS) $@ $(OBJECTS)
+-	$(RANLIB) $@
+-
+-$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
+-	@$(INSTALL) -d $(build_libdir)
+-	@$(RM) $@
+-	$(AR) $(AROPTIONS) $@ glcanvas.o
+-	$(RANLIB) $@
+-
+-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
+-	@$(INSTALL) -d $(build_libdir)
+-	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
++$(build_libdir)/lib@WX_LIBRARY_BASENAME@.la: $(OBJECTS)
++	@$(INSTALL_DATA_DIR) $(build_libdir)
++	${LIBTOOL} --mode=link ${CXX} -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1
+ 
+ # 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)
+-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
++$(build_libdir)/lib@WX_LIBRARY_GL@.la: glcanvas.o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la
++	@$(INSTALL_DATA_DIR) $(build_libdir)
++	${LIBTOOL} --mode=link ${CXX} -o $(build_libdir)/lib@WX_LIBRARY_GL@.la glcanvas.lo ${EXTRALIBS} $(LDFLAGS_GL) $(OPENGLLIBS) -rpath ${PREFIX}/lib -version-info 0:1
+ 
+ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
+-	@$(INSTALL) -d $(build_libdir)
++	@$(INSTALL_DATA_DIR) $(build_libdir)
+ 	$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
+ 
+-$(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@
+-
+-$(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@
+-
+ $(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 +219,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@
+-	cd $(libdir) \
+-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+-		&& $(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@
+@@ -385,10 +228,10 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
+ 
+ afminstall: preinstall
+ 	@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_DIR) $(datadir)/wx
++	$(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 +253,51 @@ win32install: preinstall
+ 
+ # this is the real install target: copies the library, wx-config and the
+ # headers to the installation directory
+-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 " "
+ 
+-	@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@
++	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx24-config
++	${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/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/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
+-	@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 \
+ 	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
+ 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
+ 	done
+ 
+-	@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 \
+-	  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
+@@ -467,14 +310,14 @@ preinstall_res: $(build_libdir)/@WX_RESO
+ 	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@
+ 	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@
+ 
+-preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
++preinstall_gl: $(build_libdir)/lib@WX_LIBRARY_GL@.la
+ 	@echo " "
+ 	@echo " Installing wxWindows OpenGl add-on..."
+ 	@echo " "
+-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+-	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
++	@if test ! -d $(libdir); then $(INSTALL_DATA_DIR) $(libdir); fi
++	${LIBTOOL} --mode=install ${INSTALL_DATA} $(build_libdir)/lib@WX_LIBRARY_GL@.la $(libdir)
+ 
+-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
++install: @AFMINSTALL@ preinstall_gl @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/wxGTK24/patches/patch-ac b/x11/wxGTK24/patches/patch-ac
new file mode 100644
index 00000000000..a2ffb7711b5
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-ac
@@ -0,0 +1,79 @@
+$NetBSD: patch-ac,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- src/makelib.env.in.orig	2003-09-21 13:31:38.000000000 +0200
++++ src/makelib.env.in
+@@ -33,6 +33,7 @@ libdir = @libdir@
+ 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)
+@@ -47,13 +48,13 @@ LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING
+ .SUFFIXES: .o .c .cpp .cxx
+ 
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS)  -o $@ $<
+ 
+ .cpp.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ .cxx.o:
+-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ # 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
+@@ -62,40 +63,21 @@ VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc
+ 
+ include $(top_builddir)/src/make.env
+ 
+-all: libtype_@WX_TARGET_LIBRARY_TYPE@
++all: $(TARGET_LIBNAME).la 
+ 
+-libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
+-
+-libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
+-
+-$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
+-	@$(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)
+-
+-$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS)
+-	@$(INSTALL) -d $(top_builddir)/lib
++$(TARGET_LIBNAME).la: $(OBJECTS)
++	@$(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 0:1
+ 
+-install_so:
+-	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
+-	@$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
+-	cd $(libdir) \
+-		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+-		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
++install: install_lib install_headers
+ 
+-install_a:
+-	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
++install_lib:
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TARGET_LIBNAME}.la ${PREFIX}/lib
+ 
+ install_headers:
+-	$(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
++	$(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/wxGTK24/patches/patch-ad b/x11/wxGTK24/patches/patch-ad
new file mode 100644
index 00000000000..d2ceb18bbf3
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- wx-config.in.orig	2003-09-21 13:31:27.000000000 +0200
++++ wx-config.in	2003-09-25 00:31:44.000000000 +0200
+@@ -147,7 +147,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
+ 
+       ;;
diff --git a/x11/wxGTK24/patches/patch-ae b/x11/wxGTK24/patches/patch-ae
new file mode 100644
index 00000000000..6aef7a2f135
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- src/gtk/dcclient.cpp.orig	2003-09-21 13:31:57.000000000 +0200
++++ src/gtk/dcclient.cpp	2005-01-02 14:11:00.000000000 +0100
+@@ -1666,8 +1666,10 @@
+     if (height) (*height) = (wxCoord) h;
+     if (descent)
+     {
+-        // Do something about metrics here. TODO.
+-        (*descent) = 0;
++        PangoLayoutIter *iter = pango_layout_get_iter(layout);
++        int baseline = pango_layout_iter_get_baseline(iter);
++        pango_layout_iter_free(iter);
++        *descent = h - PANGO_PIXELS(baseline);
+     }
+     if (externalLeading) (*externalLeading) = 0;  // ??
+     
diff --git a/x11/wxGTK24/patches/patch-af b/x11/wxGTK24/patches/patch-af
new file mode 100644
index 00000000000..351bd60dcd9
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- src/gtk/window.cpp.orig	2003-09-21 13:31:58.000000000 +0200
++++ src/gtk/window.cpp	2005-01-02 14:11:08.000000000 +0100
+@@ -3448,8 +3448,10 @@
+     if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
+     if (descent)
+     {
+-        // Do something about metrics here
+-        (*descent) = 0;
++        PangoLayoutIter *iter = pango_layout_get_iter(layout);
++        int baseline = pango_layout_iter_get_baseline(iter);
++        pango_layout_iter_free(iter);
++        *descent = *y - PANGO_PIXELS(baseline);
+     }
+     if (externalLeading) (*externalLeading) = 0;  // ??
+ 
diff --git a/x11/wxGTK24/patches/patch-ag b/x11/wxGTK24/patches/patch-ag
new file mode 100644
index 00000000000..467d0934156
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- wxwin.m4.orig	2003-09-21 13:31:27.000000000 +0200
++++ wxwin.m4
+@@ -33,7 +33,7 @@ dnl adds support for --wx-prefix, --wx-e
+ dnl command line options
+ dnl ---------------------------------------------------------------------------
+ 
+-AC_DEFUN(AM_OPTIONS_WXCONFIG,
++AC_DEFUN([AM_OPTIONS_WXCONFIG],
+ [
+    AC_ARG_WITH(wx-prefix, [  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)],
+                wx_config_prefix="$withval", wx_config_prefix="")
+@@ -56,7 +56,7 @@ dnl ------------------------------------
+ dnl
+ dnl Get the cflags and libraries from the wx-config script
+ dnl
+-AC_DEFUN(AM_PATH_WXCONFIG,
++AC_DEFUN([AM_PATH_WXCONFIG],
+ [
+   dnl do we have wx-config name: it can be wx-config or wxd-config or ...
+   if test x${WX_CONFIG_NAME+set} != xset ; then
diff --git a/x11/wxGTK24/patches/patch-ah b/x11/wxGTK24/patches/patch-ah
new file mode 100644
index 00000000000..194219d8d67
--- /dev/null
+++ b/x11/wxGTK24/patches/patch-ah
@@ -0,0 +1,9 @@
+$NetBSD: patch-ah,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+
+--- contrib/src/Makefile.in.orig	Sun Sep 21 13:32:39 2003
++++ contrib/src/Makefile.in
+@@ -2,3 +2,3 @@
+ 
+-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 #applet
+