Revert old state after mistyped cvs import.

6 files changed, 430 insertions, 812 deletions

diff --git a/x11/wxGTK24/DESCR b/x11/wxGTK24/DESCR
index e81d1b332b4..9c14979e7d4 100644
--- a/x11/wxGTK24/DESCR
+++ b/x11/wxGTK24/DESCR
@@ -1,23 +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.
+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.
+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/PLIST b/x11/wxGTK24/PLIST
index e31160f80bf..4d83d2ad1c3 100644
--- a/x11/wxGTK24/PLIST
+++ b/x11/wxGTK24/PLIST
@@ -1,519 +1,416 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2008/09/22 19:43:11 joerg Exp $
-bin/wx-config
-bin/wxrc
-bin/wxrc-2.6
-include/wx-2.6/wx/accel.h
-include/wx-2.6/wx/access.h
-include/wx-2.6/wx/afterstd.h
-include/wx-2.6/wx/app.h
-include/wx-2.6/wx/apptrait.h
-include/wx-2.6/wx/archive.h
-include/wx-2.6/wx/arrimpl.cpp
-include/wx-2.6/wx/arrstr.h
-include/wx-2.6/wx/artprov.h
-include/wx-2.6/wx/beforestd.h
-include/wx-2.6/wx/bitmap.h
-include/wx-2.6/wx/bmpbuttn.h
-include/wx-2.6/wx/bookctrl.h
-include/wx-2.6/wx/brush.h
-include/wx-2.6/wx/buffer.h
-include/wx-2.6/wx/build.h
-include/wx-2.6/wx/busyinfo.h
-include/wx-2.6/wx/button.h
-include/wx-2.6/wx/calctrl.h
-include/wx-2.6/wx/caret.h
-include/wx-2.6/wx/checkbox.h
-include/wx-2.6/wx/checklst.h
-include/wx-2.6/wx/chkconf.h
-include/wx-2.6/wx/choicdlg.h
-include/wx-2.6/wx/choice.h
-include/wx-2.6/wx/choicebk.h
-include/wx-2.6/wx/clipbrd.h
-include/wx-2.6/wx/clntdata.h
-include/wx-2.6/wx/cmdline.h
-include/wx-2.6/wx/cmdproc.h
-include/wx-2.6/wx/cmndata.h
-include/wx-2.6/wx/colordlg.h
-include/wx-2.6/wx/colour.h
-include/wx-2.6/wx/combobox.h
-include/wx-2.6/wx/confbase.h
-include/wx-2.6/wx/config.h
-include/wx-2.6/wx/containr.h
-include/wx-2.6/wx/control.h
-include/wx-2.6/wx/cshelp.h
-include/wx-2.6/wx/ctrlsub.h
-include/wx-2.6/wx/cursor.h
-include/wx-2.6/wx/dataobj.h
-include/wx-2.6/wx/datectrl.h
-include/wx-2.6/wx/dateevt.h
-include/wx-2.6/wx/datetime.h
-include/wx-2.6/wx/datstrm.h
-include/wx-2.6/wx/db.h
-include/wx-2.6/wx/dbgrid.h
-include/wx-2.6/wx/dbkeyg.h
-include/wx-2.6/wx/dbtable.h
-include/wx-2.6/wx/dc.h
-include/wx-2.6/wx/dcbuffer.h
-include/wx-2.6/wx/dcclient.h
-include/wx-2.6/wx/dcmemory.h
-include/wx-2.6/wx/dcmirror.h
-include/wx-2.6/wx/dcprint.h
-include/wx-2.6/wx/dcps.h
-include/wx-2.6/wx/dcscreen.h
-include/wx-2.6/wx/dde.h
-include/wx-2.6/wx/debug.h
-include/wx-2.6/wx/debugrpt.h
-include/wx-2.6/wx/defs.h
-include/wx-2.6/wx/dialog.h
-include/wx-2.6/wx/dialup.h
-include/wx-2.6/wx/dir.h
-include/wx-2.6/wx/dirctrl.h
-include/wx-2.6/wx/dirdlg.h
-include/wx-2.6/wx/display.h
-include/wx-2.6/wx/dlimpexp.h
-include/wx-2.6/wx/dnd.h
-include/wx-2.6/wx/docmdi.h
-include/wx-2.6/wx/docview.h
-include/wx-2.6/wx/dragimag.h
-include/wx-2.6/wx/dynarray.h
-include/wx-2.6/wx/dynlib.h
-include/wx-2.6/wx/dynload.h
-include/wx-2.6/wx/effects.h
-include/wx-2.6/wx/encconv.h
-include/wx-2.6/wx/encinfo.h
-include/wx-2.6/wx/event.h
-include/wx-2.6/wx/evtloop.h
-include/wx-2.6/wx/except.h
-include/wx-2.6/wx/fdrepdlg.h
-include/wx-2.6/wx/features.h
-include/wx-2.6/wx/ffile.h
-include/wx-2.6/wx/file.h
-include/wx-2.6/wx/fileconf.h
-include/wx-2.6/wx/filedlg.h
-include/wx-2.6/wx/filefn.h
-include/wx-2.6/wx/filename.h
-include/wx-2.6/wx/filesys.h
-include/wx-2.6/wx/fmappriv.h
-include/wx-2.6/wx/font.h
-include/wx-2.6/wx/fontdlg.h
-include/wx-2.6/wx/fontenc.h
-include/wx-2.6/wx/fontenum.h
-include/wx-2.6/wx/fontmap.h
-include/wx-2.6/wx/fontutil.h
-include/wx-2.6/wx/frame.h
-include/wx-2.6/wx/fs_inet.h
-include/wx-2.6/wx/fs_mem.h
-include/wx-2.6/wx/fs_zip.h
-include/wx-2.6/wx/gauge.h
-include/wx-2.6/wx/gbsizer.h
-include/wx-2.6/wx/gdicmn.h
-include/wx-2.6/wx/gdiobj.h
-include/wx-2.6/wx/generic/accel.h
-include/wx-2.6/wx/generic/calctrl.h
-include/wx-2.6/wx/generic/caret.h
-include/wx-2.6/wx/generic/choicdgg.h
-include/wx-2.6/wx/generic/colrdlgg.h
-include/wx-2.6/wx/generic/datectrl.h
-include/wx-2.6/wx/generic/dcpsg.h
-include/wx-2.6/wx/generic/dirctrlg.h
-include/wx-2.6/wx/generic/dirdlgg.h
-include/wx-2.6/wx/generic/dragimgg.h
-include/wx-2.6/wx/generic/fdrepdlg.h
-include/wx-2.6/wx/generic/filedlgg.h
-include/wx-2.6/wx/generic/fontdlgg.h
-include/wx-2.6/wx/generic/grid.h
-include/wx-2.6/wx/generic/gridctrl.h
-include/wx-2.6/wx/generic/gridsel.h
-include/wx-2.6/wx/generic/helpext.h
-include/wx-2.6/wx/generic/imaglist.h
-include/wx-2.6/wx/generic/laywin.h
-include/wx-2.6/wx/generic/listctrl.h
-include/wx-2.6/wx/generic/logg.h
-include/wx-2.6/wx/generic/msgdlgg.h
-include/wx-2.6/wx/generic/notebook.h
-include/wx-2.6/wx/generic/numdlgg.h
-include/wx-2.6/wx/generic/paletteg.h
-include/wx-2.6/wx/generic/panelg.h
-include/wx-2.6/wx/generic/printps.h
-include/wx-2.6/wx/generic/prntdlgg.h
-include/wx-2.6/wx/generic/progdlgg.h
-include/wx-2.6/wx/generic/propdlg.h
-include/wx-2.6/wx/generic/sashwin.h
-include/wx-2.6/wx/generic/scrolwin.h
-include/wx-2.6/wx/generic/spinctlg.h
-include/wx-2.6/wx/generic/splash.h
-include/wx-2.6/wx/generic/splitter.h
-include/wx-2.6/wx/generic/statusbr.h
-include/wx-2.6/wx/generic/tabg.h
-include/wx-2.6/wx/generic/textdlgg.h
-include/wx-2.6/wx/generic/timer.h
-include/wx-2.6/wx/generic/treectlg.h
-include/wx-2.6/wx/generic/wizard.h
-include/wx-2.6/wx/geometry.h
-include/wx-2.6/wx/gifdecod.h
-include/wx-2.6/wx/glcanvas.h
-include/wx-2.6/wx/grid.h
-include/wx-2.6/wx/gsocket.h
-include/wx-2.6/wx/gtk/accel.h
-include/wx-2.6/wx/gtk/app.h
-include/wx-2.6/wx/gtk/bitmap.h
-include/wx-2.6/wx/gtk/bmpbuttn.h
-include/wx-2.6/wx/gtk/brush.h
-include/wx-2.6/wx/gtk/button.h
-include/wx-2.6/wx/gtk/checkbox.h
-include/wx-2.6/wx/gtk/checklst.h
-include/wx-2.6/wx/gtk/choice.h
-include/wx-2.6/wx/gtk/clipbrd.h
-include/wx-2.6/wx/gtk/colordlg.h
-include/wx-2.6/wx/gtk/colour.h
-include/wx-2.6/wx/gtk/combobox.h
-include/wx-2.6/wx/gtk/control.h
-include/wx-2.6/wx/gtk/cursor.h
-include/wx-2.6/wx/gtk/dataform.h
-include/wx-2.6/wx/gtk/dataobj.h
-include/wx-2.6/wx/gtk/dataobj2.h
-include/wx-2.6/wx/gtk/dc.h
-include/wx-2.6/wx/gtk/dcclient.h
-include/wx-2.6/wx/gtk/dcmemory.h
-include/wx-2.6/wx/gtk/dcscreen.h
-include/wx-2.6/wx/gtk/dialog.h
-include/wx-2.6/wx/gtk/dnd.h
-include/wx-2.6/wx/gtk/filedlg.h
-include/wx-2.6/wx/gtk/font.h
-include/wx-2.6/wx/gtk/fontdlg.h
-include/wx-2.6/wx/gtk/frame.h
-include/wx-2.6/wx/gtk/gauge.h
-include/wx-2.6/wx/gtk/gdiobj.h
-include/wx-2.6/wx/gtk/glcanvas.h
-include/wx-2.6/wx/gtk/gnome/gprint.h
-include/wx-2.6/wx/gtk/icon.h
-include/wx-2.6/wx/gtk/listbox.h
-include/wx-2.6/wx/gtk/mdi.h
-include/wx-2.6/wx/gtk/menu.h
-include/wx-2.6/wx/gtk/menuitem.h
-include/wx-2.6/wx/gtk/minifram.h
-include/wx-2.6/wx/gtk/msgdlg.h
-include/wx-2.6/wx/gtk/notebook.h
-include/wx-2.6/wx/gtk/pen.h
-include/wx-2.6/wx/gtk/popupwin.h
-include/wx-2.6/wx/gtk/radiobox.h
-include/wx-2.6/wx/gtk/radiobut.h
-include/wx-2.6/wx/gtk/region.h
-include/wx-2.6/wx/gtk/scrolbar.h
-include/wx-2.6/wx/gtk/scrolwin.h
-include/wx-2.6/wx/gtk/slider.h
-include/wx-2.6/wx/gtk/spinbutt.h
-include/wx-2.6/wx/gtk/spinctrl.h
-include/wx-2.6/wx/gtk/statbmp.h
-include/wx-2.6/wx/gtk/statbox.h
-include/wx-2.6/wx/gtk/statline.h
-include/wx-2.6/wx/gtk/stattext.h
-include/wx-2.6/wx/gtk/tbargtk.h
-include/wx-2.6/wx/gtk/textctrl.h
-include/wx-2.6/wx/gtk/tglbtn.h
-include/wx-2.6/wx/gtk/timer.h
-include/wx-2.6/wx/gtk/tooltip.h
-include/wx-2.6/wx/gtk/toplevel.h
-include/wx-2.6/wx/gtk/treectrl.h
-include/wx-2.6/wx/gtk/win_gtk.h
-include/wx-2.6/wx/gtk/window.h
-include/wx-2.6/wx/hash.h
-include/wx-2.6/wx/hashmap.h
-include/wx-2.6/wx/hashset.h
-include/wx-2.6/wx/help.h
-include/wx-2.6/wx/helpbase.h
-include/wx-2.6/wx/helphtml.h
-include/wx-2.6/wx/helpwin.h
-include/wx-2.6/wx/html/forcelnk.h
-include/wx-2.6/wx/html/helpctrl.h
-include/wx-2.6/wx/html/helpdata.h
-include/wx-2.6/wx/html/helpfrm.h
-include/wx-2.6/wx/html/htmlcell.h
-include/wx-2.6/wx/html/htmldefs.h
-include/wx-2.6/wx/html/htmlfilt.h
-include/wx-2.6/wx/html/htmlpars.h
-include/wx-2.6/wx/html/htmlproc.h
-include/wx-2.6/wx/html/htmltag.h
-include/wx-2.6/wx/html/htmlwin.h
-include/wx-2.6/wx/html/htmprint.h
-include/wx-2.6/wx/html/m_templ.h
-include/wx-2.6/wx/html/winpars.h
-include/wx-2.6/wx/htmllbox.h
-include/wx-2.6/wx/icon.h
-include/wx-2.6/wx/iconbndl.h
-include/wx-2.6/wx/iconloc.h
-include/wx-2.6/wx/imagbmp.h
-include/wx-2.6/wx/image.h
-include/wx-2.6/wx/imaggif.h
-include/wx-2.6/wx/imagiff.h
-include/wx-2.6/wx/imagjpeg.h
-include/wx-2.6/wx/imaglist.h
-include/wx-2.6/wx/imagpcx.h
-include/wx-2.6/wx/imagpng.h
-include/wx-2.6/wx/imagpnm.h
-include/wx-2.6/wx/imagtiff.h
-include/wx-2.6/wx/imagxpm.h
-include/wx-2.6/wx/init.h
-include/wx-2.6/wx/intl.h
-include/wx-2.6/wx/iosfwrap.h
-include/wx-2.6/wx/ioswrap.h
-include/wx-2.6/wx/ipc.h
-include/wx-2.6/wx/ipcbase.h
-include/wx-2.6/wx/isql.h
-include/wx-2.6/wx/isqlext.h
-include/wx-2.6/wx/joystick.h
-include/wx-2.6/wx/layout.h
-include/wx-2.6/wx/laywin.h
-include/wx-2.6/wx/list.h
-include/wx-2.6/wx/listbase.h
-include/wx-2.6/wx/listbook.h
-include/wx-2.6/wx/listbox.h
-include/wx-2.6/wx/listctrl.h
-include/wx-2.6/wx/listimpl.cpp
-include/wx-2.6/wx/log.h
-include/wx-2.6/wx/longlong.h
-include/wx-2.6/wx/math.h
-include/wx-2.6/wx/matrix.h
-include/wx-2.6/wx/mdi.h
-include/wx-2.6/wx/mediactrl.h
-include/wx-2.6/wx/memconf.h
-include/wx-2.6/wx/memory.h
-include/wx-2.6/wx/memtext.h
-include/wx-2.6/wx/menu.h
-include/wx-2.6/wx/menuitem.h
-include/wx-2.6/wx/metafile.h
-include/wx-2.6/wx/mimetype.h
-include/wx-2.6/wx/minifram.h
-include/wx-2.6/wx/module.h
-include/wx-2.6/wx/msgdlg.h
-include/wx-2.6/wx/msgout.h
-include/wx-2.6/wx/mstream.h
-include/wx-2.6/wx/notebook.h
-include/wx-2.6/wx/numdlg.h
-include/wx-2.6/wx/object.h
-include/wx-2.6/wx/ownerdrw.h
-include/wx-2.6/wx/palette.h
-include/wx-2.6/wx/panel.h
-include/wx-2.6/wx/paper.h
-include/wx-2.6/wx/pen.h
-include/wx-2.6/wx/platform.h
-include/wx-2.6/wx/popupwin.h
-include/wx-2.6/wx/print.h
-include/wx-2.6/wx/printdlg.h
-include/wx-2.6/wx/prntbase.h
-include/wx-2.6/wx/process.h
-include/wx-2.6/wx/progdlg.h
-include/wx-2.6/wx/propdlg.h
-include/wx-2.6/wx/protocol/file.h
-include/wx-2.6/wx/protocol/ftp.h
-include/wx-2.6/wx/protocol/http.h
-include/wx-2.6/wx/protocol/protocol.h
-include/wx-2.6/wx/ptr_scpd.h
-include/wx-2.6/wx/quantize.h
-include/wx-2.6/wx/radiobox.h
-include/wx-2.6/wx/radiobut.h
-include/wx-2.6/wx/rawbmp.h
-include/wx-2.6/wx/recguard.h
-include/wx-2.6/wx/regex.h
-include/wx-2.6/wx/region.h
-include/wx-2.6/wx/renderer.h
-include/wx-2.6/wx/sashwin.h
-include/wx-2.6/wx/sckaddr.h
-include/wx-2.6/wx/sckipc.h
-include/wx-2.6/wx/sckstrm.h
-include/wx-2.6/wx/scopeguard.h
-include/wx-2.6/wx/scrolbar.h
-include/wx-2.6/wx/scrolwin.h
-include/wx-2.6/wx/selstore.h
-include/wx-2.6/wx/settings.h
-include/wx-2.6/wx/sizer.h
-include/wx-2.6/wx/slider.h
-include/wx-2.6/wx/snglinst.h
-include/wx-2.6/wx/socket.h
-include/wx-2.6/wx/sound.h
-include/wx-2.6/wx/spinbutt.h
-include/wx-2.6/wx/spinctrl.h
-include/wx-2.6/wx/splash.h
-include/wx-2.6/wx/splitter.h
-include/wx-2.6/wx/sstream.h
-include/wx-2.6/wx/stack.h
-include/wx-2.6/wx/stackwalk.h
-include/wx-2.6/wx/statbmp.h
-include/wx-2.6/wx/statbox.h
-include/wx-2.6/wx/statline.h
-include/wx-2.6/wx/stattext.h
-include/wx-2.6/wx/statusbr.h
-include/wx-2.6/wx/stdpaths.h
-include/wx-2.6/wx/stockitem.h
-include/wx-2.6/wx/stopwatch.h
-include/wx-2.6/wx/strconv.h
-include/wx-2.6/wx/stream.h
-include/wx-2.6/wx/string.h
-include/wx-2.6/wx/sysopt.h
-include/wx-2.6/wx/tab.h
-include/wx-2.6/wx/tabctrl.h
-include/wx-2.6/wx/taskbar.h
-include/wx-2.6/wx/tbarbase.h
-include/wx-2.6/wx/textbuf.h
-include/wx-2.6/wx/textctrl.h
-include/wx-2.6/wx/textdlg.h
-include/wx-2.6/wx/textfile.h
-include/wx-2.6/wx/tglbtn.h
-include/wx-2.6/wx/thread.h
-include/wx-2.6/wx/thrimpl.cpp
-include/wx-2.6/wx/timer.h
-include/wx-2.6/wx/tipdlg.h
-include/wx-2.6/wx/tipwin.h
-include/wx-2.6/wx/tokenzr.h
-include/wx-2.6/wx/toolbar.h
-include/wx-2.6/wx/tooltip.h
-include/wx-2.6/wx/toplevel.h
-include/wx-2.6/wx/treebase.h
-include/wx-2.6/wx/treectrl.h
-include/wx-2.6/wx/txtstrm.h
-include/wx-2.6/wx/types.h
-include/wx-2.6/wx/unix/apptbase.h
-include/wx-2.6/wx/unix/apptrait.h
-include/wx-2.6/wx/unix/displayx11.h
-include/wx-2.6/wx/unix/execute.h
-include/wx-2.6/wx/unix/fontutil.h
-include/wx-2.6/wx/unix/gsockunx.h
-include/wx-2.6/wx/unix/joystick.h
-include/wx-2.6/wx/unix/mimetype.h
-include/wx-2.6/wx/unix/pipe.h
-include/wx-2.6/wx/unix/sound.h
-include/wx-2.6/wx/unix/stackwalk.h
-include/wx-2.6/wx/unix/stdpaths.h
-include/wx-2.6/wx/unix/taskbarx11.h
-include/wx-2.6/wx/unix/utilsx11.h
-include/wx-2.6/wx/uri.h
-include/wx-2.6/wx/url.h
-include/wx-2.6/wx/utils.h
-include/wx-2.6/wx/valgen.h
-include/wx-2.6/wx/validate.h
-include/wx-2.6/wx/valtext.h
-include/wx-2.6/wx/variant.h
-include/wx-2.6/wx/vector.h
-include/wx-2.6/wx/version.h
-include/wx-2.6/wx/vidmode.h
-include/wx-2.6/wx/vlbox.h
-include/wx-2.6/wx/vms_x_fix.h
-include/wx-2.6/wx/volume.h
-include/wx-2.6/wx/vscroll.h
-include/wx-2.6/wx/wave.h
-include/wx-2.6/wx/wfstream.h
-include/wx-2.6/wx/window.h
-include/wx-2.6/wx/wizard.h
-include/wx-2.6/wx/wx.h
-include/wx-2.6/wx/wxchar.h
-include/wx-2.6/wx/wxhtml.h
-include/wx-2.6/wx/wxprec.h
-include/wx-2.6/wx/xml/xml.h
-include/wx-2.6/wx/xpmdecod.h
-include/wx-2.6/wx/xpmhand.h
-include/wx-2.6/wx/xrc/xh_all.h
-include/wx-2.6/wx/xrc/xh_bmp.h
-include/wx-2.6/wx/xrc/xh_bmpbt.h
-include/wx-2.6/wx/xrc/xh_bttn.h
-include/wx-2.6/wx/xrc/xh_cald.h
-include/wx-2.6/wx/xrc/xh_chckb.h
-include/wx-2.6/wx/xrc/xh_chckl.h
-include/wx-2.6/wx/xrc/xh_choic.h
-include/wx-2.6/wx/xrc/xh_choicbk.h
-include/wx-2.6/wx/xrc/xh_combo.h
-include/wx-2.6/wx/xrc/xh_datectrl.h
-include/wx-2.6/wx/xrc/xh_dlg.h
-include/wx-2.6/wx/xrc/xh_frame.h
-include/wx-2.6/wx/xrc/xh_gauge.h
-include/wx-2.6/wx/xrc/xh_gdctl.h
-include/wx-2.6/wx/xrc/xh_html.h
-include/wx-2.6/wx/xrc/xh_listb.h
-include/wx-2.6/wx/xrc/xh_listbk.h
-include/wx-2.6/wx/xrc/xh_listc.h
-include/wx-2.6/wx/xrc/xh_mdi.h
-include/wx-2.6/wx/xrc/xh_menu.h
-include/wx-2.6/wx/xrc/xh_notbk.h
-include/wx-2.6/wx/xrc/xh_panel.h
-include/wx-2.6/wx/xrc/xh_radbt.h
-include/wx-2.6/wx/xrc/xh_radbx.h
-include/wx-2.6/wx/xrc/xh_scrol.h
-include/wx-2.6/wx/xrc/xh_scwin.h
-include/wx-2.6/wx/xrc/xh_sizer.h
-include/wx-2.6/wx/xrc/xh_slidr.h
-include/wx-2.6/wx/xrc/xh_spin.h
-include/wx-2.6/wx/xrc/xh_split.h
-include/wx-2.6/wx/xrc/xh_statbar.h
-include/wx-2.6/wx/xrc/xh_stbmp.h
-include/wx-2.6/wx/xrc/xh_stbox.h
-include/wx-2.6/wx/xrc/xh_stlin.h
-include/wx-2.6/wx/xrc/xh_sttxt.h
-include/wx-2.6/wx/xrc/xh_text.h
-include/wx-2.6/wx/xrc/xh_tglbtn.h
-include/wx-2.6/wx/xrc/xh_toolb.h
-include/wx-2.6/wx/xrc/xh_tree.h
-include/wx-2.6/wx/xrc/xh_unkwn.h
-include/wx-2.6/wx/xrc/xh_wizrd.h
-include/wx-2.6/wx/xrc/xmlres.h
-include/wx-2.6/wx/xti.h
-include/wx-2.6/wx/xtistrm.h
-include/wx-2.6/wx/xtixml.h
-include/wx-2.6/wx/zipstrm.h
-include/wx-2.6/wx/zstream.h
-lib/libwx_base${UNICODE}-2.6.la
-lib/libwx_base${UNICODE}_net-2.6.la
-lib/libwx_base${UNICODE}_xml-2.6.la
-lib/libwx_gtk2${UNICODE}_adv-2.6.la
-lib/libwx_gtk2${UNICODE}_core-2.6.la
-lib/libwx_gtk2${UNICODE}_gl-2.6.la
-lib/libwx_gtk2${UNICODE}_html-2.6.la
-lib/libwx_gtk2${UNICODE}_media-2.6.la
-lib/libwx_gtk2${UNICODE}_qa-2.6.la
-lib/libwx_gtk2${UNICODE}_xrc-2.6.la
-lib/libwxregex${UNICODE}-2.6.la
-lib/wx/config/gtk2-${BUILDTYPE}-release-2.6
-lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx/setup.h
-share/aclocal/wxwin.m4
-share/bakefile/presets/wx.bkl
-share/bakefile/presets/wx_unix.bkl
-share/bakefile/presets/wx_win32.bkl
-share/doc/wxGTK/LICENSE
-share/locale/ca/LC_MESSAGES/wxstd.mo
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxmsw.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-@dirrm share/doc/wxGTK
-@dirrm share/bakefile/presets
-@dirrm share/bakefile
-@dirrm lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx
-@dirrm lib/wx/include/gtk2-${BUILDTYPE}-release-2.6
+@comment $NetBSD: PLIST,v 1.2 2008/09/22 19:54:27 joerg 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}
-@dirrm lib/wx/config
 @unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE}
