summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED7
-rw-r--r--databases/pgadmin3-12/Makefile8
-rw-r--r--databases/pgadmin3-12/files/patch-configure26
-rw-r--r--databases/pgadmin3/Makefile8
-rw-r--r--databases/pgadmin3/files/patch-configure26
-rw-r--r--devel/rapidsvn/Makefile8
-rw-r--r--x11-toolkits/Makefile14
-rw-r--r--x11-toolkits/wxgtk2-common-devel/Makefile14
-rw-r--r--x11-toolkits/wxgtk2-common-devel/pkg-plist500
-rw-r--r--x11-toolkits/wxgtk2-contrib-common-devel/Makefile14
-rw-r--r--x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist69
-rw-r--r--x11-toolkits/wxgtk2-contrib-devel/Makefile14
-rw-r--r--x11-toolkits/wxgtk2-contrib-devel/pkg-plist24
-rw-r--r--x11-toolkits/wxgtk2-devel/Makefile104
-rw-r--r--x11-toolkits/wxgtk2-devel/distinfo2
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-Makefile.in38
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-configure55
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-Makefile.in9
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in29
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-PlatWX.cpp11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-contrib-utils-Makefile.in12
-rw-r--r--x11-toolkits/wxgtk2-devel/files/patch-src-common-string.cpp20
-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.in11
-rw-r--r--x11-toolkits/wxgtk2-devel/pkg-descr4
-rw-r--r--x11-toolkits/wxgtk2-devel/pkg-plist29
-rw-r--r--x11-toolkits/wxgtk2-unicode-contrib-devel/Makefile18
-rw-r--r--x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist24
-rw-r--r--x11-toolkits/wxgtk2-unicode-devel/Makefile16
-rw-r--r--x11-toolkits/wxgtk2-unicode-devel/pkg-plist29
-rw-r--r--x11-toolkits/wxgtk2-utils-devel/Makefile23
-rw-r--r--x11-toolkits/wxgtk2-utils-devel/pkg-plist2
-rw-r--r--x11-toolkits/wxgtk26-common/Makefile6
-rw-r--r--x11-toolkits/wxgtk26-common/pkg-plist945
-rw-r--r--x11-toolkits/wxgtk26-contrib-common/Makefile6
-rw-r--r--x11-toolkits/wxgtk26-contrib-common/pkg-plist139
-rw-r--r--x11-toolkits/wxgtk26-contrib-utils/Makefile14
-rw-r--r--x11-toolkits/wxgtk26-contrib/Makefile6
-rw-r--r--x11-toolkits/wxgtk26-contrib/pkg-plist51
-rw-r--r--x11-toolkits/wxgtk26-unicode-contrib/Makefile8
-rw-r--r--x11-toolkits/wxgtk26-unicode-contrib/pkg-plist51
-rw-r--r--x11-toolkits/wxgtk26-unicode/Makefile12
-rw-r--r--x11-toolkits/wxgtk26-unicode/pkg-plist59
-rw-r--r--x11-toolkits/wxgtk26/Makefile26
-rw-r--r--x11-toolkits/wxgtk26/distinfo4
-rw-r--r--x11-toolkits/wxgtk26/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/wxgtk26/files/patch-configure26
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in12
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-stc-PlatWX.cpp11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-common-string.cpp20
-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-wx-config.in12
-rw-r--r--x11-toolkits/wxgtk26/pkg-plist64
-rw-r--r--x11-toolkits/wxgtk28-common/Makefile6
-rw-r--r--x11-toolkits/wxgtk28-common/pkg-plist945
-rw-r--r--x11-toolkits/wxgtk28-contrib-common/Makefile6
-rw-r--r--x11-toolkits/wxgtk28-contrib-common/pkg-plist139
-rw-r--r--x11-toolkits/wxgtk28-contrib/Makefile6
-rw-r--r--x11-toolkits/wxgtk28-contrib/pkg-plist51
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/Makefile8
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/pkg-plist51
-rw-r--r--x11-toolkits/wxgtk28-unicode/Makefile12
-rw-r--r--x11-toolkits/wxgtk28-unicode/pkg-plist59
-rw-r--r--x11-toolkits/wxgtk28/Makefile26
-rw-r--r--x11-toolkits/wxgtk28/distinfo4
-rw-r--r--x11-toolkits/wxgtk28/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/wxgtk28/files/patch-configure26
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in12
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-stc-PlatWX.cpp11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-common-string.cpp20
-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-wx-config.in12
-rw-r--r--x11-toolkits/wxgtk28/pkg-plist64
-rw-r--r--x11-toolkits/wxgtk29-common/Makefile6
-rw-r--r--x11-toolkits/wxgtk29-common/pkg-plist945
-rw-r--r--x11-toolkits/wxgtk29-contrib-common/Makefile6
-rw-r--r--x11-toolkits/wxgtk29-contrib-common/pkg-plist139
-rw-r--r--x11-toolkits/wxgtk29-contrib/Makefile6
-rw-r--r--x11-toolkits/wxgtk29-contrib/pkg-plist51
-rw-r--r--x11-toolkits/wxgtk29-unicode-contrib/Makefile8
-rw-r--r--x11-toolkits/wxgtk29-unicode-contrib/pkg-plist51
-rw-r--r--x11-toolkits/wxgtk29-unicode/Makefile12
-rw-r--r--x11-toolkits/wxgtk29-unicode/pkg-plist59
-rw-r--r--x11-toolkits/wxgtk29/Makefile26
-rw-r--r--x11-toolkits/wxgtk29/distinfo4
-rw-r--r--x11-toolkits/wxgtk29/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/wxgtk29/files/patch-configure26
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-gizmos-Makefile.in12
-rw-r--r--x11-toolkits/wxgtk29/files/patch-contrib-src-stc-PlatWX.cpp11
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-common-string.cpp20
-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-wx-config.in12
-rw-r--r--x11-toolkits/wxgtk29/pkg-plist64
106 files changed, 2220 insertions, 3613 deletions
diff --git a/MOVED b/MOVED
index 20da6651323c..bfed3347ea4f 100644
--- a/MOVED
+++ b/MOVED
@@ -1477,3 +1477,10 @@ x11-toolkits/wxgtk2-contrib|x11-toolkits/wxgtk24-contrib|2005-05-12|old wxgtk 2.
x11-toolkits/wxgtk2-unicode||2005-05-12|broken
x11-toolkits/wxgtk2-unicode-contrib||2005-05-12|broken
x11-toolkits/py-wxPython|x11-toolkits/py-wxPython24|2005-05-12|old wxgtk 2.4.2-based port renamed
+x11-toolkits/wxgtk2-common-devel|x11-toolkits/wxgtk26-common|2005-05-12|renamed
+x11-toolkits/wxgtk2-contrib-common-devel|x11-toolkits/wxgtk26-contrib-common|2005-05-12|renamed
+x11-toolkits/wxgtk2-contrib-devel|x11-toolkits/wxgtk26-contrib|2005-05-12|renamed
+x11-toolkits/wxgtk2-devel|x11-toolkits/wxgtk26|2005-05-12|renamed
+x11-toolkits/wxgtk2-unicode-contrib-devel|x11-toolkits/wxgtk26-unicode-contrib|2005-05-12|renamed
+x11-toolkits/wxgtk2-unicode-devel|x11-toolkits/wxgtk26-unicode|2005-05-12|renamed
+x11-toolkits/wxgtk2-utils-devel|x11-toolkits/wxgtk2-contrib-utils|2005-05-12|renamed
diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile
index b686a27ac685..5c28ed60ae70 100644
--- a/databases/pgadmin3-12/Makefile
+++ b/databases/pgadmin3-12/Makefile
@@ -34,16 +34,16 @@ pre-everything::
.endif
.if !defined(WITHOUT_UNICODE)
-LIB_DEPENDS+= wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
-CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.5-config
+LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
+CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.6-config
PKGNAMESUFFIX= -unicode
PKGMESSAGE= ${PKGDIR}/pkg-message-unicode
post-install:
@${CAT} ${PKGMESSAGE}
.else
-LIB_DEPENDS+= wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
-CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.5-config
+LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
+CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.6-config
.endif # WITHOUT_UNICODE
.include <bsd.port.post.mk>
diff --git a/databases/pgadmin3-12/files/patch-configure b/databases/pgadmin3-12/files/patch-configure
index ecf91d0e2b9d..18af8abfe59d 100644
--- a/databases/pgadmin3-12/files/patch-configure
+++ b/databases/pgadmin3-12/files/patch-configure
@@ -1,13 +1,23 @@
--- configure.orig Tue Nov 30 02:09:55 2004
-+++ configure Wed Jan 5 19:00:36 2005
-@@ -5175,6 +5175,10 @@
- LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
++++ configure Fri May 6 00:59:54 2005
+@@ -4996,6 +4996,9 @@
+ # Which version of wxWindows is this?
+ WX_VERSION=`${WX_CONFIG} --version`
+ case "${WX_VERSION}" in
++ 2.6*)
++ WX_VERSION="2.6"
++ ;;
+ 2.5*)
+ WX_VERSION="2.5"
+ ;;
+@@ -5173,6 +5176,10 @@
;;
-+ *wx_gtk2_core*)
-+ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}"
+ *wx_gtk2u_core*)
+ LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
- *wx_gtkud-*)
- LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}"
++ *wx_gtk2_core*)
++ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtkud-*)
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index b686a27ac685..5c28ed60ae70 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -34,16 +34,16 @@ pre-everything::
.endif
.if !defined(WITHOUT_UNICODE)
-LIB_DEPENDS+= wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
-CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.5-config
+LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
+CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.6-config
PKGNAMESUFFIX= -unicode
PKGMESSAGE= ${PKGDIR}/pkg-message-unicode
post-install:
@${CAT} ${PKGMESSAGE}
.else
-LIB_DEPENDS+= wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
-CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.5-config
+LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
+CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.6-config
.endif # WITHOUT_UNICODE
.include <bsd.port.post.mk>
diff --git a/databases/pgadmin3/files/patch-configure b/databases/pgadmin3/files/patch-configure
index ecf91d0e2b9d..18af8abfe59d 100644
--- a/databases/pgadmin3/files/patch-configure
+++ b/databases/pgadmin3/files/patch-configure
@@ -1,13 +1,23 @@
--- configure.orig Tue Nov 30 02:09:55 2004
-+++ configure Wed Jan 5 19:00:36 2005
-@@ -5175,6 +5175,10 @@
- LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
- LIBS="$LIBS $WX_NEW_LDFLAGS"
++++ configure Fri May 6 00:59:54 2005
+@@ -4996,6 +4996,9 @@
+ # Which version of wxWindows is this?
+ WX_VERSION=`${WX_CONFIG} --version`
+ case "${WX_VERSION}" in
++ 2.6*)
++ WX_VERSION="2.6"
++ ;;
+ 2.5*)
+ WX_VERSION="2.5"
+ ;;
+@@ -5173,6 +5176,10 @@
;;
-+ *wx_gtk2_core*)
-+ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}"
+ *wx_gtk2u_core*)
+ LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
- *wx_gtkud-*)
- LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}"
++ *wx_gtk2_core*)
++ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
+ *wx_gtkud-*)
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 98f04018271a..de8f6616b161 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -28,12 +28,12 @@ CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
INSTALLS_SHLIB= yes
MAN1= rapidsvn.1
-.if exists(${X11BASE}/bin/wxgtk2-2.5-config)
-WXPORT= wxgtk2-devel
-WXCONFIG= wxgtk2-2.5-config
+.if exists(${X11BASE}/bin/wxgtk2-2.6-config)
+WXPORT= wxgtk26
+WXCONFIG= wxgtk2-2.6-config
.else
WXPORT= wxgtk24
-WXCONFIG= wx-config
+WXCONFIG= wxgtk2-2.4-config
.endif
SVNDEP= ${LOCALBASE}/include/subversion-1/svn_types.h
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ec80dfadce8e..1688ef6b42e6 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -196,16 +196,16 @@
SUBDIR += viewklass
SUBDIR += vte
SUBDIR += wmapp
- SUBDIR += wxgtk2-common-devel
- SUBDIR += wxgtk2-contrib-common-devel
- SUBDIR += wxgtk2-contrib-devel
- SUBDIR += wxgtk2-devel
- SUBDIR += wxgtk2-unicode-contrib-devel
- SUBDIR += wxgtk2-unicode-devel
- SUBDIR += wxgtk2-utils-devel
SUBDIR += wxgtk24
SUBDIR += wxgtk24-contrib
SUBDIR += wxgtk24-docs
+ SUBDIR += wxgtk26
+ SUBDIR += wxgtk26-common
+ SUBDIR += wxgtk26-contrib
+ SUBDIR += wxgtk26-contrib-common
+ SUBDIR += wxgtk26-contrib-utils
+ SUBDIR += wxgtk26-unicode
+ SUBDIR += wxgtk26-unicode-contrib
SUBDIR += wxmozilla
SUBDIR += xbae
SUBDIR += xclasses
diff --git a/x11-toolkits/wxgtk2-common-devel/Makefile b/x11-toolkits/wxgtk2-common-devel/Makefile
deleted file mode 100644
index f4f254513409..000000000000
--- a/x11-toolkits/wxgtk2-common-devel/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# New ports collection makefile for: wxgtk2-common-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (devel version, common files)
-
-WXGTK_FLAVOR= gtk2-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk2-common-devel/pkg-plist b/x11-toolkits/wxgtk2-common-devel/pkg-plist
deleted file mode 100644
index f68eebf220d8..000000000000
--- a/x11-toolkits/wxgtk2-common-devel/pkg-plist
+++ /dev/null
@@ -1,500 +0,0 @@
-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
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-share/wx/2.5/afm/Cour.afm
-share/wx/2.5/afm/CourBo.afm
-share/wx/2.5/afm/CourBoO.afm
-share/wx/2.5/afm/CourO.afm
-share/wx/2.5/afm/Helv.afm
-share/wx/2.5/afm/HelvBo.afm
-share/wx/2.5/afm/HelvBoO.afm
-share/wx/2.5/afm/HelvO.afm
-share/wx/2.5/afm/TimesBo.afm
-share/wx/2.5/afm/TimesBoO.afm
-share/wx/2.5/afm/TimesO.afm
-share/wx/2.5/afm/TimesRo.afm
-share/wx/2.5/afm/Zapf.afm
-share/wx/2.5/gs_afm/Cour.afm
-share/wx/2.5/gs_afm/CourBo.afm
-share/wx/2.5/gs_afm/CourBoO.afm
-share/wx/2.5/gs_afm/CourO.afm
-share/wx/2.5/gs_afm/Helv.afm
-share/wx/2.5/gs_afm/HelvBo.afm
-share/wx/2.5/gs_afm/HelvBoO.afm
-share/wx/2.5/gs_afm/HelvO.afm
-share/wx/2.5/gs_afm/TimesBo.afm
-share/wx/2.5/gs_afm/TimesBoO.afm
-share/wx/2.5/gs_afm/TimesO.afm
-share/wx/2.5/gs_afm/TimesRo.afm
-share/wx/2.5/gs_afm/Zapf.afm
-@dirrm share/wx/2.5/gs_afm
-@dirrm share/wx/2.5/afm
-@dirrm share/wx/2.5
-@dirrm share/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/Makefile b/x11-toolkits/wxgtk2-contrib-common-devel/Makefile
deleted file mode 100644
index 8a04a418aff9..000000000000
--- a/x11-toolkits/wxgtk2-contrib-common-devel/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# New ports collection makefile for: wxgtk2-contrib-common-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, common files)
-
-WXGTK_FLAVOR= gtk2-contrib-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist b/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist
deleted file mode 100644
index 49656f547325..000000000000
--- a/x11-toolkits/wxgtk2-contrib-common-devel/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index 4c36af733fab..000000000000
--- a/x11-toolkits/wxgtk2-contrib-devel/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# New ports collection makefile for: wxgtk2-contrib-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
-
-WXGTK_FLAVOR= gtk2-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk2-contrib-devel/pkg-plist b/x11-toolkits/wxgtk2-contrib-devel/pkg-plist
deleted file mode 100644
index 1e6d7fa75aab..000000000000
--- a/x11-toolkits/wxgtk2-contrib-devel/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/libwx_gtk2_animate-2.5.so
-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.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.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.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.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.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.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.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
deleted file mode 100644
index beac69d10bff..000000000000
--- a/x11-toolkits/wxgtk2-devel/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# New ports collection makefile for: wxgtk2-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-PORTNAME= wx
-PORTVERSION= 2.5.3
-CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wxwindows
-PKGNAMESUFFIX= ${WXGTK_FLAVOR}-devel
-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\
- mspack.1:${PORTSDIR}/archivers/libmspack
-
-USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GL= yes
-USE_GMAKE= yes
-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\
- --with-mspack\
- --enable-gtk2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
- -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv \
- -L${X11BASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
-PLIST= ${.CURDIR}/pkg-plist
-NO_LATEST_LINK= yes
-
-WXGTK_FLAVOR?= gtk2
-
-.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 2
-CONFLICTS= wxgtk2-contrib-devel-2.5.2*
-.endif
-
-.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
-.endif
-
-.if ${WXGTK_FLAVOR:M*-common} != ""
-NO_BUILD= yes
-INSTALL_TARGET= install-common
-.else
-INSTALLS_SHLIB= yes
-.endif # *-common
-
-.if ${WXGTK_FLAVOR:M*-contrib*} != ""
-BUILD_WRKSRC= ${WRKSRC}/contrib
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-
-.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-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.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
-.else
-LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
-.endif
-
-pre-configure:
- @${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*} != ""
-.if ${OSVERSION} < 500000
-IGNORE= Systems prior to FreeBSD 5.0 currently out of support
-.else
-CONFIGURE_ARGS+=--enable-unicode
-.endif
-
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.5-config
-.else
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.5-config
-.endif # *-unicode*
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk2-devel/distinfo b/x11-toolkits/wxgtk2-devel/distinfo
deleted file mode 100644
index ab4f811407f2..000000000000
--- a/x11-toolkits/wxgtk2-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index c9d72e6757c7..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
- srcdir = @srcdir@
-@@ -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) $(__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_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_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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -7892,9 +7895,7 @@
-
- install-wxconfig:
- $(INSTALL_DIR) $(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-configure b/x11-toolkits/wxgtk2-devel/files/patch-configure
deleted file mode 100644
index ebac7a916f95..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.orig Mon May 31 18:11:50 2004
-+++ configure Sun Jun 27 20:13:50 2004
-@@ -32707,7 +32707,7 @@
- fi
- ;;
- *-*-freebsd*)
-- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+ THREAD_OPTS="$PTHREAD_LIBS"
- ;;
- *-*-darwin* | *-*-cygwin* )
- THREAD_OPTS=""
-@@ -32744,6 +32744,12 @@
- echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
- ;;
-
-+ -pthread|-l*)
-+ echo "$as_me:$LINENO: checking for the pthreads library $flag" >&5
-+echo $ECHO_N "checking for the pthreads library $flag... $ECHO_C" >&6
-+ THREADS_LINK="$flag"
-+ ;;
-+
- -*)
- echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
- echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
-@@ -34014,6 +34020,7 @@
- fi
- fi
- fi
-+TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}"
-
- if test "$WXGTK20" = 1 ; then
- cat >>confdefs.h <<_ACEOF
-@@ -34134,7 +34141,7 @@
- OPTIMISE="-O"
- fi
- fi
--
-+OPTIMISE=
-
- if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
- cat >>confdefs.h <<\_ACEOF
-@@ -40123,6 +40130,13 @@
-
- case "${BAKEFILE_HOST}" in
- *-*-linux* )
-+ SONAME_FLAG="-Wl,-soname,"
-+ USE_SOVERSION=1
-+ USE_SOVERLINUX=1
-+ USE_SOSYMLINKS=1
-+ ;;
-+
-+ *-*-freebsd* )
- SONAME_FLAG="-Wl,-soname,"
- USE_SOVERSION=1
- USE_SOVERLINUX=1
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-Makefile.in
deleted file mode 100644
index 20b4b5800f89..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- contrib/Makefile.in.orig Sun Jun 27 21:46:24 2004
-+++ contrib/Makefile.in Sun Jun 27 21:46:44 2004
-@@ -16,3 +16,6 @@
-
- install:
- cd src; $(MAKE) install
-+
-+install-common:
-+ cd src; $(MAKE) install-common
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in
deleted file mode 100644
index 88e167a98f95..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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 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-$(WX_RELEASE).a
-+
- clean:
- @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
-
- install:
- @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done
-+
-+install-common:
-+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done
-
- uninstall:
- @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); 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
deleted file mode 100644
index abfc81a6176c..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-animate-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/animate/animate.h; do \
- 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
deleted file mode 100644
index 0c492341ca53..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-deprecated-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/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)/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
deleted file mode 100644
index 2de711cc3b1f..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-fl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/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)/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
deleted file mode 100644
index b6e204d0704a..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-gizmos-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/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)/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
deleted file mode 100644
index 2be3bdbe7e1c..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-ogl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/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)/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
deleted file mode 100644
index 802b4f093baa..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-plot-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/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)/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
deleted file mode 100644
index c41d5cbfec19..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/stc/stc.h; do \
- 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-PlatWX.cpp b/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-PlatWX.cpp
deleted file mode 100644
index 3b9e39008930..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-stc-PlatWX.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/stc/PlatWX.cpp.orig Sun Aug 15 14:41:28 2004
-+++ contrib/src/stc/PlatWX.cpp Sun Aug 15 14:40:11 2004
-@@ -18,7 +18,7 @@
- #include "wx/stc/stc.h"
-
-
--#ifdef __WXGTK__
-+#if 0
- #include <gtk/gtk.h>
- #endif
-
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
deleted file mode 100644
index 213aef13d42c..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-src-svg-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
- for f in wx/svg/dcsvg.h; do \
- if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-contrib-utils-Makefile.in b/x11-toolkits/wxgtk2-devel/files/patch-contrib-utils-Makefile.in
deleted file mode 100644
index acbcfacb0b56..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-contrib-utils-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- contrib/utils/Makefile.in.orig Mon Jun 28 03:47:07 2004
-+++ contrib/utils/Makefile.in Mon Jun 28 03:47:23 2004
-@@ -5,6 +5,9 @@
- all:
- @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE)); done
-
-+install:
-+ @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE) install); done
-+
- clean:
- @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE) clean); done
-
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-src-common-string.cpp b/x11-toolkits/wxgtk2-devel/files/patch-src-common-string.cpp
deleted file mode 100644
index f88da4cc4be9..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-src-common-string.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/string.cpp.orig Mon Feb 21 15:53:48 2005
-+++ src/common/string.cpp Tue Feb 22 01:39:54 2005
-@@ -39,6 +39,7 @@
- #endif
-
- #include <ctype.h>
-+#include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-
-@@ -1956,6 +1957,9 @@
- // ok, there was enough space
- break;
- }
-+
-+ if (errno != EOVERFLOW)
-+ break;
-
- // still not enough, double it again
- size *= 2;
diff --git a/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h
deleted file mode 100644
index a8688e1069c0..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regcustom.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 01f1f176215f..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-src-regex-regex.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index 353821f40cfd..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-utils-wxrc-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 0453477f8fbc..000000000000
--- a/x11-toolkits/wxgtk2-devel/files/patch-wx-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-
--_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@")
-
- # now without further ado, we can answer these too.
- [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk2-devel/pkg-descr b/x11-toolkits/wxgtk2-devel/pkg-descr
deleted file mode 100644
index 67f1f41d315b..000000000000
--- a/x11-toolkits/wxgtk2-devel/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-wxWidgets (formerly known as wxWindows) is a C++ GUI framework for platform
-independent software development. On FreeBSD the Gtk toolkit is used.
-
-WWW: http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk2-devel/pkg-plist b/x11-toolkits/wxgtk2-devel/pkg-plist
deleted file mode 100644
index 3f401620305b..000000000000
--- a/x11-toolkits/wxgtk2-devel/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/wxgtk2-2.5-config
-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.3
-lib/libwx_base-2.5.so.3.0.0
-lib/libwx_base_net-2.5.so
-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.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.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.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.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.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/Makefile b/x11-toolkits/wxgtk2-unicode-contrib-devel/Makefile
deleted file mode 100644
index dd89483e1c61..000000000000
--- a/x11-toolkits/wxgtk2-unicode-contrib-devel/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-PORTREVISION= 2
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
-
-CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
-
-WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist b/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist
deleted file mode 100644
index 04a2c9b44b54..000000000000
--- a/x11-toolkits/wxgtk2-unicode-contrib-devel/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
diff --git a/x11-toolkits/wxgtk2-unicode-devel/Makefile b/x11-toolkits/wxgtk2-unicode-devel/Makefile
deleted file mode 100644
index c66db0237733..000000000000
--- a/x11-toolkits/wxgtk2-unicode-devel/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for: wxgtk2-unicode-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-PORTREVISION= 2
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (devel version, Unicode)
-
-WXGTK_FLAVOR= gtk2-unicode
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk2-unicode-devel/pkg-plist b/x11-toolkits/wxgtk2-unicode-devel/pkg-plist
deleted file mode 100644
index 3fbfc72e986b..000000000000
--- a/x11-toolkits/wxgtk2-unicode-devel/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/wxgtk2u-2.5-config
-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.3
-lib/libwx_baseu-2.5.so.3.0.0
-lib/libwx_baseu_net-2.5.so
-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.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.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.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.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.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
deleted file mode 100644
index e489845a784b..000000000000
--- a/x11-toolkits/wxgtk2-utils-devel/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for: wxgtk2-utils-devel
-# Date created: June 27, 2004
-# Whom: fjoe@FreeBSD.ORG
-#
-# $FreeBSD$
-#
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit utils (devel version)
-
-.if defined(WITH_UNICODE)
-WXGTK_FLAVOR= gtk2-unicode-utils
-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.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
-.endif
-
-BUILD_WRKSRC= ${WRKSRC}/contrib/utils
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk2-utils-devel/pkg-plist b/x11-toolkits/wxgtk2-utils-devel/pkg-plist
deleted file mode 100644
index b1daae745572..000000000000
--- a/x11-toolkits/wxgtk2-utils-devel/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/convertrc
-bin/wxrcedit
diff --git a/x11-toolkits/wxgtk26-common/Makefile b/x11-toolkits/wxgtk26-common/Makefile
index f4f254513409..1bdbb9c01952 100644
--- a/x11-toolkits/wxgtk26-common/Makefile
+++ b/x11-toolkits/wxgtk26-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-common-devel
+# New ports collection makefile for: wxgtk26-common
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (devel version, common files)
+COMMENT= The wxWidgets GUI toolkit (common files)
WXGTK_FLAVOR= gtk2-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-common/pkg-plist b/x11-toolkits/wxgtk26-common/pkg-plist
index f68eebf220d8..2cfee8986833 100644
--- a/x11-toolkits/wxgtk26-common/pkg-plist
+++ b/x11-toolkits/wxgtk26-common/pkg-plist
@@ -1,442 +1,460 @@
-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
+include/wx-2.6/wx/accel.h
+include/wx-2.6/wx/access.h
+include/wx-2.6/wx/afterstd.h
+include/wx-2.6/wx/app.h
+include/wx-2.6/wx/apptrait.h
+include/wx-2.6/wx/archive.h
+include/wx-2.6/wx/arrimpl.cpp
+include/wx-2.6/wx/arrstr.h
+include/wx-2.6/wx/artprov.h
+include/wx-2.6/wx/beforestd.h
+include/wx-2.6/wx/bitmap.h
+include/wx-2.6/wx/bmpbuttn.h
+include/wx-2.6/wx/bookctrl.h
+include/wx-2.6/wx/brush.h
+include/wx-2.6/wx/buffer.h
+include/wx-2.6/wx/build.h
+include/wx-2.6/wx/busyinfo.h
+include/wx-2.6/wx/button.h
+include/wx-2.6/wx/calctrl.h
+include/wx-2.6/wx/caret.h
+include/wx-2.6/wx/checkbox.h
+include/wx-2.6/wx/checklst.h
+include/wx-2.6/wx/chkconf.h
+include/wx-2.6/wx/choicdlg.h
+include/wx-2.6/wx/choice.h
+include/wx-2.6/wx/choicebk.h
+include/wx-2.6/wx/clipbrd.h
+include/wx-2.6/wx/clntdata.h
+include/wx-2.6/wx/cmdline.h
+include/wx-2.6/wx/cmdproc.h
+include/wx-2.6/wx/cmndata.h
+include/wx-2.6/wx/colordlg.h
+include/wx-2.6/wx/colour.h
+include/wx-2.6/wx/combobox.h
+include/wx-2.6/wx/confbase.h
+include/wx-2.6/wx/config.h
+include/wx-2.6/wx/containr.h
+include/wx-2.6/wx/control.h
+include/wx-2.6/wx/cshelp.h
+include/wx-2.6/wx/ctrlsub.h
+include/wx-2.6/wx/cursor.h
+include/wx-2.6/wx/dataobj.h
+include/wx-2.6/wx/datectrl.h
+include/wx-2.6/wx/dateevt.h
+include/wx-2.6/wx/datetime.h
+include/wx-2.6/wx/datetime.inl
+include/wx-2.6/wx/datstrm.h
+include/wx-2.6/wx/db.h
+include/wx-2.6/wx/dbgrid.h
+include/wx-2.6/wx/dbkeyg.h
+include/wx-2.6/wx/dbtable.h
+include/wx-2.6/wx/dc.h
+include/wx-2.6/wx/dcbuffer.h
+include/wx-2.6/wx/dcclient.h
+include/wx-2.6/wx/dcmemory.h
+include/wx-2.6/wx/dcmirror.h
+include/wx-2.6/wx/dcprint.h
+include/wx-2.6/wx/dcps.h
+include/wx-2.6/wx/dcscreen.h
+include/wx-2.6/wx/dde.h
+include/wx-2.6/wx/debug.h
+include/wx-2.6/wx/debugrpt.h
+include/wx-2.6/wx/defs.h
+include/wx-2.6/wx/dialog.h
+include/wx-2.6/wx/dialup.h
+include/wx-2.6/wx/dir.h
+include/wx-2.6/wx/dirctrl.h
+include/wx-2.6/wx/dirdlg.h
+include/wx-2.6/wx/display.h
+include/wx-2.6/wx/dlimpexp.h
+include/wx-2.6/wx/dnd.h
+include/wx-2.6/wx/docmdi.h
+include/wx-2.6/wx/docview.h
+include/wx-2.6/wx/dragimag.h
+include/wx-2.6/wx/dynarray.h
+include/wx-2.6/wx/dynlib.h
+include/wx-2.6/wx/dynload.h
+include/wx-2.6/wx/effects.h
+include/wx-2.6/wx/encconv.h
+include/wx-2.6/wx/encinfo.h
+include/wx-2.6/wx/event.h
+include/wx-2.6/wx/evtloop.h
+include/wx-2.6/wx/except.h
+include/wx-2.6/wx/fdrepdlg.h
+include/wx-2.6/wx/features.h
+include/wx-2.6/wx/ffile.h
+include/wx-2.6/wx/file.h
+include/wx-2.6/wx/fileconf.h
+include/wx-2.6/wx/filedlg.h
+include/wx-2.6/wx/filefn.h
+include/wx-2.6/wx/filename.h
+include/wx-2.6/wx/filesys.h
+include/wx-2.6/wx/fmappriv.h
+include/wx-2.6/wx/font.h
+include/wx-2.6/wx/fontdlg.h
+include/wx-2.6/wx/fontenc.h
+include/wx-2.6/wx/fontenum.h
+include/wx-2.6/wx/fontmap.h
+include/wx-2.6/wx/fontutil.h
+include/wx-2.6/wx/frame.h
+include/wx-2.6/wx/fs_inet.h
+include/wx-2.6/wx/fs_mem.h
+include/wx-2.6/wx/fs_zip.h
+include/wx-2.6/wx/gauge.h
+include/wx-2.6/wx/gbsizer.h
+include/wx-2.6/wx/gdicmn.h
+include/wx-2.6/wx/gdiobj.h
+include/wx-2.6/wx/generic/accel.h
+include/wx-2.6/wx/generic/calctrl.h
+include/wx-2.6/wx/generic/caret.h
+include/wx-2.6/wx/generic/choicdgg.h
+include/wx-2.6/wx/generic/colrdlgg.h
+include/wx-2.6/wx/generic/datectrl.h
+include/wx-2.6/wx/generic/dcpsg.h
+include/wx-2.6/wx/generic/dirctrlg.h
+include/wx-2.6/wx/generic/dirdlgg.h
+include/wx-2.6/wx/generic/dragimgg.h
+include/wx-2.6/wx/generic/fdrepdlg.h
+include/wx-2.6/wx/generic/filedlgg.h
+include/wx-2.6/wx/generic/fontdlgg.h
+include/wx-2.6/wx/generic/grid.h
+include/wx-2.6/wx/generic/gridctrl.h
+include/wx-2.6/wx/generic/gridsel.h
+include/wx-2.6/wx/generic/helpext.h
+include/wx-2.6/wx/generic/imaglist.h
+include/wx-2.6/wx/generic/laywin.h
+include/wx-2.6/wx/generic/listctrl.h
+include/wx-2.6/wx/generic/logg.h
+include/wx-2.6/wx/generic/msgdlgg.h
+include/wx-2.6/wx/generic/notebook.h
+include/wx-2.6/wx/generic/numdlgg.h
+include/wx-2.6/wx/generic/paletteg.h
+include/wx-2.6/wx/generic/panelg.h
+include/wx-2.6/wx/generic/printps.h
+include/wx-2.6/wx/generic/prntdlgg.h
+include/wx-2.6/wx/generic/progdlgg.h
+include/wx-2.6/wx/generic/propdlg.h
+include/wx-2.6/wx/generic/sashwin.h
+include/wx-2.6/wx/generic/scrolwin.h
+include/wx-2.6/wx/generic/spinctlg.h
+include/wx-2.6/wx/generic/splash.h
+include/wx-2.6/wx/generic/splitter.h
+include/wx-2.6/wx/generic/statusbr.h
+include/wx-2.6/wx/generic/tabg.h
+include/wx-2.6/wx/generic/textdlgg.h
+include/wx-2.6/wx/generic/timer.h
+include/wx-2.6/wx/generic/treectlg.h
+include/wx-2.6/wx/generic/wizard.h
+include/wx-2.6/wx/geometry.h
+include/wx-2.6/wx/gifdecod.h
+include/wx-2.6/wx/glcanvas.h
+include/wx-2.6/wx/grid.h
+include/wx-2.6/wx/gsocket.h
+include/wx-2.6/wx/gtk/accel.h
+include/wx-2.6/wx/gtk/app.h
+include/wx-2.6/wx/gtk/bitmap.h
+include/wx-2.6/wx/gtk/bmpbuttn.h
+include/wx-2.6/wx/gtk/brush.h
+include/wx-2.6/wx/gtk/button.h
+include/wx-2.6/wx/gtk/checkbox.h
+include/wx-2.6/wx/gtk/checklst.h
+include/wx-2.6/wx/gtk/choice.h
+include/wx-2.6/wx/gtk/clipbrd.h
+include/wx-2.6/wx/gtk/colordlg.h
+include/wx-2.6/wx/gtk/colour.h
+include/wx-2.6/wx/gtk/combobox.h
+include/wx-2.6/wx/gtk/control.h
+include/wx-2.6/wx/gtk/cursor.h
+include/wx-2.6/wx/gtk/dataform.h
+include/wx-2.6/wx/gtk/dataobj.h
+include/wx-2.6/wx/gtk/dataobj2.h
+include/wx-2.6/wx/gtk/dc.h
+include/wx-2.6/wx/gtk/dcclient.h
+include/wx-2.6/wx/gtk/dcmemory.h
+include/wx-2.6/wx/gtk/dcscreen.h
+include/wx-2.6/wx/gtk/dialog.h
+include/wx-2.6/wx/gtk/dnd.h
+include/wx-2.6/wx/gtk/filedlg.h
+include/wx-2.6/wx/gtk/font.h
+include/wx-2.6/wx/gtk/fontdlg.h
+include/wx-2.6/wx/gtk/frame.h
+include/wx-2.6/wx/gtk/gauge.h
+include/wx-2.6/wx/gtk/gdiobj.h
+include/wx-2.6/wx/gtk/glcanvas.h
+include/wx-2.6/wx/gtk/gnome/gprint.h
+include/wx-2.6/wx/gtk/icon.h
+include/wx-2.6/wx/gtk/listbox.h
+include/wx-2.6/wx/gtk/mdi.h
+include/wx-2.6/wx/gtk/menu.h
+include/wx-2.6/wx/gtk/menuitem.h
+include/wx-2.6/wx/gtk/minifram.h
+include/wx-2.6/wx/gtk/msgdlg.h
+include/wx-2.6/wx/gtk/notebook.h
+include/wx-2.6/wx/gtk/pen.h
+include/wx-2.6/wx/gtk/popupwin.h
+include/wx-2.6/wx/gtk/radiobox.h
+include/wx-2.6/wx/gtk/radiobut.h
+include/wx-2.6/wx/gtk/region.h
+include/wx-2.6/wx/gtk/scrolbar.h
+include/wx-2.6/wx/gtk/scrolwin.h
+include/wx-2.6/wx/gtk/slider.h
+include/wx-2.6/wx/gtk/spinbutt.h
+include/wx-2.6/wx/gtk/spinctrl.h
+include/wx-2.6/wx/gtk/statbmp.h
+include/wx-2.6/wx/gtk/statbox.h
+include/wx-2.6/wx/gtk/statline.h
+include/wx-2.6/wx/gtk/stattext.h
+include/wx-2.6/wx/gtk/tbargtk.h
+include/wx-2.6/wx/gtk/textctrl.h
+include/wx-2.6/wx/gtk/tglbtn.h
+include/wx-2.6/wx/gtk/timer.h
+include/wx-2.6/wx/gtk/tooltip.h
+include/wx-2.6/wx/gtk/toplevel.h
+include/wx-2.6/wx/gtk/treectrl.h
+include/wx-2.6/wx/gtk/win_gtk.h
+include/wx-2.6/wx/gtk/window.h
+include/wx-2.6/wx/hash.h
+include/wx-2.6/wx/hashmap.h
+include/wx-2.6/wx/hashset.h
+include/wx-2.6/wx/help.h
+include/wx-2.6/wx/helpbase.h
+include/wx-2.6/wx/helphtml.h
+include/wx-2.6/wx/helpwin.h
+include/wx-2.6/wx/html/forcelnk.h
+include/wx-2.6/wx/html/helpctrl.h
+include/wx-2.6/wx/html/helpdata.h
+include/wx-2.6/wx/html/helpfrm.h
+include/wx-2.6/wx/html/htmlcell.h
+include/wx-2.6/wx/html/htmldefs.h
+include/wx-2.6/wx/html/htmlfilt.h
+include/wx-2.6/wx/html/htmlpars.h
+include/wx-2.6/wx/html/htmlproc.h
+include/wx-2.6/wx/html/htmltag.h
+include/wx-2.6/wx/html/htmlwin.h
+include/wx-2.6/wx/html/htmprint.h
+include/wx-2.6/wx/html/m_templ.h
+include/wx-2.6/wx/html/winpars.h
+include/wx-2.6/wx/htmllbox.h
+include/wx-2.6/wx/icon.h
+include/wx-2.6/wx/iconbndl.h
+include/wx-2.6/wx/iconloc.h
+include/wx-2.6/wx/imagbmp.h
+include/wx-2.6/wx/image.h
+include/wx-2.6/wx/imaggif.h
+include/wx-2.6/wx/imagiff.h
+include/wx-2.6/wx/imagjpeg.h
+include/wx-2.6/wx/imaglist.h
+include/wx-2.6/wx/imagpcx.h
+include/wx-2.6/wx/imagpng.h
+include/wx-2.6/wx/imagpnm.h
+include/wx-2.6/wx/imagtiff.h
+include/wx-2.6/wx/imagxpm.h
+include/wx-2.6/wx/init.h
+include/wx-2.6/wx/intl.h
+include/wx-2.6/wx/iosfwrap.h
+include/wx-2.6/wx/ioswrap.h
+include/wx-2.6/wx/ipc.h
+include/wx-2.6/wx/ipcbase.h
+include/wx-2.6/wx/isql.h
+include/wx-2.6/wx/isqlext.h
+include/wx-2.6/wx/joystick.h
+include/wx-2.6/wx/layout.h
+include/wx-2.6/wx/laywin.h
+include/wx-2.6/wx/list.h
+include/wx-2.6/wx/listbase.h
+include/wx-2.6/wx/listbook.h
+include/wx-2.6/wx/listbox.h
+include/wx-2.6/wx/listctrl.h
+include/wx-2.6/wx/listimpl.cpp
+include/wx-2.6/wx/log.h
+include/wx-2.6/wx/longlong.h
+include/wx-2.6/wx/math.h
+include/wx-2.6/wx/matrix.h
+include/wx-2.6/wx/mdi.h
+include/wx-2.6/wx/mediactrl.h
+include/wx-2.6/wx/memconf.h
+include/wx-2.6/wx/memory.h
+include/wx-2.6/wx/memtext.h
+include/wx-2.6/wx/menu.h
+include/wx-2.6/wx/menuitem.h
+include/wx-2.6/wx/metafile.h
+include/wx-2.6/wx/mimetype.h
+include/wx-2.6/wx/minifram.h
+include/wx-2.6/wx/module.h
+include/wx-2.6/wx/msgdlg.h
+include/wx-2.6/wx/msgout.h
+include/wx-2.6/wx/mstream.h
+include/wx-2.6/wx/notebook.h
+include/wx-2.6/wx/numdlg.h
+include/wx-2.6/wx/object.h
+include/wx-2.6/wx/ownerdrw.h
+include/wx-2.6/wx/palette.h
+include/wx-2.6/wx/panel.h
+include/wx-2.6/wx/paper.h
+include/wx-2.6/wx/pen.h
+include/wx-2.6/wx/platform.h
+include/wx-2.6/wx/popupwin.h
+include/wx-2.6/wx/print.h
+include/wx-2.6/wx/printdlg.h
+include/wx-2.6/wx/prntbase.h
+include/wx-2.6/wx/process.h
+include/wx-2.6/wx/progdlg.h
+include/wx-2.6/wx/propdlg.h
+include/wx-2.6/wx/protocol/file.h
+include/wx-2.6/wx/protocol/ftp.h
+include/wx-2.6/wx/protocol/http.h
+include/wx-2.6/wx/protocol/protocol.h
+include/wx-2.6/wx/ptr_scpd.h
+include/wx-2.6/wx/quantize.h
+include/wx-2.6/wx/radiobox.h
+include/wx-2.6/wx/radiobut.h
+include/wx-2.6/wx/rawbmp.h
+include/wx-2.6/wx/regex.h
+include/wx-2.6/wx/region.h
+include/wx-2.6/wx/renderer.h
+include/wx-2.6/wx/sashwin.h
+include/wx-2.6/wx/sckaddr.h
+include/wx-2.6/wx/sckipc.h
+include/wx-2.6/wx/sckstrm.h
+include/wx-2.6/wx/scopeguard.h
+include/wx-2.6/wx/scrolbar.h
+include/wx-2.6/wx/scrolwin.h
+include/wx-2.6/wx/selstore.h
+include/wx-2.6/wx/settings.h
+include/wx-2.6/wx/sizer.h
+include/wx-2.6/wx/slider.h
+include/wx-2.6/wx/snglinst.h
+include/wx-2.6/wx/socket.h
+include/wx-2.6/wx/sound.h
+include/wx-2.6/wx/spinbutt.h
+include/wx-2.6/wx/spinctrl.h
+include/wx-2.6/wx/splash.h
+include/wx-2.6/wx/splitter.h
+include/wx-2.6/wx/sstream.h
+include/wx-2.6/wx/stack.h
+include/wx-2.6/wx/stackwalk.h
+include/wx-2.6/wx/statbmp.h
+include/wx-2.6/wx/statbox.h
+include/wx-2.6/wx/statline.h
+include/wx-2.6/wx/stattext.h
+include/wx-2.6/wx/statusbr.h
+include/wx-2.6/wx/stdpaths.h
+include/wx-2.6/wx/stockitem.h
+include/wx-2.6/wx/stopwatch.h
+include/wx-2.6/wx/strconv.h
+include/wx-2.6/wx/stream.h
+include/wx-2.6/wx/string.h
+include/wx-2.6/wx/sysopt.h
+include/wx-2.6/wx/tab.h
+include/wx-2.6/wx/tabctrl.h
+include/wx-2.6/wx/taskbar.h
+include/wx-2.6/wx/tbarbase.h
+include/wx-2.6/wx/textbuf.h
+include/wx-2.6/wx/textctrl.h
+include/wx-2.6/wx/textdlg.h
+include/wx-2.6/wx/textfile.h
+include/wx-2.6/wx/tglbtn.h
+include/wx-2.6/wx/thread.h
+include/wx-2.6/wx/thrimpl.cpp
+include/wx-2.6/wx/timer.h
+include/wx-2.6/wx/tipdlg.h
+include/wx-2.6/wx/tipwin.h
+include/wx-2.6/wx/tokenzr.h
+include/wx-2.6/wx/toolbar.h
+include/wx-2.6/wx/tooltip.h
+include/wx-2.6/wx/toplevel.h
+include/wx-2.6/wx/treebase.h
+include/wx-2.6/wx/treectrl.h
+include/wx-2.6/wx/txtstrm.h
+include/wx-2.6/wx/types.h
+include/wx-2.6/wx/unix/apptbase.h
+include/wx-2.6/wx/unix/apptrait.h
+include/wx-2.6/wx/unix/displayx11.h
+include/wx-2.6/wx/unix/execute.h
+include/wx-2.6/wx/unix/fontutil.h
+include/wx-2.6/wx/unix/gsockunx.h
+include/wx-2.6/wx/unix/joystick.h
+include/wx-2.6/wx/unix/mimetype.h
+include/wx-2.6/wx/unix/pipe.h
+include/wx-2.6/wx/unix/sound.h
+include/wx-2.6/wx/unix/stackwalk.h
+include/wx-2.6/wx/unix/stdpaths.h
+include/wx-2.6/wx/unix/taskbarx11.h
+include/wx-2.6/wx/unix/utilsx11.h
+include/wx-2.6/wx/uri.h
+include/wx-2.6/wx/url.h
+include/wx-2.6/wx/utils.h
+include/wx-2.6/wx/valgen.h
+include/wx-2.6/wx/validate.h
+include/wx-2.6/wx/valtext.h
+include/wx-2.6/wx/variant.h
+include/wx-2.6/wx/vector.h
+include/wx-2.6/wx/version.h
+include/wx-2.6/wx/vidmode.h
+include/wx-2.6/wx/vlbox.h
+include/wx-2.6/wx/vms_x_fix.h
+include/wx-2.6/wx/volume.h
+include/wx-2.6/wx/vscroll.h
+include/wx-2.6/wx/wave.h
+include/wx-2.6/wx/wfstream.h
+include/wx-2.6/wx/window.h
+include/wx-2.6/wx/wizard.h
+include/wx-2.6/wx/wx.h
+include/wx-2.6/wx/wxchar.h
+include/wx-2.6/wx/wxhtml.h
+include/wx-2.6/wx/wxprec.h
+include/wx-2.6/wx/xml/xml.h
+include/wx-2.6/wx/xpmdecod.h
+include/wx-2.6/wx/xpmhand.h
+include/wx-2.6/wx/xrc/xh_all.h
+include/wx-2.6/wx/xrc/xh_bmp.h
+include/wx-2.6/wx/xrc/xh_bmpbt.h
+include/wx-2.6/wx/xrc/xh_bttn.h
+include/wx-2.6/wx/xrc/xh_cald.h
+include/wx-2.6/wx/xrc/xh_chckb.h
+include/wx-2.6/wx/xrc/xh_chckl.h
+include/wx-2.6/wx/xrc/xh_choic.h
+include/wx-2.6/wx/xrc/xh_choicbk.h
+include/wx-2.6/wx/xrc/xh_combo.h
+include/wx-2.6/wx/xrc/xh_datectrl.h
+include/wx-2.6/wx/xrc/xh_dlg.h
+include/wx-2.6/wx/xrc/xh_frame.h
+include/wx-2.6/wx/xrc/xh_gauge.h
+include/wx-2.6/wx/xrc/xh_gdctl.h
+include/wx-2.6/wx/xrc/xh_html.h
+include/wx-2.6/wx/xrc/xh_listb.h
+include/wx-2.6/wx/xrc/xh_listbk.h
+include/wx-2.6/wx/xrc/xh_listc.h
+include/wx-2.6/wx/xrc/xh_mdi.h
+include/wx-2.6/wx/xrc/xh_menu.h
+include/wx-2.6/wx/xrc/xh_notbk.h
+include/wx-2.6/wx/xrc/xh_panel.h
+include/wx-2.6/wx/xrc/xh_radbt.h
+include/wx-2.6/wx/xrc/xh_radbx.h
+include/wx-2.6/wx/xrc/xh_scrol.h
+include/wx-2.6/wx/xrc/xh_scwin.h
+include/wx-2.6/wx/xrc/xh_sizer.h
+include/wx-2.6/wx/xrc/xh_slidr.h
+include/wx-2.6/wx/xrc/xh_spin.h
+include/wx-2.6/wx/xrc/xh_split.h
+include/wx-2.6/wx/xrc/xh_statbar.h
+include/wx-2.6/wx/xrc/xh_stbmp.h
+include/wx-2.6/wx/xrc/xh_stbox.h
+include/wx-2.6/wx/xrc/xh_stlin.h
+include/wx-2.6/wx/xrc/xh_sttxt.h
+include/wx-2.6/wx/xrc/xh_text.h
+include/wx-2.6/wx/xrc/xh_tglbtn.h
+include/wx-2.6/wx/xrc/xh_toolb.h
+include/wx-2.6/wx/xrc/xh_tree.h
+include/wx-2.6/wx/xrc/xh_unkwn.h
+include/wx-2.6/wx/xrc/xh_wizrd.h
+include/wx-2.6/wx/xrc/xmlres.h
+include/wx-2.6/wx/xti.h
+include/wx-2.6/wx/xtistrm.h
+include/wx-2.6/wx/xtixml.h
+include/wx-2.6/wx/zipstrm.h
+include/wx-2.6/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -459,42 +477,13 @@ share/locale/tr/LC_MESSAGES/wxstd.mo
share/locale/uk/LC_MESSAGES/wxstd.mo
share/locale/zh_CN/LC_MESSAGES/wxstd.mo
share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-share/wx/2.5/afm/Cour.afm
-share/wx/2.5/afm/CourBo.afm
-share/wx/2.5/afm/CourBoO.afm
-share/wx/2.5/afm/CourO.afm
-share/wx/2.5/afm/Helv.afm
-share/wx/2.5/afm/HelvBo.afm
-share/wx/2.5/afm/HelvBoO.afm
-share/wx/2.5/afm/HelvO.afm
-share/wx/2.5/afm/TimesBo.afm
-share/wx/2.5/afm/TimesBoO.afm
-share/wx/2.5/afm/TimesO.afm
-share/wx/2.5/afm/TimesRo.afm
-share/wx/2.5/afm/Zapf.afm
-share/wx/2.5/gs_afm/Cour.afm
-share/wx/2.5/gs_afm/CourBo.afm
-share/wx/2.5/gs_afm/CourBoO.afm
-share/wx/2.5/gs_afm/CourO.afm
-share/wx/2.5/gs_afm/Helv.afm
-share/wx/2.5/gs_afm/HelvBo.afm
-share/wx/2.5/gs_afm/HelvBoO.afm
-share/wx/2.5/gs_afm/HelvO.afm
-share/wx/2.5/gs_afm/TimesBo.afm
-share/wx/2.5/gs_afm/TimesBoO.afm
-share/wx/2.5/gs_afm/TimesO.afm
-share/wx/2.5/gs_afm/TimesRo.afm
-share/wx/2.5/gs_afm/Zapf.afm
-@dirrm share/wx/2.5/gs_afm
-@dirrm share/wx/2.5/afm
-@dirrm share/wx/2.5
-@dirrm share/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
+@dirrm include/wx-2.6/wx/xrc
+@dirrm include/wx-2.6/wx/xml
+@dirrm include/wx-2.6/wx/unix
+@dirrm include/wx-2.6/wx/protocol
+@dirrm include/wx-2.6/wx/html
+@dirrm include/wx-2.6/wx/gtk/gnome
+@dirrm include/wx-2.6/wx/gtk
+@dirrm include/wx-2.6/wx/generic
+@dirrm include/wx-2.6/wx
+@dirrm include/wx-2.6
diff --git a/x11-toolkits/wxgtk26-contrib-common/Makefile b/x11-toolkits/wxgtk26-contrib-common/Makefile
index 8a04a418aff9..58d6c54ebe6c 100644
--- a/x11-toolkits/wxgtk26-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk26-contrib-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-contrib-common-devel
+# New ports collection makefile for: wxgtk26-contrib-common
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, common files)
+COMMENT= The wxWidgets GUI toolkit contributed libraries (common files)
WXGTK_FLAVOR= gtk2-contrib-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-contrib-common/pkg-plist b/x11-toolkits/wxgtk26-contrib-common/pkg-plist
index 49656f547325..d1b3bf27ac1a 100644
--- a/x11-toolkits/wxgtk26-contrib-common/pkg-plist
+++ b/x11-toolkits/wxgtk26-contrib-common/pkg-plist
@@ -1,69 +1,70 @@
-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
+include/wx-2.6/wx/animate/animate.h
+include/wx-2.6/wx/deprecated/expr.h
+include/wx-2.6/wx/deprecated/prop.h
+include/wx-2.6/wx/deprecated/propform.h
+include/wx-2.6/wx/deprecated/proplist.h
+include/wx-2.6/wx/deprecated/resource.h
+include/wx-2.6/wx/deprecated/setup.h
+include/wx-2.6/wx/deprecated/tbarsmpl.h
+include/wx-2.6/wx/deprecated/treelay.h
+include/wx-2.6/wx/deprecated/wxexpr.h
+include/wx-2.6/wx/fl/antiflickpl.h
+include/wx-2.6/wx/fl/bardragpl.h
+include/wx-2.6/wx/fl/barhintspl.h
+include/wx-2.6/wx/fl/cbcustom.h
+include/wx-2.6/wx/fl/controlbar.h
+include/wx-2.6/wx/fl/dynbarhnd.h
+include/wx-2.6/wx/fl/dyntbar.h
+include/wx-2.6/wx/fl/dyntbarhnd.h
+include/wx-2.6/wx/fl/fldefs.h
+include/wx-2.6/wx/fl/frmview.h
+include/wx-2.6/wx/fl/garbagec.h
+include/wx-2.6/wx/fl/gcupdatesmgr.h
+include/wx-2.6/wx/fl/hintanimpl.h
+include/wx-2.6/wx/fl/newbmpbtn.h
+include/wx-2.6/wx/fl/panedrawpl.h
+include/wx-2.6/wx/fl/rowdragpl.h
+include/wx-2.6/wx/fl/rowlayoutpl.h
+include/wx-2.6/wx/fl/toolwnd.h
+include/wx-2.6/wx/fl/updatesmgr.h
+include/wx-2.6/wx/gizmos/dynamicsash.h
+include/wx-2.6/wx/gizmos/editlbox.h
+include/wx-2.6/wx/gizmos/gizmos.h
+include/wx-2.6/wx/gizmos/ledctrl.h
+include/wx-2.6/wx/gizmos/multicell.h
+include/wx-2.6/wx/gizmos/splittree.h
+include/wx-2.6/wx/gizmos/statpict.h
+include/wx-2.6/wx/gizmos/xh_statpict.h
+include/wx-2.6/wx/ogl/basic.h
+include/wx-2.6/wx/ogl/basicp.h
+include/wx-2.6/wx/ogl/bmpshape.h
+include/wx-2.6/wx/ogl/canvas.h
+include/wx-2.6/wx/ogl/composit.h
+include/wx-2.6/wx/ogl/constrnt.h
+include/wx-2.6/wx/ogl/divided.h
+include/wx-2.6/wx/ogl/drawn.h
+include/wx-2.6/wx/ogl/drawnp.h
+include/wx-2.6/wx/ogl/lines.h
+include/wx-2.6/wx/ogl/linesp.h
+include/wx-2.6/wx/ogl/mfutils.h
+include/wx-2.6/wx/ogl/misc.h
+include/wx-2.6/wx/ogl/ogl.h
+include/wx-2.6/wx/ogl/ogldiag.h
+include/wx-2.6/wx/plot/plot.h
+include/wx-2.6/wx/plot/plot_dwn.bmp
+include/wx-2.6/wx/plot/plot_enl.bmp
+include/wx-2.6/wx/plot/plot_shr.bmp
+include/wx-2.6/wx/plot/plot_up.bmp
+include/wx-2.6/wx/plot/plot_zin.bmp
+include/wx-2.6/wx/plot/plot_zot.bmp
+include/wx-2.6/wx/plot/wxplot.rc
+include/wx-2.6/wx/stc/stc.h
+include/wx-2.6/wx/svg/dcsvg.h
+@dirrm include/wx-2.6/wx/svg
+@dirrm include/wx-2.6/wx/stc
+@dirrm include/wx-2.6/wx/plot
+@dirrm include/wx-2.6/wx/ogl
+@dirrm include/wx-2.6/wx/gizmos
+@dirrm include/wx-2.6/wx/fl
+@dirrm include/wx-2.6/wx/deprecated
+@dirrm include/wx-2.6/wx/animate
diff --git a/x11-toolkits/wxgtk26-contrib-utils/Makefile b/x11-toolkits/wxgtk26-contrib-utils/Makefile
index e489845a784b..2dcbdbb7f106 100644
--- a/x11-toolkits/wxgtk26-contrib-utils/Makefile
+++ b/x11-toolkits/wxgtk26-contrib-utils/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-utils-devel
+# New ports collection makefile for: wxgtk26-contrib-utils
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,18 +6,18 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit utils (devel version)
+COMMENT= The wxWidgets GUI toolkit utils
.if defined(WITH_UNICODE)
-WXGTK_FLAVOR= gtk2-unicode-utils
-LIB_DEPENDS= wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
+WXGTK_FLAVOR= gtk2-unicode-contrib-utils
+LIB_DEPENDS= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
.else
-WXGTK_FLAVOR= gtk2-utils
-LIB_DEPENDS= wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
+WXGTK_FLAVOR= gtk2-contrib-utils
+LIB_DEPENDS= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
.endif
BUILD_WRKSRC= ${WRKSRC}/contrib/utils
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-contrib/Makefile b/x11-toolkits/wxgtk26-contrib/Makefile
index 4c36af733fab..1eba77011e9f 100644
--- a/x11-toolkits/wxgtk26-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-contrib/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-contrib-devel
+# New ports collection makefile for: wxgtk26-contrib
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
+COMMENT= The wxWidgets GUI toolkit contributed libraries
WXGTK_FLAVOR= gtk2-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-contrib/pkg-plist b/x11-toolkits/wxgtk26-contrib/pkg-plist
index 1e6d7fa75aab..1f11ca034c54 100644
--- a/x11-toolkits/wxgtk26-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk26-contrib/pkg-plist
@@ -1,24 +1,27 @@
-lib/libwx_gtk2_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2_svg-2.5.so.3.0.0
+lib/libwx_gtk2_animate-2.6.so
+lib/libwx_gtk2_animate-2.6.so.0
+lib/libwx_gtk2_animate-2.6.so.0.0.0
+lib/libwx_gtk2_deprecated-2.6.so
+lib/libwx_gtk2_deprecated-2.6.so.0
+lib/libwx_gtk2_deprecated-2.6.so.0.0.0
+lib/libwx_gtk2_fl-2.6.so
+lib/libwx_gtk2_fl-2.6.so.0
+lib/libwx_gtk2_fl-2.6.so.0.0.0
+lib/libwx_gtk2_gizmos-2.6.so
+lib/libwx_gtk2_gizmos-2.6.so.0
+lib/libwx_gtk2_gizmos-2.6.so.0.0.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0.0.0
+lib/libwx_gtk2_ogl-2.6.so
+lib/libwx_gtk2_ogl-2.6.so.0
+lib/libwx_gtk2_ogl-2.6.so.0.0.0
+lib/libwx_gtk2_plot-2.6.so
+lib/libwx_gtk2_plot-2.6.so.0
+lib/libwx_gtk2_plot-2.6.so.0.0.0
+lib/libwx_gtk2_stc-2.6.so
+lib/libwx_gtk2_stc-2.6.so.0
+lib/libwx_gtk2_stc-2.6.so.0.0.0
+lib/libwx_gtk2_svg-2.6.so
+lib/libwx_gtk2_svg-2.6.so.0
+lib/libwx_gtk2_svg-2.6.so.0.0.0
diff --git a/x11-toolkits/wxgtk26-unicode-contrib/Makefile b/x11-toolkits/wxgtk26-unicode-contrib/Makefile
index dd89483e1c61..62f0029a5019 100644
--- a/x11-toolkits/wxgtk26-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-unicode-contrib/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
+# New ports collection makefile for: wxgtk26-unicode-contrib
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
+COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
index 04a2c9b44b54..3abe095d45a8 100644
--- a/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
@@ -1,24 +1,27 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
+lib/libwx_gtk2u_animate-2.6.so
+lib/libwx_gtk2u_animate-2.6.so.0
+lib/libwx_gtk2u_animate-2.6.so.0.0.0
+lib/libwx_gtk2u_deprecated-2.6.so
+lib/libwx_gtk2u_deprecated-2.6.so.0
+lib/libwx_gtk2u_deprecated-2.6.so.0.0.0
+lib/libwx_gtk2u_fl-2.6.so
+lib/libwx_gtk2u_fl-2.6.so.0
+lib/libwx_gtk2u_fl-2.6.so.0.0.0
+lib/libwx_gtk2u_gizmos-2.6.so
+lib/libwx_gtk2u_gizmos-2.6.so.0
+lib/libwx_gtk2u_gizmos-2.6.so.0.0.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0.0.0
+lib/libwx_gtk2u_ogl-2.6.so
+lib/libwx_gtk2u_ogl-2.6.so.0
+lib/libwx_gtk2u_ogl-2.6.so.0.0.0
+lib/libwx_gtk2u_plot-2.6.so
+lib/libwx_gtk2u_plot-2.6.so.0
+lib/libwx_gtk2u_plot-2.6.so.0.0.0
+lib/libwx_gtk2u_stc-2.6.so
+lib/libwx_gtk2u_stc-2.6.so.0
+lib/libwx_gtk2u_stc-2.6.so.0.0.0
+lib/libwx_gtk2u_svg-2.6.so
+lib/libwx_gtk2u_svg-2.6.so.0
+lib/libwx_gtk2u_svg-2.6.so.0.0.0
diff --git a/x11-toolkits/wxgtk26-unicode/Makefile b/x11-toolkits/wxgtk26-unicode/Makefile
index dd89483e1c61..049949a2ab60 100644
--- a/x11-toolkits/wxgtk26-unicode/Makefile
+++ b/x11-toolkits/wxgtk26-unicode/Makefile
@@ -1,18 +1,14 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
+# New ports collection makefile for: wxgtk26-unicode
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
-
-CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
+COMMENT= The wxWidgets GUI toolkit (Unicode)
-WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+WXGTK_FLAVOR= gtk2-unicode
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-unicode/pkg-plist b/x11-toolkits/wxgtk26-unicode/pkg-plist
index 04a2c9b44b54..e52cb9661823 100644
--- a/x11-toolkits/wxgtk26-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk26-unicode/pkg-plist
@@ -1,24 +1,35 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
+bin/wxgtk2u-2.6-config
+bin/wxrc-gtk2u-2.6
+include/wx-2.6/gtk2-unicode-release-2.6/wx/setup.h
+lib/libwx_baseu-2.6.so
+lib/libwx_baseu-2.6.so.0
+lib/libwx_baseu-2.6.so.0.0.0
+lib/libwx_baseu_net-2.6.so
+lib/libwx_baseu_net-2.6.so.0
+lib/libwx_baseu_net-2.6.so.0.0.0
+lib/libwx_baseu_xml-2.6.so
+lib/libwx_baseu_xml-2.6.so.0
+lib/libwx_baseu_xml-2.6.so.0.0.0
+lib/libwx_gtk2u_adv-2.6.so
+lib/libwx_gtk2u_adv-2.6.so.0
+lib/libwx_gtk2u_adv-2.6.so.0.0.0
+lib/libwx_gtk2u_core-2.6.so
+lib/libwx_gtk2u_core-2.6.so.0
+lib/libwx_gtk2u_core-2.6.so.0.0.0
+lib/libwx_gtk2u_gl-2.6.so
+lib/libwx_gtk2u_gl-2.6.so.0
+lib/libwx_gtk2u_gl-2.6.so.0.0.0
+lib/libwx_gtk2u_html-2.6.so
+lib/libwx_gtk2u_html-2.6.so.0
+lib/libwx_gtk2u_html-2.6.so.0.0.0
+lib/libwx_gtk2u_media-2.6.so
+lib/libwx_gtk2u_media-2.6.so.0
+lib/libwx_gtk2u_media-2.6.so.0.0.0
+lib/libwx_gtk2u_qa-2.6.so
+lib/libwx_gtk2u_qa-2.6.so.0
+lib/libwx_gtk2u_qa-2.6.so.0.0.0
+lib/libwx_gtk2u_xrc-2.6.so
+lib/libwx_gtk2u_xrc-2.6.so.0
+lib/libwx_gtk2u_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-unicode-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-unicode-release-2.6
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index beac69d10bff..1ee1cc80e3dd 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-devel
+# New ports collection makefile for: wxgtk26
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,15 +6,15 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.3
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
-PKGNAMESUFFIX= ${WXGTK_FLAVOR}-devel
+PKGNAMESUFFIX= ${WXGTK_FLAVOR}
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
-COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
+COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
jpeg.9:${PORTSDIR}/graphics/jpeg\
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libpng=sys\
--with-expat=sys\
--with-opengl\
--with-mspack\
- --enable-gtk2
+ --with-gtk
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv \
@@ -45,17 +45,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
PLIST= ${.CURDIR}/pkg-plist
-NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 2
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -70,12 +68,12 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
.else
-LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
.endif
pre-configure:
@@ -84,7 +82,7 @@ pre-configure:
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
+.endif # !gtk-contrib-common
.endif # *-contrib*
.include <bsd.port.pre.mk>
@@ -96,9 +94,9 @@ IGNORE= Systems prior to FreeBSD 5.0 currently out of support
CONFIGURE_ARGS+=--enable-unicode
.endif
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.5-config
+WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.6-config
.else
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.5-config
+WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.6-config
.endif # *-unicode*
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
index ab4f811407f2..56d766416f01 100644
--- a/x11-toolkits/wxgtk26/distinfo
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
-SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
+MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b
+SIZE (wxGTK-2.6.0.tar.bz2) = 7281025
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
index c9d72e6757c7..00bd63328a1d 100644
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sun Oct 10 22:17:27 2004
-+++ Makefile.in Wed Nov 24 22:47:40 2004
+--- Makefile.in.orig Thu Apr 21 00:32:34 2005
++++ Makefile.in Thu May 5 16:11:02 2005
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,16 +8,16 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -7408,11 +7409,13 @@
+@@ -9127,11 +9128,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) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___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) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___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_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: 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_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___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 locale_install $(__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_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___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 $(__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-common: locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
@@ -25,7 +25,7 @@
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -7892,9 +7895,7 @@
+@@ -9664,9 +9667,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure
index ebac7a916f95..2b3d5be8d5c5 100644
--- a/x11-toolkits/wxgtk26/files/patch-configure
+++ b/x11-toolkits/wxgtk26/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon May 31 18:11:50 2004
-+++ configure Sun Jun 27 20:13:50 2004
-@@ -32707,7 +32707,7 @@
+--- configure.orig Thu Apr 21 00:32:34 2005
++++ configure Thu May 5 16:17:57 2005
+@@ -33918,7 +33918,7 @@
fi
;;
*-*-freebsd*)
@@ -9,7 +9,7 @@
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
-@@ -32744,6 +32744,12 @@
+@@ -33955,6 +33955,12 @@
echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
;;
@@ -22,7 +22,7 @@
-*)
echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
-@@ -34014,6 +34020,7 @@
+@@ -35210,6 +35216,7 @@
fi
fi
fi
@@ -30,7 +30,7 @@
if test "$WXGTK20" = 1 ; then
cat >>confdefs.h <<_ACEOF
-@@ -34134,7 +34141,7 @@
+@@ -35330,7 +35337,7 @@
OPTIMISE="-O"
fi
fi
@@ -39,17 +39,3 @@
if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -40123,6 +40130,13 @@
-
- case "${BAKEFILE_HOST}" in
- *-*-linux* )
-+ SONAME_FLAG="-Wl,-soname,"
-+ USE_SOVERSION=1
-+ USE_SOVERLINUX=1
-+ USE_SOSYMLINKS=1
-+ ;;
-+
-+ *-*-freebsd* )
- SONAME_FLAG="-Wl,-soname,"
- USE_SOVERSION=1
- USE_SOVERLINUX=1
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 b6e204d0704a..51b5ab5ee458 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 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)
+--- contrib/src/gizmos/Makefile.in.orig Thu Apr 21 00:33:08 2005
++++ contrib/src/gizmos/Makefile.in Thu May 5 16:22:48 2005
+@@ -277,6 +277,8 @@
+ all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
- install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+ install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
+
+install-common:
$(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 \
+ 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 wx/gizmos/xh_statpict.h; do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-PlatWX.cpp b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-PlatWX.cpp
deleted file mode 100644
index 3b9e39008930..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-PlatWX.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/stc/PlatWX.cpp.orig Sun Aug 15 14:41:28 2004
-+++ contrib/src/stc/PlatWX.cpp Sun Aug 15 14:40:11 2004
-@@ -18,7 +18,7 @@
- #include "wx/stc/stc.h"
-
-
--#ifdef __WXGTK__
-+#if 0
- #include <gtk/gtk.h>
- #endif
-
diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-string.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-string.cpp
deleted file mode 100644
index f88da4cc4be9..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-src-common-string.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/string.cpp.orig Mon Feb 21 15:53:48 2005
-+++ src/common/string.cpp Tue Feb 22 01:39:54 2005
-@@ -39,6 +39,7 @@
- #endif
-
- #include <ctype.h>
-+#include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-
-@@ -1956,6 +1957,9 @@
- // ok, there was enough space
- break;
- }
-+
-+ if (errno != EOVERFLOW)
-+ break;
-
- // still not enough, double it again
- size *= 2;
diff --git a/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h
deleted file mode 100644
index a8688e1069c0..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 01f1f176215f..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-wx-config.in b/x11-toolkits/wxgtk26/files/patch-wx-config.in
index 0453477f8fbc..434032d26493 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 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@"
+--- wx-config.in.orig Thu Apr 21 00:32:34 2005
++++ wx-config.in Thu May 5 16:36:09 2005
+@@ -1142,7 +1142,7 @@
+ _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
fi
--_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@")
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_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@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
# 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 3f401620305b..f21ae0c20c86 100644
--- a/x11-toolkits/wxgtk26/pkg-plist
+++ b/x11-toolkits/wxgtk26/pkg-plist
@@ -1,29 +1,35 @@
-bin/wxgtk2-2.5-config
-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.3
-lib/libwx_base-2.5.so.3.0.0
-lib/libwx_base_net-2.5.so
-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.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.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.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.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.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
+bin/wxgtk2-2.6-config
+bin/wxrc-gtk2-2.6
+include/wx-2.6/gtk2-ansi-release-2.6/wx/setup.h
+lib/libwx_base-2.6.so
+lib/libwx_base-2.6.so.0
+lib/libwx_base-2.6.so.0.0.0
+lib/libwx_base_net-2.6.so
+lib/libwx_base_net-2.6.so.0
+lib/libwx_base_net-2.6.so.0.0.0
+lib/libwx_base_xml-2.6.so
+lib/libwx_base_xml-2.6.so.0
+lib/libwx_base_xml-2.6.so.0.0.0
+lib/libwx_gtk2_adv-2.6.so
+lib/libwx_gtk2_adv-2.6.so.0
+lib/libwx_gtk2_adv-2.6.so.0.0.0
+lib/libwx_gtk2_core-2.6.so
+lib/libwx_gtk2_core-2.6.so.0
+lib/libwx_gtk2_core-2.6.so.0.0.0
+lib/libwx_gtk2_gl-2.6.so
+lib/libwx_gtk2_gl-2.6.so.0
+lib/libwx_gtk2_gl-2.6.so.0.0.0
+lib/libwx_gtk2_html-2.6.so
+lib/libwx_gtk2_html-2.6.so.0
+lib/libwx_gtk2_html-2.6.so.0.0.0
+lib/libwx_gtk2_media-2.6.so
+lib/libwx_gtk2_media-2.6.so.0
+lib/libwx_gtk2_media-2.6.so.0.0.0
+lib/libwx_gtk2_qa-2.6.so
+lib/libwx_gtk2_qa-2.6.so.0
+lib/libwx_gtk2_qa-2.6.so.0.0.0
+lib/libwx_gtk2_xrc-2.6.so
+lib/libwx_gtk2_xrc-2.6.so.0
+lib/libwx_gtk2_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6
diff --git a/x11-toolkits/wxgtk28-common/Makefile b/x11-toolkits/wxgtk28-common/Makefile
index f4f254513409..1bdbb9c01952 100644
--- a/x11-toolkits/wxgtk28-common/Makefile
+++ b/x11-toolkits/wxgtk28-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-common-devel
+# New ports collection makefile for: wxgtk26-common
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (devel version, common files)
+COMMENT= The wxWidgets GUI toolkit (common files)
WXGTK_FLAVOR= gtk2-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-common/pkg-plist b/x11-toolkits/wxgtk28-common/pkg-plist
index f68eebf220d8..2cfee8986833 100644
--- a/x11-toolkits/wxgtk28-common/pkg-plist
+++ b/x11-toolkits/wxgtk28-common/pkg-plist
@@ -1,442 +1,460 @@
-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
+include/wx-2.6/wx/accel.h
+include/wx-2.6/wx/access.h
+include/wx-2.6/wx/afterstd.h
+include/wx-2.6/wx/app.h
+include/wx-2.6/wx/apptrait.h
+include/wx-2.6/wx/archive.h
+include/wx-2.6/wx/arrimpl.cpp
+include/wx-2.6/wx/arrstr.h
+include/wx-2.6/wx/artprov.h
+include/wx-2.6/wx/beforestd.h
+include/wx-2.6/wx/bitmap.h
+include/wx-2.6/wx/bmpbuttn.h
+include/wx-2.6/wx/bookctrl.h
+include/wx-2.6/wx/brush.h
+include/wx-2.6/wx/buffer.h
+include/wx-2.6/wx/build.h
+include/wx-2.6/wx/busyinfo.h
+include/wx-2.6/wx/button.h
+include/wx-2.6/wx/calctrl.h
+include/wx-2.6/wx/caret.h
+include/wx-2.6/wx/checkbox.h
+include/wx-2.6/wx/checklst.h
+include/wx-2.6/wx/chkconf.h
+include/wx-2.6/wx/choicdlg.h
+include/wx-2.6/wx/choice.h
+include/wx-2.6/wx/choicebk.h
+include/wx-2.6/wx/clipbrd.h
+include/wx-2.6/wx/clntdata.h
+include/wx-2.6/wx/cmdline.h
+include/wx-2.6/wx/cmdproc.h
+include/wx-2.6/wx/cmndata.h
+include/wx-2.6/wx/colordlg.h
+include/wx-2.6/wx/colour.h
+include/wx-2.6/wx/combobox.h
+include/wx-2.6/wx/confbase.h
+include/wx-2.6/wx/config.h
+include/wx-2.6/wx/containr.h
+include/wx-2.6/wx/control.h
+include/wx-2.6/wx/cshelp.h
+include/wx-2.6/wx/ctrlsub.h
+include/wx-2.6/wx/cursor.h
+include/wx-2.6/wx/dataobj.h
+include/wx-2.6/wx/datectrl.h
+include/wx-2.6/wx/dateevt.h
+include/wx-2.6/wx/datetime.h
+include/wx-2.6/wx/datetime.inl
+include/wx-2.6/wx/datstrm.h
+include/wx-2.6/wx/db.h
+include/wx-2.6/wx/dbgrid.h
+include/wx-2.6/wx/dbkeyg.h
+include/wx-2.6/wx/dbtable.h
+include/wx-2.6/wx/dc.h
+include/wx-2.6/wx/dcbuffer.h
+include/wx-2.6/wx/dcclient.h
+include/wx-2.6/wx/dcmemory.h
+include/wx-2.6/wx/dcmirror.h
+include/wx-2.6/wx/dcprint.h
+include/wx-2.6/wx/dcps.h
+include/wx-2.6/wx/dcscreen.h
+include/wx-2.6/wx/dde.h
+include/wx-2.6/wx/debug.h
+include/wx-2.6/wx/debugrpt.h
+include/wx-2.6/wx/defs.h
+include/wx-2.6/wx/dialog.h
+include/wx-2.6/wx/dialup.h
+include/wx-2.6/wx/dir.h
+include/wx-2.6/wx/dirctrl.h
+include/wx-2.6/wx/dirdlg.h
+include/wx-2.6/wx/display.h
+include/wx-2.6/wx/dlimpexp.h
+include/wx-2.6/wx/dnd.h
+include/wx-2.6/wx/docmdi.h
+include/wx-2.6/wx/docview.h
+include/wx-2.6/wx/dragimag.h
+include/wx-2.6/wx/dynarray.h
+include/wx-2.6/wx/dynlib.h
+include/wx-2.6/wx/dynload.h
+include/wx-2.6/wx/effects.h
+include/wx-2.6/wx/encconv.h
+include/wx-2.6/wx/encinfo.h
+include/wx-2.6/wx/event.h
+include/wx-2.6/wx/evtloop.h
+include/wx-2.6/wx/except.h
+include/wx-2.6/wx/fdrepdlg.h
+include/wx-2.6/wx/features.h
+include/wx-2.6/wx/ffile.h
+include/wx-2.6/wx/file.h
+include/wx-2.6/wx/fileconf.h
+include/wx-2.6/wx/filedlg.h
+include/wx-2.6/wx/filefn.h
+include/wx-2.6/wx/filename.h
+include/wx-2.6/wx/filesys.h
+include/wx-2.6/wx/fmappriv.h
+include/wx-2.6/wx/font.h
+include/wx-2.6/wx/fontdlg.h
+include/wx-2.6/wx/fontenc.h
+include/wx-2.6/wx/fontenum.h
+include/wx-2.6/wx/fontmap.h
+include/wx-2.6/wx/fontutil.h
+include/wx-2.6/wx/frame.h
+include/wx-2.6/wx/fs_inet.h
+include/wx-2.6/wx/fs_mem.h
+include/wx-2.6/wx/fs_zip.h
+include/wx-2.6/wx/gauge.h
+include/wx-2.6/wx/gbsizer.h
+include/wx-2.6/wx/gdicmn.h
+include/wx-2.6/wx/gdiobj.h
+include/wx-2.6/wx/generic/accel.h
+include/wx-2.6/wx/generic/calctrl.h
+include/wx-2.6/wx/generic/caret.h
+include/wx-2.6/wx/generic/choicdgg.h
+include/wx-2.6/wx/generic/colrdlgg.h
+include/wx-2.6/wx/generic/datectrl.h
+include/wx-2.6/wx/generic/dcpsg.h
+include/wx-2.6/wx/generic/dirctrlg.h
+include/wx-2.6/wx/generic/dirdlgg.h
+include/wx-2.6/wx/generic/dragimgg.h
+include/wx-2.6/wx/generic/fdrepdlg.h
+include/wx-2.6/wx/generic/filedlgg.h
+include/wx-2.6/wx/generic/fontdlgg.h
+include/wx-2.6/wx/generic/grid.h
+include/wx-2.6/wx/generic/gridctrl.h
+include/wx-2.6/wx/generic/gridsel.h
+include/wx-2.6/wx/generic/helpext.h
+include/wx-2.6/wx/generic/imaglist.h
+include/wx-2.6/wx/generic/laywin.h
+include/wx-2.6/wx/generic/listctrl.h
+include/wx-2.6/wx/generic/logg.h
+include/wx-2.6/wx/generic/msgdlgg.h
+include/wx-2.6/wx/generic/notebook.h
+include/wx-2.6/wx/generic/numdlgg.h
+include/wx-2.6/wx/generic/paletteg.h
+include/wx-2.6/wx/generic/panelg.h
+include/wx-2.6/wx/generic/printps.h
+include/wx-2.6/wx/generic/prntdlgg.h
+include/wx-2.6/wx/generic/progdlgg.h
+include/wx-2.6/wx/generic/propdlg.h
+include/wx-2.6/wx/generic/sashwin.h
+include/wx-2.6/wx/generic/scrolwin.h
+include/wx-2.6/wx/generic/spinctlg.h
+include/wx-2.6/wx/generic/splash.h
+include/wx-2.6/wx/generic/splitter.h
+include/wx-2.6/wx/generic/statusbr.h
+include/wx-2.6/wx/generic/tabg.h
+include/wx-2.6/wx/generic/textdlgg.h
+include/wx-2.6/wx/generic/timer.h
+include/wx-2.6/wx/generic/treectlg.h
+include/wx-2.6/wx/generic/wizard.h
+include/wx-2.6/wx/geometry.h
+include/wx-2.6/wx/gifdecod.h
+include/wx-2.6/wx/glcanvas.h
+include/wx-2.6/wx/grid.h
+include/wx-2.6/wx/gsocket.h
+include/wx-2.6/wx/gtk/accel.h
+include/wx-2.6/wx/gtk/app.h
+include/wx-2.6/wx/gtk/bitmap.h
+include/wx-2.6/wx/gtk/bmpbuttn.h
+include/wx-2.6/wx/gtk/brush.h
+include/wx-2.6/wx/gtk/button.h
+include/wx-2.6/wx/gtk/checkbox.h
+include/wx-2.6/wx/gtk/checklst.h
+include/wx-2.6/wx/gtk/choice.h
+include/wx-2.6/wx/gtk/clipbrd.h
+include/wx-2.6/wx/gtk/colordlg.h
+include/wx-2.6/wx/gtk/colour.h
+include/wx-2.6/wx/gtk/combobox.h
+include/wx-2.6/wx/gtk/control.h
+include/wx-2.6/wx/gtk/cursor.h
+include/wx-2.6/wx/gtk/dataform.h
+include/wx-2.6/wx/gtk/dataobj.h
+include/wx-2.6/wx/gtk/dataobj2.h
+include/wx-2.6/wx/gtk/dc.h
+include/wx-2.6/wx/gtk/dcclient.h
+include/wx-2.6/wx/gtk/dcmemory.h
+include/wx-2.6/wx/gtk/dcscreen.h
+include/wx-2.6/wx/gtk/dialog.h
+include/wx-2.6/wx/gtk/dnd.h
+include/wx-2.6/wx/gtk/filedlg.h
+include/wx-2.6/wx/gtk/font.h
+include/wx-2.6/wx/gtk/fontdlg.h
+include/wx-2.6/wx/gtk/frame.h
+include/wx-2.6/wx/gtk/gauge.h
+include/wx-2.6/wx/gtk/gdiobj.h
+include/wx-2.6/wx/gtk/glcanvas.h
+include/wx-2.6/wx/gtk/gnome/gprint.h
+include/wx-2.6/wx/gtk/icon.h
+include/wx-2.6/wx/gtk/listbox.h
+include/wx-2.6/wx/gtk/mdi.h
+include/wx-2.6/wx/gtk/menu.h
+include/wx-2.6/wx/gtk/menuitem.h
+include/wx-2.6/wx/gtk/minifram.h
+include/wx-2.6/wx/gtk/msgdlg.h
+include/wx-2.6/wx/gtk/notebook.h
+include/wx-2.6/wx/gtk/pen.h
+include/wx-2.6/wx/gtk/popupwin.h
+include/wx-2.6/wx/gtk/radiobox.h
+include/wx-2.6/wx/gtk/radiobut.h
+include/wx-2.6/wx/gtk/region.h
+include/wx-2.6/wx/gtk/scrolbar.h
+include/wx-2.6/wx/gtk/scrolwin.h
+include/wx-2.6/wx/gtk/slider.h
+include/wx-2.6/wx/gtk/spinbutt.h
+include/wx-2.6/wx/gtk/spinctrl.h
+include/wx-2.6/wx/gtk/statbmp.h
+include/wx-2.6/wx/gtk/statbox.h
+include/wx-2.6/wx/gtk/statline.h
+include/wx-2.6/wx/gtk/stattext.h
+include/wx-2.6/wx/gtk/tbargtk.h
+include/wx-2.6/wx/gtk/textctrl.h
+include/wx-2.6/wx/gtk/tglbtn.h
+include/wx-2.6/wx/gtk/timer.h
+include/wx-2.6/wx/gtk/tooltip.h
+include/wx-2.6/wx/gtk/toplevel.h
+include/wx-2.6/wx/gtk/treectrl.h
+include/wx-2.6/wx/gtk/win_gtk.h
+include/wx-2.6/wx/gtk/window.h
+include/wx-2.6/wx/hash.h
+include/wx-2.6/wx/hashmap.h
+include/wx-2.6/wx/hashset.h
+include/wx-2.6/wx/help.h
+include/wx-2.6/wx/helpbase.h
+include/wx-2.6/wx/helphtml.h
+include/wx-2.6/wx/helpwin.h
+include/wx-2.6/wx/html/forcelnk.h
+include/wx-2.6/wx/html/helpctrl.h
+include/wx-2.6/wx/html/helpdata.h
+include/wx-2.6/wx/html/helpfrm.h
+include/wx-2.6/wx/html/htmlcell.h
+include/wx-2.6/wx/html/htmldefs.h
+include/wx-2.6/wx/html/htmlfilt.h
+include/wx-2.6/wx/html/htmlpars.h
+include/wx-2.6/wx/html/htmlproc.h
+include/wx-2.6/wx/html/htmltag.h
+include/wx-2.6/wx/html/htmlwin.h
+include/wx-2.6/wx/html/htmprint.h
+include/wx-2.6/wx/html/m_templ.h
+include/wx-2.6/wx/html/winpars.h
+include/wx-2.6/wx/htmllbox.h
+include/wx-2.6/wx/icon.h
+include/wx-2.6/wx/iconbndl.h
+include/wx-2.6/wx/iconloc.h
+include/wx-2.6/wx/imagbmp.h
+include/wx-2.6/wx/image.h
+include/wx-2.6/wx/imaggif.h
+include/wx-2.6/wx/imagiff.h
+include/wx-2.6/wx/imagjpeg.h
+include/wx-2.6/wx/imaglist.h
+include/wx-2.6/wx/imagpcx.h
+include/wx-2.6/wx/imagpng.h
+include/wx-2.6/wx/imagpnm.h
+include/wx-2.6/wx/imagtiff.h
+include/wx-2.6/wx/imagxpm.h
+include/wx-2.6/wx/init.h
+include/wx-2.6/wx/intl.h
+include/wx-2.6/wx/iosfwrap.h
+include/wx-2.6/wx/ioswrap.h
+include/wx-2.6/wx/ipc.h
+include/wx-2.6/wx/ipcbase.h
+include/wx-2.6/wx/isql.h
+include/wx-2.6/wx/isqlext.h
+include/wx-2.6/wx/joystick.h
+include/wx-2.6/wx/layout.h
+include/wx-2.6/wx/laywin.h
+include/wx-2.6/wx/list.h
+include/wx-2.6/wx/listbase.h
+include/wx-2.6/wx/listbook.h
+include/wx-2.6/wx/listbox.h
+include/wx-2.6/wx/listctrl.h
+include/wx-2.6/wx/listimpl.cpp
+include/wx-2.6/wx/log.h
+include/wx-2.6/wx/longlong.h
+include/wx-2.6/wx/math.h
+include/wx-2.6/wx/matrix.h
+include/wx-2.6/wx/mdi.h
+include/wx-2.6/wx/mediactrl.h
+include/wx-2.6/wx/memconf.h
+include/wx-2.6/wx/memory.h
+include/wx-2.6/wx/memtext.h
+include/wx-2.6/wx/menu.h
+include/wx-2.6/wx/menuitem.h
+include/wx-2.6/wx/metafile.h
+include/wx-2.6/wx/mimetype.h
+include/wx-2.6/wx/minifram.h
+include/wx-2.6/wx/module.h
+include/wx-2.6/wx/msgdlg.h
+include/wx-2.6/wx/msgout.h
+include/wx-2.6/wx/mstream.h
+include/wx-2.6/wx/notebook.h
+include/wx-2.6/wx/numdlg.h
+include/wx-2.6/wx/object.h
+include/wx-2.6/wx/ownerdrw.h
+include/wx-2.6/wx/palette.h
+include/wx-2.6/wx/panel.h
+include/wx-2.6/wx/paper.h
+include/wx-2.6/wx/pen.h
+include/wx-2.6/wx/platform.h
+include/wx-2.6/wx/popupwin.h
+include/wx-2.6/wx/print.h
+include/wx-2.6/wx/printdlg.h
+include/wx-2.6/wx/prntbase.h
+include/wx-2.6/wx/process.h
+include/wx-2.6/wx/progdlg.h
+include/wx-2.6/wx/propdlg.h
+include/wx-2.6/wx/protocol/file.h
+include/wx-2.6/wx/protocol/ftp.h
+include/wx-2.6/wx/protocol/http.h
+include/wx-2.6/wx/protocol/protocol.h
+include/wx-2.6/wx/ptr_scpd.h
+include/wx-2.6/wx/quantize.h
+include/wx-2.6/wx/radiobox.h
+include/wx-2.6/wx/radiobut.h
+include/wx-2.6/wx/rawbmp.h
+include/wx-2.6/wx/regex.h
+include/wx-2.6/wx/region.h
+include/wx-2.6/wx/renderer.h
+include/wx-2.6/wx/sashwin.h
+include/wx-2.6/wx/sckaddr.h
+include/wx-2.6/wx/sckipc.h
+include/wx-2.6/wx/sckstrm.h
+include/wx-2.6/wx/scopeguard.h
+include/wx-2.6/wx/scrolbar.h
+include/wx-2.6/wx/scrolwin.h
+include/wx-2.6/wx/selstore.h
+include/wx-2.6/wx/settings.h
+include/wx-2.6/wx/sizer.h
+include/wx-2.6/wx/slider.h
+include/wx-2.6/wx/snglinst.h
+include/wx-2.6/wx/socket.h
+include/wx-2.6/wx/sound.h
+include/wx-2.6/wx/spinbutt.h
+include/wx-2.6/wx/spinctrl.h
+include/wx-2.6/wx/splash.h
+include/wx-2.6/wx/splitter.h
+include/wx-2.6/wx/sstream.h
+include/wx-2.6/wx/stack.h
+include/wx-2.6/wx/stackwalk.h
+include/wx-2.6/wx/statbmp.h
+include/wx-2.6/wx/statbox.h
+include/wx-2.6/wx/statline.h
+include/wx-2.6/wx/stattext.h
+include/wx-2.6/wx/statusbr.h
+include/wx-2.6/wx/stdpaths.h
+include/wx-2.6/wx/stockitem.h
+include/wx-2.6/wx/stopwatch.h
+include/wx-2.6/wx/strconv.h
+include/wx-2.6/wx/stream.h
+include/wx-2.6/wx/string.h
+include/wx-2.6/wx/sysopt.h
+include/wx-2.6/wx/tab.h
+include/wx-2.6/wx/tabctrl.h
+include/wx-2.6/wx/taskbar.h
+include/wx-2.6/wx/tbarbase.h
+include/wx-2.6/wx/textbuf.h
+include/wx-2.6/wx/textctrl.h
+include/wx-2.6/wx/textdlg.h
+include/wx-2.6/wx/textfile.h
+include/wx-2.6/wx/tglbtn.h
+include/wx-2.6/wx/thread.h
+include/wx-2.6/wx/thrimpl.cpp
+include/wx-2.6/wx/timer.h
+include/wx-2.6/wx/tipdlg.h
+include/wx-2.6/wx/tipwin.h
+include/wx-2.6/wx/tokenzr.h
+include/wx-2.6/wx/toolbar.h
+include/wx-2.6/wx/tooltip.h
+include/wx-2.6/wx/toplevel.h
+include/wx-2.6/wx/treebase.h
+include/wx-2.6/wx/treectrl.h
+include/wx-2.6/wx/txtstrm.h
+include/wx-2.6/wx/types.h
+include/wx-2.6/wx/unix/apptbase.h
+include/wx-2.6/wx/unix/apptrait.h
+include/wx-2.6/wx/unix/displayx11.h
+include/wx-2.6/wx/unix/execute.h
+include/wx-2.6/wx/unix/fontutil.h
+include/wx-2.6/wx/unix/gsockunx.h
+include/wx-2.6/wx/unix/joystick.h
+include/wx-2.6/wx/unix/mimetype.h
+include/wx-2.6/wx/unix/pipe.h
+include/wx-2.6/wx/unix/sound.h
+include/wx-2.6/wx/unix/stackwalk.h
+include/wx-2.6/wx/unix/stdpaths.h
+include/wx-2.6/wx/unix/taskbarx11.h
+include/wx-2.6/wx/unix/utilsx11.h
+include/wx-2.6/wx/uri.h
+include/wx-2.6/wx/url.h
+include/wx-2.6/wx/utils.h
+include/wx-2.6/wx/valgen.h
+include/wx-2.6/wx/validate.h
+include/wx-2.6/wx/valtext.h
+include/wx-2.6/wx/variant.h
+include/wx-2.6/wx/vector.h
+include/wx-2.6/wx/version.h
+include/wx-2.6/wx/vidmode.h
+include/wx-2.6/wx/vlbox.h
+include/wx-2.6/wx/vms_x_fix.h
+include/wx-2.6/wx/volume.h
+include/wx-2.6/wx/vscroll.h
+include/wx-2.6/wx/wave.h
+include/wx-2.6/wx/wfstream.h
+include/wx-2.6/wx/window.h
+include/wx-2.6/wx/wizard.h
+include/wx-2.6/wx/wx.h
+include/wx-2.6/wx/wxchar.h
+include/wx-2.6/wx/wxhtml.h
+include/wx-2.6/wx/wxprec.h
+include/wx-2.6/wx/xml/xml.h
+include/wx-2.6/wx/xpmdecod.h
+include/wx-2.6/wx/xpmhand.h
+include/wx-2.6/wx/xrc/xh_all.h
+include/wx-2.6/wx/xrc/xh_bmp.h
+include/wx-2.6/wx/xrc/xh_bmpbt.h
+include/wx-2.6/wx/xrc/xh_bttn.h
+include/wx-2.6/wx/xrc/xh_cald.h
+include/wx-2.6/wx/xrc/xh_chckb.h
+include/wx-2.6/wx/xrc/xh_chckl.h
+include/wx-2.6/wx/xrc/xh_choic.h
+include/wx-2.6/wx/xrc/xh_choicbk.h
+include/wx-2.6/wx/xrc/xh_combo.h
+include/wx-2.6/wx/xrc/xh_datectrl.h
+include/wx-2.6/wx/xrc/xh_dlg.h
+include/wx-2.6/wx/xrc/xh_frame.h
+include/wx-2.6/wx/xrc/xh_gauge.h
+include/wx-2.6/wx/xrc/xh_gdctl.h
+include/wx-2.6/wx/xrc/xh_html.h
+include/wx-2.6/wx/xrc/xh_listb.h
+include/wx-2.6/wx/xrc/xh_listbk.h
+include/wx-2.6/wx/xrc/xh_listc.h
+include/wx-2.6/wx/xrc/xh_mdi.h
+include/wx-2.6/wx/xrc/xh_menu.h
+include/wx-2.6/wx/xrc/xh_notbk.h
+include/wx-2.6/wx/xrc/xh_panel.h
+include/wx-2.6/wx/xrc/xh_radbt.h
+include/wx-2.6/wx/xrc/xh_radbx.h
+include/wx-2.6/wx/xrc/xh_scrol.h
+include/wx-2.6/wx/xrc/xh_scwin.h
+include/wx-2.6/wx/xrc/xh_sizer.h
+include/wx-2.6/wx/xrc/xh_slidr.h
+include/wx-2.6/wx/xrc/xh_spin.h
+include/wx-2.6/wx/xrc/xh_split.h
+include/wx-2.6/wx/xrc/xh_statbar.h
+include/wx-2.6/wx/xrc/xh_stbmp.h
+include/wx-2.6/wx/xrc/xh_stbox.h
+include/wx-2.6/wx/xrc/xh_stlin.h
+include/wx-2.6/wx/xrc/xh_sttxt.h
+include/wx-2.6/wx/xrc/xh_text.h
+include/wx-2.6/wx/xrc/xh_tglbtn.h
+include/wx-2.6/wx/xrc/xh_toolb.h
+include/wx-2.6/wx/xrc/xh_tree.h
+include/wx-2.6/wx/xrc/xh_unkwn.h
+include/wx-2.6/wx/xrc/xh_wizrd.h
+include/wx-2.6/wx/xrc/xmlres.h
+include/wx-2.6/wx/xti.h
+include/wx-2.6/wx/xtistrm.h
+include/wx-2.6/wx/xtixml.h
+include/wx-2.6/wx/zipstrm.h
+include/wx-2.6/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -459,42 +477,13 @@ share/locale/tr/LC_MESSAGES/wxstd.mo
share/locale/uk/LC_MESSAGES/wxstd.mo
share/locale/zh_CN/LC_MESSAGES/wxstd.mo
share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-share/wx/2.5/afm/Cour.afm
-share/wx/2.5/afm/CourBo.afm
-share/wx/2.5/afm/CourBoO.afm
-share/wx/2.5/afm/CourO.afm
-share/wx/2.5/afm/Helv.afm
-share/wx/2.5/afm/HelvBo.afm
-share/wx/2.5/afm/HelvBoO.afm
-share/wx/2.5/afm/HelvO.afm
-share/wx/2.5/afm/TimesBo.afm
-share/wx/2.5/afm/TimesBoO.afm
-share/wx/2.5/afm/TimesO.afm
-share/wx/2.5/afm/TimesRo.afm
-share/wx/2.5/afm/Zapf.afm
-share/wx/2.5/gs_afm/Cour.afm
-share/wx/2.5/gs_afm/CourBo.afm
-share/wx/2.5/gs_afm/CourBoO.afm
-share/wx/2.5/gs_afm/CourO.afm
-share/wx/2.5/gs_afm/Helv.afm
-share/wx/2.5/gs_afm/HelvBo.afm
-share/wx/2.5/gs_afm/HelvBoO.afm
-share/wx/2.5/gs_afm/HelvO.afm
-share/wx/2.5/gs_afm/TimesBo.afm
-share/wx/2.5/gs_afm/TimesBoO.afm
-share/wx/2.5/gs_afm/TimesO.afm
-share/wx/2.5/gs_afm/TimesRo.afm
-share/wx/2.5/gs_afm/Zapf.afm
-@dirrm share/wx/2.5/gs_afm
-@dirrm share/wx/2.5/afm
-@dirrm share/wx/2.5
-@dirrm share/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
+@dirrm include/wx-2.6/wx/xrc
+@dirrm include/wx-2.6/wx/xml
+@dirrm include/wx-2.6/wx/unix
+@dirrm include/wx-2.6/wx/protocol
+@dirrm include/wx-2.6/wx/html
+@dirrm include/wx-2.6/wx/gtk/gnome
+@dirrm include/wx-2.6/wx/gtk
+@dirrm include/wx-2.6/wx/generic
+@dirrm include/wx-2.6/wx
+@dirrm include/wx-2.6
diff --git a/x11-toolkits/wxgtk28-contrib-common/Makefile b/x11-toolkits/wxgtk28-contrib-common/Makefile
index 8a04a418aff9..58d6c54ebe6c 100644
--- a/x11-toolkits/wxgtk28-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk28-contrib-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-contrib-common-devel
+# New ports collection makefile for: wxgtk26-contrib-common
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, common files)
+COMMENT= The wxWidgets GUI toolkit contributed libraries (common files)
WXGTK_FLAVOR= gtk2-contrib-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-contrib-common/pkg-plist b/x11-toolkits/wxgtk28-contrib-common/pkg-plist
index 49656f547325..d1b3bf27ac1a 100644
--- a/x11-toolkits/wxgtk28-contrib-common/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib-common/pkg-plist
@@ -1,69 +1,70 @@
-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
+include/wx-2.6/wx/animate/animate.h
+include/wx-2.6/wx/deprecated/expr.h
+include/wx-2.6/wx/deprecated/prop.h
+include/wx-2.6/wx/deprecated/propform.h
+include/wx-2.6/wx/deprecated/proplist.h
+include/wx-2.6/wx/deprecated/resource.h
+include/wx-2.6/wx/deprecated/setup.h
+include/wx-2.6/wx/deprecated/tbarsmpl.h
+include/wx-2.6/wx/deprecated/treelay.h
+include/wx-2.6/wx/deprecated/wxexpr.h
+include/wx-2.6/wx/fl/antiflickpl.h
+include/wx-2.6/wx/fl/bardragpl.h
+include/wx-2.6/wx/fl/barhintspl.h
+include/wx-2.6/wx/fl/cbcustom.h
+include/wx-2.6/wx/fl/controlbar.h
+include/wx-2.6/wx/fl/dynbarhnd.h
+include/wx-2.6/wx/fl/dyntbar.h
+include/wx-2.6/wx/fl/dyntbarhnd.h
+include/wx-2.6/wx/fl/fldefs.h
+include/wx-2.6/wx/fl/frmview.h
+include/wx-2.6/wx/fl/garbagec.h
+include/wx-2.6/wx/fl/gcupdatesmgr.h
+include/wx-2.6/wx/fl/hintanimpl.h
+include/wx-2.6/wx/fl/newbmpbtn.h
+include/wx-2.6/wx/fl/panedrawpl.h
+include/wx-2.6/wx/fl/rowdragpl.h
+include/wx-2.6/wx/fl/rowlayoutpl.h
+include/wx-2.6/wx/fl/toolwnd.h
+include/wx-2.6/wx/fl/updatesmgr.h
+include/wx-2.6/wx/gizmos/dynamicsash.h
+include/wx-2.6/wx/gizmos/editlbox.h
+include/wx-2.6/wx/gizmos/gizmos.h
+include/wx-2.6/wx/gizmos/ledctrl.h
+include/wx-2.6/wx/gizmos/multicell.h
+include/wx-2.6/wx/gizmos/splittree.h
+include/wx-2.6/wx/gizmos/statpict.h
+include/wx-2.6/wx/gizmos/xh_statpict.h
+include/wx-2.6/wx/ogl/basic.h
+include/wx-2.6/wx/ogl/basicp.h
+include/wx-2.6/wx/ogl/bmpshape.h
+include/wx-2.6/wx/ogl/canvas.h
+include/wx-2.6/wx/ogl/composit.h
+include/wx-2.6/wx/ogl/constrnt.h
+include/wx-2.6/wx/ogl/divided.h
+include/wx-2.6/wx/ogl/drawn.h
+include/wx-2.6/wx/ogl/drawnp.h
+include/wx-2.6/wx/ogl/lines.h
+include/wx-2.6/wx/ogl/linesp.h
+include/wx-2.6/wx/ogl/mfutils.h
+include/wx-2.6/wx/ogl/misc.h
+include/wx-2.6/wx/ogl/ogl.h
+include/wx-2.6/wx/ogl/ogldiag.h
+include/wx-2.6/wx/plot/plot.h
+include/wx-2.6/wx/plot/plot_dwn.bmp
+include/wx-2.6/wx/plot/plot_enl.bmp
+include/wx-2.6/wx/plot/plot_shr.bmp
+include/wx-2.6/wx/plot/plot_up.bmp
+include/wx-2.6/wx/plot/plot_zin.bmp
+include/wx-2.6/wx/plot/plot_zot.bmp
+include/wx-2.6/wx/plot/wxplot.rc
+include/wx-2.6/wx/stc/stc.h
+include/wx-2.6/wx/svg/dcsvg.h
+@dirrm include/wx-2.6/wx/svg
+@dirrm include/wx-2.6/wx/stc
+@dirrm include/wx-2.6/wx/plot
+@dirrm include/wx-2.6/wx/ogl
+@dirrm include/wx-2.6/wx/gizmos
+@dirrm include/wx-2.6/wx/fl
+@dirrm include/wx-2.6/wx/deprecated
+@dirrm include/wx-2.6/wx/animate
diff --git a/x11-toolkits/wxgtk28-contrib/Makefile b/x11-toolkits/wxgtk28-contrib/Makefile
index 4c36af733fab..1eba77011e9f 100644
--- a/x11-toolkits/wxgtk28-contrib/Makefile
+++ b/x11-toolkits/wxgtk28-contrib/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-contrib-devel
+# New ports collection makefile for: wxgtk26-contrib
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
+COMMENT= The wxWidgets GUI toolkit contributed libraries
WXGTK_FLAVOR= gtk2-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-contrib/pkg-plist b/x11-toolkits/wxgtk28-contrib/pkg-plist
index 1e6d7fa75aab..1f11ca034c54 100644
--- a/x11-toolkits/wxgtk28-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib/pkg-plist
@@ -1,24 +1,27 @@
-lib/libwx_gtk2_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2_svg-2.5.so.3.0.0
+lib/libwx_gtk2_animate-2.6.so
+lib/libwx_gtk2_animate-2.6.so.0
+lib/libwx_gtk2_animate-2.6.so.0.0.0
+lib/libwx_gtk2_deprecated-2.6.so
+lib/libwx_gtk2_deprecated-2.6.so.0
+lib/libwx_gtk2_deprecated-2.6.so.0.0.0
+lib/libwx_gtk2_fl-2.6.so
+lib/libwx_gtk2_fl-2.6.so.0
+lib/libwx_gtk2_fl-2.6.so.0.0.0
+lib/libwx_gtk2_gizmos-2.6.so
+lib/libwx_gtk2_gizmos-2.6.so.0
+lib/libwx_gtk2_gizmos-2.6.so.0.0.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0.0.0
+lib/libwx_gtk2_ogl-2.6.so
+lib/libwx_gtk2_ogl-2.6.so.0
+lib/libwx_gtk2_ogl-2.6.so.0.0.0
+lib/libwx_gtk2_plot-2.6.so
+lib/libwx_gtk2_plot-2.6.so.0
+lib/libwx_gtk2_plot-2.6.so.0.0.0
+lib/libwx_gtk2_stc-2.6.so
+lib/libwx_gtk2_stc-2.6.so.0
+lib/libwx_gtk2_stc-2.6.so.0.0.0
+lib/libwx_gtk2_svg-2.6.so
+lib/libwx_gtk2_svg-2.6.so.0
+lib/libwx_gtk2_svg-2.6.so.0.0.0
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/Makefile b/x11-toolkits/wxgtk28-unicode-contrib/Makefile
index dd89483e1c61..62f0029a5019 100644
--- a/x11-toolkits/wxgtk28-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk28-unicode-contrib/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
+# New ports collection makefile for: wxgtk26-unicode-contrib
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
+COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
index 04a2c9b44b54..3abe095d45a8 100644
--- a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
@@ -1,24 +1,27 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
+lib/libwx_gtk2u_animate-2.6.so
+lib/libwx_gtk2u_animate-2.6.so.0
+lib/libwx_gtk2u_animate-2.6.so.0.0.0
+lib/libwx_gtk2u_deprecated-2.6.so
+lib/libwx_gtk2u_deprecated-2.6.so.0
+lib/libwx_gtk2u_deprecated-2.6.so.0.0.0
+lib/libwx_gtk2u_fl-2.6.so
+lib/libwx_gtk2u_fl-2.6.so.0
+lib/libwx_gtk2u_fl-2.6.so.0.0.0
+lib/libwx_gtk2u_gizmos-2.6.so
+lib/libwx_gtk2u_gizmos-2.6.so.0
+lib/libwx_gtk2u_gizmos-2.6.so.0.0.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0.0.0
+lib/libwx_gtk2u_ogl-2.6.so
+lib/libwx_gtk2u_ogl-2.6.so.0
+lib/libwx_gtk2u_ogl-2.6.so.0.0.0
+lib/libwx_gtk2u_plot-2.6.so
+lib/libwx_gtk2u_plot-2.6.so.0
+lib/libwx_gtk2u_plot-2.6.so.0.0.0
+lib/libwx_gtk2u_stc-2.6.so
+lib/libwx_gtk2u_stc-2.6.so.0
+lib/libwx_gtk2u_stc-2.6.so.0.0.0
+lib/libwx_gtk2u_svg-2.6.so
+lib/libwx_gtk2u_svg-2.6.so.0
+lib/libwx_gtk2u_svg-2.6.so.0.0.0
diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile
index dd89483e1c61..049949a2ab60 100644
--- a/x11-toolkits/wxgtk28-unicode/Makefile
+++ b/x11-toolkits/wxgtk28-unicode/Makefile
@@ -1,18 +1,14 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
+# New ports collection makefile for: wxgtk26-unicode
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
-
-CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
+COMMENT= The wxWidgets GUI toolkit (Unicode)
-WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+WXGTK_FLAVOR= gtk2-unicode
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-unicode/pkg-plist b/x11-toolkits/wxgtk28-unicode/pkg-plist
index 04a2c9b44b54..e52cb9661823 100644
--- a/x11-toolkits/wxgtk28-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode/pkg-plist
@@ -1,24 +1,35 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
+bin/wxgtk2u-2.6-config
+bin/wxrc-gtk2u-2.6
+include/wx-2.6/gtk2-unicode-release-2.6/wx/setup.h
+lib/libwx_baseu-2.6.so
+lib/libwx_baseu-2.6.so.0
+lib/libwx_baseu-2.6.so.0.0.0
+lib/libwx_baseu_net-2.6.so
+lib/libwx_baseu_net-2.6.so.0
+lib/libwx_baseu_net-2.6.so.0.0.0
+lib/libwx_baseu_xml-2.6.so
+lib/libwx_baseu_xml-2.6.so.0
+lib/libwx_baseu_xml-2.6.so.0.0.0
+lib/libwx_gtk2u_adv-2.6.so
+lib/libwx_gtk2u_adv-2.6.so.0
+lib/libwx_gtk2u_adv-2.6.so.0.0.0
+lib/libwx_gtk2u_core-2.6.so
+lib/libwx_gtk2u_core-2.6.so.0
+lib/libwx_gtk2u_core-2.6.so.0.0.0
+lib/libwx_gtk2u_gl-2.6.so
+lib/libwx_gtk2u_gl-2.6.so.0
+lib/libwx_gtk2u_gl-2.6.so.0.0.0
+lib/libwx_gtk2u_html-2.6.so
+lib/libwx_gtk2u_html-2.6.so.0
+lib/libwx_gtk2u_html-2.6.so.0.0.0
+lib/libwx_gtk2u_media-2.6.so
+lib/libwx_gtk2u_media-2.6.so.0
+lib/libwx_gtk2u_media-2.6.so.0.0.0
+lib/libwx_gtk2u_qa-2.6.so
+lib/libwx_gtk2u_qa-2.6.so.0
+lib/libwx_gtk2u_qa-2.6.so.0.0.0
+lib/libwx_gtk2u_xrc-2.6.so
+lib/libwx_gtk2u_xrc-2.6.so.0
+lib/libwx_gtk2u_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-unicode-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-unicode-release-2.6
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index beac69d10bff..1ee1cc80e3dd 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-devel
+# New ports collection makefile for: wxgtk26
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,15 +6,15 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.3
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
-PKGNAMESUFFIX= ${WXGTK_FLAVOR}-devel
+PKGNAMESUFFIX= ${WXGTK_FLAVOR}
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
-COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
+COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
jpeg.9:${PORTSDIR}/graphics/jpeg\
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libpng=sys\
--with-expat=sys\
--with-opengl\
--with-mspack\
- --enable-gtk2
+ --with-gtk
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv \
@@ -45,17 +45,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
PLIST= ${.CURDIR}/pkg-plist
-NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 2
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -70,12 +68,12 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
.else
-LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
.endif
pre-configure:
@@ -84,7 +82,7 @@ pre-configure:
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
+.endif # !gtk-contrib-common
.endif # *-contrib*
.include <bsd.port.pre.mk>
@@ -96,9 +94,9 @@ IGNORE= Systems prior to FreeBSD 5.0 currently out of support
CONFIGURE_ARGS+=--enable-unicode
.endif
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.5-config
+WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.6-config
.else
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.5-config
+WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.6-config
.endif # *-unicode*
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index ab4f811407f2..56d766416f01 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
-SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
+MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b
+SIZE (wxGTK-2.6.0.tar.bz2) = 7281025
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
index c9d72e6757c7..00bd63328a1d 100644
--- a/x11-toolkits/wxgtk28/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sun Oct 10 22:17:27 2004
-+++ Makefile.in Wed Nov 24 22:47:40 2004
+--- Makefile.in.orig Thu Apr 21 00:32:34 2005
++++ Makefile.in Thu May 5 16:11:02 2005
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,16 +8,16 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -7408,11 +7409,13 @@
+@@ -9127,11 +9128,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) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___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) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___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_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: 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_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___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 locale_install $(__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_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___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 $(__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-common: locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
@@ -25,7 +25,7 @@
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -7892,9 +7895,7 @@
+@@ -9664,9 +9667,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure
index ebac7a916f95..2b3d5be8d5c5 100644
--- a/x11-toolkits/wxgtk28/files/patch-configure
+++ b/x11-toolkits/wxgtk28/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon May 31 18:11:50 2004
-+++ configure Sun Jun 27 20:13:50 2004
-@@ -32707,7 +32707,7 @@
+--- configure.orig Thu Apr 21 00:32:34 2005
++++ configure Thu May 5 16:17:57 2005
+@@ -33918,7 +33918,7 @@
fi
;;
*-*-freebsd*)
@@ -9,7 +9,7 @@
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
-@@ -32744,6 +32744,12 @@
+@@ -33955,6 +33955,12 @@
echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
;;
@@ -22,7 +22,7 @@
-*)
echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
-@@ -34014,6 +34020,7 @@
+@@ -35210,6 +35216,7 @@
fi
fi
fi
@@ -30,7 +30,7 @@
if test "$WXGTK20" = 1 ; then
cat >>confdefs.h <<_ACEOF
-@@ -34134,7 +34141,7 @@
+@@ -35330,7 +35337,7 @@
OPTIMISE="-O"
fi
fi
@@ -39,17 +39,3 @@
if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -40123,6 +40130,13 @@
-
- case "${BAKEFILE_HOST}" in
- *-*-linux* )
-+ SONAME_FLAG="-Wl,-soname,"
-+ USE_SOVERSION=1
-+ USE_SOVERLINUX=1
-+ USE_SOSYMLINKS=1
-+ ;;
-+
-+ *-*-freebsd* )
- SONAME_FLAG="-Wl,-soname,"
- USE_SOVERSION=1
- USE_SOVERLINUX=1
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 b6e204d0704a..51b5ab5ee458 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 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)
+--- contrib/src/gizmos/Makefile.in.orig Thu Apr 21 00:33:08 2005
++++ contrib/src/gizmos/Makefile.in Thu May 5 16:22:48 2005
+@@ -277,6 +277,8 @@
+ all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
- install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+ install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
+
+install-common:
$(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 \
+ 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 wx/gizmos/xh_statpict.h; do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-PlatWX.cpp b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-PlatWX.cpp
deleted file mode 100644
index 3b9e39008930..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-PlatWX.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/stc/PlatWX.cpp.orig Sun Aug 15 14:41:28 2004
-+++ contrib/src/stc/PlatWX.cpp Sun Aug 15 14:40:11 2004
-@@ -18,7 +18,7 @@
- #include "wx/stc/stc.h"
-
-
--#ifdef __WXGTK__
-+#if 0
- #include <gtk/gtk.h>
- #endif
-
diff --git a/x11-toolkits/wxgtk28/files/patch-src-common-string.cpp b/x11-toolkits/wxgtk28/files/patch-src-common-string.cpp
deleted file mode 100644
index f88da4cc4be9..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-src-common-string.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/string.cpp.orig Mon Feb 21 15:53:48 2005
-+++ src/common/string.cpp Tue Feb 22 01:39:54 2005
-@@ -39,6 +39,7 @@
- #endif
-
- #include <ctype.h>
-+#include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-
-@@ -1956,6 +1957,9 @@
- // ok, there was enough space
- break;
- }
-+
-+ if (errno != EOVERFLOW)
-+ break;
-
- // still not enough, double it again
- size *= 2;
diff --git a/x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h
deleted file mode 100644
index a8688e1069c0..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-src-regex-regcustom.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 01f1f176215f..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-src-regex-regex.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-wx-config.in b/x11-toolkits/wxgtk28/files/patch-wx-config.in
index 0453477f8fbc..434032d26493 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 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@"
+--- wx-config.in.orig Thu Apr 21 00:32:34 2005
++++ wx-config.in Thu May 5 16:36:09 2005
+@@ -1142,7 +1142,7 @@
+ _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
fi
--_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@")
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_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@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
# 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 3f401620305b..f21ae0c20c86 100644
--- a/x11-toolkits/wxgtk28/pkg-plist
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -1,29 +1,35 @@
-bin/wxgtk2-2.5-config
-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.3
-lib/libwx_base-2.5.so.3.0.0
-lib/libwx_base_net-2.5.so
-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.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.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.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.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.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
+bin/wxgtk2-2.6-config
+bin/wxrc-gtk2-2.6
+include/wx-2.6/gtk2-ansi-release-2.6/wx/setup.h
+lib/libwx_base-2.6.so
+lib/libwx_base-2.6.so.0
+lib/libwx_base-2.6.so.0.0.0
+lib/libwx_base_net-2.6.so
+lib/libwx_base_net-2.6.so.0
+lib/libwx_base_net-2.6.so.0.0.0
+lib/libwx_base_xml-2.6.so
+lib/libwx_base_xml-2.6.so.0
+lib/libwx_base_xml-2.6.so.0.0.0
+lib/libwx_gtk2_adv-2.6.so
+lib/libwx_gtk2_adv-2.6.so.0
+lib/libwx_gtk2_adv-2.6.so.0.0.0
+lib/libwx_gtk2_core-2.6.so
+lib/libwx_gtk2_core-2.6.so.0
+lib/libwx_gtk2_core-2.6.so.0.0.0
+lib/libwx_gtk2_gl-2.6.so
+lib/libwx_gtk2_gl-2.6.so.0
+lib/libwx_gtk2_gl-2.6.so.0.0.0
+lib/libwx_gtk2_html-2.6.so
+lib/libwx_gtk2_html-2.6.so.0
+lib/libwx_gtk2_html-2.6.so.0.0.0
+lib/libwx_gtk2_media-2.6.so
+lib/libwx_gtk2_media-2.6.so.0
+lib/libwx_gtk2_media-2.6.so.0.0.0
+lib/libwx_gtk2_qa-2.6.so
+lib/libwx_gtk2_qa-2.6.so.0
+lib/libwx_gtk2_qa-2.6.so.0.0.0
+lib/libwx_gtk2_xrc-2.6.so
+lib/libwx_gtk2_xrc-2.6.so.0
+lib/libwx_gtk2_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6
diff --git a/x11-toolkits/wxgtk29-common/Makefile b/x11-toolkits/wxgtk29-common/Makefile
index f4f254513409..1bdbb9c01952 100644
--- a/x11-toolkits/wxgtk29-common/Makefile
+++ b/x11-toolkits/wxgtk29-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-common-devel
+# New ports collection makefile for: wxgtk26-common
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (devel version, common files)
+COMMENT= The wxWidgets GUI toolkit (common files)
WXGTK_FLAVOR= gtk2-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk29-common/pkg-plist b/x11-toolkits/wxgtk29-common/pkg-plist
index f68eebf220d8..2cfee8986833 100644
--- a/x11-toolkits/wxgtk29-common/pkg-plist
+++ b/x11-toolkits/wxgtk29-common/pkg-plist
@@ -1,442 +1,460 @@
-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
+include/wx-2.6/wx/accel.h
+include/wx-2.6/wx/access.h
+include/wx-2.6/wx/afterstd.h
+include/wx-2.6/wx/app.h
+include/wx-2.6/wx/apptrait.h
+include/wx-2.6/wx/archive.h
+include/wx-2.6/wx/arrimpl.cpp
+include/wx-2.6/wx/arrstr.h
+include/wx-2.6/wx/artprov.h
+include/wx-2.6/wx/beforestd.h
+include/wx-2.6/wx/bitmap.h
+include/wx-2.6/wx/bmpbuttn.h
+include/wx-2.6/wx/bookctrl.h
+include/wx-2.6/wx/brush.h
+include/wx-2.6/wx/buffer.h
+include/wx-2.6/wx/build.h
+include/wx-2.6/wx/busyinfo.h
+include/wx-2.6/wx/button.h
+include/wx-2.6/wx/calctrl.h
+include/wx-2.6/wx/caret.h
+include/wx-2.6/wx/checkbox.h
+include/wx-2.6/wx/checklst.h
+include/wx-2.6/wx/chkconf.h
+include/wx-2.6/wx/choicdlg.h
+include/wx-2.6/wx/choice.h
+include/wx-2.6/wx/choicebk.h
+include/wx-2.6/wx/clipbrd.h
+include/wx-2.6/wx/clntdata.h
+include/wx-2.6/wx/cmdline.h
+include/wx-2.6/wx/cmdproc.h
+include/wx-2.6/wx/cmndata.h
+include/wx-2.6/wx/colordlg.h
+include/wx-2.6/wx/colour.h
+include/wx-2.6/wx/combobox.h
+include/wx-2.6/wx/confbase.h
+include/wx-2.6/wx/config.h
+include/wx-2.6/wx/containr.h
+include/wx-2.6/wx/control.h
+include/wx-2.6/wx/cshelp.h
+include/wx-2.6/wx/ctrlsub.h
+include/wx-2.6/wx/cursor.h
+include/wx-2.6/wx/dataobj.h
+include/wx-2.6/wx/datectrl.h
+include/wx-2.6/wx/dateevt.h
+include/wx-2.6/wx/datetime.h
+include/wx-2.6/wx/datetime.inl
+include/wx-2.6/wx/datstrm.h
+include/wx-2.6/wx/db.h
+include/wx-2.6/wx/dbgrid.h
+include/wx-2.6/wx/dbkeyg.h
+include/wx-2.6/wx/dbtable.h
+include/wx-2.6/wx/dc.h
+include/wx-2.6/wx/dcbuffer.h
+include/wx-2.6/wx/dcclient.h
+include/wx-2.6/wx/dcmemory.h
+include/wx-2.6/wx/dcmirror.h
+include/wx-2.6/wx/dcprint.h
+include/wx-2.6/wx/dcps.h
+include/wx-2.6/wx/dcscreen.h
+include/wx-2.6/wx/dde.h
+include/wx-2.6/wx/debug.h
+include/wx-2.6/wx/debugrpt.h
+include/wx-2.6/wx/defs.h
+include/wx-2.6/wx/dialog.h
+include/wx-2.6/wx/dialup.h
+include/wx-2.6/wx/dir.h
+include/wx-2.6/wx/dirctrl.h
+include/wx-2.6/wx/dirdlg.h
+include/wx-2.6/wx/display.h
+include/wx-2.6/wx/dlimpexp.h
+include/wx-2.6/wx/dnd.h
+include/wx-2.6/wx/docmdi.h
+include/wx-2.6/wx/docview.h
+include/wx-2.6/wx/dragimag.h
+include/wx-2.6/wx/dynarray.h
+include/wx-2.6/wx/dynlib.h
+include/wx-2.6/wx/dynload.h
+include/wx-2.6/wx/effects.h
+include/wx-2.6/wx/encconv.h
+include/wx-2.6/wx/encinfo.h
+include/wx-2.6/wx/event.h
+include/wx-2.6/wx/evtloop.h
+include/wx-2.6/wx/except.h
+include/wx-2.6/wx/fdrepdlg.h
+include/wx-2.6/wx/features.h
+include/wx-2.6/wx/ffile.h
+include/wx-2.6/wx/file.h
+include/wx-2.6/wx/fileconf.h
+include/wx-2.6/wx/filedlg.h
+include/wx-2.6/wx/filefn.h
+include/wx-2.6/wx/filename.h
+include/wx-2.6/wx/filesys.h
+include/wx-2.6/wx/fmappriv.h
+include/wx-2.6/wx/font.h
+include/wx-2.6/wx/fontdlg.h
+include/wx-2.6/wx/fontenc.h
+include/wx-2.6/wx/fontenum.h
+include/wx-2.6/wx/fontmap.h
+include/wx-2.6/wx/fontutil.h
+include/wx-2.6/wx/frame.h
+include/wx-2.6/wx/fs_inet.h
+include/wx-2.6/wx/fs_mem.h
+include/wx-2.6/wx/fs_zip.h
+include/wx-2.6/wx/gauge.h
+include/wx-2.6/wx/gbsizer.h
+include/wx-2.6/wx/gdicmn.h
+include/wx-2.6/wx/gdiobj.h
+include/wx-2.6/wx/generic/accel.h
+include/wx-2.6/wx/generic/calctrl.h
+include/wx-2.6/wx/generic/caret.h
+include/wx-2.6/wx/generic/choicdgg.h
+include/wx-2.6/wx/generic/colrdlgg.h
+include/wx-2.6/wx/generic/datectrl.h
+include/wx-2.6/wx/generic/dcpsg.h
+include/wx-2.6/wx/generic/dirctrlg.h
+include/wx-2.6/wx/generic/dirdlgg.h
+include/wx-2.6/wx/generic/dragimgg.h
+include/wx-2.6/wx/generic/fdrepdlg.h
+include/wx-2.6/wx/generic/filedlgg.h
+include/wx-2.6/wx/generic/fontdlgg.h
+include/wx-2.6/wx/generic/grid.h
+include/wx-2.6/wx/generic/gridctrl.h
+include/wx-2.6/wx/generic/gridsel.h
+include/wx-2.6/wx/generic/helpext.h
+include/wx-2.6/wx/generic/imaglist.h
+include/wx-2.6/wx/generic/laywin.h
+include/wx-2.6/wx/generic/listctrl.h
+include/wx-2.6/wx/generic/logg.h
+include/wx-2.6/wx/generic/msgdlgg.h
+include/wx-2.6/wx/generic/notebook.h
+include/wx-2.6/wx/generic/numdlgg.h
+include/wx-2.6/wx/generic/paletteg.h
+include/wx-2.6/wx/generic/panelg.h
+include/wx-2.6/wx/generic/printps.h
+include/wx-2.6/wx/generic/prntdlgg.h
+include/wx-2.6/wx/generic/progdlgg.h
+include/wx-2.6/wx/generic/propdlg.h
+include/wx-2.6/wx/generic/sashwin.h
+include/wx-2.6/wx/generic/scrolwin.h
+include/wx-2.6/wx/generic/spinctlg.h
+include/wx-2.6/wx/generic/splash.h
+include/wx-2.6/wx/generic/splitter.h
+include/wx-2.6/wx/generic/statusbr.h
+include/wx-2.6/wx/generic/tabg.h
+include/wx-2.6/wx/generic/textdlgg.h
+include/wx-2.6/wx/generic/timer.h
+include/wx-2.6/wx/generic/treectlg.h
+include/wx-2.6/wx/generic/wizard.h
+include/wx-2.6/wx/geometry.h
+include/wx-2.6/wx/gifdecod.h
+include/wx-2.6/wx/glcanvas.h
+include/wx-2.6/wx/grid.h
+include/wx-2.6/wx/gsocket.h
+include/wx-2.6/wx/gtk/accel.h
+include/wx-2.6/wx/gtk/app.h
+include/wx-2.6/wx/gtk/bitmap.h
+include/wx-2.6/wx/gtk/bmpbuttn.h
+include/wx-2.6/wx/gtk/brush.h
+include/wx-2.6/wx/gtk/button.h
+include/wx-2.6/wx/gtk/checkbox.h
+include/wx-2.6/wx/gtk/checklst.h
+include/wx-2.6/wx/gtk/choice.h
+include/wx-2.6/wx/gtk/clipbrd.h
+include/wx-2.6/wx/gtk/colordlg.h
+include/wx-2.6/wx/gtk/colour.h
+include/wx-2.6/wx/gtk/combobox.h
+include/wx-2.6/wx/gtk/control.h
+include/wx-2.6/wx/gtk/cursor.h
+include/wx-2.6/wx/gtk/dataform.h
+include/wx-2.6/wx/gtk/dataobj.h
+include/wx-2.6/wx/gtk/dataobj2.h
+include/wx-2.6/wx/gtk/dc.h
+include/wx-2.6/wx/gtk/dcclient.h
+include/wx-2.6/wx/gtk/dcmemory.h
+include/wx-2.6/wx/gtk/dcscreen.h
+include/wx-2.6/wx/gtk/dialog.h
+include/wx-2.6/wx/gtk/dnd.h
+include/wx-2.6/wx/gtk/filedlg.h
+include/wx-2.6/wx/gtk/font.h
+include/wx-2.6/wx/gtk/fontdlg.h
+include/wx-2.6/wx/gtk/frame.h
+include/wx-2.6/wx/gtk/gauge.h
+include/wx-2.6/wx/gtk/gdiobj.h
+include/wx-2.6/wx/gtk/glcanvas.h
+include/wx-2.6/wx/gtk/gnome/gprint.h
+include/wx-2.6/wx/gtk/icon.h
+include/wx-2.6/wx/gtk/listbox.h
+include/wx-2.6/wx/gtk/mdi.h
+include/wx-2.6/wx/gtk/menu.h
+include/wx-2.6/wx/gtk/menuitem.h
+include/wx-2.6/wx/gtk/minifram.h
+include/wx-2.6/wx/gtk/msgdlg.h
+include/wx-2.6/wx/gtk/notebook.h
+include/wx-2.6/wx/gtk/pen.h
+include/wx-2.6/wx/gtk/popupwin.h
+include/wx-2.6/wx/gtk/radiobox.h
+include/wx-2.6/wx/gtk/radiobut.h
+include/wx-2.6/wx/gtk/region.h
+include/wx-2.6/wx/gtk/scrolbar.h
+include/wx-2.6/wx/gtk/scrolwin.h
+include/wx-2.6/wx/gtk/slider.h
+include/wx-2.6/wx/gtk/spinbutt.h
+include/wx-2.6/wx/gtk/spinctrl.h
+include/wx-2.6/wx/gtk/statbmp.h
+include/wx-2.6/wx/gtk/statbox.h
+include/wx-2.6/wx/gtk/statline.h
+include/wx-2.6/wx/gtk/stattext.h
+include/wx-2.6/wx/gtk/tbargtk.h
+include/wx-2.6/wx/gtk/textctrl.h
+include/wx-2.6/wx/gtk/tglbtn.h
+include/wx-2.6/wx/gtk/timer.h
+include/wx-2.6/wx/gtk/tooltip.h
+include/wx-2.6/wx/gtk/toplevel.h
+include/wx-2.6/wx/gtk/treectrl.h
+include/wx-2.6/wx/gtk/win_gtk.h
+include/wx-2.6/wx/gtk/window.h
+include/wx-2.6/wx/hash.h
+include/wx-2.6/wx/hashmap.h
+include/wx-2.6/wx/hashset.h
+include/wx-2.6/wx/help.h
+include/wx-2.6/wx/helpbase.h
+include/wx-2.6/wx/helphtml.h
+include/wx-2.6/wx/helpwin.h
+include/wx-2.6/wx/html/forcelnk.h
+include/wx-2.6/wx/html/helpctrl.h
+include/wx-2.6/wx/html/helpdata.h
+include/wx-2.6/wx/html/helpfrm.h
+include/wx-2.6/wx/html/htmlcell.h
+include/wx-2.6/wx/html/htmldefs.h
+include/wx-2.6/wx/html/htmlfilt.h
+include/wx-2.6/wx/html/htmlpars.h
+include/wx-2.6/wx/html/htmlproc.h
+include/wx-2.6/wx/html/htmltag.h
+include/wx-2.6/wx/html/htmlwin.h
+include/wx-2.6/wx/html/htmprint.h
+include/wx-2.6/wx/html/m_templ.h
+include/wx-2.6/wx/html/winpars.h
+include/wx-2.6/wx/htmllbox.h
+include/wx-2.6/wx/icon.h
+include/wx-2.6/wx/iconbndl.h
+include/wx-2.6/wx/iconloc.h
+include/wx-2.6/wx/imagbmp.h
+include/wx-2.6/wx/image.h
+include/wx-2.6/wx/imaggif.h
+include/wx-2.6/wx/imagiff.h
+include/wx-2.6/wx/imagjpeg.h
+include/wx-2.6/wx/imaglist.h
+include/wx-2.6/wx/imagpcx.h
+include/wx-2.6/wx/imagpng.h
+include/wx-2.6/wx/imagpnm.h
+include/wx-2.6/wx/imagtiff.h
+include/wx-2.6/wx/imagxpm.h
+include/wx-2.6/wx/init.h
+include/wx-2.6/wx/intl.h
+include/wx-2.6/wx/iosfwrap.h
+include/wx-2.6/wx/ioswrap.h
+include/wx-2.6/wx/ipc.h
+include/wx-2.6/wx/ipcbase.h
+include/wx-2.6/wx/isql.h
+include/wx-2.6/wx/isqlext.h
+include/wx-2.6/wx/joystick.h
+include/wx-2.6/wx/layout.h
+include/wx-2.6/wx/laywin.h
+include/wx-2.6/wx/list.h
+include/wx-2.6/wx/listbase.h
+include/wx-2.6/wx/listbook.h
+include/wx-2.6/wx/listbox.h
+include/wx-2.6/wx/listctrl.h
+include/wx-2.6/wx/listimpl.cpp
+include/wx-2.6/wx/log.h
+include/wx-2.6/wx/longlong.h
+include/wx-2.6/wx/math.h
+include/wx-2.6/wx/matrix.h
+include/wx-2.6/wx/mdi.h
+include/wx-2.6/wx/mediactrl.h
+include/wx-2.6/wx/memconf.h
+include/wx-2.6/wx/memory.h
+include/wx-2.6/wx/memtext.h
+include/wx-2.6/wx/menu.h
+include/wx-2.6/wx/menuitem.h
+include/wx-2.6/wx/metafile.h
+include/wx-2.6/wx/mimetype.h
+include/wx-2.6/wx/minifram.h
+include/wx-2.6/wx/module.h
+include/wx-2.6/wx/msgdlg.h
+include/wx-2.6/wx/msgout.h
+include/wx-2.6/wx/mstream.h
+include/wx-2.6/wx/notebook.h
+include/wx-2.6/wx/numdlg.h
+include/wx-2.6/wx/object.h
+include/wx-2.6/wx/ownerdrw.h
+include/wx-2.6/wx/palette.h
+include/wx-2.6/wx/panel.h
+include/wx-2.6/wx/paper.h
+include/wx-2.6/wx/pen.h
+include/wx-2.6/wx/platform.h
+include/wx-2.6/wx/popupwin.h
+include/wx-2.6/wx/print.h
+include/wx-2.6/wx/printdlg.h
+include/wx-2.6/wx/prntbase.h
+include/wx-2.6/wx/process.h
+include/wx-2.6/wx/progdlg.h
+include/wx-2.6/wx/propdlg.h
+include/wx-2.6/wx/protocol/file.h
+include/wx-2.6/wx/protocol/ftp.h
+include/wx-2.6/wx/protocol/http.h
+include/wx-2.6/wx/protocol/protocol.h
+include/wx-2.6/wx/ptr_scpd.h
+include/wx-2.6/wx/quantize.h
+include/wx-2.6/wx/radiobox.h
+include/wx-2.6/wx/radiobut.h
+include/wx-2.6/wx/rawbmp.h
+include/wx-2.6/wx/regex.h
+include/wx-2.6/wx/region.h
+include/wx-2.6/wx/renderer.h
+include/wx-2.6/wx/sashwin.h
+include/wx-2.6/wx/sckaddr.h
+include/wx-2.6/wx/sckipc.h
+include/wx-2.6/wx/sckstrm.h
+include/wx-2.6/wx/scopeguard.h
+include/wx-2.6/wx/scrolbar.h
+include/wx-2.6/wx/scrolwin.h
+include/wx-2.6/wx/selstore.h
+include/wx-2.6/wx/settings.h
+include/wx-2.6/wx/sizer.h
+include/wx-2.6/wx/slider.h
+include/wx-2.6/wx/snglinst.h
+include/wx-2.6/wx/socket.h
+include/wx-2.6/wx/sound.h
+include/wx-2.6/wx/spinbutt.h
+include/wx-2.6/wx/spinctrl.h
+include/wx-2.6/wx/splash.h
+include/wx-2.6/wx/splitter.h
+include/wx-2.6/wx/sstream.h
+include/wx-2.6/wx/stack.h
+include/wx-2.6/wx/stackwalk.h
+include/wx-2.6/wx/statbmp.h
+include/wx-2.6/wx/statbox.h
+include/wx-2.6/wx/statline.h
+include/wx-2.6/wx/stattext.h
+include/wx-2.6/wx/statusbr.h
+include/wx-2.6/wx/stdpaths.h
+include/wx-2.6/wx/stockitem.h
+include/wx-2.6/wx/stopwatch.h
+include/wx-2.6/wx/strconv.h
+include/wx-2.6/wx/stream.h
+include/wx-2.6/wx/string.h
+include/wx-2.6/wx/sysopt.h
+include/wx-2.6/wx/tab.h
+include/wx-2.6/wx/tabctrl.h
+include/wx-2.6/wx/taskbar.h
+include/wx-2.6/wx/tbarbase.h
+include/wx-2.6/wx/textbuf.h
+include/wx-2.6/wx/textctrl.h
+include/wx-2.6/wx/textdlg.h
+include/wx-2.6/wx/textfile.h
+include/wx-2.6/wx/tglbtn.h
+include/wx-2.6/wx/thread.h
+include/wx-2.6/wx/thrimpl.cpp
+include/wx-2.6/wx/timer.h
+include/wx-2.6/wx/tipdlg.h
+include/wx-2.6/wx/tipwin.h
+include/wx-2.6/wx/tokenzr.h
+include/wx-2.6/wx/toolbar.h
+include/wx-2.6/wx/tooltip.h
+include/wx-2.6/wx/toplevel.h
+include/wx-2.6/wx/treebase.h
+include/wx-2.6/wx/treectrl.h
+include/wx-2.6/wx/txtstrm.h
+include/wx-2.6/wx/types.h
+include/wx-2.6/wx/unix/apptbase.h
+include/wx-2.6/wx/unix/apptrait.h
+include/wx-2.6/wx/unix/displayx11.h
+include/wx-2.6/wx/unix/execute.h
+include/wx-2.6/wx/unix/fontutil.h
+include/wx-2.6/wx/unix/gsockunx.h
+include/wx-2.6/wx/unix/joystick.h
+include/wx-2.6/wx/unix/mimetype.h
+include/wx-2.6/wx/unix/pipe.h
+include/wx-2.6/wx/unix/sound.h
+include/wx-2.6/wx/unix/stackwalk.h
+include/wx-2.6/wx/unix/stdpaths.h
+include/wx-2.6/wx/unix/taskbarx11.h
+include/wx-2.6/wx/unix/utilsx11.h
+include/wx-2.6/wx/uri.h
+include/wx-2.6/wx/url.h
+include/wx-2.6/wx/utils.h
+include/wx-2.6/wx/valgen.h
+include/wx-2.6/wx/validate.h
+include/wx-2.6/wx/valtext.h
+include/wx-2.6/wx/variant.h
+include/wx-2.6/wx/vector.h
+include/wx-2.6/wx/version.h
+include/wx-2.6/wx/vidmode.h
+include/wx-2.6/wx/vlbox.h
+include/wx-2.6/wx/vms_x_fix.h
+include/wx-2.6/wx/volume.h
+include/wx-2.6/wx/vscroll.h
+include/wx-2.6/wx/wave.h
+include/wx-2.6/wx/wfstream.h
+include/wx-2.6/wx/window.h
+include/wx-2.6/wx/wizard.h
+include/wx-2.6/wx/wx.h
+include/wx-2.6/wx/wxchar.h
+include/wx-2.6/wx/wxhtml.h
+include/wx-2.6/wx/wxprec.h
+include/wx-2.6/wx/xml/xml.h
+include/wx-2.6/wx/xpmdecod.h
+include/wx-2.6/wx/xpmhand.h
+include/wx-2.6/wx/xrc/xh_all.h
+include/wx-2.6/wx/xrc/xh_bmp.h
+include/wx-2.6/wx/xrc/xh_bmpbt.h
+include/wx-2.6/wx/xrc/xh_bttn.h
+include/wx-2.6/wx/xrc/xh_cald.h
+include/wx-2.6/wx/xrc/xh_chckb.h
+include/wx-2.6/wx/xrc/xh_chckl.h
+include/wx-2.6/wx/xrc/xh_choic.h
+include/wx-2.6/wx/xrc/xh_choicbk.h
+include/wx-2.6/wx/xrc/xh_combo.h
+include/wx-2.6/wx/xrc/xh_datectrl.h
+include/wx-2.6/wx/xrc/xh_dlg.h
+include/wx-2.6/wx/xrc/xh_frame.h
+include/wx-2.6/wx/xrc/xh_gauge.h
+include/wx-2.6/wx/xrc/xh_gdctl.h
+include/wx-2.6/wx/xrc/xh_html.h
+include/wx-2.6/wx/xrc/xh_listb.h
+include/wx-2.6/wx/xrc/xh_listbk.h
+include/wx-2.6/wx/xrc/xh_listc.h
+include/wx-2.6/wx/xrc/xh_mdi.h
+include/wx-2.6/wx/xrc/xh_menu.h
+include/wx-2.6/wx/xrc/xh_notbk.h
+include/wx-2.6/wx/xrc/xh_panel.h
+include/wx-2.6/wx/xrc/xh_radbt.h
+include/wx-2.6/wx/xrc/xh_radbx.h
+include/wx-2.6/wx/xrc/xh_scrol.h
+include/wx-2.6/wx/xrc/xh_scwin.h
+include/wx-2.6/wx/xrc/xh_sizer.h
+include/wx-2.6/wx/xrc/xh_slidr.h
+include/wx-2.6/wx/xrc/xh_spin.h
+include/wx-2.6/wx/xrc/xh_split.h
+include/wx-2.6/wx/xrc/xh_statbar.h
+include/wx-2.6/wx/xrc/xh_stbmp.h
+include/wx-2.6/wx/xrc/xh_stbox.h
+include/wx-2.6/wx/xrc/xh_stlin.h
+include/wx-2.6/wx/xrc/xh_sttxt.h
+include/wx-2.6/wx/xrc/xh_text.h
+include/wx-2.6/wx/xrc/xh_tglbtn.h
+include/wx-2.6/wx/xrc/xh_toolb.h
+include/wx-2.6/wx/xrc/xh_tree.h
+include/wx-2.6/wx/xrc/xh_unkwn.h
+include/wx-2.6/wx/xrc/xh_wizrd.h
+include/wx-2.6/wx/xrc/xmlres.h
+include/wx-2.6/wx/xti.h
+include/wx-2.6/wx/xtistrm.h
+include/wx-2.6/wx/xtixml.h
+include/wx-2.6/wx/zipstrm.h
+include/wx-2.6/wx/zstream.h
share/aclocal/wxwin.m4
share/locale/ca/LC_MESSAGES/wxstd.mo
share/locale/cs/LC_MESSAGES/wxstd.mo
@@ -459,42 +477,13 @@ share/locale/tr/LC_MESSAGES/wxstd.mo
share/locale/uk/LC_MESSAGES/wxstd.mo
share/locale/zh_CN/LC_MESSAGES/wxstd.mo
share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-share/wx/2.5/afm/Cour.afm
-share/wx/2.5/afm/CourBo.afm
-share/wx/2.5/afm/CourBoO.afm
-share/wx/2.5/afm/CourO.afm
-share/wx/2.5/afm/Helv.afm
-share/wx/2.5/afm/HelvBo.afm
-share/wx/2.5/afm/HelvBoO.afm
-share/wx/2.5/afm/HelvO.afm
-share/wx/2.5/afm/TimesBo.afm
-share/wx/2.5/afm/TimesBoO.afm
-share/wx/2.5/afm/TimesO.afm
-share/wx/2.5/afm/TimesRo.afm
-share/wx/2.5/afm/Zapf.afm
-share/wx/2.5/gs_afm/Cour.afm
-share/wx/2.5/gs_afm/CourBo.afm
-share/wx/2.5/gs_afm/CourBoO.afm
-share/wx/2.5/gs_afm/CourO.afm
-share/wx/2.5/gs_afm/Helv.afm
-share/wx/2.5/gs_afm/HelvBo.afm
-share/wx/2.5/gs_afm/HelvBoO.afm
-share/wx/2.5/gs_afm/HelvO.afm
-share/wx/2.5/gs_afm/TimesBo.afm
-share/wx/2.5/gs_afm/TimesBoO.afm
-share/wx/2.5/gs_afm/TimesO.afm
-share/wx/2.5/gs_afm/TimesRo.afm
-share/wx/2.5/gs_afm/Zapf.afm
-@dirrm share/wx/2.5/gs_afm
-@dirrm share/wx/2.5/afm
-@dirrm share/wx/2.5
-@dirrm share/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
+@dirrm include/wx-2.6/wx/xrc
+@dirrm include/wx-2.6/wx/xml
+@dirrm include/wx-2.6/wx/unix
+@dirrm include/wx-2.6/wx/protocol
+@dirrm include/wx-2.6/wx/html
+@dirrm include/wx-2.6/wx/gtk/gnome
+@dirrm include/wx-2.6/wx/gtk
+@dirrm include/wx-2.6/wx/generic
+@dirrm include/wx-2.6/wx
+@dirrm include/wx-2.6
diff --git a/x11-toolkits/wxgtk29-contrib-common/Makefile b/x11-toolkits/wxgtk29-contrib-common/Makefile
index 8a04a418aff9..58d6c54ebe6c 100644
--- a/x11-toolkits/wxgtk29-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk29-contrib-common/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-contrib-common-devel
+# New ports collection makefile for: wxgtk26-contrib-common
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, common files)
+COMMENT= The wxWidgets GUI toolkit contributed libraries (common files)
WXGTK_FLAVOR= gtk2-contrib-common
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk29-contrib-common/pkg-plist b/x11-toolkits/wxgtk29-contrib-common/pkg-plist
index 49656f547325..d1b3bf27ac1a 100644
--- a/x11-toolkits/wxgtk29-contrib-common/pkg-plist
+++ b/x11-toolkits/wxgtk29-contrib-common/pkg-plist
@@ -1,69 +1,70 @@
-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
+include/wx-2.6/wx/animate/animate.h
+include/wx-2.6/wx/deprecated/expr.h
+include/wx-2.6/wx/deprecated/prop.h
+include/wx-2.6/wx/deprecated/propform.h
+include/wx-2.6/wx/deprecated/proplist.h
+include/wx-2.6/wx/deprecated/resource.h
+include/wx-2.6/wx/deprecated/setup.h
+include/wx-2.6/wx/deprecated/tbarsmpl.h
+include/wx-2.6/wx/deprecated/treelay.h
+include/wx-2.6/wx/deprecated/wxexpr.h
+include/wx-2.6/wx/fl/antiflickpl.h
+include/wx-2.6/wx/fl/bardragpl.h
+include/wx-2.6/wx/fl/barhintspl.h
+include/wx-2.6/wx/fl/cbcustom.h
+include/wx-2.6/wx/fl/controlbar.h
+include/wx-2.6/wx/fl/dynbarhnd.h
+include/wx-2.6/wx/fl/dyntbar.h
+include/wx-2.6/wx/fl/dyntbarhnd.h
+include/wx-2.6/wx/fl/fldefs.h
+include/wx-2.6/wx/fl/frmview.h
+include/wx-2.6/wx/fl/garbagec.h
+include/wx-2.6/wx/fl/gcupdatesmgr.h
+include/wx-2.6/wx/fl/hintanimpl.h
+include/wx-2.6/wx/fl/newbmpbtn.h
+include/wx-2.6/wx/fl/panedrawpl.h
+include/wx-2.6/wx/fl/rowdragpl.h
+include/wx-2.6/wx/fl/rowlayoutpl.h
+include/wx-2.6/wx/fl/toolwnd.h
+include/wx-2.6/wx/fl/updatesmgr.h
+include/wx-2.6/wx/gizmos/dynamicsash.h
+include/wx-2.6/wx/gizmos/editlbox.h
+include/wx-2.6/wx/gizmos/gizmos.h
+include/wx-2.6/wx/gizmos/ledctrl.h
+include/wx-2.6/wx/gizmos/multicell.h
+include/wx-2.6/wx/gizmos/splittree.h
+include/wx-2.6/wx/gizmos/statpict.h
+include/wx-2.6/wx/gizmos/xh_statpict.h
+include/wx-2.6/wx/ogl/basic.h
+include/wx-2.6/wx/ogl/basicp.h
+include/wx-2.6/wx/ogl/bmpshape.h
+include/wx-2.6/wx/ogl/canvas.h
+include/wx-2.6/wx/ogl/composit.h
+include/wx-2.6/wx/ogl/constrnt.h
+include/wx-2.6/wx/ogl/divided.h
+include/wx-2.6/wx/ogl/drawn.h
+include/wx-2.6/wx/ogl/drawnp.h
+include/wx-2.6/wx/ogl/lines.h
+include/wx-2.6/wx/ogl/linesp.h
+include/wx-2.6/wx/ogl/mfutils.h
+include/wx-2.6/wx/ogl/misc.h
+include/wx-2.6/wx/ogl/ogl.h
+include/wx-2.6/wx/ogl/ogldiag.h
+include/wx-2.6/wx/plot/plot.h
+include/wx-2.6/wx/plot/plot_dwn.bmp
+include/wx-2.6/wx/plot/plot_enl.bmp
+include/wx-2.6/wx/plot/plot_shr.bmp
+include/wx-2.6/wx/plot/plot_up.bmp
+include/wx-2.6/wx/plot/plot_zin.bmp
+include/wx-2.6/wx/plot/plot_zot.bmp
+include/wx-2.6/wx/plot/wxplot.rc
+include/wx-2.6/wx/stc/stc.h
+include/wx-2.6/wx/svg/dcsvg.h
+@dirrm include/wx-2.6/wx/svg
+@dirrm include/wx-2.6/wx/stc
+@dirrm include/wx-2.6/wx/plot
+@dirrm include/wx-2.6/wx/ogl
+@dirrm include/wx-2.6/wx/gizmos
+@dirrm include/wx-2.6/wx/fl
+@dirrm include/wx-2.6/wx/deprecated
+@dirrm include/wx-2.6/wx/animate
diff --git a/x11-toolkits/wxgtk29-contrib/Makefile b/x11-toolkits/wxgtk29-contrib/Makefile
index 4c36af733fab..1eba77011e9f 100644
--- a/x11-toolkits/wxgtk29-contrib/Makefile
+++ b/x11-toolkits/wxgtk29-contrib/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-contrib-devel
+# New ports collection makefile for: wxgtk26-contrib
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,9 +6,9 @@
#
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version)
+COMMENT= The wxWidgets GUI toolkit contributed libraries
WXGTK_FLAVOR= gtk2-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk29-contrib/pkg-plist b/x11-toolkits/wxgtk29-contrib/pkg-plist
index 1e6d7fa75aab..1f11ca034c54 100644
--- a/x11-toolkits/wxgtk29-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-contrib/pkg-plist
@@ -1,24 +1,27 @@
-lib/libwx_gtk2_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2_svg-2.5.so.3.0.0
+lib/libwx_gtk2_animate-2.6.so
+lib/libwx_gtk2_animate-2.6.so.0
+lib/libwx_gtk2_animate-2.6.so.0.0.0
+lib/libwx_gtk2_deprecated-2.6.so
+lib/libwx_gtk2_deprecated-2.6.so.0
+lib/libwx_gtk2_deprecated-2.6.so.0.0.0
+lib/libwx_gtk2_fl-2.6.so
+lib/libwx_gtk2_fl-2.6.so.0
+lib/libwx_gtk2_fl-2.6.so.0.0.0
+lib/libwx_gtk2_gizmos-2.6.so
+lib/libwx_gtk2_gizmos-2.6.so.0
+lib/libwx_gtk2_gizmos-2.6.so.0.0.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0.0.0
+lib/libwx_gtk2_ogl-2.6.so
+lib/libwx_gtk2_ogl-2.6.so.0
+lib/libwx_gtk2_ogl-2.6.so.0.0.0
+lib/libwx_gtk2_plot-2.6.so
+lib/libwx_gtk2_plot-2.6.so.0
+lib/libwx_gtk2_plot-2.6.so.0.0.0
+lib/libwx_gtk2_stc-2.6.so
+lib/libwx_gtk2_stc-2.6.so.0
+lib/libwx_gtk2_stc-2.6.so.0.0.0
+lib/libwx_gtk2_svg-2.6.so
+lib/libwx_gtk2_svg-2.6.so.0
+lib/libwx_gtk2_svg-2.6.so.0.0.0
diff --git a/x11-toolkits/wxgtk29-unicode-contrib/Makefile b/x11-toolkits/wxgtk29-unicode-contrib/Makefile
index dd89483e1c61..62f0029a5019 100644
--- a/x11-toolkits/wxgtk29-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk29-unicode-contrib/Makefile
@@ -1,18 +1,16 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
+# New ports collection makefile for: wxgtk26-unicode-contrib
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
+COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
index 04a2c9b44b54..3abe095d45a8 100644
--- a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
@@ -1,24 +1,27 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
+lib/libwx_gtk2u_animate-2.6.so
+lib/libwx_gtk2u_animate-2.6.so.0
+lib/libwx_gtk2u_animate-2.6.so.0.0.0
+lib/libwx_gtk2u_deprecated-2.6.so
+lib/libwx_gtk2u_deprecated-2.6.so.0
+lib/libwx_gtk2u_deprecated-2.6.so.0.0.0
+lib/libwx_gtk2u_fl-2.6.so
+lib/libwx_gtk2u_fl-2.6.so.0
+lib/libwx_gtk2u_fl-2.6.so.0.0.0
+lib/libwx_gtk2u_gizmos-2.6.so
+lib/libwx_gtk2u_gizmos-2.6.so.0
+lib/libwx_gtk2u_gizmos-2.6.so.0.0.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0.0.0
+lib/libwx_gtk2u_ogl-2.6.so
+lib/libwx_gtk2u_ogl-2.6.so.0
+lib/libwx_gtk2u_ogl-2.6.so.0.0.0
+lib/libwx_gtk2u_plot-2.6.so
+lib/libwx_gtk2u_plot-2.6.so.0
+lib/libwx_gtk2u_plot-2.6.so.0.0.0
+lib/libwx_gtk2u_stc-2.6.so
+lib/libwx_gtk2u_stc-2.6.so.0
+lib/libwx_gtk2u_stc-2.6.so.0.0.0
+lib/libwx_gtk2u_svg-2.6.so
+lib/libwx_gtk2u_svg-2.6.so.0
+lib/libwx_gtk2u_svg-2.6.so.0.0.0
diff --git a/x11-toolkits/wxgtk29-unicode/Makefile b/x11-toolkits/wxgtk29-unicode/Makefile
index dd89483e1c61..049949a2ab60 100644
--- a/x11-toolkits/wxgtk29-unicode/Makefile
+++ b/x11-toolkits/wxgtk29-unicode/Makefile
@@ -1,18 +1,14 @@
-# New ports collection makefile for: wxgtk2-unicode-contrib-devel
+# New ports collection makefile for: wxgtk26-unicode
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
# $FreeBSD$
#
-PORTREVISION= 2
-
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (devel version, Unicode)
-
-CONFLICTS= wxgtk2-unicode-contrib-devel-2.5.2*
+COMMENT= The wxWidgets GUI toolkit (Unicode)
-WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk2-devel
+WXGTK_FLAVOR= gtk2-unicode
+MASTERDIR= ${.CURDIR}/../wxgtk26
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk29-unicode/pkg-plist b/x11-toolkits/wxgtk29-unicode/pkg-plist
index 04a2c9b44b54..e52cb9661823 100644
--- a/x11-toolkits/wxgtk29-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode/pkg-plist
@@ -1,24 +1,35 @@
-lib/libwx_gtk2u_animate-2.5.so
-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.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.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.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.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.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.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.3
-lib/libwx_gtk2u_svg-2.5.so.3.0.0
+bin/wxgtk2u-2.6-config
+bin/wxrc-gtk2u-2.6
+include/wx-2.6/gtk2-unicode-release-2.6/wx/setup.h
+lib/libwx_baseu-2.6.so
+lib/libwx_baseu-2.6.so.0
+lib/libwx_baseu-2.6.so.0.0.0
+lib/libwx_baseu_net-2.6.so
+lib/libwx_baseu_net-2.6.so.0
+lib/libwx_baseu_net-2.6.so.0.0.0
+lib/libwx_baseu_xml-2.6.so
+lib/libwx_baseu_xml-2.6.so.0
+lib/libwx_baseu_xml-2.6.so.0.0.0
+lib/libwx_gtk2u_adv-2.6.so
+lib/libwx_gtk2u_adv-2.6.so.0
+lib/libwx_gtk2u_adv-2.6.so.0.0.0
+lib/libwx_gtk2u_core-2.6.so
+lib/libwx_gtk2u_core-2.6.so.0
+lib/libwx_gtk2u_core-2.6.so.0.0.0
+lib/libwx_gtk2u_gl-2.6.so
+lib/libwx_gtk2u_gl-2.6.so.0
+lib/libwx_gtk2u_gl-2.6.so.0.0.0
+lib/libwx_gtk2u_html-2.6.so
+lib/libwx_gtk2u_html-2.6.so.0
+lib/libwx_gtk2u_html-2.6.so.0.0.0
+lib/libwx_gtk2u_media-2.6.so
+lib/libwx_gtk2u_media-2.6.so.0
+lib/libwx_gtk2u_media-2.6.so.0.0.0
+lib/libwx_gtk2u_qa-2.6.so
+lib/libwx_gtk2u_qa-2.6.so.0
+lib/libwx_gtk2u_qa-2.6.so.0.0.0
+lib/libwx_gtk2u_xrc-2.6.so
+lib/libwx_gtk2u_xrc-2.6.so.0
+lib/libwx_gtk2u_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-unicode-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-unicode-release-2.6
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index beac69d10bff..1ee1cc80e3dd 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: wxgtk2-devel
+# New ports collection makefile for: wxgtk26
# Date created: June 27, 2004
# Whom: fjoe@FreeBSD.ORG
#
@@ -6,15 +6,15 @@
#
PORTNAME= wx
-PORTVERSION= 2.5.3
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
-PKGNAMESUFFIX= ${WXGTK_FLAVOR}-devel
+PKGNAMESUFFIX= ${WXGTK_FLAVOR}
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
-COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
+COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
jpeg.9:${PORTSDIR}/graphics/jpeg\
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --with-libpng=sys\
--with-expat=sys\
--with-opengl\
--with-mspack\
- --enable-gtk2
+ --with-gtk
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv \
@@ -45,17 +45,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
PLIST= ${.CURDIR}/pkg-plist
-NO_LATEST_LINK= yes
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 2
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
.if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
.endif
.if ${WXGTK_FLAVOR:M*-common} != ""
@@ -70,12 +68,12 @@ BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS= ${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+= wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+= wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
.else
-LIB_DEPENDS+= wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+= wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
.endif
pre-configure:
@@ -84,7 +82,7 @@ pre-configure:
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
+.endif # !gtk-contrib-common
.endif # *-contrib*
.include <bsd.port.pre.mk>
@@ -96,9 +94,9 @@ IGNORE= Systems prior to FreeBSD 5.0 currently out of support
CONFIGURE_ARGS+=--enable-unicode
.endif
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.5-config
+WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2u-2.6-config
.else
-WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.5-config
+WXGTK_CONFIG= ${X11BASE}/bin/wxgtk2-2.6-config
.endif # *-unicode*
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index ab4f811407f2..56d766416f01 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
-SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
+MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b
+SIZE (wxGTK-2.6.0.tar.bz2) = 7281025
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index c9d72e6757c7..00bd63328a1d 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sun Oct 10 22:17:27 2004
-+++ Makefile.in Wed Nov 24 22:47:40 2004
+--- Makefile.in.orig Thu Apr 21 00:32:34 2005
++++ Makefile.in Thu May 5 16:11:02 2005
@@ -23,6 +23,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,16 +8,16 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -7408,11 +7409,13 @@
+@@ -9127,11 +9128,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) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___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) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___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_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: 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_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___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 locale_install $(__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_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___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 $(__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-common: locale_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
@@ -25,7 +25,7 @@
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -7892,9 +7895,7 @@
+@@ -9664,9 +9667,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk29/files/patch-configure b/x11-toolkits/wxgtk29/files/patch-configure
index ebac7a916f95..2b3d5be8d5c5 100644
--- a/x11-toolkits/wxgtk29/files/patch-configure
+++ b/x11-toolkits/wxgtk29/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon May 31 18:11:50 2004
-+++ configure Sun Jun 27 20:13:50 2004
-@@ -32707,7 +32707,7 @@
+--- configure.orig Thu Apr 21 00:32:34 2005
++++ configure Thu May 5 16:17:57 2005
+@@ -33918,7 +33918,7 @@
fi
;;
*-*-freebsd*)
@@ -9,7 +9,7 @@
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
-@@ -32744,6 +32744,12 @@
+@@ -33955,6 +33955,12 @@
echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
;;
@@ -22,7 +22,7 @@
-*)
echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
-@@ -34014,6 +34020,7 @@
+@@ -35210,6 +35216,7 @@
fi
fi
fi
@@ -30,7 +30,7 @@
if test "$WXGTK20" = 1 ; then
cat >>confdefs.h <<_ACEOF
-@@ -34134,7 +34141,7 @@
+@@ -35330,7 +35337,7 @@
OPTIMISE="-O"
fi
fi
@@ -39,17 +39,3 @@
if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -40123,6 +40130,13 @@
-
- case "${BAKEFILE_HOST}" in
- *-*-linux* )
-+ SONAME_FLAG="-Wl,-soname,"
-+ USE_SOVERSION=1
-+ USE_SOVERLINUX=1
-+ USE_SOSYMLINKS=1
-+ ;;
-+
-+ *-*-freebsd* )
- SONAME_FLAG="-Wl,-soname,"
- USE_SOVERSION=1
- USE_SOVERLINUX=1
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 b6e204d0704a..51b5ab5ee458 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 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)
+--- contrib/src/gizmos/Makefile.in.orig Thu Apr 21 00:33:08 2005
++++ contrib/src/gizmos/Makefile.in Thu May 5 16:22:48 2005
+@@ -277,6 +277,8 @@
+ all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
- install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+ install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
+
+install-common:
$(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 \
+ 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 wx/gizmos/xh_statpict.h; do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-PlatWX.cpp b/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-PlatWX.cpp
deleted file mode 100644
index 3b9e39008930..000000000000
--- a/x11-toolkits/wxgtk29/files/patch-contrib-src-stc-PlatWX.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/stc/PlatWX.cpp.orig Sun Aug 15 14:41:28 2004
-+++ contrib/src/stc/PlatWX.cpp Sun Aug 15 14:40:11 2004
-@@ -18,7 +18,7 @@
- #include "wx/stc/stc.h"
-
-
--#ifdef __WXGTK__
-+#if 0
- #include <gtk/gtk.h>
- #endif
-
diff --git a/x11-toolkits/wxgtk29/files/patch-src-common-string.cpp b/x11-toolkits/wxgtk29/files/patch-src-common-string.cpp
deleted file mode 100644
index f88da4cc4be9..000000000000
--- a/x11-toolkits/wxgtk29/files/patch-src-common-string.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/string.cpp.orig Mon Feb 21 15:53:48 2005
-+++ src/common/string.cpp Tue Feb 22 01:39:54 2005
-@@ -39,6 +39,7 @@
- #endif
-
- #include <ctype.h>
-+#include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-
-@@ -1956,6 +1957,9 @@
- // ok, there was enough space
- break;
- }
-+
-+ if (errno != EOVERFLOW)
-+ break;
-
- // still not enough, double it again
- size *= 2;
diff --git a/x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h
deleted file mode 100644
index a8688e1069c0..000000000000
--- a/x11-toolkits/wxgtk29/files/patch-src-regex-regcustom.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 01f1f176215f..000000000000
--- a/x11-toolkits/wxgtk29/files/patch-src-regex-regex.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-wx-config.in b/x11-toolkits/wxgtk29/files/patch-wx-config.in
index 0453477f8fbc..434032d26493 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 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@"
+--- wx-config.in.orig Thu Apr 21 00:32:34 2005
++++ wx-config.in Thu May 5 16:36:09 2005
+@@ -1142,7 +1142,7 @@
+ _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
fi
--_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@")
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_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@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
# 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 3f401620305b..f21ae0c20c86 100644
--- a/x11-toolkits/wxgtk29/pkg-plist
+++ b/x11-toolkits/wxgtk29/pkg-plist
@@ -1,29 +1,35 @@
-bin/wxgtk2-2.5-config
-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.3
-lib/libwx_base-2.5.so.3.0.0
-lib/libwx_base_net-2.5.so
-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.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.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.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.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.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
+bin/wxgtk2-2.6-config
+bin/wxrc-gtk2-2.6
+include/wx-2.6/gtk2-ansi-release-2.6/wx/setup.h
+lib/libwx_base-2.6.so
+lib/libwx_base-2.6.so.0
+lib/libwx_base-2.6.so.0.0.0
+lib/libwx_base_net-2.6.so
+lib/libwx_base_net-2.6.so.0
+lib/libwx_base_net-2.6.so.0.0.0
+lib/libwx_base_xml-2.6.so
+lib/libwx_base_xml-2.6.so.0
+lib/libwx_base_xml-2.6.so.0.0.0
+lib/libwx_gtk2_adv-2.6.so
+lib/libwx_gtk2_adv-2.6.so.0
+lib/libwx_gtk2_adv-2.6.so.0.0.0
+lib/libwx_gtk2_core-2.6.so
+lib/libwx_gtk2_core-2.6.so.0
+lib/libwx_gtk2_core-2.6.so.0.0.0
+lib/libwx_gtk2_gl-2.6.so
+lib/libwx_gtk2_gl-2.6.so.0
+lib/libwx_gtk2_gl-2.6.so.0.0.0
+lib/libwx_gtk2_html-2.6.so
+lib/libwx_gtk2_html-2.6.so.0
+lib/libwx_gtk2_html-2.6.so.0.0.0
+lib/libwx_gtk2_media-2.6.so
+lib/libwx_gtk2_media-2.6.so.0
+lib/libwx_gtk2_media-2.6.so.0.0.0
+lib/libwx_gtk2_qa-2.6.so
+lib/libwx_gtk2_qa-2.6.so.0
+lib/libwx_gtk2_qa-2.6.so.0.0.0
+lib/libwx_gtk2_xrc-2.6.so
+lib/libwx_gtk2_xrc-2.6.so.0
+lib/libwx_gtk2_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6