- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

10 files changed, 11 insertions, 21 deletions

diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index 258cf25db797..c3d4ad454df4 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	aria2c:${PORTSDIR}/www/aria2 \
 		xterm:${PORTSDIR}/x11/xterm
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build uic_build moc_build rcc_build
+USE_QT4=	gui qmake_build uic_build moc_build rcc_build
 PLIST_FILES=	bin/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
 
diff --git a/www/arora/Makefile b/www/arora/Makefile
index 0dab64ea1e78..7dd4c7bc25d9 100644
--- a/www/arora/Makefile
+++ b/www/arora/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Simple Qt4 based browser
 
 LICENSE=	GPLv3
 
-USE_QT_VER=	4
-QT_COMPONENTS=	network webkit qmake_build moc_build uic_build rcc_build \
+USE_QT4=	network webkit qmake_build moc_build uic_build rcc_build \
 		imageformats gui script sql
 HAS_CONFIGURE=	yes
 QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX}
@@ -33,7 +32,7 @@ BROKEN=		core dump on application startup
 .if defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS="@comment "
 .else
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .endif
 
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 4730540374bf..5a2d98f0d2cf 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
 USE_PERL5_BUILD=	yes
 USE_XORG=	x11 ice xext
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build rcc_build uic_build qt3support
+USE_QT4=	corelib gui moc_build rcc_build uic_build qt3support
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index e05a7a0f6c6f..534e6da56bec 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	qjson.0:${PORTSDIR}/devel/qjson \
 
 USE_GETTEXT=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	gui imageformats_run network \
+USE_QT4=	gui imageformats_run network \
 		moc_build qmake_build rcc_build uic_build
 USE_BZIP2=	yes
 USE_CMAKE=	yes
diff --git a/www/cutycapt/Makefile b/www/cutycapt/Makefile
index 0850239441c0..1f1bdbb9655d 100644
--- a/www/cutycapt/Makefile
+++ b/www/cutycapt/Makefile
@@ -18,8 +18,7 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/CutyCapt
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build imageformats webkit
+USE_QT4=	qmake_build moc_build imageformats webkit
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/CutyCapt
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 501fae0e177e..746b451e59e5 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -24,8 +24,7 @@ USE_XZ=	yes
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus porting_build \
+USE_QT4=	dbus porting_build \
 		qmake_build moc_build rcc_build uic_build uic3_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile
index 6cca484df76e..a124e99d1e7e 100644
--- a/www/kwebkitpart/Makefile
+++ b/www/kwebkitpart/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Web browser component for KDE SC based on QtWebKit
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	designer gui webkit \
+USE_QT4=	designer gui webkit \
 		moc_build qmake_build rcc_build uic_build
 USE_BZIP2=	yes
 USE_CMAKE=	yes
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 0ff74ce89510..c2fe2aae0b42 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
 DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build gui network webkit
+USE_QT4=	qmake_build gui network webkit
 
 OPTIONS=	API		"Install QtXml API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 4c6cbe4d0ae4..4ec7ead9f8b4 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Qt4 WebKit engine
 
 USE_GNOME=	glib20
 USE_GSTREAMER=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib declarative gui network \
+USE_QT4=	corelib declarative gui network \
 		qmake_build moc_build rcc_build
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index ec1e981ab558..97e0a55b68c3 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Lightweight KDE browser based on WebKit
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	script webkit \
+USE_QT4=	script webkit \
 		moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes