summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2004-11-25 20:06:45 +0000
committerMax Khon <fjoe@FreeBSD.org>2004-11-25 20:06:45 +0000
commit304894eec97b32603d2d78350424e71a0c48e63b (patch)
treee58ae328cd1853d53a6934c7d645a605f736f75d /x11-toolkits
parentUpdate to 1.8.1. (diff)
Update wxgtk2*-devel to 2.5.3
PR: 73450
Notes
Notes: svn path=/head/; revision=122428
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/wxgtk2-common-devel/pkg-plist851
-rw-r--r--x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist177
-rw-r--r--x11-toolkits/wxgtk2-contrib-devel/Makefile2
-rw-r--r--x11-toolkits/wxgtk2-contrib-devel/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk2-devel/Makefile41
-rw-r--r--x11-toolkits/wxgtk2-devel/distinfo4
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-Makefile.in33
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in15
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-xrc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h14
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-src-regex-regex.h16
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-utils-wxrc-Makefile.in21
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-wx-config.in18
-rw-r--r--x11-toolkits/wxgtk2-devel/pkg-plist39
-rw-r--r--x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk2-unicode-devel/pkg-plist39
-rw-r--r--x11-toolkits/wxgtk2-utils-devel/Makefile4
-rw-r--r--x11-toolkits/wxgtk2-utils-devel/pkg-plist1
-rw-r--r--x11-toolkits/wxgtk26-common/pkg-plist851
-rw-r--r--x11-toolkits/wxgtk26-contrib-common/pkg-plist177
-rw-r--r--x11-toolkits/wxgtk26-contrib-utils/Makefile4
-rw-r--r--x11-toolkits/wxgtk26-contrib-utils/pkg-plist1
-rw-r--r--x11-toolkits/wxgtk26-contrib/Makefile2
-rw-r--r--x11-toolkits/wxgtk26-contrib/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk26-unicode-contrib/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk26-unicode/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk26/Makefile41
-rw-r--r--x11-toolkits/wxgtk26/distinfo4
-rw-r--r--x11-toolkits/wxgtk26/files/patch-Makefile.in33
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in15
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h14
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-regex-regex.h16
-rw-r--r--x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in21
-rw-r--r--x11-toolkits/wxgtk26/files/patch-wx-config.in18
-rw-r--r--x11-toolkits/wxgtk26/pkg-plist39
-rw-r--r--x11-toolkits/wxgtk28-common/pkg-plist851
-rw-r--r--x11-toolkits/wxgtk28-contrib-common/pkg-plist177
-rw-r--r--x11-toolkits/wxgtk28-contrib/Makefile2
-rw-r--r--x11-toolkits/wxgtk28-contrib/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk28-unicode/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk28/Makefile41
-rw-r--r--x11-toolkits/wxgtk28/distinfo4
-rw-r--r--x11-toolkits/wxgtk28/files/patch-Makefile.in33
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in15
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-animate-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-xrc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h14
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-regex-regex.h16
-rw-r--r--x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in21
-rw-r--r--x11-toolkits/wxgtk28/files/patch-wx-config.in18
-rw-r--r--x11-toolkits/wxgtk28/pkg-plist39
-rw-r--r--x11-toolkits/wxgtk29-common/pkg-plist851
-rw-r--r--x11-toolkits/wxgtk29-contrib-common/pkg-plist177
-rw-r--r--x11-toolkits/wxgtk29-contrib/Makefile2
-rw-r--r--x11-toolkits/wxgtk29-contrib/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk29-unicode-contrib/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk29-unicode/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk29/Makefile41
-rw-r--r--x11-toolkits/wxgtk29/distinfo4
-rw-r--r--x11-toolkits/wxgtk29/files/patch-Makefile.in33
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in15
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-animate-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-deprecated-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in10
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-xrc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h14
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-regex-regex.h16
-rw-r--r--x11-toolkits/wxgtk29/files/patch-utils-wxrc-Makefile.in21
-rw-r--r--x11-toolkits/wxgtk29/files/patch-wx-config.in18
-rw-r--r--x11-toolkits/wxgtk29/pkg-plist39
100 files changed, 2945 insertions, 2777 deletions
diff --git a/x11-toolkits/wxgtk2-common-devel/pkg-plist b/x11-toolkits/wxgtk2-common-devel/pkg-plist
index 881bb9f3defa..f68eebf220d8 100644
--- a/x11-toolkits/wxgtk2-common-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-common-devel/pkg-plist
@@ -1,399 +1,442 @@
-include/wx/accel.h
-include/wx/access.h
-include/wx/afterstd.h
-include/wx/app.h
-include/wx/apptrait.h
-include/wx/arrimpl.cpp
-include/wx/arrstr.h
-include/wx/artprov.h
-include/wx/beforestd.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/bookctrl.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/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/dcmirror.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/display.h
-include/wx/dlimpexp.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/encinfo.h
-include/wx/event.h
-include/wx/evtloop.h
-include/wx/except.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/fmappriv.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/gbsizer.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/gridsel.h
-include/wx/generic/helpext.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/logg.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/numdlgg.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/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/msgdlg.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/win_gtk.h
-include/wx/gtk/window.h
-include/wx/hash.h
-include/wx/hashmap.h
-include/wx/hashset.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/htmlproc.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/htmllbox.h
-include/wx/icon.h
-include/wx/iconbndl.h
-include/wx/iconloc.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/init.h
-include/wx/intl.h
-include/wx/iosfwrap.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/listbook.h
-include/wx/listbox.h
-include/wx/listctrl.h
-include/wx/listimpl.cpp
-include/wx/log.h
-include/wx/longlong.h
-include/wx/math.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/numdlg.h
-include/wx/object.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/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/ptr_scpd.h
-include/wx/quantize.h
-include/wx/radiobox.h
-include/wx/radiobut.h
-include/wx/rawbmp.h
-include/wx/regex.h
-include/wx/region.h
-include/wx/renderer.h
-include/wx/sashwin.h
-include/wx/sckaddr.h
-include/wx/sckipc.h
-include/wx/sckstrm.h
-include/wx/scopeguard.h
-include/wx/scrolbar.h
-include/wx/scrolwin.h
-include/wx/selstore.h
-include/wx/settings.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/snglinst.h
-include/wx/socket.h
-include/wx/sound.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/stopwatch.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/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/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/apptbase.h
-include/wx/unix/apptrait.h
-include/wx/unix/displayx11.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/joystick.h
-include/wx/unix/mimetype.h
-include/wx/unix/pipe.h
-include/wx/unix/sound.h
-include/wx/unix/taskbarx11.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/vidmode.h
-include/wx/vlbox.h
-include/wx/vms_x_fix.h
-include/wx/volume.h
-include/wx/vscroll.h
-include/wx/wave.h
-include/wx/wfstream.h
-include/wx/window.h
-include/wx/wizard.h
-include/wx/wx.h
-include/wx/wxchar.h
-include/wx/wxhtml.h
-include/wx/wxprec.h
-include/wx/xml/xml.h
-include/wx/xpmdecod.h
-include/wx/xpmhand.h
-include/wx/xti.h
-include/wx/xtistrm.h
-include/wx/xtixml.h
-include/wx/zipstrm.h
-include/wx/zstream.h
+include/wx-2.5/wx/accel.h
+include/wx-2.5/wx/access.h
+include/wx-2.5/wx/afterstd.h
+include/wx-2.5/wx/app.h
+include/wx-2.5/wx/apptrait.h
+include/wx-2.5/wx/arrimpl.cpp
+include/wx-2.5/wx/arrstr.h
+include/wx-2.5/wx/artprov.h
+include/wx-2.5/wx/beforestd.h
+include/wx-2.5/wx/bitmap.h
+include/wx-2.5/wx/bmpbuttn.h
+include/wx-2.5/wx/bookctrl.h
+include/wx-2.5/wx/brush.h
+include/wx-2.5/wx/buffer.h
+include/wx-2.5/wx/build.h
+include/wx-2.5/wx/busyinfo.h
+include/wx-2.5/wx/button.h
+include/wx-2.5/wx/calctrl.h
+include/wx-2.5/wx/caret.h
+include/wx-2.5/wx/checkbox.h
+include/wx-2.5/wx/checklst.h
+include/wx-2.5/wx/chkconf.h
+include/wx-2.5/wx/choicdlg.h
+include/wx-2.5/wx/choice.h
+include/wx-2.5/wx/choicebk.h
+include/wx-2.5/wx/clipbrd.h
+include/wx-2.5/wx/clntdata.h
+include/wx-2.5/wx/cmdline.h
+include/wx-2.5/wx/cmdproc.h
+include/wx-2.5/wx/cmndata.h
+include/wx-2.5/wx/colordlg.h
+include/wx-2.5/wx/colour.h
+include/wx-2.5/wx/combobox.h
+include/wx-2.5/wx/confbase.h
+include/wx-2.5/wx/config.h
+include/wx-2.5/wx/containr.h
+include/wx-2.5/wx/control.h
+include/wx-2.5/wx/cshelp.h
+include/wx-2.5/wx/ctrlsub.h
+include/wx-2.5/wx/cursor.h
+include/wx-2.5/wx/dataobj.h
+include/wx-2.5/wx/datetime.h
+include/wx-2.5/wx/datetime.inl
+include/wx-2.5/wx/datstrm.h
+include/wx-2.5/wx/db.h
+include/wx-2.5/wx/dbgrid.h
+include/wx-2.5/wx/dbkeyg.h
+include/wx-2.5/wx/dbtable.h
+include/wx-2.5/wx/dc.h
+include/wx-2.5/wx/dcbuffer.h
+include/wx-2.5/wx/dcclient.h
+include/wx-2.5/wx/dcmemory.h
+include/wx-2.5/wx/dcmirror.h
+include/wx-2.5/wx/dcprint.h
+include/wx-2.5/wx/dcps.h
+include/wx-2.5/wx/dcscreen.h
+include/wx-2.5/wx/dde.h
+include/wx-2.5/wx/debug.h
+include/wx-2.5/wx/defs.h
+include/wx-2.5/wx/dialog.h
+include/wx-2.5/wx/dialup.h
+include/wx-2.5/wx/dir.h
+include/wx-2.5/wx/dirctrl.h
+include/wx-2.5/wx/dirdlg.h
+include/wx-2.5/wx/display.h
+include/wx-2.5/wx/dlimpexp.h
+include/wx-2.5/wx/dnd.h
+include/wx-2.5/wx/docmdi.h
+include/wx-2.5/wx/docview.h
+include/wx-2.5/wx/dragimag.h
+include/wx-2.5/wx/dynarray.h
+include/wx-2.5/wx/dynlib.h
+include/wx-2.5/wx/dynload.h
+include/wx-2.5/wx/effects.h
+include/wx-2.5/wx/encconv.h
+include/wx-2.5/wx/encinfo.h
+include/wx-2.5/wx/event.h
+include/wx-2.5/wx/evtloop.h
+include/wx-2.5/wx/except.h
+include/wx-2.5/wx/fdrepdlg.h
+include/wx-2.5/wx/features.h
+include/wx-2.5/wx/ffile.h
+include/wx-2.5/wx/file.h
+include/wx-2.5/wx/fileconf.h
+include/wx-2.5/wx/filedlg.h
+include/wx-2.5/wx/filefn.h
+include/wx-2.5/wx/filename.h
+include/wx-2.5/wx/filesys.h
+include/wx-2.5/wx/fmappriv.h
+include/wx-2.5/wx/font.h
+include/wx-2.5/wx/fontdlg.h
+include/wx-2.5/wx/fontenc.h
+include/wx-2.5/wx/fontenum.h
+include/wx-2.5/wx/fontmap.h
+include/wx-2.5/wx/fontutil.h
+include/wx-2.5/wx/frame.h
+include/wx-2.5/wx/fs_inet.h
+include/wx-2.5/wx/fs_mem.h
+include/wx-2.5/wx/fs_zip.h
+include/wx-2.5/wx/gauge.h
+include/wx-2.5/wx/gbsizer.h
+include/wx-2.5/wx/gdicmn.h
+include/wx-2.5/wx/gdiobj.h
+include/wx-2.5/wx/generic/accel.h
+include/wx-2.5/wx/generic/calctrl.h
+include/wx-2.5/wx/generic/caret.h
+include/wx-2.5/wx/generic/choicdgg.h
+include/wx-2.5/wx/generic/colrdlgg.h
+include/wx-2.5/wx/generic/dcpsg.h
+include/wx-2.5/wx/generic/dirctrlg.h
+include/wx-2.5/wx/generic/dirdlgg.h
+include/wx-2.5/wx/generic/dragimgg.h
+include/wx-2.5/wx/generic/fdrepdlg.h
+include/wx-2.5/wx/generic/filedlgg.h
+include/wx-2.5/wx/generic/fontdlgg.h
+include/wx-2.5/wx/generic/grid.h
+include/wx-2.5/wx/generic/gridctrl.h
+include/wx-2.5/wx/generic/gridsel.h
+include/wx-2.5/wx/generic/helpext.h
+include/wx-2.5/wx/generic/imaglist.h
+include/wx-2.5/wx/generic/laywin.h
+include/wx-2.5/wx/generic/listctrl.h
+include/wx-2.5/wx/generic/logg.h
+include/wx-2.5/wx/generic/msgdlgg.h
+include/wx-2.5/wx/generic/notebook.h
+include/wx-2.5/wx/generic/numdlgg.h
+include/wx-2.5/wx/generic/paletteg.h
+include/wx-2.5/wx/generic/panelg.h
+include/wx-2.5/wx/generic/printps.h
+include/wx-2.5/wx/generic/prntdlgg.h
+include/wx-2.5/wx/generic/progdlgg.h
+include/wx-2.5/wx/generic/sashwin.h
+include/wx-2.5/wx/generic/scrolwin.h
+include/wx-2.5/wx/generic/spinctlg.h
+include/wx-2.5/wx/generic/splash.h
+include/wx-2.5/wx/generic/splitter.h
+include/wx-2.5/wx/generic/statusbr.h
+include/wx-2.5/wx/generic/tabg.h
+include/wx-2.5/wx/generic/textdlgg.h
+include/wx-2.5/wx/generic/timer.h
+include/wx-2.5/wx/generic/treectlg.h
+include/wx-2.5/wx/generic/wizard.h
+include/wx-2.5/wx/geometry.h
+include/wx-2.5/wx/gifdecod.h
+include/wx-2.5/wx/glcanvas.h
+include/wx-2.5/wx/grid.h
+include/wx-2.5/wx/gsocket.h
+include/wx-2.5/wx/gtk/accel.h
+include/wx-2.5/wx/gtk/app.h
+include/wx-2.5/wx/gtk/bitmap.h
+include/wx-2.5/wx/gtk/bmpbuttn.h
+include/wx-2.5/wx/gtk/brush.h
+include/wx-2.5/wx/gtk/button.h
+include/wx-2.5/wx/gtk/checkbox.h
+include/wx-2.5/wx/gtk/checklst.h
+include/wx-2.5/wx/gtk/choice.h
+include/wx-2.5/wx/gtk/clipbrd.h
+include/wx-2.5/wx/gtk/colordlg.h
+include/wx-2.5/wx/gtk/colour.h
+include/wx-2.5/wx/gtk/combobox.h
+include/wx-2.5/wx/gtk/control.h
+include/wx-2.5/wx/gtk/cursor.h
+include/wx-2.5/wx/gtk/dataform.h
+include/wx-2.5/wx/gtk/dataobj.h
+include/wx-2.5/wx/gtk/dataobj2.h
+include/wx-2.5/wx/gtk/dc.h
+include/wx-2.5/wx/gtk/dcclient.h
+include/wx-2.5/wx/gtk/dcmemory.h
+include/wx-2.5/wx/gtk/dcscreen.h
+include/wx-2.5/wx/gtk/dialog.h
+include/wx-2.5/wx/gtk/dnd.h
+include/wx-2.5/wx/gtk/filedlg.h
+include/wx-2.5/wx/gtk/font.h
+include/wx-2.5/wx/gtk/fontdlg.h
+include/wx-2.5/wx/gtk/frame.h
+include/wx-2.5/wx/gtk/gauge.h
+include/wx-2.5/wx/gtk/gdiobj.h
+include/wx-2.5/wx/gtk/glcanvas.h
+include/wx-2.5/wx/gtk/icon.h
+include/wx-2.5/wx/gtk/listbox.h
+include/wx-2.5/wx/gtk/mdi.h
+include/wx-2.5/wx/gtk/menu.h
+include/wx-2.5/wx/gtk/menuitem.h
+include/wx-2.5/wx/gtk/minifram.h
+include/wx-2.5/wx/gtk/msgdlg.h
+include/wx-2.5/wx/gtk/notebook.h
+include/wx-2.5/wx/gtk/pen.h
+include/wx-2.5/wx/gtk/popupwin.h
+include/wx-2.5/wx/gtk/radiobox.h
+include/wx-2.5/wx/gtk/radiobut.h
+include/wx-2.5/wx/gtk/region.h
+include/wx-2.5/wx/gtk/scrolbar.h
+include/wx-2.5/wx/gtk/scrolwin.h
+include/wx-2.5/wx/gtk/slider.h
+include/wx-2.5/wx/gtk/spinbutt.h
+include/wx-2.5/wx/gtk/spinctrl.h
+include/wx-2.5/wx/gtk/statbmp.h
+include/wx-2.5/wx/gtk/statbox.h
+include/wx-2.5/wx/gtk/statline.h
+include/wx-2.5/wx/gtk/stattext.h
+include/wx-2.5/wx/gtk/tbargtk.h
+include/wx-2.5/wx/gtk/textctrl.h
+include/wx-2.5/wx/gtk/tglbtn.h
+include/wx-2.5/wx/gtk/timer.h
+include/wx-2.5/wx/gtk/tooltip.h
+include/wx-2.5/wx/gtk/toplevel.h
+include/wx-2.5/wx/gtk/treectrl.h
+include/wx-2.5/wx/gtk/win_gtk.h
+include/wx-2.5/wx/gtk/window.h
+include/wx-2.5/wx/hash.h
+include/wx-2.5/wx/hashmap.h
+include/wx-2.5/wx/hashset.h
+include/wx-2.5/wx/help.h
+include/wx-2.5/wx/helpbase.h
+include/wx-2.5/wx/helphtml.h
+include/wx-2.5/wx/helpwin.h
+include/wx-2.5/wx/html/forcelnk.h
+include/wx-2.5/wx/html/helpctrl.h
+include/wx-2.5/wx/html/helpdata.h
+include/wx-2.5/wx/html/helpfrm.h
+include/wx-2.5/wx/html/htmlcell.h
+include/wx-2.5/wx/html/htmldefs.h
+include/wx-2.5/wx/html/htmlfilt.h
+include/wx-2.5/wx/html/htmlpars.h
+include/wx-2.5/wx/html/htmlproc.h
+include/wx-2.5/wx/html/htmltag.h
+include/wx-2.5/wx/html/htmlwin.h
+include/wx-2.5/wx/html/htmprint.h
+include/wx-2.5/wx/html/m_templ.h
+include/wx-2.5/wx/html/winpars.h
+include/wx-2.5/wx/htmllbox.h
+include/wx-2.5/wx/icon.h
+include/wx-2.5/wx/iconbndl.h
+include/wx-2.5/wx/iconloc.h
+include/wx-2.5/wx/imagbmp.h
+include/wx-2.5/wx/image.h
+include/wx-2.5/wx/imaggif.h
+include/wx-2.5/wx/imagiff.h
+include/wx-2.5/wx/imagjpeg.h
+include/wx-2.5/wx/imaglist.h
+include/wx-2.5/wx/imagpcx.h
+include/wx-2.5/wx/imagpng.h
+include/wx-2.5/wx/imagpnm.h
+include/wx-2.5/wx/imagtiff.h
+include/wx-2.5/wx/imagxpm.h
+include/wx-2.5/wx/init.h
+include/wx-2.5/wx/intl.h
+include/wx-2.5/wx/iosfwrap.h
+include/wx-2.5/wx/ioswrap.h
+include/wx-2.5/wx/ipc.h
+include/wx-2.5/wx/ipcbase.h
+include/wx-2.5/wx/isql.h
+include/wx-2.5/wx/isqlext.h
+include/wx-2.5/wx/joystick.h
+include/wx-2.5/wx/layout.h
+include/wx-2.5/wx/laywin.h
+include/wx-2.5/wx/list.h
+include/wx-2.5/wx/listbase.h
+include/wx-2.5/wx/listbook.h
+include/wx-2.5/wx/listbox.h
+include/wx-2.5/wx/listctrl.h
+include/wx-2.5/wx/listimpl.cpp
+include/wx-2.5/wx/log.h
+include/wx-2.5/wx/longlong.h
+include/wx-2.5/wx/math.h
+include/wx-2.5/wx/matrix.h
+include/wx-2.5/wx/mdi.h
+include/wx-2.5/wx/memconf.h
+include/wx-2.5/wx/memory.h
+include/wx-2.5/wx/memtext.h
+include/wx-2.5/wx/menu.h
+include/wx-2.5/wx/menuitem.h
+include/wx-2.5/wx/metafile.h
+include/wx-2.5/wx/mimetype.h
+include/wx-2.5/wx/minifram.h
+include/wx-2.5/wx/module.h
+include/wx-2.5/wx/msgdlg.h
+include/wx-2.5/wx/msgout.h
+include/wx-2.5/wx/mstream.h
+include/wx-2.5/wx/notebook.h
+include/wx-2.5/wx/numdlg.h
+include/wx-2.5/wx/object.h
+include/wx-2.5/wx/ownerdrw.h
+include/wx-2.5/wx/palette.h
+include/wx-2.5/wx/panel.h
+include/wx-2.5/wx/paper.h
+include/wx-2.5/wx/pen.h
+include/wx-2.5/wx/platform.h
+include/wx-2.5/wx/popupwin.h
+include/wx-2.5/wx/print.h
+include/wx-2.5/wx/printdlg.h
+include/wx-2.5/wx/prntbase.h
+include/wx-2.5/wx/process.h
+include/wx-2.5/wx/progdlg.h
+include/wx-2.5/wx/protocol/file.h
+include/wx-2.5/wx/protocol/ftp.h
+include/wx-2.5/wx/protocol/http.h
+include/wx-2.5/wx/protocol/protocol.h
+include/wx-2.5/wx/ptr_scpd.h
+include/wx-2.5/wx/quantize.h
+include/wx-2.5/wx/radiobox.h
+include/wx-2.5/wx/radiobut.h
+include/wx-2.5/wx/rawbmp.h
+include/wx-2.5/wx/regex.h
+include/wx-2.5/wx/region.h
+include/wx-2.5/wx/renderer.h
+include/wx-2.5/wx/sashwin.h
+include/wx-2.5/wx/sckaddr.h
+include/wx-2.5/wx/sckipc.h
+include/wx-2.5/wx/sckstrm.h
+include/wx-2.5/wx/scopeguard.h
+include/wx-2.5/wx/scrolbar.h
+include/wx-2.5/wx/scrolwin.h
+include/wx-2.5/wx/selstore.h
+include/wx-2.5/wx/settings.h
+include/wx-2.5/wx/sizer.h
+include/wx-2.5/wx/slider.h
+include/wx-2.5/wx/snglinst.h
+include/wx-2.5/wx/socket.h
+include/wx-2.5/wx/sound.h
+include/wx-2.5/wx/spinbutt.h
+include/wx-2.5/wx/spinctrl.h
+include/wx-2.5/wx/splash.h
+include/wx-2.5/wx/splitter.h
+include/wx-2.5/wx/sstream.h
+include/wx-2.5/wx/stack.h
+include/wx-2.5/wx/statbmp.h
+include/wx-2.5/wx/statbox.h
+include/wx-2.5/wx/statline.h
+include/wx-2.5/wx/stattext.h
+include/wx-2.5/wx/statusbr.h
+include/wx-2.5/wx/stockitem.h
+include/wx-2.5/wx/stopwatch.h
+include/wx-2.5/wx/strconv.h
+include/wx-2.5/wx/stream.h
+include/wx-2.5/wx/string.h
+include/wx-2.5/wx/sysopt.h
+include/wx-2.5/wx/tab.h
+include/wx-2.5/wx/tabctrl.h
+include/wx-2.5/wx/taskbar.h
+include/wx-2.5/wx/tbarbase.h
+include/wx-2.5/wx/textbuf.h
+include/wx-2.5/wx/textctrl.h
+include/wx-2.5/wx/textdlg.h
+include/wx-2.5/wx/textfile.h
+include/wx-2.5/wx/tglbtn.h
+include/wx-2.5/wx/thread.h
+include/wx-2.5/wx/thrimpl.cpp
+include/wx-2.5/wx/timer.h
+include/wx-2.5/wx/tipdlg.h
+include/wx-2.5/wx/tipwin.h
+include/wx-2.5/wx/tokenzr.h
+include/wx-2.5/wx/toolbar.h
+include/wx-2.5/wx/tooltip.h
+include/wx-2.5/wx/toplevel.h
+include/wx-2.5/wx/treebase.h
+include/wx-2.5/wx/treectrl.h
+include/wx-2.5/wx/txtstrm.h
+include/wx-2.5/wx/types.h
+include/wx-2.5/wx/unix/apptbase.h
+include/wx-2.5/wx/unix/apptrait.h
+include/wx-2.5/wx/unix/displayx11.h
+include/wx-2.5/wx/unix/execute.h
+include/wx-2.5/wx/unix/fontutil.h
+include/wx-2.5/wx/unix/gsockunx.h
+include/wx-2.5/wx/unix/joystick.h
+include/wx-2.5/wx/unix/mimetype.h
+include/wx-2.5/wx/unix/pipe.h
+include/wx-2.5/wx/unix/sound.h
+include/wx-2.5/wx/unix/taskbarx11.h
+include/wx-2.5/wx/unix/utilsx11.h
+include/wx-2.5/wx/url.h
+include/wx-2.5/wx/utils.h
+include/wx-2.5/wx/valgen.h
+include/wx-2.5/wx/validate.h
+include/wx-2.5/wx/valtext.h
+include/wx-2.5/wx/variant.h
+include/wx-2.5/wx/vector.h
+include/wx-2.5/wx/version.h
+include/wx-2.5/wx/vidmode.h
+include/wx-2.5/wx/vlbox.h
+include/wx-2.5/wx/vms_x_fix.h
+include/wx-2.5/wx/volume.h
+include/wx-2.5/wx/vscroll.h
+include/wx-2.5/wx/wave.h
+include/wx-2.5/wx/wfstream.h
+include/wx-2.5/wx/window.h
+include/wx-2.5/wx/wizard.h
+include/wx-2.5/wx/wx.h
+include/wx-2.5/wx/wxchar.h
+include/wx-2.5/wx/wxhtml.h
+include/wx-2.5/wx/wxprec.h
+include/wx-2.5/wx/xml/xml.h
+include/wx-2.5/wx/xpmdecod.h
+include/wx-2.5/wx/xpmhand.h
+include/wx-2.5/wx/xrc/xh_all.h
+include/wx-2.5/wx/xrc/xh_bmp.h
+include/wx-2.5/wx/xrc/xh_bmpbt.h
+include/wx-2.5/wx/xrc/xh_bttn.h
+include/wx-2.5/wx/xrc/xh_cald.h
+include/wx-2.5/wx/xrc/xh_chckb.h
+include/wx-2.5/wx/xrc/xh_chckl.h
+include/wx-2.5/wx/xrc/xh_choic.h
+include/wx-2.5/wx/xrc/xh_combo.h
+include/wx-2.5/wx/xrc/xh_dlg.h
+include/wx-2.5/wx/xrc/xh_frame.h
+include/wx-2.5/wx/xrc/xh_gauge.h
+include/wx-2.5/wx/xrc/xh_gdctl.h
+include/wx-2.5/wx/xrc/xh_html.h
+include/wx-2.5/wx/xrc/xh_listb.h
+include/wx-2.5/wx/xrc/xh_listc.h
+include/wx-2.5/wx/xrc/xh_menu.h
+include/wx-2.5/wx/xrc/xh_notbk.h
+include/wx-2.5/wx/xrc/xh_panel.h
+include/wx-2.5/wx/xrc/xh_radbt.h
+include/wx-2.5/wx/xrc/xh_radbx.h
+include/wx-2.5/wx/xrc/xh_scrol.h
+include/wx-2.5/wx/xrc/xh_scwin.h
+include/wx-2.5/wx/xrc/xh_sizer.h
+include/wx-2.5/wx/xrc/xh_slidr.h
+include/wx-2.5/wx/xrc/xh_spin.h
+include/wx-2.5/wx/xrc/xh_split.h
+include/wx-2.5/wx/xrc/xh_statbar.h
+include/wx-2.5/wx/xrc/xh_stbmp.h
+include/wx-2.5/wx/xrc/xh_stbox.h
+include/wx-2.5/wx/xrc/xh_stlin.h
+include/wx-2.5/wx/xrc/xh_sttxt.h
+include/wx-2.5/wx/xrc/xh_text.h
+include/wx-2.5/wx/xrc/xh_tglbtn.h
+include/wx-2.5/wx/xrc/xh_toolb.h
+include/wx-2.5/wx/xrc/xh_tree.h
+include/wx-2.5/wx/xrc/xh_unkwn.h
+include/wx-2.5/wx/xrc/xh_wizrd.h
+include/wx-2.5/wx/xrc/xmlres.h
+include/wx-2.5/wx/xti.h
+include/wx-2.5/wx/xtistrm.h
+include/wx-2.5/wx/xtixml.h
+include/wx-2.5/wx/zipstrm.h
+include/wx-2.5/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -446,10 +489,12 @@ share/wx/2.5/gs_afm/Zapf.afm
@dirrm share/wx/2.5/afm
@dirrm share/wx/2.5
@dirrm share/wx
-@dirrm include/wx/xml
-@dirrm include/wx/unix
-@dirrm include/wx/protocol
-@dirrm include/wx/html
-@dirrm include/wx/gtk
-@dirrm include/wx/generic
-@dirrm include/wx
+@dirrm include/wx-2.5/wx/xrc
+@dirrm include/wx-2.5/wx/xml
+@dirrm include/wx-2.5/wx/unix
+@dirrm include/wx-2.5/wx/protocol
+@dirrm include/wx-2.5/wx/html
+@dirrm include/wx-2.5/wx/gtk
+@dirrm include/wx-2.5/wx/generic
+@dirrm include/wx-2.5/wx
+@dirrm include/wx-2.5
diff --git a/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist b/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist
index 83e3768c0c17..49656f547325 100644
--- a/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist
@@ -1,108 +1,69 @@
-include/wx/animate/animate.h
-include/wx/deprecated/expr.h
-include/wx/deprecated/prop.h
-include/wx/deprecated/propform.h
-include/wx/deprecated/proplist.h
-include/wx/deprecated/resource.h
-include/wx/deprecated/setup.h
-include/wx/deprecated/tbarsmpl.h
-include/wx/deprecated/treelay.h
-include/wx/deprecated/wxexpr.h
-include/wx/fl/antiflickpl.h
-include/wx/fl/bardragpl.h
-include/wx/fl/barhintspl.h
-include/wx/fl/cbcustom.h
-include/wx/fl/controlbar.h
-include/wx/fl/dynbarhnd.h
-include/wx/fl/dyntbar.h
-include/wx/fl/dyntbarhnd.h
-include/wx/fl/fldefs.h
-include/wx/fl/frmview.h
-include/wx/fl/garbagec.h
-include/wx/fl/gcupdatesmgr.h
-include/wx/fl/hintanimpl.h
-include/wx/fl/newbmpbtn.h
-include/wx/fl/panedrawpl.h
-include/wx/fl/rowdragpl.h
-include/wx/fl/rowlayoutpl.h
-include/wx/fl/toolwnd.h
-include/wx/fl/updatesmgr.h
-include/wx/gizmos/dynamicsash.h
-include/wx/gizmos/editlbox.h
-include/wx/gizmos/gizmos.h
-include/wx/gizmos/ledctrl.h
-include/wx/gizmos/multicell.h
-include/wx/gizmos/splittree.h
-include/wx/gizmos/statpict.h
-include/wx/ogl/basic.h
-include/wx/ogl/basicp.h
-include/wx/ogl/bmpshape.h
-include/wx/ogl/canvas.h
-include/wx/ogl/composit.h
-include/wx/ogl/constrnt.h
-include/wx/ogl/divided.h
-include/wx/ogl/drawn.h
-include/wx/ogl/drawnp.h
-include/wx/ogl/lines.h
-include/wx/ogl/linesp.h
-include/wx/ogl/mfutils.h
-include/wx/ogl/misc.h
-include/wx/ogl/ogl.h
-include/wx/ogl/ogldiag.h
-include/wx/plot/plot.h
-include/wx/plot/plot_dwn.bmp
-include/wx/plot/plot_enl.bmp
-include/wx/plot/plot_shr.bmp
-include/wx/plot/plot_up.bmp
-include/wx/plot/plot_zin.bmp
-include/wx/plot/plot_zot.bmp
-include/wx/plot/wxplot.rc
-include/wx/stc/stc.h
-include/wx/svg/dcsvg.h
-include/wx/xrc/xh_all.h
-include/wx/xrc/xh_bmp.h
-include/wx/xrc/xh_bmpbt.h
-include/wx/xrc/xh_bttn.h
-include/wx/xrc/xh_cald.h
-include/wx/xrc/xh_chckb.h
-include/wx/xrc/xh_chckl.h
-include/wx/xrc/xh_choic.h
-include/wx/xrc/xh_combo.h
-include/wx/xrc/xh_dlg.h
-include/wx/xrc/xh_frame.h
-include/wx/xrc/xh_gauge.h
-include/wx/xrc/xh_gdctl.h
-include/wx/xrc/xh_html.h
-include/wx/xrc/xh_listb.h
-include/wx/xrc/xh_listc.h
-include/wx/xrc/xh_menu.h
-include/wx/xrc/xh_notbk.h
-include/wx/xrc/xh_panel.h
-include/wx/xrc/xh_radbt.h
-include/wx/xrc/xh_radbx.h
-include/wx/xrc/xh_scrol.h
-include/wx/xrc/xh_scwin.h
-include/wx/xrc/xh_sizer.h
-include/wx/xrc/xh_slidr.h
-include/wx/xrc/xh_spin.h
-include/wx/xrc/xh_split.h
-include/wx/xrc/xh_statbar.h
-include/wx/xrc/xh_stbmp.h
-include/wx/xrc/xh_stbox.h
-include/wx/xrc/xh_stlin.h
-include/wx/xrc/xh_sttxt.h
-include/wx/xrc/xh_text.h
-include/wx/xrc/xh_toolb.h
-include/wx/xrc/xh_tree.h
-include/wx/xrc/xh_unkwn.h
-include/wx/xrc/xh_wizrd.h
-include/wx/xrc/xmlres.h
-@dirrm include/wx/xrc
-@dirrm include/wx/svg
-@dirrm include/wx/stc
-@dirrm include/wx/plot
-@dirrm include/wx/ogl
-@dirrm include/wx/gizmos
-@dirrm include/wx/fl
-@dirrm include/wx/deprecated
-@dirrm include/wx/animate
+include/wx-2.5/wx/animate/animate.h
+include/wx-2.5/wx/deprecated/expr.h
+include/wx-2.5/wx/deprecated/prop.h
+include/wx-2.5/wx/deprecated/propform.h
+include/wx-2.5/wx/deprecated/proplist.h
+include/wx-2.5/wx/deprecated/resource.h
+include/wx-2.5/wx/deprecated/setup.h
+include/wx-2.5/wx/deprecated/tbarsmpl.h
+include/wx-2.5/wx/deprecated/treelay.h
+include/wx-2.5/wx/deprecated/wxexpr.h
+include/wx-2.5/wx/fl/antiflickpl.h
+include/wx-2.5/wx/fl/bardragpl.h
+include/wx-2.5/wx/fl/barhintspl.h
+include/wx-2.5/wx/fl/cbcustom.h
+include/wx-2.5/wx/fl/controlbar.h
+include/wx-2.5/wx/fl/dynbarhnd.h
+include/wx-2.5/wx/fl/dyntbar.h
+include/wx-2.5/wx/fl/dyntbarhnd.h
+include/wx-2.5/wx/fl/fldefs.h
+include/wx-2.5/wx/fl/frmview.h
+include/wx-2.5/wx/fl/garbagec.h
+include/wx-2.5/wx/fl/gcupdatesmgr.h
+include/wx-2.5/wx/fl/hintanimpl.h
+include/wx-2.5/wx/fl/newbmpbtn.h
+include/wx-2.5/wx/fl/panedrawpl.h
+include/wx-2.5/wx/fl/rowdragpl.h
+include/wx-2.5/wx/fl/rowlayoutpl.h
+include/wx-2.5/wx/fl/toolwnd.h
+include/wx-2.5/wx/fl/updatesmgr.h
+include/wx-2.5/wx/gizmos/dynamicsash.h
+include/wx-2.5/wx/gizmos/editlbox.h
+include/wx-2.5/wx/gizmos/gizmos.h
+include/wx-2.5/wx/gizmos/ledctrl.h
+include/wx-2.5/wx/gizmos/multicell.h
+include/wx-2.5/wx/gizmos/splittree.h
+include/wx-2.5/wx/gizmos/statpict.h
+include/wx-2.5/wx/ogl/basic.h
+include/wx-2.5/wx/ogl/basicp.h
+include/wx-2.5/wx/ogl/bmpshape.h
+include/wx-2.5/wx/ogl/canvas.h
+include/wx-2.5/wx/ogl/composit.h
+include/wx-2.5/wx/ogl/constrnt.h
+include/wx-2.5/wx/ogl/divided.h
+include/wx-2.5/wx/ogl/drawn.h
+include/wx-2.5/wx/ogl/drawnp.h
+include/wx-2.5/wx/ogl/lines.h
+include/wx-2.5/wx/ogl/linesp.h
+include/wx-2.5/wx/ogl/mfutils.h
+include/wx-2.5/wx/ogl/misc.h
+include/wx-2.5/wx/ogl/ogl.h
+include/wx-2.5/wx/ogl/ogldiag.h
+include/wx-2.5/wx/plot/plot.h
+include/wx-2.5/wx/plot/plot_dwn.bmp
+include/wx-2.5/wx/plot/plot_enl.bmp
+include/wx-2.5/wx/plot/plot_shr.bmp
+include/wx-2.5/wx/plot/plot_up.bmp
+include/wx-2.5/wx/plot/plot_zin.bmp
+include/wx-2.5/wx/plot/plot_zot.bmp
+include/wx-2.5/wx/plot/wxplot.rc
+include/wx-2.5/wx/stc/stc.h
+include/wx-2.5/wx/svg/dcsvg.h
+@dirrm include/wx-2.5/wx/svg
+@dirrm include/wx-2.5/wx/stc
+@dirrm include/wx-2.5/wx/plot
+@dirrm include/wx-2.5/wx/ogl
+@dirrm include/wx-2.5/wx/gizmos
+@dirrm include/wx-2.5/wx/fl
+@dirrm include/wx-2.5/wx/deprecated
+@dirrm include/wx-2.5/wx/animate
diff --git a/x11-toolkits/wxgtk2-contrib-devel/Makefile b/x11-toolkits/wxgtk2-contrib-devel/Makefile
index c5160c5916c2..4c36af733fab 100644
--- a/x11-toolkits/wxgtk2-contrib-devel/Makefile
+++ b/x11-toolkits/wxgtk2-contrib-devel/Makefile
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
diff --git a/x11-toolkits/wxgtk2-contrib-devel/pkg-plist b/x11-toolkits/wxgtk2-contrib-devel/pkg-plist
index 461abc2b13c2..1e6d7fa75aab 100644
--- a/x11-toolkits/wxgtk2-contrib-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-contrib-devel/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2_animate-2.5.so
-lib/libwx_gtk2_animate-2.5.so.2
-lib/libwx_gtk2_animate-2.5.so.2.0.0
+lib/libwx_gtk2_animate-2.5.so.3
+lib/libwx_gtk2_animate-2.5.so.3.0.0
lib/libwx_gtk2_deprecated-2.5.so
-lib/libwx_gtk2_deprecated-2.5.so.2
-lib/libwx_gtk2_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2_deprecated-2.5.so.3
+lib/libwx_gtk2_deprecated-2.5.so.3.0.0
lib/libwx_gtk2_fl-2.5.so
-lib/libwx_gtk2_fl-2.5.so.2
-lib/libwx_gtk2_fl-2.5.so.2.0.0
+lib/libwx_gtk2_fl-2.5.so.3
+lib/libwx_gtk2_fl-2.5.so.3.0.0
lib/libwx_gtk2_gizmos-2.5.so
-lib/libwx_gtk2_gizmos-2.5.so.2
-lib/libwx_gtk2_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2_gizmos-2.5.so.3
+lib/libwx_gtk2_gizmos-2.5.so.3.0.0
lib/libwx_gtk2_ogl-2.5.so
-lib/libwx_gtk2_ogl-2.5.so.2
-lib/libwx_gtk2_ogl-2.5.so.2.0.0
+lib/libwx_gtk2_ogl-2.5.so.3
+lib/libwx_gtk2_ogl-2.5.so.3.0.0
lib/libwx_gtk2_plot-2.5.so
-lib/libwx_gtk2_plot-2.5.so.2
-lib/libwx_gtk2_plot-2.5.so.2.0.0
+lib/libwx_gtk2_plot-2.5.so.3
+lib/libwx_gtk2_plot-2.5.so.3.0.0
lib/libwx_gtk2_stc-2.5.so
-lib/libwx_gtk2_stc-2.5.so.2
-lib/libwx_gtk2_stc-2.5.so.2.0.0
+lib/libwx_gtk2_stc-2.5.so.3
+lib/libwx_gtk2_stc-2.5.so.3.0.0
lib/libwx_gtk2_svg-2.5.so
-lib/libwx_gtk2_svg-2.5.so.2
-lib/libwx_gtk2_svg-2.5.so.2.0.0
-lib/libwx_gtk2_xrc-2.5.so
-lib/libwx_gtk2_xrc-2.5.so.2
-lib/libwx_gtk2_xrc-2.5.so.2.0.0
+lib/libwx_gtk2_svg-2.5.so.3
+lib/libwx_gtk2_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk2-devel/Makefile b/x11-toolkits/wxgtk2-devel/Makefile
index 14e76d536b22..beb00c3158e9 100644
--- a/x11-toolkits/wxgtk2-devel/Makefile
+++ b/x11-toolkits/wxgtk2-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.2
-PORTREVISION?= 1
+PORTVERSION= 2.5.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -17,10 +16,11 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff \
- expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
+ jpeg.9:${PORTSDIR}/graphics/jpeg\
+ tiff.4:${PORTSDIR}/graphics/tiff\
+ expat.5:${PORTSDIR}/textproc/expat2\
+ mspack.1:${PORTSDIR}/archivers/libmspack
CONFLICTS= wxgtk-*
@@ -32,12 +32,13 @@ USE_ICONV= yes
USE_GNOME= gtk20
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libpng=sys \
- --with-libjpeg=sys \
- --with-libtiff=sys \
- --with-zlib=sys \
- --with-expat=sys \
- --with-opengl \
+CONFIGURE_ARGS= --with-libpng=sys\
+ --with-libjpeg=sys\
+ --with-libtiff=sys\
+ --with-zlib=sys\
+ --with-expat=sys\
+ --with-opengl\
+ --with-mspack\
--enable-gtk2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
@@ -51,7 +52,7 @@ NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -66,23 +67,23 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
.else
-LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
pre-configure:
- @${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+ @${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
.include <bsd.port.pre.mk>
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
diff --git a/x11-toolkits/wxgtk2-devel/distinfo b/x11-toolkits/wxgtk2-devel/distinfo
index 7c24033cdccf..ab4f811407f2 100644
--- a/x11-toolkits/wxgtk2-devel/distinfo
+++ b/x11-toolkits/wxgtk2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.2.tar.bz2) = b45874428b0164bfa5bd1a5a11b3eb4a
-SIZE (wxGTK-2.5.2.tar.bz2) = 6579255
+MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
+SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-Makefile.in
index 966de5b3e9df..c9d72e6757c7 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon May 31 18:11:50 2004
-+++ Makefile.in Sun Jun 27 21:12:13 2004
+--- Makefile.in.orig Sun Oct 10 22:17:27 2004
++++ Makefile.in Wed Nov 24 22:47:40 2004
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,30 +8,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -6927,11 +6928,13 @@
+@@ -7408,11 +7409,13 @@
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__macos_res___depname) $(__cocoa_res___depname)
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)
--install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx
-+ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
++ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
+
+install-common: $(__install_afm___depname) $(__install_gsafm___depname) locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-@@ -7371,8 +7374,7 @@
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+@@ -7892,9 +7895,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
-+ $(INSTALL_SCRIPT) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in
index c8ae3832f26e..88e167a98f95 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in
@@ -1,19 +1,20 @@
---- contrib/src/Makefile.in.orig Mon May 31 18:12:16 2004
-+++ contrib/src/Makefile.in Mon Jun 28 00:28:54 2004
-@@ -1,15 +1,23 @@
- # $Id: Makefile.in,v 1.16 2003/08/17 12:48:18 VS Exp $
+--- contrib/src/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/Makefile.in Fri Nov 26 00:20:35 2004
+@@ -1,15 +1,24 @@
+ # $Id: Makefile.in,v 1.17 2004/09/24 15:32:58 VS Exp $
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg xrc deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg xrc deprecated animate #applet mmedia
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
-all:
++WX_RELEASE= @WX_RELEASE@
+@COND_UNICODE_1@wxregexu_depname= wxregexu
+
+all: $(wxregexu_depname)
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
+wxregexu:
-+ cd ../.. && $(MAKE) lib/libwxregexu.a
++ @cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a
+
clean:
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in
index 4e5875295e52..abfc81a6176c 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/animate/Makefile.in.orig Sun Jun 27 21:38:11 2004
-+++ contrib/src/animate/Makefile.in Sun Jun 27 21:38:20 2004
-@@ -172,6 +172,8 @@
+--- contrib/src/animate/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/animate/Makefile.in Wed Nov 24 21:37:14 2004
+@@ -180,6 +180,8 @@
all: $(__animatedll___depname) $(__animatelib___depname)
install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/animate/animate.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in
index 237d6931053c..0c492341ca53 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/deprecated/Makefile.in.orig Sun Jun 27 21:38:26 2004
-+++ contrib/src/deprecated/Makefile.in Sun Jun 27 21:38:52 2004
-@@ -199,6 +199,8 @@
+--- contrib/src/deprecated/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/deprecated/Makefile.in Wed Nov 24 21:39:56 2004
+@@ -207,6 +207,8 @@
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in
index 094280a521fc..2de711cc3b1f 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/fl/Makefile.in.orig Sun Jun 27 21:34:52 2004
-+++ contrib/src/fl/Makefile.in Sun Jun 27 21:35:37 2004
-@@ -203,6 +203,8 @@
+--- contrib/src/fl/Makefile.in.orig Sun Oct 10 22:18:49 2004
++++ contrib/src/fl/Makefile.in Wed Nov 24 21:40:16 2004
+@@ -211,6 +211,8 @@
all: $(__fldll___depname) $(__fllib___depname)
install: all $(__install_fldll___depname) $(__install_fllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in
index fae5de6b9501..b6e204d0704a 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/gizmos/Makefile.in.orig Sun Jun 27 21:35:44 2004
-+++ contrib/src/gizmos/Makefile.in Sun Jun 27 21:35:55 2004
-@@ -181,6 +181,8 @@
+--- contrib/src/gizmos/Makefile.in.orig Sun Oct 10 22:18:50 2004
++++ contrib/src/gizmos/Makefile.in Wed Nov 24 21:40:37 2004
+@@ -189,6 +189,8 @@
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in
index cb94093057e1..2be3bdbe7e1c 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/ogl/Makefile.in.orig Sun Jun 27 22:44:07 2004
-+++ contrib/src/ogl/Makefile.in Sun Jun 27 22:44:25 2004
-@@ -193,6 +193,8 @@
+--- contrib/src/ogl/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/ogl/Makefile.in Wed Nov 24 21:41:00 2004
+@@ -201,6 +201,8 @@
all: $(__ogldll___depname) $(__ogllib___depname)
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in
index 152bf7473082..802b4f093baa 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/plot/Makefile.in.orig Sun Jun 27 21:36:28 2004
-+++ contrib/src/plot/Makefile.in Sun Jun 27 21:36:37 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/plot/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/plot/Makefile.in Wed Nov 24 21:41:16 2004
+@@ -179,6 +179,8 @@
all: $(__plotdll___depname) $(__plotlib___depname)
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in
index 5053151bf229..c41d5cbfec19 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/stc/Makefile.in.orig Sun Jun 27 21:36:48 2004
-+++ contrib/src/stc/Makefile.in Sun Jun 27 21:36:56 2004
-@@ -286,6 +286,8 @@
+--- contrib/src/stc/Makefile.in.orig Sun Oct 10 22:18:53 2004
++++ contrib/src/stc/Makefile.in Wed Nov 24 21:41:31 2004
+@@ -310,6 +310,8 @@
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/stc/stc.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in
index e41c53fd4030..213aef13d42c 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/svg/Makefile.in.orig Sun Jun 27 21:37:03 2004
-+++ contrib/src/svg/Makefile.in Sun Jun 27 21:37:16 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/svg/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/svg/Makefile.in Wed Nov 24 21:41:44 2004
+@@ -179,6 +179,8 @@
all: $(__svgdll___depname) $(__svglib___depname)
install: all $(__install_svgdll___depname) $(__install_svglib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/svg/dcsvg.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-xrc-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-xrc-Makefile.in
deleted file mode 100644
index aafcaa405758..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-xrc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/xrc/Makefile.in.orig Sun Jun 27 21:37:21 2004
-+++ contrib/src/xrc/Makefile.in Sun Jun 27 21:37:44 2004
-@@ -258,6 +258,8 @@
- all: $(__xrcdll___depname) $(__xrclib___depname)
-
- install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
-+
-+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
- for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h
new file mode 100644
index 000000000000..a8688e1069c0
--- /dev/null
+++ b/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h
@@ -0,0 +1,14 @@
+--- src/regex/regcustom.h.orig Thu Nov 25 21:03:13 2004
++++ src/regex/regcustom.h Thu Nov 25 21:03:29 2004
+@@ -76,6 +76,11 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
+
+ /* internal character type and related */
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regex.h b/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regex.h
new file mode 100644
index 000000000000..01f1f176215f
--- /dev/null
+++ b/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regex.h
@@ -0,0 +1,16 @@
+--- src/regex/regex.h.orig Thu Nov 25 21:02:55 2004
++++ src/regex/regex.h Thu Nov 25 21:03:06 2004
+@@ -115,7 +115,13 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
++
+
+ /*
+ * interface types etc.
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..353821f40cfd
--- /dev/null
+++ b/x11-toolkits/wxgtk2-devel/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,21 @@
+--- utils/wxrc/Makefile.in.orig Thu Nov 25 21:52:45 2004
++++ utils/wxrc/Makefile.in Thu Nov 25 21:58:43 2004
+@@ -28,6 +28,7 @@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ HOST_SUFFIX = @HOST_SUFFIX@
+@@ -113,9 +114,7 @@
+
+ @COND_USE_XRC_1@install_wxrc:
+ @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
+
+ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+ $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-wx-config.in b/x11-toolkits/wxgtk2-devel/files/patch-wx-config.in
index 99fb6adf332c..0453477f8fbc 100644
--- a/x11-toolkits/wxgtk2-devel/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk2-devel/files/patch-wx-config.in
@@ -1,11 +1,11 @@
---- wx-config.in.orig Mon May 31 18:11:50 2004
-+++ wx-config.in Sun Jun 27 20:08:21 2004
-@@ -230,7 +230,7 @@
- includes=" -I${includedir}"
- fi
+--- wx-config.in.orig Sun Oct 10 22:17:27 2004
++++ wx-config.in Wed Nov 24 22:48:01 2004
+@@ -1014,7 +1014,7 @@
+ _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
+ fi
-- includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
-+ includes="-I${includedir}/wx/include/${TOOLCHAIN_NAME}$includes"
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
++_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
- # in inplace case we need to also add path to contrib headers -- do it
- # unconditionally as they might be used and we have no way of knowing if
+ # now without further ado, we can answer these too.
+ [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk2-devel/pkg-plist b/x11-toolkits/wxgtk2-devel/pkg-plist
index 0af111d8925e..3f401620305b 100644
--- a/x11-toolkits/wxgtk2-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-devel/pkg-plist
@@ -1,26 +1,29 @@
bin/wxgtk2-2.5-config
-include/wx/include/gtk2-2.5/wx/setup.h
+bin/wxrc-gtk2-2.5
+include/wx-2.5/gtk2-ansi-release-2.5/wx/setup.h
lib/libwx_base-2.5.so
-lib/libwx_base-2.5.so.2
-lib/libwx_base-2.5.so.2.0.0
+lib/libwx_base-2.5.so.3
+lib/libwx_base-2.5.so.3.0.0
lib/libwx_base_net-2.5.so
-lib/libwx_base_net-2.5.so.2
-lib/libwx_base_net-2.5.so.2.0.0
+lib/libwx_base_net-2.5.so.3
+lib/libwx_base_net-2.5.so.3.0.0
lib/libwx_base_xml-2.5.so
-lib/libwx_base_xml-2.5.so.2
-lib/libwx_base_xml-2.5.so.2.0.0
+lib/libwx_base_xml-2.5.so.3
+lib/libwx_base_xml-2.5.so.3.0.0
lib/libwx_gtk2_adv-2.5.so
-lib/libwx_gtk2_adv-2.5.so.2
-lib/libwx_gtk2_adv-2.5.so.2.0.0
+lib/libwx_gtk2_adv-2.5.so.3
+lib/libwx_gtk2_adv-2.5.so.3.0.0
lib/libwx_gtk2_core-2.5.so
-lib/libwx_gtk2_core-2.5.so.2
-lib/libwx_gtk2_core-2.5.so.2.0.0
+lib/libwx_gtk2_core-2.5.so.3
+lib/libwx_gtk2_core-2.5.so.3.0.0
lib/libwx_gtk2_gl-2.5.so
-lib/libwx_gtk2_gl-2.5.so.2
-lib/libwx_gtk2_gl-2.5.so.2.0.0
+lib/libwx_gtk2_gl-2.5.so.3
+lib/libwx_gtk2_gl-2.5.so.3.0.0
lib/libwx_gtk2_html-2.5.so
-lib/libwx_gtk2_html-2.5.so.2
-lib/libwx_gtk2_html-2.5.so.2.0.0
-@dirrm include/wx/include/gtk2-2.5/wx
-@dirrm include/wx/include/gtk2-2.5
-@dirrm include/wx/include
+lib/libwx_gtk2_html-2.5.so.3
+lib/libwx_gtk2_html-2.5.so.3.0.0
+lib/libwx_gtk2_xrc-2.5.so
+lib/libwx_gtk2_xrc-2.5.so.3
+lib/libwx_gtk2_xrc-2.5.so.3.0.0
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5/wx
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5
diff --git a/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist b/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk2-unicode-devel/pkg-plist b/x11-toolkits/wxgtk2-unicode-devel/pkg-plist
index c62d05334d1b..3fbfc72e986b 100644
--- a/x11-toolkits/wxgtk2-unicode-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-unicode-devel/pkg-plist
@@ -1,26 +1,29 @@
bin/wxgtk2u-2.5-config
-include/wx/include/gtk2u-2.5/wx/setup.h
+bin/wxrc-gtk2u-2.5
+include/wx-2.5/gtk2-unicode-release-2.5/wx/setup.h
lib/libwx_baseu-2.5.so
-lib/libwx_baseu-2.5.so.2
-lib/libwx_baseu-2.5.so.2.0.0
+lib/libwx_baseu-2.5.so.3
+lib/libwx_baseu-2.5.so.3.0.0
lib/libwx_baseu_net-2.5.so
-lib/libwx_baseu_net-2.5.so.2
-lib/libwx_baseu_net-2.5.so.2.0.0
+lib/libwx_baseu_net-2.5.so.3
+lib/libwx_baseu_net-2.5.so.3.0.0
lib/libwx_baseu_xml-2.5.so
-lib/libwx_baseu_xml-2.5.so.2
-lib/libwx_baseu_xml-2.5.so.2.0.0
+lib/libwx_baseu_xml-2.5.so.3
+lib/libwx_baseu_xml-2.5.so.3.0.0
lib/libwx_gtk2u_adv-2.5.so
-lib/libwx_gtk2u_adv-2.5.so.2
-lib/libwx_gtk2u_adv-2.5.so.2.0.0
+lib/libwx_gtk2u_adv-2.5.so.3
+lib/libwx_gtk2u_adv-2.5.so.3.0.0
lib/libwx_gtk2u_core-2.5.so
-lib/libwx_gtk2u_core-2.5.so.2
-lib/libwx_gtk2u_core-2.5.so.2.0.0
+lib/libwx_gtk2u_core-2.5.so.3
+lib/libwx_gtk2u_core-2.5.so.3.0.0
lib/libwx_gtk2u_gl-2.5.so
-lib/libwx_gtk2u_gl-2.5.so.2
-lib/libwx_gtk2u_gl-2.5.so.2.0.0
+lib/libwx_gtk2u_gl-2.5.so.3
+lib/libwx_gtk2u_gl-2.5.so.3.0.0
lib/libwx_gtk2u_html-2.5.so
-lib/libwx_gtk2u_html-2.5.so.2
-lib/libwx_gtk2u_html-2.5.so.2.0.0
-@dirrm include/wx/include/gtk2u-2.5/wx
-@dirrm include/wx/include/gtk2u-2.5
-@dirrm include/wx/include
+lib/libwx_gtk2u_html-2.5.so.3
+lib/libwx_gtk2u_html-2.5.so.3.0.0
+lib/libwx_gtk2u_xrc-2.5.so
+lib/libwx_gtk2u_xrc-2.5.so.3
+lib/libwx_gtk2u_xrc-2.5.so.3.0.0
+@dirrm include/wx-2.5/gtk2-unicode-release-2.5/wx
+@dirrm include/wx-2.5/gtk2-unicode-release-2.5
diff --git a/x11-toolkits/wxgtk2-utils-devel/Makefile b/x11-toolkits/wxgtk2-utils-devel/Makefile
index 7aa0032743c7..e489845a784b 100644
--- a/x11-toolkits/wxgtk2-utils-devel/Makefile
+++ b/x11-toolkits/wxgtk2-utils-devel/Makefile
@@ -10,10 +10,10 @@ COMMENT= The wxWidgets GUI toolkit utils (devel version)
.if defined(WITH_UNICODE)
WXGTK_FLAVOR= gtk2-unicode-utils
-LIB_DEPENDS= wx_gtk2u_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
+LIB_DEPENDS= wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
.else
WXGTK_FLAVOR= gtk2-utils
-LIB_DEPENDS= wx_gtk2_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
+LIB_DEPENDS= wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
.endif
BUILD_WRKSRC= ${WRKSRC}/contrib/utils
diff --git a/x11-toolkits/wxgtk2-utils-devel/pkg-plist b/x11-toolkits/wxgtk2-utils-devel/pkg-plist
index 5f921442aaab..b1daae745572 100644
--- a/x11-toolkits/wxgtk2-utils-devel/pkg-plist
+++ b/x11-toolkits/wxgtk2-utils-devel/pkg-plist
@@ -1,3 +1,2 @@
bin/convertrc
-bin/wxrc
bin/wxrcedit
diff --git a/x11-toolkits/wxgtk26-common/pkg-plist b/x11-toolkits/wxgtk26-common/pkg-plist
index 881bb9f3defa..f68eebf220d8 100644
--- a/x11-toolkits/wxgtk26-common/pkg-plist
+++ b/x11-toolkits/wxgtk26-common/pkg-plist
@@ -1,399 +1,442 @@
-include/wx/accel.h
-include/wx/access.h
-include/wx/afterstd.h
-include/wx/app.h
-include/wx/apptrait.h
-include/wx/arrimpl.cpp
-include/wx/arrstr.h
-include/wx/artprov.h
-include/wx/beforestd.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/bookctrl.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/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/dcmirror.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/display.h
-include/wx/dlimpexp.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/encinfo.h
-include/wx/event.h
-include/wx/evtloop.h
-include/wx/except.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/fmappriv.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/gbsizer.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/gridsel.h
-include/wx/generic/helpext.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/logg.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/numdlgg.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/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/msgdlg.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/win_gtk.h
-include/wx/gtk/window.h
-include/wx/hash.h
-include/wx/hashmap.h
-include/wx/hashset.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/htmlproc.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/htmllbox.h
-include/wx/icon.h
-include/wx/iconbndl.h
-include/wx/iconloc.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/init.h
-include/wx/intl.h
-include/wx/iosfwrap.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/listbook.h
-include/wx/listbox.h
-include/wx/listctrl.h
-include/wx/listimpl.cpp
-include/wx/log.h
-include/wx/longlong.h
-include/wx/math.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/numdlg.h
-include/wx/object.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/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/ptr_scpd.h
-include/wx/quantize.h
-include/wx/radiobox.h
-include/wx/radiobut.h
-include/wx/rawbmp.h
-include/wx/regex.h
-include/wx/region.h
-include/wx/renderer.h
-include/wx/sashwin.h
-include/wx/sckaddr.h
-include/wx/sckipc.h
-include/wx/sckstrm.h
-include/wx/scopeguard.h
-include/wx/scrolbar.h
-include/wx/scrolwin.h
-include/wx/selstore.h
-include/wx/settings.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/snglinst.h
-include/wx/socket.h
-include/wx/sound.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/stopwatch.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/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/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/apptbase.h
-include/wx/unix/apptrait.h
-include/wx/unix/displayx11.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/joystick.h
-include/wx/unix/mimetype.h
-include/wx/unix/pipe.h
-include/wx/unix/sound.h
-include/wx/unix/taskbarx11.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/vidmode.h
-include/wx/vlbox.h
-include/wx/vms_x_fix.h
-include/wx/volume.h
-include/wx/vscroll.h
-include/wx/wave.h
-include/wx/wfstream.h
-include/wx/window.h
-include/wx/wizard.h
-include/wx/wx.h
-include/wx/wxchar.h
-include/wx/wxhtml.h
-include/wx/wxprec.h
-include/wx/xml/xml.h
-include/wx/xpmdecod.h
-include/wx/xpmhand.h
-include/wx/xti.h
-include/wx/xtistrm.h
-include/wx/xtixml.h
-include/wx/zipstrm.h
-include/wx/zstream.h
+include/wx-2.5/wx/accel.h
+include/wx-2.5/wx/access.h
+include/wx-2.5/wx/afterstd.h
+include/wx-2.5/wx/app.h
+include/wx-2.5/wx/apptrait.h
+include/wx-2.5/wx/arrimpl.cpp
+include/wx-2.5/wx/arrstr.h
+include/wx-2.5/wx/artprov.h
+include/wx-2.5/wx/beforestd.h
+include/wx-2.5/wx/bitmap.h
+include/wx-2.5/wx/bmpbuttn.h
+include/wx-2.5/wx/bookctrl.h
+include/wx-2.5/wx/brush.h
+include/wx-2.5/wx/buffer.h
+include/wx-2.5/wx/build.h
+include/wx-2.5/wx/busyinfo.h
+include/wx-2.5/wx/button.h
+include/wx-2.5/wx/calctrl.h
+include/wx-2.5/wx/caret.h
+include/wx-2.5/wx/checkbox.h
+include/wx-2.5/wx/checklst.h
+include/wx-2.5/wx/chkconf.h
+include/wx-2.5/wx/choicdlg.h
+include/wx-2.5/wx/choice.h
+include/wx-2.5/wx/choicebk.h
+include/wx-2.5/wx/clipbrd.h
+include/wx-2.5/wx/clntdata.h
+include/wx-2.5/wx/cmdline.h
+include/wx-2.5/wx/cmdproc.h
+include/wx-2.5/wx/cmndata.h
+include/wx-2.5/wx/colordlg.h
+include/wx-2.5/wx/colour.h
+include/wx-2.5/wx/combobox.h
+include/wx-2.5/wx/confbase.h
+include/wx-2.5/wx/config.h
+include/wx-2.5/wx/containr.h
+include/wx-2.5/wx/control.h
+include/wx-2.5/wx/cshelp.h
+include/wx-2.5/wx/ctrlsub.h
+include/wx-2.5/wx/cursor.h
+include/wx-2.5/wx/dataobj.h
+include/wx-2.5/wx/datetime.h
+include/wx-2.5/wx/datetime.inl
+include/wx-2.5/wx/datstrm.h
+include/wx-2.5/wx/db.h
+include/wx-2.5/wx/dbgrid.h
+include/wx-2.5/wx/dbkeyg.h
+include/wx-2.5/wx/dbtable.h
+include/wx-2.5/wx/dc.h
+include/wx-2.5/wx/dcbuffer.h
+include/wx-2.5/wx/dcclient.h
+include/wx-2.5/wx/dcmemory.h
+include/wx-2.5/wx/dcmirror.h
+include/wx-2.5/wx/dcprint.h
+include/wx-2.5/wx/dcps.h
+include/wx-2.5/wx/dcscreen.h
+include/wx-2.5/wx/dde.h
+include/wx-2.5/wx/debug.h
+include/wx-2.5/wx/defs.h
+include/wx-2.5/wx/dialog.h
+include/wx-2.5/wx/dialup.h
+include/wx-2.5/wx/dir.h
+include/wx-2.5/wx/dirctrl.h
+include/wx-2.5/wx/dirdlg.h
+include/wx-2.5/wx/display.h
+include/wx-2.5/wx/dlimpexp.h
+include/wx-2.5/wx/dnd.h
+include/wx-2.5/wx/docmdi.h
+include/wx-2.5/wx/docview.h
+include/wx-2.5/wx/dragimag.h
+include/wx-2.5/wx/dynarray.h
+include/wx-2.5/wx/dynlib.h
+include/wx-2.5/wx/dynload.h
+include/wx-2.5/wx/effects.h
+include/wx-2.5/wx/encconv.h
+include/wx-2.5/wx/encinfo.h
+include/wx-2.5/wx/event.h
+include/wx-2.5/wx/evtloop.h
+include/wx-2.5/wx/except.h
+include/wx-2.5/wx/fdrepdlg.h
+include/wx-2.5/wx/features.h
+include/wx-2.5/wx/ffile.h
+include/wx-2.5/wx/file.h
+include/wx-2.5/wx/fileconf.h
+include/wx-2.5/wx/filedlg.h
+include/wx-2.5/wx/filefn.h
+include/wx-2.5/wx/filename.h
+include/wx-2.5/wx/filesys.h
+include/wx-2.5/wx/fmappriv.h
+include/wx-2.5/wx/font.h
+include/wx-2.5/wx/fontdlg.h
+include/wx-2.5/wx/fontenc.h
+include/wx-2.5/wx/fontenum.h
+include/wx-2.5/wx/fontmap.h
+include/wx-2.5/wx/fontutil.h
+include/wx-2.5/wx/frame.h
+include/wx-2.5/wx/fs_inet.h
+include/wx-2.5/wx/fs_mem.h
+include/wx-2.5/wx/fs_zip.h
+include/wx-2.5/wx/gauge.h
+include/wx-2.5/wx/gbsizer.h
+include/wx-2.5/wx/gdicmn.h
+include/wx-2.5/wx/gdiobj.h
+include/wx-2.5/wx/generic/accel.h
+include/wx-2.5/wx/generic/calctrl.h
+include/wx-2.5/wx/generic/caret.h
+include/wx-2.5/wx/generic/choicdgg.h
+include/wx-2.5/wx/generic/colrdlgg.h
+include/wx-2.5/wx/generic/dcpsg.h
+include/wx-2.5/wx/generic/dirctrlg.h
+include/wx-2.5/wx/generic/dirdlgg.h
+include/wx-2.5/wx/generic/dragimgg.h
+include/wx-2.5/wx/generic/fdrepdlg.h
+include/wx-2.5/wx/generic/filedlgg.h
+include/wx-2.5/wx/generic/fontdlgg.h
+include/wx-2.5/wx/generic/grid.h
+include/wx-2.5/wx/generic/gridctrl.h
+include/wx-2.5/wx/generic/gridsel.h
+include/wx-2.5/wx/generic/helpext.h
+include/wx-2.5/wx/generic/imaglist.h
+include/wx-2.5/wx/generic/laywin.h
+include/wx-2.5/wx/generic/listctrl.h
+include/wx-2.5/wx/generic/logg.h
+include/wx-2.5/wx/generic/msgdlgg.h
+include/wx-2.5/wx/generic/notebook.h
+include/wx-2.5/wx/generic/numdlgg.h
+include/wx-2.5/wx/generic/paletteg.h
+include/wx-2.5/wx/generic/panelg.h
+include/wx-2.5/wx/generic/printps.h
+include/wx-2.5/wx/generic/prntdlgg.h
+include/wx-2.5/wx/generic/progdlgg.h
+include/wx-2.5/wx/generic/sashwin.h
+include/wx-2.5/wx/generic/scrolwin.h
+include/wx-2.5/wx/generic/spinctlg.h
+include/wx-2.5/wx/generic/splash.h
+include/wx-2.5/wx/generic/splitter.h
+include/wx-2.5/wx/generic/statusbr.h
+include/wx-2.5/wx/generic/tabg.h
+include/wx-2.5/wx/generic/textdlgg.h
+include/wx-2.5/wx/generic/timer.h
+include/wx-2.5/wx/generic/treectlg.h
+include/wx-2.5/wx/generic/wizard.h
+include/wx-2.5/wx/geometry.h
+include/wx-2.5/wx/gifdecod.h
+include/wx-2.5/wx/glcanvas.h
+include/wx-2.5/wx/grid.h
+include/wx-2.5/wx/gsocket.h
+include/wx-2.5/wx/gtk/accel.h
+include/wx-2.5/wx/gtk/app.h
+include/wx-2.5/wx/gtk/bitmap.h
+include/wx-2.5/wx/gtk/bmpbuttn.h
+include/wx-2.5/wx/gtk/brush.h
+include/wx-2.5/wx/gtk/button.h
+include/wx-2.5/wx/gtk/checkbox.h
+include/wx-2.5/wx/gtk/checklst.h
+include/wx-2.5/wx/gtk/choice.h
+include/wx-2.5/wx/gtk/clipbrd.h
+include/wx-2.5/wx/gtk/colordlg.h
+include/wx-2.5/wx/gtk/colour.h
+include/wx-2.5/wx/gtk/combobox.h
+include/wx-2.5/wx/gtk/control.h
+include/wx-2.5/wx/gtk/cursor.h
+include/wx-2.5/wx/gtk/dataform.h
+include/wx-2.5/wx/gtk/dataobj.h
+include/wx-2.5/wx/gtk/dataobj2.h
+include/wx-2.5/wx/gtk/dc.h
+include/wx-2.5/wx/gtk/dcclient.h
+include/wx-2.5/wx/gtk/dcmemory.h
+include/wx-2.5/wx/gtk/dcscreen.h
+include/wx-2.5/wx/gtk/dialog.h
+include/wx-2.5/wx/gtk/dnd.h
+include/wx-2.5/wx/gtk/filedlg.h
+include/wx-2.5/wx/gtk/font.h
+include/wx-2.5/wx/gtk/fontdlg.h
+include/wx-2.5/wx/gtk/frame.h
+include/wx-2.5/wx/gtk/gauge.h
+include/wx-2.5/wx/gtk/gdiobj.h
+include/wx-2.5/wx/gtk/glcanvas.h
+include/wx-2.5/wx/gtk/icon.h
+include/wx-2.5/wx/gtk/listbox.h
+include/wx-2.5/wx/gtk/mdi.h
+include/wx-2.5/wx/gtk/menu.h
+include/wx-2.5/wx/gtk/menuitem.h
+include/wx-2.5/wx/gtk/minifram.h
+include/wx-2.5/wx/gtk/msgdlg.h
+include/wx-2.5/wx/gtk/notebook.h
+include/wx-2.5/wx/gtk/pen.h
+include/wx-2.5/wx/gtk/popupwin.h
+include/wx-2.5/wx/gtk/radiobox.h
+include/wx-2.5/wx/gtk/radiobut.h
+include/wx-2.5/wx/gtk/region.h
+include/wx-2.5/wx/gtk/scrolbar.h
+include/wx-2.5/wx/gtk/scrolwin.h
+include/wx-2.5/wx/gtk/slider.h
+include/wx-2.5/wx/gtk/spinbutt.h
+include/wx-2.5/wx/gtk/spinctrl.h
+include/wx-2.5/wx/gtk/statbmp.h
+include/wx-2.5/wx/gtk/statbox.h
+include/wx-2.5/wx/gtk/statline.h
+include/wx-2.5/wx/gtk/stattext.h
+include/wx-2.5/wx/gtk/tbargtk.h
+include/wx-2.5/wx/gtk/textctrl.h
+include/wx-2.5/wx/gtk/tglbtn.h
+include/wx-2.5/wx/gtk/timer.h
+include/wx-2.5/wx/gtk/tooltip.h
+include/wx-2.5/wx/gtk/toplevel.h
+include/wx-2.5/wx/gtk/treectrl.h
+include/wx-2.5/wx/gtk/win_gtk.h
+include/wx-2.5/wx/gtk/window.h
+include/wx-2.5/wx/hash.h
+include/wx-2.5/wx/hashmap.h
+include/wx-2.5/wx/hashset.h
+include/wx-2.5/wx/help.h
+include/wx-2.5/wx/helpbase.h
+include/wx-2.5/wx/helphtml.h
+include/wx-2.5/wx/helpwin.h
+include/wx-2.5/wx/html/forcelnk.h
+include/wx-2.5/wx/html/helpctrl.h
+include/wx-2.5/wx/html/helpdata.h
+include/wx-2.5/wx/html/helpfrm.h
+include/wx-2.5/wx/html/htmlcell.h
+include/wx-2.5/wx/html/htmldefs.h
+include/wx-2.5/wx/html/htmlfilt.h
+include/wx-2.5/wx/html/htmlpars.h
+include/wx-2.5/wx/html/htmlproc.h
+include/wx-2.5/wx/html/htmltag.h
+include/wx-2.5/wx/html/htmlwin.h
+include/wx-2.5/wx/html/htmprint.h
+include/wx-2.5/wx/html/m_templ.h
+include/wx-2.5/wx/html/winpars.h
+include/wx-2.5/wx/htmllbox.h
+include/wx-2.5/wx/icon.h
+include/wx-2.5/wx/iconbndl.h
+include/wx-2.5/wx/iconloc.h
+include/wx-2.5/wx/imagbmp.h
+include/wx-2.5/wx/image.h
+include/wx-2.5/wx/imaggif.h
+include/wx-2.5/wx/imagiff.h
+include/wx-2.5/wx/imagjpeg.h
+include/wx-2.5/wx/imaglist.h
+include/wx-2.5/wx/imagpcx.h
+include/wx-2.5/wx/imagpng.h
+include/wx-2.5/wx/imagpnm.h
+include/wx-2.5/wx/imagtiff.h
+include/wx-2.5/wx/imagxpm.h
+include/wx-2.5/wx/init.h
+include/wx-2.5/wx/intl.h
+include/wx-2.5/wx/iosfwrap.h
+include/wx-2.5/wx/ioswrap.h
+include/wx-2.5/wx/ipc.h
+include/wx-2.5/wx/ipcbase.h
+include/wx-2.5/wx/isql.h
+include/wx-2.5/wx/isqlext.h
+include/wx-2.5/wx/joystick.h
+include/wx-2.5/wx/layout.h
+include/wx-2.5/wx/laywin.h
+include/wx-2.5/wx/list.h
+include/wx-2.5/wx/listbase.h
+include/wx-2.5/wx/listbook.h
+include/wx-2.5/wx/listbox.h
+include/wx-2.5/wx/listctrl.h
+include/wx-2.5/wx/listimpl.cpp
+include/wx-2.5/wx/log.h
+include/wx-2.5/wx/longlong.h
+include/wx-2.5/wx/math.h
+include/wx-2.5/wx/matrix.h
+include/wx-2.5/wx/mdi.h
+include/wx-2.5/wx/memconf.h
+include/wx-2.5/wx/memory.h
+include/wx-2.5/wx/memtext.h
+include/wx-2.5/wx/menu.h
+include/wx-2.5/wx/menuitem.h
+include/wx-2.5/wx/metafile.h
+include/wx-2.5/wx/mimetype.h
+include/wx-2.5/wx/minifram.h
+include/wx-2.5/wx/module.h
+include/wx-2.5/wx/msgdlg.h
+include/wx-2.5/wx/msgout.h
+include/wx-2.5/wx/mstream.h
+include/wx-2.5/wx/notebook.h
+include/wx-2.5/wx/numdlg.h
+include/wx-2.5/wx/object.h
+include/wx-2.5/wx/ownerdrw.h
+include/wx-2.5/wx/palette.h
+include/wx-2.5/wx/panel.h
+include/wx-2.5/wx/paper.h
+include/wx-2.5/wx/pen.h
+include/wx-2.5/wx/platform.h
+include/wx-2.5/wx/popupwin.h
+include/wx-2.5/wx/print.h
+include/wx-2.5/wx/printdlg.h
+include/wx-2.5/wx/prntbase.h
+include/wx-2.5/wx/process.h
+include/wx-2.5/wx/progdlg.h
+include/wx-2.5/wx/protocol/file.h
+include/wx-2.5/wx/protocol/ftp.h
+include/wx-2.5/wx/protocol/http.h
+include/wx-2.5/wx/protocol/protocol.h
+include/wx-2.5/wx/ptr_scpd.h
+include/wx-2.5/wx/quantize.h
+include/wx-2.5/wx/radiobox.h
+include/wx-2.5/wx/radiobut.h
+include/wx-2.5/wx/rawbmp.h
+include/wx-2.5/wx/regex.h
+include/wx-2.5/wx/region.h
+include/wx-2.5/wx/renderer.h
+include/wx-2.5/wx/sashwin.h
+include/wx-2.5/wx/sckaddr.h
+include/wx-2.5/wx/sckipc.h
+include/wx-2.5/wx/sckstrm.h
+include/wx-2.5/wx/scopeguard.h
+include/wx-2.5/wx/scrolbar.h
+include/wx-2.5/wx/scrolwin.h
+include/wx-2.5/wx/selstore.h
+include/wx-2.5/wx/settings.h
+include/wx-2.5/wx/sizer.h
+include/wx-2.5/wx/slider.h
+include/wx-2.5/wx/snglinst.h
+include/wx-2.5/wx/socket.h
+include/wx-2.5/wx/sound.h
+include/wx-2.5/wx/spinbutt.h
+include/wx-2.5/wx/spinctrl.h
+include/wx-2.5/wx/splash.h
+include/wx-2.5/wx/splitter.h
+include/wx-2.5/wx/sstream.h
+include/wx-2.5/wx/stack.h
+include/wx-2.5/wx/statbmp.h
+include/wx-2.5/wx/statbox.h
+include/wx-2.5/wx/statline.h
+include/wx-2.5/wx/stattext.h
+include/wx-2.5/wx/statusbr.h
+include/wx-2.5/wx/stockitem.h
+include/wx-2.5/wx/stopwatch.h
+include/wx-2.5/wx/strconv.h
+include/wx-2.5/wx/stream.h
+include/wx-2.5/wx/string.h
+include/wx-2.5/wx/sysopt.h
+include/wx-2.5/wx/tab.h
+include/wx-2.5/wx/tabctrl.h
+include/wx-2.5/wx/taskbar.h
+include/wx-2.5/wx/tbarbase.h
+include/wx-2.5/wx/textbuf.h
+include/wx-2.5/wx/textctrl.h
+include/wx-2.5/wx/textdlg.h
+include/wx-2.5/wx/textfile.h
+include/wx-2.5/wx/tglbtn.h
+include/wx-2.5/wx/thread.h
+include/wx-2.5/wx/thrimpl.cpp
+include/wx-2.5/wx/timer.h
+include/wx-2.5/wx/tipdlg.h
+include/wx-2.5/wx/tipwin.h
+include/wx-2.5/wx/tokenzr.h
+include/wx-2.5/wx/toolbar.h
+include/wx-2.5/wx/tooltip.h
+include/wx-2.5/wx/toplevel.h
+include/wx-2.5/wx/treebase.h
+include/wx-2.5/wx/treectrl.h
+include/wx-2.5/wx/txtstrm.h
+include/wx-2.5/wx/types.h
+include/wx-2.5/wx/unix/apptbase.h
+include/wx-2.5/wx/unix/apptrait.h
+include/wx-2.5/wx/unix/displayx11.h
+include/wx-2.5/wx/unix/execute.h
+include/wx-2.5/wx/unix/fontutil.h
+include/wx-2.5/wx/unix/gsockunx.h
+include/wx-2.5/wx/unix/joystick.h
+include/wx-2.5/wx/unix/mimetype.h
+include/wx-2.5/wx/unix/pipe.h
+include/wx-2.5/wx/unix/sound.h
+include/wx-2.5/wx/unix/taskbarx11.h
+include/wx-2.5/wx/unix/utilsx11.h
+include/wx-2.5/wx/url.h
+include/wx-2.5/wx/utils.h
+include/wx-2.5/wx/valgen.h
+include/wx-2.5/wx/validate.h
+include/wx-2.5/wx/valtext.h
+include/wx-2.5/wx/variant.h
+include/wx-2.5/wx/vector.h
+include/wx-2.5/wx/version.h
+include/wx-2.5/wx/vidmode.h
+include/wx-2.5/wx/vlbox.h
+include/wx-2.5/wx/vms_x_fix.h
+include/wx-2.5/wx/volume.h
+include/wx-2.5/wx/vscroll.h
+include/wx-2.5/wx/wave.h
+include/wx-2.5/wx/wfstream.h
+include/wx-2.5/wx/window.h
+include/wx-2.5/wx/wizard.h
+include/wx-2.5/wx/wx.h
+include/wx-2.5/wx/wxchar.h
+include/wx-2.5/wx/wxhtml.h
+include/wx-2.5/wx/wxprec.h
+include/wx-2.5/wx/xml/xml.h
+include/wx-2.5/wx/xpmdecod.h
+include/wx-2.5/wx/xpmhand.h
+include/wx-2.5/wx/xrc/xh_all.h
+include/wx-2.5/wx/xrc/xh_bmp.h
+include/wx-2.5/wx/xrc/xh_bmpbt.h
+include/wx-2.5/wx/xrc/xh_bttn.h
+include/wx-2.5/wx/xrc/xh_cald.h
+include/wx-2.5/wx/xrc/xh_chckb.h
+include/wx-2.5/wx/xrc/xh_chckl.h
+include/wx-2.5/wx/xrc/xh_choic.h
+include/wx-2.5/wx/xrc/xh_combo.h
+include/wx-2.5/wx/xrc/xh_dlg.h
+include/wx-2.5/wx/xrc/xh_frame.h
+include/wx-2.5/wx/xrc/xh_gauge.h
+include/wx-2.5/wx/xrc/xh_gdctl.h
+include/wx-2.5/wx/xrc/xh_html.h
+include/wx-2.5/wx/xrc/xh_listb.h
+include/wx-2.5/wx/xrc/xh_listc.h
+include/wx-2.5/wx/xrc/xh_menu.h
+include/wx-2.5/wx/xrc/xh_notbk.h
+include/wx-2.5/wx/xrc/xh_panel.h
+include/wx-2.5/wx/xrc/xh_radbt.h
+include/wx-2.5/wx/xrc/xh_radbx.h
+include/wx-2.5/wx/xrc/xh_scrol.h
+include/wx-2.5/wx/xrc/xh_scwin.h
+include/wx-2.5/wx/xrc/xh_sizer.h
+include/wx-2.5/wx/xrc/xh_slidr.h
+include/wx-2.5/wx/xrc/xh_spin.h
+include/wx-2.5/wx/xrc/xh_split.h
+include/wx-2.5/wx/xrc/xh_statbar.h
+include/wx-2.5/wx/xrc/xh_stbmp.h
+include/wx-2.5/wx/xrc/xh_stbox.h
+include/wx-2.5/wx/xrc/xh_stlin.h
+include/wx-2.5/wx/xrc/xh_sttxt.h
+include/wx-2.5/wx/xrc/xh_text.h
+include/wx-2.5/wx/xrc/xh_tglbtn.h
+include/wx-2.5/wx/xrc/xh_toolb.h
+include/wx-2.5/wx/xrc/xh_tree.h
+include/wx-2.5/wx/xrc/xh_unkwn.h
+include/wx-2.5/wx/xrc/xh_wizrd.h
+include/wx-2.5/wx/xrc/xmlres.h
+include/wx-2.5/wx/xti.h
+include/wx-2.5/wx/xtistrm.h
+include/wx-2.5/wx/xtixml.h
+include/wx-2.5/wx/zipstrm.h
+include/wx-2.5/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -446,10 +489,12 @@ share/wx/2.5/gs_afm/Zapf.afm
@dirrm share/wx/2.5/afm
@dirrm share/wx/2.5
@dirrm share/wx
-@dirrm include/wx/xml
-@dirrm include/wx/unix
-@dirrm include/wx/protocol
-@dirrm include/wx/html
-@dirrm include/wx/gtk
-@dirrm include/wx/generic
-@dirrm include/wx
+@dirrm include/wx-2.5/wx/xrc
+@dirrm include/wx-2.5/wx/xml
+@dirrm include/wx-2.5/wx/unix
+@dirrm include/wx-2.5/wx/protocol
+@dirrm include/wx-2.5/wx/html
+@dirrm include/wx-2.5/wx/gtk
+@dirrm include/wx-2.5/wx/generic
+@dirrm include/wx-2.5/wx
+@dirrm include/wx-2.5
diff --git a/x11-toolkits/wxgtk26-contrib-common/pkg-plist b/x11-toolkits/wxgtk26-contrib-common/pkg-plist
index 83e3768c0c17..49656f547325 100644
--- a/x11-toolkits/wxgtk26-contrib-common/pkg-plist
+++ b/x11-toolkits/wxgtk26-contrib-common/pkg-plist
@@ -1,108 +1,69 @@
-include/wx/animate/animate.h
-include/wx/deprecated/expr.h
-include/wx/deprecated/prop.h
-include/wx/deprecated/propform.h
-include/wx/deprecated/proplist.h
-include/wx/deprecated/resource.h
-include/wx/deprecated/setup.h
-include/wx/deprecated/tbarsmpl.h
-include/wx/deprecated/treelay.h
-include/wx/deprecated/wxexpr.h
-include/wx/fl/antiflickpl.h
-include/wx/fl/bardragpl.h
-include/wx/fl/barhintspl.h
-include/wx/fl/cbcustom.h
-include/wx/fl/controlbar.h
-include/wx/fl/dynbarhnd.h
-include/wx/fl/dyntbar.h
-include/wx/fl/dyntbarhnd.h
-include/wx/fl/fldefs.h
-include/wx/fl/frmview.h
-include/wx/fl/garbagec.h
-include/wx/fl/gcupdatesmgr.h
-include/wx/fl/hintanimpl.h
-include/wx/fl/newbmpbtn.h
-include/wx/fl/panedrawpl.h
-include/wx/fl/rowdragpl.h
-include/wx/fl/rowlayoutpl.h
-include/wx/fl/toolwnd.h
-include/wx/fl/updatesmgr.h
-include/wx/gizmos/dynamicsash.h
-include/wx/gizmos/editlbox.h
-include/wx/gizmos/gizmos.h
-include/wx/gizmos/ledctrl.h
-include/wx/gizmos/multicell.h
-include/wx/gizmos/splittree.h
-include/wx/gizmos/statpict.h
-include/wx/ogl/basic.h
-include/wx/ogl/basicp.h
-include/wx/ogl/bmpshape.h
-include/wx/ogl/canvas.h
-include/wx/ogl/composit.h
-include/wx/ogl/constrnt.h
-include/wx/ogl/divided.h
-include/wx/ogl/drawn.h
-include/wx/ogl/drawnp.h
-include/wx/ogl/lines.h
-include/wx/ogl/linesp.h
-include/wx/ogl/mfutils.h
-include/wx/ogl/misc.h
-include/wx/ogl/ogl.h
-include/wx/ogl/ogldiag.h
-include/wx/plot/plot.h
-include/wx/plot/plot_dwn.bmp
-include/wx/plot/plot_enl.bmp
-include/wx/plot/plot_shr.bmp
-include/wx/plot/plot_up.bmp
-include/wx/plot/plot_zin.bmp
-include/wx/plot/plot_zot.bmp
-include/wx/plot/wxplot.rc
-include/wx/stc/stc.h
-include/wx/svg/dcsvg.h
-include/wx/xrc/xh_all.h
-include/wx/xrc/xh_bmp.h
-include/wx/xrc/xh_bmpbt.h
-include/wx/xrc/xh_bttn.h
-include/wx/xrc/xh_cald.h
-include/wx/xrc/xh_chckb.h
-include/wx/xrc/xh_chckl.h
-include/wx/xrc/xh_choic.h
-include/wx/xrc/xh_combo.h
-include/wx/xrc/xh_dlg.h
-include/wx/xrc/xh_frame.h
-include/wx/xrc/xh_gauge.h
-include/wx/xrc/xh_gdctl.h
-include/wx/xrc/xh_html.h
-include/wx/xrc/xh_listb.h
-include/wx/xrc/xh_listc.h
-include/wx/xrc/xh_menu.h
-include/wx/xrc/xh_notbk.h
-include/wx/xrc/xh_panel.h
-include/wx/xrc/xh_radbt.h
-include/wx/xrc/xh_radbx.h
-include/wx/xrc/xh_scrol.h
-include/wx/xrc/xh_scwin.h
-include/wx/xrc/xh_sizer.h
-include/wx/xrc/xh_slidr.h
-include/wx/xrc/xh_spin.h
-include/wx/xrc/xh_split.h
-include/wx/xrc/xh_statbar.h
-include/wx/xrc/xh_stbmp.h
-include/wx/xrc/xh_stbox.h
-include/wx/xrc/xh_stlin.h
-include/wx/xrc/xh_sttxt.h
-include/wx/xrc/xh_text.h
-include/wx/xrc/xh_toolb.h
-include/wx/xrc/xh_tree.h
-include/wx/xrc/xh_unkwn.h
-include/wx/xrc/xh_wizrd.h
-include/wx/xrc/xmlres.h
-@dirrm include/wx/xrc
-@dirrm include/wx/svg
-@dirrm include/wx/stc
-@dirrm include/wx/plot
-@dirrm include/wx/ogl
-@dirrm include/wx/gizmos
-@dirrm include/wx/fl
-@dirrm include/wx/deprecated
-@dirrm include/wx/animate
+include/wx-2.5/wx/animate/animate.h
+include/wx-2.5/wx/deprecated/expr.h
+include/wx-2.5/wx/deprecated/prop.h
+include/wx-2.5/wx/deprecated/propform.h
+include/wx-2.5/wx/deprecated/proplist.h
+include/wx-2.5/wx/deprecated/resource.h
+include/wx-2.5/wx/deprecated/setup.h
+include/wx-2.5/wx/deprecated/tbarsmpl.h
+include/wx-2.5/wx/deprecated/treelay.h
+include/wx-2.5/wx/deprecated/wxexpr.h
+include/wx-2.5/wx/fl/antiflickpl.h
+include/wx-2.5/wx/fl/bardragpl.h
+include/wx-2.5/wx/fl/barhintspl.h
+include/wx-2.5/wx/fl/cbcustom.h
+include/wx-2.5/wx/fl/controlbar.h
+include/wx-2.5/wx/fl/dynbarhnd.h
+include/wx-2.5/wx/fl/dyntbar.h
+include/wx-2.5/wx/fl/dyntbarhnd.h
+include/wx-2.5/wx/fl/fldefs.h
+include/wx-2.5/wx/fl/frmview.h
+include/wx-2.5/wx/fl/garbagec.h
+include/wx-2.5/wx/fl/gcupdatesmgr.h
+include/wx-2.5/wx/fl/hintanimpl.h
+include/wx-2.5/wx/fl/newbmpbtn.h
+include/wx-2.5/wx/fl/panedrawpl.h
+include/wx-2.5/wx/fl/rowdragpl.h
+include/wx-2.5/wx/fl/rowlayoutpl.h
+include/wx-2.5/wx/fl/toolwnd.h
+include/wx-2.5/wx/fl/updatesmgr.h
+include/wx-2.5/wx/gizmos/dynamicsash.h
+include/wx-2.5/wx/gizmos/editlbox.h
+include/wx-2.5/wx/gizmos/gizmos.h
+include/wx-2.5/wx/gizmos/ledctrl.h
+include/wx-2.5/wx/gizmos/multicell.h
+include/wx-2.5/wx/gizmos/splittree.h
+include/wx-2.5/wx/gizmos/statpict.h
+include/wx-2.5/wx/ogl/basic.h
+include/wx-2.5/wx/ogl/basicp.h
+include/wx-2.5/wx/ogl/bmpshape.h
+include/wx-2.5/wx/ogl/canvas.h
+include/wx-2.5/wx/ogl/composit.h
+include/wx-2.5/wx/ogl/constrnt.h
+include/wx-2.5/wx/ogl/divided.h
+include/wx-2.5/wx/ogl/drawn.h
+include/wx-2.5/wx/ogl/drawnp.h
+include/wx-2.5/wx/ogl/lines.h
+include/wx-2.5/wx/ogl/linesp.h
+include/wx-2.5/wx/ogl/mfutils.h
+include/wx-2.5/wx/ogl/misc.h
+include/wx-2.5/wx/ogl/ogl.h
+include/wx-2.5/wx/ogl/ogldiag.h
+include/wx-2.5/wx/plot/plot.h
+include/wx-2.5/wx/plot/plot_dwn.bmp
+include/wx-2.5/wx/plot/plot_enl.bmp
+include/wx-2.5/wx/plot/plot_shr.bmp
+include/wx-2.5/wx/plot/plot_up.bmp
+include/wx-2.5/wx/plot/plot_zin.bmp
+include/wx-2.5/wx/plot/plot_zot.bmp
+include/wx-2.5/wx/plot/wxplot.rc
+include/wx-2.5/wx/stc/stc.h
+include/wx-2.5/wx/svg/dcsvg.h
+@dirrm include/wx-2.5/wx/svg
+@dirrm include/wx-2.5/wx/stc
+@dirrm include/wx-2.5/wx/plot
+@dirrm include/wx-2.5/wx/ogl
+@dirrm include/wx-2.5/wx/gizmos
+@dirrm include/wx-2.5/wx/fl
+@dirrm include/wx-2.5/wx/deprecated
+@dirrm include/wx-2.5/wx/animate
diff --git a/x11-toolkits/wxgtk26-contrib-utils/Makefile b/x11-toolkits/wxgtk26-contrib-utils/Makefile
index 7aa0032743c7..e489845a784b 100644
--- a/x11-toolkits/wxgtk26-contrib-utils/Makefile
+++ b/x11-toolkits/wxgtk26-contrib-utils/Makefile
@@ -10,10 +10,10 @@ COMMENT= The wxWidgets GUI toolkit utils (devel version)
.if defined(WITH_UNICODE)
WXGTK_FLAVOR= gtk2-unicode-utils
-LIB_DEPENDS= wx_gtk2u_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
+LIB_DEPENDS= wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
.else
WXGTK_FLAVOR= gtk2-utils
-LIB_DEPENDS= wx_gtk2_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
+LIB_DEPENDS= wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
.endif
BUILD_WRKSRC= ${WRKSRC}/contrib/utils
diff --git a/x11-toolkits/wxgtk26-contrib-utils/pkg-plist b/x11-toolkits/wxgtk26-contrib-utils/pkg-plist
index 5f921442aaab..b1daae745572 100644
--- a/x11-toolkits/wxgtk26-contrib-utils/pkg-plist
+++ b/x11-toolkits/wxgtk26-contrib-utils/pkg-plist
@@ -1,3 +1,2 @@
bin/convertrc
-bin/wxrc
bin/wxrcedit
diff --git a/x11-toolkits/wxgtk26-contrib/Makefile b/x11-toolkits/wxgtk26-contrib/Makefile
index c5160c5916c2..4c36af733fab 100644
--- a/x11-toolkits/wxgtk26-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-contrib/Makefile
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
diff --git a/x11-toolkits/wxgtk26-contrib/pkg-plist b/x11-toolkits/wxgtk26-contrib/pkg-plist
index 461abc2b13c2..1e6d7fa75aab 100644
--- a/x11-toolkits/wxgtk26-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk26-contrib/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2_animate-2.5.so
-lib/libwx_gtk2_animate-2.5.so.2
-lib/libwx_gtk2_animate-2.5.so.2.0.0
+lib/libwx_gtk2_animate-2.5.so.3
+lib/libwx_gtk2_animate-2.5.so.3.0.0
lib/libwx_gtk2_deprecated-2.5.so
-lib/libwx_gtk2_deprecated-2.5.so.2
-lib/libwx_gtk2_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2_deprecated-2.5.so.3
+lib/libwx_gtk2_deprecated-2.5.so.3.0.0
lib/libwx_gtk2_fl-2.5.so
-lib/libwx_gtk2_fl-2.5.so.2
-lib/libwx_gtk2_fl-2.5.so.2.0.0
+lib/libwx_gtk2_fl-2.5.so.3
+lib/libwx_gtk2_fl-2.5.so.3.0.0
lib/libwx_gtk2_gizmos-2.5.so
-lib/libwx_gtk2_gizmos-2.5.so.2
-lib/libwx_gtk2_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2_gizmos-2.5.so.3
+lib/libwx_gtk2_gizmos-2.5.so.3.0.0
lib/libwx_gtk2_ogl-2.5.so
-lib/libwx_gtk2_ogl-2.5.so.2
-lib/libwx_gtk2_ogl-2.5.so.2.0.0
+lib/libwx_gtk2_ogl-2.5.so.3
+lib/libwx_gtk2_ogl-2.5.so.3.0.0
lib/libwx_gtk2_plot-2.5.so
-lib/libwx_gtk2_plot-2.5.so.2
-lib/libwx_gtk2_plot-2.5.so.2.0.0
+lib/libwx_gtk2_plot-2.5.so.3
+lib/libwx_gtk2_plot-2.5.so.3.0.0
lib/libwx_gtk2_stc-2.5.so
-lib/libwx_gtk2_stc-2.5.so.2
-lib/libwx_gtk2_stc-2.5.so.2.0.0
+lib/libwx_gtk2_stc-2.5.so.3
+lib/libwx_gtk2_stc-2.5.so.3.0.0
lib/libwx_gtk2_svg-2.5.so
-lib/libwx_gtk2_svg-2.5.so.2
-lib/libwx_gtk2_svg-2.5.so.2.0.0
-lib/libwx_gtk2_xrc-2.5.so
-lib/libwx_gtk2_xrc-2.5.so.2
-lib/libwx_gtk2_xrc-2.5.so.2.0.0
+lib/libwx_gtk2_svg-2.5.so.3
+lib/libwx_gtk2_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk26-unicode/pkg-plist b/x11-toolkits/wxgtk26-unicode/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk26-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk26-unicode/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 14e76d536b22..beb00c3158e9 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.2
-PORTREVISION?= 1
+PORTVERSION= 2.5.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -17,10 +16,11 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff \
- expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
+ jpeg.9:${PORTSDIR}/graphics/jpeg\
+ tiff.4:${PORTSDIR}/graphics/tiff\
+ expat.5:${PORTSDIR}/textproc/expat2\
+ mspack.1:${PORTSDIR}/archivers/libmspack
CONFLICTS= wxgtk-*
@@ -32,12 +32,13 @@ USE_ICONV= yes
USE_GNOME= gtk20
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libpng=sys \
- --with-libjpeg=sys \
- --with-libtiff=sys \
- --with-zlib=sys \
- --with-expat=sys \
- --with-opengl \
+CONFIGURE_ARGS= --with-libpng=sys\
+ --with-libjpeg=sys\
+ --with-libtiff=sys\
+ --with-zlib=sys\
+ --with-expat=sys\
+ --with-opengl\
+ --with-mspack\
--enable-gtk2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
@@ -51,7 +52,7 @@ NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -66,23 +67,23 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
.else
-LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
pre-configure:
- @${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+ @${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
.include <bsd.port.pre.mk>
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
index 7c24033cdccf..ab4f811407f2 100644
--- a/x11-toolkits/wxgtk26/distinfo
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.2.tar.bz2) = b45874428b0164bfa5bd1a5a11b3eb4a
-SIZE (wxGTK-2.5.2.tar.bz2) = 6579255
+MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
+SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
index 966de5b3e9df..c9d72e6757c7 100644
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon May 31 18:11:50 2004
-+++ Makefile.in Sun Jun 27 21:12:13 2004
+--- Makefile.in.orig Sun Oct 10 22:17:27 2004
++++ Makefile.in Wed Nov 24 22:47:40 2004
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,30 +8,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -6927,11 +6928,13 @@
+@@ -7408,11 +7409,13 @@
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__macos_res___depname) $(__cocoa_res___depname)
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)
--install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx
-+ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
++ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
+
+install-common: $(__install_afm___depname) $(__install_gsafm___depname) locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-@@ -7371,8 +7374,7 @@
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+@@ -7892,9 +7895,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
-+ $(INSTALL_SCRIPT) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
index c8ae3832f26e..88e167a98f95 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
@@ -1,19 +1,20 @@
---- contrib/src/Makefile.in.orig Mon May 31 18:12:16 2004
-+++ contrib/src/Makefile.in Mon Jun 28 00:28:54 2004
-@@ -1,15 +1,23 @@
- # $Id: Makefile.in,v 1.16 2003/08/17 12:48:18 VS Exp $
+--- contrib/src/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/Makefile.in Fri Nov 26 00:20:35 2004
+@@ -1,15 +1,24 @@
+ # $Id: Makefile.in,v 1.17 2004/09/24 15:32:58 VS Exp $
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg xrc deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg xrc deprecated animate #applet mmedia
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
-all:
++WX_RELEASE= @WX_RELEASE@
+@COND_UNICODE_1@wxregexu_depname= wxregexu
+
+all: $(wxregexu_depname)
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
+wxregexu:
-+ cd ../.. && $(MAKE) lib/libwxregexu.a
++ @cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a
+
clean:
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
index 4e5875295e52..abfc81a6176c 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/animate/Makefile.in.orig Sun Jun 27 21:38:11 2004
-+++ contrib/src/animate/Makefile.in Sun Jun 27 21:38:20 2004
-@@ -172,6 +172,8 @@
+--- contrib/src/animate/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/animate/Makefile.in Wed Nov 24 21:37:14 2004
+@@ -180,6 +180,8 @@
all: $(__animatedll___depname) $(__animatelib___depname)
install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/animate/animate.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
index 237d6931053c..0c492341ca53 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/deprecated/Makefile.in.orig Sun Jun 27 21:38:26 2004
-+++ contrib/src/deprecated/Makefile.in Sun Jun 27 21:38:52 2004
-@@ -199,6 +199,8 @@
+--- contrib/src/deprecated/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/deprecated/Makefile.in Wed Nov 24 21:39:56 2004
+@@ -207,6 +207,8 @@
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
index 094280a521fc..2de711cc3b1f 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/fl/Makefile.in.orig Sun Jun 27 21:34:52 2004
-+++ contrib/src/fl/Makefile.in Sun Jun 27 21:35:37 2004
-@@ -203,6 +203,8 @@
+--- contrib/src/fl/Makefile.in.orig Sun Oct 10 22:18:49 2004
++++ contrib/src/fl/Makefile.in Wed Nov 24 21:40:16 2004
+@@ -211,6 +211,8 @@
all: $(__fldll___depname) $(__fllib___depname)
install: all $(__install_fldll___depname) $(__install_fllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
index fae5de6b9501..b6e204d0704a 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/gizmos/Makefile.in.orig Sun Jun 27 21:35:44 2004
-+++ contrib/src/gizmos/Makefile.in Sun Jun 27 21:35:55 2004
-@@ -181,6 +181,8 @@
+--- contrib/src/gizmos/Makefile.in.orig Sun Oct 10 22:18:50 2004
++++ contrib/src/gizmos/Makefile.in Wed Nov 24 21:40:37 2004
+@@ -189,6 +189,8 @@
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
index cb94093057e1..2be3bdbe7e1c 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/ogl/Makefile.in.orig Sun Jun 27 22:44:07 2004
-+++ contrib/src/ogl/Makefile.in Sun Jun 27 22:44:25 2004
-@@ -193,6 +193,8 @@
+--- contrib/src/ogl/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/ogl/Makefile.in Wed Nov 24 21:41:00 2004
+@@ -201,6 +201,8 @@
all: $(__ogldll___depname) $(__ogllib___depname)
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
index 152bf7473082..802b4f093baa 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/plot/Makefile.in.orig Sun Jun 27 21:36:28 2004
-+++ contrib/src/plot/Makefile.in Sun Jun 27 21:36:37 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/plot/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/plot/Makefile.in Wed Nov 24 21:41:16 2004
+@@ -179,6 +179,8 @@
all: $(__plotdll___depname) $(__plotlib___depname)
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
index 5053151bf229..c41d5cbfec19 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/stc/Makefile.in.orig Sun Jun 27 21:36:48 2004
-+++ contrib/src/stc/Makefile.in Sun Jun 27 21:36:56 2004
-@@ -286,6 +286,8 @@
+--- contrib/src/stc/Makefile.in.orig Sun Oct 10 22:18:53 2004
++++ contrib/src/stc/Makefile.in Wed Nov 24 21:41:31 2004
+@@ -310,6 +310,8 @@
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/stc/stc.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
index e41c53fd4030..213aef13d42c 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/svg/Makefile.in.orig Sun Jun 27 21:37:03 2004
-+++ contrib/src/svg/Makefile.in Sun Jun 27 21:37:16 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/svg/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/svg/Makefile.in Wed Nov 24 21:41:44 2004
+@@ -179,6 +179,8 @@
all: $(__svgdll___depname) $(__svglib___depname)
install: all $(__install_svgdll___depname) $(__install_svglib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/svg/dcsvg.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in
deleted file mode 100644
index aafcaa405758..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/xrc/Makefile.in.orig Sun Jun 27 21:37:21 2004
-+++ contrib/src/xrc/Makefile.in Sun Jun 27 21:37:44 2004
-@@ -258,6 +258,8 @@
- all: $(__xrcdll___depname) $(__xrclib___depname)
-
- install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
-+
-+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
- for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h
new file mode 100644
index 000000000000..a8688e1069c0
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h
@@ -0,0 +1,14 @@
+--- src/regex/regcustom.h.orig Thu Nov 25 21:03:13 2004
++++ src/regex/regcustom.h Thu Nov 25 21:03:29 2004
+@@ -76,6 +76,11 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
+
+ /* internal character type and related */
diff --git a/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h b/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h
new file mode 100644
index 000000000000..01f1f176215f
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h
@@ -0,0 +1,16 @@
+--- src/regex/regex.h.orig Thu Nov 25 21:02:55 2004
++++ src/regex/regex.h Thu Nov 25 21:03:06 2004
+@@ -115,7 +115,13 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
++
+
+ /*
+ * interface types etc.
diff --git a/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..353821f40cfd
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,21 @@
+--- utils/wxrc/Makefile.in.orig Thu Nov 25 21:52:45 2004
++++ utils/wxrc/Makefile.in Thu Nov 25 21:58:43 2004
+@@ -28,6 +28,7 @@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ HOST_SUFFIX = @HOST_SUFFIX@
+@@ -113,9 +114,7 @@
+
+ @COND_USE_XRC_1@install_wxrc:
+ @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
+
+ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+ $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/x11-toolkits/wxgtk26/files/patch-wx-config.in b/x11-toolkits/wxgtk26/files/patch-wx-config.in
index 99fb6adf332c..0453477f8fbc 100644
--- a/x11-toolkits/wxgtk26/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk26/files/patch-wx-config.in
@@ -1,11 +1,11 @@
---- wx-config.in.orig Mon May 31 18:11:50 2004
-+++ wx-config.in Sun Jun 27 20:08:21 2004
-@@ -230,7 +230,7 @@
- includes=" -I${includedir}"
- fi
+--- wx-config.in.orig Sun Oct 10 22:17:27 2004
++++ wx-config.in Wed Nov 24 22:48:01 2004
+@@ -1014,7 +1014,7 @@
+ _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
+ fi
-- includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
-+ includes="-I${includedir}/wx/include/${TOOLCHAIN_NAME}$includes"
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
++_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
- # in inplace case we need to also add path to contrib headers -- do it
- # unconditionally as they might be used and we have no way of knowing if
+ # now without further ado, we can answer these too.
+ [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk26/pkg-plist b/x11-toolkits/wxgtk26/pkg-plist
index 0af111d8925e..3f401620305b 100644
--- a/x11-toolkits/wxgtk26/pkg-plist
+++ b/x11-toolkits/wxgtk26/pkg-plist
@@ -1,26 +1,29 @@
bin/wxgtk2-2.5-config
-include/wx/include/gtk2-2.5/wx/setup.h
+bin/wxrc-gtk2-2.5
+include/wx-2.5/gtk2-ansi-release-2.5/wx/setup.h
lib/libwx_base-2.5.so
-lib/libwx_base-2.5.so.2
-lib/libwx_base-2.5.so.2.0.0
+lib/libwx_base-2.5.so.3
+lib/libwx_base-2.5.so.3.0.0
lib/libwx_base_net-2.5.so
-lib/libwx_base_net-2.5.so.2
-lib/libwx_base_net-2.5.so.2.0.0
+lib/libwx_base_net-2.5.so.3
+lib/libwx_base_net-2.5.so.3.0.0
lib/libwx_base_xml-2.5.so
-lib/libwx_base_xml-2.5.so.2
-lib/libwx_base_xml-2.5.so.2.0.0
+lib/libwx_base_xml-2.5.so.3
+lib/libwx_base_xml-2.5.so.3.0.0
lib/libwx_gtk2_adv-2.5.so
-lib/libwx_gtk2_adv-2.5.so.2
-lib/libwx_gtk2_adv-2.5.so.2.0.0
+lib/libwx_gtk2_adv-2.5.so.3
+lib/libwx_gtk2_adv-2.5.so.3.0.0
lib/libwx_gtk2_core-2.5.so
-lib/libwx_gtk2_core-2.5.so.2
-lib/libwx_gtk2_core-2.5.so.2.0.0
+lib/libwx_gtk2_core-2.5.so.3
+lib/libwx_gtk2_core-2.5.so.3.0.0
lib/libwx_gtk2_gl-2.5.so
-lib/libwx_gtk2_gl-2.5.so.2
-lib/libwx_gtk2_gl-2.5.so.2.0.0
+lib/libwx_gtk2_gl-2.5.so.3
+lib/libwx_gtk2_gl-2.5.so.3.0.0
lib/libwx_gtk2_html-2.5.so
-lib/libwx_gtk2_html-2.5.so.2
-lib/libwx_gtk2_html-2.5.so.2.0.0
-@dirrm include/wx/include/gtk2-2.5/wx
-@dirrm include/wx/include/gtk2-2.5
-@dirrm include/wx/include
+lib/libwx_gtk2_html-2.5.so.3
+lib/libwx_gtk2_html-2.5.so.3.0.0
+lib/libwx_gtk2_xrc-2.5.so
+lib/libwx_gtk2_xrc-2.5.so.3
+lib/libwx_gtk2_xrc-2.5.so.3.0.0
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5/wx
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5
diff --git a/x11-toolkits/wxgtk28-common/pkg-plist b/x11-toolkits/wxgtk28-common/pkg-plist
index 881bb9f3defa..f68eebf220d8 100644
--- a/x11-toolkits/wxgtk28-common/pkg-plist
+++ b/x11-toolkits/wxgtk28-common/pkg-plist
@@ -1,399 +1,442 @@
-include/wx/accel.h
-include/wx/access.h
-include/wx/afterstd.h
-include/wx/app.h
-include/wx/apptrait.h
-include/wx/arrimpl.cpp
-include/wx/arrstr.h
-include/wx/artprov.h
-include/wx/beforestd.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/bookctrl.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/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/dcmirror.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/display.h
-include/wx/dlimpexp.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/encinfo.h
-include/wx/event.h
-include/wx/evtloop.h
-include/wx/except.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/fmappriv.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/gbsizer.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/gridsel.h
-include/wx/generic/helpext.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/logg.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/numdlgg.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/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/msgdlg.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/win_gtk.h
-include/wx/gtk/window.h
-include/wx/hash.h
-include/wx/hashmap.h
-include/wx/hashset.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/htmlproc.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/htmllbox.h
-include/wx/icon.h
-include/wx/iconbndl.h
-include/wx/iconloc.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/init.h
-include/wx/intl.h
-include/wx/iosfwrap.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/listbook.h
-include/wx/listbox.h
-include/wx/listctrl.h
-include/wx/listimpl.cpp
-include/wx/log.h
-include/wx/longlong.h
-include/wx/math.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/numdlg.h
-include/wx/object.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/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/ptr_scpd.h
-include/wx/quantize.h
-include/wx/radiobox.h
-include/wx/radiobut.h
-include/wx/rawbmp.h
-include/wx/regex.h
-include/wx/region.h
-include/wx/renderer.h
-include/wx/sashwin.h
-include/wx/sckaddr.h
-include/wx/sckipc.h
-include/wx/sckstrm.h
-include/wx/scopeguard.h
-include/wx/scrolbar.h
-include/wx/scrolwin.h
-include/wx/selstore.h
-include/wx/settings.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/snglinst.h
-include/wx/socket.h
-include/wx/sound.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/stopwatch.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/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/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/apptbase.h
-include/wx/unix/apptrait.h
-include/wx/unix/displayx11.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/joystick.h
-include/wx/unix/mimetype.h
-include/wx/unix/pipe.h
-include/wx/unix/sound.h
-include/wx/unix/taskbarx11.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/vidmode.h
-include/wx/vlbox.h
-include/wx/vms_x_fix.h
-include/wx/volume.h
-include/wx/vscroll.h
-include/wx/wave.h
-include/wx/wfstream.h
-include/wx/window.h
-include/wx/wizard.h
-include/wx/wx.h
-include/wx/wxchar.h
-include/wx/wxhtml.h
-include/wx/wxprec.h
-include/wx/xml/xml.h
-include/wx/xpmdecod.h
-include/wx/xpmhand.h
-include/wx/xti.h
-include/wx/xtistrm.h
-include/wx/xtixml.h
-include/wx/zipstrm.h
-include/wx/zstream.h
+include/wx-2.5/wx/accel.h
+include/wx-2.5/wx/access.h
+include/wx-2.5/wx/afterstd.h
+include/wx-2.5/wx/app.h
+include/wx-2.5/wx/apptrait.h
+include/wx-2.5/wx/arrimpl.cpp
+include/wx-2.5/wx/arrstr.h
+include/wx-2.5/wx/artprov.h
+include/wx-2.5/wx/beforestd.h
+include/wx-2.5/wx/bitmap.h
+include/wx-2.5/wx/bmpbuttn.h
+include/wx-2.5/wx/bookctrl.h
+include/wx-2.5/wx/brush.h
+include/wx-2.5/wx/buffer.h
+include/wx-2.5/wx/build.h
+include/wx-2.5/wx/busyinfo.h
+include/wx-2.5/wx/button.h
+include/wx-2.5/wx/calctrl.h
+include/wx-2.5/wx/caret.h
+include/wx-2.5/wx/checkbox.h
+include/wx-2.5/wx/checklst.h
+include/wx-2.5/wx/chkconf.h
+include/wx-2.5/wx/choicdlg.h
+include/wx-2.5/wx/choice.h
+include/wx-2.5/wx/choicebk.h
+include/wx-2.5/wx/clipbrd.h
+include/wx-2.5/wx/clntdata.h
+include/wx-2.5/wx/cmdline.h
+include/wx-2.5/wx/cmdproc.h
+include/wx-2.5/wx/cmndata.h
+include/wx-2.5/wx/colordlg.h
+include/wx-2.5/wx/colour.h
+include/wx-2.5/wx/combobox.h
+include/wx-2.5/wx/confbase.h
+include/wx-2.5/wx/config.h
+include/wx-2.5/wx/containr.h
+include/wx-2.5/wx/control.h
+include/wx-2.5/wx/cshelp.h
+include/wx-2.5/wx/ctrlsub.h
+include/wx-2.5/wx/cursor.h
+include/wx-2.5/wx/dataobj.h
+include/wx-2.5/wx/datetime.h
+include/wx-2.5/wx/datetime.inl
+include/wx-2.5/wx/datstrm.h
+include/wx-2.5/wx/db.h
+include/wx-2.5/wx/dbgrid.h
+include/wx-2.5/wx/dbkeyg.h
+include/wx-2.5/wx/dbtable.h
+include/wx-2.5/wx/dc.h
+include/wx-2.5/wx/dcbuffer.h
+include/wx-2.5/wx/dcclient.h
+include/wx-2.5/wx/dcmemory.h
+include/wx-2.5/wx/dcmirror.h
+include/wx-2.5/wx/dcprint.h
+include/wx-2.5/wx/dcps.h
+include/wx-2.5/wx/dcscreen.h
+include/wx-2.5/wx/dde.h
+include/wx-2.5/wx/debug.h
+include/wx-2.5/wx/defs.h
+include/wx-2.5/wx/dialog.h
+include/wx-2.5/wx/dialup.h
+include/wx-2.5/wx/dir.h
+include/wx-2.5/wx/dirctrl.h
+include/wx-2.5/wx/dirdlg.h
+include/wx-2.5/wx/display.h
+include/wx-2.5/wx/dlimpexp.h
+include/wx-2.5/wx/dnd.h
+include/wx-2.5/wx/docmdi.h
+include/wx-2.5/wx/docview.h
+include/wx-2.5/wx/dragimag.h
+include/wx-2.5/wx/dynarray.h
+include/wx-2.5/wx/dynlib.h
+include/wx-2.5/wx/dynload.h
+include/wx-2.5/wx/effects.h
+include/wx-2.5/wx/encconv.h
+include/wx-2.5/wx/encinfo.h
+include/wx-2.5/wx/event.h
+include/wx-2.5/wx/evtloop.h
+include/wx-2.5/wx/except.h
+include/wx-2.5/wx/fdrepdlg.h
+include/wx-2.5/wx/features.h
+include/wx-2.5/wx/ffile.h
+include/wx-2.5/wx/file.h
+include/wx-2.5/wx/fileconf.h
+include/wx-2.5/wx/filedlg.h
+include/wx-2.5/wx/filefn.h
+include/wx-2.5/wx/filename.h
+include/wx-2.5/wx/filesys.h
+include/wx-2.5/wx/fmappriv.h
+include/wx-2.5/wx/font.h
+include/wx-2.5/wx/fontdlg.h
+include/wx-2.5/wx/fontenc.h
+include/wx-2.5/wx/fontenum.h
+include/wx-2.5/wx/fontmap.h
+include/wx-2.5/wx/fontutil.h
+include/wx-2.5/wx/frame.h
+include/wx-2.5/wx/fs_inet.h
+include/wx-2.5/wx/fs_mem.h
+include/wx-2.5/wx/fs_zip.h
+include/wx-2.5/wx/gauge.h
+include/wx-2.5/wx/gbsizer.h
+include/wx-2.5/wx/gdicmn.h
+include/wx-2.5/wx/gdiobj.h
+include/wx-2.5/wx/generic/accel.h
+include/wx-2.5/wx/generic/calctrl.h
+include/wx-2.5/wx/generic/caret.h
+include/wx-2.5/wx/generic/choicdgg.h
+include/wx-2.5/wx/generic/colrdlgg.h
+include/wx-2.5/wx/generic/dcpsg.h
+include/wx-2.5/wx/generic/dirctrlg.h
+include/wx-2.5/wx/generic/dirdlgg.h
+include/wx-2.5/wx/generic/dragimgg.h
+include/wx-2.5/wx/generic/fdrepdlg.h
+include/wx-2.5/wx/generic/filedlgg.h
+include/wx-2.5/wx/generic/fontdlgg.h
+include/wx-2.5/wx/generic/grid.h
+include/wx-2.5/wx/generic/gridctrl.h
+include/wx-2.5/wx/generic/gridsel.h
+include/wx-2.5/wx/generic/helpext.h
+include/wx-2.5/wx/generic/imaglist.h
+include/wx-2.5/wx/generic/laywin.h
+include/wx-2.5/wx/generic/listctrl.h
+include/wx-2.5/wx/generic/logg.h
+include/wx-2.5/wx/generic/msgdlgg.h
+include/wx-2.5/wx/generic/notebook.h
+include/wx-2.5/wx/generic/numdlgg.h
+include/wx-2.5/wx/generic/paletteg.h
+include/wx-2.5/wx/generic/panelg.h
+include/wx-2.5/wx/generic/printps.h
+include/wx-2.5/wx/generic/prntdlgg.h
+include/wx-2.5/wx/generic/progdlgg.h
+include/wx-2.5/wx/generic/sashwin.h
+include/wx-2.5/wx/generic/scrolwin.h
+include/wx-2.5/wx/generic/spinctlg.h
+include/wx-2.5/wx/generic/splash.h
+include/wx-2.5/wx/generic/splitter.h
+include/wx-2.5/wx/generic/statusbr.h
+include/wx-2.5/wx/generic/tabg.h
+include/wx-2.5/wx/generic/textdlgg.h
+include/wx-2.5/wx/generic/timer.h
+include/wx-2.5/wx/generic/treectlg.h
+include/wx-2.5/wx/generic/wizard.h
+include/wx-2.5/wx/geometry.h
+include/wx-2.5/wx/gifdecod.h
+include/wx-2.5/wx/glcanvas.h
+include/wx-2.5/wx/grid.h
+include/wx-2.5/wx/gsocket.h
+include/wx-2.5/wx/gtk/accel.h
+include/wx-2.5/wx/gtk/app.h
+include/wx-2.5/wx/gtk/bitmap.h
+include/wx-2.5/wx/gtk/bmpbuttn.h
+include/wx-2.5/wx/gtk/brush.h
+include/wx-2.5/wx/gtk/button.h
+include/wx-2.5/wx/gtk/checkbox.h
+include/wx-2.5/wx/gtk/checklst.h
+include/wx-2.5/wx/gtk/choice.h
+include/wx-2.5/wx/gtk/clipbrd.h
+include/wx-2.5/wx/gtk/colordlg.h
+include/wx-2.5/wx/gtk/colour.h
+include/wx-2.5/wx/gtk/combobox.h
+include/wx-2.5/wx/gtk/control.h
+include/wx-2.5/wx/gtk/cursor.h
+include/wx-2.5/wx/gtk/dataform.h
+include/wx-2.5/wx/gtk/dataobj.h
+include/wx-2.5/wx/gtk/dataobj2.h
+include/wx-2.5/wx/gtk/dc.h
+include/wx-2.5/wx/gtk/dcclient.h
+include/wx-2.5/wx/gtk/dcmemory.h
+include/wx-2.5/wx/gtk/dcscreen.h
+include/wx-2.5/wx/gtk/dialog.h
+include/wx-2.5/wx/gtk/dnd.h
+include/wx-2.5/wx/gtk/filedlg.h
+include/wx-2.5/wx/gtk/font.h
+include/wx-2.5/wx/gtk/fontdlg.h
+include/wx-2.5/wx/gtk/frame.h
+include/wx-2.5/wx/gtk/gauge.h
+include/wx-2.5/wx/gtk/gdiobj.h
+include/wx-2.5/wx/gtk/glcanvas.h
+include/wx-2.5/wx/gtk/icon.h
+include/wx-2.5/wx/gtk/listbox.h
+include/wx-2.5/wx/gtk/mdi.h
+include/wx-2.5/wx/gtk/menu.h
+include/wx-2.5/wx/gtk/menuitem.h
+include/wx-2.5/wx/gtk/minifram.h
+include/wx-2.5/wx/gtk/msgdlg.h
+include/wx-2.5/wx/gtk/notebook.h
+include/wx-2.5/wx/gtk/pen.h
+include/wx-2.5/wx/gtk/popupwin.h
+include/wx-2.5/wx/gtk/radiobox.h
+include/wx-2.5/wx/gtk/radiobut.h
+include/wx-2.5/wx/gtk/region.h
+include/wx-2.5/wx/gtk/scrolbar.h
+include/wx-2.5/wx/gtk/scrolwin.h
+include/wx-2.5/wx/gtk/slider.h
+include/wx-2.5/wx/gtk/spinbutt.h
+include/wx-2.5/wx/gtk/spinctrl.h
+include/wx-2.5/wx/gtk/statbmp.h
+include/wx-2.5/wx/gtk/statbox.h
+include/wx-2.5/wx/gtk/statline.h
+include/wx-2.5/wx/gtk/stattext.h
+include/wx-2.5/wx/gtk/tbargtk.h
+include/wx-2.5/wx/gtk/textctrl.h
+include/wx-2.5/wx/gtk/tglbtn.h
+include/wx-2.5/wx/gtk/timer.h
+include/wx-2.5/wx/gtk/tooltip.h
+include/wx-2.5/wx/gtk/toplevel.h
+include/wx-2.5/wx/gtk/treectrl.h
+include/wx-2.5/wx/gtk/win_gtk.h
+include/wx-2.5/wx/gtk/window.h
+include/wx-2.5/wx/hash.h
+include/wx-2.5/wx/hashmap.h
+include/wx-2.5/wx/hashset.h
+include/wx-2.5/wx/help.h
+include/wx-2.5/wx/helpbase.h
+include/wx-2.5/wx/helphtml.h
+include/wx-2.5/wx/helpwin.h
+include/wx-2.5/wx/html/forcelnk.h
+include/wx-2.5/wx/html/helpctrl.h
+include/wx-2.5/wx/html/helpdata.h
+include/wx-2.5/wx/html/helpfrm.h
+include/wx-2.5/wx/html/htmlcell.h
+include/wx-2.5/wx/html/htmldefs.h
+include/wx-2.5/wx/html/htmlfilt.h
+include/wx-2.5/wx/html/htmlpars.h
+include/wx-2.5/wx/html/htmlproc.h
+include/wx-2.5/wx/html/htmltag.h
+include/wx-2.5/wx/html/htmlwin.h
+include/wx-2.5/wx/html/htmprint.h
+include/wx-2.5/wx/html/m_templ.h
+include/wx-2.5/wx/html/winpars.h
+include/wx-2.5/wx/htmllbox.h
+include/wx-2.5/wx/icon.h
+include/wx-2.5/wx/iconbndl.h
+include/wx-2.5/wx/iconloc.h
+include/wx-2.5/wx/imagbmp.h
+include/wx-2.5/wx/image.h
+include/wx-2.5/wx/imaggif.h
+include/wx-2.5/wx/imagiff.h
+include/wx-2.5/wx/imagjpeg.h
+include/wx-2.5/wx/imaglist.h
+include/wx-2.5/wx/imagpcx.h
+include/wx-2.5/wx/imagpng.h
+include/wx-2.5/wx/imagpnm.h
+include/wx-2.5/wx/imagtiff.h
+include/wx-2.5/wx/imagxpm.h
+include/wx-2.5/wx/init.h
+include/wx-2.5/wx/intl.h
+include/wx-2.5/wx/iosfwrap.h
+include/wx-2.5/wx/ioswrap.h
+include/wx-2.5/wx/ipc.h
+include/wx-2.5/wx/ipcbase.h
+include/wx-2.5/wx/isql.h
+include/wx-2.5/wx/isqlext.h
+include/wx-2.5/wx/joystick.h
+include/wx-2.5/wx/layout.h
+include/wx-2.5/wx/laywin.h
+include/wx-2.5/wx/list.h
+include/wx-2.5/wx/listbase.h
+include/wx-2.5/wx/listbook.h
+include/wx-2.5/wx/listbox.h
+include/wx-2.5/wx/listctrl.h
+include/wx-2.5/wx/listimpl.cpp
+include/wx-2.5/wx/log.h
+include/wx-2.5/wx/longlong.h
+include/wx-2.5/wx/math.h
+include/wx-2.5/wx/matrix.h
+include/wx-2.5/wx/mdi.h
+include/wx-2.5/wx/memconf.h
+include/wx-2.5/wx/memory.h
+include/wx-2.5/wx/memtext.h
+include/wx-2.5/wx/menu.h
+include/wx-2.5/wx/menuitem.h
+include/wx-2.5/wx/metafile.h
+include/wx-2.5/wx/mimetype.h
+include/wx-2.5/wx/minifram.h
+include/wx-2.5/wx/module.h
+include/wx-2.5/wx/msgdlg.h
+include/wx-2.5/wx/msgout.h
+include/wx-2.5/wx/mstream.h
+include/wx-2.5/wx/notebook.h
+include/wx-2.5/wx/numdlg.h
+include/wx-2.5/wx/object.h
+include/wx-2.5/wx/ownerdrw.h
+include/wx-2.5/wx/palette.h
+include/wx-2.5/wx/panel.h
+include/wx-2.5/wx/paper.h
+include/wx-2.5/wx/pen.h
+include/wx-2.5/wx/platform.h
+include/wx-2.5/wx/popupwin.h
+include/wx-2.5/wx/print.h
+include/wx-2.5/wx/printdlg.h
+include/wx-2.5/wx/prntbase.h
+include/wx-2.5/wx/process.h
+include/wx-2.5/wx/progdlg.h
+include/wx-2.5/wx/protocol/file.h
+include/wx-2.5/wx/protocol/ftp.h
+include/wx-2.5/wx/protocol/http.h
+include/wx-2.5/wx/protocol/protocol.h
+include/wx-2.5/wx/ptr_scpd.h
+include/wx-2.5/wx/quantize.h
+include/wx-2.5/wx/radiobox.h
+include/wx-2.5/wx/radiobut.h
+include/wx-2.5/wx/rawbmp.h
+include/wx-2.5/wx/regex.h
+include/wx-2.5/wx/region.h
+include/wx-2.5/wx/renderer.h
+include/wx-2.5/wx/sashwin.h
+include/wx-2.5/wx/sckaddr.h
+include/wx-2.5/wx/sckipc.h
+include/wx-2.5/wx/sckstrm.h
+include/wx-2.5/wx/scopeguard.h
+include/wx-2.5/wx/scrolbar.h
+include/wx-2.5/wx/scrolwin.h
+include/wx-2.5/wx/selstore.h
+include/wx-2.5/wx/settings.h
+include/wx-2.5/wx/sizer.h
+include/wx-2.5/wx/slider.h
+include/wx-2.5/wx/snglinst.h
+include/wx-2.5/wx/socket.h
+include/wx-2.5/wx/sound.h
+include/wx-2.5/wx/spinbutt.h
+include/wx-2.5/wx/spinctrl.h
+include/wx-2.5/wx/splash.h
+include/wx-2.5/wx/splitter.h
+include/wx-2.5/wx/sstream.h
+include/wx-2.5/wx/stack.h
+include/wx-2.5/wx/statbmp.h
+include/wx-2.5/wx/statbox.h
+include/wx-2.5/wx/statline.h
+include/wx-2.5/wx/stattext.h
+include/wx-2.5/wx/statusbr.h
+include/wx-2.5/wx/stockitem.h
+include/wx-2.5/wx/stopwatch.h
+include/wx-2.5/wx/strconv.h
+include/wx-2.5/wx/stream.h
+include/wx-2.5/wx/string.h
+include/wx-2.5/wx/sysopt.h
+include/wx-2.5/wx/tab.h
+include/wx-2.5/wx/tabctrl.h
+include/wx-2.5/wx/taskbar.h
+include/wx-2.5/wx/tbarbase.h
+include/wx-2.5/wx/textbuf.h
+include/wx-2.5/wx/textctrl.h
+include/wx-2.5/wx/textdlg.h
+include/wx-2.5/wx/textfile.h
+include/wx-2.5/wx/tglbtn.h
+include/wx-2.5/wx/thread.h
+include/wx-2.5/wx/thrimpl.cpp
+include/wx-2.5/wx/timer.h
+include/wx-2.5/wx/tipdlg.h
+include/wx-2.5/wx/tipwin.h
+include/wx-2.5/wx/tokenzr.h
+include/wx-2.5/wx/toolbar.h
+include/wx-2.5/wx/tooltip.h
+include/wx-2.5/wx/toplevel.h
+include/wx-2.5/wx/treebase.h
+include/wx-2.5/wx/treectrl.h
+include/wx-2.5/wx/txtstrm.h
+include/wx-2.5/wx/types.h
+include/wx-2.5/wx/unix/apptbase.h
+include/wx-2.5/wx/unix/apptrait.h
+include/wx-2.5/wx/unix/displayx11.h
+include/wx-2.5/wx/unix/execute.h
+include/wx-2.5/wx/unix/fontutil.h
+include/wx-2.5/wx/unix/gsockunx.h
+include/wx-2.5/wx/unix/joystick.h
+include/wx-2.5/wx/unix/mimetype.h
+include/wx-2.5/wx/unix/pipe.h
+include/wx-2.5/wx/unix/sound.h
+include/wx-2.5/wx/unix/taskbarx11.h
+include/wx-2.5/wx/unix/utilsx11.h
+include/wx-2.5/wx/url.h
+include/wx-2.5/wx/utils.h
+include/wx-2.5/wx/valgen.h
+include/wx-2.5/wx/validate.h
+include/wx-2.5/wx/valtext.h
+include/wx-2.5/wx/variant.h
+include/wx-2.5/wx/vector.h
+include/wx-2.5/wx/version.h
+include/wx-2.5/wx/vidmode.h
+include/wx-2.5/wx/vlbox.h
+include/wx-2.5/wx/vms_x_fix.h
+include/wx-2.5/wx/volume.h
+include/wx-2.5/wx/vscroll.h
+include/wx-2.5/wx/wave.h
+include/wx-2.5/wx/wfstream.h
+include/wx-2.5/wx/window.h
+include/wx-2.5/wx/wizard.h
+include/wx-2.5/wx/wx.h
+include/wx-2.5/wx/wxchar.h
+include/wx-2.5/wx/wxhtml.h
+include/wx-2.5/wx/wxprec.h
+include/wx-2.5/wx/xml/xml.h
+include/wx-2.5/wx/xpmdecod.h
+include/wx-2.5/wx/xpmhand.h
+include/wx-2.5/wx/xrc/xh_all.h
+include/wx-2.5/wx/xrc/xh_bmp.h
+include/wx-2.5/wx/xrc/xh_bmpbt.h
+include/wx-2.5/wx/xrc/xh_bttn.h
+include/wx-2.5/wx/xrc/xh_cald.h
+include/wx-2.5/wx/xrc/xh_chckb.h
+include/wx-2.5/wx/xrc/xh_chckl.h
+include/wx-2.5/wx/xrc/xh_choic.h
+include/wx-2.5/wx/xrc/xh_combo.h
+include/wx-2.5/wx/xrc/xh_dlg.h
+include/wx-2.5/wx/xrc/xh_frame.h
+include/wx-2.5/wx/xrc/xh_gauge.h
+include/wx-2.5/wx/xrc/xh_gdctl.h
+include/wx-2.5/wx/xrc/xh_html.h
+include/wx-2.5/wx/xrc/xh_listb.h
+include/wx-2.5/wx/xrc/xh_listc.h
+include/wx-2.5/wx/xrc/xh_menu.h
+include/wx-2.5/wx/xrc/xh_notbk.h
+include/wx-2.5/wx/xrc/xh_panel.h
+include/wx-2.5/wx/xrc/xh_radbt.h
+include/wx-2.5/wx/xrc/xh_radbx.h
+include/wx-2.5/wx/xrc/xh_scrol.h
+include/wx-2.5/wx/xrc/xh_scwin.h
+include/wx-2.5/wx/xrc/xh_sizer.h
+include/wx-2.5/wx/xrc/xh_slidr.h
+include/wx-2.5/wx/xrc/xh_spin.h
+include/wx-2.5/wx/xrc/xh_split.h
+include/wx-2.5/wx/xrc/xh_statbar.h
+include/wx-2.5/wx/xrc/xh_stbmp.h
+include/wx-2.5/wx/xrc/xh_stbox.h
+include/wx-2.5/wx/xrc/xh_stlin.h
+include/wx-2.5/wx/xrc/xh_sttxt.h
+include/wx-2.5/wx/xrc/xh_text.h
+include/wx-2.5/wx/xrc/xh_tglbtn.h
+include/wx-2.5/wx/xrc/xh_toolb.h
+include/wx-2.5/wx/xrc/xh_tree.h
+include/wx-2.5/wx/xrc/xh_unkwn.h
+include/wx-2.5/wx/xrc/xh_wizrd.h
+include/wx-2.5/wx/xrc/xmlres.h
+include/wx-2.5/wx/xti.h
+include/wx-2.5/wx/xtistrm.h
+include/wx-2.5/wx/xtixml.h
+include/wx-2.5/wx/zipstrm.h
+include/wx-2.5/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -446,10 +489,12 @@ share/wx/2.5/gs_afm/Zapf.afm
@dirrm share/wx/2.5/afm
@dirrm share/wx/2.5
@dirrm share/wx
-@dirrm include/wx/xml
-@dirrm include/wx/unix
-@dirrm include/wx/protocol
-@dirrm include/wx/html
-@dirrm include/wx/gtk
-@dirrm include/wx/generic
-@dirrm include/wx
+@dirrm include/wx-2.5/wx/xrc
+@dirrm include/wx-2.5/wx/xml
+@dirrm include/wx-2.5/wx/unix
+@dirrm include/wx-2.5/wx/protocol
+@dirrm include/wx-2.5/wx/html
+@dirrm include/wx-2.5/wx/gtk
+@dirrm include/wx-2.5/wx/generic
+@dirrm include/wx-2.5/wx
+@dirrm include/wx-2.5
diff --git a/x11-toolkits/wxgtk28-contrib-common/pkg-plist b/x11-toolkits/wxgtk28-contrib-common/pkg-plist
index 83e3768c0c17..49656f547325 100644
--- a/x11-toolkits/wxgtk28-contrib-common/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib-common/pkg-plist
@@ -1,108 +1,69 @@
-include/wx/animate/animate.h
-include/wx/deprecated/expr.h
-include/wx/deprecated/prop.h
-include/wx/deprecated/propform.h
-include/wx/deprecated/proplist.h
-include/wx/deprecated/resource.h
-include/wx/deprecated/setup.h
-include/wx/deprecated/tbarsmpl.h
-include/wx/deprecated/treelay.h
-include/wx/deprecated/wxexpr.h
-include/wx/fl/antiflickpl.h
-include/wx/fl/bardragpl.h
-include/wx/fl/barhintspl.h
-include/wx/fl/cbcustom.h
-include/wx/fl/controlbar.h
-include/wx/fl/dynbarhnd.h
-include/wx/fl/dyntbar.h
-include/wx/fl/dyntbarhnd.h
-include/wx/fl/fldefs.h
-include/wx/fl/frmview.h
-include/wx/fl/garbagec.h
-include/wx/fl/gcupdatesmgr.h
-include/wx/fl/hintanimpl.h
-include/wx/fl/newbmpbtn.h
-include/wx/fl/panedrawpl.h
-include/wx/fl/rowdragpl.h
-include/wx/fl/rowlayoutpl.h
-include/wx/fl/toolwnd.h
-include/wx/fl/updatesmgr.h
-include/wx/gizmos/dynamicsash.h
-include/wx/gizmos/editlbox.h
-include/wx/gizmos/gizmos.h
-include/wx/gizmos/ledctrl.h
-include/wx/gizmos/multicell.h
-include/wx/gizmos/splittree.h
-include/wx/gizmos/statpict.h
-include/wx/ogl/basic.h
-include/wx/ogl/basicp.h
-include/wx/ogl/bmpshape.h
-include/wx/ogl/canvas.h
-include/wx/ogl/composit.h
-include/wx/ogl/constrnt.h
-include/wx/ogl/divided.h
-include/wx/ogl/drawn.h
-include/wx/ogl/drawnp.h
-include/wx/ogl/lines.h
-include/wx/ogl/linesp.h
-include/wx/ogl/mfutils.h
-include/wx/ogl/misc.h
-include/wx/ogl/ogl.h
-include/wx/ogl/ogldiag.h
-include/wx/plot/plot.h
-include/wx/plot/plot_dwn.bmp
-include/wx/plot/plot_enl.bmp
-include/wx/plot/plot_shr.bmp
-include/wx/plot/plot_up.bmp
-include/wx/plot/plot_zin.bmp
-include/wx/plot/plot_zot.bmp
-include/wx/plot/wxplot.rc
-include/wx/stc/stc.h
-include/wx/svg/dcsvg.h
-include/wx/xrc/xh_all.h
-include/wx/xrc/xh_bmp.h
-include/wx/xrc/xh_bmpbt.h
-include/wx/xrc/xh_bttn.h
-include/wx/xrc/xh_cald.h
-include/wx/xrc/xh_chckb.h
-include/wx/xrc/xh_chckl.h
-include/wx/xrc/xh_choic.h
-include/wx/xrc/xh_combo.h
-include/wx/xrc/xh_dlg.h
-include/wx/xrc/xh_frame.h
-include/wx/xrc/xh_gauge.h
-include/wx/xrc/xh_gdctl.h
-include/wx/xrc/xh_html.h
-include/wx/xrc/xh_listb.h
-include/wx/xrc/xh_listc.h
-include/wx/xrc/xh_menu.h
-include/wx/xrc/xh_notbk.h
-include/wx/xrc/xh_panel.h
-include/wx/xrc/xh_radbt.h
-include/wx/xrc/xh_radbx.h
-include/wx/xrc/xh_scrol.h
-include/wx/xrc/xh_scwin.h
-include/wx/xrc/xh_sizer.h
-include/wx/xrc/xh_slidr.h
-include/wx/xrc/xh_spin.h
-include/wx/xrc/xh_split.h
-include/wx/xrc/xh_statbar.h
-include/wx/xrc/xh_stbmp.h
-include/wx/xrc/xh_stbox.h
-include/wx/xrc/xh_stlin.h
-include/wx/xrc/xh_sttxt.h
-include/wx/xrc/xh_text.h
-include/wx/xrc/xh_toolb.h
-include/wx/xrc/xh_tree.h
-include/wx/xrc/xh_unkwn.h
-include/wx/xrc/xh_wizrd.h
-include/wx/xrc/xmlres.h
-@dirrm include/wx/xrc
-@dirrm include/wx/svg
-@dirrm include/wx/stc
-@dirrm include/wx/plot
-@dirrm include/wx/ogl
-@dirrm include/wx/gizmos
-@dirrm include/wx/fl
-@dirrm include/wx/deprecated
-@dirrm include/wx/animate
+include/wx-2.5/wx/animate/animate.h
+include/wx-2.5/wx/deprecated/expr.h
+include/wx-2.5/wx/deprecated/prop.h
+include/wx-2.5/wx/deprecated/propform.h
+include/wx-2.5/wx/deprecated/proplist.h
+include/wx-2.5/wx/deprecated/resource.h
+include/wx-2.5/wx/deprecated/setup.h
+include/wx-2.5/wx/deprecated/tbarsmpl.h
+include/wx-2.5/wx/deprecated/treelay.h
+include/wx-2.5/wx/deprecated/wxexpr.h
+include/wx-2.5/wx/fl/antiflickpl.h
+include/wx-2.5/wx/fl/bardragpl.h
+include/wx-2.5/wx/fl/barhintspl.h
+include/wx-2.5/wx/fl/cbcustom.h
+include/wx-2.5/wx/fl/controlbar.h
+include/wx-2.5/wx/fl/dynbarhnd.h
+include/wx-2.5/wx/fl/dyntbar.h
+include/wx-2.5/wx/fl/dyntbarhnd.h
+include/wx-2.5/wx/fl/fldefs.h
+include/wx-2.5/wx/fl/frmview.h
+include/wx-2.5/wx/fl/garbagec.h
+include/wx-2.5/wx/fl/gcupdatesmgr.h
+include/wx-2.5/wx/fl/hintanimpl.h
+include/wx-2.5/wx/fl/newbmpbtn.h
+include/wx-2.5/wx/fl/panedrawpl.h
+include/wx-2.5/wx/fl/rowdragpl.h
+include/wx-2.5/wx/fl/rowlayoutpl.h
+include/wx-2.5/wx/fl/toolwnd.h
+include/wx-2.5/wx/fl/updatesmgr.h
+include/wx-2.5/wx/gizmos/dynamicsash.h
+include/wx-2.5/wx/gizmos/editlbox.h
+include/wx-2.5/wx/gizmos/gizmos.h
+include/wx-2.5/wx/gizmos/ledctrl.h
+include/wx-2.5/wx/gizmos/multicell.h
+include/wx-2.5/wx/gizmos/splittree.h
+include/wx-2.5/wx/gizmos/statpict.h
+include/wx-2.5/wx/ogl/basic.h
+include/wx-2.5/wx/ogl/basicp.h
+include/wx-2.5/wx/ogl/bmpshape.h
+include/wx-2.5/wx/ogl/canvas.h
+include/wx-2.5/wx/ogl/composit.h
+include/wx-2.5/wx/ogl/constrnt.h
+include/wx-2.5/wx/ogl/divided.h
+include/wx-2.5/wx/ogl/drawn.h
+include/wx-2.5/wx/ogl/drawnp.h
+include/wx-2.5/wx/ogl/lines.h
+include/wx-2.5/wx/ogl/linesp.h
+include/wx-2.5/wx/ogl/mfutils.h
+include/wx-2.5/wx/ogl/misc.h
+include/wx-2.5/wx/ogl/ogl.h
+include/wx-2.5/wx/ogl/ogldiag.h
+include/wx-2.5/wx/plot/plot.h
+include/wx-2.5/wx/plot/plot_dwn.bmp
+include/wx-2.5/wx/plot/plot_enl.bmp
+include/wx-2.5/wx/plot/plot_shr.bmp
+include/wx-2.5/wx/plot/plot_up.bmp
+include/wx-2.5/wx/plot/plot_zin.bmp
+include/wx-2.5/wx/plot/plot_zot.bmp
+include/wx-2.5/wx/plot/wxplot.rc
+include/wx-2.5/wx/stc/stc.h
+include/wx-2.5/wx/svg/dcsvg.h
+@dirrm include/wx-2.5/wx/svg
+@dirrm include/wx-2.5/wx/stc
+@dirrm include/wx-2.5/wx/plot
+@dirrm include/wx-2.5/wx/ogl
+@dirrm include/wx-2.5/wx/gizmos
+@dirrm include/wx-2.5/wx/fl
+@dirrm include/wx-2.5/wx/deprecated
+@dirrm include/wx-2.5/wx/animate
diff --git a/x11-toolkits/wxgtk28-contrib/Makefile b/x11-toolkits/wxgtk28-contrib/Makefile
index c5160c5916c2..4c36af733fab 100644
--- a/x11-toolkits/wxgtk28-contrib/Makefile
+++ b/x11-toolkits/wxgtk28-contrib/Makefile
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
diff --git a/x11-toolkits/wxgtk28-contrib/pkg-plist b/x11-toolkits/wxgtk28-contrib/pkg-plist
index 461abc2b13c2..1e6d7fa75aab 100644
--- a/x11-toolkits/wxgtk28-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2_animate-2.5.so
-lib/libwx_gtk2_animate-2.5.so.2
-lib/libwx_gtk2_animate-2.5.so.2.0.0
+lib/libwx_gtk2_animate-2.5.so.3
+lib/libwx_gtk2_animate-2.5.so.3.0.0
lib/libwx_gtk2_deprecated-2.5.so
-lib/libwx_gtk2_deprecated-2.5.so.2
-lib/libwx_gtk2_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2_deprecated-2.5.so.3
+lib/libwx_gtk2_deprecated-2.5.so.3.0.0
lib/libwx_gtk2_fl-2.5.so
-lib/libwx_gtk2_fl-2.5.so.2
-lib/libwx_gtk2_fl-2.5.so.2.0.0
+lib/libwx_gtk2_fl-2.5.so.3
+lib/libwx_gtk2_fl-2.5.so.3.0.0
lib/libwx_gtk2_gizmos-2.5.so
-lib/libwx_gtk2_gizmos-2.5.so.2
-lib/libwx_gtk2_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2_gizmos-2.5.so.3
+lib/libwx_gtk2_gizmos-2.5.so.3.0.0
lib/libwx_gtk2_ogl-2.5.so
-lib/libwx_gtk2_ogl-2.5.so.2
-lib/libwx_gtk2_ogl-2.5.so.2.0.0
+lib/libwx_gtk2_ogl-2.5.so.3
+lib/libwx_gtk2_ogl-2.5.so.3.0.0
lib/libwx_gtk2_plot-2.5.so
-lib/libwx_gtk2_plot-2.5.so.2
-lib/libwx_gtk2_plot-2.5.so.2.0.0
+lib/libwx_gtk2_plot-2.5.so.3
+lib/libwx_gtk2_plot-2.5.so.3.0.0
lib/libwx_gtk2_stc-2.5.so
-lib/libwx_gtk2_stc-2.5.so.2
-lib/libwx_gtk2_stc-2.5.so.2.0.0
+lib/libwx_gtk2_stc-2.5.so.3
+lib/libwx_gtk2_stc-2.5.so.3.0.0
lib/libwx_gtk2_svg-2.5.so
-lib/libwx_gtk2_svg-2.5.so.2
-lib/libwx_gtk2_svg-2.5.so.2.0.0
-lib/libwx_gtk2_xrc-2.5.so
-lib/libwx_gtk2_xrc-2.5.so.2
-lib/libwx_gtk2_xrc-2.5.so.2.0.0
+lib/libwx_gtk2_svg-2.5.so.3
+lib/libwx_gtk2_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk28-unicode/pkg-plist b/x11-toolkits/wxgtk28-unicode/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk28-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 14e76d536b22..beb00c3158e9 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.2
-PORTREVISION?= 1
+PORTVERSION= 2.5.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -17,10 +16,11 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff \
- expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
+ jpeg.9:${PORTSDIR}/graphics/jpeg\
+ tiff.4:${PORTSDIR}/graphics/tiff\
+ expat.5:${PORTSDIR}/textproc/expat2\
+ mspack.1:${PORTSDIR}/archivers/libmspack
CONFLICTS= wxgtk-*
@@ -32,12 +32,13 @@ USE_ICONV= yes
USE_GNOME= gtk20
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libpng=sys \
- --with-libjpeg=sys \
- --with-libtiff=sys \
- --with-zlib=sys \
- --with-expat=sys \
- --with-opengl \
+CONFIGURE_ARGS= --with-libpng=sys\
+ --with-libjpeg=sys\
+ --with-libtiff=sys\
+ --with-zlib=sys\
+ --with-expat=sys\
+ --with-opengl\
+ --with-mspack\
--enable-gtk2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
@@ -51,7 +52,7 @@ NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -66,23 +67,23 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
.else
-LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
pre-configure:
- @${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+ @${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
.include <bsd.port.pre.mk>
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index 7c24033cdccf..ab4f811407f2 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.2.tar.bz2) = b45874428b0164bfa5bd1a5a11b3eb4a
-SIZE (wxGTK-2.5.2.tar.bz2) = 6579255
+MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
+SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
index 966de5b3e9df..c9d72e6757c7 100644
--- a/x11-toolkits/wxgtk28/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon May 31 18:11:50 2004
-+++ Makefile.in Sun Jun 27 21:12:13 2004
+--- Makefile.in.orig Sun Oct 10 22:17:27 2004
++++ Makefile.in Wed Nov 24 22:47:40 2004
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,30 +8,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -6927,11 +6928,13 @@
+@@ -7408,11 +7409,13 @@
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__macos_res___depname) $(__cocoa_res___depname)
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)
--install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx
-+ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
++ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
+
+install-common: $(__install_afm___depname) $(__install_gsafm___depname) locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-@@ -7371,8 +7374,7 @@
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+@@ -7892,9 +7895,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
-+ $(INSTALL_SCRIPT) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
index c8ae3832f26e..88e167a98f95 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
@@ -1,19 +1,20 @@
---- contrib/src/Makefile.in.orig Mon May 31 18:12:16 2004
-+++ contrib/src/Makefile.in Mon Jun 28 00:28:54 2004
-@@ -1,15 +1,23 @@
- # $Id: Makefile.in,v 1.16 2003/08/17 12:48:18 VS Exp $
+--- contrib/src/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/Makefile.in Fri Nov 26 00:20:35 2004
+@@ -1,15 +1,24 @@
+ # $Id: Makefile.in,v 1.17 2004/09/24 15:32:58 VS Exp $
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg xrc deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg xrc deprecated animate #applet mmedia
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
-all:
++WX_RELEASE= @WX_RELEASE@
+@COND_UNICODE_1@wxregexu_depname= wxregexu
+
+all: $(wxregexu_depname)
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
+wxregexu:
-+ cd ../.. && $(MAKE) lib/libwxregexu.a
++ @cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a
+
clean:
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-animate-Makefile.in
index 4e5875295e52..abfc81a6176c 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-animate-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-animate-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/animate/Makefile.in.orig Sun Jun 27 21:38:11 2004
-+++ contrib/src/animate/Makefile.in Sun Jun 27 21:38:20 2004
-@@ -172,6 +172,8 @@
+--- contrib/src/animate/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/animate/Makefile.in Wed Nov 24 21:37:14 2004
+@@ -180,6 +180,8 @@
all: $(__animatedll___depname) $(__animatelib___depname)
install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/animate/animate.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in
index 237d6931053c..0c492341ca53 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/deprecated/Makefile.in.orig Sun Jun 27 21:38:26 2004
-+++ contrib/src/deprecated/Makefile.in Sun Jun 27 21:38:52 2004
-@@ -199,6 +199,8 @@
+--- contrib/src/deprecated/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/deprecated/Makefile.in Wed Nov 24 21:39:56 2004
+@@ -207,6 +207,8 @@
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
index 094280a521fc..2de711cc3b1f 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/fl/Makefile.in.orig Sun Jun 27 21:34:52 2004
-+++ contrib/src/fl/Makefile.in Sun Jun 27 21:35:37 2004
-@@ -203,6 +203,8 @@
+--- contrib/src/fl/Makefile.in.orig Sun Oct 10 22:18:49 2004
++++ contrib/src/fl/Makefile.in Wed Nov 24 21:40:16 2004
+@@ -211,6 +211,8 @@
all: $(__fldll___depname) $(__fllib___depname)
install: all $(__install_fldll___depname) $(__install_fllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
index fae5de6b9501..b6e204d0704a 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/gizmos/Makefile.in.orig Sun Jun 27 21:35:44 2004
-+++ contrib/src/gizmos/Makefile.in Sun Jun 27 21:35:55 2004
-@@ -181,6 +181,8 @@
+--- contrib/src/gizmos/Makefile.in.orig Sun Oct 10 22:18:50 2004
++++ contrib/src/gizmos/Makefile.in Wed Nov 24 21:40:37 2004
+@@ -189,6 +189,8 @@
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
index cb94093057e1..2be3bdbe7e1c 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/ogl/Makefile.in.orig Sun Jun 27 22:44:07 2004
-+++ contrib/src/ogl/Makefile.in Sun Jun 27 22:44:25 2004
-@@ -193,6 +193,8 @@
+--- contrib/src/ogl/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/ogl/Makefile.in Wed Nov 24 21:41:00 2004
+@@ -201,6 +201,8 @@
all: $(__ogldll___depname) $(__ogllib___depname)
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
index 152bf7473082..802b4f093baa 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/plot/Makefile.in.orig Sun Jun 27 21:36:28 2004
-+++ contrib/src/plot/Makefile.in Sun Jun 27 21:36:37 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/plot/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/plot/Makefile.in Wed Nov 24 21:41:16 2004
+@@ -179,6 +179,8 @@
all: $(__plotdll___depname) $(__plotlib___depname)
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
index 5053151bf229..c41d5cbfec19 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/stc/Makefile.in.orig Sun Jun 27 21:36:48 2004
-+++ contrib/src/stc/Makefile.in Sun Jun 27 21:36:56 2004
-@@ -286,6 +286,8 @@
+--- contrib/src/stc/Makefile.in.orig Sun Oct 10 22:18:53 2004
++++ contrib/src/stc/Makefile.in Wed Nov 24 21:41:31 2004
+@@ -310,6 +310,8 @@
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/stc/stc.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
index e41c53fd4030..213aef13d42c 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/svg/Makefile.in.orig Sun Jun 27 21:37:03 2004
-+++ contrib/src/svg/Makefile.in Sun Jun 27 21:37:16 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/svg/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/svg/Makefile.in Wed Nov 24 21:41:44 2004
+@@ -179,6 +179,8 @@
all: $(__svgdll___depname) $(__svglib___depname)
install: all $(__install_svgdll___depname) $(__install_svglib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/svg/dcsvg.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-xrc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-xrc-Makefile.in
deleted file mode 100644
index aafcaa405758..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-xrc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/xrc/Makefile.in.orig Sun Jun 27 21:37:21 2004
-+++ contrib/src/xrc/Makefile.in Sun Jun 27 21:37:44 2004
-@@ -258,6 +258,8 @@
- all: $(__xrcdll___depname) $(__xrclib___depname)
-
- install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
-+
-+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
- for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h
new file mode 100644
index 000000000000..a8688e1069c0
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h
@@ -0,0 +1,14 @@
+--- src/regex/regcustom.h.orig Thu Nov 25 21:03:13 2004
++++ src/regex/regcustom.h Thu Nov 25 21:03:29 2004
+@@ -76,6 +76,11 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
+
+ /* internal character type and related */
diff --git a/x11-toolkits/wxgtk28/files/patch-src-regex-regex.h b/x11-toolkits/wxgtk28/files/patch-src-regex-regex.h
new file mode 100644
index 000000000000..01f1f176215f
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-regex-regex.h
@@ -0,0 +1,16 @@
+--- src/regex/regex.h.orig Thu Nov 25 21:02:55 2004
++++ src/regex/regex.h Thu Nov 25 21:03:06 2004
+@@ -115,7 +115,13 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
++
+
+ /*
+ * interface types etc.
diff --git a/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..353821f40cfd
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,21 @@
+--- utils/wxrc/Makefile.in.orig Thu Nov 25 21:52:45 2004
++++ utils/wxrc/Makefile.in Thu Nov 25 21:58:43 2004
+@@ -28,6 +28,7 @@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ HOST_SUFFIX = @HOST_SUFFIX@
+@@ -113,9 +114,7 @@
+
+ @COND_USE_XRC_1@install_wxrc:
+ @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
+
+ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+ $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/x11-toolkits/wxgtk28/files/patch-wx-config.in b/x11-toolkits/wxgtk28/files/patch-wx-config.in
index 99fb6adf332c..0453477f8fbc 100644
--- a/x11-toolkits/wxgtk28/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk28/files/patch-wx-config.in
@@ -1,11 +1,11 @@
---- wx-config.in.orig Mon May 31 18:11:50 2004
-+++ wx-config.in Sun Jun 27 20:08:21 2004
-@@ -230,7 +230,7 @@
- includes=" -I${includedir}"
- fi
+--- wx-config.in.orig Sun Oct 10 22:17:27 2004
++++ wx-config.in Wed Nov 24 22:48:01 2004
+@@ -1014,7 +1014,7 @@
+ _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
+ fi
-- includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
-+ includes="-I${includedir}/wx/include/${TOOLCHAIN_NAME}$includes"
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
++_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
- # in inplace case we need to also add path to contrib headers -- do it
- # unconditionally as they might be used and we have no way of knowing if
+ # now without further ado, we can answer these too.
+ [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk28/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist
index 0af111d8925e..3f401620305b 100644
--- a/x11-toolkits/wxgtk28/pkg-plist
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -1,26 +1,29 @@
bin/wxgtk2-2.5-config
-include/wx/include/gtk2-2.5/wx/setup.h
+bin/wxrc-gtk2-2.5
+include/wx-2.5/gtk2-ansi-release-2.5/wx/setup.h
lib/libwx_base-2.5.so
-lib/libwx_base-2.5.so.2
-lib/libwx_base-2.5.so.2.0.0
+lib/libwx_base-2.5.so.3
+lib/libwx_base-2.5.so.3.0.0
lib/libwx_base_net-2.5.so
-lib/libwx_base_net-2.5.so.2
-lib/libwx_base_net-2.5.so.2.0.0
+lib/libwx_base_net-2.5.so.3
+lib/libwx_base_net-2.5.so.3.0.0
lib/libwx_base_xml-2.5.so
-lib/libwx_base_xml-2.5.so.2
-lib/libwx_base_xml-2.5.so.2.0.0
+lib/libwx_base_xml-2.5.so.3
+lib/libwx_base_xml-2.5.so.3.0.0
lib/libwx_gtk2_adv-2.5.so
-lib/libwx_gtk2_adv-2.5.so.2
-lib/libwx_gtk2_adv-2.5.so.2.0.0
+lib/libwx_gtk2_adv-2.5.so.3
+lib/libwx_gtk2_adv-2.5.so.3.0.0
lib/libwx_gtk2_core-2.5.so
-lib/libwx_gtk2_core-2.5.so.2
-lib/libwx_gtk2_core-2.5.so.2.0.0
+lib/libwx_gtk2_core-2.5.so.3
+lib/libwx_gtk2_core-2.5.so.3.0.0
lib/libwx_gtk2_gl-2.5.so
-lib/libwx_gtk2_gl-2.5.so.2
-lib/libwx_gtk2_gl-2.5.so.2.0.0
+lib/libwx_gtk2_gl-2.5.so.3
+lib/libwx_gtk2_gl-2.5.so.3.0.0
lib/libwx_gtk2_html-2.5.so
-lib/libwx_gtk2_html-2.5.so.2
-lib/libwx_gtk2_html-2.5.so.2.0.0
-@dirrm include/wx/include/gtk2-2.5/wx
-@dirrm include/wx/include/gtk2-2.5
-@dirrm include/wx/include
+lib/libwx_gtk2_html-2.5.so.3
+lib/libwx_gtk2_html-2.5.so.3.0.0
+lib/libwx_gtk2_xrc-2.5.so
+lib/libwx_gtk2_xrc-2.5.so.3
+lib/libwx_gtk2_xrc-2.5.so.3.0.0
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5/wx
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5
diff --git a/x11-toolkits/wxgtk29-common/pkg-plist b/x11-toolkits/wxgtk29-common/pkg-plist
index 881bb9f3defa..f68eebf220d8 100644
--- a/x11-toolkits/wxgtk29-common/pkg-plist
+++ b/x11-toolkits/wxgtk29-common/pkg-plist
@@ -1,399 +1,442 @@
-include/wx/accel.h
-include/wx/access.h
-include/wx/afterstd.h
-include/wx/app.h
-include/wx/apptrait.h
-include/wx/arrimpl.cpp
-include/wx/arrstr.h
-include/wx/artprov.h
-include/wx/beforestd.h
-include/wx/bitmap.h
-include/wx/bmpbuttn.h
-include/wx/bookctrl.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/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/dcmirror.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/display.h
-include/wx/dlimpexp.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/encinfo.h
-include/wx/event.h
-include/wx/evtloop.h
-include/wx/except.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/fmappriv.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/gbsizer.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/gridsel.h
-include/wx/generic/helpext.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/logg.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/numdlgg.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/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/msgdlg.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/win_gtk.h
-include/wx/gtk/window.h
-include/wx/hash.h
-include/wx/hashmap.h
-include/wx/hashset.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/htmlproc.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/htmllbox.h
-include/wx/icon.h
-include/wx/iconbndl.h
-include/wx/iconloc.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/init.h
-include/wx/intl.h
-include/wx/iosfwrap.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/listbook.h
-include/wx/listbox.h
-include/wx/listctrl.h
-include/wx/listimpl.cpp
-include/wx/log.h
-include/wx/longlong.h
-include/wx/math.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/numdlg.h
-include/wx/object.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/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
-include/wx/ptr_scpd.h
-include/wx/quantize.h
-include/wx/radiobox.h
-include/wx/radiobut.h
-include/wx/rawbmp.h
-include/wx/regex.h
-include/wx/region.h
-include/wx/renderer.h
-include/wx/sashwin.h
-include/wx/sckaddr.h
-include/wx/sckipc.h
-include/wx/sckstrm.h
-include/wx/scopeguard.h
-include/wx/scrolbar.h
-include/wx/scrolwin.h
-include/wx/selstore.h
-include/wx/settings.h
-include/wx/sizer.h
-include/wx/slider.h
-include/wx/snglinst.h
-include/wx/socket.h
-include/wx/sound.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/stopwatch.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/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/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/apptbase.h
-include/wx/unix/apptrait.h
-include/wx/unix/displayx11.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/joystick.h
-include/wx/unix/mimetype.h
-include/wx/unix/pipe.h
-include/wx/unix/sound.h
-include/wx/unix/taskbarx11.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/vidmode.h
-include/wx/vlbox.h
-include/wx/vms_x_fix.h
-include/wx/volume.h
-include/wx/vscroll.h
-include/wx/wave.h
-include/wx/wfstream.h
-include/wx/window.h
-include/wx/wizard.h
-include/wx/wx.h
-include/wx/wxchar.h
-include/wx/wxhtml.h
-include/wx/wxprec.h
-include/wx/xml/xml.h
-include/wx/xpmdecod.h
-include/wx/xpmhand.h
-include/wx/xti.h
-include/wx/xtistrm.h
-include/wx/xtixml.h
-include/wx/zipstrm.h
-include/wx/zstream.h
+include/wx-2.5/wx/accel.h
+include/wx-2.5/wx/access.h
+include/wx-2.5/wx/afterstd.h
+include/wx-2.5/wx/app.h
+include/wx-2.5/wx/apptrait.h
+include/wx-2.5/wx/arrimpl.cpp
+include/wx-2.5/wx/arrstr.h
+include/wx-2.5/wx/artprov.h
+include/wx-2.5/wx/beforestd.h
+include/wx-2.5/wx/bitmap.h
+include/wx-2.5/wx/bmpbuttn.h
+include/wx-2.5/wx/bookctrl.h
+include/wx-2.5/wx/brush.h
+include/wx-2.5/wx/buffer.h
+include/wx-2.5/wx/build.h
+include/wx-2.5/wx/busyinfo.h
+include/wx-2.5/wx/button.h
+include/wx-2.5/wx/calctrl.h
+include/wx-2.5/wx/caret.h
+include/wx-2.5/wx/checkbox.h
+include/wx-2.5/wx/checklst.h
+include/wx-2.5/wx/chkconf.h
+include/wx-2.5/wx/choicdlg.h
+include/wx-2.5/wx/choice.h
+include/wx-2.5/wx/choicebk.h
+include/wx-2.5/wx/clipbrd.h
+include/wx-2.5/wx/clntdata.h
+include/wx-2.5/wx/cmdline.h
+include/wx-2.5/wx/cmdproc.h
+include/wx-2.5/wx/cmndata.h
+include/wx-2.5/wx/colordlg.h
+include/wx-2.5/wx/colour.h
+include/wx-2.5/wx/combobox.h
+include/wx-2.5/wx/confbase.h
+include/wx-2.5/wx/config.h
+include/wx-2.5/wx/containr.h
+include/wx-2.5/wx/control.h
+include/wx-2.5/wx/cshelp.h
+include/wx-2.5/wx/ctrlsub.h
+include/wx-2.5/wx/cursor.h
+include/wx-2.5/wx/dataobj.h
+include/wx-2.5/wx/datetime.h
+include/wx-2.5/wx/datetime.inl
+include/wx-2.5/wx/datstrm.h
+include/wx-2.5/wx/db.h
+include/wx-2.5/wx/dbgrid.h
+include/wx-2.5/wx/dbkeyg.h
+include/wx-2.5/wx/dbtable.h
+include/wx-2.5/wx/dc.h
+include/wx-2.5/wx/dcbuffer.h
+include/wx-2.5/wx/dcclient.h
+include/wx-2.5/wx/dcmemory.h
+include/wx-2.5/wx/dcmirror.h
+include/wx-2.5/wx/dcprint.h
+include/wx-2.5/wx/dcps.h
+include/wx-2.5/wx/dcscreen.h
+include/wx-2.5/wx/dde.h
+include/wx-2.5/wx/debug.h
+include/wx-2.5/wx/defs.h
+include/wx-2.5/wx/dialog.h
+include/wx-2.5/wx/dialup.h
+include/wx-2.5/wx/dir.h
+include/wx-2.5/wx/dirctrl.h
+include/wx-2.5/wx/dirdlg.h
+include/wx-2.5/wx/display.h
+include/wx-2.5/wx/dlimpexp.h
+include/wx-2.5/wx/dnd.h
+include/wx-2.5/wx/docmdi.h
+include/wx-2.5/wx/docview.h
+include/wx-2.5/wx/dragimag.h
+include/wx-2.5/wx/dynarray.h
+include/wx-2.5/wx/dynlib.h
+include/wx-2.5/wx/dynload.h
+include/wx-2.5/wx/effects.h
+include/wx-2.5/wx/encconv.h
+include/wx-2.5/wx/encinfo.h
+include/wx-2.5/wx/event.h
+include/wx-2.5/wx/evtloop.h
+include/wx-2.5/wx/except.h
+include/wx-2.5/wx/fdrepdlg.h
+include/wx-2.5/wx/features.h
+include/wx-2.5/wx/ffile.h
+include/wx-2.5/wx/file.h
+include/wx-2.5/wx/fileconf.h
+include/wx-2.5/wx/filedlg.h
+include/wx-2.5/wx/filefn.h
+include/wx-2.5/wx/filename.h
+include/wx-2.5/wx/filesys.h
+include/wx-2.5/wx/fmappriv.h
+include/wx-2.5/wx/font.h
+include/wx-2.5/wx/fontdlg.h
+include/wx-2.5/wx/fontenc.h
+include/wx-2.5/wx/fontenum.h
+include/wx-2.5/wx/fontmap.h
+include/wx-2.5/wx/fontutil.h
+include/wx-2.5/wx/frame.h
+include/wx-2.5/wx/fs_inet.h
+include/wx-2.5/wx/fs_mem.h
+include/wx-2.5/wx/fs_zip.h
+include/wx-2.5/wx/gauge.h
+include/wx-2.5/wx/gbsizer.h
+include/wx-2.5/wx/gdicmn.h
+include/wx-2.5/wx/gdiobj.h
+include/wx-2.5/wx/generic/accel.h
+include/wx-2.5/wx/generic/calctrl.h
+include/wx-2.5/wx/generic/caret.h
+include/wx-2.5/wx/generic/choicdgg.h
+include/wx-2.5/wx/generic/colrdlgg.h
+include/wx-2.5/wx/generic/dcpsg.h
+include/wx-2.5/wx/generic/dirctrlg.h
+include/wx-2.5/wx/generic/dirdlgg.h
+include/wx-2.5/wx/generic/dragimgg.h
+include/wx-2.5/wx/generic/fdrepdlg.h
+include/wx-2.5/wx/generic/filedlgg.h
+include/wx-2.5/wx/generic/fontdlgg.h
+include/wx-2.5/wx/generic/grid.h
+include/wx-2.5/wx/generic/gridctrl.h
+include/wx-2.5/wx/generic/gridsel.h
+include/wx-2.5/wx/generic/helpext.h
+include/wx-2.5/wx/generic/imaglist.h
+include/wx-2.5/wx/generic/laywin.h
+include/wx-2.5/wx/generic/listctrl.h
+include/wx-2.5/wx/generic/logg.h
+include/wx-2.5/wx/generic/msgdlgg.h
+include/wx-2.5/wx/generic/notebook.h
+include/wx-2.5/wx/generic/numdlgg.h
+include/wx-2.5/wx/generic/paletteg.h
+include/wx-2.5/wx/generic/panelg.h
+include/wx-2.5/wx/generic/printps.h
+include/wx-2.5/wx/generic/prntdlgg.h
+include/wx-2.5/wx/generic/progdlgg.h
+include/wx-2.5/wx/generic/sashwin.h
+include/wx-2.5/wx/generic/scrolwin.h
+include/wx-2.5/wx/generic/spinctlg.h
+include/wx-2.5/wx/generic/splash.h
+include/wx-2.5/wx/generic/splitter.h
+include/wx-2.5/wx/generic/statusbr.h
+include/wx-2.5/wx/generic/tabg.h
+include/wx-2.5/wx/generic/textdlgg.h
+include/wx-2.5/wx/generic/timer.h
+include/wx-2.5/wx/generic/treectlg.h
+include/wx-2.5/wx/generic/wizard.h
+include/wx-2.5/wx/geometry.h
+include/wx-2.5/wx/gifdecod.h
+include/wx-2.5/wx/glcanvas.h
+include/wx-2.5/wx/grid.h
+include/wx-2.5/wx/gsocket.h
+include/wx-2.5/wx/gtk/accel.h
+include/wx-2.5/wx/gtk/app.h
+include/wx-2.5/wx/gtk/bitmap.h
+include/wx-2.5/wx/gtk/bmpbuttn.h
+include/wx-2.5/wx/gtk/brush.h
+include/wx-2.5/wx/gtk/button.h
+include/wx-2.5/wx/gtk/checkbox.h
+include/wx-2.5/wx/gtk/checklst.h
+include/wx-2.5/wx/gtk/choice.h
+include/wx-2.5/wx/gtk/clipbrd.h
+include/wx-2.5/wx/gtk/colordlg.h
+include/wx-2.5/wx/gtk/colour.h
+include/wx-2.5/wx/gtk/combobox.h
+include/wx-2.5/wx/gtk/control.h
+include/wx-2.5/wx/gtk/cursor.h
+include/wx-2.5/wx/gtk/dataform.h
+include/wx-2.5/wx/gtk/dataobj.h
+include/wx-2.5/wx/gtk/dataobj2.h
+include/wx-2.5/wx/gtk/dc.h
+include/wx-2.5/wx/gtk/dcclient.h
+include/wx-2.5/wx/gtk/dcmemory.h
+include/wx-2.5/wx/gtk/dcscreen.h
+include/wx-2.5/wx/gtk/dialog.h
+include/wx-2.5/wx/gtk/dnd.h
+include/wx-2.5/wx/gtk/filedlg.h
+include/wx-2.5/wx/gtk/font.h
+include/wx-2.5/wx/gtk/fontdlg.h
+include/wx-2.5/wx/gtk/frame.h
+include/wx-2.5/wx/gtk/gauge.h
+include/wx-2.5/wx/gtk/gdiobj.h
+include/wx-2.5/wx/gtk/glcanvas.h
+include/wx-2.5/wx/gtk/icon.h
+include/wx-2.5/wx/gtk/listbox.h
+include/wx-2.5/wx/gtk/mdi.h
+include/wx-2.5/wx/gtk/menu.h
+include/wx-2.5/wx/gtk/menuitem.h
+include/wx-2.5/wx/gtk/minifram.h
+include/wx-2.5/wx/gtk/msgdlg.h
+include/wx-2.5/wx/gtk/notebook.h
+include/wx-2.5/wx/gtk/pen.h
+include/wx-2.5/wx/gtk/popupwin.h
+include/wx-2.5/wx/gtk/radiobox.h
+include/wx-2.5/wx/gtk/radiobut.h
+include/wx-2.5/wx/gtk/region.h
+include/wx-2.5/wx/gtk/scrolbar.h
+include/wx-2.5/wx/gtk/scrolwin.h
+include/wx-2.5/wx/gtk/slider.h
+include/wx-2.5/wx/gtk/spinbutt.h
+include/wx-2.5/wx/gtk/spinctrl.h
+include/wx-2.5/wx/gtk/statbmp.h
+include/wx-2.5/wx/gtk/statbox.h
+include/wx-2.5/wx/gtk/statline.h
+include/wx-2.5/wx/gtk/stattext.h
+include/wx-2.5/wx/gtk/tbargtk.h
+include/wx-2.5/wx/gtk/textctrl.h
+include/wx-2.5/wx/gtk/tglbtn.h
+include/wx-2.5/wx/gtk/timer.h
+include/wx-2.5/wx/gtk/tooltip.h
+include/wx-2.5/wx/gtk/toplevel.h
+include/wx-2.5/wx/gtk/treectrl.h
+include/wx-2.5/wx/gtk/win_gtk.h
+include/wx-2.5/wx/gtk/window.h
+include/wx-2.5/wx/hash.h
+include/wx-2.5/wx/hashmap.h
+include/wx-2.5/wx/hashset.h
+include/wx-2.5/wx/help.h
+include/wx-2.5/wx/helpbase.h
+include/wx-2.5/wx/helphtml.h
+include/wx-2.5/wx/helpwin.h
+include/wx-2.5/wx/html/forcelnk.h
+include/wx-2.5/wx/html/helpctrl.h
+include/wx-2.5/wx/html/helpdata.h
+include/wx-2.5/wx/html/helpfrm.h
+include/wx-2.5/wx/html/htmlcell.h
+include/wx-2.5/wx/html/htmldefs.h
+include/wx-2.5/wx/html/htmlfilt.h
+include/wx-2.5/wx/html/htmlpars.h
+include/wx-2.5/wx/html/htmlproc.h
+include/wx-2.5/wx/html/htmltag.h
+include/wx-2.5/wx/html/htmlwin.h
+include/wx-2.5/wx/html/htmprint.h
+include/wx-2.5/wx/html/m_templ.h
+include/wx-2.5/wx/html/winpars.h
+include/wx-2.5/wx/htmllbox.h
+include/wx-2.5/wx/icon.h
+include/wx-2.5/wx/iconbndl.h
+include/wx-2.5/wx/iconloc.h
+include/wx-2.5/wx/imagbmp.h
+include/wx-2.5/wx/image.h
+include/wx-2.5/wx/imaggif.h
+include/wx-2.5/wx/imagiff.h
+include/wx-2.5/wx/imagjpeg.h
+include/wx-2.5/wx/imaglist.h
+include/wx-2.5/wx/imagpcx.h
+include/wx-2.5/wx/imagpng.h
+include/wx-2.5/wx/imagpnm.h
+include/wx-2.5/wx/imagtiff.h
+include/wx-2.5/wx/imagxpm.h
+include/wx-2.5/wx/init.h
+include/wx-2.5/wx/intl.h
+include/wx-2.5/wx/iosfwrap.h
+include/wx-2.5/wx/ioswrap.h
+include/wx-2.5/wx/ipc.h
+include/wx-2.5/wx/ipcbase.h
+include/wx-2.5/wx/isql.h
+include/wx-2.5/wx/isqlext.h
+include/wx-2.5/wx/joystick.h
+include/wx-2.5/wx/layout.h
+include/wx-2.5/wx/laywin.h
+include/wx-2.5/wx/list.h
+include/wx-2.5/wx/listbase.h
+include/wx-2.5/wx/listbook.h
+include/wx-2.5/wx/listbox.h
+include/wx-2.5/wx/listctrl.h
+include/wx-2.5/wx/listimpl.cpp
+include/wx-2.5/wx/log.h
+include/wx-2.5/wx/longlong.h
+include/wx-2.5/wx/math.h
+include/wx-2.5/wx/matrix.h
+include/wx-2.5/wx/mdi.h
+include/wx-2.5/wx/memconf.h
+include/wx-2.5/wx/memory.h
+include/wx-2.5/wx/memtext.h
+include/wx-2.5/wx/menu.h
+include/wx-2.5/wx/menuitem.h
+include/wx-2.5/wx/metafile.h
+include/wx-2.5/wx/mimetype.h
+include/wx-2.5/wx/minifram.h
+include/wx-2.5/wx/module.h
+include/wx-2.5/wx/msgdlg.h
+include/wx-2.5/wx/msgout.h
+include/wx-2.5/wx/mstream.h
+include/wx-2.5/wx/notebook.h
+include/wx-2.5/wx/numdlg.h
+include/wx-2.5/wx/object.h
+include/wx-2.5/wx/ownerdrw.h
+include/wx-2.5/wx/palette.h
+include/wx-2.5/wx/panel.h
+include/wx-2.5/wx/paper.h
+include/wx-2.5/wx/pen.h
+include/wx-2.5/wx/platform.h
+include/wx-2.5/wx/popupwin.h
+include/wx-2.5/wx/print.h
+include/wx-2.5/wx/printdlg.h
+include/wx-2.5/wx/prntbase.h
+include/wx-2.5/wx/process.h
+include/wx-2.5/wx/progdlg.h
+include/wx-2.5/wx/protocol/file.h
+include/wx-2.5/wx/protocol/ftp.h
+include/wx-2.5/wx/protocol/http.h
+include/wx-2.5/wx/protocol/protocol.h
+include/wx-2.5/wx/ptr_scpd.h
+include/wx-2.5/wx/quantize.h
+include/wx-2.5/wx/radiobox.h
+include/wx-2.5/wx/radiobut.h
+include/wx-2.5/wx/rawbmp.h
+include/wx-2.5/wx/regex.h
+include/wx-2.5/wx/region.h
+include/wx-2.5/wx/renderer.h
+include/wx-2.5/wx/sashwin.h
+include/wx-2.5/wx/sckaddr.h
+include/wx-2.5/wx/sckipc.h
+include/wx-2.5/wx/sckstrm.h
+include/wx-2.5/wx/scopeguard.h
+include/wx-2.5/wx/scrolbar.h
+include/wx-2.5/wx/scrolwin.h
+include/wx-2.5/wx/selstore.h
+include/wx-2.5/wx/settings.h
+include/wx-2.5/wx/sizer.h
+include/wx-2.5/wx/slider.h
+include/wx-2.5/wx/snglinst.h
+include/wx-2.5/wx/socket.h
+include/wx-2.5/wx/sound.h
+include/wx-2.5/wx/spinbutt.h
+include/wx-2.5/wx/spinctrl.h
+include/wx-2.5/wx/splash.h
+include/wx-2.5/wx/splitter.h
+include/wx-2.5/wx/sstream.h
+include/wx-2.5/wx/stack.h
+include/wx-2.5/wx/statbmp.h
+include/wx-2.5/wx/statbox.h
+include/wx-2.5/wx/statline.h
+include/wx-2.5/wx/stattext.h
+include/wx-2.5/wx/statusbr.h
+include/wx-2.5/wx/stockitem.h
+include/wx-2.5/wx/stopwatch.h
+include/wx-2.5/wx/strconv.h
+include/wx-2.5/wx/stream.h
+include/wx-2.5/wx/string.h
+include/wx-2.5/wx/sysopt.h
+include/wx-2.5/wx/tab.h
+include/wx-2.5/wx/tabctrl.h
+include/wx-2.5/wx/taskbar.h
+include/wx-2.5/wx/tbarbase.h
+include/wx-2.5/wx/textbuf.h
+include/wx-2.5/wx/textctrl.h
+include/wx-2.5/wx/textdlg.h
+include/wx-2.5/wx/textfile.h
+include/wx-2.5/wx/tglbtn.h
+include/wx-2.5/wx/thread.h
+include/wx-2.5/wx/thrimpl.cpp
+include/wx-2.5/wx/timer.h
+include/wx-2.5/wx/tipdlg.h
+include/wx-2.5/wx/tipwin.h
+include/wx-2.5/wx/tokenzr.h
+include/wx-2.5/wx/toolbar.h
+include/wx-2.5/wx/tooltip.h
+include/wx-2.5/wx/toplevel.h
+include/wx-2.5/wx/treebase.h
+include/wx-2.5/wx/treectrl.h
+include/wx-2.5/wx/txtstrm.h
+include/wx-2.5/wx/types.h
+include/wx-2.5/wx/unix/apptbase.h
+include/wx-2.5/wx/unix/apptrait.h
+include/wx-2.5/wx/unix/displayx11.h
+include/wx-2.5/wx/unix/execute.h
+include/wx-2.5/wx/unix/fontutil.h
+include/wx-2.5/wx/unix/gsockunx.h
+include/wx-2.5/wx/unix/joystick.h
+include/wx-2.5/wx/unix/mimetype.h
+include/wx-2.5/wx/unix/pipe.h
+include/wx-2.5/wx/unix/sound.h
+include/wx-2.5/wx/unix/taskbarx11.h
+include/wx-2.5/wx/unix/utilsx11.h
+include/wx-2.5/wx/url.h
+include/wx-2.5/wx/utils.h
+include/wx-2.5/wx/valgen.h
+include/wx-2.5/wx/validate.h
+include/wx-2.5/wx/valtext.h
+include/wx-2.5/wx/variant.h
+include/wx-2.5/wx/vector.h
+include/wx-2.5/wx/version.h
+include/wx-2.5/wx/vidmode.h
+include/wx-2.5/wx/vlbox.h
+include/wx-2.5/wx/vms_x_fix.h
+include/wx-2.5/wx/volume.h
+include/wx-2.5/wx/vscroll.h
+include/wx-2.5/wx/wave.h
+include/wx-2.5/wx/wfstream.h
+include/wx-2.5/wx/window.h
+include/wx-2.5/wx/wizard.h
+include/wx-2.5/wx/wx.h
+include/wx-2.5/wx/wxchar.h
+include/wx-2.5/wx/wxhtml.h
+include/wx-2.5/wx/wxprec.h
+include/wx-2.5/wx/xml/xml.h
+include/wx-2.5/wx/xpmdecod.h
+include/wx-2.5/wx/xpmhand.h
+include/wx-2.5/wx/xrc/xh_all.h
+include/wx-2.5/wx/xrc/xh_bmp.h
+include/wx-2.5/wx/xrc/xh_bmpbt.h
+include/wx-2.5/wx/xrc/xh_bttn.h
+include/wx-2.5/wx/xrc/xh_cald.h
+include/wx-2.5/wx/xrc/xh_chckb.h
+include/wx-2.5/wx/xrc/xh_chckl.h
+include/wx-2.5/wx/xrc/xh_choic.h
+include/wx-2.5/wx/xrc/xh_combo.h
+include/wx-2.5/wx/xrc/xh_dlg.h
+include/wx-2.5/wx/xrc/xh_frame.h
+include/wx-2.5/wx/xrc/xh_gauge.h
+include/wx-2.5/wx/xrc/xh_gdctl.h
+include/wx-2.5/wx/xrc/xh_html.h
+include/wx-2.5/wx/xrc/xh_listb.h
+include/wx-2.5/wx/xrc/xh_listc.h
+include/wx-2.5/wx/xrc/xh_menu.h
+include/wx-2.5/wx/xrc/xh_notbk.h
+include/wx-2.5/wx/xrc/xh_panel.h
+include/wx-2.5/wx/xrc/xh_radbt.h
+include/wx-2.5/wx/xrc/xh_radbx.h
+include/wx-2.5/wx/xrc/xh_scrol.h
+include/wx-2.5/wx/xrc/xh_scwin.h
+include/wx-2.5/wx/xrc/xh_sizer.h
+include/wx-2.5/wx/xrc/xh_slidr.h
+include/wx-2.5/wx/xrc/xh_spin.h
+include/wx-2.5/wx/xrc/xh_split.h
+include/wx-2.5/wx/xrc/xh_statbar.h
+include/wx-2.5/wx/xrc/xh_stbmp.h
+include/wx-2.5/wx/xrc/xh_stbox.h
+include/wx-2.5/wx/xrc/xh_stlin.h
+include/wx-2.5/wx/xrc/xh_sttxt.h
+include/wx-2.5/wx/xrc/xh_text.h
+include/wx-2.5/wx/xrc/xh_tglbtn.h
+include/wx-2.5/wx/xrc/xh_toolb.h
+include/wx-2.5/wx/xrc/xh_tree.h
+include/wx-2.5/wx/xrc/xh_unkwn.h
+include/wx-2.5/wx/xrc/xh_wizrd.h
+include/wx-2.5/wx/xrc/xmlres.h
+include/wx-2.5/wx/xti.h
+include/wx-2.5/wx/xtistrm.h
+include/wx-2.5/wx/xtixml.h
+include/wx-2.5/wx/zipstrm.h
+include/wx-2.5/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -446,10 +489,12 @@ share/wx/2.5/gs_afm/Zapf.afm
@dirrm share/wx/2.5/afm
@dirrm share/wx/2.5
@dirrm share/wx
-@dirrm include/wx/xml
-@dirrm include/wx/unix
-@dirrm include/wx/protocol
-@dirrm include/wx/html
-@dirrm include/wx/gtk
-@dirrm include/wx/generic
-@dirrm include/wx
+@dirrm include/wx-2.5/wx/xrc
+@dirrm include/wx-2.5/wx/xml
+@dirrm include/wx-2.5/wx/unix
+@dirrm include/wx-2.5/wx/protocol
+@dirrm include/wx-2.5/wx/html
+@dirrm include/wx-2.5/wx/gtk
+@dirrm include/wx-2.5/wx/generic
+@dirrm include/wx-2.5/wx
+@dirrm include/wx-2.5
diff --git a/x11-toolkits/wxgtk29-contrib-common/pkg-plist b/x11-toolkits/wxgtk29-contrib-common/pkg-plist
index 83e3768c0c17..49656f547325 100644
--- a/x11-toolkits/wxgtk29-contrib-common/pkg-plist
+++ b/x11-toolkits/wxgtk29-contrib-common/pkg-plist
@@ -1,108 +1,69 @@
-include/wx/animate/animate.h
-include/wx/deprecated/expr.h
-include/wx/deprecated/prop.h
-include/wx/deprecated/propform.h
-include/wx/deprecated/proplist.h
-include/wx/deprecated/resource.h
-include/wx/deprecated/setup.h
-include/wx/deprecated/tbarsmpl.h
-include/wx/deprecated/treelay.h
-include/wx/deprecated/wxexpr.h
-include/wx/fl/antiflickpl.h
-include/wx/fl/bardragpl.h
-include/wx/fl/barhintspl.h
-include/wx/fl/cbcustom.h
-include/wx/fl/controlbar.h
-include/wx/fl/dynbarhnd.h
-include/wx/fl/dyntbar.h
-include/wx/fl/dyntbarhnd.h
-include/wx/fl/fldefs.h
-include/wx/fl/frmview.h
-include/wx/fl/garbagec.h
-include/wx/fl/gcupdatesmgr.h
-include/wx/fl/hintanimpl.h
-include/wx/fl/newbmpbtn.h
-include/wx/fl/panedrawpl.h
-include/wx/fl/rowdragpl.h
-include/wx/fl/rowlayoutpl.h
-include/wx/fl/toolwnd.h
-include/wx/fl/updatesmgr.h
-include/wx/gizmos/dynamicsash.h
-include/wx/gizmos/editlbox.h
-include/wx/gizmos/gizmos.h
-include/wx/gizmos/ledctrl.h
-include/wx/gizmos/multicell.h
-include/wx/gizmos/splittree.h
-include/wx/gizmos/statpict.h
-include/wx/ogl/basic.h
-include/wx/ogl/basicp.h
-include/wx/ogl/bmpshape.h
-include/wx/ogl/canvas.h
-include/wx/ogl/composit.h
-include/wx/ogl/constrnt.h
-include/wx/ogl/divided.h
-include/wx/ogl/drawn.h
-include/wx/ogl/drawnp.h
-include/wx/ogl/lines.h
-include/wx/ogl/linesp.h
-include/wx/ogl/mfutils.h
-include/wx/ogl/misc.h
-include/wx/ogl/ogl.h
-include/wx/ogl/ogldiag.h
-include/wx/plot/plot.h
-include/wx/plot/plot_dwn.bmp
-include/wx/plot/plot_enl.bmp
-include/wx/plot/plot_shr.bmp
-include/wx/plot/plot_up.bmp
-include/wx/plot/plot_zin.bmp
-include/wx/plot/plot_zot.bmp
-include/wx/plot/wxplot.rc
-include/wx/stc/stc.h
-include/wx/svg/dcsvg.h
-include/wx/xrc/xh_all.h
-include/wx/xrc/xh_bmp.h
-include/wx/xrc/xh_bmpbt.h
-include/wx/xrc/xh_bttn.h
-include/wx/xrc/xh_cald.h
-include/wx/xrc/xh_chckb.h
-include/wx/xrc/xh_chckl.h
-include/wx/xrc/xh_choic.h
-include/wx/xrc/xh_combo.h
-include/wx/xrc/xh_dlg.h
-include/wx/xrc/xh_frame.h
-include/wx/xrc/xh_gauge.h
-include/wx/xrc/xh_gdctl.h
-include/wx/xrc/xh_html.h
-include/wx/xrc/xh_listb.h
-include/wx/xrc/xh_listc.h
-include/wx/xrc/xh_menu.h
-include/wx/xrc/xh_notbk.h
-include/wx/xrc/xh_panel.h
-include/wx/xrc/xh_radbt.h
-include/wx/xrc/xh_radbx.h
-include/wx/xrc/xh_scrol.h
-include/wx/xrc/xh_scwin.h
-include/wx/xrc/xh_sizer.h
-include/wx/xrc/xh_slidr.h
-include/wx/xrc/xh_spin.h
-include/wx/xrc/xh_split.h
-include/wx/xrc/xh_statbar.h
-include/wx/xrc/xh_stbmp.h
-include/wx/xrc/xh_stbox.h
-include/wx/xrc/xh_stlin.h
-include/wx/xrc/xh_sttxt.h
-include/wx/xrc/xh_text.h
-include/wx/xrc/xh_toolb.h
-include/wx/xrc/xh_tree.h
-include/wx/xrc/xh_unkwn.h
-include/wx/xrc/xh_wizrd.h
-include/wx/xrc/xmlres.h
-@dirrm include/wx/xrc
-@dirrm include/wx/svg
-@dirrm include/wx/stc
-@dirrm include/wx/plot
-@dirrm include/wx/ogl
-@dirrm include/wx/gizmos
-@dirrm include/wx/fl
-@dirrm include/wx/deprecated
-@dirrm include/wx/animate
+include/wx-2.5/wx/animate/animate.h
+include/wx-2.5/wx/deprecated/expr.h
+include/wx-2.5/wx/deprecated/prop.h
+include/wx-2.5/wx/deprecated/propform.h
+include/wx-2.5/wx/deprecated/proplist.h
+include/wx-2.5/wx/deprecated/resource.h
+include/wx-2.5/wx/deprecated/setup.h
+include/wx-2.5/wx/deprecated/tbarsmpl.h
+include/wx-2.5/wx/deprecated/treelay.h
+include/wx-2.5/wx/deprecated/wxexpr.h
+include/wx-2.5/wx/fl/antiflickpl.h
+include/wx-2.5/wx/fl/bardragpl.h
+include/wx-2.5/wx/fl/barhintspl.h
+include/wx-2.5/wx/fl/cbcustom.h
+include/wx-2.5/wx/fl/controlbar.h
+include/wx-2.5/wx/fl/dynbarhnd.h
+include/wx-2.5/wx/fl/dyntbar.h
+include/wx-2.5/wx/fl/dyntbarhnd.h
+include/wx-2.5/wx/fl/fldefs.h
+include/wx-2.5/wx/fl/frmview.h
+include/wx-2.5/wx/fl/garbagec.h
+include/wx-2.5/wx/fl/gcupdatesmgr.h
+include/wx-2.5/wx/fl/hintanimpl.h
+include/wx-2.5/wx/fl/newbmpbtn.h
+include/wx-2.5/wx/fl/panedrawpl.h
+include/wx-2.5/wx/fl/rowdragpl.h
+include/wx-2.5/wx/fl/rowlayoutpl.h
+include/wx-2.5/wx/fl/toolwnd.h
+include/wx-2.5/wx/fl/updatesmgr.h
+include/wx-2.5/wx/gizmos/dynamicsash.h
+include/wx-2.5/wx/gizmos/editlbox.h
+include/wx-2.5/wx/gizmos/gizmos.h
+include/wx-2.5/wx/gizmos/ledctrl.h
+include/wx-2.5/wx/gizmos/multicell.h
+include/wx-2.5/wx/gizmos/splittree.h
+include/wx-2.5/wx/gizmos/statpict.h
+include/wx-2.5/wx/ogl/basic.h
+include/wx-2.5/wx/ogl/basicp.h
+include/wx-2.5/wx/ogl/bmpshape.h
+include/wx-2.5/wx/ogl/canvas.h
+include/wx-2.5/wx/ogl/composit.h
+include/wx-2.5/wx/ogl/constrnt.h
+include/wx-2.5/wx/ogl/divided.h
+include/wx-2.5/wx/ogl/drawn.h
+include/wx-2.5/wx/ogl/drawnp.h
+include/wx-2.5/wx/ogl/lines.h
+include/wx-2.5/wx/ogl/linesp.h
+include/wx-2.5/wx/ogl/mfutils.h
+include/wx-2.5/wx/ogl/misc.h
+include/wx-2.5/wx/ogl/ogl.h
+include/wx-2.5/wx/ogl/ogldiag.h
+include/wx-2.5/wx/plot/plot.h
+include/wx-2.5/wx/plot/plot_dwn.bmp
+include/wx-2.5/wx/plot/plot_enl.bmp
+include/wx-2.5/wx/plot/plot_shr.bmp
+include/wx-2.5/wx/plot/plot_up.bmp
+include/wx-2.5/wx/plot/plot_zin.bmp
+include/wx-2.5/wx/plot/plot_zot.bmp
+include/wx-2.5/wx/plot/wxplot.rc
+include/wx-2.5/wx/stc/stc.h
+include/wx-2.5/wx/svg/dcsvg.h
+@dirrm include/wx-2.5/wx/svg
+@dirrm include/wx-2.5/wx/stc
+@dirrm include/wx-2.5/wx/plot
+@dirrm include/wx-2.5/wx/ogl
+@dirrm include/wx-2.5/wx/gizmos
+@dirrm include/wx-2.5/wx/fl
+@dirrm include/wx-2.5/wx/deprecated
+@dirrm include/wx-2.5/wx/animate
diff --git a/x11-toolkits/wxgtk29-contrib/Makefile b/x11-toolkits/wxgtk29-contrib/Makefile
index c5160c5916c2..4c36af733fab 100644
--- a/x11-toolkits/wxgtk29-contrib/Makefile
+++ b/x11-toolkits/wxgtk29-contrib/Makefile
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
diff --git a/x11-toolkits/wxgtk29-contrib/pkg-plist b/x11-toolkits/wxgtk29-contrib/pkg-plist
index 461abc2b13c2..1e6d7fa75aab 100644
--- a/x11-toolkits/wxgtk29-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-contrib/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2_animate-2.5.so
-lib/libwx_gtk2_animate-2.5.so.2
-lib/libwx_gtk2_animate-2.5.so.2.0.0
+lib/libwx_gtk2_animate-2.5.so.3
+lib/libwx_gtk2_animate-2.5.so.3.0.0
lib/libwx_gtk2_deprecated-2.5.so
-lib/libwx_gtk2_deprecated-2.5.so.2
-lib/libwx_gtk2_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2_deprecated-2.5.so.3
+lib/libwx_gtk2_deprecated-2.5.so.3.0.0
lib/libwx_gtk2_fl-2.5.so
-lib/libwx_gtk2_fl-2.5.so.2
-lib/libwx_gtk2_fl-2.5.so.2.0.0
+lib/libwx_gtk2_fl-2.5.so.3
+lib/libwx_gtk2_fl-2.5.so.3.0.0
lib/libwx_gtk2_gizmos-2.5.so
-lib/libwx_gtk2_gizmos-2.5.so.2
-lib/libwx_gtk2_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2_gizmos-2.5.so.3
+lib/libwx_gtk2_gizmos-2.5.so.3.0.0
lib/libwx_gtk2_ogl-2.5.so
-lib/libwx_gtk2_ogl-2.5.so.2
-lib/libwx_gtk2_ogl-2.5.so.2.0.0
+lib/libwx_gtk2_ogl-2.5.so.3
+lib/libwx_gtk2_ogl-2.5.so.3.0.0
lib/libwx_gtk2_plot-2.5.so
-lib/libwx_gtk2_plot-2.5.so.2
-lib/libwx_gtk2_plot-2.5.so.2.0.0
+lib/libwx_gtk2_plot-2.5.so.3
+lib/libwx_gtk2_plot-2.5.so.3.0.0
lib/libwx_gtk2_stc-2.5.so
-lib/libwx_gtk2_stc-2.5.so.2
-lib/libwx_gtk2_stc-2.5.so.2.0.0
+lib/libwx_gtk2_stc-2.5.so.3
+lib/libwx_gtk2_stc-2.5.so.3.0.0
lib/libwx_gtk2_svg-2.5.so
-lib/libwx_gtk2_svg-2.5.so.2
-lib/libwx_gtk2_svg-2.5.so.2.0.0
-lib/libwx_gtk2_xrc-2.5.so
-lib/libwx_gtk2_xrc-2.5.so.2
-lib/libwx_gtk2_xrc-2.5.so.2.0.0
+lib/libwx_gtk2_svg-2.5.so.3
+lib/libwx_gtk2_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk29-unicode/pkg-plist b/x11-toolkits/wxgtk29-unicode/pkg-plist
index 6df6b2921616..04a2c9b44b54 100644
--- a/x11-toolkits/wxgtk29-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode/pkg-plist
@@ -1,27 +1,24 @@
lib/libwx_gtk2u_animate-2.5.so
-lib/libwx_gtk2u_animate-2.5.so.2
-lib/libwx_gtk2u_animate-2.5.so.2.0.0
+lib/libwx_gtk2u_animate-2.5.so.3
+lib/libwx_gtk2u_animate-2.5.so.3.0.0
lib/libwx_gtk2u_deprecated-2.5.so
-lib/libwx_gtk2u_deprecated-2.5.so.2
-lib/libwx_gtk2u_deprecated-2.5.so.2.0.0
+lib/libwx_gtk2u_deprecated-2.5.so.3
+lib/libwx_gtk2u_deprecated-2.5.so.3.0.0
lib/libwx_gtk2u_fl-2.5.so
-lib/libwx_gtk2u_fl-2.5.so.2
-lib/libwx_gtk2u_fl-2.5.so.2.0.0
+lib/libwx_gtk2u_fl-2.5.so.3
+lib/libwx_gtk2u_fl-2.5.so.3.0.0
lib/libwx_gtk2u_gizmos-2.5.so
-lib/libwx_gtk2u_gizmos-2.5.so.2
-lib/libwx_gtk2u_gizmos-2.5.so.2.0.0
+lib/libwx_gtk2u_gizmos-2.5.so.3
+lib/libwx_gtk2u_gizmos-2.5.so.3.0.0
lib/libwx_gtk2u_ogl-2.5.so
-lib/libwx_gtk2u_ogl-2.5.so.2
-lib/libwx_gtk2u_ogl-2.5.so.2.0.0
+lib/libwx_gtk2u_ogl-2.5.so.3
+lib/libwx_gtk2u_ogl-2.5.so.3.0.0
lib/libwx_gtk2u_plot-2.5.so
-lib/libwx_gtk2u_plot-2.5.so.2
-lib/libwx_gtk2u_plot-2.5.so.2.0.0
+lib/libwx_gtk2u_plot-2.5.so.3
+lib/libwx_gtk2u_plot-2.5.so.3.0.0
lib/libwx_gtk2u_stc-2.5.so
-lib/libwx_gtk2u_stc-2.5.so.2
-lib/libwx_gtk2u_stc-2.5.so.2.0.0
+lib/libwx_gtk2u_stc-2.5.so.3
+lib/libwx_gtk2u_stc-2.5.so.3.0.0
lib/libwx_gtk2u_svg-2.5.so
-lib/libwx_gtk2u_svg-2.5.so.2
-lib/libwx_gtk2u_svg-2.5.so.2.0.0
-lib/libwx_gtk2u_xrc-2.5.so
-lib/libwx_gtk2u_xrc-2.5.so.2
-lib/libwx_gtk2u_xrc-2.5.so.2.0.0
+lib/libwx_gtk2u_svg-2.5.so.3
+lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 14e76d536b22..beb00c3158e9 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.2
-PORTREVISION?= 1
+PORTVERSION= 2.5.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -17,10 +16,11 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff \
- expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
+ jpeg.9:${PORTSDIR}/graphics/jpeg\
+ tiff.4:${PORTSDIR}/graphics/tiff\
+ expat.5:${PORTSDIR}/textproc/expat2\
+ mspack.1:${PORTSDIR}/archivers/libmspack
CONFLICTS= wxgtk-*
@@ -32,12 +32,13 @@ USE_ICONV= yes
USE_GNOME= gtk20
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libpng=sys \
- --with-libjpeg=sys \
- --with-libtiff=sys \
- --with-zlib=sys \
- --with-expat=sys \
- --with-opengl \
+CONFIGURE_ARGS= --with-libpng=sys\
+ --with-libjpeg=sys\
+ --with-libtiff=sys\
+ --with-zlib=sys\
+ --with-expat=sys\
+ --with-opengl\
+ --with-mspack\
--enable-gtk2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
@@ -51,7 +52,7 @@ NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -66,23 +67,23 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
.else
-LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
pre-configure:
- @${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+ @${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
.include <bsd.port.pre.mk>
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index 7c24033cdccf..ab4f811407f2 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.2.tar.bz2) = b45874428b0164bfa5bd1a5a11b3eb4a
-SIZE (wxGTK-2.5.2.tar.bz2) = 6579255
+MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
+SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index 966de5b3e9df..c9d72e6757c7 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon May 31 18:11:50 2004
-+++ Makefile.in Sun Jun 27 21:12:13 2004
+--- Makefile.in.orig Sun Oct 10 22:17:27 2004
++++ Makefile.in Wed Nov 24 22:47:40 2004
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,30 +8,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -6927,11 +6928,13 @@
+@@ -7408,11 +7409,13 @@
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__macos_res___depname) $(__cocoa_res___depname)
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)
--install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx
-+ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
++ (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
+
+install-common: $(__install_afm___depname) $(__install_gsafm___depname) locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-@@ -7371,8 +7374,7 @@
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+@@ -7892,9 +7895,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
-+ $(INSTALL_SCRIPT) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
index c8ae3832f26e..88e167a98f95 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-Makefile.in
@@ -1,19 +1,20 @@
---- contrib/src/Makefile.in.orig Mon May 31 18:12:16 2004
-+++ contrib/src/Makefile.in Mon Jun 28 00:28:54 2004
-@@ -1,15 +1,23 @@
- # $Id: Makefile.in,v 1.16 2003/08/17 12:48:18 VS Exp $
+--- contrib/src/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/Makefile.in Fri Nov 26 00:20:35 2004
+@@ -1,15 +1,24 @@
+ # $Id: Makefile.in,v 1.17 2004/09/24 15:32:58 VS Exp $
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg xrc deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg xrc deprecated animate #applet mmedia
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
-all:
++WX_RELEASE= @WX_RELEASE@
+@COND_UNICODE_1@wxregexu_depname= wxregexu
+
+all: $(wxregexu_depname)
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
+wxregexu:
-+ cd ../.. && $(MAKE) lib/libwxregexu.a
++ @cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a
+
clean:
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-animate-Makefile.in
index 4e5875295e52..abfc81a6176c 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-animate-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-animate-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/animate/Makefile.in.orig Sun Jun 27 21:38:11 2004
-+++ contrib/src/animate/Makefile.in Sun Jun 27 21:38:20 2004
-@@ -172,6 +172,8 @@
+--- contrib/src/animate/Makefile.in.orig Sun Oct 10 22:18:48 2004
++++ contrib/src/animate/Makefile.in Wed Nov 24 21:37:14 2004
+@@ -180,6 +180,8 @@
all: $(__animatedll___depname) $(__animatelib___depname)
install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/animate/animate.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-deprecated-Makefile.in
index 237d6931053c..0c492341ca53 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-deprecated-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-deprecated-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/deprecated/Makefile.in.orig Sun Jun 27 21:38:26 2004
-+++ contrib/src/deprecated/Makefile.in Sun Jun 27 21:38:52 2004
-@@ -199,6 +199,8 @@
+--- contrib/src/deprecated/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/deprecated/Makefile.in Wed Nov 24 21:39:56 2004
+@@ -207,6 +207,8 @@
all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
index 094280a521fc..2de711cc3b1f 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-fl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/fl/Makefile.in.orig Sun Jun 27 21:34:52 2004
-+++ contrib/src/fl/Makefile.in Sun Jun 27 21:35:37 2004
-@@ -203,6 +203,8 @@
+--- contrib/src/fl/Makefile.in.orig Sun Oct 10 22:18:49 2004
++++ contrib/src/fl/Makefile.in Wed Nov 24 21:40:16 2004
+@@ -211,6 +211,8 @@
all: $(__fldll___depname) $(__fllib___depname)
install: all $(__install_fldll___depname) $(__install_fllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
index fae5de6b9501..b6e204d0704a 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/gizmos/Makefile.in.orig Sun Jun 27 21:35:44 2004
-+++ contrib/src/gizmos/Makefile.in Sun Jun 27 21:35:55 2004
-@@ -181,6 +181,8 @@
+--- contrib/src/gizmos/Makefile.in.orig Sun Oct 10 22:18:50 2004
++++ contrib/src/gizmos/Makefile.in Wed Nov 24 21:40:37 2004
+@@ -189,6 +189,8 @@
all: $(__gizmosdll___depname) $(__gizmoslib___depname)
install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
index cb94093057e1..2be3bdbe7e1c 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-ogl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/ogl/Makefile.in.orig Sun Jun 27 22:44:07 2004
-+++ contrib/src/ogl/Makefile.in Sun Jun 27 22:44:25 2004
-@@ -193,6 +193,8 @@
+--- contrib/src/ogl/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/ogl/Makefile.in Wed Nov 24 21:41:00 2004
+@@ -201,6 +201,8 @@
all: $(__ogldll___depname) $(__ogllib___depname)
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
index 152bf7473082..802b4f093baa 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-plot-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/plot/Makefile.in.orig Sun Jun 27 21:36:28 2004
-+++ contrib/src/plot/Makefile.in Sun Jun 27 21:36:37 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/plot/Makefile.in.orig Sun Oct 10 22:18:52 2004
++++ contrib/src/plot/Makefile.in Wed Nov 24 21:41:16 2004
+@@ -179,6 +179,8 @@
all: $(__plotdll___depname) $(__plotlib___depname)
install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
index 5053151bf229..c41d5cbfec19 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/stc/Makefile.in.orig Sun Jun 27 21:36:48 2004
-+++ contrib/src/stc/Makefile.in Sun Jun 27 21:36:56 2004
-@@ -286,6 +286,8 @@
+--- contrib/src/stc/Makefile.in.orig Sun Oct 10 22:18:53 2004
++++ contrib/src/stc/Makefile.in Wed Nov 24 21:41:31 2004
+@@ -310,6 +310,8 @@
all: $(__stcdll___depname) $(__stclib___depname)
install: all $(__install_stcdll___depname) $(__install_stclib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/stc/stc.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
index e41c53fd4030..213aef13d42c 100644
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-contrib-src-svg-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/svg/Makefile.in.orig Sun Jun 27 21:37:03 2004
-+++ contrib/src/svg/Makefile.in Sun Jun 27 21:37:16 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/svg/Makefile.in.orig Sun Oct 10 22:18:54 2004
++++ contrib/src/svg/Makefile.in Wed Nov 24 21:41:44 2004
+@@ -179,6 +179,8 @@
all: $(__svgdll___depname) $(__svglib___depname)
install: all $(__install_svgdll___depname) $(__install_svglib___depname)
+
+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in wx/svg/dcsvg.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-xrc-Makefile.in b/x11-toolkits/wxgtk29/files/patch-contrib-src-xrc-Makefile.in
deleted file mode 100644
index aafcaa405758..000000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-xrc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/xrc/Makefile.in.orig Sun Jun 27 21:37:21 2004
-+++ contrib/src/xrc/Makefile.in Sun Jun 27 21:37:44 2004
-@@ -258,6 +258,8 @@
- all: $(__xrcdll___depname) $(__xrclib___depname)
-
- install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
-+
-+install-common:
- $(INSTALL_DIR) $(DESTDIR)$(includedir)
- for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
- if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h
new file mode 100644
index 000000000000..a8688e1069c0
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h
@@ -0,0 +1,14 @@
+--- src/regex/regcustom.h.orig Thu Nov 25 21:03:13 2004
++++ src/regex/regcustom.h Thu Nov 25 21:03:29 2004
+@@ -76,6 +76,11 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
+
+ /* internal character type and related */
diff --git a/x11-toolkits/wxgtk29/files/patch-src-regex-regex.h b/x11-toolkits/wxgtk29/files/patch-src-regex-regex.h
new file mode 100644
index 000000000000..01f1f176215f
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-src-regex-regex.h
@@ -0,0 +1,16 @@
+--- src/regex/regex.h.orig Thu Nov 25 21:02:55 2004
++++ src/regex/regex.h Thu Nov 25 21:03:06 2004
+@@ -115,7 +115,13 @@
+ #endif
+ #define __REG_NOFRONT /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x) x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
++
+
+ /*
+ * interface types etc.
diff --git a/x11-toolkits/wxgtk29/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk29/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..353821f40cfd
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,21 @@
+--- utils/wxrc/Makefile.in.orig Thu Nov 25 21:52:45 2004
++++ utils/wxrc/Makefile.in Thu Nov 25 21:58:43 2004
+@@ -28,6 +28,7 @@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ HOST_SUFFIX = @HOST_SUFFIX@
+@@ -113,9 +114,7 @@
+
+ @COND_USE_XRC_1@install_wxrc:
+ @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
+
+ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+ $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/x11-toolkits/wxgtk29/files/patch-wx-config.in b/x11-toolkits/wxgtk29/files/patch-wx-config.in
index 99fb6adf332c..0453477f8fbc 100644
--- a/x11-toolkits/wxgtk29/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk29/files/patch-wx-config.in
@@ -1,11 +1,11 @@
---- wx-config.in.orig Mon May 31 18:11:50 2004
-+++ wx-config.in Sun Jun 27 20:08:21 2004
-@@ -230,7 +230,7 @@
- includes=" -I${includedir}"
- fi
+--- wx-config.in.orig Sun Oct 10 22:17:27 2004
++++ wx-config.in Wed Nov 24 22:48:01 2004
+@@ -1014,7 +1014,7 @@
+ _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
+ fi
-- includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
-+ includes="-I${includedir}/wx/include/${TOOLCHAIN_NAME}$includes"
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
++_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
- # in inplace case we need to also add path to contrib headers -- do it
- # unconditionally as they might be used and we have no way of knowing if
+ # now without further ado, we can answer these too.
+ [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk29/pkg-plist b/x11-toolkits/wxgtk29/pkg-plist
index 0af111d8925e..3f401620305b 100644
--- a/x11-toolkits/wxgtk29/pkg-plist
+++ b/x11-toolkits/wxgtk29/pkg-plist
@@ -1,26 +1,29 @@
bin/wxgtk2-2.5-config
-include/wx/include/gtk2-2.5/wx/setup.h
+bin/wxrc-gtk2-2.5
+include/wx-2.5/gtk2-ansi-release-2.5/wx/setup.h
lib/libwx_base-2.5.so
-lib/libwx_base-2.5.so.2
-lib/libwx_base-2.5.so.2.0.0
+lib/libwx_base-2.5.so.3
+lib/libwx_base-2.5.so.3.0.0
lib/libwx_base_net-2.5.so
-lib/libwx_base_net-2.5.so.2
-lib/libwx_base_net-2.5.so.2.0.0
+lib/libwx_base_net-2.5.so.3
+lib/libwx_base_net-2.5.so.3.0.0
lib/libwx_base_xml-2.5.so
-lib/libwx_base_xml-2.5.so.2
-lib/libwx_base_xml-2.5.so.2.0.0
+lib/libwx_base_xml-2.5.so.3
+lib/libwx_base_xml-2.5.so.3.0.0
lib/libwx_gtk2_adv-2.5.so
-lib/libwx_gtk2_adv-2.5.so.2
-lib/libwx_gtk2_adv-2.5.so.2.0.0
+lib/libwx_gtk2_adv-2.5.so.3
+lib/libwx_gtk2_adv-2.5.so.3.0.0
lib/libwx_gtk2_core-2.5.so
-lib/libwx_gtk2_core-2.5.so.2
-lib/libwx_gtk2_core-2.5.so.2.0.0
+lib/libwx_gtk2_core-2.5.so.3
+lib/libwx_gtk2_core-2.5.so.3.0.0
lib/libwx_gtk2_gl-2.5.so
-lib/libwx_gtk2_gl-2.5.so.2
-lib/libwx_gtk2_gl-2.5.so.2.0.0
+lib/libwx_gtk2_gl-2.5.so.3
+lib/libwx_gtk2_gl-2.5.so.3.0.0
lib/libwx_gtk2_html-2.5.so
-lib/libwx_gtk2_html-2.5.so.2
-lib/libwx_gtk2_html-2.5.so.2.0.0
-@dirrm include/wx/include/gtk2-2.5/wx
-@dirrm include/wx/include/gtk2-2.5
-@dirrm include/wx/include
+lib/libwx_gtk2_html-2.5.so.3
+lib/libwx_gtk2_html-2.5.so.3.0.0
+lib/libwx_gtk2_xrc-2.5.so
+lib/libwx_gtk2_xrc-2.5.so.3
+lib/libwx_gtk2_xrc-2.5.so.3.0.0
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5/wx
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5