18 files changed, 169 insertions, 123 deletions

diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 14e76d536b22..beb00c3158e9 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.5.2
-PORTREVISION?=	1
+PORTVERSION=	2.5.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxwindows
@@ -17,10 +16,11 @@ DISTNAME=	wxGTK-${PORTVERSION}
 MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings (devel version)
 
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png\
+		jpeg.9:${PORTSDIR}/graphics/jpeg\
+		tiff.4:${PORTSDIR}/graphics/tiff\
+		expat.5:${PORTSDIR}/textproc/expat2\
+		mspack.1:${PORTSDIR}/archivers/libmspack
 
 CONFLICTS=	wxgtk-*
 
@@ -32,12 +32,13 @@ USE_ICONV=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libpng=sys \
-		--with-libjpeg=sys \
-		--with-libtiff=sys \
-		--with-zlib=sys \
-		--with-expat=sys \
-		--with-opengl \
+CONFIGURE_ARGS=	--with-libpng=sys\
+		--with-libjpeg=sys\
+		--with-libtiff=sys\
+		--with-zlib=sys\
+		--with-expat=sys\
+		--with-opengl\
+		--with-mspack\
 		--enable-gtk2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			  -I${X11BASE}/include" \
@@ -51,7 +52,7 @@ NO_LATEST_LINK=	yes
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
+RUN_DEPENDS=	${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
@@ -66,23 +67,23 @@ BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS=	${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
+RUN_DEPENDS=	${X11BASE}/include/wx-2.5/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
-LIB_DEPENDS+=	wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
+LIB_DEPENDS+=	wx_baseu-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
 .else
-LIB_DEPENDS+=	wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
+LIB_DEPENDS+=	wx_base-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-devel
 .endif
 
-.endif # !gtk2-contrib-common
-.endif # *-contrib*
-
 pre-configure:
-	@${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 		-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
 		-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
 		-e "s,@CPPFLAGS@,,"
 
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
 .include <bsd.port.pre.mk>
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
index 7c24033cdccf..ab4f811407f2 100644
--- a/x11-toolkits/wxgtk26/distinfo
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -1,2 +1,2 @@
-MD5 (wxGTK-2.5.2.tar.bz2) = b45874428b0164bfa5bd1a5a11b3eb4a
-SIZE (wxGTK-2.5.2.tar.bz2) = 6579255
+MD5 (wxGTK-2.5.3.tar.bz2) = eccd8fee99f7031b380b7ce026ea78be
+SIZE (wxGTK-2.5.3.tar.bz2) = 6783651
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
index 966de5b3e9df..c9d72e6757c7 100644
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon May 31 18:11:50 2004
-+++ Makefile.in	Sun Jun 27 21:12:13 2004
+--- Makefile.in.orig	Sun Oct 10 22:17:27 2004
++++ Makefile.in	Wed Nov 24 22:47:40 2004
 @@ -23,6 +23,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -8,30 +8,31 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
  srcdir = @srcdir@
-@@ -6927,11 +6928,13 @@
+@@ -7408,11 +7409,13 @@
  
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__macos_res___depname) $(__cocoa_res___depname)
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)
  
--install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx
-+	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(includedir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__macos_res_install___depname) $(__cocoa_res_install___depname)
++	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
++	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
 +
 +install-common: $(__install_afm___depname) $(__install_gsafm___depname) locale_install
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
  	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
--	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
--	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+-	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+-	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in $(ALL_HEADERS); do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-@@ -7371,8 +7374,7 @@
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+@@ -7892,9 +7895,7 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
--	$(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
-+	$(INSTALL_SCRIPT) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+-	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+-	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
index c8ae3832f26e..88e167a98f95 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
@@ -1,19 +1,20 @@
---- contrib/src/Makefile.in.orig	Mon May 31 18:12:16 2004
-+++ contrib/src/Makefile.in	Mon Jun 28 00:28:54 2004
-@@ -1,15 +1,23 @@
- # $Id: Makefile.in,v 1.16 2003/08/17 12:48:18 VS Exp $
+--- contrib/src/Makefile.in.orig	Sun Oct 10 22:18:48 2004
++++ contrib/src/Makefile.in	Fri Nov 26 00:20:35 2004
+@@ -1,15 +1,24 @@
+ # $Id: Makefile.in,v 1.17 2004/09/24 15:32:58 VS Exp $
  
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg xrc deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg xrc deprecated animate #applet mmedia
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
  
 -all:
++WX_RELEASE=	@WX_RELEASE@
 +@COND_UNICODE_1@wxregexu_depname=	wxregexu
 +
 +all:	$(wxregexu_depname)
  	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
  
 +wxregexu:
-+	cd ../.. && $(MAKE) lib/libwxregexu.a
++	@cd ../.. && $(MAKE) lib/libwxregexu-$(WX_RELEASE).a
 +
  clean:
  	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) clean); done
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
index 4e5875295e52..abfc81a6176c 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/animate/Makefile.in.orig	Sun Jun 27 21:38:11 2004
-+++ contrib/src/animate/Makefile.in	Sun Jun 27 21:38:20 2004
-@@ -172,6 +172,8 @@
+--- contrib/src/animate/Makefile.in.orig	Sun Oct 10 22:18:48 2004
++++ contrib/src/animate/Makefile.in	Wed Nov 24 21:37:14 2004
+@@ -180,6 +180,8 @@
  all: $(__animatedll___depname) $(__animatelib___depname)
  
  install: all $(__install_animatedll___depname) $(__install_animatelib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/animate/animate.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
index 237d6931053c..0c492341ca53 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/deprecated/Makefile.in.orig	Sun Jun 27 21:38:26 2004
-+++ contrib/src/deprecated/Makefile.in	Sun Jun 27 21:38:52 2004
-@@ -199,6 +199,8 @@
+--- contrib/src/deprecated/Makefile.in.orig	Sun Oct 10 22:18:54 2004
++++ contrib/src/deprecated/Makefile.in	Wed Nov 24 21:39:56 2004
+@@ -207,6 +207,8 @@
  all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
  
  install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
index 094280a521fc..2de711cc3b1f 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/fl/Makefile.in.orig	Sun Jun 27 21:34:52 2004
-+++ contrib/src/fl/Makefile.in	Sun Jun 27 21:35:37 2004
-@@ -203,6 +203,8 @@
+--- contrib/src/fl/Makefile.in.orig	Sun Oct 10 22:18:49 2004
++++ contrib/src/fl/Makefile.in	Wed Nov 24 21:40:16 2004
+@@ -211,6 +211,8 @@
  all: $(__fldll___depname) $(__fllib___depname)
  
  install: all $(__install_fldll___depname) $(__install_fllib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
index fae5de6b9501..b6e204d0704a 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/gizmos/Makefile.in.orig	Sun Jun 27 21:35:44 2004
-+++ contrib/src/gizmos/Makefile.in	Sun Jun 27 21:35:55 2004
-@@ -181,6 +181,8 @@
+--- contrib/src/gizmos/Makefile.in.orig	Sun Oct 10 22:18:50 2004
++++ contrib/src/gizmos/Makefile.in	Wed Nov 24 21:40:37 2004
+@@ -189,6 +189,8 @@
  all: $(__gizmosdll___depname) $(__gizmoslib___depname)
  
  install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
index cb94093057e1..2be3bdbe7e1c 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/ogl/Makefile.in.orig	Sun Jun 27 22:44:07 2004
-+++ contrib/src/ogl/Makefile.in	Sun Jun 27 22:44:25 2004
-@@ -193,6 +193,8 @@
+--- contrib/src/ogl/Makefile.in.orig	Sun Oct 10 22:18:52 2004
++++ contrib/src/ogl/Makefile.in	Wed Nov 24 21:41:00 2004
+@@ -201,6 +201,8 @@
  all: $(__ogldll___depname) $(__ogllib___depname)
  
  install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
index 152bf7473082..802b4f093baa 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/plot/Makefile.in.orig	Sun Jun 27 21:36:28 2004
-+++ contrib/src/plot/Makefile.in	Sun Jun 27 21:36:37 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/plot/Makefile.in.orig	Sun Oct 10 22:18:52 2004
++++ contrib/src/plot/Makefile.in	Wed Nov 24 21:41:16 2004
+@@ -179,6 +179,8 @@
  all: $(__plotdll___depname) $(__plotlib___depname)
  
  install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
index 5053151bf229..c41d5cbfec19 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/stc/Makefile.in.orig	Sun Jun 27 21:36:48 2004
-+++ contrib/src/stc/Makefile.in	Sun Jun 27 21:36:56 2004
-@@ -286,6 +286,8 @@
+--- contrib/src/stc/Makefile.in.orig	Sun Oct 10 22:18:53 2004
++++ contrib/src/stc/Makefile.in	Wed Nov 24 21:41:31 2004
+@@ -310,6 +310,8 @@
  all: $(__stcdll___depname) $(__stclib___depname)
  
  install: all $(__install_stcdll___depname) $(__install_stclib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/stc/stc.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
index e41c53fd4030..213aef13d42c 100644
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
@@ -1,11 +1,11 @@
---- contrib/src/svg/Makefile.in.orig	Sun Jun 27 21:37:03 2004
-+++ contrib/src/svg/Makefile.in	Sun Jun 27 21:37:16 2004
-@@ -171,6 +171,8 @@
+--- contrib/src/svg/Makefile.in.orig	Sun Oct 10 22:18:54 2004
++++ contrib/src/svg/Makefile.in	Wed Nov 24 21:41:44 2004
+@@ -179,6 +179,8 @@
  all: $(__svgdll___depname) $(__svglib___depname)
  
  install: all $(__install_svgdll___depname) $(__install_svglib___depname)
 +
 +install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in wx/svg/dcsvg.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in
deleted file mode 100644
index aafcaa405758..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-contrib-src-xrc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/src/xrc/Makefile.in.orig	Sun Jun 27 21:37:21 2004
-+++ contrib/src/xrc/Makefile.in	Sun Jun 27 21:37:44 2004
-@@ -258,6 +258,8 @@
- all: $(__xrcdll___depname) $(__xrclib___depname)
- 
- install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
-+
-+install-common:
- 	$(INSTALL_DIR) $(DESTDIR)$(includedir)
- 	for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
- 	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h b/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h
new file mode 100644
index 000000000000..a8688e1069c0
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-regex-regcustom.h
@@ -0,0 +1,14 @@
+--- src/regex/regcustom.h.orig	Thu Nov 25 21:03:13 2004
++++ src/regex/regcustom.h	Thu Nov 25 21:03:29 2004
+@@ -76,6 +76,11 @@
+ #endif
+ #define __REG_NOFRONT           /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x)          x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
+ 
+ /* internal character type and related */
diff --git a/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h b/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h
new file mode 100644
index 000000000000..01f1f176215f
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-regex-regex.h
@@ -0,0 +1,16 @@
+--- src/regex/regex.h.orig	Thu Nov 25 21:02:55 2004
++++ src/regex/regex.h	Thu Nov 25 21:03:06 2004
+@@ -115,7 +115,13 @@
+ #endif
+ #define __REG_NOFRONT           /* don't want regcomp() and regexec() */
+ #define _ANSI_ARGS_(x)          x
++
++#ifdef __FreeBSD__
++#define re_comp wx_re_comp
++#define re_exec wx_re_exec
++#endif
+ /* --- end --- */
++
+ 
+ /*
+  * interface types etc.
diff --git a/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..353821f40cfd
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,21 @@
+--- utils/wxrc/Makefile.in.orig	Thu Nov 25 21:52:45 2004
++++ utils/wxrc/Makefile.in	Thu Nov 25 21:58:43 2004
+@@ -28,6 +28,7 @@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ HOST_SUFFIX = @HOST_SUFFIX@
+@@ -113,9 +114,7 @@
+ 
+ @COND_USE_XRC_1@install_wxrc: 
+ @COND_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++@COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
+ 
+ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+ 	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/x11-toolkits/wxgtk26/files/patch-wx-config.in b/x11-toolkits/wxgtk26/files/patch-wx-config.in
index 99fb6adf332c..0453477f8fbc 100644
--- a/x11-toolkits/wxgtk26/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk26/files/patch-wx-config.in
@@ -1,11 +1,11 @@
---- wx-config.in.orig	Mon May 31 18:11:50 2004
-+++ wx-config.in	Sun Jun 27 20:08:21 2004
-@@ -230,7 +230,7 @@
-         includes=" -I${includedir}"
-     fi
+--- wx-config.in.orig	Sun Oct 10 22:17:27 2004
++++ wx-config.in	Wed Nov 24 22:48:01 2004
+@@ -1014,7 +1014,7 @@
+     _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
+ fi
  
--    includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
-+    includes="-I${includedir}/wx/include/${TOOLCHAIN_NAME}$includes"
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
++_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
  
-     # in inplace case we need to also add path to contrib headers -- do it
-     # unconditionally as they might be used and we have no way of knowing if
+ # now without further ado, we can answer these too.
+ [ -z "$output_option_cppflags" ] || echo $_cppflags
diff --git a/x11-toolkits/wxgtk26/pkg-plist b/x11-toolkits/wxgtk26/pkg-plist
index 0af111d8925e..3f401620305b 100644
--- a/x11-toolkits/wxgtk26/pkg-plist
+++ b/x11-toolkits/wxgtk26/pkg-plist
@@ -1,26 +1,29 @@
 bin/wxgtk2-2.5-config
-include/wx/include/gtk2-2.5/wx/setup.h
+bin/wxrc-gtk2-2.5
+include/wx-2.5/gtk2-ansi-release-2.5/wx/setup.h
 lib/libwx_base-2.5.so
-lib/libwx_base-2.5.so.2
-lib/libwx_base-2.5.so.2.0.0
+lib/libwx_base-2.5.so.3
+lib/libwx_base-2.5.so.3.0.0
 lib/libwx_base_net-2.5.so
-lib/libwx_base_net-2.5.so.2
-lib/libwx_base_net-2.5.so.2.0.0
+lib/libwx_base_net-2.5.so.3
+lib/libwx_base_net-2.5.so.3.0.0
 lib/libwx_base_xml-2.5.so
-lib/libwx_base_xml-2.5.so.2
-lib/libwx_base_xml-2.5.so.2.0.0
+lib/libwx_base_xml-2.5.so.3
+lib/libwx_base_xml-2.5.so.3.0.0
 lib/libwx_gtk2_adv-2.5.so
-lib/libwx_gtk2_adv-2.5.so.2
-lib/libwx_gtk2_adv-2.5.so.2.0.0
+lib/libwx_gtk2_adv-2.5.so.3
+lib/libwx_gtk2_adv-2.5.so.3.0.0
 lib/libwx_gtk2_core-2.5.so
-lib/libwx_gtk2_core-2.5.so.2
-lib/libwx_gtk2_core-2.5.so.2.0.0
+lib/libwx_gtk2_core-2.5.so.3
+lib/libwx_gtk2_core-2.5.so.3.0.0
 lib/libwx_gtk2_gl-2.5.so
-lib/libwx_gtk2_gl-2.5.so.2
-lib/libwx_gtk2_gl-2.5.so.2.0.0
+lib/libwx_gtk2_gl-2.5.so.3
+lib/libwx_gtk2_gl-2.5.so.3.0.0
 lib/libwx_gtk2_html-2.5.so
-lib/libwx_gtk2_html-2.5.so.2
-lib/libwx_gtk2_html-2.5.so.2.0.0
-@dirrm include/wx/include/gtk2-2.5/wx
-@dirrm include/wx/include/gtk2-2.5
-@dirrm include/wx/include
+lib/libwx_gtk2_html-2.5.so.3
+lib/libwx_gtk2_html-2.5.so.3.0.0
+lib/libwx_gtk2_xrc-2.5.so
+lib/libwx_gtk2_xrc-2.5.so.3
+lib/libwx_gtk2_xrc-2.5.so.3.0.0
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5/wx
+@dirrm include/wx-2.5/gtk2-ansi-release-2.5