Add wxgtk26, fix the runtime by add pangox in pkg-config. Thanks to marcus for

hint. The demos, vlc and py-bittornado work again. I only bump the
PORTREVISION in wxgtk26, so I am not sure if other wxgtk26-* need too.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4517 df743ca5-7f9a-e211-a948-0013205c9059

19 files changed, 401 insertions, 0 deletions

diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
new file mode 100644
index 000000000..716a7a353
--- /dev/null
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -0,0 +1,111 @@
+# New ports collection makefile for:	wxgtk26
+# Date created:         		June 27, 2004
+# Whom:					fjoe@FreeBSD.ORG
+#
+# $FreeBSD$
+#
+
+PORTNAME=	wx
+PORTVERSION=	2.6.0
+PORTREVISION?=	2
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	wxwindows
+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.9:${PORTSDIR}/graphics/jpeg\
+		tiff.4:${PORTSDIR}/graphics/tiff\
+		expat.5:${PORTSDIR}/textproc/expat2\
+		mspack.1:${PORTSDIR}/archivers/libmspack
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GL=		yes
+USE_GMAKE=	yes
+USE_ICONV=	yes
+USE_GNOME=	gtk20
+USE_REINPLACE=	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\
+		--disable-backtrace
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+			  -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv \
+			 -L${X11BASE}/lib" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+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=	${X11BASE}/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
+INSTALLS_SHLIB=	yes
+.endif # *-common
+
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
+.if ${WXGTK_FLAVOR} != "gtk2-contrib-utils"
+BUILD_WRKSRC=	${WRKSRC}/contrib
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
+RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+LIB_DEPENDS+=	wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
+.else
+LIB_DEPENDS+=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+.endif
+
+pre-configure:
+	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+		-e "s|@CXXFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cxxflags`|" \
+		-e "s|@CFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cflags`|" \
+		-e "s|@CPPFLAGS@||"
+
+.endif # !gtk2-contrib-common
+.endif # !gtk2-contrib-utils
+.endif # *-contrib*
+
+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.pre.mk>
+
+.if ${WXGTK_FLAVOR:M*-unicode*} != ""
+.if ${OSVERSION} < 500000
+IGNORE=		Systems prior to FreeBSD 5.0 currently out of support
+.else
+CONFIGURE_ARGS+=--enable-unicode
+.endif
+
+WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
+.else
+WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
+.endif # *-unicode*
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/wxgtk26/distinfo b/x11-toolkits/wxgtk26/distinfo
new file mode 100644
index 000000000..56d766416
--- /dev/null
+++ b/x11-toolkits/wxgtk26/distinfo
@@ -0,0 +1,2 @@
+MD5 (wxGTK-2.6.0.tar.bz2) = 1371dd278e8f5a7e1fb821c1e3b3795b
+SIZE (wxGTK-2.6.0.tar.bz2) = 7281025
diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
new file mode 100644
index 000000000..00bd63328
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -0,0 +1,38 @@
+--- Makefile.in.orig	Thu Apr 21 00:32:34 2005
++++ Makefile.in	Thu May  5 16:11:02 2005
+@@ -23,6 +23,7 @@
+ SONAME_FLAG = @SONAME_FLAG@
+ STRIP = @STRIP@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
+ srcdir = @srcdir@
+@@ -9127,11 +9128,13 @@
+ 
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__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 $(__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)
+-	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+-	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+ 	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+ 	for f in $(ALL_HEADERS); do \
+ 	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+@@ -9664,9 +9667,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
diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure
new file mode 100644
index 000000000..2b3d5be8d
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-configure
@@ -0,0 +1,41 @@
+--- configure.orig	Thu Apr 21 00:32:34 2005
++++ configure	Thu May  5 16:17:57 2005
+@@ -33918,7 +33918,7 @@
+                 fi
+                 ;;
+           *-*-freebsd*)
+-                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
++                                                THREAD_OPTS="$PTHREAD_LIBS"
+                 ;;
+           *-*-darwin* | *-*-cygwin* )
+                                                 THREAD_OPTS=""
+@@ -33955,6 +33955,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
+@@ -35210,6 +35216,7 @@
+     fi
+   fi
+ fi
++TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}"
+ 
+ if test "$WXGTK20" = 1 ; then
+   cat >>confdefs.h <<_ACEOF
+@@ -35330,7 +35337,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..79e8fc3c5
--- /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.1 2005-08-16 21:26:32 mezz 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-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..434032d26
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-wx-config.in
@@ -0,0 +1,11 @@
+--- wx-config.in.orig	Thu Apr 21 00:32:34 2005
++++ wx-config.in	Thu May  5 16:36:09 2005
+@@ -1142,7 +1142,7 @@
+     _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
+ fi
+ 
+-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@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..f21ae0c20
--- /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.0.0
+lib/libwx_base_net-2.6.so
+lib/libwx_base_net-2.6.so.0
+lib/libwx_base_net-2.6.so.0.0.0
+lib/libwx_base_xml-2.6.so
+lib/libwx_base_xml-2.6.so.0
+lib/libwx_base_xml-2.6.so.0.0.0
+lib/libwx_gtk2_adv-2.6.so
+lib/libwx_gtk2_adv-2.6.so.0
+lib/libwx_gtk2_adv-2.6.so.0.0.0
+lib/libwx_gtk2_core-2.6.so
+lib/libwx_gtk2_core-2.6.so.0
+lib/libwx_gtk2_core-2.6.so.0.0.0
+lib/libwx_gtk2_gl-2.6.so
+lib/libwx_gtk2_gl-2.6.so.0
+lib/libwx_gtk2_gl-2.6.so.0.0.0
+lib/libwx_gtk2_html-2.6.so
+lib/libwx_gtk2_html-2.6.so.0
+lib/libwx_gtk2_html-2.6.so.0.0.0
+lib/libwx_gtk2_media-2.6.so
+lib/libwx_gtk2_media-2.6.so.0
+lib/libwx_gtk2_media-2.6.so.0.0.0
+lib/libwx_gtk2_qa-2.6.so
+lib/libwx_gtk2_qa-2.6.so.0
+lib/libwx_gtk2_qa-2.6.so.0.0.0
+lib/libwx_gtk2_xrc-2.6.so
+lib/libwx_gtk2_xrc-2.6.so.0
+lib/libwx_gtk2_xrc-2.6.so.0.0.0
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6/wx
+@dirrm include/wx-2.6/gtk2-ansi-release-2.6