aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2006-04-02 19:06:59 +0800
committerfjoe <fjoe@FreeBSD.org>2006-04-02 19:06:59 +0800
commit835032fe2f15ed8add04bb6268db20480fa8ff4a (patch)
treea4fd9953e1ab16c9ce61f7577e05a46241ff6b93
parent15880e00995e144ff74e430dfebe36ba3a23d6ff (diff)
downloadfreebsd-ports-gnome-835032fe2f15ed8add04bb6268db20480fa8ff4a.tar.gz
freebsd-ports-gnome-835032fe2f15ed8add04bb6268db20480fa8ff4a.tar.zst
freebsd-ports-gnome-835032fe2f15ed8add04bb6268db20480fa8ff4a.zip
- Update to 2.6.3
- Get rid of USE_REINPLACE - Make portlint happy with the IGNORE value PR: 95149 (mostly) Submitted by: Vasil Dimov
-rw-r--r--x11-toolkits/wxgtk26-common/Makefile1
-rw-r--r--x11-toolkits/wxgtk26-contrib-common/Makefile1
-rw-r--r--x11-toolkits/wxgtk26-contrib/Makefile1
-rw-r--r--x11-toolkits/wxgtk26-contrib/pkg-plist18
-rw-r--r--x11-toolkits/wxgtk26-docs/Makefile10
-rw-r--r--x11-toolkits/wxgtk26-docs/distinfo6
-rw-r--r--x11-toolkits/wxgtk26-docs/pkg-descr2
-rw-r--r--x11-toolkits/wxgtk26-unicode-contrib/Makefile1
-rw-r--r--x11-toolkits/wxgtk26-unicode-contrib/pkg-plist18
-rw-r--r--x11-toolkits/wxgtk26-unicode/Makefile1
-rw-r--r--x11-toolkits/wxgtk26-unicode/pkg-plist20
-rw-r--r--x11-toolkits/wxgtk26/Makefile7
-rw-r--r--x11-toolkits/wxgtk26/distinfo6
-rw-r--r--x11-toolkits/wxgtk26/files/patch-Makefile.in17
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp23
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp26
-rw-r--r--x11-toolkits/wxgtk26/pkg-plist20
-rw-r--r--x11-toolkits/wxgtk28-common/Makefile1
-rw-r--r--x11-toolkits/wxgtk28-contrib-common/Makefile1
-rw-r--r--x11-toolkits/wxgtk28-contrib/Makefile1
-rw-r--r--x11-toolkits/wxgtk28-contrib/pkg-plist18
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/Makefile1
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/pkg-plist18
-rw-r--r--x11-toolkits/wxgtk28-unicode/Makefile1
-rw-r--r--x11-toolkits/wxgtk28-unicode/pkg-plist20
-rw-r--r--x11-toolkits/wxgtk28/Makefile7
-rw-r--r--x11-toolkits/wxgtk28/distinfo6
-rw-r--r--x11-toolkits/wxgtk28/files/patch-Makefile.in17
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp23
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-gtk-clipbrd.cpp26
-rw-r--r--x11-toolkits/wxgtk28/pkg-plist20
-rw-r--r--x11-toolkits/wxgtk29-common/Makefile1
-rw-r--r--x11-toolkits/wxgtk29-contrib-common/Makefile1
-rw-r--r--x11-toolkits/wxgtk29-contrib/Makefile1
-rw-r--r--x11-toolkits/wxgtk29-contrib/pkg-plist18
-rw-r--r--x11-toolkits/wxgtk29-unicode-contrib/Makefile1
-rw-r--r--x11-toolkits/wxgtk29-unicode-contrib/pkg-plist18
-rw-r--r--x11-toolkits/wxgtk29-unicode/Makefile1
-rw-r--r--x11-toolkits/wxgtk29-unicode/pkg-plist20
-rw-r--r--x11-toolkits/wxgtk29/Makefile7
-rw-r--r--x11-toolkits/wxgtk29/distinfo6
-rw-r--r--x11-toolkits/wxgtk29/files/patch-Makefile.in17
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp23
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-gtk-clipbrd.cpp26
-rw-r--r--x11-toolkits/wxgtk29/pkg-plist20
45 files changed, 249 insertions, 249 deletions
diff --git a/x11-toolkits/wxgtk26-common/Makefile b/x11-toolkits/wxgtk26-common/Makefile
index f4b25afa47f7..1bdbb9c01952 100644
--- a/x11-toolkits/wxgtk26-common/Makefile
+++ b/x11-toolkits/wxgtk26-common/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (common files)
diff --git a/x11-toolkits/wxgtk26-contrib-common/Makefile b/x11-toolkits/wxgtk26-contrib-common/Makefile
index 2289cc269f3b..58d6c54ebe6c 100644
--- a/x11-toolkits/wxgtk26-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk26-contrib-common/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (common files)
diff --git a/x11-toolkits/wxgtk26-contrib/Makefile b/x11-toolkits/wxgtk26-contrib/Makefile
index 67d1bc480dfe..1eba77011e9f 100644
--- a/x11-toolkits/wxgtk26-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-contrib/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries
diff --git a/x11-toolkits/wxgtk26-contrib/pkg-plist b/x11-toolkits/wxgtk26-contrib/pkg-plist
index 8a754c89cc50..8c494fe85671 100644
--- a/x11-toolkits/wxgtk26-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk26-contrib/pkg-plist
@@ -1,27 +1,27 @@
lib/libwx_gtk2_animate-2.6.so
lib/libwx_gtk2_animate-2.6.so.0
-lib/libwx_gtk2_animate-2.6.so.0.2.0
+lib/libwx_gtk2_animate-2.6.so.0.3.1
lib/libwx_gtk2_deprecated-2.6.so
lib/libwx_gtk2_deprecated-2.6.so.0
-lib/libwx_gtk2_deprecated-2.6.so.0.2.0
+lib/libwx_gtk2_deprecated-2.6.so.0.3.1
lib/libwx_gtk2_fl-2.6.so
lib/libwx_gtk2_fl-2.6.so.0
-lib/libwx_gtk2_fl-2.6.so.0.2.0
+lib/libwx_gtk2_fl-2.6.so.0.3.1
lib/libwx_gtk2_gizmos-2.6.so
lib/libwx_gtk2_gizmos-2.6.so.0
-lib/libwx_gtk2_gizmos-2.6.so.0.2.0
+lib/libwx_gtk2_gizmos-2.6.so.0.3.1
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.2.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0.3.1
lib/libwx_gtk2_ogl-2.6.so
lib/libwx_gtk2_ogl-2.6.so.0
-lib/libwx_gtk2_ogl-2.6.so.0.2.0
+lib/libwx_gtk2_ogl-2.6.so.0.3.1
lib/libwx_gtk2_plot-2.6.so
lib/libwx_gtk2_plot-2.6.so.0
-lib/libwx_gtk2_plot-2.6.so.0.2.0
+lib/libwx_gtk2_plot-2.6.so.0.3.1
lib/libwx_gtk2_stc-2.6.so
lib/libwx_gtk2_stc-2.6.so.0
-lib/libwx_gtk2_stc-2.6.so.0.2.0
+lib/libwx_gtk2_stc-2.6.so.0.3.1
lib/libwx_gtk2_svg-2.6.so
lib/libwx_gtk2_svg-2.6.so.0
-lib/libwx_gtk2_svg-2.6.so.0.2.0
+lib/libwx_gtk2_svg-2.6.so.0.3.1
diff --git a/x11-toolkits/wxgtk26-docs/Makefile b/x11-toolkits/wxgtk26-docs/Makefile
index 2224b9931d50..2a5482e8b395 100644
--- a/x11-toolkits/wxgtk26-docs/Makefile
+++ b/x11-toolkits/wxgtk26-docs/Makefile
@@ -6,36 +6,30 @@
#
PORTNAME= wxgtk_doc
-PORTVERSION= 2.6.2
+PORTVERSION= 2.6.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
DISTNAME= wxWidgets-${PORTVERSION}-HTML
MAINTAINER= m.sund@arcor.de
-COMMENT= wxWidgets 2.6.2 HTML documentation
+COMMENT= wxWidgets ${PORTVERSION} HTML documentation
LATEST_LINK= wxgtk26_doc
NO_BUILD= YES
-CONTRIBDOCDIR= ${WRKDIR}/wxWidgets-${PORTVERSION}/contrib/docs
-
WXGTKDOCDIR= share/doc/${PORTNAME}_26
WRKSRC= ${WRKDIR}/wxWidgets-${PORTVERSION}/docs
do-install:
@${MKDIR} ${PREFIX}/${WXGTKDOCDIR}
@(cd ${WRKSRC} && ${FIND} html -type d -exec ${MKDIR} ${PREFIX}/${WXGTKDOCDIR}/{} \;)
- @(cd ${CONTRIBDOCDIR} && ${FIND} html -type d -exec ${MKDIR} ${PREFIX}/${WXGTKDOCDIR}/{} \;)
@(cd ${WRKSRC} && ${FIND} html -type f -exec ${INSTALL_MAN} {} ${PREFIX}/${WXGTKDOCDIR}/{} \;)
- @(cd ${CONTRIBDOCDIR} && ${FIND} html -type f -exec ${INSTALL_MAN} {} ${PREFIX}/${WXGTKDOCDIR}/{} \;)
post-install:
@(cd ${WRKSRC} && ${FIND} html -type f -exec ${ECHO} ${WXGTKDOCDIR}/{} >> ${TMPPLIST} \;)
- @(cd ${CONTRIBDOCDIR} && ${FIND} html -type f -exec ${ECHO} ${WXGTKDOCDIR}/{} >> ${TMPPLIST} \;)
@(cd ${WRKSRC} && ${FIND} html/* -type d -exec ${ECHO} @dirrm ${WXGTKDOCDIR}/{} >> ${TMPPLIST} \;)
- @(cd ${CONTRIBDOCDIR} && ${FIND} html/* -type d -exec ${ECHO} @dirrm ${WXGTKDOCDIR}/{} >> ${TMPPLIST} \;)
@${ECHO} @dirrm ${WXGTKDOCDIR}/html >> ${TMPPLIST}
@${ECHO} @dirrm ${WXGTKDOCDIR} >> ${TMPPLIST}
diff --git a/x11-toolkits/wxgtk26-docs/distinfo b/x11-toolkits/wxgtk26-docs/distinfo
index 347b27857007..e50a25114d59 100644
--- a/x11-toolkits/wxgtk26-docs/distinfo
+++ b/x11-toolkits/wxgtk26-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxWidgets-2.6.2-HTML.tar.gz) = 1e2bbd9d858c426ae667b017d8bdd4f6
-SHA256 (wxWidgets-2.6.2-HTML.tar.gz) = eeb47240ccc56a8eb14d09153e1cfaa9ad9c3f71ea67b21ac62790e59c405312
-SIZE (wxWidgets-2.6.2-HTML.tar.gz) = 1440455
+MD5 (wxWidgets-2.6.3-HTML.tar.gz) = e575ac25e30749bd540b23ed9b370029
+SHA256 (wxWidgets-2.6.3-HTML.tar.gz) = d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1
+SIZE (wxWidgets-2.6.3-HTML.tar.gz) = 1349870
diff --git a/x11-toolkits/wxgtk26-docs/pkg-descr b/x11-toolkits/wxgtk26-docs/pkg-descr
index cd8bd1160cd7..81b66d3e56d2 100644
--- a/x11-toolkits/wxgtk26-docs/pkg-descr
+++ b/x11-toolkits/wxgtk26-docs/pkg-descr
@@ -1,3 +1,3 @@
-wxWidgets 2.6.2 HTML documentation
+wxWidgets HTML documentation
WWW: http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk26-unicode-contrib/Makefile b/x11-toolkits/wxgtk26-unicode-contrib/Makefile
index df1322fa7bcf..62f0029a5019 100644
--- a/x11-toolkits/wxgtk26-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-unicode-contrib/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
diff --git a/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
index 0d11542d5ca9..1bedd72d4374 100644
--- a/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk26-unicode-contrib/pkg-plist
@@ -1,27 +1,27 @@
lib/libwx_gtk2u_animate-2.6.so
lib/libwx_gtk2u_animate-2.6.so.0
-lib/libwx_gtk2u_animate-2.6.so.0.2.0
+lib/libwx_gtk2u_animate-2.6.so.0.3.1
lib/libwx_gtk2u_deprecated-2.6.so
lib/libwx_gtk2u_deprecated-2.6.so.0
-lib/libwx_gtk2u_deprecated-2.6.so.0.2.0
+lib/libwx_gtk2u_deprecated-2.6.so.0.3.1
lib/libwx_gtk2u_fl-2.6.so
lib/libwx_gtk2u_fl-2.6.so.0
-lib/libwx_gtk2u_fl-2.6.so.0.2.0
+lib/libwx_gtk2u_fl-2.6.so.0.3.1
lib/libwx_gtk2u_gizmos-2.6.so
lib/libwx_gtk2u_gizmos-2.6.so.0
-lib/libwx_gtk2u_gizmos-2.6.so.0.2.0
+lib/libwx_gtk2u_gizmos-2.6.so.0.3.1
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.2.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0.3.1
lib/libwx_gtk2u_ogl-2.6.so
lib/libwx_gtk2u_ogl-2.6.so.0
-lib/libwx_gtk2u_ogl-2.6.so.0.2.0
+lib/libwx_gtk2u_ogl-2.6.so.0.3.1
lib/libwx_gtk2u_plot-2.6.so
lib/libwx_gtk2u_plot-2.6.so.0
-lib/libwx_gtk2u_plot-2.6.so.0.2.0
+lib/libwx_gtk2u_plot-2.6.so.0.3.1
lib/libwx_gtk2u_stc-2.6.so
lib/libwx_gtk2u_stc-2.6.so.0
-lib/libwx_gtk2u_stc-2.6.so.0.2.0
+lib/libwx_gtk2u_stc-2.6.so.0.3.1
lib/libwx_gtk2u_svg-2.6.so
lib/libwx_gtk2u_svg-2.6.so.0
-lib/libwx_gtk2u_svg-2.6.so.0.2.0
+lib/libwx_gtk2u_svg-2.6.so.0.3.1
diff --git a/x11-toolkits/wxgtk26-unicode/Makefile b/x11-toolkits/wxgtk26-unicode/Makefile
index 984e5fbb6abc..049949a2ab60 100644
--- a/x11-toolkits/wxgtk26-unicode/Makefile
+++ b/x11-toolkits/wxgtk26-unicode/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk26-unicode/pkg-plist b/x11-toolkits/wxgtk26-unicode/pkg-plist
index ec002bf7d7af..48b512fb8a5b 100644
--- a/x11-toolkits/wxgtk26-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk26-unicode/pkg-plist
@@ -3,33 +3,33 @@ 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.2.0
+lib/libwx_baseu-2.6.so.0.3.1
lib/libwx_baseu_net-2.6.so
lib/libwx_baseu_net-2.6.so.0
-lib/libwx_baseu_net-2.6.so.0.2.0
+lib/libwx_baseu_net-2.6.so.0.3.1
lib/libwx_baseu_xml-2.6.so
lib/libwx_baseu_xml-2.6.so.0
-lib/libwx_baseu_xml-2.6.so.0.2.0
+lib/libwx_baseu_xml-2.6.so.0.3.1
lib/libwx_gtk2u_adv-2.6.so
lib/libwx_gtk2u_adv-2.6.so.0
-lib/libwx_gtk2u_adv-2.6.so.0.2.0
+lib/libwx_gtk2u_adv-2.6.so.0.3.1
lib/libwx_gtk2u_core-2.6.so
lib/libwx_gtk2u_core-2.6.so.0
-lib/libwx_gtk2u_core-2.6.so.0.2.0
+lib/libwx_gtk2u_core-2.6.so.0.3.1
lib/libwx_gtk2u_gl-2.6.so
lib/libwx_gtk2u_gl-2.6.so.0
-lib/libwx_gtk2u_gl-2.6.so.0.2.0
+lib/libwx_gtk2u_gl-2.6.so.0.3.1
lib/libwx_gtk2u_html-2.6.so
lib/libwx_gtk2u_html-2.6.so.0
-lib/libwx_gtk2u_html-2.6.so.0.2.0
+lib/libwx_gtk2u_html-2.6.so.0.3.1
lib/libwx_gtk2u_media-2.6.so
lib/libwx_gtk2u_media-2.6.so.0
-lib/libwx_gtk2u_media-2.6.so.0.2.0
+lib/libwx_gtk2u_media-2.6.so.0.3.1
lib/libwx_gtk2u_qa-2.6.so
lib/libwx_gtk2u_qa-2.6.so.0
-lib/libwx_gtk2u_qa-2.6.so.0.2.0
+lib/libwx_gtk2u_qa-2.6.so.0.3.1
lib/libwx_gtk2u_xrc-2.6.so
lib/libwx_gtk2u_xrc-2.6.so.0
-lib/libwx_gtk2u_xrc-2.6.so.0.2.0
+lib/libwx_gtk2u_xrc-2.6.so.0.3.1
@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 4cc512ed5d22..125352772425 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.6.2
+PORTVERSION= 2.6.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -28,8 +28,8 @@ USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
+#USE_GCC= 3.4+
USE_GNOME= gtk20
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
--with-libjpeg=sys\
@@ -52,7 +52,6 @@ PLIST= ${.CURDIR}/pkg-plist
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 3
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
@@ -98,7 +97,7 @@ post-patch:
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
.if ${OSVERSION} < 500000
-IGNORE= Systems prior to FreeBSD 5.0 currently out of support
+IGNORE= systems prior to FreeBSD 5.0 currently out of support
.else
CONFIGURE_ARGS+=--enable-unicode
.endif
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
index 5faf15c5f48f..e65efb62fc87 100644
--- a/x11-toolkits/wxgtk26/distinfo
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.6.2.tar.bz2) = ba2afe7bd028062c5fff6d5ef3249c67
-SHA256 (wxGTK-2.6.2.tar.bz2) = 563c46435642d8c371768d3191c38e0791e689d1abc85b693a447cc0194bc771
-SIZE (wxGTK-2.6.2.tar.bz2) = 7328807
+MD5 (wxGTK-2.6.3.tar.bz2) = 3cd76c3c47913e52a3175dd47239c6ec
+SHA256 (wxGTK-2.6.3.tar.bz2) = 29902dc4600182edc2efa20b84e6f9a2bf88fa3c4b2b29f497b83b79c29dab10
+SIZE (wxGTK-2.6.3.tar.bz2) = 7213119
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
index d63613ccefb5..c4a0015bafa5 100644
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Sep 20 22:03:25 2005
-+++ Makefile.in Wed Oct 12 23:21:27 2005
-@@ -23,6 +23,7 @@
+--- Makefile.in.orig Tue Mar 21 11:39:27 2006
++++ Makefile.in Tue Mar 21 11:54:48 2006
+@@ -24,6 +24,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -9153,13 +9154,15 @@
+@@ -9387,18 +9388,15 @@
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)
@@ -23,11 +23,16 @@
$(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
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(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)$(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 \
-@@ -9692,9 +9695,7 @@
+@@ -9931,9 +9929,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
deleted file mode 100644
index 12488d2b710e..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
-retrieving revision 1.166
-retrieving revision 1.166.2.1
-diff -u -r1.166 -r1.166.2.1
---- src/common/intl.cpp 2005/09/18 23:38:06 1.166
-+++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1
-@@ -1260,9 +1260,14 @@
- inputConv =
- csConv = new wxCSConv(m_charset);
- }
-- else // no conversion needed
-+ else // no need to convert the encoding
- {
-+ // we still need the conversion for Unicode build
-+#if wxUSE_UNICODE
-+ inputConv = wxConvCurrent;
-+#else // !wxUSE_UNICODE
- inputConv = NULL;
-+#endif
- }
-
- // conversion to apply to msgid strings before looking them up: we only
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp
new file mode 100644
index 000000000000..1568c514b291
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp
@@ -0,0 +1,26 @@
+--- 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/wxgtk26/pkg-plist b/x11-toolkits/wxgtk26/pkg-plist
index 9601a2533669..f97ace59bb87 100644
--- a/x11-toolkits/wxgtk26/pkg-plist
+++ b/x11-toolkits/wxgtk26/pkg-plist
@@ -3,33 +3,33 @@ 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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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
diff --git a/x11-toolkits/wxgtk28-common/Makefile b/x11-toolkits/wxgtk28-common/Makefile
index f4b25afa47f7..1bdbb9c01952 100644
--- a/x11-toolkits/wxgtk28-common/Makefile
+++ b/x11-toolkits/wxgtk28-common/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (common files)
diff --git a/x11-toolkits/wxgtk28-contrib-common/Makefile b/x11-toolkits/wxgtk28-contrib-common/Makefile
index 2289cc269f3b..58d6c54ebe6c 100644
--- a/x11-toolkits/wxgtk28-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk28-contrib-common/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (common files)
diff --git a/x11-toolkits/wxgtk28-contrib/Makefile b/x11-toolkits/wxgtk28-contrib/Makefile
index 67d1bc480dfe..1eba77011e9f 100644
--- a/x11-toolkits/wxgtk28-contrib/Makefile
+++ b/x11-toolkits/wxgtk28-contrib/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries
diff --git a/x11-toolkits/wxgtk28-contrib/pkg-plist b/x11-toolkits/wxgtk28-contrib/pkg-plist
index 8a754c89cc50..8c494fe85671 100644
--- a/x11-toolkits/wxgtk28-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib/pkg-plist
@@ -1,27 +1,27 @@
lib/libwx_gtk2_animate-2.6.so
lib/libwx_gtk2_animate-2.6.so.0
-lib/libwx_gtk2_animate-2.6.so.0.2.0
+lib/libwx_gtk2_animate-2.6.so.0.3.1
lib/libwx_gtk2_deprecated-2.6.so
lib/libwx_gtk2_deprecated-2.6.so.0
-lib/libwx_gtk2_deprecated-2.6.so.0.2.0
+lib/libwx_gtk2_deprecated-2.6.so.0.3.1
lib/libwx_gtk2_fl-2.6.so
lib/libwx_gtk2_fl-2.6.so.0
-lib/libwx_gtk2_fl-2.6.so.0.2.0
+lib/libwx_gtk2_fl-2.6.so.0.3.1
lib/libwx_gtk2_gizmos-2.6.so
lib/libwx_gtk2_gizmos-2.6.so.0
-lib/libwx_gtk2_gizmos-2.6.so.0.2.0
+lib/libwx_gtk2_gizmos-2.6.so.0.3.1
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.2.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0.3.1
lib/libwx_gtk2_ogl-2.6.so
lib/libwx_gtk2_ogl-2.6.so.0
-lib/libwx_gtk2_ogl-2.6.so.0.2.0
+lib/libwx_gtk2_ogl-2.6.so.0.3.1
lib/libwx_gtk2_plot-2.6.so
lib/libwx_gtk2_plot-2.6.so.0
-lib/libwx_gtk2_plot-2.6.so.0.2.0
+lib/libwx_gtk2_plot-2.6.so.0.3.1
lib/libwx_gtk2_stc-2.6.so
lib/libwx_gtk2_stc-2.6.so.0
-lib/libwx_gtk2_stc-2.6.so.0.2.0
+lib/libwx_gtk2_stc-2.6.so.0.3.1
lib/libwx_gtk2_svg-2.6.so
lib/libwx_gtk2_svg-2.6.so.0
-lib/libwx_gtk2_svg-2.6.so.0.2.0
+lib/libwx_gtk2_svg-2.6.so.0.3.1
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/Makefile b/x11-toolkits/wxgtk28-unicode-contrib/Makefile
index df1322fa7bcf..62f0029a5019 100644
--- a/x11-toolkits/wxgtk28-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk28-unicode-contrib/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
index 0d11542d5ca9..1bedd72d4374 100644
--- a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
@@ -1,27 +1,27 @@
lib/libwx_gtk2u_animate-2.6.so
lib/libwx_gtk2u_animate-2.6.so.0
-lib/libwx_gtk2u_animate-2.6.so.0.2.0
+lib/libwx_gtk2u_animate-2.6.so.0.3.1
lib/libwx_gtk2u_deprecated-2.6.so
lib/libwx_gtk2u_deprecated-2.6.so.0
-lib/libwx_gtk2u_deprecated-2.6.so.0.2.0
+lib/libwx_gtk2u_deprecated-2.6.so.0.3.1
lib/libwx_gtk2u_fl-2.6.so
lib/libwx_gtk2u_fl-2.6.so.0
-lib/libwx_gtk2u_fl-2.6.so.0.2.0
+lib/libwx_gtk2u_fl-2.6.so.0.3.1
lib/libwx_gtk2u_gizmos-2.6.so
lib/libwx_gtk2u_gizmos-2.6.so.0
-lib/libwx_gtk2u_gizmos-2.6.so.0.2.0
+lib/libwx_gtk2u_gizmos-2.6.so.0.3.1
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.2.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0.3.1
lib/libwx_gtk2u_ogl-2.6.so
lib/libwx_gtk2u_ogl-2.6.so.0
-lib/libwx_gtk2u_ogl-2.6.so.0.2.0
+lib/libwx_gtk2u_ogl-2.6.so.0.3.1
lib/libwx_gtk2u_plot-2.6.so
lib/libwx_gtk2u_plot-2.6.so.0
-lib/libwx_gtk2u_plot-2.6.so.0.2.0
+lib/libwx_gtk2u_plot-2.6.so.0.3.1
lib/libwx_gtk2u_stc-2.6.so
lib/libwx_gtk2u_stc-2.6.so.0
-lib/libwx_gtk2u_stc-2.6.so.0.2.0
+lib/libwx_gtk2u_stc-2.6.so.0.3.1
lib/libwx_gtk2u_svg-2.6.so
lib/libwx_gtk2u_svg-2.6.so.0
-lib/libwx_gtk2u_svg-2.6.so.0.2.0
+lib/libwx_gtk2u_svg-2.6.so.0.3.1
diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile
index 984e5fbb6abc..049949a2ab60 100644
--- a/x11-toolkits/wxgtk28-unicode/Makefile
+++ b/x11-toolkits/wxgtk28-unicode/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk28-unicode/pkg-plist b/x11-toolkits/wxgtk28-unicode/pkg-plist
index ec002bf7d7af..48b512fb8a5b 100644
--- a/x11-toolkits/wxgtk28-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk28-unicode/pkg-plist
@@ -3,33 +3,33 @@ 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.2.0
+lib/libwx_baseu-2.6.so.0.3.1
lib/libwx_baseu_net-2.6.so
lib/libwx_baseu_net-2.6.so.0
-lib/libwx_baseu_net-2.6.so.0.2.0
+lib/libwx_baseu_net-2.6.so.0.3.1
lib/libwx_baseu_xml-2.6.so
lib/libwx_baseu_xml-2.6.so.0
-lib/libwx_baseu_xml-2.6.so.0.2.0
+lib/libwx_baseu_xml-2.6.so.0.3.1
lib/libwx_gtk2u_adv-2.6.so
lib/libwx_gtk2u_adv-2.6.so.0
-lib/libwx_gtk2u_adv-2.6.so.0.2.0
+lib/libwx_gtk2u_adv-2.6.so.0.3.1
lib/libwx_gtk2u_core-2.6.so
lib/libwx_gtk2u_core-2.6.so.0
-lib/libwx_gtk2u_core-2.6.so.0.2.0
+lib/libwx_gtk2u_core-2.6.so.0.3.1
lib/libwx_gtk2u_gl-2.6.so
lib/libwx_gtk2u_gl-2.6.so.0
-lib/libwx_gtk2u_gl-2.6.so.0.2.0
+lib/libwx_gtk2u_gl-2.6.so.0.3.1
lib/libwx_gtk2u_html-2.6.so
lib/libwx_gtk2u_html-2.6.so.0
-lib/libwx_gtk2u_html-2.6.so.0.2.0
+lib/libwx_gtk2u_html-2.6.so.0.3.1
lib/libwx_gtk2u_media-2.6.so
lib/libwx_gtk2u_media-2.6.so.0
-lib/libwx_gtk2u_media-2.6.so.0.2.0
+lib/libwx_gtk2u_media-2.6.so.0.3.1
lib/libwx_gtk2u_qa-2.6.so
lib/libwx_gtk2u_qa-2.6.so.0
-lib/libwx_gtk2u_qa-2.6.so.0.2.0
+lib/libwx_gtk2u_qa-2.6.so.0.3.1
lib/libwx_gtk2u_xrc-2.6.so
lib/libwx_gtk2u_xrc-2.6.so.0
-lib/libwx_gtk2u_xrc-2.6.so.0.2.0
+lib/libwx_gtk2u_xrc-2.6.so.0.3.1
@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 4cc512ed5d22..125352772425 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.6.2
+PORTVERSION= 2.6.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -28,8 +28,8 @@ USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
+#USE_GCC= 3.4+
USE_GNOME= gtk20
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
--with-libjpeg=sys\
@@ -52,7 +52,6 @@ PLIST= ${.CURDIR}/pkg-plist
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 3
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
@@ -98,7 +97,7 @@ post-patch:
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
.if ${OSVERSION} < 500000
-IGNORE= Systems prior to FreeBSD 5.0 currently out of support
+IGNORE= systems prior to FreeBSD 5.0 currently out of support
.else
CONFIGURE_ARGS+=--enable-unicode
.endif
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index 5faf15c5f48f..e65efb62fc87 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.6.2.tar.bz2) = ba2afe7bd028062c5fff6d5ef3249c67
-SHA256 (wxGTK-2.6.2.tar.bz2) = 563c46435642d8c371768d3191c38e0791e689d1abc85b693a447cc0194bc771
-SIZE (wxGTK-2.6.2.tar.bz2) = 7328807
+MD5 (wxGTK-2.6.3.tar.bz2) = 3cd76c3c47913e52a3175dd47239c6ec
+SHA256 (wxGTK-2.6.3.tar.bz2) = 29902dc4600182edc2efa20b84e6f9a2bf88fa3c4b2b29f497b83b79c29dab10
+SIZE (wxGTK-2.6.3.tar.bz2) = 7213119
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
index d63613ccefb5..c4a0015bafa5 100644
--- a/x11-toolkits/wxgtk28/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Sep 20 22:03:25 2005
-+++ Makefile.in Wed Oct 12 23:21:27 2005
-@@ -23,6 +23,7 @@
+--- Makefile.in.orig Tue Mar 21 11:39:27 2006
++++ Makefile.in Tue Mar 21 11:54:48 2006
+@@ -24,6 +24,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -9153,13 +9154,15 @@
+@@ -9387,18 +9388,15 @@
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)
@@ -23,11 +23,16 @@
$(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
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(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)$(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 \
-@@ -9692,9 +9695,7 @@
+@@ -9931,9 +9929,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
deleted file mode 100644
index 12488d2b710e..000000000000
--- a/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
-retrieving revision 1.166
-retrieving revision 1.166.2.1
-diff -u -r1.166 -r1.166.2.1
---- src/common/intl.cpp 2005/09/18 23:38:06 1.166
-+++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1
-@@ -1260,9 +1260,14 @@
- inputConv =
- csConv = new wxCSConv(m_charset);
- }
-- else // no conversion needed
-+ else // no need to convert the encoding
- {
-+ // we still need the conversion for Unicode build
-+#if wxUSE_UNICODE
-+ inputConv = wxConvCurrent;
-+#else // !wxUSE_UNICODE
- inputConv = NULL;
-+#endif
- }
-
- // conversion to apply to msgid strings before looking them up: we only
diff --git a/x11-toolkits/wxgtk28/files/patch-src-gtk-clipbrd.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-clipbrd.cpp
new file mode 100644
index 000000000000..1568c514b291
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-gtk-clipbrd.cpp
@@ -0,0 +1,26 @@
+--- 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/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist
index 9601a2533669..f97ace59bb87 100644
--- a/x11-toolkits/wxgtk28/pkg-plist
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -3,33 +3,33 @@ 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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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
diff --git a/x11-toolkits/wxgtk29-common/Makefile b/x11-toolkits/wxgtk29-common/Makefile
index f4b25afa47f7..1bdbb9c01952 100644
--- a/x11-toolkits/wxgtk29-common/Makefile
+++ b/x11-toolkits/wxgtk29-common/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (common files)
diff --git a/x11-toolkits/wxgtk29-contrib-common/Makefile b/x11-toolkits/wxgtk29-contrib-common/Makefile
index 2289cc269f3b..58d6c54ebe6c 100644
--- a/x11-toolkits/wxgtk29-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk29-contrib-common/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (common files)
diff --git a/x11-toolkits/wxgtk29-contrib/Makefile b/x11-toolkits/wxgtk29-contrib/Makefile
index 67d1bc480dfe..1eba77011e9f 100644
--- a/x11-toolkits/wxgtk29-contrib/Makefile
+++ b/x11-toolkits/wxgtk29-contrib/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries
diff --git a/x11-toolkits/wxgtk29-contrib/pkg-plist b/x11-toolkits/wxgtk29-contrib/pkg-plist
index 8a754c89cc50..8c494fe85671 100644
--- a/x11-toolkits/wxgtk29-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-contrib/pkg-plist
@@ -1,27 +1,27 @@
lib/libwx_gtk2_animate-2.6.so
lib/libwx_gtk2_animate-2.6.so.0
-lib/libwx_gtk2_animate-2.6.so.0.2.0
+lib/libwx_gtk2_animate-2.6.so.0.3.1
lib/libwx_gtk2_deprecated-2.6.so
lib/libwx_gtk2_deprecated-2.6.so.0
-lib/libwx_gtk2_deprecated-2.6.so.0.2.0
+lib/libwx_gtk2_deprecated-2.6.so.0.3.1
lib/libwx_gtk2_fl-2.6.so
lib/libwx_gtk2_fl-2.6.so.0
-lib/libwx_gtk2_fl-2.6.so.0.2.0
+lib/libwx_gtk2_fl-2.6.so.0.3.1
lib/libwx_gtk2_gizmos-2.6.so
lib/libwx_gtk2_gizmos-2.6.so.0
-lib/libwx_gtk2_gizmos-2.6.so.0.2.0
+lib/libwx_gtk2_gizmos-2.6.so.0.3.1
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.2.0
+lib/libwx_gtk2_gizmos_xrc-2.6.so.0.3.1
lib/libwx_gtk2_ogl-2.6.so
lib/libwx_gtk2_ogl-2.6.so.0
-lib/libwx_gtk2_ogl-2.6.so.0.2.0
+lib/libwx_gtk2_ogl-2.6.so.0.3.1
lib/libwx_gtk2_plot-2.6.so
lib/libwx_gtk2_plot-2.6.so.0
-lib/libwx_gtk2_plot-2.6.so.0.2.0
+lib/libwx_gtk2_plot-2.6.so.0.3.1
lib/libwx_gtk2_stc-2.6.so
lib/libwx_gtk2_stc-2.6.so.0
-lib/libwx_gtk2_stc-2.6.so.0.2.0
+lib/libwx_gtk2_stc-2.6.so.0.3.1
lib/libwx_gtk2_svg-2.6.so
lib/libwx_gtk2_svg-2.6.so.0
-lib/libwx_gtk2_svg-2.6.so.0.2.0
+lib/libwx_gtk2_svg-2.6.so.0.3.1
diff --git a/x11-toolkits/wxgtk29-unicode-contrib/Makefile b/x11-toolkits/wxgtk29-unicode-contrib/Makefile
index df1322fa7bcf..62f0029a5019 100644
--- a/x11-toolkits/wxgtk29-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk29-unicode-contrib/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
diff --git a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
index 0d11542d5ca9..1bedd72d4374 100644
--- a/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode-contrib/pkg-plist
@@ -1,27 +1,27 @@
lib/libwx_gtk2u_animate-2.6.so
lib/libwx_gtk2u_animate-2.6.so.0
-lib/libwx_gtk2u_animate-2.6.so.0.2.0
+lib/libwx_gtk2u_animate-2.6.so.0.3.1
lib/libwx_gtk2u_deprecated-2.6.so
lib/libwx_gtk2u_deprecated-2.6.so.0
-lib/libwx_gtk2u_deprecated-2.6.so.0.2.0
+lib/libwx_gtk2u_deprecated-2.6.so.0.3.1
lib/libwx_gtk2u_fl-2.6.so
lib/libwx_gtk2u_fl-2.6.so.0
-lib/libwx_gtk2u_fl-2.6.so.0.2.0
+lib/libwx_gtk2u_fl-2.6.so.0.3.1
lib/libwx_gtk2u_gizmos-2.6.so
lib/libwx_gtk2u_gizmos-2.6.so.0
-lib/libwx_gtk2u_gizmos-2.6.so.0.2.0
+lib/libwx_gtk2u_gizmos-2.6.so.0.3.1
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.2.0
+lib/libwx_gtk2u_gizmos_xrc-2.6.so.0.3.1
lib/libwx_gtk2u_ogl-2.6.so
lib/libwx_gtk2u_ogl-2.6.so.0
-lib/libwx_gtk2u_ogl-2.6.so.0.2.0
+lib/libwx_gtk2u_ogl-2.6.so.0.3.1
lib/libwx_gtk2u_plot-2.6.so
lib/libwx_gtk2u_plot-2.6.so.0
-lib/libwx_gtk2u_plot-2.6.so.0.2.0
+lib/libwx_gtk2u_plot-2.6.so.0.3.1
lib/libwx_gtk2u_stc-2.6.so
lib/libwx_gtk2u_stc-2.6.so.0
-lib/libwx_gtk2u_stc-2.6.so.0.2.0
+lib/libwx_gtk2u_stc-2.6.so.0.3.1
lib/libwx_gtk2u_svg-2.6.so
lib/libwx_gtk2u_svg-2.6.so.0
-lib/libwx_gtk2u_svg-2.6.so.0.2.0
+lib/libwx_gtk2u_svg-2.6.so.0.3.1
diff --git a/x11-toolkits/wxgtk29-unicode/Makefile b/x11-toolkits/wxgtk29-unicode/Makefile
index 984e5fbb6abc..049949a2ab60 100644
--- a/x11-toolkits/wxgtk29-unicode/Makefile
+++ b/x11-toolkits/wxgtk29-unicode/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk29-unicode/pkg-plist b/x11-toolkits/wxgtk29-unicode/pkg-plist
index ec002bf7d7af..48b512fb8a5b 100644
--- a/x11-toolkits/wxgtk29-unicode/pkg-plist
+++ b/x11-toolkits/wxgtk29-unicode/pkg-plist
@@ -3,33 +3,33 @@ 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.2.0
+lib/libwx_baseu-2.6.so.0.3.1
lib/libwx_baseu_net-2.6.so
lib/libwx_baseu_net-2.6.so.0
-lib/libwx_baseu_net-2.6.so.0.2.0
+lib/libwx_baseu_net-2.6.so.0.3.1
lib/libwx_baseu_xml-2.6.so
lib/libwx_baseu_xml-2.6.so.0
-lib/libwx_baseu_xml-2.6.so.0.2.0
+lib/libwx_baseu_xml-2.6.so.0.3.1
lib/libwx_gtk2u_adv-2.6.so
lib/libwx_gtk2u_adv-2.6.so.0
-lib/libwx_gtk2u_adv-2.6.so.0.2.0
+lib/libwx_gtk2u_adv-2.6.so.0.3.1
lib/libwx_gtk2u_core-2.6.so
lib/libwx_gtk2u_core-2.6.so.0
-lib/libwx_gtk2u_core-2.6.so.0.2.0
+lib/libwx_gtk2u_core-2.6.so.0.3.1
lib/libwx_gtk2u_gl-2.6.so
lib/libwx_gtk2u_gl-2.6.so.0
-lib/libwx_gtk2u_gl-2.6.so.0.2.0
+lib/libwx_gtk2u_gl-2.6.so.0.3.1
lib/libwx_gtk2u_html-2.6.so
lib/libwx_gtk2u_html-2.6.so.0
-lib/libwx_gtk2u_html-2.6.so.0.2.0
+lib/libwx_gtk2u_html-2.6.so.0.3.1
lib/libwx_gtk2u_media-2.6.so
lib/libwx_gtk2u_media-2.6.so.0
-lib/libwx_gtk2u_media-2.6.so.0.2.0
+lib/libwx_gtk2u_media-2.6.so.0.3.1
lib/libwx_gtk2u_qa-2.6.so
lib/libwx_gtk2u_qa-2.6.so.0
-lib/libwx_gtk2u_qa-2.6.so.0.2.0
+lib/libwx_gtk2u_qa-2.6.so.0.3.1
lib/libwx_gtk2u_xrc-2.6.so
lib/libwx_gtk2u_xrc-2.6.so.0
-lib/libwx_gtk2u_xrc-2.6.so.0.2.0
+lib/libwx_gtk2u_xrc-2.6.so.0.3.1
@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 4cc512ed5d22..125352772425 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.6.2
+PORTVERSION= 2.6.3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -28,8 +28,8 @@ USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
+#USE_GCC= 3.4+
USE_GNOME= gtk20
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
--with-libjpeg=sys\
@@ -52,7 +52,6 @@ PLIST= ${.CURDIR}/pkg-plist
WXGTK_FLAVOR?= gtk2
.if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION= 3
CONFLICTS= wxgtk2-contrib-devel-2.5.2*
.endif
@@ -98,7 +97,7 @@ post-patch:
.if ${WXGTK_FLAVOR:M*-unicode*} != ""
.if ${OSVERSION} < 500000
-IGNORE= Systems prior to FreeBSD 5.0 currently out of support
+IGNORE= systems prior to FreeBSD 5.0 currently out of support
.else
CONFIGURE_ARGS+=--enable-unicode
.endif
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index 5faf15c5f48f..e65efb62fc87 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.6.2.tar.bz2) = ba2afe7bd028062c5fff6d5ef3249c67
-SHA256 (wxGTK-2.6.2.tar.bz2) = 563c46435642d8c371768d3191c38e0791e689d1abc85b693a447cc0194bc771
-SIZE (wxGTK-2.6.2.tar.bz2) = 7328807
+MD5 (wxGTK-2.6.3.tar.bz2) = 3cd76c3c47913e52a3175dd47239c6ec
+SHA256 (wxGTK-2.6.3.tar.bz2) = 29902dc4600182edc2efa20b84e6f9a2bf88fa3c4b2b29f497b83b79c29dab10
+SIZE (wxGTK-2.6.3.tar.bz2) = 7213119
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index d63613ccefb5..c4a0015bafa5 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Sep 20 22:03:25 2005
-+++ Makefile.in Wed Oct 12 23:21:27 2005
-@@ -23,6 +23,7 @@
+--- Makefile.in.orig Tue Mar 21 11:39:27 2006
++++ Makefile.in Tue Mar 21 11:54:48 2006
+@@ -24,6 +24,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
-@@ -9153,13 +9154,15 @@
+@@ -9387,18 +9388,15 @@
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)
@@ -23,11 +23,16 @@
$(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
-- (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(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)$(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 \
-@@ -9692,9 +9695,7 @@
+@@ -9931,9 +9929,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
deleted file mode 100644
index 12488d2b710e..000000000000
--- a/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
-retrieving revision 1.166
-retrieving revision 1.166.2.1
-diff -u -r1.166 -r1.166.2.1
---- src/common/intl.cpp 2005/09/18 23:38:06 1.166
-+++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1
-@@ -1260,9 +1260,14 @@
- inputConv =
- csConv = new wxCSConv(m_charset);
- }
-- else // no conversion needed
-+ else // no need to convert the encoding
- {
-+ // we still need the conversion for Unicode build
-+#if wxUSE_UNICODE
-+ inputConv = wxConvCurrent;
-+#else // !wxUSE_UNICODE
- inputConv = NULL;
-+#endif
- }
-
- // conversion to apply to msgid strings before looking them up: we only
diff --git a/x11-toolkits/wxgtk29/files/patch-src-gtk-clipbrd.cpp b/x11-toolkits/wxgtk29/files/patch-src-gtk-clipbrd.cpp
new file mode 100644
index 000000000000..1568c514b291
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-src-gtk-clipbrd.cpp
@@ -0,0 +1,26 @@
+--- 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/wxgtk29/pkg-plist b/x11-toolkits/wxgtk29/pkg-plist
index 9601a2533669..f97ace59bb87 100644
--- a/x11-toolkits/wxgtk29/pkg-plist
+++ b/x11-toolkits/wxgtk29/pkg-plist
@@ -3,33 +3,33 @@ 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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.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