- Use features of bsd.wx.mk, especially USE_WX

PR: ports/101613 Submitted by: alepulver
svn path=/head/; revision=178433
2024-12-20 04:02:27 +00:00 · 2006-12-01 07:39:02 +00:00 · 2006-12-01 07:39:02 +00:00 · d750615763 · 2021-03-31 03:12:20 +00:00
commit d750615763
parent 767bcfc72c
77 changed files with 197 additions and 397 deletions
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@ -15,7 +15,6 @@ MAINTAINER=	craig@yekse.gank.org
 COMMENT=	Audacity is a GUI editor for digital audio waveforms

 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26

 CONFLICTS=	audacity-devel-[0-9]*

@ -24,6 +23,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
+USE_WX=		2.6

 MAN1=		audacity.1
 MANCOMPRESSED=	yes
@ -40,8 +40,7 @@ SSE_CFLAGS=	-mno-sse -mno-sse2

 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
-		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.6-config
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}"

 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@ -12,17 +12,17 @@ MASTER_SITES=	http://www.mbox.wz.cz/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program intended to help with organizing your music files

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 \
-		${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
 		${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
 		lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		mplayer:${PORTSDIR}/multimedia/mplayer
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24

 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_BZIP2=	yes
+USE_WX=		2.4
+WX_COMPS=	python
 WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}

 .include <bsd.port.mk>
--- a/biology/L-Breeder/Makefile
+++ b/biology/L-Breeder/Makefile
@ -16,8 +16,7 @@ DISTNAME=	${PORTNAME}-source
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	Allows you to display and breed L-system forms

-LIB_DEPENDS=	wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
-		glut.4:${PORTSDIR}/graphics/libglut
+LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut

 NO_WRKSUBDIR=	yes
 BUILD_WRKSRC=	${WRKSRC}/Unix
@ -26,8 +25,7 @@ USE_ZIP=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
-
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
+USE_WX=		2.4

 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@ -22,8 +22,6 @@ EXTRACT_ONLY=		${PORTNAME}-sources-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Schematic and PCB editing software

-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-
 .if !defined(NOPORTDOCS)
 DISTFILES+=	doc_components-${DOCVERSION}.tgz:dat
 DOCVERSION=	2006-06-26
@ -36,10 +34,7 @@ USE_ZIP=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
-
-MAKE_ENV=	WX_CONFIG=${WX_CONFIG}
-
-WX_CONFIG=	wxgtk2-2.6-config
+USE_WX=		2.6

 INSTDIR=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR} OPSYS=${OPSYS}
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@ -22,8 +22,6 @@ EXTRACT_ONLY=		${PORTNAME}-sources-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Schematic and PCB editing software

-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-
 .if !defined(NOPORTDOCS)
 DISTFILES+=	doc_components-${DOCVERSION}.tgz:dat
 DOCVERSION=	2006-06-26
@ -36,10 +34,7 @@ USE_ZIP=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
-
-MAKE_ENV=	WX_CONFIG=${WX_CONFIG}
-
-WX_CONFIG=	wxgtk2-2.6-config
+USE_WX=		2.6

 INSTDIR=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR} OPSYS=${OPSYS}
