9 files changed, 24 insertions, 38 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 65e0cd657b92..8d235e5431bb 100644
--- 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>
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 65e0cd657b92..8d235e5431bb 100644
--- 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>
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index 46da7dd5fb8e..f50282230827 100644
--- 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>
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index 65e0cd657b92..8d235e5431bb 100644
--- 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>
diff --git a/net-p2p/mute-net/Makefile b/net-p2p/mute-net/Makefile
index a7826ea771ba..591269073eaf 100644
--- 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
 
 #
diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile
index a8e9108cbcaf..daffa4e13374 100644
--- 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
diff --git a/net-p2p/py-kenosis-bittorrent/Makefile b/net-p2p/py-kenosis-bittorrent/Makefile
index 26cfd64819ea..3d9a43846882 100644
--- 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
 
diff --git a/net-p2p/pyslsk/Makefile b/net-p2p/pyslsk/Makefile
index a6f6d48a55f2..ce183c2ce9c7 100644
--- 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>
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index f9fd3e4f2c2f..5b0df9f3e67a 100644
--- 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=	\