37 files changed, 81 insertions, 84 deletions

diff --git a/misc/artikulate-kde4/Makefile b/misc/artikulate-kde4/Makefile
index e7955cf3aa19..5919116b5900 100644
--- a/misc/artikulate-kde4/Makefile
+++ b/misc/artikulate-kde4/Makefile
@@ -14,9 +14,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtqui
 
 IGNORE=		not usable, links to both GStreamer 0.10.x and 1.x
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	automoc4 kdelibs libkeduvocdocument runtime_run
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT=		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
index e687c2e892c7..48314c630d84 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Pronunciation trainer for KDE
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive attica auth codecs config configwidgets coreaddons \
 		crash doctools ecm i18n kdeclarative newstuff service \
 		widgetsaddons xmlgui
-USE_QT5=	core dbus gui multimedia network qml quick sql testlib widgets \
+USE_QT=		core dbus gui multimedia network qml quick sql testlib widgets \
 		xml xmlpatterns \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index ce2c09322b84..656f024cf7d3 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -16,8 +16,8 @@ BROKEN_powerpc64=	fails to compile: btosismorphsegmentation.cpp.o: undefined ref
 LIB_DEPENDS=	libclucene-core.so:textproc/clucene \
 		libsword.so:misc/sword
 
-USES=		cmake:outsource tar:xz ssl
-USE_QT4=	corelib dbus gui iconengines network phonon qtestlib script \
+USES=		cmake:outsource qt:4 tar:xz ssl
+USE_QT=		corelib dbus gui iconengines network phonon qtestlib script \
 		svg webkit xml linguist_build moc_build qmake_build \
 		rcc_build uic_build
 
diff --git a/misc/crosti/Makefile b/misc/crosti/Makefile
index b6ca56c17ee3..c61a611d8d50 100644
--- a/misc/crosti/Makefile
+++ b/misc/crosti/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Convert custom image to cross stitch design, edit stitch designs
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
-USES=		desktop-file-utils dos2unix qmake shared-mime-info zip
+USES=		desktop-file-utils dos2unix qmake qt:5 shared-mime-info zip
 USE_GL=		gl
-USE_QT5=	concurrent core gui printsupport svg widgets buildtools_build
+USE_QT=		concurrent core gui printsupport svg widgets buildtools_build
 DOS2UNIX_FILES=	${PORTNAME}.pro
 NO_WRKSUBDIR=	yes
 
diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile
index 8d67e99bf87e..25d12458eb7f 100644
--- a/misc/kde-thumbnailer-chm/Makefile
+++ b/misc/kde-thumbnailer-chm/Makefile
@@ -12,9 +12,9 @@ COMMENT=	KDE thumbnail generator for CHM files
 
 LIB_DEPENDS=	libchm.so:misc/chmlib
 
-USES=		cmake kde:4
+USES=		cmake kde:4 qt:4
 USE_KDE=	kdelibs automoc4
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT=		moc_build qmake_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	lib/kde4/chmthumbnail.so \
diff --git a/misc/kde-thumbnailer-epub/Makefile b/misc/kde-thumbnailer-epub/Makefile
index 8d5bde13911b..1c5656e4b965 100644
--- a/misc/kde-thumbnailer-epub/Makefile
+++ b/misc/kde-thumbnailer-epub/Makefile
@@ -12,9 +12,9 @@ COMMENT=	KDE thumbnail generator for ePub files
 
 PORTSCOUT=	limit:^1\.0
 
-USES=		cmake:outsource kde:4
+USES=		cmake:outsource kde:4 qt:4
 USE_KDE=	kdelibs automoc4
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT=		moc_build qmake_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	lib/kde4/epubthumbnail.so \
diff --git a/misc/kde-thumbnailer-fb2/Makefile b/misc/kde-thumbnailer-fb2/Makefile
index c9f31fc7d3ac..d98c926bc687 100644
--- a/misc/kde-thumbnailer-fb2/Makefile
+++ b/misc/kde-thumbnailer-fb2/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	160180-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE thumbnail generator for fb2 files
 
-USES=		cmake:outsource kde:4
+USES=		cmake:outsource kde:4 qt:4
 USE_KDE=	kdelibs automoc4
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT=		moc_build qmake_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	lib/kde4/fb2thumbnail.so \
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 7fd09d3cc41a..5566e4635090 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -7,9 +7,9 @@ CONFLICTS_INSTALL=	kf5-baloo-5.* \
 			kf5-kdelibs4support-5.* \
 			kf5-kfilemetadata-5.*
 
