74 files changed, 152 insertions, 150 deletions

diff --git a/net/akonadi-calendar/Makefile b/net/akonadi-calendar/Makefile
index dc358f1cb314..c5959f3c57b2 100644
--- a/net/akonadi-calendar/Makefile
+++ b/net/akonadi-calendar/Makefile
@@ -9,14 +9,14 @@ COMMENT=	Akonadi Calendar Integration
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
 		dbusaddons ecm kdelibs4support i18n iconthemes itemmodels \
 		jobwidgets kio service wallet widgetsaddons xmlgui
 # pim components
 USE_KDE+=	akonadi akonadicontacts akonadimime calendarcore calendarutils \
 		contacts identitymanagement mailtransport mime pimtextedit
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/akonadi-contacts/Makefile b/net/akonadi-contacts/Makefile
index 232782d53096..d7981227a04a 100644
--- a/net/akonadi-contacts/Makefile
+++ b/net/akonadi-contacts/Makefile
@@ -9,13 +9,13 @@ COMMENT=	Libraries and daemons to implement Contact Management in Akonadi
 LICENSE=	LGPL21
 
 USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
-		tar:xz
+		qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
 		dbusaddons ecm i18n iconthemes itemmodels jobwidgets kio \
 		prison service sonnet textwidgets widgetsaddons xmlgui
 # pim components
 USE_KDE+=	akonadi akonadimime calendarcore contacts mime
-USE_QT5=	dbus core gui network testlib webengine widgets xml \
+USE_QT=		dbus core gui network testlib webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/akonadi-mime/Makefile b/net/akonadi-mime/Makefile
index c31357d85321..15c2e4bd8857 100644
--- a/net/akonadi-mime/Makefile
+++ b/net/akonadi-mime/Makefile
@@ -9,12 +9,12 @@ COMMENT=	Libraries and daemons to implement basic email handling
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons dbusaddons ecm \
 		i18n itemmodels kio service widgetsaddons xmlgui
 # pim components
 USE_KDE+=	akonadi mime
-USE_QT5=	core dbus gui widgets xml \
+USE_QT=		core dbus gui widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/akonadi-notes/Makefile b/net/akonadi-notes/Makefile
index 9b312b377146..2bf251549fbb 100644
--- a/net/akonadi-notes/Makefile
+++ b/net/akonadi-notes/Makefile
@@ -9,11 +9,11 @@ COMMENT=	KDE library for accessing mail storages in MBox format
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm i18n
 # pim components
 USE_KDE+=	akonadi mime
-USE_QT5=	core xml \
+USE_QT=		core xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/akonadi-search/Makefile b/net/akonadi-search/Makefile
index 20d7291e142a..9a1d9b87ee9c 100644
--- a/net/akonadi-search/Makefile
+++ b/net/akonadi-search/Makefile
@@ -11,13 +11,13 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
 		crash ecm i18n itemmodels kcmutils package plasma-framework \
 		runner service widgetsaddons
 # pim components
 USE_KDE+=	akonadi akonadimime calendarcore contacts  mime
-USE_QT5=	core dbus gui widgets xml \
+USE_QT=		core dbus gui widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index fadb53c1305f..94ae753f6493 100644
--- a/net/avahi-qt4/Makefile
+++ b/net/avahi-qt4/Makefile
@@ -17,7 +17,8 @@ DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	qt4
-USE_QT4=	corelib moc_build
+USES=	qt:4
+USE_QT=		corelib moc_build
 AVAHI_PKGCONFIG=	avahi-qt4.pc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile
