14 files changed, 54 insertions, 122 deletions

diff --git a/x11-toolkits/py-SciParam/Makefile b/x11-toolkits/py-SciParam/Makefile
index 9e873b8b4365..8cc679c7b1ee 100644
--- 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}
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 2e54d08135ba..fce2ab766269 100644
--- 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}
diff --git a/x11-toolkits/py-wxPython26-common/Makefile b/x11-toolkits/py-wxPython26-common/Makefile
index 99087e39da0b..5b52f9ac2419 100644
--- 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"
diff --git a/x11-toolkits/py-wxPython26-unicode/Makefile b/x11-toolkits/py-wxPython26-unicode/Makefile
index bbf28f6f8b32..ecd3032bb692 100644
--- 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
 
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 3d25b475d46e..f8e88766ff82 100644
--- 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}
diff --git a/x11-toolkits/py-wxPython28-common/Makefile b/x11-toolkits/py-wxPython28-common/Makefile
index 99087e39da0b..5b52f9ac2419 100644
--- 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"
diff --git a/x11-toolkits/py-wxPython28-unicode/Makefile b/x11-toolkits/py-wxPython28-unicode/Makefile
index bbf28f6f8b32..ecd3032bb692 100644
--- 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
 
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 3d25b475d46e..f8e88766ff82 100644
--- 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}
diff --git a/x11-toolkits/ruby-wx/Makefile b/x11-toolkits/ruby-wx/Makefile
index ee4a650ff95b..2badcf3ee8b4 100644
--- 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:
diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile
index a5ad3d18f963..aff67f1b4660 100644
--- 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}
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index e18ec9b66633..ab643d3cc2c1 100644
--- 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*
 
-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*
+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.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index e18ec9b66633..ab643d3cc2c1 100644
--- 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*
 
-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*
+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.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index e18ec9b66633..ab643d3cc2c1 100644
--- 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*
 
-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*
+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.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile
index 70d318d9150c..64c33c5c7be2 100644
--- 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>