-USE_QT4=	uic_build moc_build qmake_build rcc_build xml
+USE_QT=		uic_build moc_build qmake_build rcc_build xml
 USE_KDE=	kdelibs automoc4
-USES=		cmake gettext kde:4 tar:xz
+USES=		cmake gettext kde:4 qt:4 tar:xz
 
 
 # Support for spelling dictionaries
diff --git a/misc/kdeedu-data/Makefile b/misc/kdeedu-data/Makefile
index d8d50d6f5994..700983b4bdc2 100644
--- a/misc/kdeedu-data/Makefile
+++ b/misc/kdeedu-data/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	misc kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE edu data files
 
-USES=		cmake:outsource kde:5 tar:xz
+USES=		cmake:outsource kde:5 qt:5 tar:xz
 USE_KDE=	ecm
-USE_QT5=	buildtools_build qmake_build
+USE_QT=		buildtools_build qmake_build
 
 # The qmake dependency is only needed so that kf5-e-c-m can query qmake for
 # some installation directories.
diff --git a/misc/kf5-purpose/Makefile b/misc/kf5-purpose/Makefile
index 64043af32847..08c9712d5a37 100644
--- a/misc/kf5-purpose/Makefile
+++ b/misc/kf5-purpose/Makefile
@@ -11,10 +11,10 @@ LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt5 \
 		libkaccounts.so:net-im/kaccounts-integration
 
 USES=		cmake:outsource compiler:c++11-lang gettext \
-		kde:5 pkgconfig tar:xz
+		kde:5 pkgconfig qt:5 tar:xz
 USE_GNOME=	intltool
 USE_KDE=	config coreaddons ecm i18n kdeclarative kio service widgetsaddons
-USE_QT5=	concurrent core dbus gui network qml widgets xml \
+USE_QT=		concurrent core dbus gui network qml widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/misc/kgeography-kde4/Makefile b/misc/kgeography-kde4/Makefile
index 21748074f7ea..23b3d2262f2f 100644
--- a/misc/kgeography-kde4/Makefile
+++ b/misc/kgeography-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	misc kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 geography trainer
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	xml moc_build qmake_build rcc_build uic_build
+USE_QT=		xml moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 785d575d79a6..d53a5186ae49 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -7,10 +7,10 @@ CATEGORIES=	misc kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE geography trainer
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons crash doctools ecm \
 		i18n iconthemes itemviews service widgetsaddons xmlgui
-USE_QT5=	core dbus gui widgets xml \
+USE_QT=		core dbus gui widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/misc/klettres-kde4/Makefile b/misc/klettres-kde4/Makefile
index b01cc7443ccd..3faca70e9332 100644
--- a/misc/klettres-kde4/Makefile
+++ b/misc/klettres-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	misc kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Alphabet learning tool for KDE 4
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	xml moc_build qmake_build rcc_build uic_build
+USE_QT=		xml moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index c1747da25c4d..1ef5ff445ae7 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -8,11 +8,11 @@ CATEGORIES=	misc kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Alphabet learning tool for KDE
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
 		crash doctools ecm emoticons i18n init itemmodels \
 		kdelibs4support newstuff service widgetsaddons xmlgui
-USE_QT5=	core dbus gui network phonon4 svg widgets xml \
+USE_QT=		core dbus gui network phonon4 svg widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index e155558134af..9a43462254cb 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -12,9 +12,9 @@ COMMENT=	KDE4 recipe database
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake gettext kde:4 shared-mime-info
+USES=		cmake gettext kde:4 qt:4 shared-mime-info
 USE_GNOME=	libxml2 libxslt
-USE_QT4=	corelib dbus gui qt3support sql webkit xml \
+USE_QT=		corelib dbus gui qt3support sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_KDE=	automoc4 kdelibs qimageblitz
 
@@ -24,14 +24,14 @@ OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	SQLITE MYSQL PGSQL
 OPTIONS_DEFAULT=	SQLITE
 
-SQLITE_USES=		sqlite
-SQLITE_USE=		QT4=sql-sqlite3_run
+SQLITE_USES=		qt:4 sqlite
+SQLITE_USE=		QT=sql-sqlite3_run
 SQLITE_CMAKE_BOOL=	WITH_Sqlite
 
-MYSQL_USES=		mysql
-MYSQL_USE=		QT4=sql-mysql_run
+MYSQL_USES=		mysql qt:4
+MYSQL_USE=		QT=sql-mysql_run
 
