8 files changed, 9 insertions, 17 deletions

diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index cb24b0aeb69d..a0ac261dac4a 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Qt-based GDS2 Viewer
 
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network moc_build sql uic_build \
+USE_QT4=	corelib gui network moc_build sql uic_build \
 		rcc_build qt3support xml
 PLIST_FILES=	bin/klayout \
 		bin/strm2cif \
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index df0f5b89a304..4ed18cd30680 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -16,8 +16,7 @@ DISTNAME=	LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IC/MEMS layout editor
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network moc_build sql uic_build \
+USE_QT4=	corelib gui network moc_build sql uic_build \
 		rcc_build qmake qt3support xml
 USE_ZIP=	yes
 USE_FREETYPE=	yes
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 7cc0a80a7de0..2d882f26278b 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -15,13 +15,12 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	2D CAD system
 
 USE_XZ=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	help qt3support help-tools_build moc_build qmake_build \
+USE_QT4=	help qt3support help-tools_build moc_build qmake_build \
 		rcc_build uic_build uic3_build
 MAKE_JOBS_SAFE=	yes
 
 .if !defined(WITHOUT_NLS)
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index b6cfdcebbbd6..a4586ff01716 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -18,8 +18,7 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A tool for processing and editing 3D triangular meshes
 
 USE_GL=		glew glu
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake corelib gui xml opengl network moc uic rcc
+USE_QT4=	qmake corelib gui xml opengl network moc uic rcc
 
 USE_LDCONFIG=	yes
 
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 9bd87f593a52..75372e52a0d8 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -27,8 +27,7 @@ LIB_DEPENDS=	GLU.1:${PORTSDIR}/graphics/libGLU \
 		opencsg:${PORTSDIR}/graphics/opencsg
 
 USE_GL=		glew
-USE_QT_VER=     4
-QT_COMPONENTS=  qmake corelib gui opengl moc uic rcc
+USE_QT4=  qmake corelib gui opengl moc uic rcc
 PLIST_SUB=      PORTVERSION=${PORTVERSION}
 #MAKE_JOBS_UNSAFE=yes
 QMAKE_ENV =		EIGEN2DIR=${LOCALBASE}/include/eigen2
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index 2fe2528e2dd4..b77a4caf5d44 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	QElectroTech is application to design electric diagrams
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network svg xml \
+USE_QT4=	gui network svg xml \
 		moc_build qmake_build rcc_build uic_build
 INSTALLS_ICONS=	yes
 
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 005cf72e5f57..90bc7bad6c56 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A graphical tool for designing finite state machines
 
 USE_BZIP2=	yes
 USE_XORG=	xi
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qt3support svg xml \
+USE_QT4=	corelib gui qt3support svg xml \
 		moc_build porting_build qmake_build \
 		uic_build uic3_build rcc_build
 USE_GNOME=	desktopfileutils
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index f7fd798c60f3..2d440c1fe0c3 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -170,10 +170,9 @@ BUILD_DEPENDS+=		${LOCALBASE}/lib/libboost_python.so:${PORTSDIR}/devel/boost-pyt
 
 #Dependency from qt4
 .if !${SAL_MODULE} == "kernel" && !${SAL_MODULE} == "randomizer"
-USE_QT_VER=			4
 CONFIGURE_ENV+=		QTDIR=${LOCALBASE}
 QTFLAGS+=		-I${LOCALBASE}/include/qt4 -L${LOCALBASE}/lib/qt4
-QT_COMPONENTS=		gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
+USE_QT4=		gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
 AUTOTOOLS_ENV+= 	QTDIR=${LOCALBASE}
 .endif