Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk

From now on, ports that depend on Qt4 will have to set
	USES=		qt:4
	USE_QT=		foo bar
ports depending on Qt5 will use
	USES=		qt:5
	USE_QT=		foo bar

PR:		229225
Exp-run by:	antoine
Reviewed by:	mat
Approved by:	portmgr (antoine)
Differential Revision:	→https://reviews.freebsd.org/D15540

52 files changed, 108 insertions, 104 deletions

diff --git a/net-im/cutegram/Makefile b/net-im/cutegram/Makefile
index 341f8973f4d5..a451a7f9afe4 100644
--- a/net-im/cutegram/Makefile
+++ b/net-im/cutegram/Makefile
@@ -22,8 +22,8 @@ GH_PROJECT=	Cutegram aseman-qt-tools:tools
 GH_TAGNAME=	91bf14b:tools
 GH_SUBDIR=	Cutegram/asemantools:tools
 
-USES=		qmake:outsource desktop-file-utils ssl
-USE_QT5=	qmake_build buildtools_build core qml quick sql xml multimedia \
+USES=		qmake:outsource desktop-file-utils qt:5 ssl
+USE_QT=		qmake_build buildtools_build core qml quick sql xml multimedia \
 		widgets dbus webkit quickcontrols graphicaleffects sql-sqlite3
 QMAKE_ARGS=	LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \
 		TELEGRAMQML_INCLUDE_PATH="${LOCALBASE}/include/telegramqml"
diff --git a/net-im/diligent/Makefile b/net-im/diligent/Makefile
index 0a0aae030598..2ae3d921976c 100644
--- a/net-im/diligent/Makefile
+++ b/net-im/diligent/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Unofficial Qt Slack client
 LICENSE=	LGPL3
 
 USE_LDCONFIG=	yes
-USE_QT5=	core gui linguist network svg \
+USE_QT=		core gui linguist network svg \
 		webkit widgets x11extras buildtools_build
 USE_GL=		gl
-USES=		compiler:c++11-lang qmake
+USES=		compiler:c++11-lang qmake qt:5
 
 QMAKE_ARGS=	CONFIG+="configure"
 
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index 792eb14c662c..1c0ce254517e 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -56,8 +56,9 @@ KAB_IMPLIES=	KDE
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB}
+USES+=		qt:4
 USE_KDE=	kdelibs
-USE_QT4=	corelib
+USE_QT=		corelib
 CONFIGURE_ARGS+=--enable-kde
 #CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE_PREFIX}/include -I${QT_INCDIR} \
 #	-I${LOCALBASE}/include" KDE_LIBS="-L${KDE_PREFIX}/lib"
diff --git a/net-im/gitterdone/Makefile b/net-im/gitterdone/Makefile
index 2686a1b04432..db285a6dbe13 100644
--- a/net-im/gitterdone/Makefile
+++ b/net-im/gitterdone/Makefile
@@ -14,8 +14,8 @@ MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-USES=		qmake shebangfix tar:xz
-USE_QT5=	core gui network linguist_build \
+USES=		qmake qt:5 shebangfix tar:xz
+USE_QT=		core gui network linguist_build \
 		buildtools_build widgets webkit svg
 USE_GL+=	gl
 
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index 492886722b13..071fe970d49f 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lyricat
 GH_PROJECT=	Hotot
 
-USES=		cmake gettext kde:4 python:2.7
+USES=		cmake gettext kde:4 python:2.7 qt:4
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
@@ -38,7 +38,7 @@ PLIST_SUB+=	GTK2="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MKDE4}
-USE_QT4=	moc_build qmake_build rcc_build uic_build \
+USE_QT=		moc_build qmake_build rcc_build uic_build \
 		corelib gui sql webkit
 PLIST_SUB+=	QT4=""
 .else
diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile
index 01b146d19e7b..d5cbfbdc9ae4 100644
--- a/net-im/kaccounts-integration/Makefile
+++ b/net-im/kaccounts-integration/Makefile
@@ -14,11 +14,11 @@ LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib \
 		libkeyring-kwallet.so:sysutils/signon-kwallet-extension
 RUN_DEPENDS=	signon-ui:sysutils/signon-ui
 