-@dirrm include/wx-2.6/wx/xrc
-@dirrm include/wx-2.6/wx/xml
-@dirrm include/wx-2.6/wx/unix
-@dirrm include/wx-2.6/wx/protocol
-@dirrm include/wx-2.6/wx/html
-@dirrm include/wx-2.6/wx/gtk/gnome
-@dirrm include/wx-2.6/wx/gtk
-@dirrm include/wx-2.6/wx/generic
-@dirrm include/wx-2.6/wx
-@dirrm include/wx-2.6
+@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/PLIST.Darwin b/x11/wxGTK24/PLIST.Darwin
deleted file mode 100644
index f9c2020bd23..00000000000
--- a/x11/wxGTK24/PLIST.Darwin
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1.1.1 2008/09/22 19:43:11 joerg Exp $
-include/wx-2.6/wx/mac/corefoundation/cfstring.h
-include/wx-2.6/wx/mac/corefoundation/hid.h
-include/wx-2.6/wx/mac/corefoundation/stdpaths.h
diff --git a/x11/wxGTK24/hacks.mk b/x11/wxGTK24/hacks.mk
deleted file mode 100644
index ca0f284a010..00000000000
--- a/x11/wxGTK24/hacks.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1.1.1 2008/09/22 19:43:11 joerg Exp $
-#
-# Disable the precompiled headers on NetBSD mipseb and sparc64
-# machines, otherwise wxGTK will not compile there.
-#   mipseb reported by jmcneill@NetBSD.org.
-#   sparc64 reported by jdc@NetBSD.org.
-
-
-.if !defined(WXGTK_HACKS_MK)
-WXGTK_HACKS_MK=		# defined
-
-.if ${OPSYS} == "NetBSD" && \
-    (${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc64")
-PKG_HACKS+=		disable-precomp-headers
-CONFIGURE_ARGS+=        --disable-precomp-headers
-.endif
-
-.endif # WXGTK_HACKS_MK
diff --git a/x11/wxGTK24/patches/manual-bakefile.diff b/x11/wxGTK24/patches/manual-bakefile.diff
deleted file mode 100644
index bc3d6cc1a8f..00000000000
--- a/x11/wxGTK24/patches/manual-bakefile.diff
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl rules/autoconf.bkl
---- ../bakefile-0.2.0.orig/rules/autoconf.bkl	2006-01-22 23:31:00.000000000 +0000
-+++ rules/autoconf.bkl	2006-07-03 20:34:27.000000000 +0000
-@@ -160,61 +160,18 @@
- 
-         <set var="__linkname1">$(__linkname)</set>
-         
--        <set var="__targetsuf2">
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
--                $(DLLEXT).$(__soversion1)
--            </if>
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
--                .$(__soversion1)$(DLLEXT)
--            </if>
--            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
--        </set>
-+        <set var="__targetsuf2">$(DLLEXT)</set>
-         <set var="__linkname2" eval="0">
-             $(DLLPREFIX)$(__dllname)$(__targetsuf2)
-         </set>
-         
--        <set var="__targetsuf3">
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
--                $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
--            </if>
--            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
--                .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
--            </if>
--            <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
--                -$(__soversion1)$(DLLEXT)
--            </if>
--            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
--        </set>
-+        <set var="__targetsuf3">$(DLLEXT)</set>
-         <set var="__targetname" eval="0">
-             $(DLLPREFIX)$(__dllname)$(__targetsuf3)
-         </set>
-         
--        <set var="__soname_flags">
--            <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
--                $(SONAME_FLAG)$(__linkname2)
--            </if>
--            <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
--                $(SONAME_FLAG)$(__targetname)
--            </if>
--        </set>
-+        <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
-         <ldflags>$(__soname_flags)</ldflags>
--
--        <set var="__so_symlinks_cmd">
--            <if cond="USE_SOSYMLINKS=='1'">
--                (cd $(pathPrefixToPath(__targetdir));
--                $(RM) $(__linkname1) $(__linkname2);
--                $(LN_S) $(__targetname) $(__linkname2);
--                $(LN_S) $(__linkname2) $(__linkname1))
--            </if>
--        </set>
--        <set var="__so_symlinks_inst_cmd">
--            <if cond="USE_SOSYMLINKS=='1'">
--                $(RM) $(__linkname1) $(__linkname2);
--                $(LN_S) $(__targetname) $(__linkname2);
--                $(LN_S) $(__linkname2) $(__linkname1)
--            </if>
--        </set>
--        <__command>$(LF)$(__so_symlinks_cmd)</__command>
-     
-         <set var="__mac_instname">$(__linkname2)</set>
-    
-@@ -238,12 +195,6 @@
-         <set var="__macinstname" eval="0">
-             $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
-         </set>
--        <set var="__macinstnamecmd">
--            <if cond="PLATFORM_MACOSX=='1'">
--                -install_name $(value)/$(__macinstname)
--            </if>
--        </set>
--        <ldflags>$(__macinstnamecmd)</ldflags>
- 
-         <modify-target target="install_$(id)">
-             <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
-diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl rules/makefile.bkl
---- ../bakefile-0.2.0.orig/rules/makefile.bkl	2005-12-08 10:19:46.000000000 +0000
-+++ rules/makefile.bkl	2006-03-20 22:04:43.000000000 +0000
-@@ -604,7 +604,7 @@
-         <define-tag name="install-to" rules="exe">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-@@ -612,8 +612,7 @@
-         <define-tag name="install-to" rules="dll">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(value)
--                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-@@ -621,7 +620,7 @@
-         <define-tag name="install-to" rules="module">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-@@ -629,7 +628,7 @@
-         <define-tag name="install-to" rules="lib">
-             <modify-target target="install_$(id)">
-                 <command>
--                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
-                 </command>
-             </modify-target>
-         </define-tag>
-diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl
---- ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl	2005-06-16 17:48:03.000000000 +0000
-+++ rules/makefile_defs_gnu.bkl	2006-02-28 22:43:14.000000000 +0000
-@@ -37,12 +37,12 @@
- 
-             <template id="__commands_templ_C">
-                 <set var="__COMPILE_C_CMD" eval="0">
--                    $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
-+                    ${LIBTOOL} --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
-                 </set>
-             </template>
-             <template id="__commands_templ_CXX">
-                 <set var="__COMPILE_CXX_CMD" eval="0">
--                    $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
-+                    ${LIBTOOL} --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
-                 </set>
-             </template>
- 
-diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl
---- ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl	2005-03-13 22:50:03.000000000 +0000
-+++ rules/makefile_defs_unix.bkl	2006-03-20 21:30:47.000000000 +0000
-@@ -15,20 +15,21 @@
- 
-     <set var="DIRSEP">/</set>
- 
--    <set var="OBJEXT">.o</set>
-+    <set var="LIBTOOL">${LIBTOOL}</set>
-+    <set var="OBJEXT">.lo</set>
-     <set var="LIBEXT" overwrite="0">.a</set>
-     <set var="LIBPREFIX" overwrite="0">lib</set>
-     <set var="EXEEXT" overwrite="0"></set>
--    <set var="DLLEXT" overwrite="0">.so</set>
-+    <set var="DLLEXT" overwrite="1">.la</set>
-     <set var="DLLEXT_MODULE" overwrite="0">$(DLLEXT)</set>
-     <set var="DLLIMPEXT" overwrite="0">$(DLLEXT)</set>
-     <set var="DLLPREFIX" overwrite="0">$(LIBPREFIX)</set>
-     <set var="DLLPREFIX_MODULE" overwrite="0">$(DLLPREFIX)</set>
--    <set var="PIC_CFLAGS" overwrite="0">-fPIC -DPIC</set>
-+    <set var="PIC_CFLAGS" overwrite="0"></set>
- 
--    <set var="INSTALL_PROGRAM" overwrite="0">install -c</set>
--    <set var="INSTALL_DATA" overwrite="0">$(INSTALL) -m 644</set>
--    <set var="INSTALL_DIR" overwrite="0">$(INSTALL) -d</set>
-+    <set var="INSTALL_PROGRAM" overwrite="1">${BSD_INSTALL_PROGRAM}</set>
-+    <set var="INSTALL_DATA" overwrite="1">${BSD_INSTALL_DATA}</set>
-+    <set var="INSTALL_DIR" overwrite="1">${BSD_INSTALL_DATA_DIR}</set>
- 
-     <set var="AROPTIONS">rcu</set>
-     <set var="RM">rm -f</set>
-@@ -92,12 +93,12 @@
-     <if cond="FORMAT!='gnu'">
-         <template id="__commands_templ_C">
-             <set var="__COMPILE_C_CMD" eval="0">
--                $(CCC) -c -o $@ $(__cflags) $(src)
-+                $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(src)
-             </set>
-         </template>
-         <template id="__commands_templ_CXX">
-             <set var="__COMPILE_CXX_CMD" eval="0">
--                $(CXXC) -c -o $@ $(__cxxflags) $(src)
-+                $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(src)
-             </set>
-         </template>
-     </if>
-@@ -105,18 +106,16 @@
- 
-     <template id="__commands_templ">
-         <set var="__LINK_EXE_CMD" eval="0">
--            $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>        
-         <set var="__LINK_LIB_CMD" eval="0">
--            $(RM) $@
--            $(AR) $(AROPTIONS) $@ $(__objects_var)
--            $(RANLIB) $@
-+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>
-         <set var="__LINK_DLL_CMD" eval="0">
--            $(__dll_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>
-         <set var="__LINK_MODULE_CMD" eval="0">
--            $(__module_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-         </set>
-     </template>
-     
diff --git a/x11/wxGTK24/patches/manual-regen.diff b/x11/wxGTK24/patches/manual-regen.diff
deleted file mode 100644
index 83b129dfc02..00000000000
--- a/x11/wxGTK24/patches/manual-regen.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-To regenerate the patch, get the full wxWidgets tarball, copy build/bakefiles
-and the various *.bkl files into the wxGTK tree and run
-	./bakefile_gen -f autoconf
-in build/bakefiles. manual-bakefile.diff contains the necessary patch for
-the bakefile ruleset to use libtool.
-
---- build/bakefiles/regex.bkl.orig	2006-03-20 20:14:11.000000000 +0000
-+++ build/bakefiles/regex.bkl
-@@ -27,16 +27,13 @@
-         <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
-     </set>
- 
--    <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
-+    <dll id="wxregex" template="msvc_setup_h,anylib"
-          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
--        <libname cond="FORMAT=='autoconf'">
--            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
--        </libname>
--        <libname cond="FORMAT!='autoconf'">
--            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
--        </libname>
--        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
--        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
-+        <dllname>
-+            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)
-+	</dllname>
-+        <version>$(WX_VERSION)</version>
-+        <so_version>$(WXSOVERSION)</so_version>
-         <define>__WX$(TOOLKIT)__</define>
-         <define>$(UNICODE_DEFINE)</define>
-         <dirname>$(LIBDIRNAME)</dirname>
-@@ -48,6 +45,6 @@
-             src/regex/regerror.c
-             src/regex/regfree.c
-         </sources>
--    </lib>
-+    </dll>
- 
- </makefile>
---- build/bakefiles/wx.bkl.orig	2006-02-28 22:50:55.000000000 +0000
-+++ build/bakefiles/wx.bkl
-@@ -96,7 +96,7 @@
-             <command>
-                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
--                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-+                ${BSD_INSTALL_SCRIPT} lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-             </command>
-         </action>