-PGSQL_USES=		pgsql
-PGSQL_USE=		QT4=sql-pgsql_run
+PGSQL_USES=		pgsql qt:4
+PGSQL_USE=		QT=sql-pgsql_run
 
 .include <bsd.port.mk>
diff --git a/misc/ktouch-kde4/Makefile b/misc/ktouch-kde4/Makefile
index 5cd10e75685a..89c10a5f1066 100644
--- a/misc/ktouch-kde4/Makefile
+++ b/misc/ktouch-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Touch typing tutor for KDE 4
 
 RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts-kde4
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib declarative opengl phonon script sql xmlpatterns \
+USE_QT=		corelib declarative opengl phonon script sql xmlpatterns \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	xkbfile
 
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 6fb5b5ad8d6f..060bc9054eea 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -7,12 +7,12 @@ CATEGORIES=	misc kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Touch typing tutor for KDE
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons doctools \
 		ecm i18n itemviews kcmutils kdeclarative kio newstuff package \
 		parts service sonnet texteditor textwidgets widgetsaddons \
 		windowsystem xmlgui
-USE_QT5=	core dbus gui network qml quick script sql testlib widgets \
+USE_QT=		core dbus gui network qml quick script sql testlib widgets \
 		x11extras xml xmlpatterns \
 		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xcb xext xkbfile
diff --git a/misc/kwordquiz-kde4/Makefile b/misc/kwordquiz-kde4/Makefile
index f889cb714fb9..f9b7dd46eead 100644
--- a/misc/kwordquiz-kde4/Makefile
+++ b/misc/kwordquiz-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	misc kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Flash card trainer for KDE 4
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs libkeduvocdocument automoc4
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT=		moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index dbb359e8eddd..a8689b3854d3 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -8,14 +8,14 @@ CATEGORIES=	misc kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Flash card trainer for KDE Applications
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools ecm emoticons guiaddons i18n \
 		iconthemes init itemmodels itemviews jobwidgets kdeclarative \
 		kdelibs4support kio libkeduvocdocument newstuff notifications \
 		notifyconfig parts service solid sonnet textwidgets \
 		unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5=	core dbus gui network phonon4 printsupport widgets xml \
+USE_QT=		core dbus gui network phonon4 printsupport widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/misc/libkdeedu-kde4/Makefile b/misc/libkdeedu-kde4/Makefile
index f456d9868990..237537705d99 100644
--- a/misc/libkdeedu-kde4/Makefile
+++ b/misc/libkdeedu-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	misc kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries used by KDE educational applications
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib gui xml moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/libkeduvocdocument/Makefile b/misc/libkeduvocdocument/Makefile
index e4264904ff9f..4213eef6d7f0 100644
--- a/misc/libkeduvocdocument/Makefile
+++ b/misc/libkeduvocdocument/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	misc kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library for reading and writing vocabulary files
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive config coreaddons ecm i18n kio service
-USE_QT5=	core gui xml \
+USE_QT=		core gui xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/misc/lxi-tools/Makefile b/misc/lxi-tools/Makefile
index 3e65c5f6409e..c498aa9b0886 100644
--- a/misc/lxi-tools/Makefile
+++ b/misc/lxi-tools/Makefile
@@ -31,10 +31,10 @@ PLIST_FILES=	bin/lxi \
 
 OPTIONS_DEFINE=	DOCS GUI
 
-GUI_USE=		qt5=core,gui,charts,widgets,buildtools_build,qmake_build gl=gl
+GUI_USES=		qmake:no_env qt:5
+GUI_USE=		qt=core,gui,charts,widgets,buildtools_build,qmake_build gl=gl
 GUI_CONFIGURE_ENABLE=	lxi-gui
 GUI_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${QT_LIBDIR}"
-GUI_VARS=		QT_NONSTANDARD=yes
 GUI_PLIST_FILES=	bin/lxi-gui
 
 post-patch:
diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
index 3225558c015b..e1c7c129efc6 100644
--- a/misc/openmvg/Makefile
+++ b/misc/openmvg/Makefile
@@ -19,14 +19,14 @@ LIB_DEPENDS=	libflann_cpp.so:math/flann \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		cmake:outsource eigen:3 jpeg
+USES=		cmake:outsource eigen:3 jpeg qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMVG
 GH_PROJECT=	openMVG
 GH_TUPLE=	openMVG-thirdparty:cereal:37fca60:cereal/dependencies/cereal \
 		openMVG-thirdparty:osi_clp:a25a980:osi/dependencies/osi_clp
 WRKSRC_SUBDIR=	src