-USES=		cmake:outsource gettext pkgconfig kde:5 tar:xz
+USES=		cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons dbusaddons ecm \
 		i18n iconthemes kcmutils kio service wallet widgetsaddons \
 		akonadi
-USE_QT5=	dbus core gui network qml widgets xml \
+USE_QT=		dbus core gui network qml widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/kaccounts-providers/Makefile b/net-im/kaccounts-providers/Makefile
index 2e8b9a216132..6b423a4e34ec 100644
--- a/net-im/kaccounts-providers/Makefile
+++ b/net-im/kaccounts-providers/Makefile
@@ -12,10 +12,10 @@ LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib \
 		libaccounts-qt5.so:net-im/libaccounts-qt5 \
 		libsignon-qt5.so:sysutils/signon-qt5
 
-USES=		cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES=		cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
 USE_GNOME=	intltool
 USE_KDE=	config coreaddons i18n kdeclarative kio package service
-USE_QT5=	core gui network qml xml \
+USE_QT=		core gui network qml xml \
 		buildtools_build qmake_build
 
 #install to ${LOCALBASE}:
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index f5b48d20821d..99c58a06ffd4 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	MSN Messenger client for KDE
 LIB_DEPENDS=	libqca.so:devel/qca@qt4 \
 		libgif.so:graphics/giflib
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	kdelibs libkonq automoc4
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USE_QT=		qmake_build moc_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index 8ec901456aa1..59684e5b4458 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -18,12 +18,12 @@ LIB_DEPENDS=	libidn.so:dns/libidn \
 		libjasper.so:graphics/jasper
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
-USES=		cmake:outsource jpeg kde:4 pkgconfig shebangfix sqlite tar:xz \
+USES=		cmake:outsource jpeg kde:4 pkgconfig qt:4 shebangfix sqlite tar:xz \
 		webplugin:native
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	kdelibs pimlibs \
 		automoc4 qimageblitz
-USE_QT4=	corelib gui network qt3support sql xml \
+USE_QT=		corelib gui network qt3support sql xml \
 		moc_build qmake_build rcc_build uic_build uic3_build
 USE_XORG=	x11 xdamage xext xscrnsaver xtst
 USE_LDCONFIG=	yes
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index af654fa800b9..b8b9a82bfa12 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=    libidn.so:dns/libidn \
 		libqca-qt5.so:devel/qca@qt5 \
 		libv4l2.so:multimedia/libv4l
 
-USES=		cmake:outsource jpeg kde:5 shebangfix tar:xz
+USES=		cmake:outsource jpeg kde:5 qt:5 shebangfix tar:xz
 USE_GNOME=	libxml2 libxslt
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons dnssd ecm emoticons guiaddons i18n \
@@ -25,7 +25,7 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		windowsystem xmlgui
 # KDE PIM components
 USE_KDE+=	contacts identitymanagement libkleo pimtextedit
-USE_QT5=        core dbus gui network phonon4 printsupport sql widgets xml \
+USE_QT=	        core dbus gui network phonon4 printsupport sql widgets xml \
 		buildtools_build qmake_build
 
 # See #228640: temporary work around to fix the build on Current with ld being lld.
diff --git a/net-im/ktp-accounts-kcm-kde4/Makefile b/net-im/ktp-accounts-kcm-kde4/Makefile
index a4bc100be5d3..b7a68b322bac 100644
--- a/net-im/ktp-accounts-kcm-kde4/Makefile
+++ b/net-im/ktp-accounts-kcm-kde4/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	HAZE IRC JABBER SALUT
diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile
index 4d2c71957ae1..c710ee9abc62 100644
--- a/net-im/ktp-accounts-kcm/Makefile
+++ b/net-im/ktp-accounts-kcm/Makefile
@@ -18,12 +18,12 @@ LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt5 \
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list  \
 		${QT_PLUGINDIR}/kaccounts/ui/owncloud_plugin_kaccounts.so:net-im/kaccounts-providers
 
-USES=		cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES=		cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
 USE_GNOME=	intltool
 USE_KDE=	auth codecs config configwidgets coreaddons ecm i18n \
 		iconthemes itemviews kcmutils kio notifications notifyconfig \
 		service texteditor wallet widgetsaddons windowsystem
