- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

10 files changed, 10 insertions, 20 deletions

diff --git a/x11-toolkits/attica/Makefile b/x11-toolkits/attica/Makefile
index 81fa680d43d2..bc08cb6d15bd 100644
--- a/x11-toolkits/attica/Makefile
+++ b/x11-toolkits/attica/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	stable/${PORTNAME}/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Collaboration Services API library
 
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus network moc_build uic_build rcc_build qmake_build
+USE_QT4=	dbus network moc_build uic_build rcc_build qmake_build
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 4c229acd6c27..8cf4e018f0e3 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		glu
-USE_QT_VER=	4
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -67,7 +66,7 @@ PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if defined(WITH_QT4)
-QT_COMPONENTS=	moc_build corelib
+USE_QT4=	moc_build corelib
 MAKE_ARGS+=	QT4MOC=${LOCALBASE}/bin/moc-qt4
 PLIST_SUB+=	QT4=""
 .else
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index 9e62ab332546..cee7bcac2bf7 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
 DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
-USE_QT_VER=	4
-QT_COMPONENTS=	gui imageformats_run inputmethods_run iconengines_run \
+USE_QT4=	gui imageformats_run inputmethods_run iconengines_run \
 		qmake_build moc_build
 
 OPTIONS=	API		"Install QtGui API for QScintilla2" on \
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 7cf71375e83e..e82ff9329bc5 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build corelib
+USE_QT4=	qmake_build moc_build rcc_build uic_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11-toolkits/qt4pas/Makefile b/x11-toolkits/qt4pas/Makefile
index 5f7465f1af11..0e7a2e588b36 100644
--- a/x11-toolkits/qt4pas/Makefile
+++ b/x11-toolkits/qt4pas/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Qt4 binding for FreePascal
 
 USE_LDCONFIG=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network script webkit qmake_build \
+USE_QT4=	corelib gui network script webkit qmake_build \
 		moc_build
 
 QT4_VER_MIN=	4.5.3
diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile
index fc4cb55d297b..a97546b135a0 100644
--- a/x11-toolkits/qwt5-designerplugin/Makefile
+++ b/x11-toolkits/qwt5-designerplugin/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Qt Designer plugin for Qwt
 
 LIB_DEPENDS=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5
 
-USE_QT_VER=	4
-QT_COMPONENTS=	designer moc_build qmake_build rcc_build
+USE_QT4=	designer moc_build qmake_build rcc_build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 QMAKE_ARGS+=	-unix -recursive CONFIG+=QwtDesigner \
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index a1084b4c4ada..9d16adf72124 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui svg moc_build qmake_build
+USE_QT4=	gui svg moc_build qmake_build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX}
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
index bbea19803fcb..e9f39d89f9f3 100644
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ b/x11-toolkits/qwt6-designerplugin/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Qt Designer plugin for Qwt
 
 LIB_DEPENDS=	qwt6.6:${PORTSDIR}/x11-toolkits/qwt6
 
-USE_QT_VER=	4
-QT_COMPONENTS=	designer moc_build qmake_build rcc_build
+USE_QT4=	designer moc_build qmake_build rcc_build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 QMAKE_ARGS+=	-recursive CONFIG+=QwtDesigner \
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index b6b575911566..906e02ae5bbf 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui svg xml moc_build qmake_build
+USE_QT4=	gui svg xml moc_build qmake_build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 QMAKE_ARGS+=	-recursive PREFIX=${PREFIX}
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 7c8280e06e66..95b8f593540a 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	Coin.61:${PORTSDIR}/graphics/Coin
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl moc_build
+USE_QT4=	corelib opengl moc_build
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include
 LDFLAGS+=	-L${QT_LIBDIR} -L${LOCALBASE}/lib