Finish repo-move of wxgtk2*-devel ports to wxgtk26* and update to the

latest stable release wxWidgets 2.6.0.

2 files changed, 73 insertions, 72 deletions

diff --git a/x11-toolkits/wxgtk29-contrib-common/Makefile b/x11-toolkits/wxgtk29-contrib-common/Makefile
index 8a04a418aff..58d6c54ebe6 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 49656f54732..d1b3bf27ac1 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