-USE_QT5=	core gui opengl svg widgets buildtools_build qmake_build
+USE_QT=		core gui opengl svg widgets buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
diff --git a/misc/parley-kde4/Makefile b/misc/parley-kde4/Makefile
index c27743adedab..53308cec7a47 100644
--- a/misc/parley-kde4/Makefile
+++ b/misc/parley-kde4/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	misc kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Vocabulary trainer for KDE 4
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	kdelibs libkeduvocdocument attica automoc4
-USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib gui moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xrender
 
 .include <bsd.port.mk>
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index 0e2c11cec4e7..413ddd5499c7 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -10,14 +10,14 @@ COMMENT=	Vocabulary trainer for KDE
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 		docbook-xml>0:textproc/docbook-xml
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	attica auth codecs completion configwidgets coreaddons config \
 		crash doctools ecm i18n jobwidgets kcmutils kio newstuff \
 		notifications kross khtml service sonnet textwidgets \
 		widgetsaddons xmlgui \
 		libkeduvocdocument
-USE_QT5=	concurrent core dbus gui location network multimedia qml quick \
+USE_QT=		concurrent core dbus gui location network multimedia qml quick \
 		script svg webchannel webengine widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11 xrender
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index b28f04230633..540a73b9f94f 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.usermode.org/code/
 MAINTAINER=	david@usermode.org
 COMMENT=	Homebrewer's recipe calculator
 
-USES=		qmake
-USE_QT4=	moc_build uic_build rcc_build xml gui
+USES=		qmake qt:4
+USE_QT=		moc_build uic_build rcc_build xml gui
 PORTDOCS=	*
 
 QMAKE_ARGS=	CONFIG+="configure"
diff --git a/misc/qmetro/Makefile b/misc/qmetro/Makefile
index 554b7aecc33d..7f62f7064545 100644
--- a/misc/qmetro/Makefile
+++ b/misc/qmetro/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Map of the transport system for many city subways
 
 LICENSE=	GPLv2
 
-USES=		dos2unix qmake zip
+USES=		dos2unix qmake qt:4 zip
 INSTALLS_ICONS=	yes
-USE_QT4=	gui xml uic_build moc_build multimedia \
+USE_QT=		gui xml uic_build moc_build multimedia \
 		rcc_build
 LDFLAGS=	-lz
 DOS2UNIX_FILES=	rc/alarm.pri
diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 02334396743e..f23026c134fa 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation
 
-USE_QT4=	# empty
-QT_DIST=	yes
+USES=		qmake:no_configure qt-dist:4
 NO_BUILD=	yes
 
 EXTRACT_AFTER_ARGS=	'${DISTNAME}/doc'
diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index 11ec343940dd..86ee6b997d42 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt localized messages
 
-USE_QT4=	linguisttools_build
-QT_DIST=	yes
+USES=		qmake:no_configure qt-dist:4
+USE_QT=		linguisttools_build
 
 NO_ARCH=	yes
 
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index a3ae6b248eb4..401eaf29d899 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -10,10 +10,9 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 graphical configuration utility
 
-USES=		pkgconfig
-USE_QT4=	qmake_build moc_build rcc_build uic_build \
+USES=		pkgconfig qmake:no_env qt-dist:4
+USE_QT=		moc_build rcc_build uic_build \
 		corelib dbus gui xml
-QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
@@ -42,7 +41,8 @@ OPTIONS_DEFINE=	PHONON
 OPTIONS_DEFAULT=PHONON
 
 PHONON_DESC=	Phonon multimedia framework support (implies GStreamer)
-PHONON_USE=	GSTREAMER=yes QT4=phonon,phonon-gst
+PHONON_USES=	qt-dist:4
+PHONON_USE=	GSTREAMER=yes QT=phonon,phonon-gst
 PHONON_CONFIGURE_ON=	-phonon -gstreamer
 PHONON_CONFIGURE_OFF=	-no-phonon -no-gstreamer
 
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e922a9b03090..6d6440a07d40 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -10,13 +10,12 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 demonstration and example applications
 
-USES=		pkgconfig
+USES=		pkgconfig qmake:no_env qt-dist:4
 USE_GSTREAMER=	yes
