12 files changed, 112 insertions, 222 deletions

diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ab643d3cc2c1..0564a0acadf8 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	2.6.3
+PORTVERSION=	2.8.0rc1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxwindows
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
-DISTNAME=	wxGTK-${PORTVERSION}
+DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
 
 MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
@@ -22,13 +22,12 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png\
 		expat.6:${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_GSTREAMER80=yes
+USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-libjpeg=sys\
@@ -40,24 +39,20 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-gtk\
 		--enable-mediactrl\
 		--disable-backtrace
-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}"\
-		X11BASE="${X11BASE}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
+		WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	1
-CONFLICTS=	wxgtk2-contrib-devel-2.5.2*
+PORTREVISION=	0
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
+RUN_DEPENDS=	${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
@@ -68,12 +63,12 @@ USE_LDCONFIG=	yes
 .endif # *-common
 
 .if ${WXGTK_FLAVOR:M*-contrib*} != ""
-USE_WX=		2.6
+USE_WX=		2.8
 BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
+RUN_DEPENDS=	${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
 WX_UNICODE=	yes
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index e65efb62fc87..45da3382d829 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.6.3.tar.bz2) = 3cd76c3c47913e52a3175dd47239c6ec
-SHA256 (wxGTK-2.6.3.tar.bz2) = 29902dc4600182edc2efa20b84e6f9a2bf88fa3c4b2b29f497b83b79c29dab10
-SIZE (wxGTK-2.6.3.tar.bz2) = 7213119
+MD5 (wxGTK-2.8.0-rc1.tar.gz) = f549cb5c4f5decca5473dc6c82ab16c0
+SHA256 (wxGTK-2.8.0-rc1.tar.gz) = 0c48b874e5cd23d441a44828b441a6fa1884ef415f5bb2b267ae32575b175e67
+SIZE (wxGTK-2.8.0-rc1.tar.gz) = 12245061
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
index c4a0015bafa5..f3f537e90876 100644
--- a/x11-toolkits/wxgtk28/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Mar 21 11:39:27 2006
-+++ Makefile.in	Tue Mar 21 11:54:48 2006
+--- Makefile.in.orig	Mon Nov 13 16:58:04 2006
++++ Makefile.in	Thu Nov 30 23:37:17 2006
 @@ -24,6 +24,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
@@ -7,32 +7,34 @@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
- srcdir = @srcdir@
-@@ -9387,18 +9388,15 @@
+ BK_DEPS = @BK_DEPS@
+@@ -11185,11 +11186,7 @@
  
- 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)
+ 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) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___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_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 locale_msw_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: 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_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++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_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig $(__cocoa_res_install___depname)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+ 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -11197,6 +11194,12 @@
+ 	fi; \
+ 	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
+ 	done
 +
 +install-common: locale_install locale_msw_install
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- 	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
- 	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
--	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
--	for f in setup.h $(RCDEFS_H); do \
--	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
--	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f`; \
--	fi; \
--	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
--	done
++	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
++	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
  	$(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 \
-@@ -9931,9 +9929,7 @@
+@@ -11944,11 +11947,10 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -42,4 +44,7 @@
 +	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
  
  locale_install: 
++	(cd $(srcdir)/locale && $(MAKE) allmo)
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+ 	for l in $(LOCALE_LINGUAS) ; do \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure
index b3cf594f3ac9..1fec2d79037f 100644
--- a/x11-toolkits/wxgtk28/files/patch-configure
+++ b/x11-toolkits/wxgtk28/files/patch-configure
@@ -1,58 +1,28 @@
---- configure.orig	Thu Jun  2 23:03:05 2005
-+++ configure	Wed Aug 31 23:48:02 2005
-@@ -23409,6 +23409,7 @@
+--- configure.orig	Mon Nov 13 16:57:42 2006
++++ configure	Thu Nov 30 22:49:10 2006
+@@ -24040,6 +24040,7 @@
  
  
  SEARCH_INCLUDE="\
-+    $X11BASE/include	      \
++    $X11BASE/include          \
      /usr/local/include        \
                                \
      /usr/Motif-2.1/include    \
-@@ -34396,7 +34396,7 @@
+@@ -38999,7 +39000,7 @@
                  fi
                  ;;
            *-*-freebsd*)
 -                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+                                                THREAD_OPTS="$PTHREAD_LIBS"
++                                                THREAD_OPTS="${PTHREAD_LIBS}"
                  ;;
            *-*-darwin* | *-*-cygwin* )
                                                  THREAD_OPTS=""
-@@ -34433,6 +34433,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
-@@ -34515,7 +34521,7 @@
-           { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
- echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
-       else
--                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
-+                              LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS"
-           LIBS="$THREADS_LINK $LIBS"
- 
-           echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
-@@ -35701,6 +35707,7 @@
-     fi
-   fi
- fi
-+TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}"
- 
- if test "$WXGTK20" = 1 ; then
-   cat >>confdefs.h <<_ACEOF
-@@ -35823,7 +35830,7 @@
-         OPTIMISE="-O"
+@@ -41649,7 +41650,7 @@
+         OPTIMISE_CFLAGS="-O"
      fi
  fi
 -
-+OPTIMISE=
++OPTIMISE_CFLAGS=
  
- if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
+ if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
      cat >>confdefs.h <<\_ACEOF
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
index 88e167a98f95..ec39fc404703 100644
--- a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
@@ -1,29 +1,29 @@
---- 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/src/Makefile.in.orig	Fri Dec  1 00:58:54 2006
++++ contrib/src/Makefile.in	Fri Dec  1 01:39:18 2006
+@@ -2,15 +2,25 @@
  
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
+ CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
  
 -all:
-+WX_RELEASE=	@WX_RELEASE@
++WX_RELEASE=		@WX_RELEASE@
++wx_top_builddir=	@wx_top_builddir@
 +@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
++	@cd ../.. && $(MAKE) $(wx_top_builddir)/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/wxgtk28/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-animate-Makefile.in
deleted file mode 100644
index abfc81a6176c..000000000000
--- a/x11-toolkits/wxgtk28/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/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-deprecated-Makefile.in
deleted file mode 100644
index 0c492341ca53..000000000000
--- a/x11-toolkits/wxgtk28/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/wxgtk28/files/patch-contrib-utils-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-utils-Makefile.in
deleted file mode 100644
index acbcfacb0b56..000000000000
--- a/x11-toolkits/wxgtk28/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/wxgtk28/files/patch-src-gtk-clipbrd.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-clipbrd.cpp
deleted file mode 100644
index 1568c514b291..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-src-gtk-clipbrd.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/gtk/clipbrd.cpp.orig	Wed Mar 22 05:42:16 2006
-+++ src/gtk/clipbrd.cpp	Sun Apr  2 17:51:17 2006
-@@ -494,16 +494,21 @@
- 
-     delete[] array;
- 
-+#ifdef __WXGTK20__
-     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
-                         "selection_get",
-                         GTK_SIGNAL_FUNC(selection_handler),
-                         GUINT_TO_POINTER(
--#ifdef __WXGTK20__
-                                 gtk_get_current_event_time()
-+                                        ) );
- #else
-+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
-+                        "selection_get",
-+                        GTK_SIGNAL_FUNC(selection_handler),
-+                        GUINT_TO_POINTER(
-                                 gdk_event_get_time(gtk_get_current_event())
--#endif
-                                         ) );
-+#endif
- 
- #if wxUSE_THREADS
-     /* disable GUI threads */
diff --git a/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
index 353821f40cfd..1ae8e5792c84 100644
--- a/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
@@ -1,21 +1,23 @@
---- 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 @@
+--- utils/wxrc/Makefile.in.orig	Thu Nov 30 23:00:32 2006
++++ utils/wxrc/Makefile.in	Thu Nov 30 23:01:25 2006
+@@ -29,6 +29,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 @@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@
+@@ -114,11 +115,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@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@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)
++@COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)$(EXEEXT)
  
- wxrc_wxrc.o: $(srcdir)/wxrc.cpp
- 	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-toolkits/wxgtk28/files/patch-wx-config.in b/x11-toolkits/wxgtk28/files/patch-wx-config.in
deleted file mode 100644
index a36b094b2dad..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-wx-config.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- wx-config.in.orig	Wed Mar 22 05:42:05 2006
-+++ wx-config.in	Tue Nov 28 23:49:30 2006
-@@ -25,15 +25,15 @@
- 
- if [ ~ = '~' ]
- then
--    if (bash -c echo) >/dev/null 2>&1
-+    if (/bin/sh -c echo) >/dev/null 2>&1
-     then
--        exec bash "$0" "$@"
-+        exec /bin/sh "$0" "$@"
-     fi
-     if (ksh -c echo) >/dev/null 2>&1
-     then
-         exec ksh "$0" "$@"
-     fi
--    echo "$0: this script requires bash or ksh"
-+    echo "$0: this script requires bourne shell or ksh"
-     exit 1
- fi
-  
-@@ -1143,7 +1143,7 @@
-     _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
- fi
- 
--_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 f97ace59bb87..b15a2b3f639a 100644
--- a/x11-toolkits/wxgtk28/pkg-plist
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -1,35 +1,43 @@
-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.3.1
-lib/libwx_base_net-2.6.so
-lib/libwx_base_net-2.6.so.0
-lib/libwx_base_net-2.6.so.0.3.1
-lib/libwx_base_xml-2.6.so
-lib/libwx_base_xml-2.6.so.0
-lib/libwx_base_xml-2.6.so.0.3.1
-lib/libwx_gtk2_adv-2.6.so
-lib/libwx_gtk2_adv-2.6.so.0
-lib/libwx_gtk2_adv-2.6.so.0.3.1
-lib/libwx_gtk2_core-2.6.so
-lib/libwx_gtk2_core-2.6.so.0
-lib/libwx_gtk2_core-2.6.so.0.3.1
-lib/libwx_gtk2_gl-2.6.so
-lib/libwx_gtk2_gl-2.6.so.0
-lib/libwx_gtk2_gl-2.6.so.0.3.1
-lib/libwx_gtk2_html-2.6.so
-lib/libwx_gtk2_html-2.6.so.0
-lib/libwx_gtk2_html-2.6.so.0.3.1
-lib/libwx_gtk2_media-2.6.so
-lib/libwx_gtk2_media-2.6.so.0
-lib/libwx_gtk2_media-2.6.so.0.3.1
-lib/libwx_gtk2_qa-2.6.so
-lib/libwx_gtk2_qa-2.6.so.0
-lib/libwx_gtk2_qa-2.6.so.0.3.1
-lib/libwx_gtk2_xrc-2.6.so
-lib/libwx_gtk2_xrc-2.6.so.0
-lib/libwx_gtk2_xrc-2.6.so.0.3.1
-@dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
-@dirrm include/wx-2.6/gtk2-ansi-release-2.6
+bin/wxgtk2-2.8-config
+bin/wxrc-gtk2-2.8
+lib/libwx_base-2.8.so
+lib/libwx_base-2.8.so.0
+lib/libwx_base-2.8.so.0.0.0
+lib/libwx_base_net-2.8.so
+lib/libwx_base_net-2.8.so.0
+lib/libwx_base_net-2.8.so.0.0.0
+lib/libwx_base_xml-2.8.so
+lib/libwx_base_xml-2.8.so.0
+lib/libwx_base_xml-2.8.so.0.0.0
+lib/libwx_gtk2_adv-2.8.so
+lib/libwx_gtk2_adv-2.8.so.0
+lib/libwx_gtk2_adv-2.8.so.0.0.0
+lib/libwx_gtk2_aui-2.8.so
+lib/libwx_gtk2_aui-2.8.so.0
+lib/libwx_gtk2_aui-2.8.so.0.0.0
+lib/libwx_gtk2_core-2.8.so
+lib/libwx_gtk2_core-2.8.so.0
+lib/libwx_gtk2_core-2.8.so.0.0.0
+lib/libwx_gtk2_gl-2.8.so
+lib/libwx_gtk2_gl-2.8.so.0
+lib/libwx_gtk2_gl-2.8.so.0.0.0
+lib/libwx_gtk2_html-2.8.so
+lib/libwx_gtk2_html-2.8.so.0
+lib/libwx_gtk2_html-2.8.so.0.0.0
+lib/libwx_gtk2_media-2.8.so
+lib/libwx_gtk2_media-2.8.so.0
+lib/libwx_gtk2_media-2.8.so.0.0.0
+lib/libwx_gtk2_qa-2.8.so
+lib/libwx_gtk2_qa-2.8.so.0
+lib/libwx_gtk2_qa-2.8.so.0.0.0
+lib/libwx_gtk2_richtext-2.8.so
+lib/libwx_gtk2_richtext-2.8.so.0
+lib/libwx_gtk2_richtext-2.8.so.0.0.0
+lib/libwx_gtk2_xrc-2.8.so
+lib/libwx_gtk2_xrc-2.8.so.0
+lib/libwx_gtk2_xrc-2.8.so.0.0.0
+lib/wx/include/gtk2-ansi-release-2.8/wx/setup.h
+@dirrm lib/wx/include/gtk2-ansi-release-2.8/wx
+@dirrm lib/wx/include/gtk2-ansi-release-2.8
+@dirrmtry lib/wx/include
+@dirrmtry lib/wx