67 files changed, 67 insertions, 134 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index b3cabb3fba4b..76b273a5347b 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -32,8 +32,7 @@ USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=	yes
 CMAKE_VERBOSE=	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
 PLIST_SUB+=	LIBVERS=${PORTVERSION:R}
 
 INSTALLS_ICONS=	yes
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index 18cf651f73f3..a467e4499b2b 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -20,8 +20,7 @@ LICENSE_COMB=	dual
 
 USE_GL=		glu
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui opengl \
+USE_QT4=	corelib gui opengl \
 		moc_build qmake_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 232609f91d91..b31375d19c37 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program that can detect edges in images
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build linguist_build gui
+USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build gui
 WRKSRC=		${WRKDIR}/${PORTNAME}
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 0153e8459b80..2de2dbd62a15 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -29,8 +29,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network qt3support sql svg xml \
+USE_QT4=	gui dbus network qt3support sql svg xml \
 		qmake_build moc_build rcc_build uic_build
 USE_GNOME=	pkgconfig
 USE_CMAKE=	yes
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index a78b89741071..c792831eb848 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network rcc_build uic_build moc_build qmake_build
+USE_QT4=	gui network rcc_build uic_build moc_build qmake_build
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
 		--x-libraries="${LOCALBASE}/lib"
diff --git a/graphics/easypaint/Makefile b/graphics/easypaint/Makefile
index ef91dc00303e..597c29be6c20 100644
--- a/graphics/easypaint/Makefile
+++ b/graphics/easypaint/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Easy graphic editing program
 
 LICENSE=	GPLv3
 
-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
 QPROFILE=	easyPaint
 WRKSRC=		${WRKDIR}/${QPROFILE}
 
diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
index a4a39ac625d4..50f97f931635 100644
--- a/graphics/eos-movrec/Makefile
+++ b/graphics/eos-movrec/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
 USE_ZIP=	yes
 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build gui
+USE_QT4=	qmake_build moc_build rcc_build uic_build gui
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 DISTVERSIONSUFFIX=	-src
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index a5ee2fc2da89..77cb4ff6c084 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build xml
+USE_QT4=	corelib gui moc_build qmake_build xml
 USE_PYTHON=	yes
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 0931eeea8025..156ab27dc45b 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	boost_program_options.4:${PORTSDIR}/devel/boost-libs
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GL=		glu
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui opengl \
+USE_QT4=	corelib gui opengl \
 		moc_build qmake_build
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
index e0fba2ded3c0..a555677bbd74 100644
--- a/graphics/fraqtive/Makefile
+++ b/graphics/fraqtive/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Draws Mandelbrot and Julia fractals
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui opengl qmake_build uic_build moc_build rcc_build
+USE_QT4=	gui opengl qmake_build uic_build moc_build rcc_build
 QT_NONSTANDARD=	yes
 USE_GL=		glu
 HAS_CONFIGURE=	yes
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index e9ffa3c7c2d7..6fe5a6912629 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -149,8 +149,7 @@ PLIST_SUB+=	KDE="@comment "
 .if defined(WITH_KDE4)
 GNASH_GUIS+=	kde4
 PLIST_SUB+=	KDE4=""
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build
+USE_QT4=	moc_build
 QT_NONSTANDARD=	yes
 USE_KDE4=	kdehier kdelibs
 CONFIGURE_ENV+=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index aaee48e9e27a..cf67638bd7f1 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -94,8 +94,7 @@ OPTIONS=	ICONV "Build with ICONV support" on \
 .include <bsd.port.options.mk>
 
 .if defined(WITH_GVEDIT)
-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
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 3fa47a115bb8..c5c2c4daccfb 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -26,8 +26,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 USE_KDE4=	kdehier kdelibs kdeprefix libkipi libkonq \
 		automoc4 soprano
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 1b2712c1e544..97f5075e862d 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -25,8 +25,7 @@ USE_LDCONFIG=	yes
 USE_LUA=	5.1
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qt3support qmake_build moc_build uic_build rcc_build
+USE_QT4=	gui qt3support qmake_build moc_build uic_build rcc_build
 MAN1=		ipe.1 ipe6upgrade.1 ipeextract.1 iperender.1 ipetoipe.1 ipescript.1
 
 .if defined(NOPORTDOCS)
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index d708569b26bc..3b12e6277163 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -24,8 +24,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus qt3support qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qt3support qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index 3cbd59cda553..25e948d9eb18 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/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=	dbus qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile
index 5a866d78bdd4..080018aaa3fc 100644
--- a/graphics/kcoloredit/Makefile
+++ b/graphics/kcoloredit/Makefile
@@ -19,8 +19,7 @@ COMMENT=	Palette files editor for KDE
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile
index c7ff0a56ca52..2f6f7176bc10 100644
--- a/graphics/kdegraphics4-mobipocket/Makefile
+++ b/graphics/kdegraphics4-mobipocket/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix okular automoc4 strigi
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build
+USE_QT4=	gui qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile
index f4d3e2456216..068286b2eed1 100644
--- a/graphics/kdegraphics4-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 strigi
 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_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile
index cfa246a2174c..2bbb36e9a53c 100644
--- a/graphics/kdegraphics4-svgpart/Makefile
+++ b/graphics/kdegraphics4-svgpart/Makefile
@@ -21,8 +21,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile
index bc61bd233d1a..9ea3e83277f1 100644
--- a/graphics/kdegraphics4-thumbnailers/Makefile
+++ b/graphics/kdegraphics4-thumbnailers/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix libkdcraw libkexiv2 automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build
+USE_QT4=	gui qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile
index c289c68dab5d..c72756acc1e9 100644
--- a/graphics/kgraphviewer/Makefile
+++ b/graphics/kgraphviewer/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gvc:${PORTSDIR}/graphics/graphviz
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile
index d4e4f92b69a5..60ee0dedf9a7 100644
--- a/graphics/kiconedit/Makefile
+++ b/graphics/kiconedit/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A KDE icon editor
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 8b17166c9279..2111dc1535d7 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -30,8 +30,7 @@ USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_GL=		glu
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network svg xml opengl \
+USE_QT4=	gui dbus network svg xml opengl \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index 9bdc9e8e9fee..dc7277ec49df 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml dbus designer_build \
+USE_QT4=	gui xml dbus designer_build \
 		qmake_build moc_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 USE_GHOSTSCRIPT=	yes
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index ab347e50bd56..17786a22dc1e 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz
 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_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index 08f22e9522b5..acb21e9d75bc 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier 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
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile
index d63ffb2209a7..e83ef14d092d 100644
--- a/graphics/kpovmodeler/Makefile
+++ b/graphics/kpovmodeler/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
 USE_BZIP2=	yes
 USE_GL=		glu
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib opengl qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index 38b4ccfc17a5..fc4834ab65cf 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix libksane automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qmake_build moc_build uic_build rcc_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index 538db09a5b86..732a6963bc20 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix libkipi automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qmake_build moc_build uic_build rcc_build
 USE_XORG=	x11 xext xfixes
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index b82555954b18..b9364849548b 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -20,8 +20,7 @@ COMMENT=	KDE image viewer
 USE_BZIP2=	yes
 USE_GNOME=	imlib
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib opengl qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index c12b7c9a05b0..0fa454a71c3c 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -24,8 +24,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 USE_XZ=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui xml \
+USE_QT4=	dbus gui xml \
 		moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index fc53688247bd..ffc6c81e4749 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -25,8 +25,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 USE_XZ=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui xml \
+USE_QT4=	dbus gui xml \
 		moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index f1f05f4246d6..80efa01d3059 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 USE_XZ=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui xml \
+USE_QT4=	dbus gui xml \
 		moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index 160b396f3f56..303cd96bd6ef 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -21,8 +21,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix 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_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index a0a103c5c2d7..56f8e86c77de 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xext sm ice xxf86vm
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qt3support assistantclient linguist_build qmake_build moc_build uic_build rcc_build
+USE_QT4=	corelib gui qt3support assistantclient linguist_build qmake_build moc_build uic_build rcc_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 5009b65d01b9..533b3d2ef90b 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -25,8 +25,7 @@ LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
 		gsl.16:${PORTSDIR}/math/gsl
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml webkit imageformats_run linguist_build \
+USE_QT4=	gui xml webkit imageformats_run linguist_build \
 		moc_build qmake_build rcc_build uic_build
 QMAKE_ARGS=	PREFIX=${PREFIX} DOCDIR=${DOCSDIR} I18NDIR=${DATADIR}/i18n
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 47c73fd9f757..97ba697d4feb 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -44,8 +44,7 @@ OPTIONS=	QT4	"Build Qt4 GUI executable"		on \
 .include <bsd.port.options.mk>
 
 .if defined(WITH_QT4)
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build corelib gui
+USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui
 PLIST_FILES+=	bin/luxrender
 .endif
 
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 8b9a7dadb4e3..ddcc3f738459 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Mesh Viewer
 WRKSRC=		${WRKDIR}/mview-${PORTVERSION}
 
 USE_GL=		glu
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui opengl moc_build
+USE_QT4=	corelib gui opengl moc_build
 USE_GMAKE=	yes
 CXXFLAGS+=	-I. -Imesh -Imathvector \
 		`pkg-config --cflags QtOpenGL glu`
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index 33ea6a0bae80..dff1314ed906 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -36,9 +36,8 @@ OPTIONS=	COMPRESSUI "Build compressor UI (requires Qt4)" off
 .include <bsd.port.options.mk>
 
 .if defined(WITH_COMPRESSUI)