--- a/chinese/BBMan/Makefile
+++ b/chinese/BBMan/Makefile
@ -16,11 +16,10 @@ DISTNAME=	${PORTNAME}-src-v${PORTVERSION:S,.,-,g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BBMan is a BBS client for X Window System

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
+USE_WX=		2.4

 PLIST_FILES=	bin/BBMan

@ -35,7 +34,7 @@ BROKEN=		Hard-codes reference to libc_r
 .endif

 do-build:
-	cd ${WRKSRC} && ${CXX} main.cpp `wxgtk2-2.4-config --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
+	cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${TARGETDIR}/bin/BBMan
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@ -16,11 +16,11 @@ DISTFILES=	tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz
 MAINTAINER=	db@db.net
 COMMENT=	Amateur Radio Station electronic trusted logbook

-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		wx_base-2.6:${PORTSDIR}/x11-toolkits/wxgtk26
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2

 USE_PERL5=	yes
 USE_GETOPT_LONG=	yes
+USE_WX=		2.6
 INSTALLS_SHLIB=	yes
 MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"

--- a/comms/trustedqsl/files/Makefile
+++ b/comms/trustedqsl/files/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 all:
-	(cd tqsllib-2.0;./configure --with-wxwindows=${X11BASE}/bin/wxgtk2-2.6-config;make;make converter;make gen_crq;make load_cert;make station_loc)
+	(cd tqsllib-2.0;./configure --with-wxwindows=${WX_CONFIG};make;make converter;make gen_crq;make load_cert;make station_loc)
 	(cd TrustedQSL-1.11;make)

 install:
--- a/comms/trustedqsl/files/Makefile.TrustedQSL-1.11
+++ b/comms/trustedqsl/files/Makefile.TrustedQSL-1.11
@ -5,8 +5,8 @@ TQSL_VERSION_MINOR = 0
 LIBS=-lz -lexpat -lcrypto
 INCDIR = -I$(TQSLINC)
 BUILD = unofficial
-WXFLAGS=`wxgtk2-2.6-config --cflags`
-WXLIBS=`wxgtk2-2.6-config --libs`
+WXFLAGS=`${WX_CONFIG} --cflags`
+WXLIBS=`${WX_CONFIG} --libs`
 DEFS = -DHAVE_CONFIG_H
 CXXFLAGS +=  $(DEFS) $(INCDIR)  -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1  $(WXFLAGS)

--- a/databases/pgadmin3-12/Makefile
+++ b/databases/pgadmin3-12/Makefile
@ -16,8 +16,10 @@ MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	PostgreSQL database design and management system

 USE_PGSQL=	yes
+USE_WX=		2.6
+WX_COMPS=	contrib
+WX_CONF_ARGS=	relative
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
 CONFLICTS=	pgadmin3-1.[456789]*
@ -25,26 +27,12 @@ NO_LATEST_LINK=	yes

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 500000
-WITHOUT_UNICODE=	yes
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_UNICODE)
-	@${ECHO_MSG} "You can build non-Unicode version by defining WITHOUT_UNICODE."
-.endif
-
-.if !defined(WITHOUT_UNICODE)
-LIB_DEPENDS+=	wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
-WX_CONFIG=	wxgtk2u-2.6-config
+.if defined(WX_UNICODE)
 PKGNAMESUFFIX=	-unicode
 PKGMESSAGE=	${PKGDIR}/pkg-message-unicode

 post-install:
 	@${CAT} ${PKGMESSAGE}
-.else
-LIB_DEPENDS+=	wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
-WX_CONFIG=	wxgtk2-2.6-config
-.endif # WITHOUT_UNICODE
+.endif

 .include <bsd.port.post.mk>
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@ -24,16 +24,10 @@ CONFLICTS=	pgadmin3-1.[12]*

 USE_WX=		2.6
 WX_COMPS=	wx contrib
-WX_UNICODE=	yes
 WX_CONF_ARGS=	relative
+WX_UNICODE=	yes

 post-install:
 	@${CAT} ${PKGMESSAGE}

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=		cannot install: requires wchar_t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/databases/pydbdesigner/Makefile
+++ b/databases/pydbdesigner/Makefile
@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=${PORTNAME}
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Graphical designer for relational databases

-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-
 EXTRACT_AFTER_ARGS=	| ${TAR} --exclude CVS -xf -

 USE_PYTHON=	2.2+
+USE_WX=		2.4
+WX_COMPS=	python
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/PyDBDesigner

--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A calendar program for women

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-
 USE_BZIP2=	yes
 USE_PYTHON_RUN=	yes
+USE_WX=		2.6
+WX_COMPS=	python
 NO_BUILD=	yes

 MAN1=		${PORTNAME}.1
--- a/devel/agide/Makefile
+++ b/devel/agide/Makefile
@ -16,8 +16,7 @@ MAINTAINER=	rui@ruilopes.com
 COMMENT=	A-A-P GUI IDE: a framework for software development

 RUN_DEPENDS=	${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \
-		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim \
-		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim

 MAN1=		agide.1

@ -26,6 +25,8 @@ NO_WRKSUBDIR=	yes

 USE_ZIP=	yes
 USE_PYTHON=	yes
+USE_WX=		2.4
+WX_COMPS=	python
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}

 pre-install:
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@ -16,12 +16,12 @@ DISTNAME=	boa-constructor-${PORTVERSION}
 MAINTAINER=	filippo.natali@gmail.com
 COMMENT=	A cross platform RAD GUI Building IDE for wxPython

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-
 WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}

 USE_ZIP=	yes
 USE_PYTHON=	yes
+USE_WX=		2.6
+WX_COMPS=	python
 DATADIR=	${PREFIX}/share/Boa

 do-build:
--- a/devel/datadesigner/Makefile
+++ b/devel/datadesigner/Makefile
@ -16,16 +16,15 @@ MASTER_SITE_SUBDIR=	dbdesign
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database Schema Designer

-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2

 USE_GNOME=	libxml2 libxslt
 USE_ICONV=	yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
-WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}

 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@ -16,11 +16,11 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Highly customizable cross-platform ide to aid programming in Python

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-
 USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python

 post-install:
 	@${ECHO} '#!/bin/sh' > ${WRKDIR}/drpython.sh
--- a/devel/ecos-tools/Makefile
+++ b/devel/ecos-tools/Makefile
@ -16,10 +16,10 @@ DISTNAME=	ecos-tools.${SNAPDATE}
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	Configuration tools for the eCos embedded OS

-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84 \
-		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84

 USE_BZIP2=	yes
+USE_WX=		2.4
 WRKSRC=		${WRKDIR}/infra-build
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../ecos/host/configure
@ -31,7 +31,7 @@ SNAPDATE=	20040125

 ECOSSRCDIR=	${WRKDIR}/ecos/host
 CFGTOOL_WRKSRC=	${WRKDIR}/configtool-build
-CFGTOOL_MAKE_ENV=	WXDIR=${X11BASE} WX_CONFIG=wxgtk2-2.4-config \
+CFGTOOL_MAKE_ENV=	WX_CONFIG=${WX_CONFIG} \
 			ECOSSRCDIR=${ECOSSRCDIR} \
 			INSTALLDIR=${PREFIX}
 CFGTOOL_MAKEFILE=	${ECOSSRCDIR}/tools/configtool/standalone/wxwin/makefile.gnu
--- a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
+++ b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
@ -36,8 +36,8 @@ $FreeBSD$
   PROGRAM=configtool
 -  CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags`
 -  LDFLAGS=`$(WXDIR)/bin/wx-config --libs`
-+  CPPFLAGS=`$(WXDIR)/bin/$(WX_CONFIG) --cppflags`
-+  LDFLAGS=`$(WXDIR)/bin/$(WX_CONFIG) --libs`
+  CPPFLAGS=`$(WX_CONFIG) --cppflags`
+  LDFLAGS=`$(WX_CONFIG) --libs`
   EXTRAOBJECTS=
 endif
 
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@ -16,14 +16,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}.bsd
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for visually creating and documenting classes

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_GNOME=	gnometarget
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	WXWINDOWS="yes"
+USE_WX=		2.4

 PLIST_FILES=	bin/klassmodeler

