17 files changed, 20 insertions, 37 deletions

diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index c1baf00e90d0..87d2f3f2c61f 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL=	kalgebra-4.7.* kdeedu-4.[0-6].*
 USE_XZ=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
+USE_QT4=	moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index e27ba78dc33b..c7d07d07a5a3 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -24,8 +24,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qtestlib_build xmlpatterns \
+USE_QT4=	qtestlib_build xmlpatterns \
 		moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 3e91b2a236ad..b062f6ade667 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -32,8 +32,7 @@ FETCH_ARGS=	-pRr
 
 USE_LDCONFIG=		yes
 USE_CMAKE=		yes
-USE_QT_VER=		4
-QT_COMPONENTS=		corelib opengl qmake_build gui moc_build rcc_build
+USE_QT4=		corelib opengl qmake_build gui moc_build rcc_build
 HAS_CONFIGURE=		yes
 DOCSDIR=		${PREFIX}/share/doc/CGAL-3.4
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index b314b24d8747..7a62b33cf8ff 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -35,9 +35,8 @@ USE_FORTRAN=		yes
 FFLAGS+=		-O2
 
 USE_GL=			yes
-USE_QT_VER=		4
 USE_CMAKE=		yes
-QT_COMPONENTS=		gui network opengl moc_build rcc_build uic_build \
+USE_QT4=		gui network opengl moc_build rcc_build uic_build \
 			qmake_build xml svg
 CPPFLAGS+=		${CXXFLAGS} -I${LOCALBASE}/include  ${AMDINC}
 
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 1018e7d0f4ba..1bf26dbc5d57 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -23,8 +23,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 USE_GL=		glu
 USE_KDE4=	kdehier kdelibs kdeprefix libkdeedu automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui opengl script scripttools xml \
+USE_QT4=	gui opengl script scripttools xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 MAKE_JOBS_SAFE=	yes
diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile
index 01b2923b6cfe..001084f64bee 100644
--- a/math/kbruch/Makefile
+++ b/math/kbruch/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 15561d06fddc..5b683df5b68e 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/kig/Makefile b/math/kig/Makefile
index e7d67abb3827..b87d876413df 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus moc_build qmake_build rcc_build uic_build
+USE_QT4=	dbus moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile
index 2abb766a83dd..43152cdf7425 100644
--- a/math/kmplot/Makefile
+++ b/math/kmplot/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	xml moc_build qmake_build rcc_build uic_build
+USE_QT4=	xml moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 1afd844e1c6b..8bdb0aee0d73 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -94,8 +94,7 @@ PLIST_SUB+=	TCLTK="@comment "
 .if defined(WITH_QT)
 .undef WITHOUT_X11
 PKGNAMESUFFIX=	-qt
-USE_QT_VER=	4
-QT_COMPONENTS=	assistant assistantclient clucene corelib dbus	\
+USE_QT4=	assistant assistantclient clucene corelib dbus	\
 		designer doc gui help help-tools linguist moc	\
 		network opengl phonon qmake qt3support qtestlib	\
 		rcc script scripttools sql svg uic uic3 webkit	\
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index ec32ab95b52b..38c2567415c1 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui opengl svg qt3support network assistantclient \
+USE_QT4=	gui opengl svg qt3support network assistantclient \
 		moc_build qmake_build rcc_build
 USE_GL=		glu
 HAS_CONFIGURE=	yes
@@ -58,11 +57,11 @@ PLIST_SUB+=	PYTHON="@comment "
 
 .if !defined(WITHOUT_DOCS)
 RUN_DEPENDS+=	qtiplot-doc>=0:${PORTSDIR}/math/qtiplot-doc
-QT_COMPONENTS+=	assistant-adp_run
+USE_QT4+=	assistant-adp_run
 .endif
 
 .if !defined(WITHOUT_NLS)
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile
index 61e13b2f99cf..dc71ca98dda6 100644
--- a/math/qtoctave/Makefile
+++ b/math/qtoctave/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Qt4 frontend for Octave
 RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	designer gui network script svg xml \
+USE_QT4=	designer gui network script svg xml \
 		qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DWITH_UseRPMTools:Bool=Off
diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile
index 3339208fac8d..205fec178030 100644
--- a/math/qwtplot3d-qt4/Makefile
+++ b/math/qwtplot3d-qt4/Makefile
@@ -16,8 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	3D plotting widgets for scientific data and math expressions
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build qmake_build opengl
+USE_QT4=	gui moc_build qmake_build opengl
 USE_GL=		glu
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index cc10b3a76ec1..acb84cd449b5 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R \
 
 CONFLICTS=	rkward-0.4.*
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build phonon
+USE_QT4=	qmake_build moc_build rcc_build uic_build phonon
 
 USE_KDE4=	kdehier kdeprefix automoc4 kdelibs
 USE_PHP=	yes
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index cb87c3cc0e88..5a3df7ef6d9e 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	script scripttools \
+USE_QT4=	script scripttools \
 		moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index 25b88713db19..1f6e21966282 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A desktop calculator for power users
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build gui xml
+USE_QT4=	qmake_build moc_build rcc_build uic_build gui xml
 USE_CMAKE=	yes
 CMAKE_SOURCE_PATH=	src
 
@@ -25,7 +24,7 @@ LRELEASE_CMD=	${LOCALBASE}/bin/lrelease-qt4
 LRELEASE_ARGS=	-compress -silent
 
 .if !defined(WITHOUT_NLS)
-QT_COMPONENTS+=	linguist
+USE_QT4+=	linguist
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index ebc647e759d2..6cc8250c3337 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -118,8 +118,7 @@ PLIST_SUB+=	X11=""
 .endif
 
 .if defined(WITH_QT)
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib assistant assistantclient designer \
+USE_QT4=	corelib assistant assistantclient designer \
 		gui opengl qtestlib sql dbus \
 		qmake_build uic_build moc_build rcc_build
 CMAKE_ARGS+=	-DVTK_USE_GUISUPPORT:BOOL=ON \