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

PR:		ports/101613
Submitted by:	alepulver

8 files changed, 18 insertions, 26 deletions

diff --git a/devel/agide/Makefile b/devel/agide/Makefile
index efbd9a869dad..b66eb82358b4 100644
--- 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:
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index b714cbb053ed..d93de6eee88d 100644
--- 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:
diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile
index 450e942f55df..6f508d1f3727 100644
--- 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
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index 310925d8a6db..c3770f5a9437 100644
--- 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
diff --git a/devel/ecos-tools/Makefile b/devel/ecos-tools/Makefile
index c1832b6b02fb..b1f7acd5cc2f 100644
--- 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
diff --git 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
index ac96b582fd8d..a2cf829bb235 100644
--- 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
  
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index d19004259c9c..340b5f54d35b 100644
--- 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
 
diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile
index d97bb403b2eb..3d66ef870772 100644
--- 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} \