40 files changed, 42 insertions, 81 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 3b74f123366a..c26e9b291753 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -49,8 +49,7 @@ OPTIONS=	PODOFO	"PDF support via PoDoFo library" on
 
 USE_XZ=		yes
 USE_PYTHON=	2.7
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build
+USE_QT4=	qmake_build moc_build
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	"-I${LOCALBASE}/include"
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index 8eabd83084fc..c249cad78cd5 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -30,8 +30,7 @@ BUILD_WRKSRC=	${WRKSRC}/src
 
 PROJECTHOST=	lib7zip
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui xml \
+USE_QT4=	corelib gui xml \
 		linguist_build moc_build qmake_build uic_build
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index 5d8ed724deb5..ba4454c9d2a4 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -24,8 +24,7 @@ WRKSRC=		${WRKDIR}/KDAB-Charm-3151d25
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DCharm_VERSION:STRING=${PORTVERSION}
 USE_KDE4=	kdehier kdeprefix
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build corelib gui network \
+USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui network \
 		qtestlib sql sql-sqlite3 xml
 USE_XORG=	ice x11 xext xscrnsaver
 INSTALLS_ICONS=	yes
diff --git a/deskutils/epoch/Makefile b/deskutils/epoch/Makefile
index 1010513e6459..85830e164ac4 100644
--- a/deskutils/epoch/Makefile
+++ b/deskutils/epoch/Makefile
@@ -19,8 +19,7 @@ LINCENSE=	GPLv3
 PROJECTHOST=	gepoch
 
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build rcc_build
+USE_QT4=	gui qmake_build moc_build rcc_build
 
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
 
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 774f5246bc73..146702dd4294 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -26,8 +26,7 @@ UI=		gtk
 USE_GNOME=	gtk20
 .else
 UI=		qt4
-USE_QT_VER=	4
-QT_COMPONENTS=	gui corelib imageformats network moc_build
+USE_QT4=	gui corelib imageformats network moc_build
 LDFLAGS+=	-L${QT_LIBDIR}
 .endif
 
diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 2c48430003c9..868fc1f97e95 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -18,8 +18,7 @@ MAINTAINER=	salfrancl@yahoo.es
 COMMENT=	FET is free timetabling software
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network qt3support xml \
+USE_QT4=	gui network qt3support xml \
 		moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 QMAKE_ARGS=	-unix PREFIX=${PREFIX} \
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index d1db55e38d12..573574d283ea 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -53,8 +53,7 @@ OPTIONS=	DEBUGGING	"Enable debug output on runtime"	on\
 .include <bsd.port.options.mk>
 
 .if defined(WITH_QT)
-USE_QT_VER=	4
-QT_COMPONENTS=	webkit opengl gui corelib script network moc_build
+USE_QT4=	webkit opengl gui corelib script network moc_build
 .endif
 
 .if defined(WITH_GTKWEBKIT)
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 160ec0fb29bb..e97e0e20b849 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -20,8 +20,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USE_CMAKE=	yes
 USE_KDE4=	kdeprefix kdelibs automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	webkit qmake_build moc_build rcc_build uic_build
+USE_QT4=	webkit qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 post-install:
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index d6f4b4889d8d..2c98635f2821 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -25,8 +25,7 @@ USE_GNOME=	libxml2
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
 		akonadi automoc4 ontologies sharedmime soprano strigi
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus designer gui network xml xmlpatterns \
+USE_QT4=	dbus designer gui network xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 CMAKE_ARGS=	-DKDEPIM_MOBILE_UI:BOOL=OFF
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index bc9aa2fc38d7..35abc8e5bc12 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -34,8 +34,7 @@ USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
 		akonadi automoc4 ontologies soprano strigi
 KDE4_BUILDENV=	yes
 USE_OPENLDAP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus designer gui network \
+USE_QT4=	dbus designer gui network \
 		qt3support script sql webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11 xscrnsaver
diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile
index 13e0455dba6a..10d82ce06b13 100644
--- a/deskutils/kdepim44-runtime/Makefile
+++ b/deskutils/kdepim44-runtime/Makefile
@@ -23,8 +23,7 @@ LATEST_LINK=	${PORTNAME}44
 USE_KDE4=	pimlibs kdeprefix kdehier sharedmime automoc4
 KDE4_BUILDENV=	yes
 USE_BZIP2=	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
 
 post-patch:
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index bf402e372ce9..ebfe438f1ebe 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -28,8 +28,7 @@ USE_KDE4=	kdelibs pimlibs \
 		akonadi kdeprefix kdehier automoc4 oxygen
 KDE4_BUILDENV=	yes
 USE_BZIP2=	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
 USE_OPENLDAP=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 228abd55dc29..21cbf2bf57aa 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -29,8 +29,7 @@ USE_KDE4=	kdelibs akonadi kdeprefix kdehier \
 		automoc4 ontologies sharedmime soprano
 KDE4_BUILDENV=	yes
 USE_OPENLDAP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus designer gui network sql xml \
+USE_QT4=	dbus designer gui network sql xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 0da8e2445c47..266c549754e7 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -28,8 +28,7 @@ USE_XZ=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix libkexiv2 pimlibs workspace \
 		akonadi attica automoc4 qimageblitz sharedmime soprano
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network opengl script sql svg webkit xml \
+USE_QT4=	dbus gui network opengl script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11 xrender xtst
 MAKE_JOBS_SAFE=	yes
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index a65b01f078ca..05e42ec61357 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build uic_build rcc_build
+USE_QT4=	corelib qmake_build moc_build uic_build rcc_build
 USE_XORG=	x11
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile
index 705c99852891..1c9a8bb9f083 100644
--- a/deskutils/ksshaskpass/Makefile
+++ b/deskutils/ksshaskpass/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A KDE 4 version of ssh-askpass with KWallet support
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc_build uic_build qmake_build rcc_build
+USE_QT4=	qmake moc_build uic_build qmake_build rcc_build
 
 MAN1=		ksshaskpass.1
 SUB_FILES=	pkg-message
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 3ee7c915cad1..a73326389a15 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/spirit/core.hpp:${PORTSDIR}/devel/boos
 RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USE_DOS2UNIX=	readme.lyx readme.txt
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build gui network
+USE_QT4=	qmake_build moc_build rcc_build uic_build gui network
 PORTDOCS=	*
 
 post-patch:
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index 1e4bb85e75b1..15ba839f519b 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-sources
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A notes-taking application based QT4
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build moc_build rcc_build uic_build
+USE_QT4=	gui xml qmake_build moc_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile
index f504b0178bea..2caa4ef4b17a 100644
--- a/deskutils/plasma-applet-cwp/Makefile
+++ b/deskutils/plasma-applet-cwp/Makefile
@@ -22,8 +22,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network opengl svg phonon webkit xml \
+USE_QT4=	gui dbus network opengl svg phonon webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile
index ee8702c80dcd..b5c7e29e0710 100644
--- a/deskutils/plasma-applet-fancytasks/Makefile
+++ b/deskutils/plasma-applet-fancytasks/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs kdebase workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network opengl svg phonon webkit xml \
+USE_QT4=	gui dbus network opengl svg phonon webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile
index a1b465ac9da6..745c2105f351 100644
--- a/deskutils/plasma-applet-panelspacer/Makefile
+++ b/deskutils/plasma-applet-panelspacer/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Panel spacer plasma applet for KDE4
 
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network opengl svg webkit xml \
+USE_QT4=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
 WRKSRC=		${WRKDIR}/Panelspacer_from_svn_pour_kdelook-tmp
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index 7722bb178e62..94afd694f7ce 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Amarok 2.x plasma applet for KDE4
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network opengl phonon svg webkit xml xmlpatterns \
+USE_QT4=	gui dbus network opengl phonon svg webkit xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile
index 33aa7b686c83..59adfd112f97 100644
--- a/deskutils/plasma-applet-serverstatuswidget/Makefile
+++ b/deskutils/plasma-applet-serverstatuswidget/Makefile
@@ -20,8 +20,7 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_KDE4=	automoc4 kdeprefix workspace
-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
 
 LICENSE=	GPLv2
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index 6988e7215e44..d5cf52ace200 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network opengl svg webkit xml \
+USE_QT4=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
 WRKSRC=		${WRKDIR}/plasma-${PORTNAME}-${PORTVERSION}-kde-4.3.80
diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile
index aaeb6780e19e..5fd20f6a865b 100644
--- a/deskutils/plasma-applet-teacooker/Makefile
+++ b/deskutils/plasma-applet-teacooker/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Tea cooker plasma applet for KDE4
 
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network opengl svg webkit xml \
+USE_QT4=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile
index e1a828e23137..56f2924bc632 100644
--- a/deskutils/plasma-applet-yawp/Makefile
+++ b/deskutils/plasma-applet-yawp/Makefile
@@ -20,8 +20,7 @@ LICENSE=	GPLv2
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/q4wine/Makefile b/deskutils/q4wine/Makefile
index 70f981a5b68b..a53cfa468224 100644
--- a/deskutils/q4wine/Makefile
+++ b/deskutils/q4wine/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo \
 		cabextract:${PORTSDIR}/archivers/cabextract \
 		icotool:${PORTSDIR}/graphics/icoutils
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build rcc_build moc_build uic_build \
+USE_QT4=	qmake_build rcc_build moc_build uic_build \
 		linguist_build corelib gui sql network
 
 ONLY_FOR_ARCHS=	i386
@@ -39,7 +38,7 @@ OPTIONS=	DBUS "Enable DBus notification support" on
 .if defined(WITHOUT_DBUS)
 CMAKE_ARGS+=	-DWITH_DBUS:BOOL=OFF
 .else
-QT_COMPONENTS+=	dbus
+USE_QT4+=	dbus
 .endif
 
 post-install:
diff --git a/deskutils/qlabels/Makefile b/deskutils/qlabels/Makefile
index c1883433ccf9..da834a532025 100644
--- a/deskutils/qlabels/Makefile
+++ b/deskutils/qlabels/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A labels and business cards creating and printing software
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	xml gui corelib qmake_build uic_build moc_build rcc_build
+USE_QT4=	xml gui corelib qmake_build uic_build moc_build rcc_build
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 
 DESKTOP_ENTRIES=	"qlabels" \
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index e16b2058a297..c4020ae85dc7 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	qOrganizer-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A general organizer that includes calendar with jurnal and schedule
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network qmake_build moc_build rcc_build sql
+USE_QT4=	gui network qmake_build moc_build rcc_build sql
 WRKSRC=		${WRKDIR}/qOrganizer/src
 
 PLIST_FILES=	bin/qOrganizer share/pixmaps/qOrganizer.png
diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile
index 2a0c448f0684..be2672a220fa 100644
--- a/deskutils/qrfcview/Makefile
+++ b/deskutils/qrfcview/Makefile
@@ -15,8 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Graphical RFC viewer
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network corelib qmake_build uic_build moc_build rcc_build
+USE_QT4=	gui network corelib qmake_build uic_build moc_build rcc_build
 PLIST_FILES=	bin/qRFCView
 
 do-configure:
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index c65fd04eebaa..baf2d21d201a 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Blog management application based on Qt 4
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui network xml \
+USE_QT4=	corelib dbus gui network xml \
 		moc_build qmake_build rcc_build uic_build
 USE_OPENSSL=	yes
 USE_CMAKE=	yes
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 7b3cd34c03ea..3b9c01c50018 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -37,8 +37,7 @@ MAN5=		recoll.conf.5
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT_VER=	4
-QT_COMPONENTS=	webkit moc_build qmake_build rcc_build uic_build
+USE_QT4=	webkit moc_build qmake_build rcc_build uic_build
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
 INSTALLS_ICONS=	yes
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 2f181688723b..0013aaf07ef5 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -23,8 +23,7 @@ USE_KDE4=	kdehier kdelibs kdeprefix
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
 USE_PYTHON_BUILD=	2.5+
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui linguist svg webkit xml \
+USE_QT4=	corelib gui linguist svg webkit xml \
 		moc_build qmake_build uic_build
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index 9f22a1978883..98438d6503db 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
 
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build linguist_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index b2ca3d2febdf..745ad0b87dc2 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui dbus moc_build uic_build qmake_build rcc_build
+USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
 USE_BZIP2=	yes
 USE_GNOME=	libxml2 pkgconfig
 USE_FAM=	yes
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index f91d0338c48a..55c5cd427a9f 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -20,8 +20,7 @@ USE_XZ=	yes
 USE_PYTHON=	2.5+
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz
 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/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 456153ac05e3..c346b39452f5 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -30,7 +30,7 @@ OPTIONS=	ASPELL "install with aspell support" off \
 		HTTPLOAD "install httpLoad plugin" off
 
 WRKSRC=		${WRKDIR}/TreeLine
-USE_QT_VER=	4
+USE_QT4=		yes
 USE_PYTHON=	2.5+
 NO_BUILD=	yes
 
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 4ac94f6a28c2..f3a12b93b946 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -16,8 +16,7 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Tool for managing notes within a hierarchical tree
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build moc_build uic_build rcc_build
+USE_QT4=	gui xml qmake_build moc_build uic_build rcc_build
 
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 PLIST_FILES=	bin/tuxcards
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 6f228c68713d..ebc5629216fc 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	lichray@gmail.com
 COMMENT=	VYM is a tool to generate and manipulate mind maps
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build \
+USE_QT4=	qmake_build uic_build moc_build \
 		qt3support network xml dbus svg
 QMAKE_ARGS=	PREFIX=${PREFIX} \
 		DATADIR=${DATADIR:C,/vym$,,} \
@@ -34,7 +33,7 @@ DESKTOP_ENTRIES=	"VYM" \
 			false
 
 .if !defined(WITHOUT_NLS)
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
index 02dd410139fa..a284befeec62 100644
--- a/deskutils/znotes/Makefile
+++ b/deskutils/znotes/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Simple notes based on QT4
 
 LICENSE=	GPLv3
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	gui network xml qmake_build uic_build moc_build rcc_build \
 		linguist_build
 
 DESKTOP_ENTRIES="zNotes" "Simple notes" \