--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@ -14,17 +14,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	GUI builder for wxPython/wxWindows written in Python

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-
-.if defined(WITH_UNICODE)
-WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
-.else
-WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
-.endif
-
 WRKSRC=		${WRKDIR}/wxGlade-${PORTVERSION}

 USE_PYTHON=	yes
+USE_WX=		2.6
+WX_COMPS=	python

 do-build:
 	@(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD} 'exec ${PYTHON_CMD} \
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@ -17,14 +17,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gettext catalogs (.po files) editor

 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell \
-		wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
+LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell

 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_BDB=	yes
 WITH_BDB_HIGHEST=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
+WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@ -15,10 +15,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-wx2.6.1.0
 MAINTAINER=	nivit@email.it
 COMMENT=	Stani's Python Editor

-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python

 OPTIONS=	ENCRYPTED_DEBUG "Enable encrypted debug in SPE" off

@ -45,12 +45,6 @@ post-install:

 .include <bsd.port.pre.mk>

-.if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
-WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
-.else
-WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
-.endif
-
 .if defined(WITH_ENCRYPTED_DEBUG)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
 .endif
--- a/ftp/ftpcube/Makefile
+++ b/ftp/ftpcube/Makefile
@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical FTP Client

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
 		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
@ -24,6 +23,8 @@ BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \

 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.4
+WX_COMPS=	python

 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' ${WRKSRC}/setup.cfg
--- a/games/abridge/Makefile
+++ b/games/abridge/Makefile
@ -14,10 +14,9 @@ MASTER_SITES=	http://www.abridgegame.org/src/
 MAINTAINER=	Janos.Mohacsi@bsd.hu
 COMMENT=	Bridge game

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config

 MAN1=		abridge.1
 PLIST_FILES=	bin/abridge
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@ -16,12 +16,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@mail.ru
 COMMENT=	Clone of the strategy board game 'Blokus'

-LIB_DEPENDS=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
+USE_WX=		2.6

 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
@ -39,6 +38,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-ai.h
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e 's|wx-config|wxgtk2-2.6-config|' ${WRKSRC}/makefile.in ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' ${WRKSRC}/makefile.in ${WRKSRC}/configure

 .include <bsd.port.post.mk>
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@ -15,12 +15,8 @@ DISTNAME=		Scorched3D-${SCORCH_VERSION}-src
 MAINTAINER=		guy@device.dyndns.org
 COMMENT=		Scorched is a game based loosely on the classic DOS game

