summaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-18 21:28:25 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-18 21:28:25 +0800
commitd72a649d5109055d2d8fc5b2d58c54e916b29155 (patch)
tree845b817108514c6e200fa043c731bc199877933d /x11-toolkits
parent9a640a521086c04a1c33e6b93856b17d1584fc36 (diff)
downloadmarcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar
marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.gz
marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.bz2
marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.lz
marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.xz
marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.zst
marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.zip
Add upstream hack to fix the build of wxgtk26 and wxgtk28 with glib 2.21.x.
Submitted by: Dominique Goncalves on IRC git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12899 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/wxgtk26/Makefile96
-rw-r--r--x11-toolkits/wxgtk26/distinfo3
-rw-r--r--x11-toolkits/wxgtk26/files/patch-Makefile.in56
-rw-r--r--x11-toolkits/wxgtk26/files/patch-configure58
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in9
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in29
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in12
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp20
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp16
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp11
-rw-r--r--x11-toolkits/wxgtk26/files/patch-utils-wxrc-Makefile.in21
-rw-r--r--x11-toolkits/wxgtk26/files/patch-wx-config.in11
-rw-r--r--x11-toolkits/wxgtk26/pkg-descr4
-rw-r--r--x11-toolkits/wxgtk26/pkg-plist35
-rw-r--r--x11-toolkits/wxgtk28/Makefile94
-rw-r--r--x11-toolkits/wxgtk28/distinfo3
-rw-r--r--x11-toolkits/wxgtk28/files/patch-Makefile.in57
-rw-r--r--x11-toolkits/wxgtk28/files/patch-configure28
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-Makefile.in9
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in29
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp11
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp16
-rw-r--r--x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in23
-rw-r--r--x11-toolkits/wxgtk28/pkg-descr4
-rw-r--r--x11-toolkits/wxgtk28/pkg-plist43
40 files changed, 863 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
new file mode 100644
index 000000000..7a4b89b40
--- /dev/null
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -0,0 +1,96 @@
+# New ports collection makefile for: wxgtk26
+# Date created: June 27, 2004
+# Whom: fjoe@FreeBSD.ORG
+#
+# $FreeBSD: ports/x11-toolkits/wxgtk26/Makefile,v 1.43 2009/08/22 00:39:32 amdmi3 Exp $
+#
+
+PORTNAME= wx
+PORTVERSION= 2.6.4
+PORTREVISION?= 2
+CATEGORIES= x11-toolkits
+MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
+PKGNAMESUFFIX= ${WXGTK_FLAVOR}
+DISTNAME= wxGTK-${PORTVERSION}
+
+MAINTAINER?= fjoe@FreeBSD.org
+COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
+
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
+ jpeg.10:${PORTSDIR}/graphics/jpeg\
+ tiff.4:${PORTSDIR}/graphics/tiff\
+ expat.6:${PORTSDIR}/textproc/expat2\
+ mspack.1:${PORTSDIR}/archivers/libmspack
+
+USE_BZIP2= yes
+USE_XORG= x11 sm xxf86vm xinerama
+USE_GL= glu
+USE_GMAKE= yes
+USE_ICONV= yes
+USE_GNOME= gtk20
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-libpng=sys\
+ --with-libjpeg=sys\
+ --with-libtiff=sys\
+ --with-zlib=sys\
+ --with-expat=sys\
+ --with-opengl\
+ --with-mspack\
+ --with-gtk\
+ --disable-backtrace
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -liconv" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"\
+ X11BASE="${LOCALBASE}"
+NO_LATEST_LINK= yes
+PLIST= ${.CURDIR}/pkg-plist
+
+WXGTK_FLAVOR?= gtk2
+
+.if ${WXGTK_FLAVOR} == "gtk2"
+CONFLICTS= wxgtk2-contrib-devel-2.5.2*
+.endif
+
+.if ${WXGTK_FLAVOR} != "gtk2-common"
+RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
+.endif
+
+.if ${WXGTK_FLAVOR:M*-common} != ""
+NO_BUILD= yes
+INSTALL_TARGET= install-common
+.else
+USE_LDCONFIG= yes
+.endif # *-common
+
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
+BUILD_WRKSRC= ${WRKSRC}/contrib
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
+USE_WX= 2.6
+RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+WX_UNICODE= yes
+.endif
+
+pre-configure:
+ @${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+ -e "s|@CXXFLAGS@|${CFLAGS} `${WX_CONFIG} --cxxflags`|" \
+ -e "s|@CFLAGS@|${CFLAGS} `${WX_CONFIG} --cflags`|" \
+ -e "s|@CPPFLAGS@||"
+
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+CONFIGURE_ARGS+=--enable-unicode
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
+ s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
+ ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
new file mode 100644
index 000000000..48618c7fa
--- /dev/null
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -0,0 +1,3 @@
+MD5 (wxGTK-2.6.4.tar.bz2) = ce0fd2b425bc98957cf70eea5f154b49
+SHA256 (wxGTK-2.6.4.tar.bz2) = 96edce3000611b83c28e50f8ae0bdff235a079e30e8a83769d32367702df1144
+SIZE (wxGTK-2.6.4.tar.bz2) = 7209941
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
new file mode 100644
index 000000000..0ba321f48
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -0,0 +1,56 @@
+--- Makefile.in.orig Wed Mar 22 05:42:05 2006
++++ Makefile.in Tue Jan 9 00:08:38 2007
+@@ -24,6 +24,7 @@
+ SONAME_FLAG = @SONAME_FLAG@
+ STRIP = @STRIP@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
+ srcdir = @srcdir@
+@@ -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)
+
+-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-common: locale_install
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
+ $(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
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; 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 \
+@@ -9931,9 +9929,7 @@
+
+ install-wxconfig:
+ $(INSTALL_DIR) $(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
+@@ -9941,7 +9937,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure
new file mode 100644
index 000000000..b3cf594f3
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-configure
@@ -0,0 +1,58 @@
+--- configure.orig Thu Jun 2 23:03:05 2005
++++ configure Wed Aug 31 23:48:02 2005
+@@ -23409,6 +23409,7 @@
+
+
+ SEARCH_INCLUDE="\
++ $X11BASE/include \
+ /usr/local/include \
+ \
+ /usr/Motif-2.1/include \
+@@ -34396,7 +34396,7 @@
+ fi
+ ;;
+ *-*-freebsd*)
+- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
++ 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"
+ fi
+ fi
+-
++OPTIMISE=
+
+ if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
+ cat >>confdefs.h <<\_ACEOF
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in
new file mode 100644
index 000000000..20b4b5800
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-Makefile.in
@@ -0,0 +1,9 @@
+--- contrib/Makefile.in.orig Sun Jun 27 21:46:24 2004
++++ contrib/Makefile.in Sun Jun 27 21:46:44 2004
+@@ -16,3 +16,6 @@
+
+ install:
+ cd src; $(MAKE) install
++
++install-common:
++ cd src; $(MAKE) install-common
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
new file mode 100644
index 000000000..5c4a4bba7
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-Makefile.in
@@ -0,0 +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: patch-contrib-src-Makefile.in,v 1.5 2009-09-18 13:28:24 kwm Exp $
+
+-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-$(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/wxgtk26/files/patch-contrib-src-animate-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
new file mode 100644
index 000000000..abfc81a61
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-animate-Makefile.in
@@ -0,0 +1,11 @@
+--- 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/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
new file mode 100644
index 000000000..0c492341c
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-deprecated-Makefile.in
@@ -0,0 +1,11 @@
+--- 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/wxgtk26/files/patch-contrib-src-fl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
new file mode 100644
index 000000000..2de711cc3
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-fl-Makefile.in
@@ -0,0 +1,11 @@
+--- 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)/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)/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
new file mode 100644
index 000000000..51b5ab5ee
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-gizmos-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/gizmos/Makefile.in.orig Thu Apr 21 00:33:08 2005
++++ contrib/src/gizmos/Makefile.in Thu May 5 16:22:48 2005
+@@ -277,6 +277,8 @@
+ all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
+
+ install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
++
++install-common:
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
new file mode 100644
index 000000000..2be3bdbe7
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-ogl-Makefile.in
@@ -0,0 +1,11 @@
+--- 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)/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)/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
new file mode 100644
index 000000000..802b4f093
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-plot-Makefile.in
@@ -0,0 +1,11 @@
+--- 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)/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)/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
new file mode 100644
index 000000000..c41d5cbfe
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-stc-Makefile.in
@@ -0,0 +1,11 @@
+--- 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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ for f in wx/stc/stc.h; do \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
new file mode 100644
index 000000000..213aef13d
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-src-svg-Makefile.in
@@ -0,0 +1,11 @@
+--- 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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ for f in wx/svg/dcsvg.h; do \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in b/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in
new file mode 100644
index 000000000..acbcfacb0
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-contrib-utils-Makefile.in
@@ -0,0 +1,12 @@
+--- 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/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
new file mode 100644
index 000000000..7d964d682
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
@@ -0,0 +1,20 @@
+--- src/common/intl.cpp.orig Wed Mar 22 05:42:10 2006
++++ src/common/intl.cpp Tue Jan 9 00:27:17 2007
+@@ -1452,6 +1452,8 @@
+ m_initialized = false;
+ }
+
++#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
++
+ // NB: this function has (desired) side effect of changing current locale
+ bool wxLocale::Init(const wxChar *szName,
+ const wxChar *szShort,
+@@ -1520,7 +1522,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp
new file mode 100644
index 000000000..0f06c4088
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-button.cpp
@@ -0,0 +1,11 @@
+--- src/gtk/button.cpp.orig 2006-03-22 00:42:16.000000000 +0100
++++ src/gtk/button.cpp 2007-11-22 14:00:47.000000000 +0100
+@@ -89,7 +89,7 @@
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+- g_free( default_border );
++ gtk_border_free( default_border );
+ }
+ #else
+ left_border = 6;
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000..113f73e51
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,16 @@
+--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100
++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200
+@@ -14,8 +14,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp
new file mode 100644
index 000000000..663168de4
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-window.cpp
@@ -0,0 +1,11 @@
+--- src/gtk/window.cpp.orig 2006-03-22 00:42:17.000000000 +0100
++++ src/gtk/window.cpp 2007-11-22 14:01:22.000000000 +0100
+@@ -3279,7 +3279,7 @@
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+- g_free( default_border );
++ gtk_border_free( default_border );
+ }
+ #else
+ left_border = 6;
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 000000000..353821f40
--- /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
new file mode 100644
index 000000000..91a9738d8
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-wx-config.in
@@ -0,0 +1,11 @@
+--- wx-config.in.orig 2007-03-20 21:49:55.000000000 +0600
++++ wx-config.in 2009-03-15 14:05:53.000000000 +0600
+@@ -1129,7 +1129,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/wxgtk26/pkg-descr b/x11-toolkits/wxgtk26/pkg-descr
new file mode 100644
index 000000000..67f1f41d3
--- /dev/null
+++ b/x11-toolkits/wxgtk26/pkg-descr
@@ -0,0 +1,4 @@
+wxWidgets (formerly known as wxWindows) is a C++ GUI framework for platform
+independent software development. On FreeBSD the Gtk toolkit is used.
+
+WWW: http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk26/pkg-plist b/x11-toolkits/wxgtk26/pkg-plist
new file mode 100644
index 000000000..b116faa0c
--- /dev/null
+++ b/x11-toolkits/wxgtk26/pkg-plist
@@ -0,0 +1,35 @@
+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.4.0
+lib/libwx_base_net-2.6.so
+lib/libwx_base_net-2.6.so.0
+lib/libwx_base_net-2.6.so.0.4.0
+lib/libwx_base_xml-2.6.so
+lib/libwx_base_xml-2.6.so.0
+lib/libwx_base_xml-2.6.so.0.4.0
+lib/libwx_gtk2_adv-2.6.so
+lib/libwx_gtk2_adv-2.6.so.0
+lib/libwx_gtk2_adv-2.6.so.0.4.0
+lib/libwx_gtk2_core-2.6.so
+lib/libwx_gtk2_core-2.6.so.0
+lib/libwx_gtk2_core-2.6.so.0.4.0
+lib/libwx_gtk2_gl-2.6.so
+lib/libwx_gtk2_gl-2.6.so.0
+lib/libwx_gtk2_gl-2.6.so.0.4.0
+lib/libwx_gtk2_html-2.6.so
+lib/libwx_gtk2_html-2.6.so.0
+lib/libwx_gtk2_html-2.6.so.0.4.0
+lib/libwx_gtk2_media-2.6.so
+lib/libwx_gtk2_media-2.6.so.0
+lib/libwx_gtk2_media-2.6.so.0.4.0
+lib/libwx_gtk2_qa-2.6.so
+lib/libwx_gtk2_qa-2.6.so.0
+lib/libwx_gtk2_qa-2.6.so.0.4.0
+lib/libwx_gtk2_xrc-2.6.so
+lib/libwx_gtk2_xrc-2.6.so.0
+lib/libwx_gtk2_xrc-2.6.so.0.4.0
+@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/Makefile b/x11-toolkits/wxgtk28/Makefile
new file mode 100644
index 000000000..c7fac2dee
--- /dev/null
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -0,0 +1,94 @@
+# New ports collection makefile for: wxgtk26
+# Date created: June 27, 2004
+# Whom: fjoe@FreeBSD.ORG
+#
+# $FreeBSD: ports/x11-toolkits/wxgtk28/Makefile,v 1.50 2009/08/22 00:39:32 amdmi3 Exp $
+#
+
+PORTNAME= wx
+PORTVERSION= 2.8.10
+PORTREVISION?= 2
+CATEGORIES= x11-toolkits
+MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
+PKGNAMESUFFIX= ${WXGTK_FLAVOR}
+DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1}
+
+MAINTAINER?= fjoe@FreeBSD.org
+COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
+
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
+ jpeg.10:${PORTSDIR}/graphics/jpeg\
+ tiff.4:${PORTSDIR}/graphics/tiff\
+ expat.6:${PORTSDIR}/textproc/expat2\
+ mspack.1:${PORTSDIR}/archivers/libmspack
+
+USE_BZIP2= yes
+USE_XORG= x11 sm xxf86vm xinerama
+USE_GL= glu
+USE_GMAKE= yes
+USE_ICONV= yes
+USE_GNOME= gtk20 gconf2
+USE_GSTREAMER= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-libpng=sys\
+ --with-libjpeg=sys\
+ --with-libtiff=sys\
+ --with-zlib=sys\
+ --with-expat=sys\
+ --with-opengl\
+ --with-mspack\
+ --with-gtk\
+ --enable-mediactrl\
+ --disable-backtrace\
+ --enable-graphics_ctx
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
+ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
+ WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
+ PTHREAD_LIBS="${PTHREAD_LIBS}"\
+ X11BASE="${LOCALBASE}"
+PLIST= ${.CURDIR}/pkg-plist
+
+WXGTK_FLAVOR?= gtk2
+
+.if ${WXGTK_FLAVOR} != "gtk2-common"
+RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
+.endif
+
+.if ${WXGTK_FLAVOR:M*-common} != ""
+NO_BUILD= yes
+INSTALL_TARGET= install-common
+.else
+USE_LDCONFIG= yes
+.endif # *-common
+
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
+BUILD_WRKSRC= ${WRKSRC}/contrib
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
+USE_WX= 2.8
+RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+WX_UNICODE= yes
+.endif
+
+pre-configure:
+ @${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+ -e "s|@CXXFLAGS@|${CFLAGS} `${WX_CONFIG} --cxxflags`|" \
+ -e "s|@CFLAGS@|${CFLAGS} `${WX_CONFIG} --cflags`|" \
+ -e "s|@CPPFLAGS@||"
+
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+CONFIGURE_ARGS+=--enable-unicode
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
+ s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
+ ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
new file mode 100644
index 000000000..6b1855837
--- /dev/null
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -0,0 +1,3 @@
+MD5 (wxGTK-2.8.10.tar.bz2) = 88b867bc118a183af56efc67014bdf27
+SHA256 (wxGTK-2.8.10.tar.bz2) = 697569f3c029da68a6f5e95ad01e6ae26cf86e3776fcbfc8671de2e688099a98
+SIZE (wxGTK-2.8.10.tar.bz2) = 9365627
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
new file mode 100644
index 000000000..bc15e0793
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -0,0 +1,57 @@
+--- Makefile.in.orig 2009-03-06 18:17:59.000000000 +0600
++++ Makefile.in 2009-03-20 00:04:22.000000000 +0600
+@@ -25,6 +25,7 @@
+ SONAME_FLAG = @SONAME_FLAG@
+ STRIP = @STRIP@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
+ BK_DEPS = @BK_DEPS@
+@@ -11443,11 +11444,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) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+-install: $(__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: $(__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 \
+@@ -11455,6 +11452,12 @@
+ fi; \
+ $(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
+ done
++
++install-common: locale_install
++ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
++ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; 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 \
+@@ -12202,17 +12205,16 @@
+
+ install-wxconfig:
+ $(INSTALL_DIR) $(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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ $(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 ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure
new file mode 100644
index 000000000..1fec2d790
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-configure
@@ -0,0 +1,28 @@
+--- 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 \
+ /usr/local/include \
+ \
+ /usr/Motif-2.1/include \
+@@ -38999,7 +39000,7 @@
+ fi
+ ;;
+ *-*-freebsd*)
+- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
++ THREAD_OPTS="${PTHREAD_LIBS}"
+ ;;
+ *-*-darwin* | *-*-cygwin* )
+ THREAD_OPTS=""
+@@ -41649,7 +41650,7 @@
+ OPTIMISE_CFLAGS="-O"
+ fi
+ fi
+-
++OPTIMISE_CFLAGS=
+
+ if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
+ cat >>confdefs.h <<\_ACEOF
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-Makefile.in
new file mode 100644
index 000000000..20b4b5800
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-Makefile.in
@@ -0,0 +1,9 @@
+--- contrib/Makefile.in.orig Sun Jun 27 21:46:24 2004
++++ contrib/Makefile.in Sun Jun 27 21:46:44 2004
+@@ -16,3 +16,6 @@
+
+ install:
+ cd src; $(MAKE) install
++
++install-common:
++ cd src; $(MAKE) install-common
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
new file mode 100644
index 000000000..78773088b
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-Makefile.in
@@ -0,0 +1,29 @@
+--- contrib/src/Makefile.in.orig 2009-03-06 18:18:00.000000000 +0600
++++ contrib/src/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -2,15 +2,25 @@
+
+ CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
+
+-all:
++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) $(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-fl-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
new file mode 100644
index 000000000..cd1f741c5
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-fl-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/fl/Makefile.in.orig 2009-03-06 18:18:00.000000000 +0600
++++ contrib/src/fl/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -245,6 +245,8 @@
+ all: $(__fldll___depname) $(__fllib___depname)
+
+ install: $(__install_fldll___depname) $(__install_fllib___depname)
++
++install-common:
+ $(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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
new file mode 100644
index 000000000..c71e4ee1e
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-gizmos-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/gizmos/Makefile.in.orig 2009-03-06 18:18:00.000000000 +0600
++++ contrib/src/gizmos/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -308,6 +308,8 @@
+ all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
+
+ install: $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
++
++install-common:
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.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-ogl-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
new file mode 100644
index 000000000..5039cab23
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-ogl-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/ogl/Makefile.in.orig 2009-03-06 18:18:06.000000000 +0600
++++ contrib/src/ogl/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -235,6 +235,8 @@
+ all: $(__ogldll___depname) $(__ogllib___depname)
+
+ install: $(__install_ogldll___depname) $(__install_ogllib___depname)
++
++install-common:
+ $(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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
new file mode 100644
index 000000000..1089e7351
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-plot-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/plot/Makefile.in.orig 2009-03-06 18:18:00.000000000 +0600
++++ contrib/src/plot/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -213,6 +213,8 @@
+ all: $(__plotdll___depname) $(__plotlib___depname)
+
+ install: $(__install_plotdll___depname) $(__install_plotlib___depname)
++
++install-common:
+ $(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)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
new file mode 100644
index 000000000..b665ce68f
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-stc-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/stc/Makefile.in.orig 2009-03-06 18:18:00.000000000 +0600
++++ contrib/src/stc/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -369,6 +369,8 @@
+ all: $(__stcdll___depname) $(__stclib___depname)
+
+ install: $(__install_stcdll___depname) $(__install_stclib___depname)
++
++install-common:
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ for f in wx/stc/stc.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-svg-Makefile.in b/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
new file mode 100644
index 000000000..1210c8879
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-contrib-src-svg-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/src/svg/Makefile.in.orig 2009-03-06 18:18:00.000000000 +0600
++++ contrib/src/svg/Makefile.in 2009-03-20 00:07:59.000000000 +0600
+@@ -213,6 +213,8 @@
+ all: $(__svgdll___depname) $(__svglib___depname)
+
+ install: $(__install_svgdll___depname) $(__install_svglib___depname)
++
++install-common:
+ $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ for f in wx/svg/dcsvg.h; do \
+ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
diff --git a/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
new file mode 100644
index 000000000..5d205cecb
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
@@ -0,0 +1,11 @@
+--- src/common/intl.cpp.orig Mon Jan 8 21:27:30 2007
++++ src/common/intl.cpp Mon Jan 8 21:27:18 2007
+@@ -1585,7 +1585,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
diff --git a/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000..113f73e51
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,16 @@
+--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100
++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200
+@@ -14,8 +14,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000..1ae8e5792
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,23 @@
+--- 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@
+ 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)$(EXEEXT)
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-toolkits/wxgtk28/pkg-descr b/x11-toolkits/wxgtk28/pkg-descr
new file mode 100644
index 000000000..67f1f41d3
--- /dev/null
+++ b/x11-toolkits/wxgtk28/pkg-descr
@@ -0,0 +1,4 @@
+wxWidgets (formerly known as wxWindows) is a C++ GUI framework for platform
+independent software development. On FreeBSD the Gtk toolkit is used.
+
+WWW: http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk28/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist
new file mode 100644
index 000000000..623210b18
--- /dev/null
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -0,0 +1,43 @@
+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.6.0
+lib/libwx_base_net-2.8.so
+lib/libwx_base_net-2.8.so.0
+lib/libwx_base_net-2.8.so.0.6.0
+lib/libwx_base_xml-2.8.so
+lib/libwx_base_xml-2.8.so.0
+lib/libwx_base_xml-2.8.so.0.6.0
+lib/libwx_gtk2_adv-2.8.so
+lib/libwx_gtk2_adv-2.8.so.0
+lib/libwx_gtk2_adv-2.8.so.0.6.0
+lib/libwx_gtk2_aui-2.8.so
+lib/libwx_gtk2_aui-2.8.so.0
+lib/libwx_gtk2_aui-2.8.so.0.6.0
+lib/libwx_gtk2_core-2.8.so
+lib/libwx_gtk2_core-2.8.so.0
+lib/libwx_gtk2_core-2.8.so.0.6.0
+lib/libwx_gtk2_gl-2.8.so
+lib/libwx_gtk2_gl-2.8.so.0
+lib/libwx_gtk2_gl-2.8.so.0.6.0
+lib/libwx_gtk2_html-2.8.so
+lib/libwx_gtk2_html-2.8.so.0
+lib/libwx_gtk2_html-2.8.so.0.6.0
+lib/libwx_gtk2_media-2.8.so
+lib/libwx_gtk2_media-2.8.so.0
+lib/libwx_gtk2_media-2.8.so.0.6.0
+lib/libwx_gtk2_qa-2.8.so
+lib/libwx_gtk2_qa-2.8.so.0
+lib/libwx_gtk2_qa-2.8.so.0.6.0
+lib/libwx_gtk2_richtext-2.8.so
+lib/libwx_gtk2_richtext-2.8.so.0
+lib/libwx_gtk2_richtext-2.8.so.0.6.0
+lib/libwx_gtk2_xrc-2.8.so
+lib/libwx_gtk2_xrc-2.8.so.0
+lib/libwx_gtk2_xrc-2.8.so.0.6.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