index a907fc46f641..fa9ac7aff683 100644
--- a/net/cagibi/Makefile
+++ b/net/cagibi/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	KDE/stable/${PORTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE SSDP/uPNP proxy
 
-USES=		cmake kde:4 tar:bzip2
+USES=		cmake kde:4 qt:4 tar:bzip2
 USE_KDE=	automoc4
-USE_QT4=	corelib network xml dbus \
+USE_QT=		corelib network xml dbus \
 		qmake_build moc_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net/calendarsupport/Makefile b/net/calendarsupport/Makefile
index db7e4bf810ab..782270634769 100644
--- a/net/calendarsupport/Makefile
+++ b/net/calendarsupport/Makefile
@@ -11,14 +11,14 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 		guiaddons i18n iconthemes itemmodels jobwidgets kio service \
 		widgetsaddons
 # pim components
 USE_KDE+=	akonadi akonadicalendar calendarcore calendarutils holidays \
 		identitymanagement kdepim-apps-libs mime pimcommon pimtextedit
-USE_QT5=	core gui network printsupport testlib uitools widgets xml \
+USE_QT=		core gui network printsupport testlib uitools widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/eventviews/Makefile b/net/eventviews/Makefile
index 514d57b5f3c1..278cd3ac367f 100644
--- a/net/eventviews/Makefile
+++ b/net/eventviews/Makefile
@@ -12,14 +12,14 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libKGantt.so:graphics/kdiagram  \
 		libboost_system.so:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 		guiaddons i18n iconthemes itemmodels service widgetsaddons
 # pim components
 USE_KDE+=	akonadi akonadicalendar akonadicontacts calendarcore \
 		calendarsupport calendarutils contacts identitymanagement \
 		libkdepim mime pimtextedit
-USE_QT5=	core gui printsupport testlib uitools widgets xml \
+USE_QT=		core gui printsupport testlib uitools widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/hupnp/Makefile b/net/hupnp/Makefile
index 3754cd425ea4..ce3640b90b80 100644
--- a/net/hupnp/Makefile
+++ b/net/hupnp/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Library for building UPnP devices and control points
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/hupnp/LICENSE_LGPLv3.txt
 
-USES=		gmake qmake zip
-USE_QT4=	corelib network xml dbus gui \
+USES=		gmake qmake qt:4 zip
+USE_QT=		corelib network xml dbus gui \
 		moc_build rcc_build uic_build
 USE_CXXSTD=	gnu++98
 
diff --git a/net/incidenceeditor/Makefile b/net/incidenceeditor/Makefile
index 51a394ae8418..66e61c5d14b8 100644
--- a/net/incidenceeditor/Makefile
+++ b/net/incidenceeditor/Makefile
@@ -12,7 +12,7 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libKGantt.so:graphics/kdiagram \
 		libboost_system.so:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 		i18n iconthemes itemmodels jobwidgets kio service sonnet \
 		textwidgets wallet widgetsaddons xmlgui
@@ -20,7 +20,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 USE_KDE+=	akonadi akonadicalendar akonadicontacts akonadimime calendarcore calendarsupport calendarutils \
 		contacts eventviews identitymanagement kdepim-apps-libs ldap \
 		libkdepim mailtransport mime pimtextedit
-USE_QT5=	core dbus gui network printsupport testlib uitools webkit \
+USE_QT=		core dbus gui network printsupport testlib uitools webkit \
 		widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/net/kalarmcal/Makefile b/net/kalarmcal/Makefile
index 5227568c7086..4baec6589da9 100644
--- a/net/kalarmcal/Makefile
+++ b/net/kalarmcal/Makefile
@@ -9,7 +9,7 @@ COMMENT=	KDE API for KAlarm alarms
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons crash ecm guiaddons holidays i18n iconthemes \
 		itemmodels itemviews jobwidgets kdelibs4support kio \
@@ -18,7 +18,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
 # pim components
 USE_KDE+=	akonadi calendarcore calendarutils holidays identitymanagement \
 		pimtextedit
-USE_QT5=	core dbus gui network printsupport widgets xml \
+USE_QT=		core dbus gui network printsupport widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kblog/Makefile b/net/kblog/Makefile
index 4e3e4b8cf6e2..8c42ff33e043 100644
--- a/net/kblog/Makefile
+++ b/net/kblog/Makefile
@@ -9,11 +9,11 @@ COMMENT=	KDE API for weblogging access
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n kdelibs4support kio service xmlrpcclient
 # pim components
 USE_KDE+=	calendarcore syndication
-USE_QT5=	core gui webkit \
+USE_QT=		core gui webkit \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kcalcore/Makefile b/net/kcalcore/Makefile
index 0cf611736ce5..47ea33983bc3 100644
--- a/net/kcalcore/Makefile
+++ b/net/kcalcore/Makefile
@@ -11,9 +11,9 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libical.so:devel/libical
 
-USES=		bison cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		bison cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm emoticons init itemmodels itemviews kdelibs4support
-USE_QT5=	core gui \
+USE_QT=		core gui \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kcalutils/Makefile b/net/kcalutils/Makefile
index ddb93b5672a2..ac4db8f1b859 100644
--- a/net/kcalutils/Makefile
+++ b/net/kcalutils/Makefile
@@ -9,12 +9,12 @@ COMMENT=	KDE utility and user interface functions for accessing calendar
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
 USE_KDE=	codecs config coreaddons ecm i18n iconthemes kdelibs4support \
 		widgetsaddons
 # pim components
 USE_KDE+=	calendarcore identitymanagement pimtextedit
-USE_QT5=	core gui widgets xml \
+USE_QT=		core gui widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kcontacts/Makefile b/net/kcontacts/Makefile
index f12a445b0098..40ef792b28f7 100644
--- a/net/kcontacts/Makefile
+++ b/net/kcontacts/Makefile
@@ -9,9 +9,9 @@ COMMENT=	KDE api to manage contact information
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm codecs config coreaddons i18n
-USE_QT5=	core dbus gui \
+USE_QT=		core dbus gui \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kdav/Makefile b/net/kdav/Makefile
index 2aaa95286686..249173e00b33 100644
--- a/net/kdav/Makefile
+++ b/net/kdav/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	net kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	A DAV protocol implementation with KJobs
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n kio service
-USE_QT5=	core gui network xml xmlpatterns \
+USE_QT=		core gui network xml xmlpatterns \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kdenetwork-filesharing-kde4/Makefile b/net/kdenetwork-filesharing-kde4/Makefile
index dbf8f8d6dc3f..65911ef4d5d7 100644
--- a/net/kdenetwork-filesharing-kde4/Makefile
+++ b/net/kdenetwork-filesharing-kde4/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX=	-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Filesharing via Samba
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs 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/net/kdenetwork-filesharing/Makefile b/net/kdenetwork-filesharing/Makefile
index 87bc94331ec3..6e1d6dd2bf95 100644
--- a/net/kdenetwork-filesharing/Makefile
+++ b/net/kdenetwork-filesharing/Makefile
@@ -7,10 +7,10 @@ CATEGORIES=	net kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Filesharing via Samba
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	completion config coreaddons doctools ecm i18n jobwidgets kio \
 		service widgetsaddons
-USE_QT5=	core gui network widgets \
+USE_QT=		core gui network widgets \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net/kdenetwork-strigi-analyzers-kde4/Makefile b/net/kdenetwork-strigi-analyzers-kde4/Makefile
index 2281b1a3f847..1a2d8333828f 100644
--- a/net/kdenetwork-strigi-analyzers-kde4/Makefile
+++ b/net/kdenetwork-strigi-analyzers-kde4/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Strigi analyzers for network-related file formats
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs strigi 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/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 9179774e80bf..0bbaf9f8c24c 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	net kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Network applications (meta port)
 
-USES=		kde:5 metaport
-USE_QT5=	#
+USES=		kde:5 metaport qt:5
+USE_QT=		#
 
 OPTIONS_DEFINE=	FILESHARING KRDC KRFB
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NKOPETE}
diff --git a/net/kf5-kholidays/Makefile b/net/kf5-kholidays/Makefile
index 327e8fd403e9..79c09d5d2149 100644
--- a/net/kf5-kholidays/Makefile
+++ b/net/kf5-kholidays/Makefile
@@ -9,9 +9,9 @@ COMMENT=	KDE library for calendar holidays
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm emoticons kdelibs4support init itemmodels itemviews
-USE_QT5=	core gui qml buildtools_build qmake_build
+USE_QT=		core gui qml buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/net/kf5-kxmlrpcclient/Makefile b/net/kf5-kxmlrpcclient/Makefile
index 9eaecc2abf02..8c6192cc5d3c 100644
--- a/net/kf5-kxmlrpcclient/Makefile
+++ b/net/kf5-kxmlrpcclient/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	net kde kde-frameworks
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 interaction with XMLRPC services
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm doctools i18n kio service
-USE_QT5=	buildtools_build core gui qmake_build xml
+USE_QT=		buildtools_build core gui qmake_build xml
 
 .include <bsd.port.mk>