-BUILD_DEPENDS=		${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
-			wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
-			openal-config:${PORTSDIR}/audio/openal
-RUN_DEPENDS=		${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
-			wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
-			openal-config:${PORTSDIR}/audio/openal
+BUILD_DEPENDS=		openal-config:${PORTSDIR}/audio/openal
+RUN_DEPENDS=		openal-config:${PORTSDIR}/audio/openal
 LIB_DEPENDS=		alut.1:${PORTSDIR}/audio/freealut

 SCORCH_VERSION=		40.1d
@ -33,13 +29,14 @@ GNU_CONFIGURE=		yes
 USE_GL=			yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=	automake:15 autoconf:253
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute

 WRKSRC=			${WRKDIR}/scorched
 AUTOMAKE_ARGS=		--foreign
 CONFIGURE_ARGS=		--program-prefix='' \
 			--prefix=${PREFIX}/games/scorched3d \
-			--datadir=${PREFIX}/games/scorched3d \
-			--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
+			--datadir=${PREFIX}/games/scorched3d
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql
 .endif
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@ -15,12 +15,11 @@ MASTER_SITES=	http://www.mcaree.org/Comical/ \
 MAINTAINER=	john@mcaree.org
 COMMENT=	A sequential image viewer

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
 USE_GMAKE=	yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
-CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config

 .include <bsd.port.pre.mk>

--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@ -20,21 +20,20 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		fftw:${PORTSDIR}/math/fftw \
-		wx_gtk2_xrc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
 		boost_date_time:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
 		PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools

 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_ICONV=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute

 DOCSDIR=	${PREFIX}/share/hugin/xrc/data
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config

 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
@ -45,7 +44,7 @@ PLIST_SUB+=	NLS=""
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e 's|-wxrc|-${X11BASE}/bin/wxrc-gtk2-2.6|' \
+	@${REINPLACE_CMD} -e 's|-wxrc|-${WX_CONFIG:S/wx/wxrc/}|' \
 		${WRKSRC}/src/hugin/xrc/Makefile.in

 .include <bsd.port.mk>
--- a/graphics/multivideo/Makefile
+++ b/graphics/multivideo/Makefile
@ -16,19 +16,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An image sequence viewer

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
 WRKSRC=		${WRKDIR}/${PORTNAME}

 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_WX=		2.4
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 ALL_TARGET=	default

 PLIST_FILES=	bin/multivideo

-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|g++|\$$\(CXX)|g ; \
 		 s|-O2 -g -Wall -W|\$$\(CXXFLAGS\)|g ; \
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@ -15,13 +15,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	C++ library to create, manipulate, and render SVG files

-BUILD_DEPENDS=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
-RUN_DEPENDS=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
-
 USE_LDCONFIG=	yes
-WX_CONFIG=	wxgtk2-2.6-config
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	libartlgpl2
+USE_WX=		2.6

 .include <bsd.port.pre.mk>

--- a/graphics/xaralx/Makefile
+++ b/graphics/xaralx/Makefile
@ -20,22 +20,17 @@ COMMENT?=	Top-tier vector/general purpose graphics program (recommended version)
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes

-#WXDEP=	${X11BASE}/libwx_baseu-2.6.so.0.3.1
-WXDEP=	wxgtk2-unicode>=2.6.3
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config \
-		${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
 		xml2-config:${PORTSDIR}/textproc/libxml2 \
 		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS+=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc \
 		xml2.5:${PORTSDIR}/textproc/libxml2

 USE_AUTOTOOLS=	autoconf:259:env aclocal:19:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-wx-config=wxgtk2u-2.6-config \
-		--program-suffix=${PKGNAMESUFFIX}
+CONFIGURE_ARGS+=	--program-suffix=${PKGNAMESUFFIX}
 # we're using dlmalloc because the stock libc does not have malloc_usable_size()
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -ldlmalloc"

@ -43,6 +38,9 @@ USE_GMAKE=	yes
 MAKE_ENV?=	INCLUDES="-I${LOCALBASE}/include/dlmalloc" LANG=C

 USE_GCC=	3.4+
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
+WX_UNICODE=	yes

 MAN1=	xaralx${PKGNAMESUFFIX}.1
 MANFILE=	xaralx.1
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@ -21,9 +21,6 @@ LIB_DEPENDS=	ming.4:${PORTSDIR}/graphics/ming \
 .if !defined (WITHOUT_AVIPLAY)
 LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 .endif
-.if defined (WITH_WXGTK2)
-LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-.endif
 .if !defined (WITHOUT_ZIP)
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 .endif
@ -33,7 +30,8 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 	       	CPPFLAGS="-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}"
 .if defined (WITH_WXGTK2)
-CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.4-config
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 PLIST_FILES+=	bin/wxzphoto
 .else
 CONFIGURE_ARGS+=	--disable-wx
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	mahogany
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		An X11 mail and news client

-LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
 USE_X_PREFIX=		yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 ALL_TARGET=		all locales
@ -25,8 +25,7 @@ INSTALL_TARGET=		install_bin install_locale

 MAN1=			M.1 mahogany.1

-CONFIGURE_ARGS=		--with-python=none \
-			--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
+CONFIGURE_ARGS=		--with-python=none
 CONFIGURE_ENV=		OSTYPE=${OPSYS} CFLAGS="${CFLAGS}"

 .include <bsd.port.pre.mk>
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@ -15,14 +15,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of tools for doing computation in game theory

-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-
 USE_X_PREFIX=	yes
+USE_WX=		2.6
 USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
-MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes

 CPPFLAGS=	${PTHREAD_CFLAGS}
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@ -14,15 +14,14 @@ MASTER_SITES=	http://graph.seul.org/
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A tool that allows you to create, manipulate and study graphs

-LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk20
 USE_BISON=	yes
 USE_GMAKE=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
 MAKEFILE=	GNUmakefile

 PLIST_FILES=	bin/graphthing bin/gt
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@ -14,11 +14,12 @@ PKGNAMEPREFIX=	diary-
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A personal workout diary program for bodybuilders

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-unicode/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26-unicode \
-		${PYTHON_SITELIBDIR}/sqlite/__init__.py:${PORTSDIR}/databases/py-PySQLite11
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sqlite/__init__.py:${PORTSDIR}/databases/py-PySQLite11

 USE_GETTEXT=	yes
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python

 .include <bsd.port.mk>
--- a/misc/documancer/Makefile
+++ b/misc/documancer/Makefile
@ -18,12 +18,12 @@ COMMENT=	A programmer's documentation reader

 BUILD_DEPENDS=	wget:${PORTSDIR}/ftp/wget \
 		swish-e:${PORTSDIR}/www/swish-e
-LIB_DEPENDS=	wxmozilla_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxmozilla
-RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PYTHON=	2.4
 USE_PERL5=	yes
+USE_WX=		2.4
+WX_COMPS=	mozilla python
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share

--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@ -61,13 +61,11 @@ PLIST_FILES+=	%%DATADIR%%/${file}
 PLIST_FILES+=	%%DATADIR%%/images/${file}
 .endfor

-WXGTK_CONFIG=	wxgtk2u-2.6-config
-
 .include <bsd.port.pre.mk>

 .ifndef(WITHOUT_WXGTK)
-LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-
+USE_WX=		2.6
+WX_UNICODE=	yes
 MAN1+=		mmg.1
 PLIST_FILES+=	bin/mmg
 .endif
@ -90,7 +88,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
 		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
-	@${REINPLACE_CMD} -e 's|wx-config|${WXGTK_CONFIG}|' \
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
 		${WRKSRC}/src/common/os.cpp
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@ -37,11 +37,12 @@ BUILD_DEPENDS=	\
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 RUN_DEPENDS=	\
 		${BUILD_DEPENDS} \
-		bash:${PORTSDIR}/shells/bash \
-		${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
+		bash:${PORTSDIR}/shells/bash

 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python
 GNU_CONFIGURE=	yes

 MAN1=	idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@ -99,15 +99,6 @@ CONFIGURE_ARGS+=	--enable-ffmpeg \
 MAN1=		vlc.1 \
 		vlc-config.1

-.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
-WX_CONFIG=	wxgtk2-2.4-config
-WXGTK2_PORT=	wxgtk24
-.else
-WX_CONFIG=	wxgtk2-2.6-config
-WXGTK2_PORT=	wxgtk26
-CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
-.endif
-
 .include <bsd.port.pre.mk>

 .if ${ARCH} == "amd64"
@ -188,7 +179,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2
-WITH_WXGTK=	yes
+.undef WITHOUT_WXGTK
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@ -201,10 +192,8 @@ CONFIGURE_ARGS+=--disable-loader
 .endif

 .if !defined(WITHOUT_WXGTK)
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
-RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+USE_WX=		2.6
 CONFIGURE_ARGS+=--enable-wxwidgets
-CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@ -22,13 +22,7 @@
 #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
 #
 # WITHOUT_WXGTK=yes
-#  WxWindows/Gtk 2.x Interface
-#  This is the default and most supported
-#  x11 interface
-#
-# WITH_WXGTK_VER=[2.4|2.6]
-#  Choose a WxGTK version you want to use.
-#  Defaults to 26
+#  WxWidgets Interface
 #
 # Audio Knobs:
 #
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@ -56,15 +56,6 @@ CONFIGURE_ARGS+=	--enable-ffmpeg \
 MAN1=		vlc.1 \
 		vlc-config.1

-.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
-WX_CONFIG=	wxgtk2-2.4-config
-WXGTK2_PORT=	wxgtk24
-.else
-WX_CONFIG=	wxgtk2-2.6-config
-WXGTK2_PORT=	wxgtk26
-CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
-.endif
-
 .include <bsd.port.pre.mk>

 .if ${OSVERSION} < 500035
@ -145,7 +136,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2
-WITH_WXGTK=	yes
+.undef WITHOUT_WXGTK
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@ -158,10 +149,8 @@ CONFIGURE_ARGS+=--disable-loader
 .endif

 .if !defined(WITHOUT_WXGTK)
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
-RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+USE_WX=		2.6
 CONFIGURE_ARGS+=--enable-wxwidgets
-CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@ -23,13 +23,7 @@
 #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
 #
 # WITHOUT_WXGTK=yes
-#  WxWindows/Gtk 2.x Interface
-#  This is the default and most supported
-#  x11 interface
-#
-# WITH_WXGTK_VER=[2.4|2.6]
-#  Choose a WxGTK version you want to use.
-#  Defaults to 26
+#  WxWidgets Interface
 #
 # Audio Knobs:
 #
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	amule
 MAINTAINER=	boris@tagnet.ru
 COMMENT=	The all-platform eMule p2p client

-LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 #		gd.4:${PORTSDIR}/graphics/gd
 #		png.5:${PORTSDIR}/graphics/png

@ -28,6 +27,8 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-debug \
@ -35,7 +36,6 @@ CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG} \
 		--with-curl-config=${CURL_CONFIG} \
 		--enable-embedded_crypto \
 		--enable-monolithic
@ -53,7 +53,6 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off

-WX_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
 CURL_CONFIG?=	${LOCALBASE}/bin/curl-config

 .include <bsd.port.pre.mk>
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	amule
 MAINTAINER=	boris@tagnet.ru
 COMMENT=	The all-platform eMule p2p client

-LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 #		gd.4:${PORTSDIR}/graphics/gd
 #		png.5:${PORTSDIR}/graphics/png

@ -28,6 +27,8 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-debug \
@ -35,7 +36,6 @@ CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG} \
 		--with-curl-config=${CURL_CONFIG} \
 		--enable-embedded_crypto \
 		--enable-monolithic
@ -53,7 +53,6 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off

-WX_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
 CURL_CONFIG?=	${LOCALBASE}/bin/curl-config

 .include <bsd.port.pre.mk>
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@ -18,8 +18,7 @@ COMMENT=	The all-platform eMule p2p client

 DEPRECATED=	use net-p2p/amule2 if you are running OSVERSION > 500000

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
-		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl

 LATEST_LINK=	aMule1
 CONFLICTS=	aMule-2.* aMule-devel-[0-9]*
@ -28,11 +27,12 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG} \
 		--with-wxbase-config=${WX_CONFIG} \
 		--with-curl-config=${CURL_CONFIG} \
 		--program-transform-name="s/ed2k/amule-ed2k-handler/"
@ -43,7 +43,6 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 OPTIONS=	OPTIMIZE "Build with optimization" on \
 		STATIC "Enable static linking" off

-WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 CURL_CONFIG?=	${LOCALBASE}/bin/curl-config

 .include <bsd.port.pre.mk>
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	amule
 MAINTAINER=	boris@tagnet.ru
 COMMENT=	The all-platform eMule p2p client

-LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 #		gd.4:${PORTSDIR}/graphics/gd
 #		png.5:${PORTSDIR}/graphics/png

@ -28,6 +27,8 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-debug \
@ -35,7 +36,6 @@ CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG} \
 		--with-curl-config=${CURL_CONFIG} \
 		--enable-embedded_crypto \
 		--enable-monolithic