-USE_QT4=	qmake_build moc_build rcc_build uic_build corelib designer \
+USE_QT=		moc_build rcc_build uic_build corelib designer \
 		gui network opengl sql svg qtestlib xml imageformats_run dbus \
 		script webkit phonon help assistant_run phonon-gst_run scripttools \
 		xmlpatterns multimedia
-QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
diff --git a/misc/qt5-doc/Makefile b/misc/qt5-doc/Makefile
index 3e66995e20bc..0a7fee7a2887 100644
--- a/misc/qt5-doc/Makefile
+++ b/misc/qt5-doc/Makefile
@@ -18,8 +18,8 @@ WRKSRC=		${WRKDIR}/Docs/Qt-${QT5_VERSION}
 #   tar: Damaged 7-Zip archive
 # Depend on p7zip across all versions because Uses/7z.mk does not work if
 # included after bsd.port.pre.mk.
-USES=		7z:p7zip
-USE_QT5=	# we just need access to QT5_VERSION and other variables.
+USES=		7z:p7zip qt:5
+USE_QT=		# we just need access to QT5_VERSION and other variables.
 
 DESCR=		${.CURDIR:H:H}/devel/qt5/pkg-descr
 NO_ARCH=	yes
diff --git a/misc/qt5-examples/Makefile b/misc/qt5-examples/Makefile
index d11b4b282d1e..b25ec89fc9d7 100644
--- a/misc/qt5-examples/Makefile
+++ b/misc/qt5-examples/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Qt 5 examples sourcecode
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-USES=		tar:xz
-USE_QT5=	#
+USES=		qt:5 tar:xz
+USE_QT=		#
 
 DESCR=		${.CURDIR:H:H}/devel/qt5/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
diff --git a/misc/qt5-l10n/Makefile b/misc/qt5-l10n/Makefile
index 6793a2fe3d72..161347669831 100644
--- a/misc/qt5-l10n/Makefile
+++ b/misc/qt5-l10n/Makefile
@@ -8,8 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt localized messages
 
-USES=		qmake
-USE_QT5=	qmake_build linguisttools_build
-QT_DIST=	translations
+USES=		qmake qt-dist:5,translations
+USE_QT=		qmake_build linguisttools_build
 
 .include <bsd.port.mk>
diff --git a/misc/qt5ct/Makefile b/misc/qt5ct/Makefile
index 47020043cb20..df3e604655a5 100644
--- a/misc/qt5ct/Makefile
+++ b/misc/qt5ct/Makefile
@@ -13,8 +13,8 @@ LICENSE=	BSD2CLAUSE
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 	libfreetype.so:print/freetype2
 
-USES=		gettext-runtime qmake tar:bz2
-USE_QT5=	core dbus gui svg widgets buildtools_build \
+USES=		gettext-runtime qmake qt:5 tar:bz2
+USE_QT=		core dbus gui svg widgets buildtools_build \
 	linguisttools_build
 USE_GL=	egl gl
 USE_XORG=	x11 xext xrender
diff --git a/misc/saaghar/Makefile b/misc/saaghar/Makefile
index 37d6efd68aa6..94a3263460ed 100644
--- a/misc/saaghar/Makefile
+++ b/misc/saaghar/Makefile
@@ -19,8 +19,8 @@ EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:archivers/unzip
 
 OPTIONS_DEFINE=	DEBUG
 
-USES=		qmake dos2unix
-USE_QT4=	gui network sql xml sql-sqlite3_run \
+USES=		qmake dos2unix qt:4
+USE_QT=		gui network sql xml sql-sqlite3_run \
 		moc_build rcc_build uic_build phonon \
 		dbus declarative xmlpatterns svg script
 WRKSRC=		${WRKDIR}/Saaghar
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 603e72542b6c..e0371369052b 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -21,11 +21,11 @@ LIB_DEPENDS=	libexempi.so:textproc/exempi \
 		libyaz.so:net/yaz
 
 USES=		cmake gettext kde:4 pkgconfig python:run \
-		shared-mime-info shebangfix tar:bzip2
+		qt:4 shared-mime-info shebangfix tar:bzip2
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	kdelibs libksane pimlibs soprano \
 		automoc4 qimageblitz libkcddb libkcompactdisc
-USE_QT4=	corelib dbus gui network phonon svg xml \
+USE_QT=		corelib dbus gui network phonon svg xml \
 		qmake_build moc_build uic_build rcc_build
 
 SHEBANG_FILES=	src/fetch/scripts/bedetheque.py \