-USE_QT_VER=	4
 # *_build stuff is not really needed, but cmake's Qt finder won't work otherwise
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build corelib gui opengl
+USE_QT4=	qmake_build moc_build uic_build rcc_build corelib gui opengl
 PLIST_SUB+=	COMPRESSUI=""
 .else
 PLIST_SUB+=	COMPRESSUI="@comment "
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index 04669db90368..85096e41ec85 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -30,8 +30,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz
 KDE4_BUILDENV=	yes
-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
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 84875cd338a2..4a883371604d 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Constructive Solid Geometry rendering library
 USE_GL=		glew
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-USE_QT_VER=     4
-QT_COMPONENTS=  qmake_build corelib gui
+USE_QT4=  qmake_build corelib gui
 PLIST_SUB=      PORTVERSION=${PORTVERSION}
 #MAKE_JOBS_UNSAFE=yes
 
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 36d3dd5f6fac..49e80c072368 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -118,8 +118,7 @@ CMAKE_ARGS+=	-DWITH_PNG:BOOL=Off
 .endif
 
 .if defined(WITH_QT4)
-USE_QT_VER= 	4
-QT_COMPONENTS+=	opengl moc_build qmake_build rcc_build uic_build
+USE_QT4+=	opengl moc_build qmake_build rcc_build uic_build
 CMAKE_ARGS+=	-DWITH_QT:BOOL=On -DWITH_QT_OPENGL:BOOL=On
 .else
 CMAKE_ARGS+=	-DWITH_QT:BOOL=Off
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 9490d030cc30..a4b059282eab 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -51,8 +51,7 @@ CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
 
 .if defined(WITH_IMAGEVIEWER)
 USE_GL=		glew
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui opengl qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib gui opengl qmake_build moc_build rcc_build uic_build
 CMAKE_ARGS+=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
 CMAKE_ENV+=	QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR}
 PLIST_SUB+=	IMAGEVIEWER=""
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 5278d5e3b232..6cb510bc7c12 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -29,8 +29,7 @@ LIB_DEPENDS+=	ming:${PORTSDIR}/graphics/ming \
 USE_ZIP=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build qmake_build rcc_build xml_build opengl_build
+USE_QT4=	gui moc_build qmake_build rcc_build xml_build opengl_build
 USE_XORG=	xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \
 		xxf86vm xdamage
 USE_GL=		gl glu
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index f72bb073e9d9..16d93605a40f 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -58,8 +58,7 @@ CONFIGURE_ARGS+=--disable-poppler-glib
 .if ${SLAVEPORT}=="qt4"
 CONFIGURE_ARGS+=--enable-poppler-qt4
 CONFIGURE_ENV+=	ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt4
-USE_QT_VER+=	4
-QT_COMPONENTS=	gui corelib xml qtestlib moc_build
+USE_QT4=	gui corelib xml qtestlib moc_build
 # It requires poppler/splash to be built unless you disable splash backend
 # support to allow you use BUILD_WRKSRC here. It seems that splash backend
 # can read more PDF files than without, tested with demos's poppler_qt4viewer.
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index deb1ad52820f..2a8469cc36f8 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A barcode library for KDE
 LIB_DEPENDS=	dmtx.0:${PORTSDIR}/graphics/libdmtx \
 		qrencode.3:${PORTSDIR}/graphics/libqrencode
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index 7d474dece6f1..981d40143a22 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/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=	svg qmake_build
+USE_QT4=	svg qmake_build
 
 OPTIONS=	API		"Install QtSvg API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 0bfa80ab4e8f..f1bf175799b1 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		unrar:${PORTSDIR}/archivers/unrar
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build rcc_build uic_build \
+USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build \
 		xml
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 4f1043aef45d..d72b03be5c01 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -25,9 +25,8 @@ USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_BISON=	build
 USE_CMAKE=	yes
-USE_QT_VER=	4
 USE_SQLITE=	yes
