11 files changed, 75 insertions, 146 deletions

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