@ -53,7 +53,6 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off

-WX_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
 CURL_CONFIG?=	${LOCALBASE}/bin/curl-config

 .include <bsd.port.pre.mk>
--- a/net-p2p/mute-net/Makefile
+++ b/net-p2p/mute-net/Makefile
@ -29,9 +29,7 @@ WRKSRC=		${WRKDIR}/${RELEASE_DIRECTORY}/MUTE
 PATCH_WRKSRC=	${WRKDIR}/${RELEASE_DIRECTORY}

 .ifndef(WITHOUT_GUI)
-LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
-WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
+USE_WX=		2.4
 .endif

 #
--- a/net-p2p/py-bittornado/Makefile
+++ b/net-p2p/py-bittornado/Makefile
@ -45,7 +45,8 @@ WITHOUT_GUI=	yes

 # required for GUI
 .ifndef(WITHOUT_GUI)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+USE_WX=		2.4
+WX_COMPS=	python
 PLIST_SUB+=	GUI=''
 EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
 .else
--- a/net-p2p/py-kenosis-bittorrent/Makefile
+++ b/net-p2p/py-kenosis-bittorrent/Makefile
@ -47,7 +47,8 @@ WITHOUT_PSYCO=	yes

 # required for GUI
 .ifndef(WITHOUT_GUI)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+USE_WX=		2.4