-USE_QT5=	core dbus gui network qml sql widgets xml \
+USE_QT=		core dbus gui network qml sql widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net-im/ktp-approver-kde4/Makefile b/net-im/ktp-approver-kde4/Makefile
index 2d016c168bab..8214249e8a61 100644
--- a/net-im/ktp-approver-kde4/Makefile
+++ b/net-im/ktp-approver-kde4/Makefile
@@ -14,8 +14,8 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile
index 3484874183e1..f2aa6a6a371a 100644
--- a/net-im/ktp-approver/Makefile
+++ b/net-im/ktp-approver/Makefile
@@ -11,9 +11,9 @@ LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm dbusaddons service i18n notifications
-USE_QT5=	core  dbus gui network widgets xml \
+USE_QT=		core  dbus gui network widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-auth-handler-kde4/Makefile b/net-im/ktp-auth-handler-kde4/Makefile
index 92758b800edc..03a30988ff7d 100644
--- a/net-im/ktp-auth-handler-kde4/Makefile
+++ b/net-im/ktp-auth-handler-kde4/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS=	libqjson.so:devel/qjson \
 		libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib dbus gui xml webkit \
+USE_QT=		corelib dbus gui xml webkit \
 		moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile
index 454fc178c249..530106515197 100644
--- a/net-im/ktp-auth-handler/Makefile
+++ b/net-im/ktp-auth-handler/Makefile
@@ -14,10 +14,10 @@ LIB_DEPENDS=	libqca-qt5.so:devel/qca@qt5 \
 		libkaccounts.so:net-im/kaccounts-integration \
 		libsignon-qt5.so:sysutils/signon-qt5
 
-USES=		cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES=		cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	completion config coreaddons ecm i18n jobwidgets kdewebkit \
 		kio wallet service widgetsaddons
-USE_QT5=	core dbus gui network webkit widgets xml \
+USE_QT=		core dbus gui network webkit widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-call-ui/Makefile b/net-im/ktp-call-ui/Makefile
index 3f068bc14fe5..259fa9ec9848 100644
--- a/net-im/ktp-call-ui/Makefile
+++ b/net-im/ktp-call-ui/Makefile
@@ -16,12 +16,12 @@ LIB_DEPENDS=	libKTpCommonInternals.so:net-im/ktp-common-internals \
 		libtelepathy-qt5-farstream.so:net-im/telepathy-qt5
 
 USES=		cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \
-		python:2.7 tar:xz
+		python:2.7 qt:5 tar:xz
 USE_GNOME=	glib20
 USE_KDE=	auth codecs config configwidgets coreaddons ecm iconthemes \
 		i18n kcmutils kdeclarative notifications package service \
 		wallet widgetsaddons xmlgui