-QT_COMPONENTS=	gui svg xml network sql designer linguist_build \
+USE_QT4=	gui svg xml network sql designer linguist_build \
 		qmake_build moc_build rcc_build uic_build
 
 USE_LDCONFIG=	yes
diff --git a/graphics/qiviewer/Makefile b/graphics/qiviewer/Makefile
index 886312ccd4ce..5895fd5ed5fd 100644
--- a/graphics/qiviewer/Makefile
+++ b/graphics/qiviewer/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Fast and lightweight image viewer
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml dbus linguist_build qmake_build moc_build \
+USE_QT4=	gui xml dbus linguist_build qmake_build moc_build \
 		rcc_build uic_build
 QMAKEFLAGS+=	PREFIX="${PREFIX}"
 
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index a672a857a744..066a1059ec88 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SVG icon engine plugin
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib gui svg xml
+USE_QT4=	qmake_build moc_build corelib gui svg xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index bf8c5c5b5af6..f827e647e4bb 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
 		tiff:${PORTSDIR}/graphics/tiff
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui svg xml
+USE_QT4=	qmake_build moc_build rcc_build corelib gui svg xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	true
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 76818fe56b22..3896030d0138 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt screen magnification utility
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib gui network
+USE_QT4=	qmake_build moc_build corelib gui network
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index af73d7b8b3fe..f4088c43e930 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SVG library
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib gui
+USE_QT4=	qmake_build moc_build corelib gui
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile
index ae963962a36b..46453b1d4033 100644
--- a/graphics/qtgtl/Makefile
+++ b/graphics/qtgtl/Makefile
@@ -20,8 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	GTLCore.0:${PORTSDIR}/graphics/opengtl
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 8813609e4adf..a33303954d07 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -25,8 +25,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
 USE_CMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-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
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index 74bdbb477c95..8b3a419d68c9 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -18,8 +18,7 @@ COMMENT=	The Seam Carving GUI is a GUI front end to CAIR
 HAS_CONFIGURE=	yes
 
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui imageformats_run moc_build qmake_build uic_build
+USE_QT4=	gui imageformats_run moc_build qmake_build uic_build
 
 WRKSRC=		${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION}
 
diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile
index 5fb4f9e9a188..f0da0f33f16d 100644
--- a/graphics/showimage/Makefile
+++ b/graphics/showimage/Makefile
@@ -18,8 +18,7 @@ COMMENT=	ShowImage is a simple KDE based image viewer
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-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
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index 1cb8838ef996..bc467f53a4d6 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	ksane.0:${PORTSDIR}/graphics/libksane
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index 73edb2db5660..6f78916e2a80 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Rule-based 3D structure generator
 
 USE_GL=		glu
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build corelib gui opengl moc_build rcc_build xml script
+USE_QT4=	qmake_build corelib gui opengl moc_build rcc_build xml script
 MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/structure-synth
 
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index f94285eabd82..9ace4a926223 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	tiled-qt-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	General purpose tile map editor
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui opengl \
+USE_QT4=	corelib gui opengl \
 		linguist_build qmake_build moc_build uic_build rcc_build
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index e83233fa75b3..6bfd46d6dc69 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		qscintilla2:${PORTSDIR}/devel/qscintilla2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \
+USE_QT4=	corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \
 		designer assistant assistantclient
 USE_GL=		glew glut
 USE_GNOME=	libxml2
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 9460c1ce7a3b..57b91a3e3543 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -24,8 +24,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 BROKEN=		does not compile
 
 GNU_CONFIGURE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build
+USE_QT4=	moc_build qmake_build
 USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	2.4+
diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
index 46d1405a7bd3..214798f6a458 100644
--- a/graphics/yagf/Makefile
+++ b/graphics/yagf/Makefile
@@ -22,8 +22,7 @@ USE_CMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
 INSTALLS_ICONS=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui imageformats linguist_build \
+USE_QT4=	corelib gui imageformats linguist_build \
 		moc_build qmake_build rcc_build uic_build
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index c221c3c16a1c..a5e675a9a4ba 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -85,8 +85,7 @@ PLIST_SUB+=	GTK2="@comment "
 .endif
 
 .if defined(WITH_QT4)
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build
+USE_QT4=	gui moc_build
 CONFIGURE_ARGS+=	--with-qt=yes
 PLIST_SUB+=	QT4=""
 .else
diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile
index f366002fc0ad..bc23dd1bfb38 100644
--- a/graphics/zint/Makefile
+++ b/graphics/zint/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build designer
+USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build designer
 MAKE_JOBS_SAFE=	yes
 
 DESKTOP_ENTRIES="Zint" "Barcode generator" "" "zint-qt" "" false