+WX_COMPS=	python

 EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py

--- a/net-p2p/pyslsk/Makefile
+++ b/net-p2p/pyslsk/Makefile
@ -14,9 +14,6 @@ MASTER_SITES=	http://www.sensi.org/~ak/pyslsk/
 MAINTAINER=	shoesoft@gmx.net
 COMMENT=	Client for SoulSeek filesharing system

-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
-
 .if !defined(WITHOUT_VORBIS)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
 .endif
@ -27,12 +24,7 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/bsddb3/__init__.py:${PORTSDIR}/databases/py-b

 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_WX=		2.6
+WX_COMPS=	python

-.include <bsd.port.pre.mk>
-
-pre-install:
-.if exists(${PYTHON_SITELIBDIR}/wx/__init__.py)
-BROKEN=	"pyslsk only works with py-wxPython >= 2.6, please deinstall old version first"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@ -17,8 +17,7 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library

 BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget

 USE_GETTEXT=	yes
@ -28,14 +27,15 @@ USE_GNOME=	gnomehier \
 		gnomehack \
 		gnomeprefix
 USE_GMAKE=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-cryptopp-prefix=${LOCALBASE} \
 		--with-gtk-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
-		--enable-debug \
-		--with-wx-config=${WX_CONFIG}
+		--enable-debug
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 MAKE_ARGS=	-e
@ -44,8 +44,6 @@ MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 # for debugging purposes
 STRIP=

-WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.6-config
-
 FILES_ATOLL_PATCH=	src/Preferences.cpp \
 			src/otherfunctions.cpp
 FILES_STDINT_PATCH=	\
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@ -42,7 +42,8 @@ OPTIONS=	X11 "Build Boinc Manager GUI" on
 .include <bsd.port.pre.mk>

 .if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 CPPFLAGS+=		-I${X11BASE}/include
 .else
 CONFIGURE_ARGS+=	--with-wx-config=false
@ -50,7 +51,6 @@ CONFIGURE_ARGS+=	--with-wx-config=false

 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv \
-		wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		glut:${PORTSDIR}/graphics/libglut
 .endif
--- a/net/py-mp-random/Makefile
+++ b/net/py-mp-random/Makefile
@ -16,10 +16,10 @@ DISTNAME=	MirrorProjectRandomImageWidget-src-${PORTVERSION}
 MAINTAINER=	randomimage-widget@mirrorproject.com
 COMMENT=	Display random Mirror Project images on your desktop

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython24
-
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
+USE_WX=		2.4
+WX_COMPS=	python
 NO_BUILD=	yes

 pre-install:
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@ -19,19 +19,14 @@ COMMENT=	Scientific tools for Python
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy \
 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
-.if exists(${PYTHON_SITELIBDIR}/wx.pth)
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx.pth:${PORTSDIR}/x11-toolkits/py-wxPython26
-.elif exists(${PYTHON_SITELIBDIR}/wx/__init__.py)
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-.else
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx.pth:${PORTSDIR}/x11-toolkits/py-wxPython26
-.endif

 LATEST_LINK=	py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options

 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
+USE_WX=		2.4-2.6
+WX_COMPS=	python:build python:run
 OPTIONS=	ATLAS "Use optimized blas library" OFF

 post-patch:
--- a/security/hashish/Makefile
+++ b/security/hashish/Makefile
@ -18,13 +18,12 @@ MAINTAINER=	jllovela@ncsu.edu
 COMMENT=	GUI file and string hashing utility

 BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24

+USE_WX=		2.4
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config"
+		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 PLIST_FILES=	bin/hashish

--- a/security/newpki-client/Makefile
+++ b/security/newpki-client/Makefile
@ -15,16 +15,15 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ PKI client from newpki project

 LIB_DEPENDS=	newpki.2:${PORTSDIR}/security/newpki-lib \
-		xml2:${PORTSDIR}/textproc/libxml2 \
-		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+		xml2:${PORTSDIR}/textproc/libxml2

 WRKSRC=		${WRKDIR}/${PORTNAME}-2.0.0

 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
+USE_WX=		2.4

 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib" \
--- a/security/newpki-client/files/patch-configure
+++ b/security/newpki-client/files/patch-configure
@ -55,8 +55,8 @@
 
 -WXCXX=`wx-config --cxxflags`
 -WXLIB=`wx-config --libs`
-+WXCXX=`${WXCONFIG} --cxxflags`
-+WXLIB=`${WXCONFIG} --libs`
+WXCXX=`${WX_CONFIG} --cxxflags`
+WXLIB=`${WX_CONFIG} --libs`
 
 CPPFLAGS="$WXCXX -DWXINTL_NO_GETTEXT_MACRO $CPPFLAGS"
 LIBS="$WXLIB -lnewpki $LIBS"