diff --git a/net/kget-kde4/Makefile b/net/kget-kde4/Makefile
index bd73a31592f4..e66bd92823dc 100644
--- a/net/kget-kde4/Makefile
+++ b/net/kget-kde4/Makefile
@@ -14,12 +14,12 @@ LIB_DEPENDS=	libgpgme.so:security/gpgme \
 		libqca.so:devel/qca@qt4 \
 		libboost_thread.so:devel/boost-libs
 
-USES=		cmake:outsource kde:4 shebangfix sqlite tar:xz
+USES=		cmake:outsource kde:4 qt:4 shebangfix sqlite tar:xz
 USE_KDE=	kdelibs workspace libkonq \
 		nepomuk-core nepomuk-widgets automoc4 ontologies \
 		soprano
 SHEBANG_FILES=	conf/*.pl
-USE_QT4=	gui sql moc_build qmake_build rcc_build uic_build
+USE_QT=		gui sql moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 CONFIGURE_ENV=	XDG_CONFIG_HOME=/dev/null
diff --git a/net/kget/Makefile b/net/kget/Makefile
index 0cf077ed53e9..d379d99d66d4 100644
--- a/net/kget/Makefile
+++ b/net/kget/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=    libKF5Torrent.so:net-p2p/libktorrent  \
 		libqca-qt5.so:devel/qca@qt5 \
 		libqgpgme.so:security/gpgme-qt5
 
-USES=		cmake:outsource kde:5 shebangfix sqlite tar:xz
+USES=		cmake:outsource kde:5 qt:5 shebangfix sqlite tar:xz
 
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons emoticons guiaddons i18n \
@@ -25,7 +25,7 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		kdelibs4support kio notifications notifyconfig parts service \
 		solid sonnet textwidgets unitconversion wallet widgetsaddons \
 		windowsystem xmlgui
-USE_QT5=        core dbus gui network printsupport sql widgets xml \
+USE_QT=	        core dbus gui network printsupport sql widgets xml \
 		buildtools_build qmake_build
 
 USE_LDCONFIG=	yes
diff --git a/net/kidentitymanagement/Makefile b/net/kidentitymanagement/Makefile
index 200d64a9c7bd..e7d97d4217fb 100644
--- a/net/kidentitymanagement/Makefile
+++ b/net/kidentitymanagement/Makefile
@@ -9,13 +9,13 @@ COMMENT=	KDE pim identities
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 		emoticons i18n init itemmodels itemviews jobwidgets \
 		kdelibs4support kio service widgetsaddons xmlgui
 # pim components
 USE_KDE+=	pimtextedit
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kimap/Makefile b/net/kimap/Makefile
index b38896240e0d..ec3b9090d30b 100644
--- a/net/kimap/Makefile
+++ b/net/kimap/Makefile
@@ -12,11 +12,11 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libsasl2.so:security/cyrus-sasl2
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	codecs config coreaddons ecm i18n kdelibs4support kio service
 # pim components
 USE_KDE+=	mime
-USE_QT5=	core \
+USE_QT=		core \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kio-gdrive/Makefile b/net/kio-gdrive/Makefile
index a51e95088a15..1c5839faf19a 100644
--- a/net/kio-gdrive/Makefile
+++ b/net/kio-gdrive/Makefile
@@ -17,12 +17,12 @@ LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain@qt5 \
 		libkaccounts.so:net-im/kaccounts-integration
 RUN_DEPENDS=	kaccounts-providers>=0: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=	completion config coreaddons ecm i18n jobwidgets kio \
 		notifications service widgetsaddons \
 		gapi
-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/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index 094388a41756..fdf57469fcac 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -13,9 +13,9 @@ COMMENT=	KIO slave to access UPnP MediaServers
 
 LIB_DEPENDS=	libHUpnp.so:net/hupnp
 
-USES=		cmake kde:4 tar:bzip2
+USES=		cmake kde:4 qt:4 tar:bzip2
 USE_KDE=	automoc4 kdelibs
-USE_QT4=	corelib network xml dbus gui \
+USE_QT=		corelib network xml dbus gui \
 		qmake_build moc_build rcc_build uic_build
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/.[^.]*$//}
diff --git a/net/kldap/Makefile b/net/kldap/Makefile
index 0ca25b73fe79..26d5242fe334 100644
--- a/net/kldap/Makefile
+++ b/net/kldap/Makefile
@@ -11,11 +11,11 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm completion config coreaddons i18n kio widgetsaddons service
 # pim components
 USE_KDE+=	mbox
-USE_QT5=	core gui network widgets \
+USE_QT=		core gui network widgets \
 		buildtools_build qmake_build
 USE_OPENLDAP=	yes
 USE_LDCONFIG=	yes
diff --git a/net/kmailtransport/Makefile b/net/kmailtransport/Makefile
index 5a77ecfec53c..85cc1e733c8e 100644
--- a/net/kmailtransport/Makefile
+++ b/net/kmailtransport/Makefile
@@ -11,12 +11,12 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons i18n \
 		itemmodels jobwidgets kcmutils kio service wallet widgetsaddons
 # pim components
 USE_KDE+=	akonadi akonadimime ksmtp mime
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kmbox/Makefile b/net/kmbox/Makefile
index 82c65e9260b7..2fe8ce7f3fef 100644
--- a/net/kmbox/Makefile
+++ b/net/kmbox/Makefile
@@ -9,11 +9,11 @@ COMMENT=	KDE library for accessing mail storages in MBox format
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm
 # pim components
 USE_KDE+=	mime
-USE_QT5=	core gui \
+USE_QT=		core gui \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kmime/Makefile b/net/kmime/Makefile
index fa9607e39225..351e8c4f004a 100644
--- a/net/kmime/Makefile
+++ b/net/kmime/Makefile
@@ -11,9 +11,9 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	codecs ecm emoticons i18n init itemmodels itemviews kdelibs4support
-USE_QT5=	core \
+USE_QT=		core \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index 293094e08f2b..65b7a2e457b6 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	KDE network monitor
 BROKEN_FreeBSD_11=	does not build due to access to kernel-private structure (error: member access into incomplete type 'struct in6_ifaddr')
 BROKEN_FreeBSD_12=	does not build due to access to kernel-private structure (error: member access into incomplete type 'struct in6_ifaddr')
 
-USES=		cmake gettext kde:4 shebangfix tar:xz
+USES=		cmake gettext kde:4 qt:4 shebangfix tar:xz
 SHEBANG_FILES=	src/kconf_update/*.pl
-USE_QT4=	qmake_build moc_build uic_build rcc_build
+USE_QT=		qmake_build moc_build uic_build rcc_build
 USE_KDE=	kdelibs workspace automoc4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net/kontactinterface/Makefile b/net/kontactinterface/Makefile
index 8f6a2a2e5ceb..2e15775e1102 100644
--- a/net/kontactinterface/Makefile
+++ b/net/kontactinterface/Makefile
@@ -9,12 +9,12 @@ COMMENT=	KDE glue for embedding KParts into Kontact
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 		emoticons i18n iconthemes init itemmodels itemviews jobwidgets \
 		kdelibs4support kio parts service sonnet textwidgets \
 		widgetsaddons windowsystem xmlgui
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kpimtextedit/Makefile b/net/kpimtextedit/Makefile
index 881b9f0b7e6c..a2ff974c973b 100644
--- a/net/kpimtextedit/Makefile
+++ b/net/kpimtextedit/Makefile
@@ -9,12 +9,12 @@ COMMENT=	KDE library for PIM-specific text editing utilities
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 		emoticons i18n iconthemes init itemmodels itemviews jobwidgets \
 		kdelibs4support kio service sonnet syntaxhighlighting textwidgets \
 		widgetsaddons xmlgui
-USE_QT5=	core dbus gui network speech widgets xml \
+USE_QT=		core dbus gui network speech widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/krdc-kde4/Makefile b/net/krdc-kde4/Makefile
index f3ef0f6507e0..40cb14d25bc1 100644
--- a/net/krdc-kde4/Makefile
+++ b/net/krdc-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT=	RDP and VNC client for KDE
 LIB_DEPENDS=	libvncserver.so:net/libvncserver \
 		libtelepathy-qt4.so:net-im/telepathy-qt4
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT=		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	FREERDP
diff --git a/net/krdc/Makefile b/net/krdc/Makefile
index 12fa17810bcf..c541f55d3e52 100644
--- a/net/krdc/Makefile
+++ b/net/krdc/Makefile
@@ -9,12 +9,12 @@ COMMENT=	RDP and VNC client for KDE
 
 LIB_DEPENDS=	libvncserver.so:net/libvncserver
 
-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 dnssd doctools ecm i18n iconthemes kcmutils \
 		notifications notifyconfig service wallet widgetsaddons \
 		xmlgui
-USE_QT5=	core dbus gui network widgets xml \
+USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/krfb-kde4/Makefile b/net/krfb-kde4/Makefile
index 89381e435dcb..06e37119d219 100644
--- a/net/krfb-kde4/Makefile
+++ b/net/krfb-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT=	VNC server for KDE
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4
 
-USES=		alias cmake:outsource jpeg kde:4 tar:xz
+USES=		alias cmake:outsource jpeg kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib gui network \
+USE_QT=		corelib gui network \
 		moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net/krfb/Makefile b/net/krfb/Makefile
index 5560daff8373..e1d641254ace 100644
--- a/net/krfb/Makefile
+++ b/net/krfb/Makefile
@@ -11,11 +11,11 @@ LIB_DEPENDS=	libvncserver.so:net/libvncserver \
 		libxcb-image.so:x11/xcb-util-image
 
 USES=		alias cmake:outsource compiler:c++11-lib gettext jpeg \
-		kde:5 pkgconfig tar:xz
+		kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
 		crash dbusaddons dnssd doctools ecm i18n notifications \
 		wallet widgetsaddons xmlgui
-USE_QT5=	core dbus gui network widgets x11extras xml \
+USE_QT=		core dbus gui network widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	x11 xcb xdamage xext xtst
 
diff --git a/net/ksmtp/Makefile b/net/ksmtp/Makefile
index b17cdce40476..55f670c93dd3 100644
--- a/net/ksmtp/Makefile
+++ b/net/ksmtp/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Job-based library to send email through an SMTP server
 LICENSE=	LGPL21
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons i18n kio service
 # pim components
 USE_KDE+=	mime
-USE_QT5=	core network \
+USE_QT=		core network \
 		buildtools_build qmake_build
 
 USE_LDCONFIG=	yes
diff --git a/net/ktnef/Makefile b/net/ktnef/Makefile
index 40a96519d471..1d5b25301160 100644
--- a/net/ktnef/Makefile
+++ b/net/ktnef/Makefile
@@ -9,11 +9,11 @@ COMMENT=	KDE API for the handling of TNEF data
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n kdelibs4support
 # pim components
 USE_KDE+=	calendarcore calendarutils contacts
-USE_QT5=	core gui widgets xml \
+USE_QT=		core gui widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile
index 10618456cd26..5388b16ebe8c 100644
--- a/net/kwooty/Makefile
+++ b/net/kwooty/Makefile
@@ -14,9 +14,9 @@ RUN_DEPENDS=	${LOCALBASE}/bin/unrar:archivers/unrar \
 		${LOCALBASE}/bin/par2:archivers/par2cmdline \
 		${LOCALBASE}/bin/7z:archivers/p7zip
 
-USES=		cmake gettext kde:4
+USES=		cmake gettext kde:4 qt:4
 USE_KDE=	kdelibs automoc4 workspace
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USE_QT=		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/net/libgravatar/Makefile b/net/libgravatar/Makefile
index d06ffc3c869d..b6a6fa6c99ae 100644
--- a/net/libgravatar/Makefile
+++ b/net/libgravatar/Makefile
@@ -9,12 +9,12 @@ COMMENT=	Library for gravatar support
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons ecm i18n kio \
 		service sonnet textwidgets widgetsaddons
 # pim components
 USE_KDE+=	pimcommon
-USE_QT5=	core gui network testlib widgets xml \
+USE_QT=		core gui network testlib widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile
index f9fad9998505..1805c8d253a1 100644
--- a/net/libkfbapi/Makefile
+++ b/net/libkfbapi/Makefile
@@ -14,10 +14,10 @@ LICENSE=	LGPL20
 
 LIB_DEPENDS=	libqjson.so:devel/qjson@qt4
 
-USES=		cmake:outsource gettext kde:4 tar:bzip2
+USES=		cmake:outsource gettext kde:4 qt:4 tar:bzip2
 USE_KDE=	automoc4 kdelibs pimlibs
 USE_LDCONFIG=	yes
-USE_QT4=	gui webkit \
+USE_QT=		gui webkit \
 		qmake_build moc_build rcc_build uic_build
 
 pre-configure:
diff --git a/net/libkgapi/Makefile b/net/libkgapi/Makefile
index 2314387640f9..e12f5c5797c6 100644
--- a/net/libkgapi/Makefile
+++ b/net/libkgapi/Makefile
@@ -11,7 +11,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libical.so:devel/libical
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons crash ecm emoticons guiaddons i18n iconthemes init \
 		itemmodels itemviews jobwidgets kdelibs4support kio \
@@ -19,7 +19,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		widgetsaddons windowsystem xmlgui solid sonnet
 # pim components
 USE_KDE+=	calendarcore contacts
-USE_QT5=	core dbus gui location qml network printsupport quick webchannel \
+USE_QT=		core dbus gui location qml network printsupport quick webchannel \
 		webengine widgets xml \
 		buildtools_build qmake_build
 
diff --git a/net/libksieve/Makefile b/net/libksieve/Makefile
index e8c7c2e1e1f2..970b43860c3d 100644
--- a/net/libksieve/Makefile
+++ b/net/libksieve/Makefile
@@ -12,14 +12,14 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libsasl2.so:security/cyrus-sasl2
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive attica auth codecs completion config configwidgets \
 		coreaddons ecm i18n iconthemes jobwidgets kio newstuff service \
 		sonnet syntaxhighlighting wallet widgetsaddons windowsystem xmlgui
 # pim components
 USE_KDE+=	akonadi identitymanagement libkdepim mailtransport mime \
 		pimcommon pimtextedit
-USE_QT5=	core dbus gui location network printsupport qml quick testlib \
+USE_QT=		core dbus gui location network printsupport qml quick testlib \
 		uitools webchannel webengine widgets xml \
                 buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/net/libkvkontakte-kde4/Makefile b/net/libkvkontakte-kde4/Makefile
index d044fe405c6a..4826a76fef74 100644
--- a/net/libkvkontakte-kde4/Makefile
+++ b/net/libkvkontakte-kde4/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libqjson.so:devel/qjson@qt4
 
-USES=		cmake:outsource gettext kde:4 pkgconfig tar:xz
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USES=		cmake:outsource gettext kde:4 pkgconfig qt:4 tar:xz
+USE_QT=		moc_build qmake_build rcc_build uic_build
 USE_KDE=	automoc4 kdelibs
 USE_LDCONFIG=	yes
 
diff --git a/net/libkvkontakte/Makefile b/net/libkvkontakte/Makefile
index 8eb5fe5c45ea..2f60636a85e8 100644
--- a/net/libkvkontakte/Makefile
+++ b/net/libkvkontakte/Makefile
@@ -13,9 +13,9 @@ COMMENT=	KDE library for accessing vk.com
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n kdewebkit kio service widgetsaddons
-USE_QT5=	core gui network webkit widgets \
+USE_QT=		core gui network webkit widgets \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net/libmaia/Makefile b/net/libmaia/Makefile
index 9d2f0dc2cd4f..4421f2c3d3d7 100644
--- a/net/libmaia/Makefile
+++ b/net/libmaia/Makefile
@@ -10,10 +10,10 @@ CATEGORIES=	net
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	XML-RPC lib for Qt
 
-USES=		gmake qmake
+USES=		gmake qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	wiedi
-USE_QT5=	buildtools_build network xml
+USE_QT=		buildtools_build network xml
 
 PLIST_FILES=	include/maia/maiaObject.h \
 		include/maia/maiaXmlRpcClient.h \
diff --git a/net/libmediawiki/Makefile b/net/libmediawiki/Makefile
index 2a904b5c25a0..b2db738687eb 100644
--- a/net/libmediawiki/Makefile
+++ b/net/libmediawiki/Makefile
@@ -12,9 +12,9 @@ COMMENT=	KDE library for accessing MediaWiki sites
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-USES=		cmake:outsource kde:5 tar:xz
+USES=		cmake:outsource kde:5 qt:5 tar:xz
 USE_KDE=	coreaddons ecm
-USE_QT5=	core network testlib \
+USE_QT=		core network testlib \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/net/mailcommon/Makefile b/net/mailcommon/Makefile
index e54988683d28..9770d1250165 100644
--- a/net/mailcommon/Makefile
+++ b/net/mailcommon/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpgmepp.so:security/gpgme-cpp \
 		libqgpgme.so:security/gpgme-qt5
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
 		ecm i18n iconthemes itemmodels itemviews jobwidgets kio \
 		service sonnet syntaxhighlighting textwidgets wallet \
@@ -25,7 +25,7 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
 # pim components
 USE_KDE+=	akonadi akonadicontacts akonadimime contacts identitymanagement ldap libkdepim libkleo mailimporter \
 		mailtransport messagelib mime pimcommon pimtextedit
-USE_QT5=	core dbus network xml designer gui phonon4 testlib uiplugin \
+USE_QT=		core dbus network xml designer gui phonon4 testlib uiplugin \
 		uitools webkit widgets \
                 buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/net/mailimporter/Makefile b/net/mailimporter/Makefile
index 49ee44a9fe9d..7fbd5b7985ae 100644
--- a/net/mailimporter/Makefile
+++ b/net/mailimporter/Makefile
@@ -11,11 +11,11 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive config coreaddons ecm i18n itemmodels
 # pim components
 USE_KDE+=	akonadi akonadimime libkdepim mime
-USE_QT5=	core gui testlib uitools widgets xml \
+USE_QT=		core gui testlib uitools widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
index ecc622944a72..10cae53f9900 100644
--- a/net/messagelib/Makefile
+++ b/net/messagelib/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpgmepp.so:security/gpgme-cpp \
 		libqgpgme.so:security/gpgme-qt5
 
-USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons ecm i18n iconthemes itemmodels itemviews jobwidgets \
 		kdewebkit kio service solid sonnet syntaxhighlighting \
@@ -26,7 +26,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadisearch calendarcore \
 		contacts grantleetheme gravatar identitymanagement \
 		kdepim-apps-libs ldap libkdepim libkleo mailtransport mbox \
 		mime pimcommon pimtextedit
-USE_QT5=	core dbus gui location network printsupport qml quick testlib \
+USE_QT=		core dbus gui location network printsupport qml quick testlib \
 		uitools webchannel webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/net/ostinato/Makefile b/net/ostinato/Makefile
index 185dd44841e2..1af272c7939a 100644
--- a/net/ostinato/Makefile
+++ b/net/ostinato/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
-USES=		compiler:c++11-lang qmake
-USE_QT4=	corelib gui moc_build rcc_build uic_build network script \
+USES=		compiler:c++11-lang qmake qt:4
+USE_QT=		corelib gui moc_build rcc_build uic_build network script \
 		xml
 
 PLIST_FILES=	bin/drone \
diff --git a/net/pimcommon/Makefile b/net/pimcommon/Makefile
index f2721049bb29..227ddf722d0f 100644
--- a/net/pimcommon/Makefile
+++ b/net/pimcommon/Makefile
@@ -11,7 +11,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
 USE_KDE=	archive attica auth codecs completion config configwidgets \
 		dbusaddons ecm emoticons i18n init iconthemes itemmodels \
 		jobwidgets kdelibs4support kio newstuff service sonnet textwidgets \
@@ -19,7 +19,7 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
 # pim components
 USE_KDE+=	akonadi akonadicontacts contacts imap libkdepim mime \
 		pimtextedit
-USE_QT5=	core dbus designer gui network printsupport script testlib \
+USE_QT=		core dbus designer gui network printsupport script testlib \
 		uiplugin uitools webkit widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 73d81360d510..89fccabf550f 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python bindings for the Qt4 toolkit, QtNetwork module
 CONFIGURE_ARGS=	--enable QtNetwork
 PYQT_DIST=	yes
 
-USES=		python pyqt:4
+USES=		python pyqt:4 qt:4
 USE_PYQT=	sip_build core_run
 USE_PYTHON=	flavors
-USE_QT4=	moc_build corelib network qmake_build
+USE_QT=		moc_build corelib network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index a7f53a936e2e..1218a9abb68c 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Python bindings for the Qt5 toolkit, QtNetwork module
 CONFIGURE_ARGS=	--enable QtNetwork
 PYQT_DIST=	yes
 
-USES=		python pyqt:5
+USES=		python pyqt:5 qt:5
 USE_PYQT=	sip_build core_run
 USE_PYTHON=	flavors
-USE_QT5=	core network qmake_build
+USE_QT=		core network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
diff --git a/net/qjsonrpc/Makefile b/net/qjsonrpc/Makefile
index a4ef875c4fde..f18be030b4bf 100644
--- a/net/qjsonrpc/Makefile
+++ b/net/qjsonrpc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	C++ Qt based JSON RPC2 library
 
 LICENSE=	LGPL21
 
-USES=		qmake
-USE_QT4=	moc_build network qtestlib_build rcc_build
+USES=		qmake qt:4
+USE_QT=		moc_build network qtestlib_build rcc_build
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/devonit-qjsonrpc-adefe89b0c6f
diff --git a/net/qoauth-qt5/Makefile b/net/qoauth-qt5/Makefile
index 8203a8b36697..41f4b92b7c6f 100644
--- a/net/qoauth-qt5/Makefile
+++ b/net/qoauth-qt5/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libqca-qt5.so:devel/qca@qt5
 
-USES=		qmake:outsource
+USES=		qmake:outsource qt:5
 USE_LDCONFIG=	yes
-USE_QT5=	core network testlib buildtools_build qmake_build
+USE_QT=		core network testlib buildtools_build qmake_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ayoy
diff --git a/net/qoauth/Makefile b/net/qoauth/Makefile
index 650c8ec7fffc..25b23242211b 100644
--- a/net/qoauth/Makefile
+++ b/net/qoauth/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libqca.so:devel/qca@qt4
 
-USES=		qmake:outsource
+USES=		qmake:outsource qt:4
 USE_LDCONFIG=	yes
-USE_QT4=	corelib qtestlib network moc_build
+USE_QT=		corelib qtestlib network moc_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ayoy
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index e6a0589d5d50..f23c8767edc5 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -18,9 +18,8 @@ BROKEN_SSL_REASON_openssl-devel=	error: member access into incomplete type 'RSA'
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES=		ssl
-USE_QT4=	qmake_build moc_build rcc_build corelib
-QT_DIST=	yes
+USES=		qmake:no_env qt-dist:4 ssl
+USE_QT=		moc_build rcc_build corelib
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index 4ddf24cf6b5a..be2a9547dce0 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -13,9 +13,8 @@ BROKEN_SSL_REASON_openssl-devel=	error: member access into incomplete type 'X509
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES=		ssl
-USE_QT5=	core qmake_build buildtools_build
-QT_DIST=	base
+USES=		qmake:no_env qt-dist:5,base ssl
+USE_QT=		core buildtools_build
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-no-gui -no-xcb
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
diff --git a/net/qtweetlib/Makefile b/net/qtweetlib/Makefile
index 5a32ca2f25bb..4cc876ce90a7 100644
--- a/net/qtweetlib/Makefile
+++ b/net/qtweetlib/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS=	libqjson.so:devel/qjson@qt4
 GH_ACCOUNT=	minimoog
 GH_PROJECT=	QTweetLib
 
-USES=		cmake
+USES=		cmake qt:4
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-USE_QT4=	gui moc_build network qmake_build rcc_build uic_build
+USE_QT=		gui moc_build network qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/net/quiterss/Makefile b/net/quiterss/Makefile
index fd201a7b1036..d94af9278148 100644
--- a/net/quiterss/Makefile
+++ b/net/quiterss/Makefile
@@ -22,11 +22,13 @@ OPTIONS_SINGLE=		GUI
 OPTIONS_SINGLE_GUI=	QT4 QT5
 OPTIONS_DEFAULT=	QT5
 
-QT4_USE=	QT4=moc_build,rcc_build,uic_build,linguisttools_build
-QT4_USE+=	QT4=corelib,gui,network,xml,webkit,phonon,sql,sql-sqlite3_run
+QT4_USES=	qt:4 qt:4
+QT4_USE=	QT=moc_build,rcc_build,uic_build,linguisttools_build
+QT4_USE+=	QT=corelib,gui,network,xml,webkit,phonon,sql,sql-sqlite3_run
 
-QT5_USE=	QT5=buildtools_build,linguisttools_build,core,xml,gui,widgets
-QT5_USE+=	QT5=network,multimedia,printsupport,webkit,sql,sql-sqlite3_run
+QT5_USES=	qt:5 qt:5
+QT5_USE=	QT=buildtools_build,linguisttools_build,core,xml,gui,widgets
+QT5_USE+=	QT=network,multimedia,printsupport,webkit,sql,sql-sqlite3_run
 
 post-patch-DEBUG-on:
 	@${REINPLACE_CMD} 's|debug_and_release|debug|' \
diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
index 7a171b8684ab..5532f8812a76 100644
--- a/net/rsplib/Makefile
+++ b/net/rsplib/Makefile
@@ -21,9 +21,9 @@ CONFIGURE_ARGS=	--disable-maintainer-mode \
 		--enable-qt --with-qt-lib=${QT_LIBDIR} \
 		--with-qt-include=${QT_INCDIR}
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool shebangfix
+USES=		gmake libtool qt:4 shebangfix
 SHEBANG_FILES=	rsplib/scriptingserviceexample
 USE_LDCONFIG=	yes
-USE_QT4=	gui xml moc_build
+USE_QT=		gui xml moc_build
 
 .include <bsd.port.mk>
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index f5219fd1e501..331d3a7360f6 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -13,10 +13,10 @@ COMMENT=	KDE 4.x SMB Network browser and SMB shares mounting center
 
 RUN_DEPENDS=	sudo:security/sudo
 
-USES=		cmake gettext kde:4 samba:run tar:bzip2
+USES=		cmake gettext kde:4 qt:4 samba:run tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/kde4
 USE_KDE=	kdelibs automoc4 runtime
-USE_QT4=	corelib gui network opengl script svg webkit \
+USE_QT=		corelib gui network opengl script svg webkit \
 		qmake_build moc_build rcc_build uic_build phonon
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/smb4k
 SUB_FILES=	pkg-message
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index 10d4e54bc771..7861c951e192 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libprotobuf-lite.so:devel/protobuf
 
 PORTDOCS=	README
 
-USES=		compiler:c++11-lib
+USES=		compiler:c++11-lib qt:5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-development
 
@@ -29,7 +29,7 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
-USE_QT5=	buildtools_build qmake_build core network gui widgets
+USE_QT=		buildtools_build qmake_build core network gui widgets
 USE_GL+=	gl
 USE_RC_SUBR=	${PORTNAME}
 INSTALLS_ICONS=	yes
diff --git a/net/syndication/Makefile b/net/syndication/Makefile
index 709df8b37f79..10ae4832ee73 100644
--- a/net/syndication/Makefile
+++ b/net/syndication/Makefile
@@ -9,9 +9,9 @@ COMMENT=	KDE RSS feed handling library
 
 LICENSE=	LGPL21
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	codecs config coreaddons ecm kio service
-USE_QT5=	core gui xml \
+USE_QT=		core gui xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 65f6b708d8ca..41e9496f2b11 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -86,7 +86,8 @@ KRB_NONE_DESC=		Disable Kerberos support
 
 GTK2_USE=	GNOME=gtk20,cairo
 GTK3_USE=	GNOME=gtk30,cairo
-QT5_USE=	qt5=core,gui,widgets,printsupport,buildtools_build,linguisttools_build
+QT5_USES=		qt:5
+QT5_USE=	qt=core,gui,widgets,printsupport,buildtools_build,linguisttools_build
 
 LUA_USES=		lua:5[1-2]
 KRB_BASE_USES=		gssapi
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index e98c21c5c2e1..a10ec47d95d1 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Qt-based frontend for wpa_supplicant
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-USES=		gmake
-USE_QT5=	qmake_build buildtools_build linguisttools_build core gui \
+USES=		gmake qt:5
+USE_QT=		qmake_build buildtools_build linguisttools_build core gui \
 		widgets svg_run
 
 ALL_TARGET=	wpa_gui-qt4
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index dfe976f985bb..02943919e1e9 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS=	libcups.so:print/cups \
 RUN_DEPENDS=	nxproxy:net/nxproxy \
 		x2goclient-cli:net/x2goclient-cli
 
-USES=		qmake
+USES=		qmake qt:4
 USE_XORG=	xpm
-USE_QT4=	gui network svg \
+USE_QT=		gui network svg \
 		linguisttools_build moc_build rcc_build uic_build
 QMAKE_ARGS=	QMAKE_LRELEASE="${LRELEASE}"
 
diff --git a/net/zeroconf-ioslave-kde4/Makefile b/net/zeroconf-ioslave-kde4/Makefile
index c8fa5320d9b6..197323d0b0ea 100644
--- a/net/zeroconf-ioslave-kde4/Makefile
+++ b/net/zeroconf-ioslave-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	net kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Network monitor for DNS-SD services (Zeroconf)
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	kdelibs 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/net/zeroconf-ioslave/Makefile b/net/zeroconf-ioslave/Makefile
index 41f2165e2122..783c7c07a867 100644
--- a/net/zeroconf-ioslave/Makefile
+++ b/net/zeroconf-ioslave/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	net kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Network monitor for DNS-SD services (Zeroconf)
 
-USES=		cmake:outsource kde:5 tar:xz
+USES=		cmake:outsource kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons dbusaddons dnssd i18n kio service
-USE_QT5=	core dbus network \
+USE_QT=		core dbus network \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>