-USE_QT5=	core dbus gui network qml quick widgets xml \
+USE_QT=		core dbus gui network qml quick widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net-im/ktp-common-internals-kde4/Makefile b/net-im/ktp-common-internals-kde4/Makefile
index e0ad6001ef16..538b9debdb3d 100644
--- a/net-im/ktp-common-internals-kde4/Makefile
+++ b/net-im/ktp-common-internals-kde4/Makefile
@@ -14,9 +14,9 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4
 RUN_DEPENDS=	${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control
 
-USES=		cmake compiler:c++11-lang gettext kde:4 tar:bzip2
+USES=		cmake compiler:c++11-lang gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs pimlibs automoc4
-USE_QT4=	declarative script \
+USE_QT=		declarative script \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index 06bec6420843..60644a228215 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -17,13 +17,13 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 RUN_DEPENDS=	${LOCALBASE}/lib/mission-control-plugins.0/mcp-account-manager-accounts-sso.so:net-im/telepathy-accounts-signon \
 		${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control
 
-USES=		cmake:outsource gettext pkgconfig kde:5 tar:xz
+USES=		cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons ecm i18n iconthemes itemviews jobwidgets kcmutils \
 		kio notifications notifyconfig parts people service solid \
 		sonnet texteditor textwidgets wallet widgetsaddons windowsystem \
 		xmlgui
-USE_QT5=	core dbus gui network qml sql widgets xml \
+USE_QT=		core dbus gui network qml sql widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net-im/ktp-contact-list-kde4/Makefile b/net-im/ktp-contact-list-kde4/Makefile
index 1a3d2265dea5..034d96ec9eaa 100644
--- a/net-im/ktp-contact-list-kde4/Makefile
+++ b/net-im/ktp-contact-list-kde4/Makefile
@@ -14,8 +14,8 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile
index 88c74df10623..ad30cd9300d6 100644
--- a/net-im/ktp-contact-list/Makefile
+++ b/net-im/ktp-contact-list/Makefile
@@ -11,12 +11,12 @@ LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 		libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
-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 \
 		dbusaddons ecm i18n iconthemes jobwidgets kcmutils kio \
 		notifications notifyconfig people service wallet widgetsaddons \
 		windowsystem xmlgui
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-contact-runner-kde4/Makefile b/net-im/ktp-contact-runner-kde4/Makefile
index ed7084f66f0a..3754ab957b51 100644
--- a/net-im/ktp-contact-runner-kde4/Makefile
+++ b/net-im/ktp-contact-runner-kde4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	KRunner integration module for KDE Telepathy
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile
index 9c4e23fb0a08..ab3afb7859ec 100644
--- a/net-im/ktp-contact-runner/Makefile
+++ b/net-im/ktp-contact-runner/Makefile
@@ -10,10 +10,10 @@ COMMENT=	KRunner integration module for KDE Telepathy
 LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n package plasma-framework runner \
 		service wallet
-USE_QT5=	core dbus gui network widgets xml\
+USE_QT=		core dbus gui network widgets xml\
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-desktop-applets-kde4/Makefile b/net-im/ktp-desktop-applets-kde4/Makefile
index ae23875788bb..9fb39f52f1f0 100644
--- a/net-im/ktp-desktop-applets-kde4/Makefile
+++ b/net-im/ktp-desktop-applets-kde4/Makefile
@@ -12,8 +12,8 @@ COMMENT=	KDE instant messaging plasma widgets
 
 LIB_DEPENDS=	libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile
index 1b7e0a84cb93..9794bdfd8dcc 100644
--- a/net-im/ktp-desktop-applets/Makefile
+++ b/net-im/ktp-desktop-applets/Makefile
@@ -9,9 +9,9 @@ COMMENT=	KDE instant messaging plasma widgets
 
 LIB_DEPENDS=	libKTpCommonInternals.so:net-im/ktp-common-internals
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm plasma-framework windowsystem
-USE_QT5=	core dbus gui network qml widgets \
+USE_QT=		core dbus gui network qml widgets \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-filetransfer-handler-kde4/Makefile b/net-im/ktp-filetransfer-handler-kde4/Makefile
index 70b0942f3b81..4a8e409ab199 100644
--- a/net-im/ktp-filetransfer-handler-kde4/Makefile
+++ b/net-im/ktp-filetransfer-handler-kde4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	KDE instant messaging file transfer handler
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile
index cc72359245a2..507df8f28dc4 100644
--- a/net-im/ktp-filetransfer-handler/Makefile
+++ b/net-im/ktp-filetransfer-handler/Makefile
@@ -10,11 +10,11 @@ COMMENT=	KDE instant messaging file transfer handler
 LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons ecm i18n itemviews jobwidgets kio service solid \
 		wallet widgetsaddons xmlgui
-USE_QT5=	core dbus gui network xml widgets \
+USE_QT=		core dbus gui network xml widgets \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-kded-integration-module-kde4/Makefile b/net-im/ktp-kded-integration-module-kde4/Makefile
index 36fc6ced253d..d3703baac81e 100644
--- a/net-im/ktp-kded-integration-module-kde4/Makefile
+++ b/net-im/ktp-kded-integration-module-kde4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Module for integration of instant messaging into KDE Workspaces
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-kded-module/Makefile b/net-im/ktp-kded-module/Makefile
index 5a724e294202..9614ef704e3e 100644
--- a/net-im/ktp-kded-module/Makefile
+++ b/net-im/ktp-kded-module/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Module for integration of instant messaging into KDE Workspaces
 LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	activities auth codecs completion config configwidgets coreaddons \
 		dbusaddons i18n idletime jobwidgets kcmutils kio notifications \
 		service wallet widgetsaddons
-USE_QT5=	concurrent core dbus gui network sql widgets xml \
+USE_QT=		concurrent core dbus gui network sql widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-send-file-kde4/Makefile b/net-im/ktp-send-file-kde4/Makefile
index 1d1dd55ab1fb..a3d54873e306 100644
--- a/net-im/ktp-send-file-kde4/Makefile
+++ b/net-im/ktp-send-file-kde4/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler-kde4 \
 		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile
index 1060889a438d..cab72ca872ff 100644
--- a/net-im/ktp-send-file/Makefile
+++ b/net-im/ktp-send-file/Makefile
@@ -12,11 +12,11 @@ LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 RUN_DEPENDS=	${KDE_PREFIX}/lib/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
 		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-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 ecm \
 		i18n iconthemes jobwidgets kcmutils kio service wallet \
 		widgetsaddons
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net-im/ktp-text-ui-kde4/Makefile b/net-im/ktp-text-ui-kde4/Makefile
index 381359d0b896..a892b0989bc1 100644
--- a/net-im/ktp-text-ui-kde4/Makefile
+++ b/net-im/ktp-text-ui-kde4/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
-USES=		cmake compiler:c++11-lang gettext kde:4 tar:bzip2
+USES=		cmake compiler:c++11-lang gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	automoc4
-USE_QT4=	corelib webkit xml \
+USE_QT=		corelib webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index 78bdf248be0e..f169825ef22e 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -12,13 +12,13 @@ LIB_DEPENDS=	libtelepathy-qt5.so:net-im/telepathy-qt5 \
 		libKTpCommonInternals.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-USES=		cmake:outsource compiler:c++11-lang gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
 		dbusaddons ecm emoticons i18n iconthemes itemviews jobwidgets \
 		kcmutils kdewebkit kio notifications notifyconfig people \
 		service sonnet textwidgets wallet widgetsaddons windowsystem \
 		xmlgui
-USE_QT5=	core dbus gui location network qml quick speech webchannel \
+USE_QT=		core dbus gui location network qml quick speech webchannel \
 		webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/net-im/libaccounts-qt5/Makefile b/net-im/libaccounts-qt5/Makefile
index a9e65d9c7cf7..cb95d26be51d 100644
--- a/net-im/libaccounts-qt5/Makefile
+++ b/net-im/libaccounts-qt5/Makefile
@@ -20,8 +20,8 @@ BUILD_DEPENDS=	doxygen:devel/doxygen
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
-USES=		compiler:c++11-lib qmake pathfix pkgconfig python tar:bz2
-USE_QT5=	buildtools_build core qmake_build testlib xml
+USES=		compiler:c++11-lib qmake pathfix pkgconfig python qt:5 tar:bz2
+USE_QT=		buildtools_build core qmake_build testlib xml
 
 pre-configure:
 	${REINPLACE_CMD} -e 's,$$$${INSTALL_LIBDIR},${LOCALBASE}/libdata,' \
diff --git a/net-im/libjreen/Makefile b/net-im/libjreen/Makefile
index 5fa62fc855ae..78d9f56e34cf 100644
--- a/net-im/libjreen/Makefile
+++ b/net-im/libjreen/Makefile
@@ -21,9 +21,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-USE_QT4=	moc_build qmake_build rcc_build network
+USE_QT=		moc_build qmake_build rcc_build network
 
-USES=		cmake pkgconfig:build
+USES=		cmake pkgconfig:build qt:4
 
 pre-configure:
 	${REINPLACE_CMD} -e 's,lib.*/pkgconfig,libdata/pkgconfig,' \
diff --git a/net-im/libqtelegram-ae/Makefile b/net-im/libqtelegram-ae/Makefile
index bf81d8e8fc00..bb23674fb75e 100644
--- a/net-im/libqtelegram-ae/Makefile
+++ b/net-im/libqtelegram-ae/Makefile
@@ -18,8 +18,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Aseman-Land
 GH_PROJECT=	libqtelegram-aseman-edition
 
-USES=		qmake:outsource ssl
-USE_QT5=	qmake_build buildtools_build core gui network multimedia
+USES=		qmake:outsource qt:5 ssl
+USE_QT=		qmake_build buildtools_build core gui network multimedia
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 33b7baa75420..7d015ce1050b 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/lib/licq/protocol_icq.so:${LICQ_PORT}-icq
 
 USE_XORG=	x11 xext ice xscrnsaver sm
-USES=		cmake
-USE_QT4=	qmake_build moc_build rcc_build uic_build linguisttools_build \
+USES=		cmake qt:4
+USE_QT=		qmake_build moc_build rcc_build uic_build linguisttools_build \
 		corelib xml gui network dbus svg
 
 OPTIONS_DEFINE=	HUNSPELL KDE4
diff --git a/net-im/plasma-applet-ktp-kde4/Makefile b/net-im/plasma-applet-ktp-kde4/Makefile
index 22d7ad0b8b95..c8d927ca3f6a 100644
--- a/net-im/plasma-applet-ktp-kde4/Makefile
+++ b/net-im/plasma-applet-ktp-kde4/Makefile
@@ -15,9 +15,9 @@ COMMENT=	KDE instant messaging Plasma applets
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
-USES=		cmake gettext kde:4 tar:bzip2
+USES=		cmake gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib declarative \
+USE_QT=		corelib declarative \
 		moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 88a92ec747f0..5d6191e14774 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -15,13 +15,13 @@ LIB_DEPENDS=	libidn.so:dns/libidn \
 		libminizip.so:archivers/minizip \
 		libqca-qt5.so:devel/qca@qt5
 
-USES=		cmake desktop-file-utils pkgconfig tar:xz
+USES=		cmake desktop-file-utils pkgconfig qt:5 tar:xz
 
 CMAKE_ARGS=	-DIDN_LIBRARY=${LOCALBASE}/lib/libidn.so \
 		-DIDN_INCLUDE_DIR=${LOCALBASE}/include \
 		-DUSE_WEBENGINE:BOOL=FALSE
 
-USE_QT5=	concurrent core dbus gui multimedia network svg webkit widgets \
+USE_QT=		concurrent core dbus gui multimedia network svg webkit widgets \
 		x11extras xml \
 		buildtools_build qmake_build imageformats_run
 USE_XORG=	ice sm x11 xcb xext xscrnsaver
diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile
index 4ab4de90d15b..6b6c2a7dbfb3 100644
--- a/net-im/psimedia/Makefile
+++ b/net-im/psimedia/Makefile
@@ -12,12 +12,11 @@ COMMENT=	Voice and video API for Psi-like IM clients
 LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
 		libspeexdsp.so:audio/speexdsp
 
-USES=		pkgconfig tar:bzip2
+USES=		pkgconfig qmake:no_env qt:4 tar:bzip2
 HAS_CONFIGURE=	yes
-USE_QT4=	gui qmake_build moc_build uic_build
+USE_QT=		gui qmake_build moc_build uic_build
 USE_GSTREAMER=	jpeg speex theora vorbis
 
-QT_NONSTANDARD=	yes
 CONFIGURE_ARGS=	--qtdir=${LOCALBASE} \
 		--verbose
 DESTDIRNAME=	INSTALL_ROOT
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index cfdb9e8f26e5..e6002678e82a 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -28,10 +28,10 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libtoxcore.so:net-im/tox \
 		libvpx.so:multimedia/libvpx
 
-USES=		cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig
+USES=		cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig qt:5
 USE_GITHUB=	yes
 USE_GNOME=	gtk20 gdkpixbuf2 cairo
-USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg \
+USE_QT=		core gui network xml opengl sql sql-sqlite3_run widgets svg \
 		concurrent_build buildtools_build linguisttools_build qmake_build testlib_build
 CMAKE_ARGS=	-DGIT_DESCRIBE:STRING=${FULLVERSION}
 CMAKE_OFF=	USE_CCACHE
diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile
index ca77e6e795dc..de2d18bcd3ed 100644
--- a/net-im/qxmpp/Makefile
+++ b/net-im/qxmpp/Makefile
@@ -16,10 +16,12 @@ CONFLICTS?=	${PORTNAME}-qt5-[0-9]*
 
 USES=		qmake pathfix pkgconfig libtool
 .if defined(QXMPP_SLAVE)
-USE_QT5=	core gui network xml buildtools_build
+USES+=		qt:5
+USE_QT=		core gui network xml buildtools_build
 PLIST_SUB=	QDNS="@comment "
 .else
-USE_QT4=	corelib gui network qtestlib xml uic_build moc_build \
+USES+=		qt:4
+USE_QT=		corelib gui network qtestlib xml uic_build moc_build \
 		rcc_build
 PLIST_SUB=	QDNS=""
 .endif
diff --git a/net-im/ramblercontacts/Makefile b/net-im/ramblercontacts/Makefile
index 7652693f840f..f4d80945aee1 100644
--- a/net-im/ramblercontacts/Makefile
+++ b/net-im/ramblercontacts/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Free, multi-service communication client from Rambler
 
 LICENSE=	GPLv3
 
-USES=		qmake dos2unix
+USES=		qmake dos2unix qt:4
 DOS2UNIX_FILES=	src/config.inc
 USE_XORG=	xscrnsaver
-USE_QT4=	moc_build rcc_build uic_build designer_build \
+USE_QT=		moc_build rcc_build uic_build designer_build \
 		webkit
 USE_LDCONFIG=	yes
 
diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
index 28f51d07a9d7..a6f32fc31c1b 100644
--- a/net-im/ricochet/Makefile
+++ b/net-im/ricochet/Makefile
@@ -17,10 +17,10 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
-USES=		compiler:c++11-lib gmake pkgconfig qmake ssl
+USES=		compiler:c++11-lib gmake pkgconfig qmake qt:5 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	ricochet-im
-USE_QT5=	core gui multimedia network qml quick quickcontrols widgets \
+USE_QT=		core gui multimedia network qml quick quickcontrols widgets \
 		buildtools_build linguisttools_build
 USE_GL=		gl
 QMAKE_ARGS+=	DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}
diff --git a/net-im/teamwords/Makefile b/net-im/teamwords/Makefile
index d4459750ab0c..b440e557da05 100644
--- a/net-im/teamwords/Makefile
+++ b/net-im/teamwords/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Unofficial Qt Slack client
 
 LICENSE=	LGPL3
 
-USES=		compiler:c++11-lang qmake
+USES=		compiler:c++11-lang qmake qt:5
 USE_LDCONFIG=	yes
-USE_QT5=	core gui widgets network svg linguist \
+USE_QT=		core gui widgets network svg linguist \
 		webkit buildtools x11extras
 USE_GL=		gl
 
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 3c438124be35..934a3d07903a 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libopenal.so:audio/openal-soft \
 		libopus.so:audio/opus
 
-USES=		cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build ssl
+USES=		cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build qt:5 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
@@ -33,7 +33,7 @@ GH_TUPLE=	catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \
 		telegramdesktop:libtgvoip:6e0e102:libtgvoip/Telegram/ThirdParty/libtgvoip \
 		telegramdesktop:crl:344cbde9:crl/Telegram/ThirdParty/crl
 USE_GNOME=	glib20 gtk30
-USE_QT5=	core gui imageformats network widgets buildtools_build qmake_build dbus
+USE_QT=		core gui imageformats network widgets buildtools_build qmake_build dbus
 USE_XORG=	x11 xcb
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/out/Release
diff --git a/net-im/telegramqml/Makefile b/net-im/telegramqml/Makefile
index 8501d9f1c7d2..19cfe0a592cd 100644
--- a/net-im/telegramqml/Makefile
+++ b/net-im/telegramqml/Makefile
@@ -19,8 +19,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Aseman-Land
 GH_PROJECT=	TelegramQML
 
-USES=		qmake:outsource ssl
-USE_QT5=	qmake_build buildtools_build core qml quick sql xml multimedia
+USES=		qmake:outsource qt:5 ssl
+USE_QT=		qmake_build buildtools_build core qml quick sql xml multimedia
 USE_LDCONFIG=	yes
 QMAKE_ARGS=	BUILD_MODE+=lib \
 		LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae"
diff --git a/net-im/telepathy-accounts-signon/Makefile b/net-im/telepathy-accounts-signon/Makefile
index 27dcdbbc8ca4..01a00da0bed9 100644
--- a/net-im/telepathy-accounts-signon/Makefile
+++ b/net-im/telepathy-accounts-signon/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib \
 		libmission-control-plugins.so:net-im/telepathy-mission-control \
 		libsignon-glib.so:net-im/libsignon-glib
 
-USES=		gettext pkgconfig qmake tar:bz2
-USE_QT5=	buildtools_build core qmake_build
+USES=		gettext pkgconfig qmake qt:5 tar:bz2
+USE_QT=		buildtools_build core qmake_build
 
 USE_LDCONFIG=	YES
 
diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile
index 081419dc4494..5495d805778c 100644
--- a/net-im/telepathy-logger-qt4/Makefile
+++ b/net-im/telepathy-logger-qt4/Makefile
@@ -17,11 +17,11 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libtelepathy-logger.so:net-im/telepathy-logger \
 		libtelepathy-qt4.so:net-im/telepathy-qt4
 
-USES=		bison:build cmake kde:4 pkgconfig python:2.7,build tar:bzip2
+USES=		bison:build cmake kde:4 pkgconfig python:2.7,build qt:4 tar:bzip2
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER=	qt4
 USE_KDE=	# empty
-USE_QT4=	corelib dbus moc_build qmake_build rcc_build uic_build
+USE_QT=		corelib dbus moc_build qmake_build rcc_build uic_build
 CMAKE_ARGS=	-DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR:BOOL=True
 USE_LDCONFIG=	yes
 
diff --git a/net-im/telepathy-logger-qt5/Makefile b/net-im/telepathy-logger-qt5/Makefile
index 42612391686b..dd52122f16f8 100644
--- a/net-im/telepathy-logger-qt5/Makefile
+++ b/net-im/telepathy-logger-qt5/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libtelepathy-logger.so:net-im/telepathy-logger \
 		libtelepathy-qt5.so:net-im/telepathy-qt5
 
-USES=		bison:build cmake:outsource kde:5 pkgconfig python:2.7,build tar:xz
+USES=		bison:build cmake:outsource kde:5 pkgconfig python:2.7,build qt:5 tar:xz
 USE_GNOME=	glib20 libxml2
 USE_KDE=	ecm
-USE_QT5=	core buildtools_build dbus network qmake_build xml
+USE_QT=		core buildtools_build dbus network qmake_build xml
 CMAKE_ARGS=	-DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR:BOOL=True
 USE_LDCONFIG=	yes
 
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 84e4a2657364..4141c0767455 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -30,11 +30,13 @@ CMAKE_ARGS=	-DENABLE_EXAMPLES:BOOL=False \
 		-DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \
 		-DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE}
 . if ${PKGNAMESUFFIX:M4}
-USE_QT4=	corelib dbus gui network qtestlib_build xml \
+USES+=		qt:4
+USE_QT=		corelib dbus gui network qtestlib_build xml \
 		moc_build qmake_build rcc_build uic_build
 SHLIB_SUFFIX=	2
 . else
-USE_QT5=	core dbus gui network xml \
+USES+=		qt:5
+USE_QT=		core dbus gui network xml \
 		buildtools_build qmake_build testlib_build widgets_build
 SHLIB_SUFFIX=	0
 . endif
diff --git a/net-im/vacuum-im/Makefile b/net-im/vacuum-im/Makefile
index 4c19101c0f02..6c7e78f36c16 100644
--- a/net-im/vacuum-im/Makefile
+++ b/net-im/vacuum-im/Makefile
@@ -16,10 +16,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Vacuum-IM
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 
-USES=		cmake
+USES=		cmake qt:4
 USE_XORG=	xscrnsaver
 USE_LDCONFIG=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT=		gui xml qmake_build uic_build moc_build rcc_build \
 		network linguist_build webkit
 
 PORTDOCS=	AUTHORS CHANGELOG COPYING README TRANSLATORS