--- a/sysutils/bacula-server-devel/Makefile
+++ b/sysutils/bacula-server-devel/Makefile
@ -117,9 +117,8 @@ PLIST_SUB+=		GNOMECONS="@comment "
 .endif
 # Build wx-console
 .if defined(WITH_WXCONSOLE)
+USE_WX=			2.4
 CONFIGURE_ARGS+=	--enable-wx-console
-LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-CONFIGURE_ENV+=		WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 PLIST_SUB+=		WXCONS=""
 .else
 # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@ -118,9 +118,8 @@ PLIST_SUB+=		GNOMECONS="@comment "
 .endif
 # Build wx-console
 .if defined(WITH_WXCONSOLE)
+USE_WX=			2.4
 CONFIGURE_ARGS+=	--enable-wx-console
-LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-CONFIGURE_ENV+=		WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 PLIST_SUB+=		WXCONS=""
 .else
 # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Python module to parse or write delimeter-separated (e.g. CSV) files

 .if defined(WITH_GUI)
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+USE_WX=		2.4
+WX_COMPS=	python
 .endif

 USE_PYTHON=	yes
--- a/x11-fm/jaffm/Makefile
+++ b/x11-fm/jaffm/Makefile
@ -14,9 +14,8 @@ MASTER_SITES=	http://binary.is/download/ \
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A lightweight file manager inspired by MacOS Finder

-WXGTK_VER?=	2.6
-
 USE_BZIP2=	yes
+USE_WX=		2.4-2.6
 USE_X_PREFIX=	yes
 ALL_TARGET=	${PORTNAME}

@ -24,19 +23,9 @@ PLIST_FILES=	bin/${PORTNAME}

 .include <bsd.port.pre.mk>

-.if ${WXGTK_VER} == "2.4" || \
-    (exists(${X11BASE}/bin/wxgtk2-2.4-config) && \
-    !exists(${X11BASE}/bin/wxgtk2-2.6-config))
-LIB_DEPENDS+=	wx_gtk2_core-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-WXGTK_VER=	2.4
-.else
-LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-WXGTK_VER=	2.6
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's#^PREFIX=.*#PREFIX=${PREFIX}#' \
-		-e 's#$$(shell wx-config \(.*\))#`${X11BASE}/bin/wxgtk2-${WXGTK_VER}-config \1`#' \
+		-e 's#$$(shell wx-config \(.*\))#`${WX_CONFIG} \1`#' \
 		-e 's#^FLAGS=-ggdb#FLAGS=${CFLAGS}#' \
 		${WRKSRC}/Makefile

--- a/x11-toolkits/py-SciParam/Makefile
+++ b/x11-toolkits/py-SciParam/Makefile
@ -19,11 +19,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scientific Parameter Dialogs in wxPython based user interfaces

-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.4
+WX_COMPS=	python

 .if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@ -26,6 +26,7 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}"
+USE_WX=		2.4
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo

 post-build:
@ -52,9 +53,6 @@ post-install:
 BROKEN=		"Does not build on ia64 or sparc64"
 .endif

-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
-
 CONFIGURE_ARGS+=	--enable-gtk2
 PYDISTUTILS_BUILDARGS+=	WXPORT=gtk2
 PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS}
--- a/x11-toolkits/py-wxPython26-common/Makefile
+++ b/x11-toolkits/py-wxPython26-common/Makefile
@ -13,6 +13,4 @@ MASTERDIR=	${.CURDIR}/../py-wxPython26

 PLIST=	${.CURDIR}/pkg-plist

-LIB_DEPENDS+=  wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
-
 .include "${MASTERDIR}/Makefile"
--- a/x11-toolkits/py-wxPython26-unicode/Makefile
+++ b/x11-toolkits/py-wxPython26-unicode/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$
 #

-WITH_UNICODE=	yes
+WITH_WXPYTHON_UNICODE=	yes

 MASTERDIR=	${.CURDIR}/../py-wxPython26

--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@ -29,6 +29,9 @@ PYDISTUTILS_BUILDARGS=	\
 			WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}"
 PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
+USE_WX=		2.6
+WX_COMPS=	contrib
+WX_PREMK=	yes
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 WXPORT=		gtk2

@ -64,27 +67,15 @@ post-build:
 .include <bsd.port.pre.mk>

 # are we ready for unicode?
-.if defined(WITH_UNICODE)
+.if defined(WITH_WXPYTHON_UNICODE)
 . if ${OSVERSION} < 500000
 IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
 . endif
 .endif

-# build dependencies
-.if defined(WITH_UNICODE)
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-
-WX_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
-.else
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
-
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
-.endif
-
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
-
 PLIST_SUB+=	WX_VERSION=${WX_VERSION}
 .endif

@ -104,9 +95,8 @@ PYDISTUTILS_BUILDARGS+=	\
 			INSTALL_MULTIVERSION=0
 INSTALLS_SHLIB=	yes

-. if defined(WITH_UNICODE)
-LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		wx_gtk2u_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
+. if defined(WITH_WXPYTHON_UNICODE)
+WX_UNICODE=	yes

 PKGNAMESUFFIX=	-unicode

@ -114,11 +104,8 @@ PYDISTUTILS_BUILDARGS+=	\
 			UNICODE=1
 WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
 . else
-LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
-		wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
-
 WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
-. endif # defined(WITH_UNICODE)
+. endif # defined(WITH_WXPYTHON_UNICODE)

 # plist substitutions and library dirs
 PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
