15 files changed, 19 insertions, 33 deletions

diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 664eecde60dd..af0a70669763 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	clucene.0:${PORTSDIR}/textproc/clucene
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui iconengines network phonon qtestlib script \
+USE_QT4=	corelib dbus gui iconengines network phonon qtestlib script \
 		svg webkit xml linguist_build moc_build qmake_build \
 		rcc_build uic_build
 
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index c1c98d6fe4ce..e0e63e695df2 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -6,8 +6,7 @@ DISTNAME=	${PORTNAME}-${KDE4_L10N}-${PORTVERSION}
 DIST_SUBDIR?=	KDE/kde-l10n
 
 USE_XZ=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	uic_build moc_build qmake_build rcc_build xml
+USE_QT4=	uic_build moc_build qmake_build rcc_build xml
 USE_GETTEXT=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
 USE_CMAKE=	yes
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 28dbd15e919e..b59b6e842e40 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/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/misc/klettres/Makefile b/misc/klettres/Makefile
index 7a90c1a54d55..3418a372595a 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/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/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 3224bc627309..3c22928b99fd 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -20,8 +20,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USE_CMAKE=	yes
 USE_GETTEXT=	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
 USE_KDE4=	automoc4 kdeprefix kdelibs sharedmime
 MAKE_JOBS_SAFE=	yes
 
@@ -38,17 +37,17 @@ OPTIONS=	SQLITE "Support for SQLite backend" on \
 CMAKE_ARGS+=	-DWITH_Sqlite:BOOL=OFF
 .else
 USE_SQLITE=	yes
-QT_COMPONENTS+=	sql-sqlite3_run
+USE_QT4+=	sql-sqlite3_run
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
-QT_COMPONENTS+=	sql-mysql_run
+USE_QT4+=	sql-mysql_run
 .endif
 
 .if defined(WITH_POSTGRESQL)
 USE_PGSQL=	yes
-QT_COMPONENTS+=	sql-pgsql_run
+USE_QT4+=	sql-pgsql_run
 .endif
 
 pre-configure:
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index f7538c5e849f..35849ff13c0c 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/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=	phonon moc_build qmake_build rcc_build uic_build
+USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 608f189580cf..aff96a454daf 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix libkdeedu 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
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index 3db2f0391257..c671c3ab4465 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/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=	gui xml moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui xml moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index f223fe2c2f63..f8884f54f97c 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -21,8 +21,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdehier kdelibs kdeprefix libkdeedu attica 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_XORG=	x11 xrender
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 9218ca27c85b..e4c1ee9fb80e 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.usermode.org/code/
 MAINTAINER=	david@usermode.org
 COMMENT=	A homebrewer's recipe calculator
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build xml gui
+USE_QT4=	qmake_build moc_build uic_build rcc_build xml gui
 PORTDOCS=	*
 HAS_CONFIGURE=	yes
 
diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index caf0284e9718..4bbb57d2f99c 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Multiplatform C++ application framework
 
-USE_QT_VER=	4
+USE_QT4=	yes
 QT_DIST=	yes
 NO_BUILD=	yes
 
diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index 7add3a5b4af9..b89658585a66 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt translations messages
 
-USE_QT_VER=	4
-QT_COMPONENTS=	linguist_build
+USE_QT4=	linguist_build
 QT_DIST=	yes
 QT_NONSTANDARD=	yes
 
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index ef9d1ab2bff5..419d9d5a0ea4 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Qt graphical configuration utility
 
 OPTIONS=	PHONON "Add support for Phonon (implies GStreamer)" on
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build qt3support corelib \
+USE_QT4=	qmake_build moc_build rcc_build uic_build qt3support corelib \
 		gui sql xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
@@ -43,7 +42,7 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_PHONON)
-QT_COMPONENTS+=	phonon phonon-gst
+USE_QT4+=	phonon phonon-gst
 USE_GSTREAMER=	yes
 .else
 CONFIGURE_ARGS+=	-no-phonon -no-gstreamer
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e2f724045a86..dc4903ab52cc 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt demonstration and example programs
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build corelib designer \
+USE_QT4=	qmake_build moc_build rcc_build uic_build corelib designer \
 		gui network opengl sql svg qtestlib xml imageformats_run dbus \
 		script webkit phonon help assistant_run phonon-gst scripttools \
 		xmlpatterns multimedia
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 084114735d57..bc2173c94c3f 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -29,8 +29,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USE_BZIP2=	yes
 USE_KDE4=	pimlibs kdelibs kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
+USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes