- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by: bapt, David Naylor (kde team)
2012-06-06 06:44:37 +00:00
parent 7db146587f
commit 9c2f65e395
587 changed files with 635 additions and 1216 deletions
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -23,8 +23,7 @@ CONFLICTS=	ktts-4.[4-6].*
 USE_XZ=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	xml qmake_build moc_build uic_build rcc_build
+USE_QT4=	xml qmake_build moc_build uic_build rcc_build
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes

--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -22,8 +22,7 @@ CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 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>
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 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

 MAN1=	kmag.1
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 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
 USE_XORG=	xtst
 MAKE_JOBS_SAFE=	yes

--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 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

 MAN1=	kmouth.1
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt accessibility widgets

-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build qt3support corelib gui network sql xml
+USE_QT4=	qmake_build moc_build qt3support corelib gui network sql xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs libkonq
 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

 MAN1=		ark.1
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -240,8 +240,7 @@ SCONS_ARGS+=	oldstyle=no
 .endif

 .if defined(WITH_QTBIND)
-USE_QT_VER=	4
-QT_COMPONENTS=	network
+USE_QT4=	network
 SCONS_ARGS+=	libQgpsmm=yes
 PLIST_SUB+=	QTBIND=""
 .else
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -44,8 +44,7 @@ pre-everything::
 .if defined(WITH_WEBKIT_IMAGE)
 PLIST_FILES+=	bin/webkit-image

-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui webkit moc_build
+USE_QT4=	corelib gui webkit moc_build

 do-build:
 	cd ${WRKSRC} && \
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -27,8 +27,7 @@ CONFLICTS=	kdeedu-4.[0-6].*

 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	opengl qmake_build moc_build rcc_build uic_build
+USE_QT4=	opengl qmake_build moc_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes

--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.4.[0-4]

 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus declarative gui network \
+USE_QT4=	dbus declarative gui network \
 		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XZ=	yes
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes

-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
+USE_QT4=	qmake_build uic_build moc_build rcc_build \
 		gui network svg webkit xml imageformats script scripttools
 MAKE_JOBS_SAFE=	yes

@@ -57,7 +56,7 @@ QMAKEFLAGS+=	NODEBUG=1
 PLIST_SUB+=	NLS="@comment "
 .else
 PLIST_SUB+=	NLS=""
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build

 pre-build:
 	@cd ${WRKSRC}/translations && lrelease-qt4 ../src/src.pro
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 		gps.20:${PORTSDIR}/astro/gpsd

 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui opengl network sql xml linguist_build \
+USE_QT4=	dbus gui opengl network sql xml linguist_build \
 		moc_build uic_build rcc_build qmake_build
 USE_GL=		glu
 MAKE_JOBS_SAFE=	yes
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -22,8 +22,7 @@ USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_GL=		glu
 USE_ICONV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build rcc_build uic_build qmake_build \
+USE_QT4=	moc_build rcc_build uic_build qmake_build \
 		corelib gui network opengl script
 MAKE_JOBS_SAFE=	yes

--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=kris
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays a view of the Earth (like xearth) with a rendered photo map

-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qt3support moc_build
+USE_QT4=	corelib gui qt3support moc_build
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} QT_PREFIX=${QT_PREFIX}

--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -32,8 +32,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 USE_GETTEXT=	yes
 USE_KDE4=	kdehier kdeprefix kdelibs runtime automoc4
 USE_MYSQL=	embedded
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network opengl phonon script svg webkit \
+USE_QT4=	gui network opengl phonon script svg webkit \
 		qmake_build moc_build rcc_build uic_build
 USE_BZIP2=	yes
 USE_CMAKE=	yes
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
 USE_XZ=		yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network svg xml \
+USE_QT4=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes

--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -28,8 +28,7 @@ PROJECTHOST=	${PORTNAME}${PKGNAMESUFFIX}
 USE_CMAKE=	yes
 USE_ICONV=	yes
 USE_GL=		glew
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
 		linguist_build network sql opengl dbus qtestlib corelib
 USE_GCC=	4.2+
 INSTALLS_ICONS=	yes
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		avutil.1:${PORTSDIR}/multimedia/ffmpeg \
 		tag.1:${PORTSDIR}/audio/taglib

-USE_QT_VER=	4
 USE_LDCONFIG=	yes
-QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
 		network phonon-gst sql
 USE_ICONV=	yes
 USE_GETTEXT=	yes
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -16,8 +16,7 @@ COMMENT=	CUE player

 LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify

-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build network
+USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build network
 USE_GSTREAMER=	flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack

 LICENSE=	GPLv3
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -40,8 +40,7 @@ MAN1=		dssi_analyse_plugin.1 dssi_list_plugins.1 dssi_osc_send.1 \
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MQT4}
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui
+USE_QT4=	corelib gui
 QT_NONSTANDARD=	yes
 PLIST_SUB=	QT=""
 .else
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	xmmsclient++.4:${PORTSDIR}/audio/cpp-xmms2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E}

 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml network imageformats_run \
+USE_QT4=	gui xml network imageformats_run \
 		qmake_build moc_build rcc_build uic_build
 QT_NONSTANDARD=	yes
 USE_GMAKE=	yes
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -23,8 +23,7 @@ OPTIONS_DEFINE=	OSS ALSA PORTAUDIO JACK
 OPTIONS_DEFAULT=	OSS JACK

 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui opengl \
+USE_QT4=	corelib gui opengl \
 		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glut
 USE_CMAKE=	yes
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -23,8 +23,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN=		does not install

 MAJORVERSION=	0.9.5
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
+USE_QT4=	corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
 USE_SCONS=	yes

 OPTIONS=	JACK "JACK support" on \
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame

 USE_BZIP2=	yes
 USE_CMAKE=	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 kdehier kdeprefix

 LICENSE=	GPLv2
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -19,8 +19,7 @@ LICENSE=	GPLv2
 LATEST_LINK=	${PORTNAME}-kde4

 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	svg gui network dbus xml \
+USE_QT4=	svg gui network dbus xml \
 		qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 # libchromaprint has not been ported yet
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/streamripper:${PORTSDIR}/audio/streamripper
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build

 CMAKE_ARGS+=	-DWITHOUT_LIBPROXY=YES # requires libproxy >= 0.3.1
 WRKSRC=		${WRKDIR}/${PORTNAME}
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -28,8 +28,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-install pkg-deinstall
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui imageformats_run moc_build network qmake_build rcc_build \
+USE_QT4=	gui imageformats_run moc_build network qmake_build rcc_build \
 		sql uic_build xml
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \

 USE_RUBY=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib xml network sql gui qtestlib \
+USE_QT4=	corelib xml network sql gui qtestlib \
 		qmake_build moc_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	-release --prefix ${PREFIX}
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -38,8 +38,7 @@ OPTIONS=	JACK       "Enable JACK support"       OFF \
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_XORG=	xft
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui xml moc_build uic_build rcc_build \
+USE_QT4=	corelib gui xml moc_build uic_build rcc_build \
 		qmake_build
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DWANT_ALSA:BOOL=OFF \
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	A simple media player using Qt/Phonon

 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build uic_build moc_build \
+USE_QT4=	gui xml qmake_build uic_build moc_build \
 		rcc_build phonon

 QMAKE_PRO=	${PORTNAME}.pro
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS=	umidi20.1:${PORTSDIR}/audio/libumidi

 LICENSE=	BSD
 USE_BZIP2=	yes
-USE_QT_VER=	4

-QT_COMPONENTS=	gui qmake_build moc_build rcc_build
+USE_QT4=	gui qmake_build moc_build rcc_build

 MAKE_JOBS_SAFE=	yes

--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Minitunes is just another music player

 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib

-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui moc_build network phonon qmake_build rcc_build \
+USE_QT4=	dbus gui moc_build network phonon qmake_build rcc_build \
 		sql uic_build xml
 INSTALLS_ICONS=	yes

--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -36,8 +36,7 @@ WAVPACK_DESC=	Enable WavPack audio support plugin
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 USE_GL=		glu
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network opengl script sql svg webkit xml \
+USE_QT4=	corelib gui network opengl script sql svg webkit xml \
 		xmlpatterns linguist_build moc_build qmake_build rcc_build \
 		uic_build
 USE_SCONS=	yes
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex \
 		protoc:${PORTSDIR}/devel/protobuf

 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui svg iconengines_run xml sql network l10n \
+USE_QT4=	gui svg iconengines_run xml sql network l10n \
 		linguist_build qmake_build moc_build rcc_build uic_build \
 		opengl sql-sqlite3_run

@@ -49,7 +48,7 @@ BROKEN=		does not compile on FreeBSD 7.x
 .if defined(WITHOUT_DBUS)
 CONFIG+=	no-dbus
 .else
-QT_COMPONENTS+=	dbus
+USE_QT4+=	dbus
 .endif

 .if defined(WITHOUT_SYSCELT)
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	protobuf.7:${PORTSDIR}/devel/protobuf

 USERS=		${PORTNAME}
 GROUPS=		${USERS}
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib network xml sql sql-sqlite3_run
+USE_QT4=	qmake_build moc_build corelib network xml sql sql-sqlite3_run

 CONFIG=		no-client

@@ -41,7 +40,7 @@ CONFIG+=	no-ice
 .endif

 .if defined(WITH_DBUS)
-QT_COMPONENTS+=	dbus
+USE_QT4+=	dbus
 .else
 CONFIG+=	no-dbus
 .endif
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}

 USE_BZIP2=	yes
 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network svg xml script scripttools designer webkit \
+USE_QT4=	corelib gui network svg xml script scripttools designer webkit \
 		qmake_build moc_build uic_build linguist_build rcc_build
 MAKE_JOBS_SAFE=	yes

--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -27,8 +27,7 @@ LIB_DEPENDS=	cdio.13:${PORTSDIR}/sysutils/libcdio \
 BUILD_DEPENDS=	mythfrontend:${PORTSDIR}/multimedia/mythtv

 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	linguist_build moc_build qmake_build rcc_build uic_build
+USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/mythtv/plugins

--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -18,8 +18,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib \
 		jack.0:${PORTSDIR}/audio/jack

-USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui xml \
+USE_QT4=	corelib dbus gui xml \
 		linguist_build moc_build qmake_build rcc_build uic_build
 QT_NONSTANDARD=	yes
 USE_GMAKE=	yes
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -20,8 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme

 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 \
 		corelib gui network xml xmlpatterns
 MAKE_JOBS_SAFE=	yes
 INSTALLS_ICONS=	yes
@@ -39,12 +38,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 .if defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS="@comment "
 .else
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build
 PLIST_SUB+=	NLS=""
 .endif

 .if defined(WITH_DBUS) && !defined(WITHOUT_DBUS)
-QT_COMPONENTS+=	dbus
+USE_QT4+=	dbus
 QMAKEFLAGS+=	"CONFIG+=qdbus"
 .endif

--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gig.10:${PORTSDIR}/audio/libgig \
 		lscp.6:${PORTSDIR}/audio/liblscp
 RUN_DEPENDS=	linuxsampler:${PORTSDIR}/audio/linuxsampler

-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui \
+USE_QT4=	corelib gui \
 		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	fluidsynth:${PORTSDIR}/audio/fluidsynth

 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build linguist_build
+USE_QT4=	gui qmake_build moc_build uic_build rcc_build linguist_build
 CFLAGS+=	-I${QT_INCDIR} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 LDFLAGS+=	-L${QT_LIBDIR}
 CONFIGURE_ARGS+=ac_cv_path_ac_moc=${MOC} ac_cv_path_ac_uic=${UIC} \
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -18,8 +18,7 @@ COMMENT=	QT4 Client for MPD (the Music Player Daemon)

 LIB_DEPENDS=	mpdclient.2:${PORTSDIR}/audio/libmpdclient

-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network \
+USE_QT4=	corelib gui network \
 		qmake_build moc_build rcc_build uic_build
 QMAKE_ARGS=	PREFIX=${PREFIX}

--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -28,8 +28,7 @@ LIB_DEPENDS+=	lrdf.2:${PORTSDIR}/textproc/liblrdf \

 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml network corelib sql qt3support \
+USE_QT4=	gui xml network corelib sql qt3support \
 		rcc_build moc_build uic_build linguist_build
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
 		kcddb:${PORTSDIR}/multimedia/kdemultimedia4

 USE_CMAKE=	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 kdehier kdeprefix kdelibs
 INSTALLS_ICONS=	yes

--- a/audio/tepsonic/Makefile
+++ b/audio/tepsonic/Makefile
@@ -18,10 +18,9 @@ COMMENT=	TepSonic is a simple and fast audio player
 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib

 USE_CMAKE=	yes
-USE_QT_VER=	4
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-QT_COMPONENTS=	gui xml sql phonon network linguist_build \
+USE_QT4=	gui xml sql phonon network linguist_build \
 		rcc_build qmake_build uic_build moc_build

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/audio/waheela/Makefile
+++ b/audio/waheela/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	amarok>=2:${PORTSDIR}/audio/amarok-kde4

 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdehier kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network svg xml \
+USE_QT4=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes

--- 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 \
--- 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
--- 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 "
--- 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

--- 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
--- 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

--- 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
--- 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

--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -68,8 +68,7 @@ SUB_LIST+=	GTK3_IM=xim

 .if ${PORT_OPTIONS:MQT4}
 USE_QT=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui
+USE_QT4=	gui
 CMAKE_ARGS+=	-DENABLE_QT_IM_MODULE=ON
 PLIST_SUB+=	QT4=""
 .else
--- a/chinese/fqterm/Makefile
+++ b/chinese/fqterm/Makefile
@@ -21,8 +21,7 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-install pkg-deinstall ${PORTNAME}.desktop
 USE_XORG=	x11 ice xext xt xaw xpm xi xproto xextproto
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network script qt3support imageformats \
+USE_QT4=	gui network script qt3support imageformats \
 		codecs-cn codecs-tw codecs-jp codecs-kr \
 		qmake_build moc_build rcc_build uic_build linguist_build

--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -38,8 +38,7 @@ MAN1=		gcin.1 gcin-exit.1 gcin2tab.1 gcin-gb-toggle.1 gcin-kbm-toggle.1 \
 .include <bsd.port.options.mk>

 .if defined(WITH_QT_IM_MODULE)
-USE_QT_VER=	4
-QT_COMPONENTS=	inputmethods qmake_build moc_build corelib gui
+USE_QT4=	inputmethods qmake_build moc_build corelib gui
 LIB_DEPENDS+=	mng:${PORTSDIR}/graphics/libmng
 PLIST_SUB+=	QT_IM_MODULE=""
 .else
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX=	-cn
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt GB 18030 codec plugin

-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build corelib
+USE_QT4=	qmake_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes

--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX=	-tw
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Big-5 codec plugin

-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build corelib
+USE_QT4=	qmake_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes

--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Graphical serial terminal

 RUN_DEPENDS=	lsz:${PORTSDIR}/comms/lrzsz

-USE_QT_VER=	4
-QT_COMPONENTS=	qt3support qmake_build moc_build rcc_build uic_build
+USE_QT4=	qt3support qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes

 MAN1=		cutecom.1
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 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>
--- a/databases/akonadi-google/Makefile
+++ b/databases/akonadi-google/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	qjson.0:${PORTSDIR}/devel/qjson
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt

 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network webkit xml \
+USE_QT4=	dbus gui network webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/akonadi-googledata/Makefile
+++ b/databases/akonadi-googledata/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	gcal:${PORTSDIR}/deskutils/libgcal
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build rcc_build moc_build uic_build dbus
+USE_QT4=	qmake_build rcc_build moc_build uic_build dbus
 USE_KDE4=	kdelibs kdeprefix pimlibs automoc4 akonadi

 .include <bsd.port.mk>
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt

 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib network qtestlib dbus gui sql \
+USE_QT4=	corelib network qtestlib dbus gui sql \
 		qmake_build moc_build rcc_build uic_build
 USE_KDE4=	kdehier kdeprefix sharedmime automoc4 soprano
 KDE4_BUILDENV=	yes
@@ -44,7 +43,7 @@ OPTIONS=	MYSQL "Install MySQL plugin and server (recommended)" on \

 .ifndef(WITHOUT_MYSQL)
 USE_MYSQL=	server
-QT_COMPONENTS+=	sql-mysql_run
+USE_QT4+=	sql-mysql_run
 .endif

 .ifdef(WITH_PGSQL)
@@ -52,7 +51,7 @@ QT_COMPONENTS+=	sql-mysql_run
 # it over MySQL might like to use some advanced configuration like a
 # remote server.
 #USE_PGSQL=	server
-QT_COMPONENTS+=	sql-pgsql_run
+USE_QT4+=	sql-pgsql_run
 .endif

 .ifdef(WITH_SQLITE)
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdelibs kdeprefix automoc4 sharedmime
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build \
+USE_QT4=	qmake_build moc_build uic_build rcc_build \
 		webkit
 MAKE_JOBS_SAFE=	yes

--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -22,8 +22,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=	sql qmake_build
+USE_QT4=	sql qmake_build

 OPTIONS=	API		"Install QtSql API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Qt IBase/Firebird database plugin
 DB=		ibase

 USE_FIREBIRD=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build sql
+USE_QT4=	moc_build sql
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Qt MySQL database plugin

 DB=		mysql

-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build sql
+USE_QT4=	moc_build sql
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -17,8 +17,7 @@ DB=		odbc

 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc

-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build sql
+USE_QT4=	moc_build sql
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Qt PostgreSQL database plugin

 DB=		psql

-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build sql
+USE_QT4=	moc_build sql
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQL library

-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib
+USE_QT4=	qmake_build moc_build corelib
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -17,8 +17,7 @@ DB=		sqlite2

 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2

-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build sql
+USE_QT4=	moc_build sql
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -18,8 +18,7 @@ DISTINFO_FILE=	${PORTSDIR}/devel/qt4/distinfo

 LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3

-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build sql
+USE_QT4=	moc_build sql
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -17,10 +17,9 @@ COMMENT=	Admin's GUI tool for Sqlite3
 LIB_DEPENDS=	qscintilla2:${PORTSDIR}/devel/qscintilla2

 USE_CMAKE=	yes
-USE_QT_VER=	4
 USE_SQLITE=	yes
 CMAKE_ENV+=	QMAKESPEC=${QMAKESPEC}
-QT_COMPONENTS=	qmake_build gui moc_build rcc_build uic_build xml sql
+USE_QT4=	qmake_build gui moc_build rcc_build uic_build xml sql

 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -24,8 +24,7 @@ OPTIONS=	ORACLE "Build with Oracle support (i386 only)" off \
 		MYSQL  "Build with MySQL support" on

 USE_AUTOTOOLS=	aclocal automake autoconf autoheader libtool
-USE_QT_VER=	4
-QT_COMPONENTS=	gui corelib sql xml network linguist moc_build uic_build rcc_build
+USE_QT4=	gui corelib sql xml network linguist moc_build uic_build rcc_build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes

--- 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"
--- 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
--- 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
--- 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

--- 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

--- 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} \
--- 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)
--- 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:
--- 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
--- 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
--- 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:
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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}
--- 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}
--- 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
--- 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

--- 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
--- 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
--- a/Show More
+++ b/Show More