--- a/x11-toolkits/py-wxPython28-common/Makefile
+++ b/x11-toolkits/py-wxPython28-common/Makefile
@ -13,6 +13,4 @@ MASTERDIR=	${.CURDIR}/../py-wxPython26

 PLIST=	${.CURDIR}/pkg-plist

-LIB_DEPENDS+=  wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
-
 .include "${MASTERDIR}/Makefile"
--- a/x11-toolkits/py-wxPython28-unicode/Makefile
+++ b/x11-toolkits/py-wxPython28-unicode/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$
 #

-WITH_UNICODE=	yes
+WITH_WXPYTHON_UNICODE=	yes

 MASTERDIR=	${.CURDIR}/../py-wxPython26

--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@ -29,6 +29,9 @@ PYDISTUTILS_BUILDARGS=	\
 			WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}"
 PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
+USE_WX=		2.6
+WX_COMPS=	contrib
+WX_PREMK=	yes
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 WXPORT=		gtk2

@ -64,27 +67,15 @@ post-build:
 .include <bsd.port.pre.mk>

 # are we ready for unicode?
-.if defined(WITH_UNICODE)
+.if defined(WITH_WXPYTHON_UNICODE)
 . if ${OSVERSION} < 500000
 IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
 . endif
 .endif

-# build dependencies
-.if defined(WITH_UNICODE)
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-
-WX_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
-.else
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
-
-WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
-.endif
-
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
-
 PLIST_SUB+=	WX_VERSION=${WX_VERSION}
 .endif

@ -104,9 +95,8 @@ PYDISTUTILS_BUILDARGS+=	\
 			INSTALL_MULTIVERSION=0
 INSTALLS_SHLIB=	yes

-. if defined(WITH_UNICODE)
-LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		wx_gtk2u_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
+. if defined(WITH_WXPYTHON_UNICODE)
+WX_UNICODE=	yes

 PKGNAMESUFFIX=	-unicode

@ -114,11 +104,8 @@ PYDISTUTILS_BUILDARGS+=	\
 			UNICODE=1
 WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
 . else
-LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
-		wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
-
 WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
-. endif # defined(WITH_UNICODE)
+. endif # defined(WITH_WXPYTHON_UNICODE)

 # plist substitutions and library dirs
 PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
--- a/x11-toolkits/ruby-wx/Makefile
+++ b/x11-toolkits/ruby-wx/Makefile
@ -18,12 +18,11 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ruby bindings for wxWindows (aka wxWidgets)

-LIB_DEPENDS=	wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk24 \
-		wx_gtk2_xrc-2.4:${PORTSDIR}/x11-toolkits/wxgtk24-contrib
-
 USE_ICONV=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
+USE_WX=		2.4
+WX_COMPS=	contrib

 .include <bsd.port.pre.mk>

@ -37,7 +36,7 @@ DOCS=		README README.linux ChangeLog
 post-patch:
 	@${FIND} ${WRKSRC} -name *.t | ${XARGS} ${REINPLACE_CMD} -e 's|
||'
 	@${REINPLACE_CMD} -E 's/ html(processor|window).o//' ${WRKSRC}/depend
-	@${REINPLACE_CMD} -e 's/wx-config/wxgtk2-2.4-config/' ${WRKSRC}/extconf.rb
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG:T}|' ${WRKSRC}/extconf.rb

 .if !defined(NOPORTDOCS)
 post-install:
--- a/x11-toolkits/wxgtk24-contrib/Makefile
+++ b/x11-toolkits/wxgtk24-contrib/Makefile
@ -10,9 +10,9 @@ PORTREVISION=	7
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit contributed libraries

+USE_WX=		2.4
 WXGTK_FLAVOR=	gtk2-contrib
 MASTERDIR=	${.CURDIR}/../wxgtk24
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24

 BUILD_WRKSRC=	${WRKSRC}/contrib/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@ -68,6 +68,7 @@ USE_LDCONFIG=	yes
 .endif # *-common

 .if ${WXGTK_FLAVOR:M*-contrib*} != ""
+USE_WX=		2.6
 BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

@ -75,37 +76,25 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 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
+WX_UNICODE=	yes
 .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|@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.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>
+.include <bsd.port.mk>
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@ -68,6 +68,7 @@ USE_LDCONFIG=	yes
 .endif # *-common

 .if ${WXGTK_FLAVOR:M*-contrib*} != ""
+USE_WX=		2.6
 BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

@ -75,37 +76,25 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 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
+WX_UNICODE=	yes
 .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|@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.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>
+.include <bsd.port.mk>
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@ -68,6 +68,7 @@ USE_LDCONFIG=	yes
 .endif # *-common

 .if ${WXGTK_FLAVOR:M*-contrib*} != ""
+USE_WX=		2.6
 BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

@ -75,37 +76,25 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 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
+WX_UNICODE=	yes
 .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|@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.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>
+.include <bsd.port.mk>
--- a/x11-toolkits/wxmozilla/Makefile
+++ b/x11-toolkits/wxmozilla/Makefile
@ -16,16 +16,14 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embedding Mozilla in wxWidgets

-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_GECKO=	mozilla
-WXGTK_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-wx-config=${WXGTK_CONFIG} --enable-python
+CONFIGURE_ARGS=	--enable-python
+USE_WX=		2.4
+WX_COMPS=	python
+WX_CONF_ARGS=	absolute
 USE_LDCONFIG=	yes

 .include <bsd.port.pre.mk>