D36349.1794717263.diff
No OneTemporary
Actions

Authored By

Unknown

Size

558 KB

Referenced Files

None

Subscribers

None

D36349.1794717263.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	Index: CHANGES
	===================================================================
	--- CHANGES
	+++ CHANGES
	@@ -10,6 +10,23 @@

	All ports committers are allowed to commit to this file.

	+20220XXX:
	+AUTHOR: zirias@FreeBSD.org
	+
	+ kde.mk, qt.mk and pyqt.mk now use a colon for component suffixes
	+
	+ Suffixes for build, run and test (for pyqt) dependencies used an underscore
	+ previously. This was not in line with most other USES, using a colon for
	+ that purpose.
	+
	+ So if you previously had for example
	+
	+ USE_QT= buildtools_build
	+
	+ replace it with
	+
	+ USE_QT= buildtools:build
	+
	20220907:
	AUTHOR: se@FreeBSD.org

	Index: Mk/Uses/kde.mk
	===================================================================
	--- Mk/Uses/kde.mk
	+++ Mk/Uses/kde.mk
	@@ -9,8 +9,8 @@
	#
	# USE_KDE List of KF5/Plasma5 components (other ports) that this
	# port depends on.
	-# * foo_build Add a build-time dependency (BUILD_DEPENDS)
	-# * foo_run Add a run-time dependency (RUN_DEPENDS)
	+# * foo:build Add a build-time dependency (BUILD_DEPENDS)
	+# * foo:run Add a run-time dependency (RUN_DEPENDS)
	# * foo (default) Add both dependencies on component <foo>, or
	# a LIB_DEPENDS if applicable.
	#
	@@ -25,7 +25,7 @@
	#
	# option DOCS If the port is part of kde-applications (see CATEGORIES,
	# above) and has an option defined for DOCS then a dependency
	-# for doctools_build is added. The option itself doesn't
	+# for doctools:build is added. The option itself doesn't
	# have to do anything -- the dependency is always there.
	#
	# KDE_INVENT If the port does not have a regular release, and should
	@@ -159,7 +159,7 @@
	. if ${_KDE_OPTIONS:MDOCS}
	DOCSDIR= ${PREFIX}/share/doc
	PORTDOCS?= HTML/*
	-USE_KDE+= doctools_build
	+USE_KDE+= doctools:build
	. endif
	# Further pass along a SHLIB_VER PLIST_SUB
	PLIST_SUB+= KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \
	@@ -870,18 +870,18 @@
	_USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL}

	# Iterate through components deprived of suffix.
	-. for component in ${USE_KDE:O:u:C/_.+//}
	+. for component in ${USE_KDE:O:u:C/:.+//}
	# Check that the component is valid.
	. if ${_USE_KDE_ALL:M${component}} != ""
	# Skip meta-components (currently none).
	. if defined(kde-${component}_PORT) && (defined(kde-${component}_PATH) \|\| defined(kde-${component}_LIB))
	# Check if a dependency type is explicitly requested.
	-. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
	+. if ${USE_KDE:M${component}\:*} != "" && ${USE_KDE:M${component}} == ""
	kde-${component}_TYPE= # empty
	-. if ${USE_KDE:M${component}_build} != ""
	+. if ${USE_KDE:M${component}\:build} != ""
	kde-${component}_TYPE+= build
	. endif
	-. if ${USE_KDE:M${component}_run} != ""
	+. if ${USE_KDE:M${component}\:run} != ""
	kde-${component}_TYPE+= run
	. endif
	. endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
	Index: Mk/Uses/pyqt.mk
	===================================================================
	--- Mk/Uses/pyqt.mk
	+++ Mk/Uses/pyqt.mk
	@@ -11,10 +11,10 @@
	# targets are then set assuming a certain tarball and
	# port layout.
	# USE_PYQT - List of PyQt components to depend on
	-# * foo_build only build depend
	-# * foo_run only run depend
	-# * foo_test only test depend
	-# * foo both (default)
	+# * foo:build only build depend
	+# * foo:run only run depend
	+# * foo:test only test depend
	+# * foo build and run depend (default)
	# PYQT_SIPDIR - where sip files will be installed to
	# PYQT_APIDIR - where api files will be installed to
	# PYQT_DOCDIR - where doc files will be installed to
	@@ -199,7 +199,7 @@
	${_USE_QSCINTILLA} \
	${_USE_PYQTBUILDER}
	. for comp in ${_USE_PYQT_ALL:O:u}
	-_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test
	+_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}:build py-${comp}:run py-${comp}:test
	py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
	py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
	py-${comp}_TEST_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
	@@ -211,9 +211,9 @@
	_USE_PYQT= ${USE_PYQT:O:u}
	. for comp in ${_USE_PYQT}
	. if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
	-BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS}
	-RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS}
	-TEST_DEPENDS+= ${py-${comp}_TEST_DEPENDS}
	+BUILD_DEPENDS+= ${py-${comp:S/:/_/}_BUILD_DEPENDS}
	+RUN_DEPENDS+= ${py-${comp:S/:/_/}_RUN_DEPENDS}
	+TEST_DEPENDS+= ${py-${comp:S/:/_/}_TEST_DEPENDS}
	. else
	IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #'
	. endif
	Index: Mk/Uses/qmake.mk
	===================================================================
	--- Mk/Uses/qmake.mk
	+++ Mk/Uses/qmake.mk
	@@ -110,7 +110,7 @@

	# Add qmake to USE_QT -- unless it's qmake itself
	. if !${PORTNAME} == qmake && ${_QT_VER:M5}
	-USE_QT+= qmake_build
	+USE_QT+= qmake:build
	. endif

	. if empty(qmake_ARGS:Mno_env)
	Index: Mk/Uses/qt.mk
	===================================================================
	--- Mk/Uses/qt.mk
	+++ Mk/Uses/qt.mk
	@@ -11,8 +11,8 @@
	# Versions: 5
	#
	# Port variables:
	-# USE_QT - List of Qt modules to depend on, with optional '_build'
	-# and '_run' suffixes. Define it empty to include this file
	+# USE_QT - List of Qt modules to depend on, with optional ':build'
	+# and ':run' suffixes. Define it empty to include this file
	# without depending on Qt ports.
	#
	# MAINTAINER: kde@FreeBSD.org
	@@ -399,18 +399,18 @@
	${_USE_QT${_QT_VER}_ONLY}
	_USE_QT= ${USE_QT}
	# Iterate through components deprived of suffix.
	-. for component in ${_USE_QT:O:u:C/_(build\|run)$//}
	+. for component in ${_USE_QT:O:u:C/:(build\|run)$//}
	# Check that the component is valid.
	. if ${_USE_QT_ALL:M${component}} != ""
	# Skip meta-components (currently none).
	. if defined(qt-${component}_PORT) && (defined(qt-${component}_PATH) \|\| defined(qt-${component}_LIB))
	# Check if a dependency type is explicitly requested.
	-. if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
	+. if ${_USE_QT:M${component}\:*} != "" && ${_USE_QT:M${component}} == ""
	qt-${component}_TYPE= # empty
	-. if ${_USE_QT:M${component}_build} != ""
	+. if ${_USE_QT:M${component}\:build} != ""
	qt-${component}_TYPE+= build
	. endif
	-. if ${_USE_QT:M${component}_run} != ""
	+. if ${_USE_QT:M${component}\:run} != ""
	qt-${component}_TYPE+= run
	. endif
	. endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
	Index: accessibility/gammy/Makefile
	===================================================================
	--- accessibility/gammy/Makefile
	+++ accessibility/gammy/Makefile
	@@ -15,7 +15,7 @@
	GH_ACCOUNT= Fushko
	USE_GL= gl
	USE_QT= core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xext xxf86vm

	PLIST_FILES= bin/gammy \
	Index: accessibility/kmag/Makefile
	===================================================================
	--- accessibility/kmag/Makefile
	+++ accessibility/kmag/Makefile
	@@ -12,9 +12,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons \
	i18n kio service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: accessibility/kmousetool/Makefile
	===================================================================
	--- accessibility/kmousetool/Makefile
	+++ accessibility/kmousetool/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
	i18n iconthemes notifications widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui phonon4 widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xtst

	OPTIONS_DEFINE= DOCS
	Index: accessibility/kmouth/Makefile
	===================================================================
	--- accessibility/kmouth/Makefile
	+++ accessibility/kmouth/Makefile
	@@ -12,9 +12,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	i18n jobwidgets kio service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport speech widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: accessibility/libqaccessibilityclient/Makefile
	===================================================================
	--- accessibility/libqaccessibilityclient/Makefile
	+++ accessibility/libqaccessibilityclient/Makefile
	@@ -14,6 +14,6 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: accessibility/qt5-speech/Makefile
	===================================================================
	--- accessibility/qt5-speech/Makefile
	+++ accessibility/qt5-speech/Makefile
	@@ -10,7 +10,7 @@
	qt-dist:5,speech xorg
	USE_GL= gl
	USE_PERL5= extract
	-USE_QT= core gui buildtools_build qmake_build
	+USE_QT= core gui buildtools:build qmake:build

	OPTIONS_DEFINE= ALSA
	OPTIONS_GROUP= BACKEND
	Index: archivers/ark/Makefile
	===================================================================
	--- archivers/ark/Makefile
	+++ archivers/ark/Makefile
	@@ -14,9 +14,9 @@
	coreaddons crash dbusaddons doctools i18n iconthemes \
	itemmodels itemviews jobwidgets khtml kio parts pty service \
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: archivers/kf5-karchive/Makefile
	===================================================================
	--- archivers/kf5-karchive/Makefile
	+++ archivers/kf5-karchive/Makefile
	@@ -9,8 +9,8 @@
	LICENSE= LGPL20

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: archivers/libarchive-qt/Makefile
	===================================================================
	--- archivers/libarchive-qt/Makefile
	+++ archivers/libarchive-qt/Makefile
	@@ -10,7 +10,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake qt:5
	-USE_QT= buildtools_build core dbus gui network qmake_build widgets
	+USE_QT= buildtools:build core dbus gui network qmake:build widgets
	USE_LDCONFIG= yes
	USE_GITLAB= yes

	Index: archivers/lxqt-archiver/Makefile
	===================================================================
	--- archivers/lxqt-archiver/Makefile
	+++ archivers/lxqt-archiver/Makefile
	@@ -17,7 +17,7 @@
	USES= cmake compiler:c++14-lang desktop-file-utils lxqt pkgconfig tar:xz gnome qt:5 xorg

	USE_GNOME= glib20
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	network printsupport svg widgets x11extras
	USE_LXQT= buildtools lxqt
	USE_XORG= xcb
	Index: archivers/quazip/Makefile
	===================================================================
	--- archivers/quazip/Makefile
	+++ archivers/quazip/Makefile
	@@ -16,7 +16,7 @@
	CPE_VENDOR= quazip_project
	USE_LDCONFIG= yes
	USE_QT= core network \
	- buildtools_build testlib_build qmake_build
	+ buildtools:build testlib:build qmake:build
	CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE

	PLIST_SUB= QTVER_SUFFIX=5 \
	Index: archivers/v1541commander/Makefile
	===================================================================
	--- archivers/v1541commander/Makefile
	+++ archivers/v1541commander/Makefile
	@@ -18,7 +18,7 @@

	USES= compiler:c++11-lang gmake pkgconfig qt:5 shared-mime-info

	-USE_QT= core gui network widgets buildtools_build linguisttools_build
	+USE_QT= core gui network widgets buildtools:build linguisttools:build

	USE_GITHUB= yes
	GH_PROJECT= zimk:zimk
	Index: astro/gpsbabel/Makefile
	===================================================================
	--- astro/gpsbabel/Makefile
	+++ astro/gpsbabel/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= compiler:c++11-lang gmake localbase qt:5
	-USE_QT= core qmake_build
	+USE_QT= core qmake:build

	CONFLICTS= gpsbabel14

	@@ -24,7 +24,7 @@
	GUI_USES= gl
	GUI_USE= GL=gl \
	QT=declarative,gui,location,network,printsupport,webchannel \
	- QT=webengine,widgets,xml,buildtools_build,linguisttools_build
	+ QT=webengine,widgets,xml,buildtools:build,linguisttools:build
	GUI_ALL_TARGET= gui
	GUI_VARS= MAKE_JOBS_UNSAFE=yes

	Index: astro/indiwebmanagerapp/Makefile
	===================================================================
	--- astro/indiwebmanagerapp/Makefile
	+++ astro/indiwebmanagerapp/Makefile
	@@ -16,7 +16,7 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons doctools i18n kio itemviews jobwidgets service \
	solid widgetsaddons windowsystem xmlgui
	-USE_QT= buildtools concurrent core dbus gui qmake_build network widgets \
	+USE_QT= buildtools concurrent core dbus gui qmake:build network widgets \
	xml
	USE_XORG= x11
	USE_GITHUB= yes
	Index: astro/kosmindoormap/Makefile
	===================================================================
	--- astro/kosmindoormap/Makefile
	+++ astro/kosmindoormap/Makefile
	@@ -10,9 +10,9 @@

	USES= bison cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= i18n kpublictransport \
	- ecm_build
	+ ecm:build
	USE_QT= core declarative gui network quick3d \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: astro/kstars/Makefile
	===================================================================
	--- astro/kstars/Makefile
	+++ astro/kstars/Makefile
	@@ -31,11 +31,11 @@
	iconthemes init itemviews jobwidgets kio newstuff notifications \
	notifyconfig parts plotting service solid texteditor \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core datavis3d dbus declarative gui multimedia \
	network opengl printsupport sql svg testlib websockets widgets \
	xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: astro/marble/Makefile
	===================================================================
	--- astro/marble/Makefile
	+++ astro/marble/Makefile
	@@ -20,10 +20,10 @@
	crash doctools i18n jobwidgets kio newstuff package parts \
	plasma-framework plasma-workspace-wallpapers runner service solid \
	sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative designer gui location network opengl \
	phonon4 printsupport script serialport sql svg webchannel widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	USE_LDCONFIG= yes
	Index: astro/merkaartor/Makefile
	===================================================================
	--- astro/merkaartor/Makefile
	+++ astro/merkaartor/Makefile
	@@ -20,7 +20,7 @@
	USE_LDCONFIG= yes

	QMAKE_ARGS= SYSTEM_QUAZIP=1
	-USE_QT= buildtools_build \
	+USE_QT= buildtools:build \
	concurrent core gui imageformats network printsupport svg \
	webkit widgets xml

	@@ -44,7 +44,7 @@
	DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1

	NLS_USES= qt:5
	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build

	OPTIONS_SUB= yes

	Index: astro/oskar/Makefile
	===================================================================
	--- astro/oskar/Makefile
	+++ astro/oskar/Makefile
	@@ -20,7 +20,7 @@

	USES= cmake compiler:c++11-lang localbase:ldflags python qt:5 \
	shebangfix
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	SHEBANG_FILES= apps/oskar_convert_cst_to_scalar.py
	Index: astro/stellarium/Makefile
	===================================================================
	--- astro/stellarium/Makefile
	+++ astro/stellarium/Makefile
	@@ -15,7 +15,7 @@

	USES= cmake compiler:c++11-lang desktop-file-utils \
	qt:5 shared-mime-info
	-USE_QT= qmake_build buildtools_build \
	+USE_QT= qmake:build buildtools:build \
	charts concurrent core gui network opengl \
	printsupport widgets

	@@ -47,7 +47,7 @@
	MULTIMEDIA_USE= QT=multimedia
	MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF

	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build
	NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=OFF

	SCRIPTS_USE= QT=script
	@@ -56,7 +56,7 @@
	TELESCOPE_USE= QT=serialport
	TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF

	-TEST_USE= QT=testlib_build
	+TEST_USE= QT=testlib:build
	TEST_CMAKE_ON= -DENABLE_TESTING:BOOL=ON

	TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx
	Index: astro/stellarsolver/Makefile
	===================================================================
	--- astro/stellarsolver/Makefile
	+++ astro/stellarsolver/Makefile
	@@ -13,7 +13,7 @@
	libwcs.so:astro/wcslib

	USES= cmake desktop-file-utils iconv ninja qt:5 pkgconfig
	-USE_QT= buildtools concurrent core gui qmake_build network widgets
	+USE_QT= buildtools concurrent core gui qmake:build network widgets
	USE_GITHUB= yes
	GH_ACCOUNT= rlancaste

	Index: audio/abgate-lv2/Makefile
	===================================================================
	--- audio/abgate-lv2/Makefile
	+++ audio/abgate-lv2/Makefile
	@@ -18,7 +18,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= antanasbruzas
	USE_CXXSTD= c++11
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build
	USE_GL= gl
	USE_GNOME= atkmm gtk20 gtkmm24 libsigc++20
	USE_LDCONFIG= yes
	Index: audio/amarok/Makefile
	===================================================================
	--- audio/amarok/Makefile
	+++ audio/amarok/Makefile
	@@ -25,7 +25,7 @@
	USE_QT= core concurrent declarative dbus gui location network phonon4 \
	quickcontrols2 script scripttools sql svg webchannel \
	webkit widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	USE_KDE= archive auth attica bookmarks codecs config configwidgets \
	completion coreaddons crash dbusaddons dnssd globalaccel \
	@@ -33,7 +33,7 @@
	kcmutils kio kirigami2 newstuff notifications notifyconfig \
	package parts service solid sonnet texteditor textwidgets \
	threadweaver wallet widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_XORG= ice sm x11 xext
	USE_LDCONFIG= yes

	Index: audio/audiocd-kio/Makefile
	===================================================================
	--- audio/audiocd-kio/Makefile
	+++ audio/audiocd-kio/Makefile
	@@ -22,7 +22,7 @@
	service solid sonnet textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network phonon4 printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_LDCONFIG= yes

	Index: audio/bambootracker/Makefile
	===================================================================
	--- audio/bambootracker/Makefile
	+++ audio/bambootracker/Makefile
	@@ -20,7 +20,7 @@

	USE_GL= gl
	USE_QT= buildtools core gui multimedia network widgets \
	- linguisttools_build
	+ linguisttools:build

	DATADIR= ${PREFIX}/share/BambooTracker
	DOCSDIR= ${PREFIX}/share/doc/BambooTracker
	Index: audio/cadence/Makefile
	===================================================================
	--- audio/cadence/Makefile
	+++ audio/cadence/Makefile
	@@ -18,7 +18,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= falkTX
	GH_PROJECT= Cadence
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	USE_PYQT= pyqt5 sip

	CXXFLAGS+= -DJACKBRIDGE_PROPER_CPP11_SUPPORT=yes
	Index: audio/cantata/Makefile
	===================================================================
	--- audio/cantata/Makefile
	+++ audio/cantata/Makefile
	@@ -14,8 +14,8 @@
	USE_GITHUB= yes
	GH_ACCOUNT= CDrummond

	-USE_QT= buildtools_build concurrent core dbus gui network \
	- qmake_build sql sql-sqlite3_run svg widgets xml
	+USE_QT= buildtools:build concurrent core dbus gui network \
	+ qmake:build sql sql-sqlite3:run svg widgets xml

	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_UDev
	CMAKE_OFF= ENABLE_CDIOPARANOIA
	@@ -72,7 +72,7 @@
	MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
	MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ

	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build
	NLS_CMAKE_ON= -DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
	-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
	NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \
	Index: audio/carla/Makefile
	===================================================================
	--- audio/carla/Makefile
	+++ audio/carla/Makefile
	@@ -22,7 +22,7 @@
	tar:bz2 xorg
	USE_PYQT= pyqt5 sip
	USE_GNOME= gtk20 gtk30
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	USE_GL= gl
	USE_XORG= x11
	USE_SDL= sdl2
	Index: audio/csoundqt/Makefile
	===================================================================
	--- audio/csoundqt/Makefile
	+++ audio/csoundqt/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lib desktop-file-utils gl gmake qmake qt:5 shared-mime-info
	USE_GITHUB= yes
	-USE_QT= concurrent core declarative gui network printsupport webchannel webkit widgets xml buildtools_build
	+USE_QT= concurrent core declarative gui network printsupport webchannel webkit widgets xml buildtools:build
	USE_GL= gl

	QMAKE_ARGS= CONFIG+="CSOUND_API_INCLUDE_DIR=${LOCALBASE}/include/csound CSOUND_LIBRARY_DIR=${LOCALBASE}/lib build64" \
	Index: audio/dgedit/Makefile
	===================================================================
	--- audio/dgedit/Makefile
	+++ audio/dgedit/Makefile
	@@ -14,7 +14,7 @@
	libsndfile.so:audio/libsndfile

	USES= autoreconf compiler:c++14-lang gmake libtool localbase pkgconfig qt:5
	-USE_QT= buildtools_build core gui linguisttools_build widgets xml
	+USE_QT= buildtools:build core gui linguisttools:build widgets xml

	GNU_CONFIGURE= yes

	Index: audio/dmidiplayer/Makefile
	===================================================================
	--- audio/dmidiplayer/Makefile
	+++ audio/dmidiplayer/Makefile
	@@ -15,7 +15,7 @@
	libuchardet.so:textproc/uchardet

	USES= compiler:c++17-lang cmake desktop-file-utils pkgconfig qt:6 tar:bz2
	-USE_QT= base tools_build
	+USE_QT= base tools:build

	CMAKE_ARGS= -DUSE_QT=6
	CMAKE_ON= EMBED_TRANSLATIONS
	Index: audio/drumkv1-lv2/Makefile
	===================================================================
	--- audio/drumkv1-lv2/Makefile
	+++ audio/drumkv1-lv2/Makefile
	@@ -17,7 +17,7 @@
	liblo.so:audio/liblo

	USES= cmake compiler:c++17-lang desktop-file-utils gl localbase:ldflags pkgconfig qt:5 shared-mime-info
	-USE_QT= core gui svg widgets xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui svg widgets xml buildtools:build linguisttools:build qmake:build
	USE_GL= gl

	CMAKE_OFF= CONFIG_ALSA_MIDI
	Index: audio/drumstick/Makefile
	===================================================================
	--- audio/drumstick/Makefile
	+++ audio/drumstick/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= compiler:c++11-lang cmake desktop-file-utils pkgconfig qt:6 shared-mime-info tar:bz2
	-USE_QT= base svg 5compat tools_build
	+USE_QT= base svg 5compat tools:build
	USE_LDCONFIG= yes

	CMAKE_ARGS= -DUSE_QT=6
	Index: audio/dsbmixer/Makefile
	===================================================================
	--- audio/dsbmixer/Makefile
	+++ audio/dsbmixer/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:tgz
	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets

	USE_GITHUB= yes
	GH_ACCOUNT= mrclksr
	Index: audio/elisa/Makefile
	===================================================================
	--- audio/elisa/Makefile
	+++ audio/elisa/Makefile
	@@ -17,7 +17,7 @@
	service solid widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui multimedia network \
	quickcontrols2 sql svg widgets xml \
	- buildtools_build declarative-test_build qmake_build testlib_build
	+ buildtools:build declarative-test:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS VLC
	Index: audio/faustlive/Makefile
	===================================================================
	--- audio/faustlive/Makefile
	+++ audio/faustlive/Makefile
	@@ -20,7 +20,7 @@
	libsndfile.so:audio/libsndfile # audio/alsa-lib isn't really needed: https://github.com/grame-cncm/faustlive/issues/3

	USES= compiler:c++11-lang gl pkgconfig qmake qt:5 shebangfix
	-USE_QT= core gui network widgets buildtools_build
	+USE_QT= core gui network widgets buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: audio/flacon/Makefile
	===================================================================
	--- audio/flacon/Makefile
	+++ audio/flacon/Makefile
	@@ -21,8 +21,8 @@

	USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:5
	USE_GITHUB= yes
	-USE_QT= buildtools_build concurrent_build qmake_build testlib_build \
	- linguisttools_build core gui network widgets
	+USE_QT= buildtools:build concurrent:build qmake:build testlib:build \
	+ linguisttools:build core gui network widgets
	CMAKE_ARGS= -DBUILD_TESTS:BOOL=YES

	do-test:
	Index: audio/fmit/Makefile
	===================================================================
	--- audio/fmit/Makefile
	+++ audio/fmit/Makefile
	@@ -17,7 +17,7 @@

	USES= compiler:c++11-lang gl gnome pkgconfig qmake qt:5 tar:bzip2 xorg

	-USE_QT= buildtools_build core gui opengl qmake_build multimedia network svg widgets
	+USE_QT= buildtools:build core gui opengl qmake:build multimedia network svg widgets
	USE_GL= gl glut

	USE_GITHUB= yes
	Index: audio/guidolib/Makefile
	===================================================================
	--- audio/guidolib/Makefile
	+++ audio/guidolib/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libmidisharelight.so:audio/midisharelight

	USES= compiler:c++11-lang gl cmake gnome localbase:ldflags pkgconfig qt:5 xorg
	-USE_QT= core gui widgets printsupport xml buildtools_build qmake_build
	+USE_QT= core gui widgets printsupport xml buildtools:build qmake:build
	USE_GL= gl
	USE_GNOME= cairo
	USE_LDCONFIG= yes
	Index: audio/hpsjam/Makefile
	===================================================================
	--- audio/hpsjam/Makefile
	+++ audio/hpsjam/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build core gui widgets svg
	+USE_QT= buildtools:build core gui widgets svg

	USE_GITHUB= yes
	GH_ACCOUNT= hselasky
	Index: audio/hydrogen/Makefile
	===================================================================
	--- audio/hydrogen/Makefile
	+++ audio/hydrogen/Makefile
	@@ -15,8 +15,8 @@

	USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig \
	localbase qt:5
	-USE_QT= core gui network widgets xml xmlpatterns buildtools_build \
	- linguisttools_build qmake_build testlib_build
	+USE_QT= core gui network widgets xml xmlpatterns buildtools:build \
	+ linguisttools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	USE_GITHUB= yes
	Index: audio/inscore/Makefile
	===================================================================
	--- audio/inscore/Makefile
	+++ audio/inscore/Makefile
	@@ -16,7 +16,7 @@

	USES= cmake gnome qt:5
	USE_QT= core declarative gui network multimedia opengl printsupport sensors svg widgets websockets \
	- qmake_build buildtools_build
	+ qmake:build buildtools:build
	USE_LDCONFIG= yes

	USE_GITHUB= yes
	Index: audio/jacktrip/Makefile
	===================================================================
	--- audio/jacktrip/Makefile
	+++ audio/jacktrip/Makefile
	@@ -14,7 +14,7 @@
	librtaudio.so:audio/rtaudio

	USES= meson compiler:c++17-lang gl pkgconfig qt:5
	-USE_QT= core gui network networkauth quickcontrols2 svg websockets widgets buildtools_build
	+USE_QT= core gui network networkauth quickcontrols2 svg websockets widgets buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: audio/jalv/Makefile
	===================================================================
	--- audio/jalv/Makefile
	+++ audio/jalv/Makefile
	@@ -25,7 +25,7 @@
	qt:5 tar:bz2 waf
	CONFIGURE_ARGS= --no-qt4
	USE_CXXSTD= c++11
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	USE_GNOME= atk atkmm cairo cairomm pango pangomm libsigc++20 \
	gdkpixbuf2 glib20 glibmm gtk20 gtk30 gtkmm24

	Index: audio/jamulus/Makefile
	===================================================================
	--- audio/jamulus/Makefile
	+++ audio/jamulus/Makefile
	@@ -17,7 +17,7 @@
	server_PKGNAMESUFFIX= -server

	USES= compiler:c++11-lang gl pkgconfig qmake qt:5
	-USE_QT= concurrent core multimedia network xml buildtools_build linguisttools_build
	+USE_QT= concurrent core multimedia network xml buildtools:build linguisttools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: audio/juk/Makefile
	===================================================================
	--- audio/juk/Makefile
	+++ audio/juk/Makefile
	@@ -15,9 +15,9 @@
	coreaddons crash dbusaddons globalaccel i18n iconthemes itemviews \
	jobwidgets kio notifications service solid sonnet textwidgets \
	wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network phonon4 svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: audio/kid3-qt5/Makefile
	===================================================================
	--- audio/kid3-qt5/Makefile
	+++ audio/kid3-qt5/Makefile
	@@ -19,7 +19,7 @@
	USE_GNOME= libxslt:build
	USE_LDCONFIG= yes
	USE_QT= core dbus gui multimedia network xml widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	CMAKE_ARGS= -DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \
	-DWITH_LIBDIR=lib \
	@@ -39,7 +39,7 @@
	# KF5
	USES+= kde:5
	USE_KDE+= auth codecs config configwidgets coreaddons kio \
	- service widgetsaddons xmlgui doctools_build ecm_build
	+ service widgetsaddons xmlgui doctools:build ecm:build
	USE_QT+= concurrent
	PLIST_SUB+= KF5="" QT="@comment " QT_SUFX=""
	KID3_APPS+= KDE
	@@ -78,7 +78,7 @@
	TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib
	TAGLIB_CMAKE_BOOL= WITH_TAGLIB

	-TEST_USE= LOCALE=en_US.UTF-8 QT=testlib_build
	+TEST_USE= LOCALE=en_US.UTF-8 QT=testlib:build
	TEST_CMAKE_BOOL= BUILD_TESTING
	TEST_TARGET= # define to override CMAKE_ARGS from Uses/kde.mk
	TEST_WRKSRC= ${BUILD_WRKSRC}/src/test
	Index: audio/kmix/Makefile
	===================================================================
	--- audio/kmix/Makefile
	+++ audio/kmix/Makefile
	@@ -15,9 +15,9 @@
	emoticons globalaccel i18n iconthemes init itemmodels \
	itemviews kcmutils kdelibs4support notifications package \
	plasma-framework service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	# we want the KF5 version of kmix
	Index: audio/kwave/Makefile
	===================================================================
	--- audio/kwave/Makefile
	+++ audio/kwave/Makefile
	@@ -22,9 +22,9 @@
	coreaddons crash dbusaddons i18n iconthemes itemviews \
	jobwidgets kio service solid sonnet textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui multimedia network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_GROUP= AUDIOPLUGIN
	Index: audio/libechonest/Makefile
	===================================================================
	--- audio/libechonest/Makefile
	+++ audio/libechonest/Makefile
	@@ -17,14 +17,14 @@
	USE_GITHUB= yes
	GH_ACCOUNT= lfranchi

	-USE_QT= core buildtools_build qmake_build network xml
	+USE_QT= core buildtools:build qmake:build network xml
	CMAKE_OFF+= BUILD_WITH_QT4

	PLIST_SUB= PORTVERSION=${PORTVERSION}

	OPTIONS_DEFINE= TEST

	-TEST_USE= QT=testlib_build
	+TEST_USE= QT=testlib:build
	TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS

	.include <bsd.port.mk>
	Index: audio/libkcddb/Makefile
	===================================================================
	--- audio/libkcddb/Makefile
	+++ audio/libkcddb/Makefile
	@@ -12,9 +12,9 @@
	USE_KDE= auth codecs completion config configwidgets \
	coreaddons i18n jobwidgets kio service solid \
	widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: audio/libkcompactdisc/Makefile
	===================================================================
	--- audio/libkcompactdisc/Makefile
	+++ audio/libkcompactdisc/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= coreaddons emoticons i18n itemmodels itemviews \
	kdelibs4support solid \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui phonon4 widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= ALSA DOCS
	Index: audio/liblastfm-qt5/Makefile
	===================================================================
	--- audio/liblastfm-qt5/Makefile
	+++ audio/liblastfm-qt5/Makefile
	@@ -17,7 +17,7 @@
	GH_ACCOUNT= lastfm
	USE_LDCONFIG= yes
	USE_QT= core dbus network sql xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CMAKE_OFF= BUILD_WITH_QT4
	QTVER_SUFFIX= 5

	@@ -35,7 +35,7 @@
	FINGERPRINT_BUILD_DEPENDS= ${NONEXISTENT}:math/fftw3:patch
	FINGERPRINT_CMAKE_ON= -DLIBFFTW3_INCLUDE_DIR:PATH=`${MAKE} -C ${PORTSDIR}/math/fftw3 -VWRKSRC`/api

	-TEST_USE= QT=testlib_build
	+TEST_USE= QT=testlib:build
	TEST_CMAKE_BOOL= BUILD_TESTS
	TEST_TEST_TARGET= test

	Index: audio/lmms/Makefile
	===================================================================
	--- audio/lmms/Makefile
	+++ audio/lmms/Makefile
	@@ -38,7 +38,7 @@
	GH_TUPLE= mjansson:rpmalloc:1.4.0:rpmalloc/src/3rdparty/rpmalloc/rpmalloc \
	lukas-w:qt5-x11embed:ec77d4ba40bebc0c53a016adb646b6fa65dd5faf:qt5x11embed/src/3rdparty/qt5-x11embed
	USE_LDCONFIG= yes
	-USE_QT= core gui widgets x11extras xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui widgets x11extras xml buildtools:build linguisttools:build qmake:build
	USE_XORG= xcursor xext xfixes xft xinerama xrender

	CMAKE_OFF= WANT_ALSA WANT_CALF WANT_CAPS WANT_CMT WANT_SWH WANT_STK \
	Index: audio/midipp/Makefile
	===================================================================
	--- audio/midipp/Makefile
	+++ audio/midipp/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build core gui network printsupport widgets
	+USE_QT= buildtools:build core gui network printsupport widgets

	USE_GITHUB= yes
	GH_ACCOUNT= hselasky
	Index: audio/mixxx/Makefile
	===================================================================
	--- audio/mixxx/Makefile
	+++ audio/mixxx/Makefile
	@@ -39,8 +39,8 @@
	USE_GL= gl glu
	USE_GITHUB= yes
	GH_ACCOUNT= mixxxdj
	-USE_QT= buildtools concurrent core dbus gui linguisttools_build network \
	- opengl qmake_build script scripttools sql sql-sqlite3 svg \
	+USE_QT= buildtools concurrent core dbus gui linguisttools:build network \
	+ opengl qmake:build script scripttools sql sql-sqlite3 svg \
	testlib x11extras xml xmlpatterns widgets

	CONFLICTS= mixxx22*
	Index: audio/mixxx22/Makefile
	===================================================================
	--- audio/mixxx22/Makefile
	+++ audio/mixxx22/Makefile
	@@ -40,8 +40,8 @@
	USE_GITHUB= yes
	GH_ACCOUNT= mixxxdj
	USE_QT= buildtools concurrent core dbus gui network opengl script scripttools \
	- sql sql-sqlite3 svg testlib xml xmlpatterns linguisttools_build \
	- qmake_build widgets
	+ sql sql-sqlite3 svg testlib xml xmlpatterns linguisttools:build \
	+ qmake:build widgets

	CONFLICTS= mixxx

	Index: audio/mous/Makefile
	===================================================================
	--- audio/mous/Makefile
	+++ audio/mous/Makefile
	@@ -72,7 +72,7 @@

	QT5_CMAKE_BOOL= WITH_APP_QT5
	QT5_USES= qt:5
	-QT5_USE= qt=buildtools,core,gui,widgets,qmake_build
	+QT5_USE= qt=buildtools,core,gui,widgets,qmake:build

	SNDIO_CMAKE_BOOL= WITH_PLUGIN_SNDIO
	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
	Index: audio/mpz/Makefile
	===================================================================
	--- audio/mpz/Makefile
	+++ audio/mpz/Makefile
	@@ -16,7 +16,7 @@

	USES= compiler:c++11-lang desktop-file-utils gstreamer qmake qt:5
	USE_GSTREAMER= flac libav mpg123 ogg opus vorbis
	-USE_QT= buildtools_build concurrent core dbus gui multimedia \
	+USE_QT= buildtools:build concurrent core dbus gui multimedia \
	network widgets x11extras

	QMAKE_ARGS= DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP
	Index: audio/mumble/Makefile
	===================================================================
	--- audio/mumble/Makefile
	+++ audio/mumble/Makefile
	@@ -38,7 +38,7 @@
	mumble-voip:sbcelt:045493d:mumble_sbcelt/3rdparty/sbcelt-src \
	mumble-voip:mumble-theme:9467fe8:mumble_theme/themes/Mumble

	-USE_QT= buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg widgets xml
	+USE_QT= buildtools:build core gui l10n linguist:build network opengl sql sql-sqlite3:run svg widgets xml
	USE_LDCONFIG= yes

	USE_XORG= ice xi x11
	Index: audio/murmur/Makefile
	===================================================================
	--- audio/murmur/Makefile
	+++ audio/murmur/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
	USE_CXXSTD= c++11
	-USE_QT= buildtools_build core network sql xml
	+USE_QT= buildtools:build core network sql xml

	USE_GITHUB= YES
	GH_ACCOUNT= mumble-voip
	@@ -48,7 +48,7 @@
	MYSQL_USE= QT=sql-mysql

	SQLITE_VARS_OFF= CONFIG+=no-sqlite3_run
	-SQLITE_USE= QT=sql-sqlite3_run
	+SQLITE_USE= QT=sql-sqlite3:run

	USERS= murmur
	GROUPS= murmur
	Index: audio/muse-sequencer/Makefile
	===================================================================
	--- audio/muse-sequencer/Makefile
	+++ audio/muse-sequencer/Makefile
	@@ -29,7 +29,7 @@

	USES= cmake compiler:c++11-lib desktop-file-utils gl gnome localbase:ldflags qt:5 pkgconfig python shared-mime-info shebangfix
	USE_GL= gl
	-USE_QT= core gui svg xml widgets buildtools_build linguisttools_build qmake_build uitools_build
	+USE_QT= core gui svg xml widgets buildtools:build linguisttools:build qmake:build uitools:build
	USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 libsigc++20 pango pangomm
	USE_LDCONFIG= yes

	Index: audio/musescore/Makefile
	===================================================================
	--- audio/musescore/Makefile
	+++ audio/musescore/Makefile
	@@ -23,7 +23,7 @@
	help location network opengl printsupport \
	quickcontrols2 scripttools sql svg testlib \
	webchannel widgets xml xmlpatterns \
	- buildtools_build linguisttools_build qmake_build uitools_build
	+ buildtools:build linguisttools:build qmake:build uitools:build

	USE_GITHUB= yes
	GH_PROJECT= MuseScore
	Index: audio/mythplugin-mythmusic/Makefile
	===================================================================
	--- audio/mythplugin-mythmusic/Makefile
	+++ audio/mythplugin-mythmusic/Makefile
	@@ -22,7 +22,7 @@
	GH_ACCOUNT= MythTV
	GH_PROJECT= mythtv
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build core gui qmake_build sql widgets xml
	+USE_QT= buildtools:build core gui qmake:build sql widgets xml

	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
	Index: audio/noson-app/Makefile
	===================================================================
	--- audio/noson-app/Makefile
	+++ audio/noson-app/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++11-lang qt:5 ssl
	USE_QT= core dbus declarative graphicaleffects gui network \
	- quickcontrols2 svg widgets xml buildtools_build qmake_build
	+ quickcontrols2 svg widgets xml buildtools:build qmake:build
	USE_GITHUB= yes
	GH_ACCOUNT= janbar

	Index: audio/openal-soft/Makefile
	===================================================================
	--- audio/openal-soft/Makefile
	+++ audio/openal-soft/Makefile
	@@ -34,7 +34,7 @@
	UTILS_DESC= Build and install utility programs

	CONFIG_USES= qt:5
	-CONFIG_USE= QT=core,gui,widgets,buildtools_build,qmake_build
	+CONFIG_USE= QT=core,gui,widgets,buildtools:build,qmake:build
	CONFIG_CMAKE_BOOL_OFF= ALSOFT_NO_CONFIG_UTIL
	CONFIG_CMAKE_ON= -DALSOFT_NO_QT5:BOOL=OFF

	Index: audio/padthv1-lv2/Makefile
	===================================================================
	--- audio/padthv1-lv2/Makefile
	+++ audio/padthv1-lv2/Makefile
	@@ -20,7 +20,7 @@
	USES= cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:5 \
	shared-mime-info
	USE_GL= gl
	-USE_QT= core gui svg widgets xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui svg widgets xml buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= rncbc
	Index: audio/pavucontrol-qt/Makefile
	===================================================================
	--- audio/pavucontrol-qt/Makefile
	+++ audio/pavucontrol-qt/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++14-lang gettext-runtime localbase:ldflags qt:5 \
	lxqt pkgconfig tar:xz gnome
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	widgets
	USE_LXQT= buildtools
	USE_GNOME= glib20
	Index: audio/pianobooster/Makefile
	===================================================================
	--- audio/pianobooster/Makefile
	+++ audio/pianobooster/Makefile
	@@ -19,7 +19,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= captnfab
	GH_PROJECT= PianoBooster
	-USE_QT= core gui opengl widgets xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui opengl widgets xml buildtools:build linguisttools:build qmake:build
	USE_GL= gl glu

	CMAKE_ON= USE_JACK
	Index: audio/picard/Makefile
	===================================================================
	--- audio/picard/Makefile
	+++ audio/picard/Makefile
	@@ -22,7 +22,7 @@

	USES= gettext pyqt:5 python:3.7+ desktop-file-utils
	USE_LOCALE= en_US.UTF-8
	-USE_PYQT= pyqt5_run sip
	+USE_PYQT= pyqt5:run sip
	USE_PYTHON= autoplist distutils noflavors

	CONFLICTS_INSTALL= picard-tools py*-python-picard # bin/picard
	Index: audio/plasma5-plasma-pa/Makefile
	===================================================================
	--- audio/plasma5-plasma-pa/Makefile
	+++ audio/plasma5-plasma-pa/Makefile
	@@ -14,9 +14,9 @@
	USE_GNOME= glib20
	USE_KDE= config configwidgets coreaddons ecm globalaccel i18n \
	kdeclarative notifications package plasma-framework \
	- doctools_build
	+ doctools:build
	USE_QT= core dbus declarative gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	SHEBANG_FILES= data/plasmaVolumeDisableKMixAutostart.pl
	CMAKE_OFF= USE_GCONF
	Index: audio/polyphone/Makefile
	===================================================================
	--- audio/polyphone/Makefile
	+++ audio/polyphone/Makefile
	@@ -23,7 +23,7 @@
	editor/graphics/graphiquefourier.cpp \
	editor/tree/treeitemdelegate.cpp
	USE_GL= gl
	-USE_QT= core concurrent gui network printsupport svg widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core concurrent gui network printsupport svg widgets buildtools:build linguisttools:build qmake:build
	USE_GNOME= glib20
	USE_CXXSTD= c++11

	Index: audio/pulseaudio-qt/Makefile
	===================================================================
	--- audio/pulseaudio-qt/Makefile
	+++ audio/pulseaudio-qt/Makefile
	@@ -12,8 +12,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 \
	pkgconfig qt:5 shebangfix tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core dbus gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: audio/qaudiosonar/Makefile
	===================================================================
	--- audio/qaudiosonar/Makefile
	+++ audio/qaudiosonar/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets

	USE_GITHUB= yes
	GH_ACCOUNT= hselasky
	Index: audio/qjackctl/Makefile
	===================================================================
	--- audio/qjackctl/Makefile
	+++ audio/qjackctl/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libjack.so:audio/jack

	USES= cmake compiler:c++11-lib gl localbase:ldflags pkgconfig qt:5
	-USE_QT= core gui network widgets x11extras xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui network widgets x11extras xml buildtools:build linguisttools:build qmake:build
	USE_GL= gl
	USE_CXXSTD= c++11

	Index: audio/qmidiarp/Makefile
	===================================================================
	--- audio/qmidiarp/Makefile
	+++ audio/qmidiarp/Makefile
	@@ -22,8 +22,8 @@
	gmake gnome localbase libtool pkgconfig qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= emuse
	-USE_QT= core gui network widgets buildtools_build \
	- linguisttools_build
	+USE_QT= core gui network widgets buildtools:build \
	+ linguisttools:build
	USE_CXXSTD= c++11
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --enable-qt5 --enable-translations=yes
	Index: audio/qmidictl/Makefile
	===================================================================
	--- audio/qmidictl/Makefile
	+++ audio/qmidictl/Makefile
	@@ -12,7 +12,7 @@

	USES= cmake compiler:c++11-lang gl localbase pkgconfig qt:5
	GNU_CONFIGURE= yes
	-USE_QT= core gui network widgets qmake_build buildtools_build linguisttools_build
	+USE_QT= core gui network widgets qmake:build buildtools:build linguisttools:build
	USE_GL= gl

	BINARY_ALIAS= qmake=${QMAKE}
	Index: audio/qmidinet/Makefile
	===================================================================
	--- audio/qmidinet/Makefile
	+++ audio/qmidinet/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libjack.so:audio/jack

	USES= cmake compiler:c++17-lang pkgconfig qt:5
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build

	CMAKE_OFF= CONFIG_ALSA_MIDI # libalsa doesn't have MIDI functionality on FreeBSD

	Index: audio/qsampler/Makefile
	===================================================================
	--- audio/qsampler/Makefile
	+++ audio/qsampler/Makefile
	@@ -18,7 +18,7 @@
	shared-mime-info qmake:no_env qt:5 xorg
	USE_GL= gl
	USE_QT= core gui network widgets x11extras \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= rncbc
	Index: audio/qsynth/Makefile
	===================================================================
	--- audio/qsynth/Makefile
	+++ audio/qsynth/Makefile
	@@ -14,8 +14,8 @@

	USES= cmake compiler:c++11-lang pkgconfig qt:5
	USE_CXXSTD= c++11
	-USE_QT= core gui network widgets x11extras buildtools_build \
	- linguisttools_build qmake_build
	+USE_QT= core gui network widgets x11extras buildtools:build \
	+ linguisttools:build qmake:build

	# cf. PR 224488
	LDFLAGS+= -Wl,--as-needed
	Index: audio/qtractor/Makefile
	===================================================================
	--- audio/qtractor/Makefile
	+++ audio/qtractor/Makefile
	@@ -41,8 +41,8 @@

	USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig qt:5 shared-mime-info
	USE_GNOME= atk cairo gdkpixbuf2 gtk20 gtkmm24 pango
	-USE_QT= core gui svg widgets x11extras xml buildtools_build linguisttools_build qmake_build
	-#USE_QT= base svg tools_build # for Qt6
	+USE_QT= core gui svg widgets x11extras xml buildtools:build linguisttools:build qmake:build
	+#USE_QT= base svg tools:build # for Qt6

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}_${DISTVERSION}

	Index: audio/quimup/Makefile
	===================================================================
	--- audio/quimup/Makefile
	+++ audio/quimup/Makefile
	@@ -16,7 +16,7 @@
	libtag.so:audio/taglib

	USES= compiler:c++11-lang gl pkgconfig qmake qt:5
	-USE_QT= core gui network widgets buildtools_build
	+USE_QT= core gui network widgets buildtools:build
	USE_GL= gl

	WRKSRC= ${WRKDIR}/Quimup_${PORTVERSION}_source
	Index: audio/qxgedit/Makefile
	===================================================================
	--- audio/qxgedit/Makefile
	+++ audio/qxgedit/Makefile
	@@ -13,6 +13,6 @@
	LIB_DEPENDS= libasound.so:audio/alsa-lib

	USES= cmake compiler:c++17-lang pkgconfig qt:5
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: audio/rosegarden/Makefile
	===================================================================
	--- audio/rosegarden/Makefile
	+++ audio/rosegarden/Makefile
	@@ -30,7 +30,7 @@
	localbase:ldflags pkgconfig shared-mime-info tar:bzip2 \
	qt:5 xorg
	USE_QT= core gui network printsupport testlib widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_XORG= ice sm x11 xext

	OPTIONS_DEFINE= LIRC
	Index: audio/samplv1-lv2/Makefile
	===================================================================
	--- audio/samplv1-lv2/Makefile
	+++ audio/samplv1-lv2/Makefile
	@@ -21,7 +21,7 @@
	USES= cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:5 \
	shared-mime-info
	USE_GL= gl
	-USE_QT= core gui svg widgets xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui svg widgets xml buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= rncbc
	Index: audio/sayonara/Makefile
	===================================================================
	--- audio/sayonara/Makefile
	+++ audio/sayonara/Makefile
	@@ -16,8 +16,8 @@
	qt:5 python shebangfix
	USE_GNOME= glib20
	USE_GSTREAMER= flac libav mpg123 ogg opus vorbis
	-USE_QT= dbus core gui network sql sql-sqlite3_run svg widgets xml \
	- buildtools_build qmake_build linguisttools_build
	+USE_QT= dbus core gui network sql sql-sqlite3:run svg widgets xml \
	+ buildtools:build qmake:build linguisttools:build

	USE_GITLAB= yes
	GL_ACCOUNT= luciocarreras
	Index: audio/sonic-visualiser/Makefile
	===================================================================
	--- audio/sonic-visualiser/Makefile
	+++ audio/sonic-visualiser/Makefile
	@@ -27,7 +27,7 @@

	USES= autoreconf compiler:c++11-lang desktop-file-utils dos2unix gmake gl pkgconfig qt:5 xorg
	DOS2UNIX_FILES= convert.pro
	-USE_QT= buildtools_build core gui network qmake_build svg testlib widgets xml
	+USE_QT= buildtools:build core gui network qmake:build svg testlib widgets xml
	USE_XORG= x11
	USE_GL= gl

	Index: audio/soundkonverter/Makefile
	===================================================================
	--- audio/soundkonverter/Makefile
	+++ audio/soundkonverter/Makefile
	@@ -17,14 +17,14 @@
	GH_ACCOUNT= dfaust
	USES= cmake compiler:c++11-lang kde:5 qt:5 xorg
	USE_GITHUB= yes
	-USE_QT= dbus concurrent core buildtools_build gui network printsupport \
	- qmake_build widgets xml
	+USE_QT= dbus concurrent core buildtools:build gui network printsupport \
	+ qmake:build widgets xml
	USE_KDE= auth codecs config configwidgets completion coreaddons crash \
	bookmarks guiaddons i18n iconthemes init itemviews jobwidgets \
	kdelibs4support kio libkcddb notifications parts textwidgets \
	service solid sonnet unitconversion windowsystem widgetsaddons \
	xmlgui \
	- doctools_build
	+ doctools:build
	USE_XORG= x11
	WRKSRC_SUBDIR= src

	Index: audio/spectmorph/Makefile
	===================================================================
	--- audio/spectmorph/Makefile
	+++ audio/spectmorph/Makefile
	@@ -21,7 +21,7 @@
	libsndfile.so:audio/libsndfile

	USES= autoreconf desktop-file-utils gettext-runtime gl gmake gnome libtool pkgconfig python:run qt:5 shebangfix tar:bz2 xorg
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	USE_GNOME= cairo glib20
	USE_GL= gl
	USE_XORG= x11
	Index: audio/spotify-qt/Makefile
	===================================================================
	--- audio/spotify-qt/Makefile
	+++ audio/spotify-qt/Makefile
	@@ -15,7 +15,7 @@
	USES= cmake compiler:c++11-lang qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= kraxarn
	-USE_QT= core dbus gui network svg widgets buildtools_build qmake_build
	+USE_QT= core dbus gui network svg widgets buildtools:build qmake:build

	PLIST_FILES= bin/spotify-qt \
	share/applications/spotify-qt.desktop \
	Index: audio/strawberry/Makefile
	===================================================================
	--- audio/strawberry/Makefile
	+++ audio/strawberry/Makefile
	@@ -24,7 +24,7 @@

	USE_GNOME= glib20
	USE_QT= concurrent core dbus gui linguisttools network sql sql-sqlite3 \
	- widgets x11extras buildtools_build qmake_build testlib_build
	+ widgets x11extras buildtools:build qmake:build testlib:build
	USE_XORG= ice sm x11 xcb xext

	CMAKE_ARGS= -DENABLE_GSTREAMER:BOOL=true \
	Index: audio/supercollider/Makefile
	===================================================================
	--- audio/supercollider/Makefile
	+++ audio/supercollider/Makefile
	@@ -20,8 +20,8 @@

	USES= cmake compiler:c++11-lang iconv localbase pkgconfig \
	qt:5 readline shared-mime-info tar:bzip2 xorg
	-USE_QT= buildtools_build concurrent core declarative gui linguisttools location \
	- network opengl printsupport qmake_build sensors \
	+USE_QT= buildtools:build concurrent core declarative gui linguisttools location \
	+ network opengl printsupport qmake:build sensors \
	sql widgets websockets webchannel svg
	USE_XORG= x11
	USE_LDCONFIG= yes
	Index: audio/synthv1-lv2/Makefile
	===================================================================
	--- audio/synthv1-lv2/Makefile
	+++ audio/synthv1-lv2/Makefile
	@@ -18,7 +18,7 @@
	USES= cmake compiler:c++17-lang desktop-file-utils gl pkgconfig qt:5 \
	shared-mime-info
	USE_GL= gl
	-USE_QT= core gui svg widgets xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui svg widgets xml buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= rncbc
	Index: audio/tiatracker/Makefile
	===================================================================
	--- audio/tiatracker/Makefile
	+++ audio/tiatracker/Makefile
	@@ -16,7 +16,7 @@
	USES= compiler:c++11-lang dos2unix gl qmake qt:5 sdl tar:xz
	DOS2UNIX_GLOB= .c .cpp .h .k65 *.pro
	USE_GL= gl
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	USE_SDL= sdl2

	CFLAGS+= `sdl2-config --cflags`
	Index: audio/traverso/Makefile
	===================================================================
	--- audio/traverso/Makefile
	+++ audio/traverso/Makefile
	@@ -28,7 +28,7 @@
	libwavpack.so:audio/wavpack

	USES= cmake compiler:c++11-lang desktop-file-utils localbase:ldflags pkgconfig qt:5
	-USE_QT= core gui printsupport xml widgets buildtools_build qmake_build
	+USE_QT= core gui printsupport xml widgets buildtools:build qmake:build

	CMAKE_OFF= WANT_ALSA

	Index: audio/virtual_oss_ctl/Makefile
	===================================================================
	--- audio/virtual_oss_ctl/Makefile
	+++ audio/virtual_oss_ctl/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets

	USE_GITHUB= yes
	GH_ACCOUNT= hselasky
	Index: audio/vmpk/Makefile
	===================================================================
	--- audio/vmpk/Makefile
	+++ audio/vmpk/Makefile
	@@ -14,7 +14,7 @@
	LIB_DEPENDS= libdrumstick-rt.so:audio/drumstick

	USES= compiler:c++11-lang cmake localbase:ldflags pkgconfig qt:6 tar:bz2 xorg
	-USE_QT= base svg tools_build
	+USE_QT= base svg tools:build
	USE_XORG= xcb

	CMAKE_ON= EMBED_TRANSLATIONS
	Index: audio/welle.io/Makefile
	===================================================================
	--- audio/welle.io/Makefile
	+++ audio/welle.io/Makefile
	@@ -20,7 +20,7 @@
	GH_ACCOUNT= AlbrechtL
	GH_TAGNAME= 0aacf578d77d79212483cd6fce436fb66523f63f
	USE_QT= charts core dbus declarative gui multimedia network \
	- quickcontrols2 widgets buildtools_build qmake_build
	+ quickcontrols2 widgets buildtools:build qmake:build

	OPTIONS_DEFINE= AIRSPY CLI FFTW RTLSDR SOAPY
	OPTIONS_DEFAULT= FFTW RTLSDR
	Index: benchmarks/kdiskmark/Makefile
	===================================================================
	--- benchmarks/kdiskmark/Makefile
	+++ benchmarks/kdiskmark/Makefile
	@@ -15,9 +15,9 @@
	GH_PROJECT= KDiskMark

	USES= cmake compiler:c++11-lang kde:5 qt:5
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	dbus core gui widgets
	-USE_KDE= ecm_build auth coreaddons
	+USE_KDE= ecm:build auth coreaddons

	post-patch:
	@${REINPLACE_CMD} -e '/--ioengine=/s,libaio,posixaio,' \
	Index: biology/sigviewer/Makefile
	===================================================================
	--- biology/sigviewer/Makefile
	+++ biology/sigviewer/Makefile
	@@ -16,7 +16,7 @@
	libxdf.so:misc/libxdf

	USES= gl qmake qt:5
	-USE_QT= core gui widgets xml qmake_build buildtools_build
	+USE_QT= core gui widgets xml qmake:build buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: biology/ugene/Makefile
	===================================================================
	--- biology/ugene/Makefile
	+++ biology/ugene/Makefile
	@@ -20,10 +20,10 @@

	USES= desktop-file-utils gl qmake qt:5 shared-mime-info sqlite xorg
	USE_GL= gl glu
	-USE_QT= buildtools_build linguisttools_build \
	+USE_QT= buildtools:build linguisttools:build \
	core gui network opengl printsupport scripttools script \
	sql svg testlib widgets xml \
	- imageformats_run
	+ imageformats:run
	USE_XORG= x11 xtst

	QMAKE_ARGS= INSTALL_PREFIX="${PREFIX}" UGENE_INSTALL_DATA="${DATADIR}" \
	Index: cad/appcsxcad/Makefile
	===================================================================
	--- cad/appcsxcad/Makefile
	+++ cad/appcsxcad/Makefile
	@@ -23,7 +23,7 @@
	libvtkCommonCore-9.1.so:math/vtk9

	USES= cmake jpeg pkgconfig qt:5 xorg
	-USE_QT= core gui sql widgets xml buildtools_build qmake_build
	+USE_QT= core gui sql widgets xml buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xt
	USE_LDCONFIG= yes

	Index: cad/caneda/Makefile
	===================================================================
	--- cad/caneda/Makefile
	+++ cad/caneda/Makefile
	@@ -17,7 +17,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= Caneda
	GH_PROJECT= Caneda
	-USE_QT= core gui printsupport svg widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui printsupport svg widgets buildtools:build linguisttools:build qmake:build

	CMAKE_ARGS= -DQWT_INCLUDE_DIR=${LOCALBASE}/include/qt5/qwt6 -DQWT_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so

	Index: cad/freecad/Makefile
	===================================================================
	--- cad/freecad/Makefile
	+++ cad/freecad/Makefile
	@@ -41,7 +41,7 @@
	USE_XORG= ice sm x11 xext xt
	USE_GL= gl glu
	USE_QT= buildtools concurrent core declarative gui location network \
	- opengl printsupport qmake_build svg webchannel webengine \
	+ opengl printsupport qmake:build svg webchannel webengine \
	widgets xml xmlpatterns
	USE_LDCONFIG= yes

	Index: cad/ktechlab/Makefile
	===================================================================
	--- cad/ktechlab/Makefile
	+++ cad/ktechlab/Makefile
	@@ -17,13 +17,13 @@
	localbase qt:5 shared-mime-info xorg
	USE_GITHUB= yes
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- qmake_build buildtools_build
	+ qmake:build buildtools:build
	USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \
	crash guiaddons i18n iconthemes init itemviews jobwidgets js \
	kdelibs4support khtml kio notifications parts service solid \
	sonnet syntaxhighlighting texteditor textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_GNOME= glib20
	USE_XORG= x11

	Index: cad/ldview/Makefile
	===================================================================
	--- cad/ldview/Makefile
	+++ cad/ldview/Makefile
	@@ -19,7 +19,7 @@
	ldraw>0:cad/ldraw

	USES= desktop-file-utils gl gmake jpeg qmake qt:5 shared-mime-info shebangfix xorg
	-USE_QT= core gui linguist opengl printsupport widgets buildtools_build qmake_build
	+USE_QT= core gui linguist opengl printsupport widgets buildtools:build qmake:build
	USE_GL= gl glu
	USE_XORG= x11

	Index: cad/leocad/Makefile
	===================================================================
	--- cad/leocad/Makefile
	+++ cad/leocad/Makefile
	@@ -16,7 +16,7 @@
	USES= compiler:c++11-lang cpe desktop-file-utils gl qmake qt:5 shared-mime-info xorg
	USE_GITHUB= yes
	GH_ACCOUNT= leozide
	-USE_QT= core gui concurrent network opengl printsupport widgets xml buildtools_build linguisttools_build
	+USE_QT= core gui concurrent network opengl printsupport widgets xml buildtools:build linguisttools:build
	USE_GL= gl

	QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} MAN_DIR=${PREFIX}/man/man1 LDRAW_LIBRARY_PATH=${PREFIX}/share/ldraw
	Index: cad/librecad/Makefile
	===================================================================
	--- cad/librecad/Makefile
	+++ cad/librecad/Makefile
	@@ -23,7 +23,7 @@
	GH_PROJECT= LibreCAD
	USE_GL= gl
	USE_QT= core gui printsupport svg widgets \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build

	QMAKE_ARGS+= BOOST_DIR="${LOCALBASE}"

	Index: cad/librepcb/Makefile
	===================================================================
	--- cad/librepcb/Makefile
	+++ cad/librepcb/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake compiler:c++11-lang desktop-file-utils gl qt:5 shared-mime-info zip
	USE_QT= concurrent core gui network opengl printsupport sql svg xml widgets \
	- buildtools_build linguisttools_build testlib_build qmake_build
	+ buildtools:build linguisttools:build testlib:build qmake:build
	USE_GL= gl

	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
	Index: cad/meshlab/Makefile
	===================================================================
	--- cad/meshlab/Makefile
	+++ cad/meshlab/Makefile
	@@ -15,7 +15,7 @@

	USES= dos2unix gl qmake:outsource qt:5
	USE_GL= gl glu glew
	-USE_QT= buildtools_build core gui network \
	+USE_QT= buildtools:build core gui network \
	opengl script xml xmlpatterns widgets
	USE_GITHUB= yes
	GH_ACCOUNT= cnr-isti-vclab
	Index: cad/openroad/Makefile
	===================================================================
	--- cad/openroad/Makefile
	+++ cad/openroad/Makefile
	@@ -28,7 +28,7 @@
	libspdlog.so:devel/spdlog

	USES= bison compiler:c++17-lang cmake eigen:3 qt:5 localbase:ldflags python:3.7+,build readline tcl:86 # the code asks for tcl-87, but build fails: https://github.com/The-OpenROAD-Project/OpenROAD/issues/508
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= The-OpenROAD-Project
	Index: cad/openscad-devel/Makefile
	===================================================================
	--- cad/openscad-devel/Makefile
	+++ cad/openscad-devel/Makefile
	@@ -35,7 +35,7 @@
	USE_GITHUB= yes
	USE_GL= gl glu glew
	USE_GNOME= cairo glib20 libxml2
	-USE_QT= buildtools_build core concurrent_build dbus gui multimedia qmake_build svg widgets
	+USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake:build svg widgets
	USE_XORG= x11
	GH_ACCOUNT= microsoft:mimalloc
	GH_PROJECT= MCAD:mcad mimalloc:mimalloc
	Index: cad/openscad/Makefile
	===================================================================
	--- cad/openscad/Makefile
	+++ cad/openscad/Makefile
	@@ -31,7 +31,7 @@
	USE_GITHUB= yes
	USE_GL= gl glu glew
	USE_GNOME= glib20 libxml2
	-USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets
	+USE_QT= buildtools:build core concurrent:build dbus gui multimedia widgets
	USE_XORG= x11
	GH_TAGNAME= 41f58fe57c03457a3a8b4dc541ef5654ec3e8c78
	QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION}
	Index: cad/py-pyfda/Makefile
	===================================================================
	--- cad/py-pyfda/Makefile
	+++ cad/py-pyfda/Makefile
	@@ -20,7 +20,7 @@

	USES= python:3.7+ pyqt:5
	USE_PYTHON= distutils autoplist
	-USE_PYQT= pyqt5_run
	+USE_PYQT= pyqt5:run
	NO_ARCH= yes

	post-extract:
	Index: cad/qcad/Makefile
	===================================================================
	--- cad/qcad/Makefile
	+++ cad/qcad/Makefile
	@@ -21,7 +21,7 @@
	USES= compiler:c++11-lang gl gmake qmake qt:5
	USE_GITHUB= yes
	USE_LDCONFIG= yes
	-USE_QT= buildtools qmake_build \
	+USE_QT= buildtools qmake:build \
	designer gui help imageformats network opengl script \
	scripttools sql svg uitools xml xmlpatterns webkit
	USE_GL= glu
	Index: cad/qcsxcad/Makefile
	===================================================================
	--- cad/qcsxcad/Makefile
	+++ cad/qcsxcad/Makefile
	@@ -21,7 +21,7 @@
	libvtkCommonCore-9.1.so:math/vtk9

	USES= cmake gl jpeg pkgconfig qt:5 xorg
	-USE_QT= core gui opengl sql widgets xml buildtools_build qmake_build
	+USE_QT= core gui opengl sql widgets xml buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xt
	USE_GL= gl opengl
	USE_LDCONFIG= yes
	Index: cad/qelectrotech/Makefile
	===================================================================
	--- cad/qelectrotech/Makefile
	+++ cad/qelectrotech/Makefile
	@@ -18,7 +18,7 @@
	USE_GL= gl
	USE_QT= concurrent core gui network printsupport sql sql-sqlite3 \
	svg widgets xml \
	- buildtools_build
	+ buildtools:build
	USE_KDE= coreaddons widgetsaddons

	OPTIONS_DEFINE= DEBUG DOCS
	Index: cad/qucs-s/Makefile
	===================================================================
	--- cad/qucs-s/Makefile
	+++ cad/qucs-s/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= cmake qt:5
	-USE_QT= core gui printsupport svg widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui printsupport svg widgets buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= ra3xdh
	Index: cad/veroroute/Makefile
	===================================================================
	--- cad/veroroute/Makefile
	+++ cad/veroroute/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE= ${WRKSRC}/../licenses/license_GPLv3.txt

	USES= compiler:c++11-lang gl qmake qt:5
	-USE_QT= core gui network widgets buildtools_build
	+USE_QT= core gui network widgets buildtools:build
	USE_GL= gl

	WRKSRC= ${WRKDIR}/VeroRoute
	Index: chinese/fcitx-libpinyin/Makefile
	===================================================================
	--- chinese/fcitx-libpinyin/Makefile
	+++ chinese/fcitx-libpinyin/Makefile
	@@ -33,7 +33,7 @@

	.if ${PORT_OPTIONS:MQT5}
	USES+= qt:5
	-USE_QT= qmake_build gui webengine buildtools_build
	+USE_QT= qmake:build gui webengine buildtools:build
	USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt
	PLIST_SUB+= QT5=""
	.else
	Index: chinese/fcitx5-chinese-addons/Makefile
	===================================================================
	--- chinese/fcitx5-chinese-addons/Makefile
	+++ chinese/fcitx5-chinese-addons/Makefile
	@@ -32,7 +32,7 @@

	GUI_DESC= Configuration GUI
	GUI_USES= qt:5
	-GUI_USE= qt=dbus,concurrent,webkit,buildtools_build,qmake_build
	+GUI_USE= qt=dbus,concurrent,webkit,buildtools:build,qmake:build
	GUI_LIB_DEPENDS= libFcitx5Qt5DBusAddons.so:textproc/fcitx5-qt
	GUI_CMAKE_ON= -DUSE_WEBKIT:BOOL=true

	Index: chinese/gcin-qt5/Makefile
	===================================================================
	--- chinese/gcin-qt5/Makefile
	+++ chinese/gcin-qt5/Makefile
	@@ -15,7 +15,7 @@

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/qt5-im
	USES= compiler:c++11-lang gmake pkgconfig qt:5 tar:xz
	-USE_QT= qdbus qmake_build buildtools_build core gui
	+USE_QT= qdbus qmake:build buildtools:build core gui
	USE_CXXSTD= c++11
	MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
	MKDIR="${MKDIR}"
	Index: comms/cutecom/Makefile
	===================================================================
	--- comms/cutecom/Makefile
	+++ comms/cutecom/Makefile
	@@ -13,7 +13,7 @@
	RUN_DEPENDS= lsz:comms/lrzsz

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= buildtools_build core gui network qmake_build serialport widgets
	+USE_QT= buildtools:build core gui network qmake:build serialport widgets
	USE_GITLAB= yes

	GL_COMMIT= cce2e5ec01df09ca4b05f055f21942e0de7eb7dd
	Index: comms/inspectrum/Makefile
	===================================================================
	--- comms/inspectrum/Makefile
	+++ comms/inspectrum/Makefile
	@@ -20,7 +20,7 @@
	GH_ACCOUNT= miek
	GH_TAGNAME= d6115cb458068fa64c7bbd9020bcbab3373fee0e

	-USE_QT= core buildtools_build concurrent widgets
	+USE_QT= core buildtools:build concurrent widgets
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: comms/klog/Makefile
	===================================================================
	--- comms/klog/Makefile
	+++ comms/klog/Makefile
	@@ -13,9 +13,9 @@
	USES= compiler:c++11-lang gl qmake qt:5 xorg
	USE_GITHUB= yes
	USE_GL= gl
	-USE_QT= buildtools_build charts core declarative gui \
	- linguisttools_build location multimedia network \
	- printsupport sql sql-sqlite3_run serialport widgets
	+USE_QT= buildtools:build charts core declarative gui \
	+ linguisttools:build location multimedia network \
	+ printsupport sql sql-sqlite3:run serialport widgets
	GH_ACCOUNT= ea4k
	GH_PROJECT= klog

	Index: comms/libsdr-gui/Makefile
	===================================================================
	--- comms/libsdr-gui/Makefile
	+++ comms/libsdr-gui/Makefile
	@@ -17,7 +17,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= hmatuschek

	-USE_QT= core buildtools_build qmake widgets
	+USE_QT= core buildtools:build qmake widgets
	USES= cmake compiler:c++11-lang pkgconfig qt:5
	USE_LDCONFIG= yes

	Index: comms/nanovna-saver/Makefile
	===================================================================
	--- comms/nanovna-saver/Makefile
	+++ comms/nanovna-saver/Makefile
	@@ -18,7 +18,7 @@

	USES= python:3.3+ pyqt:5
	USE_PYTHON= distutils autoplist noflavors
	-USE_PYQT= pyqt5_run
	+USE_PYQT= pyqt5:run

	USE_GITHUB= yes
	GH_ACCOUNT= NanoVNA-Saver
	Index: comms/qt5-connectivity/Makefile
	===================================================================
	--- comms/qt5-connectivity/Makefile
	+++ comms/qt5-connectivity/Makefile
	@@ -7,6 +7,6 @@
	COMMENT= Qt connectivity (Bluetooth/NFC) module

	USES= compiler:c++11-lang qmake qt-dist:5,connectivity
	-USE_QT= concurrent core declarative buildtools_build
	+USE_QT= concurrent core declarative buildtools:build

	.include <bsd.port.mk>
	Index: comms/qt5-sensors/Makefile
	===================================================================
	--- comms/qt5-sensors/Makefile
	+++ comms/qt5-sensors/Makefile
	@@ -7,6 +7,6 @@
	COMMENT= Qt sensors module

	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors
	-USE_QT= core declarative buildtools_build
	+USE_QT= core declarative buildtools:build

	.include <bsd.port.mk>
	Index: comms/qt5-serialbus/Makefile
	===================================================================
	--- comms/qt5-serialbus/Makefile
	+++ comms/qt5-serialbus/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lib perl5 qmake qt-dist:5,serialbus
	USE_PERL5= extract
	-USE_QT= core network serialport buildtools_build
	+USE_QT= core network serialport buildtools:build
	QT_BINARIES= yes

	.include <bsd.port.mk>
	Index: comms/qt5-serialport/Makefile
	===================================================================
	--- comms/qt5-serialport/Makefile
	+++ comms/qt5-serialport/Makefile
	@@ -8,6 +8,6 @@

	USES= compiler:c++11-lang libtool perl5 qmake qt-dist:5,serialport
	USE_PERL5= extract
	-USE_QT= core buildtools_build
	+USE_QT= core buildtools:build

	.include <bsd.port.mk>
	Index: comms/sdr-wspr/Makefile
	===================================================================
	--- comms/sdr-wspr/Makefile
	+++ comms/sdr-wspr/Makefile
	@@ -15,7 +15,7 @@
	USES= cmake compiler:gcc-c++11-lib fortran pkgconfig qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= hmatuschek
	-USE_QT= core buildtools_build qmake webkit widgets
	+USE_QT= core buildtools:build qmake webkit widgets

	PLIST_FILES= bin/sdr-wspr share/applications/sdr-wspr.desktop \
	share/icons/sdr-wspr.svg
	Index: comms/wsjtx/Makefile
	===================================================================
	--- comms/wsjtx/Makefile
	+++ comms/wsjtx/Makefile
	@@ -24,7 +24,7 @@
	USE_GL= glu
	USE_QT= core gui network widgets \
	multimedia concurrent printsupport serialport sql sql-sqlite3 \
	- buildtools_build linguisttools_build qmake_build testlib
	+ buildtools:build linguisttools:build qmake:build testlib

	CONFLICTS_INSTALL= wsjtz

	Index: comms/wsjtz/Makefile
	===================================================================
	--- comms/wsjtz/Makefile
	+++ comms/wsjtz/Makefile
	@@ -31,7 +31,7 @@
	USE_GL= glu
	USE_QT= core gui network widgets \
	multimedia concurrent printsupport serialport sql sql-sqlite3 \
	- testlib buildtools_build linguisttools_build qmake_build
	+ testlib buildtools:build linguisttools:build qmake:build

	CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
	-DLOCALBASE::STRING="${LOCALBASE}"
	Index: comms/xcwcp/Makefile
	===================================================================
	--- comms/xcwcp/Makefile
	+++ comms/xcwcp/Makefile
	@@ -12,7 +12,7 @@
	MASTERDIR= ${.CURDIR}/../unixcw

	USES= compiler:c++11-lang gettext qt:5
	-USE_QT= gui widgets buildtools_build qmake_build
	+USE_QT= gui widgets buildtools:build qmake:build
	USE_CXXSTD= c++11
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --enable-xcwcp
	Index: databases/akonadi/Makefile
	===================================================================
	--- databases/akonadi/Makefile
	+++ databases/akonadi/Makefile
	@@ -20,10 +20,10 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes itemmodels itemviews \
	kio service windowsystem widgetsaddons xmlgui \
	- designerplugin_build ecm_build \
	- designerplugin_run
	+ designerplugin:build ecm:build \
	+ designerplugin:run
	USE_QT= concurrent core dbus designer gui network sql testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"

	@@ -37,7 +37,7 @@

	MYSQL_DESC= Install MySQL Qt plugin and server
	MYSQL_USES= mysql:server qt:5
	-MYSQL_USE= QT=sql-mysql_run
	+MYSQL_USE= QT=sql-mysql:run
	MYSQL_CMAKE_BOOL= AKONADI_BUILD_MYSQL

	PGSQL_DESC= Install PostgreSQL Qt plugin
	@@ -46,12 +46,12 @@
	# remote server.
	#PGSQL_USE= PGSQL=server
	PGSQL_USES= qt:5
	-PGSQL_USE= QT=sql-pgsql_run
	+PGSQL_USE= QT=sql-pgsql:run
	PGSQL_CMAKE_BOOL= AKONADI_BUILD_PGSQL

	SQLITE_DESC= Enable SQLite backend
	SQLITE_USES= qt:5 sqlite:3
	-SQLITE_USE= QT=sql-sqlite3_run
	+SQLITE_USE= QT=sql-sqlite3:run
	SQLITE_CMAKE_BOOL= AKONADI_BUILD_QSQLITE

	.include <bsd.port.options.mk>
	Index: databases/cutelyst-asql/Makefile
	===================================================================
	--- databases/cutelyst-asql/Makefile
	+++ databases/cutelyst-asql/Makefile
	@@ -16,7 +16,7 @@
	USES= cmake compiler:c++11-lang localbase pgsql qt:5
	USE_GITHUB= yes
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build \
	+USE_QT= qmake:build buildtools:build \
	core

	GH_ACCOUNT= cutelyst
	Index: databases/kbibtex/Makefile
	===================================================================
	--- databases/kbibtex/Makefile
	+++ databases/kbibtex/Makefile
	@@ -20,10 +20,10 @@
	coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
	kio parts service solid sonnet syntaxhighlighting texteditor \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus declarative gui location network \
	printsupport webchannel widgets xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: databases/kdb/Makefile
	===================================================================
	--- databases/kdb/Makefile
	+++ databases/kdb/Makefile
	@@ -18,7 +18,7 @@
	python qt:5 tar:xz
	USE_KDE= coreaddons ecm i18n
	USE_QT= core gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	# In the future, these options will be moved into slave ports
	OPTIONS_DEFINE= SQLITE MYSQL PGSQL
	Index: databases/kexi/Makefile
	===================================================================
	--- databases/kexi/Makefile
	+++ databases/kexi/Makefile
	@@ -21,9 +21,9 @@
	configwidgets coreaddons crash ecm guiaddons i18n \
	iconthemes itemviews jobwidgets kio parts service \
	solid sonnet syntaxhighlighting texteditor textwidgets \
	- widgetsaddons windowsystem xmlgui breeze-icons_build
	+ widgetsaddons windowsystem xmlgui breeze-icons:build
	USE_QT= concurrent core dbus declarative gui network printsupport webkit widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	CONFLICTS_INSTALL= calligra-2*
	Index: databases/opendbviewer/Makefile
	===================================================================
	--- databases/opendbviewer/Makefile
	+++ databases/opendbviewer/Makefile
	@@ -14,7 +14,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= Jet1oeil
	USE_QT= core gui network sql sql-sqlite3 testlib widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	OPTIONS_DEFINE= DOCS PGSQL MYSQL
	OPTIONS_DEFAULT= PGSQL
	Index: databases/pgmodeler/Makefile
	===================================================================
	--- databases/pgmodeler/Makefile
	+++ databases/pgmodeler/Makefile
	@@ -17,7 +17,7 @@
	USE_GNOME= libxml2
	USE_GL= gl
	USE_QT= core gui network printsupport sql svg widgets testlib uitools \
	- buildtools_build
	+ buildtools:build
	USE_XORG= x11 xext

	USE_LDCONFIG= yes
	Index: databases/qt5-sql/Makefile
	===================================================================
	--- databases/qt5-sql/Makefile
	+++ databases/qt5-sql/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5= extract
	-USE_QT= core qmake_build buildtools_build
	+USE_QT= core qmake:build buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= -no-gui -no-xcb

	Index: databases/redisdesktopmanager/Makefile
	===================================================================
	--- databases/redisdesktopmanager/Makefile
	+++ databases/redisdesktopmanager/Makefile
	@@ -40,7 +40,7 @@
	redis:hiredis:6850306:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
	simdjson:simdjson:3bd8b0b:simdjson/3rdparty/simdjson
	USE_QT= charts concurrent core declarative gui network \
	- quickcontrols svg widgets buildtools_build qmake_build
	+ quickcontrols svg widgets buildtools:build qmake:build
	QMAKE_ARGS+= SYSTEM_BROTLI=1 SYSTEM_LZ4=1 SYSTEM_SNAPPY=1 \
	SYSTEM_ZSTD=1 VERSION=${PORTVERSION}
	BINARY_ALIAS= python3-config=${PYTHON_CMD}-config \
	Index: databases/sqlitebrowser/Makefile
	===================================================================
	--- databases/sqlitebrowser/Makefile
	+++ databases/sqlitebrowser/Makefile
	@@ -18,7 +18,7 @@
	USES= compiler:c++11-lang cmake desktop-file-utils gnome qt:5 sqlite
	CMAKE_ARGS+= -DQT_INCLUDE_DIR=${QT_INCDIR} -DQT_LIBRARY_DIR=${QT_LIBDIR}
	USE_QT= core concurrent gui network printsupport testlib widgets \
	- buildtools_build linguisttools_build qmake_build xml
	+ buildtools:build linguisttools:build qmake:build xml
	USE_GITHUB= yes

	PORTSCOUT= ignore:1
	Index: databases/sqlitestudio/Makefile
	===================================================================
	--- databases/sqlitestudio/Makefile
	+++ databases/sqlitestudio/Makefile
	@@ -29,8 +29,8 @@
	USES= compiler:c++17-lang gl gmake ncurses qmake qt:5 readline sqlite
	USE_GITHUB= yes
	GH_ACCOUNT= pawelsalawa
	-USE_QT= core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
	- uitools buildtools_build linguisttools_build
	+USE_QT= core concurrent gui network script sql sql-sqlite3:run svg widgets xml \
	+ uitools buildtools:build linguisttools:build
	USE_GL= gl

	WRKSRC_SUBDIR= SQLiteStudio3
	Index: databases/symphytum/Makefile
	===================================================================
	--- databases/symphytum/Makefile
	+++ databases/symphytum/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= qmake qt:5
	-USE_QT= buildtools_build \
	+USE_QT= buildtools:build \
	core gui network printsupport sql svg widgets
	USE_GITHUB= yes
	GH_ACCOUNT= giowck
	Index: deskutils/akonadi-calendar-tools/Makefile
	===================================================================
	--- deskutils/akonadi-calendar-tools/Makefile
	+++ deskutils/akonadi-calendar-tools/Makefile
	@@ -13,12 +13,12 @@
	itemviews jobwidgets kdelibs4support kio notifications parts \
	service solid sonnet textwidgets unitconversion widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar calendarsupport calendarcore calendarutils \
	identitymanagement libkdepim mime pimtextedit
	USE_QT= core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/akonadi-import-wizard/Makefile
	===================================================================
	--- deskutils/akonadi-import-wizard/Makefile
	+++ deskutils/akonadi-import-wizard/Makefile
	@@ -16,13 +16,13 @@
	USE_KDE= archive auth codecs completion config configwidgets coreaddons \
	crash dbusaddons i18n itemmodels kio service wallet \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \
	identitymanagement imap libkdepim libkleo mailcommon mailimporter \
	mailtransport messagelib mime pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/akonadiconsole/Makefile
	===================================================================
	--- deskutils/akonadiconsole/Makefile
	+++ deskutils/akonadiconsole/Makefile
	@@ -21,14 +21,14 @@
	itemmodels itemviews jobwidgets kdelibs4support kio \
	notifications parts service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \
	akonadisearch calendarcore calendarsupport contacts \
	grantleetheme identitymanagement libkdepim libkleo messagelib mime \
	pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network printsupport sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/akregator/Makefile
	===================================================================
	--- deskutils/akregator/Makefile
	+++ deskutils/akregator/Makefile
	@@ -19,13 +19,13 @@
	i18n iconthemes itemmodels jobwidgets kcmutils kio \
	notifications notifyconfig parts service solid sonnet texteditor\
	textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadimime contacts grantleetheme kontactinterface \
	libkdepim libkleo messagelib mime pimcommon pimtextedit syndication
	USE_QT= concurrent core dbus declarative gui location network printsupport \
	webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/ausweisapp2/Makefile
	===================================================================
	--- deskutils/ausweisapp2/Makefile
	+++ deskutils/ausweisapp2/Makefile
	@@ -22,7 +22,7 @@
	GH_PROJECT= AusweisApp2
	USE_QT= concurrent core declarative graphicaleffects gui network \
	quickcontrols2 svg websockets widgets \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build

	# The VENDOR variable controls the name of the directory in ${PREFIX}/share.
	CMAKE_ARGS= -DVENDOR=${PORTNAME}
	Index: deskutils/basket/Makefile
	===================================================================
	--- deskutils/basket/Makefile
	+++ deskutils/basket/Makefile
	@@ -24,7 +24,7 @@
	notifications parts service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network phonon4 testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	USE_GITHUB= yes
	Index: deskutils/birdtray/Makefile
	===================================================================
	--- deskutils/birdtray/Makefile
	+++ deskutils/birdtray/Makefile
	@@ -14,8 +14,8 @@
	xorg
	USE_XORG= x11
	USE_KDE= i18n
	-USE_QT= core gui network svg widgets x11extras buildtools_build \
	- linguisttools_build qmake_build
	+USE_QT= core gui network svg widgets x11extras buildtools:build \
	+ linguisttools:build qmake:build
	USE_GITHUB= yes
	GH_ACCOUNT= gyunaev

	Index: deskutils/calibre/Makefile
	===================================================================
	--- deskutils/calibre/Makefile
	+++ deskutils/calibre/Makefile
	@@ -61,7 +61,7 @@
	USE_RC_SUBR= calibre
	SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION}
	USE_PYQT= pyqt5 pysip qtbuilder sip webengine
	-USE_QT= buildtools_build core dbus gui qmake_build widgets
	+USE_QT= buildtools:build core dbus gui qmake:build widgets
	USE_GL= egl gl
	USE_GNOME= glib20
	USE_XORG= xrender xext x11
	Index: deskutils/calindori/Makefile
	===================================================================
	--- deskutils/calindori/Makefile
	+++ deskutils/calindori/Makefile
	@@ -16,10 +16,10 @@
	USE_QT= core dbus declarative gui \
	network quickcontrols quickcontrols2 \
	svg widgets \
	- buildtools_build linguist_build qmake_build
	+ buildtools:build linguist:build qmake:build
	USE_KDE= calendarcore config coreaddons dbusaddons i18n kirigami2 \
	notifications people service \
	- ecm_build
	+ ecm:build

	CMAKE_OFF= BUILD_TESTING

	Index: deskutils/charmtimetracker/Makefile
	===================================================================
	--- deskutils/charmtimetracker/Makefile
	+++ deskutils/charmtimetracker/Makefile
	@@ -26,7 +26,7 @@
	USE_QT= core dbus gui \
	network printsupport script sql sql-sqlite3 \
	widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= ice x11 xcb xext xscrnsaver

	.include <bsd.port.mk>
	Index: deskutils/coolreader/Makefile
	===================================================================
	--- deskutils/coolreader/Makefile
	+++ deskutils/coolreader/Makefile
	@@ -23,7 +23,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= buggins

	-USE_QT= core buildtools_build gui qmake_build widgets linguisttools_build
	+USE_QT= core buildtools:build gui qmake:build widgets linguisttools:build

	CMAKE_ARGS= -D GUI=QT5 -D MAX_IMAGE_SCALE_MUL=2 \
	-D DOC_DATA_COMPRESSION_LEVEL=3 -D DOC_BUFFER_SIZE=0x1400000
	Index: deskutils/copyq/Makefile
	===================================================================
	--- deskutils/copyq/Makefile
	+++ deskutils/copyq/Makefile
	@@ -33,8 +33,8 @@
	USE_LDCONFIG= yes

	USE_QT= core declarative gui network script svg wayland widgets \
	- x11extras buildtools_build linguisttools_build qmake_build \
	- imageformats_run
	+ x11extras buildtools:build linguisttools:build qmake:build \
	+ imageformats:run
	USE_XORG= x11 xau xcb xdmcp xtst

	LDFLAGS+= -Wl,--as-needed
	Index: deskutils/coregarage/Makefile
	===================================================================
	--- deskutils/coregarage/Makefile
	+++ deskutils/coregarage/Makefile
	@@ -14,7 +14,7 @@
	libcprime-core.so:deskutils/libcprime

	USES= cmake localbase:ldflags qt:5
	-USE_QT= buildtools_build core gui network qmake_build widgets
	+USE_QT= buildtools:build core gui network qmake:build widgets
	USE_GITLAB= yes

	GL_ACCOUNT= CuboCore
	Index: deskutils/fet/Makefile
	===================================================================
	--- deskutils/fet/Makefile
	+++ deskutils/fet/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++14-lang gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= core printsupport widgets buildtools_build
	+USE_QT= core printsupport widgets buildtools:build

	INSTALL_TARGET= ${WRKSRC}/fet-cl

	Index: deskutils/flameshot/Makefile
	===================================================================
	--- deskutils/flameshot/Makefile
	+++ deskutils/flameshot/Makefile
	@@ -19,7 +19,7 @@
	USE_GITHUB= yes
	USE_GL= gl
	USE_QT= core dbus gui linguist network svg widgets \
	- buildtools_build
	+ buildtools:build

	post-patch:
	@${REINPLACE_CMD} -e 's,$${CMAKE_INSTALL_FULL_BINDIR},${LOCALBASE}/bin,1' \
	Index: deskutils/grantlee-editor/Makefile
	===================================================================
	--- deskutils/grantlee-editor/Makefile
	+++ deskutils/grantlee-editor/Makefile
	@@ -19,13 +19,13 @@
	coreaddons crash dbusaddons i18n itemmodels jobwidgets \
	kio newstuff service solid syntaxhighlighting texteditor \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \
	libkleo messagelib mime pimcommon pimtextedit
	USE_QT= concurrent core dbus declarative gui location network \
	printsupport webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/grantleetheme/Makefile
	===================================================================
	--- deskutils/grantleetheme/Makefile
	+++ deskutils/grantleetheme/Makefile
	@@ -11,9 +11,9 @@
	pkgconfig qt:5 tar:xz
	USE_KDE= attica auth codecs config configwidgets coreaddons guiaddons \
	i18n iconthemes newstuff service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/itinerary/Makefile
	===================================================================
	--- deskutils/itinerary/Makefile
	+++ deskutils/itinerary/Makefile
	@@ -12,11 +12,11 @@
	dbusaddons i18n jobwidgets kio kpkpass notifications kosm \
	kitinerary kpublictransport mime qqc2-desktop-style \
	service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network quick3d \
	quickcontrols2 \
	testlib widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: deskutils/kaddressbook/Makefile
	===================================================================
	--- deskutils/kaddressbook/Makefile
	+++ deskutils/kaddressbook/Makefile
	@@ -16,13 +16,13 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	i18n iconthemes itemmodels jobwidgets kcmutils kio parts pimtextedit \
	prison service solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadisearch contacts grantleetheme \
	imap kontactinterface libkdepim mime pimcommon \
	- kdepim-runtime5_run
	+ kdepim-runtime5:run
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/kalarm/Makefile
	===================================================================
	--- deskutils/kalarm/Makefile
	+++ deskutils/kalarm/Makefile
	@@ -14,16 +14,16 @@
	itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
	notifications notifyconfig parts service solid sonnet textwidgets \
	unitconversion wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime calendarcore \
	calendarutils contacts globalaccel grantleetheme holidays identitymanagement \
	idletime libkdepim mailcommon mailtransport mime \
	pimcommon pimtextedit imap \
	- kdepim-runtime5_run
	+ kdepim-runtime5:run
	USE_QT= concurrent core dbus gui network phonon4 printsupport widgets \
	x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/kalendar/Makefile
	===================================================================
	--- deskutils/kalendar/Makefile
	+++ deskutils/kalendar/Makefile
	@@ -13,15 +13,15 @@
	qt:5 tar:xz xorg
	USE_QT= concurrent core dbus declarative gui location multimedia \
	network printsupport quickcontrols2 svg widgets xml \
	- buildtools_build declarative-test_build linguist_build \
	- qmake_build testlib_build
	+ buildtools:build declarative-test:build linguist:build \
	+ qmake:build testlib:build
	USE_KDE= akonadi akonadicalendar akonadicontacts auth calendarcore \
	calendarsupport calendarutils codecs config configwidgets \
	contacts coreaddons dbusaddons eventviews grantleetheme i18n \
	identitymanagement itemmodels kio kirigami2 mime notifications \
	people pimtextedit qqc2-desktop-style service sonnet \
	textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: deskutils/kcharselect/Makefile
	===================================================================
	--- deskutils/kcharselect/Makefile
	+++ deskutils/kcharselect/Makefile
	@@ -12,9 +12,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash bookmarks \
	doctools i18n widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: deskutils/kchmviewer/Makefile
	===================================================================
	--- deskutils/kchmviewer/Makefile
	+++ deskutils/kchmviewer/Makefile
	@@ -15,7 +15,7 @@
	qmake:outsource qt:5 xorg
	USE_GL= gl
	USE_QT= core dbus gui network printsupport webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	USE_GITHUB= yes
	Index: deskutils/kdeconnect-kde/Makefile
	===================================================================
	--- deskutils/kdeconnect-kde/Makefile
	+++ deskutils/kdeconnect-kde/Makefile
	@@ -24,10 +24,10 @@
	itemviews jobwidgets kcmutils kio kirigami2 notifications \
	people qqc2-desktop-style service solid wayland widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui multimedia network \
	quickcontrols2 testlib wayland widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xtst
	USE_LDCONFIG= ${QT_QMLDIR}/org/kde/kdeconnect

	Index: deskutils/kdepim-addons/Makefile
	===================================================================
	--- deskutils/kdepim-addons/Makefile
	+++ deskutils/kdepim-addons/Makefile
	@@ -22,7 +22,7 @@
	dbusaddons guiaddons i18n iconthemes itemmodels itemviews jobwidgets \
	kdeclarative khtml kio parts prison service solid sonnet syntaxhighlighting \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar akonadicontacts akonadiimportwizard \
	akonadimime akonadinotes calendarcore calendarsupport \
	@@ -33,7 +33,7 @@
	messagelib mime pimcommon pimtextedit tnef
	USE_QT= concurrent core dbus declarative gui location network printsupport testlib \
	webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/kdepim-runtime/Makefile
	===================================================================
	--- deskutils/kdepim-runtime/Makefile
	+++ deskutils/kdepim-runtime/Makefile
	@@ -31,7 +31,7 @@
	pimtextedit syndication
	USE_QT= concurrent core dbus declarative gui location network networkauth printsupport speech \
	script webchannel webengine widgets xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/keditbookmarks/Makefile
	===================================================================
	--- deskutils/keditbookmarks/Makefile
	+++ deskutils/keditbookmarks/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons i18n iconthemes jobwidgets kio parts service \
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: deskutils/kfind/Makefile
	===================================================================
	--- deskutils/kfind/Makefile
	+++ deskutils/kfind/Makefile
	@@ -12,9 +12,9 @@
	jobwidgets kdelibs4support kio notifications parts service \
	solid sonnet textwidgets unitconversion widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: deskutils/kmail-account-wizard/Makefile
	===================================================================
	--- deskutils/kmail-account-wizard/Makefile
	+++ deskutils/kmail-account-wizard/Makefile
	@@ -18,12 +18,12 @@
	dbusaddons i18n itemmodels itemviews kcmutils kio kross \
	newstuff notifications notifyconfig service texteditor wallet \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadimime identitymanagement ldap libkdepim libkleo \
	mailtransport mime pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network script widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/kmail/Makefile
	===================================================================
	--- deskutils/kmail/Makefile
	+++ deskutils/kmail/Makefile
	@@ -28,17 +28,17 @@
	notifications notifyconfig parts service solid sonnet \
	syntaxhighlighting texteditor textwidgets unitconversion wallet \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \
	calendarutils contacts gravatar grantleetheme \
	identitymanagement libkdepim libkleo libksieve \
	kontactinterface ldap mailcommon mailtransport messagelib \
	mime pimcommon pimtextedit tnef \
	- kdepim-runtime5_run
	+ kdepim-runtime5:run
	USE_QT= concurrent core dbus declarative gui location network printsupport \
	webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/knotes/Makefile
	===================================================================
	--- deskutils/knotes/Makefile
	+++ deskutils/knotes/Makefile
	@@ -20,9 +20,9 @@
	USE_KDE+= akonadi akonadicontacts akonadinotes akonadisearch \
	calendarcore calendarutils contacts grantleetheme imap kontactinterface libkdepim \
	mime pimcommon pimtextedit \
	- kdepim-runtime5_run
	+ kdepim-runtime5:run
	USE_QT= concurrent core dbus gui network printsupport widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext
	USE_LDCONFIG= yes

	Index: deskutils/kodaskanna/Makefile
	===================================================================
	--- deskutils/kodaskanna/Makefile
	+++ deskutils/kodaskanna/Makefile
	@@ -19,9 +19,9 @@
	USE_QT= concurrent core dbus declarative gui \
	multimedia network quickcontrols quickcontrols2 \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_KDE= auth codecs config configwidgets coreaddons i18n \
	kio purpose service widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build

	.include <bsd.port.mk>
	Index: deskutils/kongress/Makefile
	===================================================================
	--- deskutils/kongress/Makefile
	+++ deskutils/kongress/Makefile
	@@ -16,9 +16,9 @@
	USE_QT= core dbus declarative gui \
	network quickcontrols quickcontrols2 \
	svg widgets \
	- buildtools_build linguist_build qmake_build
	+ buildtools:build linguist:build qmake:build
	USE_KDE= calendarcore config coreaddons dbusaddons i18n kirigami2 notifications service \
	- ecm_build
	+ ecm:build

	CMAKE_ON= REMINDERS_ENABLED
	CMAKE_OFF= BUILD_TESTING
	Index: deskutils/kontact/Makefile
	===================================================================
	--- deskutils/kontact/Makefile
	+++ deskutils/kontact/Makefile
	@@ -11,13 +11,13 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	guiaddons i18n iconthemes itemmodels jobwidgets kcmutils kio parts \
	service solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi grantleetheme kontactinterface libkdepim pimcommon \
	pimtextedit
	USE_QT= concurrent core dbus declarative gui location network \
	printsupport webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/korganizer/Makefile
	===================================================================
	--- deskutils/korganizer/Makefile
	+++ deskutils/korganizer/Makefile
	@@ -15,16 +15,16 @@
	itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
	newstuff notifications parts service solid sonnet textwidgets \
	unitconversion wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \
	akonadinotes akonadisearch calendarcore calendarsupport \
	calendarutils contacts eventviews grantleetheme holidays identitymanagement \
	imap incidenceeditor kontactinterface ldap \
	libkdepim mailtransport mime pimcommon pimtextedit \
	- kdepim-runtime5_run
	+ kdepim-runtime5:run
	USE_QT= concurrent core dbus gui multimedia network phonon4 printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/kruler/Makefile
	===================================================================
	--- deskutils/kruler/Makefile
	+++ deskutils/kruler/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= auth codecs config configwidgets coreaddons doctools i18n \
	notifications widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb

	OPTIONS_DEFINE= DOCS
	Index: deskutils/ktimetracker/Makefile
	===================================================================
	--- deskutils/ktimetracker/Makefile
	+++ deskutils/ktimetracker/Makefile
	@@ -16,9 +16,9 @@
	coreaddons dbusaddons i18n idletime jobwidgets \
	notifications service textwidgets widgetsaddons \
	windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: deskutils/kuserfeedback/Makefile
	===================================================================
	--- deskutils/kuserfeedback/Makefile
	+++ deskutils/kuserfeedback/Makefile
	@@ -14,7 +14,7 @@
	USES= bison cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= charts core declarative gui network printsupport svg widgets \
	- buildtools_build help_build qdoc_build qmake_build
	+ buildtools:build help:build qdoc:build qmake:build

	OPTIONS_DEFINE= SERVER

	Index: deskutils/latte-dock/Makefile
	===================================================================
	--- deskutils/latte-dock/Makefile
	+++ deskutils/latte-dock/Makefile
	@@ -18,10 +18,10 @@
	guiaddons i18n iconthemes jobwidgets kdeclarative kio \
	libksysguard newstuff notifications package plasma-framework \
	service solid wayland widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets \
	x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xcb xext

	.include <bsd.port.mk>
	Index: deskutils/libcprime/Makefile
	===================================================================
	--- deskutils/libcprime/Makefile
	+++ deskutils/libcprime/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake qt:5
	-USE_QT= buildtools_build core dbus gui network qmake_build widgets
	+USE_QT= buildtools:build core dbus gui network qmake:build widgets
	USE_LDCONFIG= yes
	USE_GITLAB= yes

	Index: deskutils/libkdepim/Makefile
	===================================================================
	--- deskutils/libkdepim/Makefile
	+++ deskutils/libkdepim/Makefile
	@@ -14,12 +14,12 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n iconthemes itemmodels itemviews jobwidgets kcmutils \
	kio service wallet widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadisearch contacts ldap mime
	USE_QT= concurrent core dbus designer gui network uiplugin uitools \
	widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	USE_LDCONFIG= yes

	Index: deskutils/libportal/Makefile
	===================================================================
	--- deskutils/libportal/Makefile
	+++ deskutils/libportal/Makefile
	@@ -13,7 +13,7 @@
	USES= gnome meson pkgconfig qt:5

	USE_GNOME= glib20 gtk30 introspection:build
	-USE_QT= buildtools core gui qmake_build testlib widgets x11extras
	+USE_QT= buildtools core gui qmake:build testlib widgets x11extras
	USE_LDCONFIG= yes

	USE_GITHUB= yes
	Index: deskutils/lumina-archiver/Makefile
	===================================================================
	--- deskutils/lumina-archiver/Makefile
	+++ deskutils/lumina-archiver/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/../../../LICENSE

	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	-USE_QT= buildtools_build concurrent core gui \
	+USE_QT= buildtools:build concurrent core gui \
	multimedia network svg widgets x11extras
	USE_GL= gl
	USE_GITHUB= yes
	@@ -21,7 +21,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= qt=linguist_build
	+NLS_USE= qt=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	CONFLICTS_INSTALL= lumina-1.2.*
	Index: deskutils/lumina-calculator/Makefile
	===================================================================
	--- deskutils/lumina-calculator/Makefile
	+++ deskutils/lumina-calculator/Makefile
	@@ -11,7 +11,7 @@
	USES= compiler:c++11-lang gl qmake qt:5 xorg
	USE_GL= gl
	USE_XORG= x11
	-USE_QT= buildtools_build core gui svg widgets
	+USE_QT= buildtools:build core gui svg widgets
	USE_GITHUB= yes
	GH_ACCOUNT= lumina-desktop
	GH_TAGNAME= 159fc375
	@@ -19,7 +19,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= qt=linguist_build
	+NLS_USE= qt=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	CONFLICTS_INSTALL= lumina-1.2.*
	Index: deskutils/lumina-fileinfo/Makefile
	===================================================================
	--- deskutils/lumina-fileinfo/Makefile
	+++ deskutils/lumina-fileinfo/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/../../../LICENSE

	USES= compiler:c++11-lang gl qmake qt:5
	-USE_QT= buildtools_build concurrent core gui \
	+USE_QT= buildtools:build concurrent core gui \
	multimedia network svg widgets x11extras
	USE_GL= gl
	USE_GITHUB= yes
	@@ -22,7 +22,7 @@
	OPTIONS_SUB= yes

	NLS_QMAKE_ON= CONFIG+=WITH_I18N
	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build

	CONFLICTS_INSTALL= lumina-1.2.*

	Index: deskutils/lumina-fm/Makefile
	===================================================================
	--- deskutils/lumina-fm/Makefile
	+++ deskutils/lumina-fm/Makefile
	@@ -10,7 +10,7 @@
	LICENSE= BSD3CLAUSE

	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	-USE_QT= buildtools_build concurrent core gui imageformats \
	+USE_QT= buildtools:build concurrent core gui imageformats \
	multimedia network svg widgets x11extras
	USE_GL= gl
	USE_GITHUB= yes
	@@ -20,7 +20,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	CONFLICTS_INSTALL= lumina-1.2.*
	Index: deskutils/lumina-mediaplayer/Makefile
	===================================================================
	--- deskutils/lumina-mediaplayer/Makefile
	+++ deskutils/lumina-mediaplayer/Makefile
	@@ -13,7 +13,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl gstreamer qmake qt:5
	USE_GL= gl
	USE_GSTREAMER= gl
	-USE_QT= buildtools_build core concurrent gui \
	+USE_QT= buildtools:build core concurrent gui \
	multimedia network svg widgets x11extras
	USE_GITHUB= yes
	GH_ACCOUNT= lumina-desktop
	@@ -22,7 +22,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= qt=linguist_build
	+NLS_USE= qt=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
	Index: deskutils/lumina-pdf/Makefile
	===================================================================
	--- deskutils/lumina-pdf/Makefile
	+++ deskutils/lumina-pdf/Makefile
	@@ -10,7 +10,7 @@
	LICENSE= BSD3CLAUSE

	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	-USE_QT= buildtools_build concurrent core gui \
	+USE_QT= buildtools:build concurrent core gui \
	multimedia network printsupport \
	svg widgets x11extras
	USE_GL= gl
	@@ -34,7 +34,7 @@
	MUPDF_LIB_DEPENDS= libmupdf.so:graphics/mupdf

	NLS_QMAKE_ON= CONFIG+=WITH_I18N
	-NLS_USE= qt=linguist_build
	+NLS_USE= qt=linguist:build

	POPPLER_QMAKE_ON= USE_POPPLER=true
	POPPLER_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
	Index: deskutils/lumina-photo/Makefile
	===================================================================
	--- deskutils/lumina-photo/Makefile
	+++ deskutils/lumina-photo/Makefile
	@@ -10,7 +10,7 @@
	LICENSE= BSD3CLAUSE

	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	-USE_QT= buildtools_build concurrent core gui multimedia \
	+USE_QT= buildtools:build concurrent core gui multimedia \
	printsupport network svg widgets x11extras
	USE_GL= gl
	USE_GITHUB= yes
	@@ -20,7 +20,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
	Index: deskutils/lumina-screenshot/Makefile
	===================================================================
	--- deskutils/lumina-screenshot/Makefile
	+++ deskutils/lumina-screenshot/Makefile
	@@ -16,7 +16,7 @@
	libxcb-util.so:x11/xcb-util

	USES= compiler:c++11-lang gl qmake qt:5 xorg
	-USE_QT= buildtools_build concurrent core gui \
	+USE_QT= buildtools:build concurrent core gui \
	multimedia network svg x11extras widgets
	USE_XORG= xcb xdamage
	USE_GL= gl
	@@ -27,7 +27,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	CONFLICTS_INSTALL= lumina-1.2.*
	Index: deskutils/lumina-textedit/Makefile
	===================================================================
	--- deskutils/lumina-textedit/Makefile
	+++ deskutils/lumina-textedit/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/../../../LICENSE

	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	-USE_QT= buildtools_build concurrent core gui multimedia \
	+USE_QT= buildtools:build concurrent core gui multimedia \
	network printsupport svg widgets x11extras
	USE_GL= gl
	USE_GITHUB= yes
	@@ -21,7 +21,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	CONFLICTS_INSTALL= lumina-1.2.*
	Index: deskutils/lxqt-notificationd/Makefile
	===================================================================
	--- deskutils/lxqt-notificationd/Makefile
	+++ deskutils/lxqt-notificationd/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++14-lang gettext kde:5 lxqt qt:5 \
	pkgconfig tar:xz gnome xorg
	-USE_QT= buildtools_build qmake_build dbus core gui \
	+USE_QT= buildtools:build qmake:build dbus core gui \
	linguisttools svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools lxqt
	Index: deskutils/maliit-framework/Makefile
	===================================================================
	--- deskutils/maliit-framework/Makefile
	+++ deskutils/maliit-framework/Makefile
	@@ -19,7 +19,7 @@
	GH_ACCOUNT= maliit
	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango
	USE_QT= core dbus declarative gui network wayland widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= xcb

	CMAKE_ON= enable-dbus-activation \
	Index: deskutils/maliit-keyboard/Makefile
	===================================================================
	--- deskutils/maliit-keyboard/Makefile
	+++ deskutils/maliit-keyboard/Makefile
	@@ -19,7 +19,7 @@
	USE_GNOME= glib20
	GLIB_SCHEMAS= org.maliit.keyboard.maliit.gschema.xml
	USE_QT= core dbus declarative gui multimedia network quickcontrols2 \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CMAKE_OFF= enable-tests
	CMAKE_ARGS= -DHUNSPELL_DICT_PATH=${PREFIX}/share/hunspell

	Index: deskutils/mbox-importer/Makefile
	===================================================================
	--- deskutils/mbox-importer/Makefile
	+++ deskutils/mbox-importer/Makefile
	@@ -14,13 +14,13 @@
	USES= cmake compiler:c++11-lib desktop-file-utils gettext kde:5 qt:5 tar:xz
	USE_KDE= archive auth codecs completion config configwidgets coreaddons \
	crash i18n itemmodels kio service widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime contacts \
	grantleetheme identitymanagement imap libkdepim libkleo mailcommon \
	mailimporter messagelib mime pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/mindforger/Makefile
	===================================================================
	--- deskutils/mindforger/Makefile
	+++ deskutils/mindforger/Makefile
	@@ -11,7 +11,7 @@
	LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell

	USES= pkgconfig qmake qt:5
	-USE_QT= buildtools_build core declarative gui location network \
	+USE_QT= buildtools:build core declarative gui location network \
	printsupport webchannel widgets
	USE_GITHUB= yes
	GH_ACCOUNT= dvorka
	Index: deskutils/nextcloudclient/Makefile
	===================================================================
	--- deskutils/nextcloudclient/Makefile
	+++ deskutils/nextcloudclient/Makefile
	@@ -17,8 +17,8 @@
	USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \
	gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \
	sqlite ssl
	-USE_QT= buildtools_build concurrent core dbus declarative graphicaleffects \
	- gui linguist_build location network printsupport qmake_build \
	+USE_QT= buildtools:build concurrent core dbus declarative graphicaleffects \
	+ gui linguist:build location network printsupport qmake:build \
	quickcontrols2 sql svg testlib webchannel websockets \
	widgets xml
	CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \
	Index: deskutils/owncloudclient/Makefile
	===================================================================
	--- deskutils/owncloudclient/Makefile
	+++ deskutils/owncloudclient/Makefile
	@@ -26,7 +26,7 @@
	widgetsaddons windowsystem
	USE_LDCONFIG= yes
	USE_QT= concurrent core dbus gui network sql webkit widgets xml \
	- buildtools_build linguist_build qmake_build
	+ buildtools:build linguist:build qmake:build

	CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:STRING=man \
	-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
	Index: deskutils/pim-data-exporter/Makefile
	===================================================================
	--- deskutils/pim-data-exporter/Makefile
	+++ deskutils/pim-data-exporter/Makefile
	@@ -17,13 +17,13 @@
	coreaddons crash dbusaddons i18n itemmodels itemviews \
	jobwidgets kio notifications service solid wallet \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime akonadinotes calendarcore contacts \
	grantleetheme identitymanagement imap libkdepim libkleo mailcommon \
	mailtransport messagelib mime pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: deskutils/pim-sieve-editor/Makefile
	===================================================================
	--- deskutils/pim-sieve-editor/Makefile
	+++ deskutils/pim-sieve-editor/Makefile
	@@ -11,11 +11,11 @@
	USE_KDE= auth bookmarks codecs config configwidgets coreaddons crash \
	dbusaddons i18n iconthemes kio service wallet \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= libksieve mailtransport pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: deskutils/plasma5-milou/Makefile
	===================================================================
	--- deskutils/plasma5-milou/Makefile
	+++ deskutils/plasma5-milou/Makefile
	@@ -10,6 +10,6 @@
	USE_KDE= auth codecs config coreaddons i18n itemmodels kdeclarative \
	package plasma-framework runner service
	USE_QT= core declarative gui network script widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: deskutils/plasma5-sddm-kcm/Makefile
	===================================================================
	--- deskutils/plasma5-sddm-kcm/Makefile
	+++ deskutils/plasma5-sddm-kcm/Makefile
	@@ -14,7 +14,7 @@
	newstuff service widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative designer gui network uiplugin \
	widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xcb xcursor xext xfixes

	.include <bsd.port.mk>
	Index: deskutils/plasma5-xdg-desktop-portal-kde/Makefile
	===================================================================
	--- deskutils/plasma5-xdg-desktop-portal-kde/Makefile
	+++ deskutils/plasma5-xdg-desktop-portal-kde/Makefile
	@@ -14,10 +14,10 @@
	coreaddons i18n itemviews jobwidgets kdeclarative kio \
	kirigami2 notifications package plasma-framework service solid \
	wayland widgetsaddons windowsystem xmlgui \
	- ecm_build plasma-wayland-protocols_build
	+ ecm:build plasma-wayland-protocols:build
	USE_QT= concurrent core dbus declarative gui network printsupport \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: deskutils/qlipper/Makefile
	===================================================================
	--- deskutils/qlipper/Makefile
	+++ deskutils/qlipper/Makefile
	@@ -21,7 +21,7 @@
	LXQTAUTOSTART_BUILD_DEPENDS= ${LOCALBASE}/share/cmake/lxqt-build-tools/lxqt-build-tools-config.cmake:devel/lxqt-build-tools
	LXQTAUTOSTART_CMAKE_BOOL= ENABLE_LXQT_AUTOSTART

	-USE_QT= buildtools_build qmake_build core gui linguisttools \
	+USE_QT= buildtools:build qmake:build core gui linguisttools \
	network widgets

	USE_XORG= x11
	Index: deskutils/qownnotes/Makefile
	===================================================================
	--- deskutils/qownnotes/Makefile
	+++ deskutils/qownnotes/Makefile
	@@ -14,7 +14,7 @@

	USES= gl gmake pkgconfig qmake qt:5 tar:xz xorg
	USE_GL= gl
	-USE_QT= buildtools_build linguisttools_build \
	+USE_QT= buildtools:build linguisttools:build \
	concurrent core declarative gui network printsupport \
	sql svg websockets widgets x11extras xml xmlpatterns
	USE_XORG= x11
	Index: deskutils/qtfeedback/Makefile
	===================================================================
	--- deskutils/qtfeedback/Makefile
	+++ deskutils/qtfeedback/Makefile
	@@ -13,7 +13,7 @@
	GH_ACCOUNT= qtproject
	USE_GL= gl
	USE_QT= core declarative gui multimedia network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	pre-configure:
	cd ${CONFIGURE_WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} -module QtFeedback
	Index: deskutils/recoll/Makefile
	===================================================================
	--- deskutils/recoll/Makefile
	+++ deskutils/recoll/Makefile
	@@ -26,7 +26,7 @@
	USE_PYTHON= py3kplist
	PYDISTUTILS_PKGNAME= Recoll
	PYDISTUTILS_PKGVERSION= 1.0
	-USE_QT= core gui printsupport widgets xml buildtools_build qmake_build
	+USE_QT= core gui printsupport widgets xml buildtools:build qmake:build

	SHEBANG_FILES= desktop/hotrecoll.py filters/*.py filters/rcl7z \
	filters/rclaudio filters/rclchm filters/rcldia filters/rclepub \
	Index: deskutils/semantik/Makefile
	===================================================================
	--- deskutils/semantik/Makefile
	+++ deskutils/semantik/Makefile
	@@ -17,7 +17,7 @@
	USE_LDCONFIG= yes
	USE_QT= core dbus declarative gui location network printsupport \
	svg webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	SHEBANG_FILES= src/templates/beamer/wscript \
	src/templates/pdflatex/wscript \
	Index: deskutils/syncthingtray/Makefile
	===================================================================
	--- deskutils/syncthingtray/Makefile
	+++ deskutils/syncthingtray/Makefile
	@@ -27,8 +27,8 @@
	USE_KDE= plasma-framework
	USE_QT= concurrent core dbus declarative gui location network \
	printsupport qdbus quickcontrols2 svg webchannel \
	- widgets x11extras buildtools_build doc_build linguist_build \
	- qmake_build testlib_build
	+ widgets x11extras buildtools:build doc:build linguist:build \
	+ qmake:build testlib:build

	CMAKE_OFF= USE_STANDARD_FILESYSTEM SYSTEMD_SUPPORT

	Index: deskutils/todour/Makefile
	===================================================================
	--- deskutils/todour/Makefile
	+++ deskutils/todour/Makefile
	@@ -10,7 +10,7 @@
	LICENSE= GPLv2

	USES= qmake qt:5
	-USE_QT= buildtools_build core gui network widgets
	+USE_QT= buildtools:build core gui network widgets
	USE_GITHUB= yes
	GH_ACCOUNT= SverrirValgeirsson
	GH_PROJECT= Todour
	Index: deskutils/zanshin/Makefile
	===================================================================
	--- deskutils/zanshin/Makefile
	+++ deskutils/zanshin/Makefile
	@@ -18,10 +18,10 @@
	USE_KDE+= akonadicalendar akonadicontacts akonadinotes akonadisearch \
	calendarcore contacts identitymanagement kontactinterface ldap \
	mime pimtextedit \
	- kdepim-runtime5_run
	+ kdepim-runtime5:run
	USE_QT= concurrent core dbus declarative gui network printsupport testlib \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: deskutils/znotes/Makefile
	===================================================================
	--- deskutils/znotes/Makefile
	+++ deskutils/znotes/Makefile
	@@ -11,7 +11,7 @@

	USES= compiler:c++11-lang gl qmake qt:5
	USE_GL= gl
	-USE_QT= buildtools_build linguisttools_build core gui network \
	+USE_QT= buildtools:build linguisttools:build core gui network \
	printsupport widgets xml

	USE_GITHUB= yes
	Index: devel/RStudio/Makefile
	===================================================================
	--- devel/RStudio/Makefile
	+++ devel/RStudio/Makefile
	@@ -70,7 +70,7 @@
	COMMENT+= (desktop UI version)
	USES+= desktop-file-utils qt:5 shared-mime-info
	USE_QT= core dbus declarative gui location network opengl printsupport quickcontrols sensors \
	- sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
	+ sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools:build qmake:build
	CMAKE_ARGS+= -DRSTUDIO_TARGET=Desktop
	INSTALL_SUBDIR= ${PORTNAME:tl}
	EXECUTABLE= ${PORTNAME:tl}
	Index: devel/apitrace/Makefile
	===================================================================
	--- devel/apitrace/Makefile
	+++ devel/apitrace/Makefile
	@@ -33,7 +33,7 @@
	WAFFLE_DESC= Use Waffle library to allow retrace on Wayland, headless etc.

	QT5_USES= qt:5
	-QT5_USE= QT=core,gui,network,widgets,buildtools_build,qmake_build
	+QT5_USE= QT=core,gui,network,widgets,buildtools:build,qmake:build
	QT5_CMAKE_BOOL= ENABLE_GUI

	WAFFLE_LIB_DEPENDS= libwaffle-1.so:graphics/waffle
	Index: devel/cervisia/Makefile
	===================================================================
	--- devel/cervisia/Makefile
	+++ devel/cervisia/Makefile
	@@ -11,9 +11,9 @@
	dbusaddons doctools i18n iconthemes init itemviews \
	jobwidgets kdesu kio notifications parts pty service solid \
	sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/cmake-doc/Makefile
	===================================================================
	--- devel/cmake-doc/Makefile
	+++ devel/cmake-doc/Makefile
	@@ -17,7 +17,7 @@

	NO_ARCH= yes
	USES= cmake qt:5
	-USE_QT= help_build
	+USE_QT= help:build
	USE_LOCALE= en_US.UTF-8

	CMAKE_OFF= SPHINX_MAN
	Index: devel/cmake-gui/Makefile
	===================================================================
	--- devel/cmake-gui/Makefile
	+++ devel/cmake-gui/Makefile
	@@ -27,7 +27,7 @@

	USES= cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \
	shared-mime-info qt:${FLAVOR:S/qt//}
	-_USE_QT5= core gui widgets buildtools_build qmake_build
	+_USE_QT5= core gui widgets buildtools:build qmake:build
	_USE_QT6= base
	USE_QT= ${_USE_QT${FLAVOR:S/qt//}}
	CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
	Index: devel/codequery/Makefile
	===================================================================
	--- devel/codequery/Makefile
	+++ devel/codequery/Makefile
	@@ -19,7 +19,7 @@
	GH_ACCOUNT= ruben2020

	USE_QT= concurrent core gui widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	CMAKE_ON= BUILD_QT5

	Index: devel/cppcheck/Makefile
	===================================================================
	--- devel/cppcheck/Makefile
	+++ devel/cppcheck/Makefile
	@@ -24,7 +24,7 @@

	CMAKE_ON+= BUILD_GUI
	USES+= qt:5
	-USE_QT= core gui widgets printsupport help qmake_build buildtools_build linguisttools_build
	+USE_QT= core gui widgets printsupport help qmake:build buildtools:build linguisttools:build

	BUILD_WRKSRC= ${WRKSRC}/gui
	INSTALL_WRKSRC= ${WRKSRC}/gui
	Index: devel/dolphin-plugins/Makefile
	===================================================================
	--- devel/dolphin-plugins/Makefile
	+++ devel/dolphin-plugins/Makefile
	@@ -17,7 +17,7 @@
	syntaxhighlighting texteditor textwidgets unitconversion widgetsaddons \
	windowsystem xmlgui
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/doxygen/Makefile
	===================================================================
	--- devel/doxygen/Makefile
	+++ devel/doxygen/Makefile
	@@ -48,7 +48,7 @@
	LATEX_USE= TEX=base,dvipsk,pdftex

	QT5_USES= qt:5
	-QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build
	+QT5_USE= QT=core,widgets,gui,xml,qmake:build,buildtools:build
	QT5_CMAKE_BOOL= build_wizard
	QT5_PLIST_FILES= bin/doxywizard

	Index: devel/easy-profiler/Makefile
	===================================================================
	--- devel/easy-profiler/Makefile
	+++ devel/easy-profiler/Makefile
	@@ -16,7 +16,7 @@
	BROKEN_i386= see https://github.com/yse/easy_profiler/issues/202

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= yse
	Index: devel/elf-dissector/Makefile
	===================================================================
	--- devel/elf-dissector/Makefile
	+++ devel/elf-dissector/Makefile
	@@ -19,9 +19,9 @@
	kde:5 pkgconfig qt:5

	USE_QT= core \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_KDE= itemmodels \
	- doctools_build ecm_build
	+ doctools:build ecm:build

	KDE_INVENT= 942274185cc89fabf74f5f1efb886ecf210ab2fb sdk

	Index: devel/eql5/Makefile
	===================================================================
	--- devel/eql5/Makefile
	+++ devel/eql5/Makefile
	@@ -14,7 +14,7 @@
	USES= gl qmake qt:5
	USE_QT= core declarative gui help location multimedia network \
	printsupport sql svg webchannel webengine widgets \
	- buildtools_build uitools_build
	+ buildtools:build uitools:build
	USE_GL= gl
	USE_LDCONFIG= yes

	Index: devel/fuel/Makefile
	===================================================================
	--- devel/fuel/Makefile
	+++ devel/fuel/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lang gmake qmake qt:5 shebangfix
	USE_QT= core gui network webkit widgets \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build

	SHEBANG_FILES= intl/convert.sh
	PLIST_FILES= bin/fuel share/applications/fuel.desktop \
	Index: devel/gammaray/Makefile
	===================================================================
	--- devel/gammaray/Makefile
	+++ devel/gammaray/Makefile
	@@ -20,7 +20,7 @@

	USE_QT= 3d concurrent core declarative designer gui help linguisttools \
	location network printsupport script scripttools svg uiplugin \
	- webchannel widgets xml buildtools_build qdoc_build qmake_build
	+ webchannel widgets xml buildtools:build qdoc:build qmake:build
	USE_KDE= coreaddons syntaxhighlighting

	USE_GITHUB= yes
	Index: devel/gitklient/Makefile
	===================================================================
	--- devel/gitklient/Makefile
	+++ devel/gitklient/Makefile
	@@ -19,7 +19,7 @@
	jobwidgets kio parts service solid sonnet syntaxhighlighting \
	texteditor textwidgets widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/gitqlient/Makefile
	===================================================================
	--- devel/gitqlient/Makefile
	+++ devel/gitqlient/Makefile
	@@ -13,7 +13,7 @@
	USES= compiler:c++11-lang cpe qmake:outsource qt:5
	USE_GL+= gl
	USE_QT= core gui widgets \
	- buildtools_build
	+ buildtools:build

	USE_GITHUB= yes
	GH_ACCOUNT= francescmm
	Index: devel/grantlee5/Makefile
	===================================================================
	--- devel/grantlee5/Makefile
	+++ devel/grantlee5/Makefile
	@@ -14,7 +14,7 @@
	PORTSCOUT= limit:^5\.

	USE_QT= core declarative gui network script \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USES= cmake compiler:c++11-lib grantlee:5,selfbuild qt:5
	USE_CXXSTD= c++11
	CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE
	Index: devel/gwenhywfar/Makefile
	===================================================================
	--- devel/gwenhywfar/Makefile
	+++ devel/gwenhywfar/Makefile
	@@ -76,7 +76,7 @@
	USES+= compiler:c++11-lang gl qmake:no_env qt:5
	USE_GL= gl
	USE_QT= core gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \
	--with-qt5-moc=${MOC} \
	--with-qt5-uic=${UIC}
	Index: devel/heaptrack/Makefile
	===================================================================
	--- devel/heaptrack/Makefile
	+++ devel/heaptrack/Makefile
	@@ -23,7 +23,7 @@
	jobwidgets kio kio service solid threadweaver \
	widgetsaddons windowsystem
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/heimdall/Makefile
	===================================================================
	--- devel/heimdall/Makefile
	+++ devel/heimdall/Makefile
	@@ -19,7 +19,7 @@
	OPTIONS_SUB= yes

	GUI_USES= qt:5
	-GUI_USE= QT=buildtools_build,core,gui,qmake_build,widgets
	+GUI_USE= QT=buildtools:build,core,gui,qmake:build,widgets
	GUI_CMAKE_OFF= -DDISABLE_FRONTEND=YES

	GH_ACCOUNT= Benjamin-Dobell
	Index: devel/injeqt/Makefile
	===================================================================
	--- devel/injeqt/Makefile
	+++ devel/injeqt/Makefile
	@@ -14,7 +14,7 @@
	GH_ACCOUNT= vogel

	USES= cmake compiler:c++11-lib pathfix qt:5
	-USE_QT= core buildtools_build qmake_build testlib_build
	+USE_QT= core buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	CMAKE_ON= DISABLE_EXAMPLES \
	Index: devel/kapptemplate/Makefile
	===================================================================
	--- devel/kapptemplate/Makefile
	+++ devel/kapptemplate/Makefile
	@@ -12,9 +12,9 @@
	USE_KDE= auth archive codecs completion config configwidgets coreaddons \
	doctools i18n jobwidgets kio newstuff service solid \
	widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/kcachegrind/Makefile
	===================================================================
	--- devel/kcachegrind/Makefile
	+++ devel/kcachegrind/Makefile
	@@ -11,9 +11,9 @@
	USE_KDE= archive auth bookmarks codecs completion config configwidgets \
	coreaddons dbusaddons i18n itemviews jobwidgets kio service solid \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	SHEBANG_FILES= converters/dprof2calltree \
	Index: devel/kdbg/Makefile
	===================================================================
	--- devel/kdbg/Makefile
	+++ devel/kdbg/Makefile
	@@ -14,7 +14,7 @@
	USE_KDE= auth codecs config configwidgets coreaddons ecm \
	i18n iconthemes widgetsaddons windowsystem xmlgui
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_GITHUB= yes
	GH_ACCOUNT= j6t
	Index: devel/kde-dev-scripts/Makefile
	===================================================================
	--- devel/kde-dev-scripts/Makefile
	+++ devel/kde-dev-scripts/Makefile
	@@ -7,7 +7,7 @@

	USES= cmake kde:5 perl5 python:run qt:5 shebangfix tar:xz
	USE_KDE= doctools ecm
	-USE_QT= buildtools_build qmake_build
	+USE_QT= buildtools:build qmake:build

	SHEBANG_FILES= cxxmetric \
	draw_lib_dependencies \
	Index: devel/kde-dev-utils/Makefile
	===================================================================
	--- devel/kde-dev-utils/Makefile
	+++ devel/kde-dev-utils/Makefile
	@@ -11,9 +11,9 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons i18n itemviews jobwidgets kio parts service \
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus designer gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/kdesdk-kio/Makefile
	===================================================================
	--- devel/kdesdk-kio/Makefile
	+++ devel/kdesdk-kio/Makefile
	@@ -8,9 +8,9 @@

	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 shebangfix tar:xz
	USE_KDE= config coreaddons i18n kio service \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	SHEBANG_FILES= perldoc/pod2html.pl

	Index: devel/kdesdk-thumbnailers/Makefile
	===================================================================
	--- devel/kdesdk-thumbnailers/Makefile
	+++ devel/kdesdk-thumbnailers/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= completion config coreaddons i18n jobwidgets \
	kio service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/kdesdk/Makefile
	===================================================================
	--- devel/kdesdk/Makefile
	+++ devel/kdesdk/Makefile
	@@ -38,7 +38,7 @@
	KAPPTEMPLATE_RUN_DEPENDS= kapptemplate>=${KDE_APPLICATIONS_VERSION}:devel/kapptemplate

	KATE_DESC= KDE advanced text editor
	-KATE_USE= KDE=kate_run
	+KATE_USE= KDE=kate:run

	KCACHEGRIND_DESC= Profiler frontend
	KCACHEGRIND_RUN_DEPENDS= kcachegrind>=${KDE_APPLICATIONS_VERSION}:devel/kcachegrind
	Index: devel/kdesvn/Makefile
	===================================================================
	--- devel/kdesvn/Makefile
	+++ devel/kdesvn/Makefile
	@@ -23,9 +23,9 @@
	coreaddons dbusaddons ecm i18n iconthemes itemviews jobwidgets \
	kio notifications parts service sonnet solid texteditor \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	PORTSCOUT= ignore:1
	Index: devel/kdev-php/Makefile
	===================================================================
	--- devel/kdev-php/Makefile
	+++ devel/kdev-php/Makefile
	@@ -17,7 +17,7 @@
	sonnet syntaxhighlighting texteditor textwidgets threadweaver \
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	# Versioning values, to reduce plist churn (match with devel/kdevelop)
	Index: devel/kdev-python/Makefile
	===================================================================
	--- devel/kdev-python/Makefile
	+++ devel/kdev-python/Makefile
	@@ -17,7 +17,7 @@
	solid sonnet syntaxhighlighting texteditor textwidgets \
	threadweaver widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	# Versioning values, to reduce plist churn (match with devel/kdevelop)
	Index: devel/kdevelop-pg-qt/Makefile
	===================================================================
	--- devel/kdevelop-pg-qt/Makefile
	+++ devel/kdevelop-pg-qt/Makefile
	@@ -16,7 +16,7 @@
	USES= bison cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core testlib \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	CONFLICTS= kdevelop-pg-qt-1.0*

	Index: devel/kdevelop/Makefile
	===================================================================
	--- devel/kdevelop/Makefile
	+++ devel/kdevelop/Makefile
	@@ -33,11 +33,11 @@
	textwidgets threadweaver \
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui help network printsupport \
	- script sql widgets xml buildtools_build qmake_build
	+ script sql widgets xml buildtools:build qmake:build
	USE_XORG= x11
	SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \
	kdevplatform/util/.zshrc
	-# Most ports have ecm_build, testlib_build, but because this is an
	+# Most ports have ecm:build, testlib:build, but because this is an
	# IDE, which probably is used for Qt / KDE development (also
	# other things, but let's guess a target market), pull in some
	# additional development things that are otherwise build-dep-only.
	Index: devel/kf5-extra-cmake-modules/Makefile
	===================================================================
	--- devel/kf5-extra-cmake-modules/Makefile
	+++ devel/kf5-extra-cmake-modules/Makefile
	@@ -9,9 +9,9 @@
	LICENSE_FILE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS

	USES= cmake kde:5 qt:5 tar:xz
	-USE_QT= linguisttools buildtools_build qmake_build
	+USE_QT= linguisttools buildtools:build qmake:build

	-HELP_USE= QT=help_build # qt5-help is only used to build a .qch file.
	+HELP_USE= QT=help:build # qt5-help is only used to build a .qch file.
	NO_ARCH= yes

	PORTDOCS= html/*
	Index: devel/kf5-kauth/Makefile
	===================================================================
	--- devel/kf5-kauth/Makefile
	+++ devel/kf5-kauth/Makefile
	@@ -10,8 +10,8 @@
	USES= cmake compiler:c++11-lib cpe kde:5 qt:5 tar:xz
	CPE_VENDOR= kde
	USE_KDE= coreaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui linguisttools widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-kbookmarks/Makefile
	===================================================================
	--- devel/kf5-kbookmarks/Makefile
	+++ devel/kf5-kbookmarks/Makefile
	@@ -8,8 +8,8 @@
	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui linguisttools widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-kcmutils/Makefile
	===================================================================
	--- devel/kf5-kcmutils/Makefile
	+++ devel/kf5-kcmutils/Makefile
	@@ -9,8 +9,8 @@
	USE_KDE= auth codecs config configwidgets coreaddons guiaddons i18n \
	itemviews kdeclarative package service \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: devel/kf5-kconfig/Makefile
	===================================================================
	--- devel/kf5-kconfig/Makefile
	+++ devel/kf5-kconfig/Makefile
	@@ -11,8 +11,8 @@

	USES= cmake compiler:c++11-lib cpe kde:5 qt:5 tar:xz
	CPE_VENDOR= kde
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core dbus declarative gui linguisttools network xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: devel/kf5-kcoreaddons/Makefile
	===================================================================
	--- devel/kf5-kcoreaddons/Makefile
	+++ devel/kf5-kcoreaddons/Makefile
	@@ -9,9 +9,9 @@
	LICENSE_COMB= multi

	USES= cmake compiler:c++11-lib kde:5 qt:5 shared-mime-info tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core linguisttools \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= FAM INOTIFY
	OPTIONS_DEFAULT= INOTIFY
	Index: devel/kf5-kcrash/Makefile
	===================================================================
	--- devel/kf5-kcrash/Makefile
	+++ devel/kf5-kcrash/Makefile
	@@ -7,9 +7,9 @@

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz xorg
	USE_KDE= coreaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= core gui widgets x11extras \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= ice sm x11 xext

	.include <bsd.port.mk>
	Index: devel/kf5-kdbusaddons/Makefile
	===================================================================
	--- devel/kf5-kdbusaddons/Makefile
	+++ devel/kf5-kdbusaddons/Makefile
	@@ -9,8 +9,8 @@
	LICENSE= LGPL21+

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core dbus gui x11extras \
	- buildtools_build linguisttools_build qmake_build testlib_build
	+ buildtools:build linguisttools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: devel/kf5-kdeclarative/Makefile
	===================================================================
	--- devel/kf5-kdeclarative/Makefile
	+++ devel/kf5-kdeclarative/Makefile
	@@ -13,9 +13,9 @@
	USE_KDE= completion config coreaddons globalaccel guiaddons i18n \
	iconthemes jobwidgets kio notifications package service \
	solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/kf5-kdoctools/Makefile
	===================================================================
	--- devel/kf5-kdoctools/Makefile
	+++ devel/kf5-kdoctools/Makefile
	@@ -14,8 +14,8 @@
	USES= cmake compiler:c++11-lib gettext gnome kde:5 qt:5 tar:xz
	USE_GNOME= libxml2 libxslt
	USE_KDE= archive i18n \
	- ecm_build
	+ ecm:build
	USE_QT= core \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-kfilemetadata/Makefile
	===================================================================
	--- devel/kf5-kfilemetadata/Makefile
	+++ devel/kf5-kfilemetadata/Makefile
	@@ -17,8 +17,8 @@
	USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig \
	qt:5 tar:xz
	USE_KDE= archive config coreaddons i18n \
	- ecm_build
	+ ecm:build
	USE_QT= core gui xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-ki18n/Makefile
	===================================================================
	--- devel/kf5-ki18n/Makefile
	+++ devel/kf5-ki18n/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib gettext-runtime \
	gettext-tools:build,run kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= concurrent core declarative network script \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: devel/kf5-kidletime/Makefile
	===================================================================
	--- devel/kf5-kidletime/Makefile
	+++ devel/kf5-kidletime/Makefile
	@@ -6,9 +6,9 @@
	COMMENT= KF5 library for monitoring user activity

	USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz xorg
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core dbus gui widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xcb xscrnsaver

	.include <bsd.port.mk>
	Index: devel/kf5-kio/Makefile
	===================================================================
	--- devel/kf5-kio/Makefile
	+++ devel/kf5-kio/Makefile
	@@ -14,10 +14,10 @@
	i18n iconthemes itemviews jobwidgets kded \
	notifications service solid sonnet textwidgets wallet \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative gui network \
	script widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/kf5-kitemmodels/Makefile
	===================================================================
	--- devel/kf5-kitemmodels/Makefile
	+++ devel/kf5-kitemmodels/Makefile
	@@ -6,8 +6,8 @@
	COMMENT= KF5 models for Qt Model/View system

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core declarative network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: devel/kf5-knewstuff/Makefile
	===================================================================
	--- devel/kf5-knewstuff/Makefile
	+++ devel/kf5-knewstuff/Makefile
	@@ -11,9 +11,9 @@
	configwidgets coreaddons i18n iconthemes itemviews \
	jobwidgets kio kirigami2 package service solid sonnet \
	textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/kf5-knotifications/Makefile
	===================================================================
	--- devel/kf5-knotifications/Makefile
	+++ devel/kf5-knotifications/Makefile
	@@ -11,9 +11,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= codecs config coreaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui linguisttools network phonon4 widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xtst

	OPTIONS_DEFINE= AUDIO
	Index: devel/kf5-knotifyconfig/Makefile
	===================================================================
	--- devel/kf5-knotifyconfig/Makefile
	+++ devel/kf5-knotifyconfig/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= completion config coreaddons i18n jobwidgets kio \
	service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network phonon4 widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= AUDIO
	Index: devel/kf5-kpackage/Makefile
	===================================================================
	--- devel/kf5-kpackage/Makefile
	+++ devel/kf5-kpackage/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= archive config coreaddons i18n \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-kparts/Makefile
	===================================================================
	--- devel/kf5-kparts/Makefile
	+++ devel/kf5-kparts/Makefile
	@@ -11,7 +11,7 @@
	i18n iconthemes jobwidgets kio notifications service \
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/kf5-kpeople/Makefile
	===================================================================
	--- devel/kf5-kpeople/Makefile
	+++ devel/kf5-kpeople/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons i18n itemviews service widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network sql widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-kpty/Makefile
	===================================================================
	--- devel/kf5-kpty/Makefile
	+++ devel/kf5-kpty/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= coreaddons i18n \
	- ecm_build
	+ ecm:build
	USE_QT= core \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-kservice/Makefile
	===================================================================
	--- devel/kf5-kservice/Makefile
	+++ devel/kf5-kservice/Makefile
	@@ -7,9 +7,9 @@

	USES= bison cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= archive config coreaddons crash dbusaddons i18n \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	# Make the applications.menu file not conflict with KDE4.
	CMAKE_ARGS= -DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu"
	Index: devel/kf5-ktexteditor/Makefile
	===================================================================
	--- devel/kf5-ktexteditor/Makefile
	+++ devel/kf5-ktexteditor/Makefile
	@@ -15,10 +15,10 @@
	coreaddons guiaddons i18n iconthemes itemviews \
	jobwidgets kio parts service solid sonnet syntaxhighlighting \
	textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network printsupport \
	script widgets xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/kf5-kunitconversion/Makefile
	===================================================================
	--- devel/kf5-kunitconversion/Makefile
	+++ devel/kf5-kunitconversion/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= i18n \
	- ecm_build
	+ ecm:build
	USE_QT= core network xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/kf5-solid/Makefile
	===================================================================
	--- devel/kf5-solid/Makefile
	+++ devel/kf5-solid/Makefile
	@@ -8,10 +8,10 @@
	RUN_DEPENDS= bsdisks:sysutils/bsdisks

	USES= bison cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= concurrent core dbus declarative gui linguisttools \
	network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	OPTIONS_DEFINE= IMOBILE

	Index: devel/kf5-threadweaver/Makefile
	===================================================================
	--- devel/kf5-threadweaver/Makefile
	+++ devel/kf5-threadweaver/Makefile
	@@ -6,8 +6,8 @@
	COMMENT= KF5 helper for multithreaded programming

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: devel/kio-extras/Makefile
	===================================================================
	--- devel/kio-extras/Makefile
	+++ devel/kio-extras/Makefile
	@@ -18,10 +18,10 @@
	jobwidgets js kdelibs4support khtml kio notifications parts \
	pty service solid sonnet syntaxhighlighting textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network phonon4 printsupport \
	sql svg testlib webchannel widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcursor
	SHEBANG_FILES= info/kde-info2html

	Index: devel/kirigami-gallery/Makefile
	===================================================================
	--- devel/kirigami-gallery/Makefile
	+++ devel/kirigami-gallery/Makefile
	@@ -11,9 +11,9 @@

	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= itemmodels kirigami2 package \
	- ecm_build
	+ ecm:build
	USE_QT= core declarative gui network quickcontrols2 svg widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: devel/kpublictransport/Makefile
	===================================================================
	--- devel/kpublictransport/Makefile
	+++ devel/kpublictransport/Makefile
	@@ -10,7 +10,7 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core declarative gui network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: devel/libdbusmenu-qt/Makefile
	===================================================================
	--- devel/libdbusmenu-qt/Makefile
	+++ devel/libdbusmenu-qt/Makefile
	@@ -20,7 +20,7 @@
	USES= compiler:c++11-lib cmake qt:${FLAVOR:S/qt//}
	USE_LDCONFIG= yes
	_USE_QT5= core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	_USE_QT6= base
	USE_QT= ${_USE_QT${FLAVOR:S/qt//}}
	CMAKE_ON= USE_QT${FLAVOR:S/qt//}
	Index: devel/liblxqt/Makefile
	===================================================================
	--- devel/liblxqt/Makefile
	+++ devel/liblxqt/Makefile
	@@ -14,7 +14,7 @@
	USES= cmake compiler:c++14-lang gettext gnome kde:5 lxqt \
	pkgconfig qt:5 tar:xz xorg
	USE_GNOME= glib20
	-USE_QT= buildtools_build qmake_build dbus core gui linguisttools \
	+USE_QT= buildtools:build qmake:build dbus core gui linguisttools \
	svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools qtxdg
	Index: devel/libqtxdg/Makefile
	===================================================================
	--- devel/libqtxdg/Makefile
	+++ devel/libqtxdg/Makefile
	@@ -12,7 +12,7 @@
	USES= cmake compiler:c++14-lang gnome lxqt pkgconfig qt:5 tar:xz
	USE_LDCONFIG= yes
	USE_GNOME= glib20
	-USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
	+USE_QT= buildtools:build qmake:build core dbus gui svg widgets \
	xml
	USE_LXQT= buildtools

	Index: devel/liteide/Makefile
	===================================================================
	--- devel/liteide/Makefile
	+++ devel/liteide/Makefile
	@@ -34,7 +34,7 @@

	USE_GL= gl
	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
	-USE_QT= buildtools_build core gui network printsupport widgets xml
	+USE_QT= buildtools:build core gui network printsupport widgets xml

	SUB_FILES= liteide

	Index: devel/lokalize/Makefile
	===================================================================
	--- devel/lokalize/Makefile
	+++ devel/lokalize/Makefile
	@@ -13,9 +13,9 @@
	coreaddons crash dbusaddons doctools i18n itemviews \
	jobwidgets kio kross notifications parts service solid sonnet \
	textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network script sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/lxqt-build-tools/Makefile
	===================================================================
	--- devel/lxqt-build-tools/Makefile
	+++ devel/lxqt-build-tools/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/BSD-3-Clause

	USES= cmake lxqt pkgconfig qt:5 tar:xz gnome
	-USE_QT= qmake_build buildtools_build core
	+USE_QT= qmake:build buildtools:build core
	USE_GNOME= glib20

	.include <bsd.port.mk>
	Index: devel/nextpnr/Makefile
	===================================================================
	--- devel/nextpnr/Makefile
	+++ devel/nextpnr/Makefile
	@@ -22,7 +22,7 @@
	${PY_BOOST}

	USES= compiler:c++11-lang cmake qt:5 eigen:3 python:3.5+ gl
	-USE_QT= buildtools_build core gui opengl qmake_build widgets
	+USE_QT= buildtools:build core gui opengl qmake:build widgets
	USE_GL= gl glu
	USE_GITHUB= yes
	GH_ACCOUNT= YosysHQ
	Index: devel/okteta/Makefile
	===================================================================
	--- devel/okteta/Makefile
	+++ devel/okteta/Makefile
	@@ -18,7 +18,7 @@
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative designer gui network printsupport \
	script scripttools widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: devel/plasma5-khotkeys/Makefile
	===================================================================
	--- devel/plasma5-khotkeys/Makefile
	+++ devel/plasma5-khotkeys/Makefile
	@@ -14,10 +14,10 @@
	kdelibs4support kio notifications parts plasma-framework \
	plasma-workspace service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets \
	x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xtst

	.include <bsd.port.mk>
	Index: devel/plasma5-kwrited/Makefile
	===================================================================
	--- devel/plasma5-kwrited/Makefile
	+++ devel/plasma5-kwrited/Makefile
	@@ -9,6 +9,6 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= coreaddons dbusaddons ecm i18n notifications pty
	USE_QT= core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: devel/plasma5-plasma-sdk/Makefile
	===================================================================
	--- devel/plasma5-plasma-sdk/Makefile
	+++ devel/plasma5-plasma-sdk/Makefile
	@@ -13,10 +13,10 @@
	jobwidgets kdeclarative kio kirigami2 newstuff package parts \
	plasma-framework service solid sonnet syntaxhighlighting \
	texteditor textwidgets widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus declarative gui network webkit widgets \
	x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: devel/poxml/Makefile
	===================================================================
	--- devel/poxml/Makefile
	+++ devel/poxml/Makefile
	@@ -9,7 +9,7 @@
	kde:5 qt:5 tar:xz
	USE_KDE= doctools ecm
	USE_QT= core xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: devel/py-pyface/Makefile
	===================================================================
	--- devel/py-pyface/Makefile
	+++ devel/py-pyface/Makefile
	@@ -37,7 +37,7 @@

	QT5_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
	QT5_USES= pyqt:5
	-QT5_USE= PYQT=pyqt5_run,pyqt5_test
	+QT5_USE= PYQT=pyqt5:run,pyqt5:test

	# These tests were extracted from etstool.py and adapted to the ports test framework
	# Note: The occurences of "qt4" aren't typos
	Index: devel/py-qt5-pyqt/Makefile
	===================================================================
	--- devel/py-qt5-pyqt/Makefile
	+++ devel/py-qt5-pyqt/Makefile
	@@ -24,7 +24,7 @@
	multimedia network opengl printsupport quick3d remoteobjects \
	sensors serialport speech sql svg testlib webchannel webkit websockets \
	widgets x11extras xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	PORTSCOUT?= limit:^${_QT_VERSION:R}

	Index: devel/py-qt5-qscintilla2/Makefile
	===================================================================
	--- devel/py-qt5-qscintilla2/Makefile
	+++ devel/py-qt5-qscintilla2/Makefile
	@@ -17,9 +17,9 @@

	USES= python:3.5-3.9 pyqt:5 gl qt:5
	USE_GL= gl
	-USE_PYQT= pyqt5 sip_build qtbuilder
	+USE_PYQT= pyqt5 sip:build qtbuilder
	USE_PYTHON= concurrent flavors py3kplist
	-USE_QT= core gui printsupport widgets buildtools_build qmake_build
	+USE_QT= core gui printsupport widgets buildtools:build qmake:build

	OPTIONS_DEFINE= DEBUG
	DEBUG_CONFIGURE_ON= --debug --trace
	Index: devel/pyotherside-qt5/Makefile
	===================================================================
	--- devel/pyotherside-qt5/Makefile
	+++ devel/pyotherside-qt5/Makefile
	@@ -13,7 +13,7 @@

	USES= compiler:c++11-lang gettext-runtime gl python:3.4+ qmake qt:5
	USE_QT= core declarative declarative-test gui network quickcontrols \
	- svg testlib widgets buildtools_build
	+ svg testlib widgets buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: devel/pyside2-tools/Makefile
	===================================================================
	--- devel/pyside2-tools/Makefile
	+++ devel/pyside2-tools/Makefile
	@@ -23,7 +23,7 @@
	USE_PYTHON= flavors
	USE_QT= 3d buildtools charts core datavis3d declarative \
	designer gui help location multimedia network opengl \
	- printsupport qmake_build script scripttools scxml sensors \
	+ printsupport qmake:build script scripttools scxml sensors \
	speech sql svg testlib uitools webchannel \
	websockets widgets x11extras xml xmlpatterns

	Index: devel/pyside2/Makefile
	===================================================================
	--- devel/pyside2/Makefile
	+++ devel/pyside2/Makefile
	@@ -20,9 +20,9 @@
	USE_GL= gl
	USE_LDCONFIG= yes
	USE_PYTHON= flavors
	-USE_QT= 3d buildtools_build charts concurrent core datavis3d declarative \
	+USE_QT= 3d buildtools:build charts concurrent core datavis3d declarative \
	designer gamepad gui help location multimedia network opengl \
	- printsupport qmake_build quickcontrols2 remoteobjects serialport \
	+ printsupport qmake:build quickcontrols2 remoteobjects serialport \
	script scripttools scxml sensors speech sql svg testlib uitools \
	webchannel websockets widgets x11extras xml xmlpatterns

	Index: devel/qca/Makefile
	===================================================================
	--- devel/qca/Makefile
	+++ devel/qca/Makefile
	@@ -28,7 +28,7 @@

	CMAKE_ARGS+= -DQCA_SUFFIX=${FLAVOR} \
	-D${FLAVOR:tu}:BOOL=TRUE
	-_USE_QT5= core buildtools_build qmake_build
	+_USE_QT5= core buildtools:build qmake:build
	_USE_QT6= 5compat base
	USE_QT= ${_USE_QT${FLAVOR:S/qt//}}

	Index: devel/qconf/Makefile
	===================================================================
	--- devel/qconf/Makefile
	+++ devel/qconf/Makefile
	@@ -12,7 +12,7 @@

	USES= qmake:no_env qt:5 tar:bzip2
	USE_QT= core gui xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	HAS_CONFIGURE= yes
	MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}"

	Index: devel/qcoro/Makefile
	===================================================================
	--- devel/qcoro/Makefile
	+++ devel/qcoro/Makefile
	@@ -12,7 +12,7 @@

	USES= cmake compiler:c++17-lang pkgconfig qt:5
	USE_QT= concurrent core dbus network testlib websockets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= danvratil
	Index: devel/qgit/Makefile
	===================================================================
	--- devel/qgit/Makefile
	+++ devel/qgit/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++11-lang cpe qt:5
	USE_QT= core gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= tibirna
	Index: devel/qjson/Makefile
	===================================================================
	--- devel/qjson/Makefile
	+++ devel/qjson/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= flavio
	USE_LDCONFIG= yes
	-USE_QT= core buildtools_build qmake_build
	+USE_QT= core buildtools:build qmake:build
	CMAKE_OFF= QT4_BUILD
	QT_SUFFIX= -qt5

	Index: devel/qschematic/Makefile
	===================================================================
	--- devel/qschematic/Makefile
	+++ devel/qschematic/Makefile
	@@ -12,7 +12,7 @@
	LIB_DEPENDS= libgpds.so:devel/gpds

	USES= cmake compiler:c++17-lang qt:5
	-USE_QT= buildtools_build core gui qmake_build widgets
	+USE_QT= buildtools:build core gui qmake:build widgets

	USE_GITHUB= yes
	GH_ACCOUNT= simulton
	Index: devel/qscintilla2-designerplugin-qt5/Makefile
	===================================================================
	--- devel/qscintilla2-designerplugin-qt5/Makefile
	+++ devel/qscintilla2-designerplugin-qt5/Makefile
	@@ -15,7 +15,7 @@
	USES= compiler:c++11-lang qmake pyqt:5 qt:5 gl
	USE_GL= gl
	USE_QT= core designer printsupport gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	WRKSRC= ${WRKDIR}/${DISTNAME}/designer

	Index: devel/qscintilla2-qt5/Makefile
	===================================================================
	--- devel/qscintilla2-qt5/Makefile
	+++ devel/qscintilla2-qt5/Makefile
	@@ -12,7 +12,7 @@
	USES= compiler:c++11-lang gl qmake pyqt:5 qt:5
	USE_GL= gl
	USE_PYQT= #
	-USE_QT= buildtools_build core gui printsupport widgets
	+USE_QT= buildtools:build core gui printsupport widgets
	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

	BUILD_WRKSRC= ${WRKSRC}/src
	Index: devel/qt5-assistant/Makefile
	===================================================================
	--- devel/qt5-assistant/Makefile
	+++ devel/qt5-assistant/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	USE_QT= core gui help network printsupport sql widgets \
	- buildtools_build sql-sqlite3_run
	+ buildtools:build sql-sqlite3:run
	QT_BINARIES= yes

	DESKTOP_ENTRIES="Qt 5 Assistant" "" \
	Index: devel/qt5-concurrent/Makefile
	===================================================================
	--- devel/qt5-concurrent/Makefile
	+++ devel/qt5-concurrent/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5= extract
	-USE_QT= core qmake_build buildtools_build
	+USE_QT= core qmake:build buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= -no-gui -no-xcb

	Index: devel/qt5-core/Makefile
	===================================================================
	--- devel/qt5-core/Makefile
	+++ devel/qt5-core/Makefile
	@@ -15,7 +15,7 @@
	USES= compiler:c++11-lang gnome perl5 qmake:no_env qt-dist:5,base
	USE_GNOME= glib20
	USE_PERL5= extract
	-USE_QT= qmake_build buildtools_build
	+USE_QT= qmake:build buildtools:build
	HAS_CONFIGURE= yes
	# Disable (almost) everything to install minimal qconfig.h.
	# -no-feature-* adds QT_NO_* (for features which have no switch or
	Index: devel/qt5-dbus/Makefile
	===================================================================
	--- devel/qt5-dbus/Makefile
	+++ devel/qt5-dbus/Makefile
	@@ -10,7 +10,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5= extract
	-USE_QT= core qmake_build buildtools_build
	+USE_QT= core qmake:build buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= -no-gui -no-xcb

	Index: devel/qt5-designer/Makefile
	===================================================================
	--- devel/qt5-designer/Makefile
	+++ devel/qt5-designer/Makefile
	@@ -7,8 +7,8 @@
	COMMENT= Qt 5 graphical user interface designer

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= assistant_run core declarative gui network printsupport uiplugin \
	- widgets xml buildtools_build
	+USE_QT= assistant:run core declarative gui network printsupport uiplugin \
	+ widgets xml buildtools:build

	DESKTOP_ENTRIES="Qt 5 Designer" "" \
	"${PREFIX}/share/pixmaps/designer-qt5.png" \
	Index: devel/qt5-help/Makefile
	===================================================================
	--- devel/qt5-help/Makefile
	+++ devel/qt5-help/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	USE_QT= core gui network sql widgets \
	- buildtools_build sql-sqlite3_run
	+ buildtools:build sql-sqlite3:run

	QT_BINARIES= yes

	Index: devel/qt5-linguist/Makefile
	===================================================================
	--- devel/qt5-linguist/Makefile
	+++ devel/qt5-linguist/Makefile
	@@ -8,8 +8,8 @@

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	USE_QT= core gui printsupport widgets xml \
	- assistant_run linguisttools_run \
	- buildtools_build designer_build uitools_build
	+ assistant:run linguisttools:run \
	+ buildtools:build designer:build uitools:build

	DESKTOP_ENTRIES="Qt 5 Linguist" "" \
	"${PREFIX}/share/pixmaps/linguist-qt5.png" \
	Index: devel/qt5-linguisttools/Makefile
	===================================================================
	--- devel/qt5-linguisttools/Makefile
	+++ devel/qt5-linguisttools/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt localization tools

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= core xml buildtools_build declarative_build
	+USE_QT= core xml buildtools:build declarative:build

	BUILD_WRKSRC= ${WRKSRC}/src/linguist
	INSTALL_WRKSRC= ${WRKSRC}/src/linguist
	Index: devel/qt5-location/Makefile
	===================================================================
	--- devel/qt5-location/Makefile
	+++ devel/qt5-location/Makefile
	@@ -8,6 +8,6 @@

	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location
	USE_QT= concurrent core dbus declarative gui network serialport \
	- buildtools_build
	+ buildtools:build

	.include <bsd.port.mk>
	Index: devel/qt5-qdbus/Makefile
	===================================================================
	--- devel/qt5-qdbus/Makefile
	+++ devel/qt5-qdbus/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt command-line interface to D-Bus

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= core dbus xml buildtools_build
	+USE_QT= core dbus xml buildtools:build

	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}
	INSTALL_WRKSRC= ${BUILD_WRKSRC}
	Index: devel/qt5-qdbusviewer/Makefile
	===================================================================
	--- devel/qt5-qdbusviewer/Makefile
	+++ devel/qt5-qdbusviewer/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt 5 graphical interface to D-Bus

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= core dbus gui widgets xml buildtools_build
	+USE_QT= core dbus gui widgets xml buildtools:build

	DESKTOP_ENTRIES="Qt 5 D-Bus Viewer" "" \
	"${PREFIX}/share/pixmaps/qdbusviewer-qt5.png" \
	Index: devel/qt5-qdoc/Makefile
	===================================================================
	--- devel/qt5-qdoc/Makefile
	+++ devel/qt5-qdoc/Makefile
	@@ -11,7 +11,7 @@
	RUN_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT}

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= core declarative buildtools_build qdoc-data_run
	+USE_QT= core declarative buildtools:build qdoc-data:run

	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
	INSTALL_WRKSRC= ${BUILD_WRKSRC}
	Index: devel/qt5-remoteobjects/Makefile
	===================================================================
	--- devel/qt5-remoteobjects/Makefile
	+++ devel/qt5-remoteobjects/Makefile
	@@ -9,7 +9,7 @@
	USES= compiler:c++11-lang gl qmake qt-dist:5
	USE_GL= gl
	USE_QT= core declarative network \
	- buildtools_build
	+ buildtools:build

	QT_BINARIES= yes

	Index: devel/qt5-script/Makefile
	===================================================================
	--- devel/qt5-script/Makefile
	+++ devel/qt5-script/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake qt-dist:5,script
	USE_PERL5= extract
	-USE_QT= core buildtools_build
	+USE_QT= core buildtools:build
	# Keep make(1) from descending into src/script/obj/ (qmake:outsource
	# doesn't work).
	MAKE_ENV= MAKEOBJDIR=.
	Index: devel/qt5-scripttools/Makefile
	===================================================================
	--- devel/qt5-scripttools/Makefile
	+++ devel/qt5-scripttools/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt Script additional components

	USES= compiler:c++11-lang qmake qt-dist:5,script
	-USE_QT= core gui script widgets buildtools_build
	+USE_QT= core gui script widgets buildtools:build

	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
	INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}
	Index: devel/qt5-scxml/Makefile
	===================================================================
	--- devel/qt5-scxml/Makefile
	+++ devel/qt5-scxml/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt5 SCXML module

	USES= compiler:c++11-lang qmake qt-dist:5,scxml
	-USE_QT= core declarative network buildtools_build
	+USE_QT= core declarative network buildtools:build

	QT_BINARIES= yes

	Index: devel/qt5-testlib/Makefile
	===================================================================
	--- devel/qt5-testlib/Makefile
	+++ devel/qt5-testlib/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5= extract
	-USE_QT= core qmake_build buildtools_build
	+USE_QT= core qmake:build buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= -no-gui -no-xcb

	Index: devel/qt5-uitools/Makefile
	===================================================================
	--- devel/qt5-uitools/Makefile
	+++ devel/qt5-uitools/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt Designer UI forms support module

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= core gui uiplugin widgets buildtools_build
	+USE_QT= core gui uiplugin widgets buildtools:build

	BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
	INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
	Index: devel/qt5/Makefile.sqldrivers
	===================================================================
	--- devel/qt5/Makefile.sqldrivers
	+++ devel/qt5/Makefile.sqldrivers
	@@ -8,7 +8,7 @@

	USES+= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5+= extract
	-USE_QT+= core sql qmake_build buildtools_build
	+USE_QT+= core sql qmake:build buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS+=-no-gui -no-xcb

	Index: devel/qtcreator/Makefile
	===================================================================
	--- devel/qtcreator/Makefile
	+++ devel/qtcreator/Makefile
	@@ -80,10 +80,10 @@
	EXAMPLES_DESC= Install the Qt5 example projects
	QTWEBENGINE_DESC= Add dependency on qt5-webengine

	-DOCS_USE= QT=doc_run
	+DOCS_USE= QT=doc:run
	DOCS_CMAKE_BOOL= WITH_DOCS

	-EXAMPLES_USE= QT=examples_run
	+EXAMPLES_USE= QT=examples:run

	QTWEBENGINE_USE= qt=webengine
	QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
	Index: devel/redasm/Makefile
	===================================================================
	--- devel/redasm/Makefile
	+++ devel/redasm/Makefile
	@@ -11,7 +11,7 @@
	LICENSE= GPLv3

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= buildtools_build qmake_build core gui widgets
	+USE_QT= buildtools:build qmake:build core gui widgets

	USE_GITHUB= yes
	GH_ACCOUNT= REDasmOrg
	Index: devel/sasm/Makefile
	===================================================================
	--- devel/sasm/Makefile
	+++ devel/sasm/Makefile
	@@ -14,7 +14,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= Dman95
	USE_GL= gl
	-USE_QT= core gui network widgets buildtools_build
	+USE_QT= core gui network widgets buildtools:build

	CONFLICTS_INSTALL= fasm fasm-fpga

	Index: devel/shiboken2/Makefile
	===================================================================
	--- devel/shiboken2/Makefile
	+++ devel/shiboken2/Makefile
	@@ -24,7 +24,7 @@
	USE_GNOME= libxml2
	USE_LDCONFIG= yes
	USE_PYTHON= flavors
	-USE_QT= buildtools_build core gui network qmake_build testlib \
	+USE_QT= buildtools:build core gui network qmake:build testlib \
	xml xmlpatterns

	SHEBANG_FILES= shiboken_tool.py
	Index: devel/umbrello/Makefile
	===================================================================
	--- devel/umbrello/Makefile
	+++ devel/umbrello/Makefile
	@@ -15,9 +15,9 @@
	jobwidgets kdelibs4support kio notifications parts service \
	solid sonnet syntaxhighlighting texteditor textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport svg webkit widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: devel/vitables/Makefile
	===================================================================
	--- devel/vitables/Makefile
	+++ devel/vitables/Makefile
	@@ -18,7 +18,7 @@

	USES= dos2unix python pyqt:5
	USE_PYTHON= distutils cython noflavors autoplist
	-USE_PYQT= pyqt5_run sip_run
	+USE_PYQT= pyqt5:run sip:run

	USE_GITHUB= yes
	GH_ACCOUNT= uvemas
	Index: devel/xelfviewer/Makefile
	===================================================================
	--- devel/xelfviewer/Makefile
	+++ devel/xelfviewer/Makefile
	@@ -11,7 +11,7 @@

	USES= pkgconfig qt:5
	GNU_CONFIGURE= yes
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	concurrent core gui opengl printsupport sql widgets
	USE_GITHUB= yes
	GH_ACCOUNT= horsicq
	Index: devel/xopcodecalc/Makefile
	===================================================================
	--- devel/xopcodecalc/Makefile
	+++ devel/xopcodecalc/Makefile
	@@ -11,7 +11,7 @@

	USES= pkgconfig qt:5
	GNU_CONFIGURE= yes
	-USE_QT= buildtools_build qmake_build core gui widgets
	+USE_QT= buildtools:build qmake:build core gui widgets

	USE_GITHUB= yes
	GH_ACCOUNT= horsicq
	Index: devel/xpeviewer/Makefile
	===================================================================
	--- devel/xpeviewer/Makefile
	+++ devel/xpeviewer/Makefile
	@@ -11,7 +11,7 @@

	USES= desktop-file-utils pkgconfig qt:5
	GNU_CONFIGURE= yes
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	concurrent core gui opengl printsupport widgets
	USE_GITHUB= yes
	GH_ACCOUNT= horsicq
	Index: devel/zeal/Makefile
	===================================================================
	--- devel/zeal/Makefile
	+++ devel/zeal/Makefile
	@@ -20,7 +20,7 @@
	USE_GITHUB= yes
	USE_KDE= ecm
	USE_QT= concurrent core gui network webkit widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xcb xext

	GH_ACCOUNT= zealdocs
	Index: dns/kf5-kdnssd/Makefile
	===================================================================
	--- dns/kf5-kdnssd/Makefile
	+++ dns/kf5-kdnssd/Makefile
	@@ -6,9 +6,9 @@
	COMMENT= KF5 abstraction to system DNSSD features

	USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core linguisttools network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFAULT=AVAHI
	OPTIONS_RADIO=ZEROCONF
	Index: dns/knock/Makefile
	===================================================================
	--- dns/knock/Makefile
	+++ dns/knock/Makefile
	@@ -18,7 +18,7 @@

	USES= python pyqt:5 # pyqt:5 isn't used: https://github.com/guelfoweb/knock/issues/108
	USE_PYTHON= distutils noflavors autoplist
	-USE_PYQT= pyqt5_run
	+USE_PYQT= pyqt5:run

	USE_GITHUB= yes
	GH_ACCOUNT= guelfoweb
	Index: dns/qmdnsengine/Makefile
	===================================================================
	--- dns/qmdnsengine/Makefile
	+++ dns/qmdnsengine/Makefile
	@@ -12,7 +12,7 @@
	USES= cmake compiler:c++11-lang qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= nitroshare
	-USE_QT= core network buildtools_build qmake_build
	+USE_QT= core network buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: editors/calligra/Makefile
	===================================================================
	--- editors/calligra/Makefile
	+++ editors/calligra/Makefile
	@@ -52,8 +52,8 @@
	texteditor textwidgets threadweaver unitconversion wallet \
	widgetsaddons windowsystem xmlgui \
	calendarcore okular
	-USE_QT= buildtools_build concurrent core dbus declarative gui network opengl \
	- phonon4 printsupport qmake_build \
	+USE_QT= buildtools:build concurrent core dbus declarative gui network opengl \
	+ phonon4 printsupport qmake:build \
	script sql svg testlib webkit widgets x11extras xml
	USE_XORG= ice sm x11 xext
	USE_LDCONFIG= yes
	Index: editors/calligraplan/Makefile
	===================================================================
	--- editors/calligraplan/Makefile
	+++ editors/calligraplan/Makefile
	@@ -19,9 +19,9 @@
	notifications parts service solid sonnet textwidgets wallet \
	widgetsaddons windowsystem xmlgui \
	akonadicontacts calendarcore contacts \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network printsupport widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	PLIST_SUB+= SHLIB_VER=18.0.0 SHLIB_SHORT=18
	Index: editors/cpeditor/Makefile
	===================================================================
	--- editors/cpeditor/Makefile
	+++ editors/cpeditor/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake:noninja compiler:c++14-lang desktop-file-utils qt:5
	USE_QT= core gui network widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_GITHUB= yes
	GH_TUPLE= \
	cpeditor:QCodeEditor:dbf8b26:cpeditor_QCodeEditor/third_party/QCodeEditor \
	Index: editors/encryptpad/Makefile
	===================================================================
	--- editors/encryptpad/Makefile
	+++ editors/encryptpad/Makefile
	@@ -20,7 +20,7 @@
	GH_PROJECT= EncryptPad

	USE_GL= gl
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build
	BINARY_ALIAS= python=${PYTHON_CMD} \
	qmake=${QMAKE}

	Index: editors/featherpad/Makefile
	===================================================================
	--- editors/featherpad/Makefile
	+++ editors/featherpad/Makefile
	@@ -17,7 +17,7 @@
	GH_ACCOUNT= tsujan
	GH_PROJECT= FeatherPad

	-USE_QT= buildtools_build qmake_build core dbus gui printsupport network \
	+USE_QT= buildtools:build qmake:build core dbus gui printsupport network \
	svg widgets x11extras linguisttools
	USE_XORG= x11 sm ice xext
	USE_GL= gl
	Index: editors/focuswriter/Makefile
	===================================================================
	--- editors/focuswriter/Makefile
	+++ editors/focuswriter/Makefile
	@@ -17,7 +17,7 @@
	USES= cmake compiler:c++17-lang desktop-file-utils gl iconv pkgconfig \
	qt:6 tar:bz2
	USE_GL= gl
	-USE_QT= base multimedia tools_build
	+USE_QT= base multimedia tools:build

	PORTDATA= *
	PORTDOCS= CREDITS ChangeLog README
	Index: editors/ghostwriter/Makefile
	===================================================================
	--- editors/ghostwriter/Makefile
	+++ editors/ghostwriter/Makefile
	@@ -14,8 +14,8 @@
	USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= wereturtle
	-USE_QT= core gui svg webchannel webengine widgets buildtools_build \
	- linguisttools_build
	+USE_QT= core gui svg webchannel webengine widgets buildtools:build \
	+ linguisttools:build

	# cf. PR 224488
	LDFLAGS+= -Wl,--as-needed
	Index: editors/kate/Makefile
	===================================================================
	--- editors/kate/Makefile
	+++ editors/kate/Makefile
	@@ -18,9 +18,9 @@
	jobwidgets kio newstuff package parts plasma-framework \
	service solid sonnet syntaxhighlighting texteditor textwidgets \
	threadweaver wallet widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network script sql widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: editors/kile/Makefile
	===================================================================
	--- editors/kile/Makefile
	+++ editors/kile/Makefile
	@@ -21,9 +21,9 @@
	init itemviews jobwidgets js khtml kio okular parts service \
	solid sonnet syntaxhighlighting texteditor textwidgets \
	widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network script widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	SHEBANG_FILES= *.pl

	Index: editors/libreoffice/Makefile
	===================================================================
	--- editors/libreoffice/Makefile
	+++ editors/libreoffice/Makefile
	@@ -232,7 +232,7 @@
	MARIADB_USES= mysql:client

	QT5_CONFIGURE_ENABLE= qt5
	-QT5_USE= qt=buildtools_build,core,gui,network,qmake_build,widgets,x11extras
	+QT5_USE= qt=buildtools:build,core,gui,network,qmake:build,widgets,x11extras
	QT5_USES= qt:5

	SDK_BUILD_DEPENDS= doxygen:devel/doxygen
	Index: editors/mp/Makefile
	===================================================================
	--- editors/mp/Makefile
	+++ editors/mp/Makefile
	@@ -67,7 +67,7 @@
	QT5_USES= compiler:c++11-lang gl pkgconfig qmake:no_env qt:5
	QT5_USE= cxxstd=-std=c++11 \
	gl=gl \
	- qt=buildtools_build,core,gui,widgets
	+ qt=buildtools:build,core,gui,widgets
	QT5_CONFIGURE_ENV= CCLINK="${CXX}"
	QT5_CONFIGURE_ON= --with-qt5 --with-moc="${MOC}"
	QT5_CONFIGURE_OFF= --without-qt
	Index: editors/neovim-qt/Makefile
	===================================================================
	--- editors/neovim-qt/Makefile
	+++ editors/neovim-qt/Makefile
	@@ -17,7 +17,7 @@
	USES= cmake compiler:c++11-lang desktop-file-utils qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= equalsraf
	-USE_QT= core gui network testlib widgets buildtools_build qmake_build svg
	+USE_QT= core gui network testlib widgets buildtools:build qmake:build svg

	CMAKE_ON= USE_SYSTEM_MSGPACK
	CMAKE_OFF= ENABLE_TESTS
	Index: editors/notepadnext/Makefile
	===================================================================
	--- editors/notepadnext/Makefile
	+++ editors/notepadnext/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libuchardet.so:textproc/uchardet

	USES= desktop-file-utils gl qmake qt:5 xorg
	-USE_QT= core gui network printsupport widgets buildtools_build linguisttools_build
	+USE_QT= core gui network printsupport widgets buildtools:build linguisttools:build
	USE_GL= gl
	USE_XORG= xcb

	Index: editors/tea/Makefile
	===================================================================
	--- editors/tea/Makefile
	+++ editors/tea/Makefile
	@@ -16,7 +16,7 @@
	OPTIONS_DEFAULT= ASPELL HUNSPELL
	SPELL_DESC= Spell checker backend

	-USE_QT= buildtools_build core declarative gui network widgets printsupport
	+USE_QT= buildtools:build core declarative gui network widgets printsupport
	USE_GL= gl
	USE_LOCALE= en_US.UTF-8

	Index: editors/texmaker/Makefile
	===================================================================
	--- editors/texmaker/Makefile
	+++ editors/texmaker/Makefile
	@@ -17,7 +17,7 @@
	gl pkgconfig qmake qt:5 tar:bzip2
	USE_GL= gl
	USE_QT= concurrent core gui network printsupport script widgets \
	- xml buildtools_build
	+ xml buildtools:build
	USE_TEX= latex dvipsk

	EXTRACT_AFTER_ARGS= --exclude hunspell
	Index: editors/texstudio/Makefile
	===================================================================
	--- editors/texstudio/Makefile
	+++ editors/texstudio/Makefile
	@@ -19,7 +19,7 @@
	ghostscript:run gl pkgconfig qmake qt:5 xorg
	USE_QT = core declarative gui network script svg widgets \
	xml printsupport concurrent uitools \
	- buildtools_build
	+ buildtools:build
	QTVER_SUFFIX= 5

	USE_XORG= x11
	Index: editors/texworks/Makefile
	===================================================================
	--- editors/texworks/Makefile
	+++ editors/texworks/Makefile
	@@ -20,7 +20,7 @@
	qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= TeXworks
	-USE_QT= buildtools_build designer_build qmake_build \
	+USE_QT= buildtools:build designer:build qmake:build \
	core concurrent dbus gui linguisttools script \
	scripttools uitools widgets xml

	Index: emulators/aqemu/Makefile
	===================================================================
	--- emulators/aqemu/Makefile
	+++ emulators/aqemu/Makefile
	@@ -14,7 +14,7 @@
	LIB_DEPENDS= libvncclient.so:net/libvncserver

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= buildtools_build qmake_build \
	+USE_QT= buildtools:build qmake:build \
	core dbus gui network printsupport testlib widgets

	USE_GITHUB= yes
	Index: emulators/cemu/Makefile
	===================================================================
	--- emulators/cemu/Makefile
	+++ emulators/cemu/Makefile
	@@ -15,7 +15,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl libarchive pkgconfig \
	qmake qt:5 shared-mime-info
	USE_GL= gl
	-USE_QT= buildtools_build core gui network widgets
	+USE_QT= buildtools:build core gui network widgets

	USE_GITHUB= yes
	GH_ACCOUNT= CE-Programming
	Index: emulators/citra/Makefile
	===================================================================
	--- emulators/citra/Makefile
	+++ emulators/citra/Makefile
	@@ -83,7 +83,7 @@
	share/man/man6/${PORTNAME}.6.gz

	QT5_USES= desktop-file-utils qt:5 shared-mime-info
	-QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,multimedia,widgets
	+QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,concurrent:build,core,gui,multimedia,widgets
	QT5_CMAKE_BOOL= ENABLE_QT ENABLE_QT_TRANSLATION
	QT5_PLIST_FILES=bin/${PORTNAME}-qt \
	"@comment bin/${PORTNAME}-room" \
	Index: emulators/dolphin-emu/Makefile
	===================================================================
	--- emulators/dolphin-emu/Makefile
	+++ emulators/dolphin-emu/Makefile
	@@ -54,7 +54,7 @@
	USE_GL= gl glew glu
	USE_SDL= sdl2
	USE_XORG= ice sm x11 xext xi xrandr
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets

	# XXX USE_MGBA crashes configure step
	CMAKE_ARGS+= -DUSE_UPNP:BOOL=ON \
	Index: emulators/emu64/Makefile
	===================================================================
	--- emulators/emu64/Makefile
	+++ emulators/emu64/Makefile
	@@ -17,7 +17,7 @@
	USES= compiler:c++11-lang desktop-file-utils dos2unix gl pkgconfig \
	qmake:outsource qt:5 sdl
	USE_GL= gl glu
	-USE_QT= core gui widgets buildtools_build linguisttools_build
	+USE_QT= core gui widgets buildtools:build linguisttools:build

	DOS2UNIX_FILES= src/widget_file_browse.h

	Index: emulators/fceux/Makefile
	===================================================================
	--- emulators/fceux/Makefile
	+++ emulators/fceux/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake desktop-file-utils gl lua:51 pkgconfig qt:5 sdl
	USE_GL= gl glu
	-USE_QT= buildtools_build core gui opengl qmake_build widgets
	+USE_QT= buildtools:build core gui opengl qmake:build widgets
	USE_SDL= sdl2

	CFLAGS+= -DPUBLIC_RELEASE
	Index: emulators/libretro-kronos/Makefile
	===================================================================
	--- emulators/libretro-kronos/Makefile
	+++ emulators/libretro-kronos/Makefile
	@@ -24,7 +24,7 @@

	USE_LDCONFIG= yes

	-USE_QT= core opengl buildtools_build qmake_build
	+USE_QT= core opengl buildtools:build qmake:build

	USE_SDL= sdl2

	Index: emulators/mame/Makefile
	===================================================================
	--- emulators/mame/Makefile
	+++ emulators/mame/Makefile
	@@ -27,7 +27,7 @@
	GH_PROJECT= mame # explicit (master port)
	GH_TAGNAME= mame${PORTVERSION:S/.//}
	USE_GL= gl
	-USE_QT= buildtools core gui qmake_build widgets
	+USE_QT= buildtools core gui qmake:build widgets
	USE_SDL= sdl2 ttf2
	USE_XORG= x11 xext xi xinerama xrender

	Index: emulators/mgba/Makefile
	===================================================================
	--- emulators/mgba/Makefile
	+++ emulators/mgba/Makefile
	@@ -66,7 +66,7 @@
	MAGICK_CMAKE_BOOL= USE_MAGICK

	QT5_USES= desktop-file-utils qt:5
	-QT5_USE= qt=qmake_build,buildtools_build,core,gui,widgets,network,opengl,multimedia
	+QT5_USE= qt=qmake:build,buildtools:build,core,gui,widgets,network,opengl,multimedia
	QT5_CMAKE_BOOL= BUILD_QT

	.include <bsd.port.mk>
	Index: emulators/mupen64plus-qt/Makefile
	===================================================================
	--- emulators/mupen64plus-qt/Makefile
	+++ emulators/mupen64plus-qt/Makefile
	@@ -21,8 +21,8 @@
	USES= gl pkgconfig qmake qt:5
	USE_GL= gl
	USE_QT= core gui network sql widgets xml \
	- buildtools_build \
	- sql-sqlite3_run
	+ buildtools:build \
	+ sql-sqlite3:run

	USE_GITHUB= yes
	GH_ACCOUNT= dh4
	Index: emulators/ppsspp/Makefile
	===================================================================
	--- emulators/ppsspp/Makefile
	+++ emulators/ppsspp/Makefile
	@@ -63,7 +63,7 @@
	LIBRETRO_PLIST_FILES= lib/libretro/${PORTNAME}_libretro.so
	LIBRETRO_VARS= CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES=
	QT5_USES= qt:5 sdl
	-QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,gui,multimedia,opengl,widgets
	+QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,gui,multimedia,opengl,widgets
	QT5_USE+= SDL=sdl2 # audio, joystick
	QT5_CMAKE_BOOL= USING_QT_UI
	QT5_VARS= EXENAME=PPSSPPQt
	Index: emulators/qmc2/Makefile
	===================================================================
	--- emulators/qmc2/Makefile
	+++ emulators/qmc2/Makefile
	@@ -18,8 +18,8 @@
	USES= compiler:c++11-lang dos2unix gl gmake qt:5 sdl tar:bzip2 xorg
	USE_XORG= x11 xmu
	USE_GL= gl glu
	-USE_QT= buildtools_build core declarative gui multimedia \
	- network opengl qmake_build \
	+USE_QT= buildtools:build core declarative gui multimedia \
	+ network opengl qmake:build \
	testlib script scripttools sql svg \
	webkit widgets xml xmlpatterns
	USE_SDL= sdl
	Index: emulators/ripes/Makefile
	===================================================================
	--- emulators/ripes/Makefile
	+++ emulators/ripes/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake qmake qt:5

	-USE_QT= buildtools_build charts concurrent core gui svg testlib widgets
	+USE_QT= buildtools:build charts concurrent core gui svg testlib widgets

	CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX}

	Index: emulators/rpcs3/Makefile
	===================================================================
	--- emulators/rpcs3/Makefile
	+++ emulators/rpcs3/Makefile
	@@ -39,7 +39,7 @@
	USES= cmake compiler:c++17-lang elfctl gl iconv:wchar_t localbase:ldflags \
	openal:soft pkgconfig python:3.4+,build qt:5 xorg
	USE_GL= gl glew
	-USE_QT= qmake_build buildtools_build core concurrent dbus gui multimedia svg widgets
	+USE_QT= qmake:build buildtools:build core concurrent dbus gui multimedia svg widgets
	USE_XORG= x11
	CMAKE_ON= CMAKE_SKIP_RPATH ${CURL FFMPEG FLATBUFFERS LIBPNG PUGIXML XXHASH:L:S/^/USE_SYSTEM_/}
	CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests
	Index: emulators/ukncbtl/Makefile
	===================================================================
	--- emulators/ukncbtl/Makefile
	+++ emulators/ukncbtl/Makefile
	@@ -14,7 +14,7 @@

	USE_GL= gl
	USE_QT= core gui multimedia network script testlib widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= nzeemin
	Index: emulators/virtualbox-ose-legacy/Makefile
	===================================================================
	--- emulators/virtualbox-ose-legacy/Makefile
	+++ emulators/virtualbox-ose-legacy/Makefile
	@@ -158,7 +158,7 @@
	PLIST_SUB+= QT=""
	USES+= gl qmake:no_env qt:5 xorg
	USE_GL= gl glu
	-USE_QT= buildtools_build core dbus gui linguisttools_build opengl
	+USE_QT= buildtools:build core dbus gui linguisttools:build opengl
	USE_QT+= printsupport widgets x11extras
	USE_XORG= xcb
	VBOX_PROGS+= VirtualBox
	Index: emulators/virtualbox-ose/Makefile
	===================================================================
	--- emulators/virtualbox-ose/Makefile
	+++ emulators/virtualbox-ose/Makefile
	@@ -162,7 +162,7 @@
	PLIST_SUB+= QT=""
	USES+= gl qmake:no_env qt:5 xorg
	USE_GL= gl glu
	-USE_QT= buildtools_build core dbus gui linguisttools_build opengl
	+USE_QT= buildtools:build core dbus gui linguisttools:build opengl
	USE_QT+= printsupport widgets x11extras
	USE_XORG= xcb
	VBOX_PROGS+= VirtualBox VirtualBoxVM
	Index: emulators/yuzu/Makefile
	===================================================================
	--- emulators/yuzu/Makefile
	+++ emulators/yuzu/Makefile
	@@ -79,7 +79,7 @@
	JACK_CMAKE_BOOL= USE_JACK

	NLS_DESC= UI translations (implies QT5)
	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build
	NLS_CMAKE_BOOL= ENABLE_QT_TRANSLATION
	NLS_IMPLIES= QT5

	@@ -87,7 +87,7 @@
	PULSEAUDIO_CMAKE_BOOL= USE_PULSE

	QT5_USES= desktop-file-utils qt:5 shared-mime-info
	-QT5_USE= QT=qmake_build,buildtools_build,concurrent_build,core,gui,widgets
	+QT5_USE= QT=qmake:build,buildtools:build,concurrent:build,core,gui,widgets
	QT5_CMAKE_BOOL= ENABLE_QT
	QT5_PLIST_FILES= bin/${PORTNAME} \
	share/applications/org.yuzu_emu.yuzu.desktop \
	Index: finance/alkimia/Makefile
	===================================================================
	--- finance/alkimia/Makefile
	+++ finance/alkimia/Makefile
	@@ -21,10 +21,10 @@
	USE_LDCONFIG= yes
	USE_KDE= attica auth codecs completion config configwidgets coreaddons \
	i18n iconthemes jobwidgets kio newstuff service solid sonnet \
	- textwidgets widgetsaddons windowsystem xmlgui ecm_build
	+ textwidgets widgetsaddons windowsystem xmlgui ecm:build
	USE_PERL5= run
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen
	Index: finance/kmymoney/Makefile
	===================================================================
	--- finance/kmymoney/Makefile
	+++ finance/kmymoney/Makefile
	@@ -18,10 +18,10 @@

	USES= cmake compiler:c++14-lang desktop-file-utils gettext kde:5 \
	pkgconfig qt:5 shared-mime-info shebangfix tar:xz
	-USE_QT= buildtools_build core dbus gui network printsupport qmake_build \
	- sql testlib_build xml webkit widgets
	+USE_QT= buildtools:build core dbus gui network printsupport qmake:build \
	+ sql testlib:build xml webkit widgets
	USE_KDE= activities archive auth bookmarks codecs completion config \
	- configwidgets coreaddons doctools_build ecm_build i18n \
	+ configwidgets coreaddons doctools:build ecm:build i18n \
	iconthemes itemmodels itemviews jobwidgets kcmutils \
	kio notifications textwidgets service solid sonnet \
	wallet widgetsaddons xmlgui
	Index: finance/kraft/Makefile
	===================================================================
	--- finance/kraft/Makefile
	+++ finance/kraft/Makefile
	@@ -20,7 +20,7 @@
	auth codecs config configwidgets contacts coreaddons \
	grantleetheme i18n itemmodels widgetsaddons
	USE_QT= core dbus gui sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	SHEBANG_FILES= manual/makeman.sh

	Index: finance/qtbitcointrader/Makefile
	===================================================================
	--- finance/qtbitcointrader/Makefile
	+++ finance/qtbitcointrader/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE.GPL3

	USES= compiler:c++11-lib gl qmake qt:5 ssl xorg
	-USE_QT= core gui multimedia network script speech widgets buildtools_build
	+USE_QT= core gui multimedia network script speech widgets buildtools:build
	USE_GL= gl

	WRKSRC_SUBDIR= src
	Index: finance/skrooge/Makefile
	===================================================================
	--- finance/skrooge/Makefile
	+++ finance/skrooge/Makefile
	@@ -27,13 +27,13 @@
	package parts plasma-framework runner service solid sonnet \
	textwidgets unitconversion wallet widgetsaddons windowsystem \
	xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	# designerplugin is weird: it's defined as a _run dependency, but
	# skrooge checks for it at build-time.
	-USE_KDE+= designerplugin_build
	+USE_KDE+= designerplugin:build
	USE_QT= concurrent core dbus declarative designer gui network \
	printsupport script sql svg webkit widgets xml \
	- buildtools_build designer_build qmake_build testlib_build
	+ buildtools:build designer:build qmake:build testlib:build
	USE_XORG= x11
	SHEBANG_FILES= plugins/import/skrooge_import_backend/skrooge-sabb.py \
	skgbankmodeler/skrooge-coinmarketcap.py \
	Index: french/aster/Makefile
	===================================================================
	--- french/aster/Makefile
	+++ french/aster/Makefile
	@@ -47,7 +47,7 @@

	USES= bison blaslapack:openblas fortran gettext python:3.6+ qt:5 tk
	USE_BINUTILS= yes
	-USE_QT= linguisttools_build
	+USE_QT= linguisttools:build

	#CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.*

	Index: games/2048-qt/Makefile
	===================================================================
	--- games/2048-qt/Makefile
	+++ games/2048-qt/Makefile
	@@ -16,7 +16,7 @@
	GH_PROJECT= 2048-Qt

	USES= compiler:c++11-lang gmake pkgconfig qmake qt:5
	-USE_QT= core declarative gui network widgets buildtools_build quickcontrols
	+USE_QT= core declarative gui network widgets buildtools:build quickcontrols

	PLIST_FILES= bin/2048-qt ${DESKTOPDIR}/${PORTNAME}.desktop \
	share/pixmaps/${PORTNAME}.png
	Index: games/LibreMines/Makefile
	===================================================================
	--- games/LibreMines/Makefile
	+++ games/LibreMines/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake qt:5
	-USE_QT= buildtools_build core gui multimedia qmake_build svg widgets
	+USE_QT= buildtools:build core gui multimedia qmake:build svg widgets

	USE_GITHUB= yes
	GH_ACCOUNT= Bollos00
	Index: games/auralquiz/Makefile
	===================================================================
	--- games/auralquiz/Makefile
	+++ games/auralquiz/Makefile
	@@ -16,7 +16,7 @@

	USES= compiler:c++11-lang gl qmake qt:5
	USE_GL= gl
	-USE_QT= core gui widgets phonon4 qmake_build buildtools_build
	+USE_QT= core gui widgets phonon4 qmake:build buildtools:build

	PORTDOCS= CHANGELOG README TODO

	Index: games/blinken/Makefile
	===================================================================
	--- games/blinken/Makefile
	+++ games/blinken/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	doctools guiaddons i18n widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui phonon4 svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/bomber/Makefile
	===================================================================
	--- games/bomber/Makefile
	+++ games/bomber/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	i18n kio libkdegames widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets phonon4 xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/bovo/Makefile
	===================================================================
	--- games/bovo/Makefile
	+++ games/bovo/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	i18n kdeclarative libkdegames newstuff widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/bubble-chains/Makefile
	===================================================================
	--- games/bubble-chains/Makefile
	+++ games/bubble-chains/Makefile
	@@ -16,7 +16,7 @@

	USES= qmake qt:5 xorg
	USE_QT= core gui widgets xml opengl multimedia x11extras \
	- qmake_build buildtools_build
	+ qmake:build buildtools:build
	USE_XORG= x11 xrandr

	QMAKE_ARGS= DATADIR="${DATADIR}"
	Index: games/chessx/Makefile
	===================================================================
	--- games/chessx/Makefile
	+++ games/chessx/Makefile
	@@ -13,7 +13,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5 tar:tgz
	USE_GL= gl
	USE_QT= concurrent core gui multimedia network opengl printsupport svg \
	- widgets xml buildtools_build linguisttools_build speech
	+ widgets xml buildtools:build linguisttools:build speech

	PLIST_FILES= bin/chessx \
	share/applications/chessx.desktop \
	Index: games/cockatrice/Makefile
	===================================================================
	--- games/cockatrice/Makefile
	+++ games/cockatrice/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libprotobuf.so:devel/protobuf

	USES= cmake compiler:c++11-lib gnome qt:5
	-USE_QT= buildtools_build concurrent core network qmake_build websockets widgets gui
	+USE_QT= buildtools:build concurrent core network qmake:build websockets widgets gui
	USE_GITHUB= yes
	GH_TAGNAME= 2021-01-26-Release-2.8.0

	@@ -32,7 +32,7 @@
	COCKATRICE_CMAKE_ON= -DWITH_CLIENT=ON -DWITH_ORACLE=ON
	COCKATRICE_CMAKE_OFF= -DWITH_CLIENT=OFF -DWITH_ORACLE=OFF

	-COCKATRICE_USE= qt=multimedia,printsupport,svg,linguisttools_build
	+COCKATRICE_USE= qt=multimedia,printsupport,svg,linguisttools:build
	SERVATRICE_USE= qt=sql,sql-mysql
	SERVATRICE_USE+= RC_SUBR=servatrice

	Index: games/colorcode/Makefile
	===================================================================
	--- games/colorcode/Makefile
	+++ games/colorcode/Makefile
	@@ -13,7 +13,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= compiler:c++11-lang qmake qt:5
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	WRKSRC= ${WRKDIR}/ColorCode-${PORTVERSION}

	DESKTOP_ENTRIES=ColorCode \
	Index: games/connectagram/Makefile
	===================================================================
	--- games/connectagram/Makefile
	+++ games/connectagram/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lib gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build network widgets
	+USE_QT= buildtools:build core gui linguisttools:build network widgets

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	Index: games/cutemaze/Makefile
	===================================================================
	--- games/cutemaze/Makefile
	+++ games/cutemaze/Makefile
	@@ -13,8 +13,8 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= core gui svg imageformats_run widgets \
	- linguisttools_build buildtools_build
	+USE_QT= core gui svg imageformats:run widgets \
	+ linguisttools:build buildtools:build

	PORTDOCS= ChangeLog README
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	Index: games/doomsday/Makefile
	===================================================================
	--- games/doomsday/Makefile
	+++ games/doomsday/Makefile
	@@ -22,7 +22,7 @@
	USE_LDCONFIG= yes
	USE_SDL= sdl2 mixer2
	USE_XORG= x11 sm ice xext xrandr xxf86vm
	-USE_QT= buildtools_build core gui network widgets qmake_build opengl x11extras
	+USE_QT= buildtools:build core gui network widgets qmake:build opengl x11extras
	CMAKE_ARGS+= -DDENG_ENABLE_COTIRE=OFF -DDENG_ASSIMP_EMBEDDED=OFF
	LDFLAGS+= -lexecinfo

	Index: games/dustrac/Makefile
	===================================================================
	--- games/dustrac/Makefile
	+++ games/dustrac/Makefile
	@@ -21,7 +21,7 @@
	USES= compiler:c++11-lib cmake gl openal pkgconfig qt:5
	USE_GL= gl glu
	USE_QT= core gui opengl xml widgets testlib sql \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	CMAKE_ARGS= -DReleaseBuild=on \
	-DSystemFonts=on \
	-DDATA_PATH=${DATADIR} \
	Index: games/freeciv/Makefile
	===================================================================
	--- games/freeciv/Makefile
	+++ games/freeciv/Makefile
	@@ -76,7 +76,7 @@
	PGSQL_VARS= _FREECIV_DB+=postgres

	QT5_USES= qt:5 sdl
	-QT5_USE= QT=core,gui,widgets,buildtools_build \
	+QT5_USE= QT=core,gui,widgets,buildtools:build \
	SDL=mixer2
	QT5_CONFIGURE_ON= --with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
	--with-qt5-libs=${LOCALBASE}/${QT_LIBDIR_REL}
	Index: games/gcompris-qt/Makefile
	===================================================================
	--- games/gcompris-qt/Makefile
	+++ games/gcompris-qt/Makefile
	@@ -16,11 +16,11 @@
	LIB_DEPENDS= libBox2D.so:x11-toolkits/qml-box2d

	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	-USE_KDE= doctools_build ecm_build
	+USE_KDE= doctools:build ecm:build
	USE_QT= core declarative graphicaleffects gui multimedia network quickcontrols \
	sensors svg widgets \
	- buildtools_build linguisttools_build qmake_build testlib_build \
	- imageformats_run
	+ buildtools:build linguisttools:build qmake:build testlib:build \
	+ imageformats:run

	CMAKE_ARGS= -DQML_BOX2D_LIBRARY=${QT_QMLDIR}/Box2D.2.0

	Index: games/gottet/Makefile
	===================================================================
	--- games/gottet/Makefile
	+++ games/gottet/Makefile
	@@ -14,7 +14,7 @@
	USES= compiler:c++11-lib gl qmake qt:5 tar:bzip2
	USE_GL= gl
	USE_QT= core gui widgets \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	Index: games/granatier/Makefile
	===================================================================
	--- games/granatier/Makefile
	+++ games/granatier/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= attica auth codecs config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes itemviews kio \
	libkdegames newstuff notifyconfig service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/hedgewars/Makefile
	===================================================================
	--- games/hedgewars/Makefile
	+++ games/hedgewars/Makefile
	@@ -23,8 +23,8 @@
	USE_SDL= sdl2 mixer2 image2 ttf2 net2
	USE_FPC= opengl libpng rtl-objpas rtl-extra
	USE_QT= core gui widgets network \
	- qmake_build buildtools_build \
	- linguisttools_build
	+ qmake:build buildtools:build \
	+ linguisttools:build
	USE_GL= gl glu
	USE_LDCONFIG= yes
	CMAKE_ON= NOSERVER
	Index: games/iqpuzzle/Makefile
	===================================================================
	--- games/iqpuzzle/Makefile
	+++ games/iqpuzzle/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= compiler:c++11-lang gl qmake qt:5
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: games/kanagram/Makefile
	===================================================================
	--- games/kanagram/Makefile
	+++ games/kanagram/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= attica auth codecs config configwidgets coreaddons crash \
	doctools i18n kdeclarative kio libkeduvocdocument newstuff \
	package service sonnet widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network opengl speech svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kapman/Makefile
	===================================================================
	--- games/kapman/Makefile
	+++ games/kapman/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons i18n libkdegames notifyconfig widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/katomic/Makefile
	===================================================================
	--- games/katomic/Makefile
	+++ games/katomic/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= attica auth codecs config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes itemviews kio \
	libkdegames newstuff notifyconfig service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	SHEBANG_FILES= src/katomic-levelset-upd.pl

	OPTIONS_DEFINE= DOCS
	Index: games/kblackbox/Makefile
	===================================================================
	--- games/kblackbox/Makefile
	+++ games/kblackbox/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= archive auth codecs config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes libkdegames sonnet \
	textwidgets widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kblocks/Makefile
	===================================================================
	--- games/kblocks/Makefile
	+++ games/kblocks/Makefile
	@@ -11,7 +11,7 @@
	dbusaddons i18n itemmodels kio libkdegames newstuff \
	notifyconfig textwidgets widgetsaddons windowsystem xmlgui
	USE_QT= core dbus declarative gui network phonon4 svg testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kbounce/Makefile
	===================================================================
	--- games/kbounce/Makefile
	+++ games/kbounce/Makefile
	@@ -11,10 +11,10 @@
	dbusaddons guiaddons i18n iconthemes jobwidgets kio \
	libkdegames notifyconfig service solid textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network phonon4 svg \
	testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kbreakout/Makefile
	===================================================================
	--- games/kbreakout/Makefile
	+++ games/kbreakout/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes jobwidgets kio libkdegames \
	service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kdiamond/Makefile
	===================================================================
	--- games/kdiamond/Makefile
	+++ games/kdiamond/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	doctools guiaddons i18n iconthemes libkdegames \
	notifications notifyconfig widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kfourinline/Makefile
	===================================================================
	--- games/kfourinline/Makefile
	+++ games/kfourinline/Makefile
	@@ -11,9 +11,9 @@
	dbusaddons dnssd i18n iconthemes itemmodels itemviews \
	kdeclarative kdelibs4support kio libkdegames notifyconfig \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kgoldrunner/Makefile
	===================================================================
	--- games/kgoldrunner/Makefile
	+++ games/kgoldrunner/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	crash dbusaddons i18n kio libkdegames service \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/khangman/Makefile
	===================================================================
	--- games/khangman/Makefile
	+++ games/khangman/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= attica auth codecs completion config configwidgets coreaddons \
	crash doctools i18n kdeclarative libkeduvocdocument \
	newstuff notifications package service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: games/kigo/Makefile
	===================================================================
	--- games/kigo/Makefile
	+++ games/kigo/Makefile
	@@ -11,9 +11,9 @@
	coreaddons crash dbusaddons i18n jobwidgets kio \
	libkdegames newstuff notifyconfig service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: games/killbots/Makefile
	===================================================================
	--- games/killbots/Makefile
	+++ games/killbots/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes itemviews kio \
	libkdegames notifyconfig widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kiriki/Makefile
	===================================================================
	--- games/kiriki/Makefile
	+++ games/kiriki/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	guiaddons i18n iconthemes kio libkdegames widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network printsupport svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kjumpingcube/Makefile
	===================================================================
	--- games/kjumpingcube/Makefile
	+++ games/kjumpingcube/Makefile
	@@ -11,9 +11,9 @@
	dbusaddons guiaddons i18n iconthemes itemviews jobwidgets \
	kio libkdegames newstuff notifyconfig service solid widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: games/klickety/Makefile
	===================================================================
	--- games/klickety/Makefile
	+++ games/klickety/Makefile
	@@ -13,9 +13,9 @@
	coreaddons crash dbusaddons doctools i18n itemviews \
	jobwidgets kio libkdegames notifications notifyconfig service \
	solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: games/klines/Makefile
	===================================================================
	--- games/klines/Makefile
	+++ games/klines/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	guiaddons i18n iconthemes itemviews kio libkdegames \
	newstuff service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kmahjongg/Makefile
	===================================================================
	--- games/kmahjongg/Makefile
	+++ games/kmahjongg/Makefile
	@@ -12,9 +12,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons doctools i18n kdeclarative libkdegames newstuff \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kmines/Makefile
	===================================================================
	--- games/kmines/Makefile
	+++ games/kmines/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	i18n kio libkdegames notifyconfig sonnet textwidgets \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/knavalbattle/Makefile
	===================================================================
	--- games/knavalbattle/Makefile
	+++ games/knavalbattle/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons dnssd doctools i18n libkdegames sonnet \
	textwidgets widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/knetwalk/Makefile
	===================================================================
	--- games/knetwalk/Makefile
	+++ games/knetwalk/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	guiaddons i18n iconthemes itemviews kio libkdegames \
	notifyconfig sonnet textwidgets widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/knights/Makefile
	===================================================================
	--- games/knights/Makefile
	+++ games/knights/Makefile
	@@ -17,7 +17,7 @@
	widgetsaddons xmlgui
	USE_QT= concurrent core dbus declarative gui network speech \
	svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kolf/Makefile
	===================================================================
	--- games/kolf/Makefile
	+++ games/kolf/Makefile
	@@ -12,10 +12,10 @@
	itemviews jobwidgets kdelibs4support kio libkdegames \
	notifications parts service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network phonon4 printsupport \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_LDCONFIG= yes

	Index: games/kollision/Makefile
	===================================================================
	--- games/kollision/Makefile
	+++ games/kollision/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
	i18n kio libkdegames newstuff notifyconfig textwidgets \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network phonon4 svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/konquest/Makefile
	===================================================================
	--- games/konquest/Makefile
	+++ games/konquest/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n libkdegames widgetsaddons \
	xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kpat/Makefile
	===================================================================
	--- games/kpat/Makefile
	+++ games/kpat/Makefile
	@@ -15,9 +15,9 @@
	crash dbusaddons guiaddons i18n iconthemes itemviews \
	kdeclarative kio libkdegames newstuff notifyconfig service \
	textwidgets widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network phonon4 svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	CMAKE_ON= WITH_BH_SOLVER

	OPTIONS_DEFINE= DOCS
	Index: games/kreversi/Makefile
	===================================================================
	--- games/kreversi/Makefile
	+++ games/kreversi/Makefile
	@@ -11,9 +11,9 @@
	coreaddons crash dbusaddons i18n iconthemes itemviews \
	jobwidgets kdeclarative kio libkdegames package service \
	solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: games/kshisen/Makefile
	===================================================================
	--- games/kshisen/Makefile
	+++ games/kshisen/Makefile
	@@ -12,9 +12,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons dnssd i18n kdeclarative kio libkdegames \
	newstuff widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/ksirk/Makefile
	===================================================================
	--- games/ksirk/Makefile
	+++ games/ksirk/Makefile
	@@ -11,7 +11,7 @@
	coreaddons crash i18n iconthemes kio libkdegames newstuff \
	service wallet widgetsaddons xmlgui
	USE_QT= concurrent core dbus declarative gui network phonon4 svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: games/ksnakeduel/Makefile
	===================================================================
	--- games/ksnakeduel/Makefile
	+++ games/ksnakeduel/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	crash dbusaddons guiaddons i18n libkdegames \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kspaceduel/Makefile
	===================================================================
	--- games/kspaceduel/Makefile
	+++ games/kspaceduel/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	crash dbusaddons i18n libkdegames widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/ksquares/Makefile
	===================================================================
	--- games/ksquares/Makefile
	+++ games/ksquares/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons guiaddons i18n iconthemes itemviews kio \
	libkdegames notifyconfig widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/ksudoku/Makefile
	===================================================================
	--- games/ksudoku/Makefile
	+++ games/ksudoku/Makefile
	@@ -11,10 +11,10 @@
	USE_KDE= archive auth codecs completion config configwidgets \
	coreaddons crash guiaddons i18n jobwidgets kio \
	libkdegames service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network opengl printsupport \
	svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	OPTIONS_DEFINE= DOCS

	Index: games/ktuberling/Makefile
	===================================================================
	--- games/ktuberling/Makefile
	+++ games/ktuberling/Makefile
	@@ -13,10 +13,10 @@
	kdelibs4support kio libkdegames newstuff notifications \
	notifyconfig parts service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui multimedia network \
	phonon4 printsupport svg testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/kubrick/Makefile
	===================================================================
	--- games/kubrick/Makefile
	+++ games/kubrick/Makefile
	@@ -10,9 +10,9 @@
	USE_GL= gl glu
	USE_KDE= auth codecs config configwidgets coreaddons crash \
	i18n kio libkdegames service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network opengl svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/leela-zero/Makefile
	===================================================================
	--- games/leela-zero/Makefile
	+++ games/leela-zero/Makefile
	@@ -20,7 +20,7 @@
	USES= cmake compiler:c++14-lang eigen:3 localbase qt:5
	USE_GITHUB= yes
	GH_TUPLE= google:googletest:cafa9e5:gtest/gtest
	-USE_QT= core widgets buildtools_build qmake_build
	+USE_QT= core widgets buildtools:build qmake:build

	CMAKE_ON= USE_BLAS BUILD_TESTING
	CMAKE_ARGS= -DBLAS_INCLUDE_DIRS:STRING=${LOCALBASE}/include
	Index: games/libkdegames/Makefile
	===================================================================
	--- games/libkdegames/Makefile
	+++ games/libkdegames/Makefile
	@@ -15,9 +15,9 @@
	globalaccel guiaddons i18n iconthemes init itemmodels \
	itemviews jobwidgets kdeclarative kdelibs4support kio newstuff \
	package service textwidgets widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	SHLIB_VER= 7.3.1
	Index: games/libkmahjongg/Makefile
	===================================================================
	--- games/libkmahjongg/Makefile
	+++ games/libkmahjongg/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core gui svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: games/lskat/Makefile
	===================================================================
	--- games/lskat/Makefile
	+++ games/lskat/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash \
	guiaddons i18n libkdegames notifyconfig widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: games/multimc/Makefile
	===================================================================
	--- games/multimc/Makefile
	+++ games/multimc/Makefile
	@@ -19,8 +19,8 @@
	MultiMC:quazip:3691d57:quazip/libraries/quazip
	USE_LDCONFIG= yes
	USE_JAVA= 1.8+
	-USE_QT= core concurrent gui network testlib_build widgets xml \
	- buildtools_build qmake_build
	+USE_QT= core concurrent gui network testlib:build widgets xml \
	+ buildtools:build qmake:build

	CMAKE_ARGS= -DMultiMC_LAYOUT="lin-system"
	CMAKE_OFF= MultiMC_UPDATER
	Index: games/openage/Makefile
	===================================================================
	--- games/openage/Makefile
	+++ games/openage/Makefile
	@@ -34,7 +34,7 @@
	GH_ACCOUNT= SFTtech
	USE_SDL= image2 sdl2
	USE_GL= gl glu
	-USE_QT= core declarative gui network buildtools_build qmake_build
	+USE_QT= core declarative gui network buildtools:build qmake:build
	USE_PYTHON= cython
	USE_LDCONFIG= yes

	Index: games/openmw/Makefile
	===================================================================
	--- games/openmw/Makefile
	+++ games/openmw/Makefile
	@@ -24,8 +24,8 @@
	USE_GITHUB= yes
	GH_ACCOUNT= OpenMW
	USE_GL= gl
	-USE_QT= core gui network opengl printsupport widgets buildtools_build \
	- qmake_build
	+USE_QT= core gui network opengl printsupport widgets buildtools:build \
	+ qmake:build
	USE_SDL= sdl2

	CMAKE_ARGS= -DDESIRED_QT_VERSION=5 \
	Index: games/palapeli/Makefile
	===================================================================
	--- games/palapeli/Makefile
	+++ games/palapeli/Makefile
	@@ -12,7 +12,7 @@
	crash i18n itemviews jobwidgets kio libkdegames notifications service \
	solid widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: games/pentobi/Makefile
	===================================================================
	--- games/pentobi/Makefile
	+++ games/pentobi/Makefile
	@@ -18,7 +18,7 @@
	shared-mime-info tar:xz
	USE_GNOME= librsvg2:build
	USE_QT= core gui concurrent quickcontrols2 declarative network \
	- qmake_build buildtools_build linguisttools_build
	+ qmake:build buildtools:build linguisttools:build
	CMAKE_ARGS= -DDOCBOOK_XSL=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl

	PORTDATA= *
	Index: games/picmi/Makefile
	===================================================================
	--- games/picmi/Makefile
	+++ games/picmi/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	dbusaddons doctools i18n jobwidgets kdeclarative kio \
	libkdegames newstuff service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network svg testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: games/pokerth/Makefile
	===================================================================
	--- games/pokerth/Makefile
	+++ games/pokerth/Makefile
	@@ -27,7 +27,7 @@
	USES= compiler:c++11-lang gl gmake iconv qmake qt:5 sdl sqlite ssl
	USE_GL= gl
	USE_CXXSTD= c++11
	-USE_QT= buildtools_build core gui network sql sql-sqlite3 widgets
	+USE_QT= buildtools:build core gui network sql sql-sqlite3 widgets
	USE_SDL= mixer

	QMAKE_SOURCE_PATH= pokerth.pro
	Index: games/py-mnemosyne/Makefile
	===================================================================
	--- games/py-mnemosyne/Makefile
	+++ games/py-mnemosyne/Makefile
	@@ -22,7 +22,7 @@
	${PYTHON_PKGNAMEPREFIX}gtts>=0:audio/py-gtts@${PY_FLAVOR}

	USES= pyqt:5 python:3.7+ shebangfix dos2unix #due textproc/py-googletrans
	-USE_PYQT= pyqt5_run sip_run webengine_run
	+USE_PYQT= pyqt5:run sip:run webengine:run
	USE_PYTHON= autoplist concurrent distutils

	DOS2UNIX_GLOB= *.py
	Index: games/qnetwalk/Makefile
	===================================================================
	--- games/qnetwalk/Makefile
	+++ games/qnetwalk/Makefile
	@@ -13,7 +13,7 @@
	GH_ACCOUNT= AMDmi3

	USES= cmake compiler:c++11-lang pkgconfig qt:5 sdl
	-USE_QT= core gui widgets qmake_build buildtools_build linguisttools_build
	+USE_QT= core gui widgets qmake:build buildtools:build linguisttools:build
	USE_SDL= sdl2 mixer2

	PORTDOCS= ChangeLog.md README.md
	Index: games/solarus-quest-editor/Makefile
	===================================================================
	--- games/solarus-quest-editor/Makefile
	+++ games/solarus-quest-editor/Makefile
	@@ -28,7 +28,7 @@

	CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF
	USE_SDL= sdl2 ttf2 image2
	-USE_QT= buildtools_build concurrent core gui linguist qmake_build widgets
	+USE_QT= buildtools:build concurrent core gui linguist qmake:build widgets

	DESKTOP_ENTRIES= "Solarus Quest Editor" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
	"Game;" false
	Index: games/solarus/Makefile
	===================================================================
	--- games/solarus/Makefile
	+++ games/solarus/Makefile
	@@ -25,7 +25,7 @@
	GL_COMMIT= f43727b232b3ed13d98440a845e2a29e470e4f0d

	MAKE_ARGS+= DESTDIR=${STAGEDIR}
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets
	USE_SDL= sdl2 ttf2 image2
	USE_GL= gl glu
	USE_LDCONFIG= yes
	Index: games/tanglet/Makefile
	===================================================================
	--- games/tanglet/Makefile
	+++ games/tanglet/Makefile
	@@ -14,7 +14,7 @@
	USES= compiler:c++11-lib desktop-file-utils gl pkgconfig qmake \
	qt:5 shared-mime-info tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build linguisttools_build core gui widgets
	+USE_QT= buildtools:build linguisttools:build core gui widgets

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	Index: games/wyrmgus/Makefile
	===================================================================
	--- games/wyrmgus/Makefile
	+++ games/wyrmgus/Makefile
	@@ -23,7 +23,7 @@
	USES= cmake compiler:c++17-lang lua:51 pkgconfig sdl sqlite qt:5 xorg
	USE_QT= core gui widgets multimedia location \
	quickcontrols quickcontrols2 graphicaleffects \
	- qmake_build buildtools_build
	+ qmake:build buildtools:build
	USE_XORG= x11
	USE_SDL= sdl2 mixer2
	CMAKE_ARGS= -DGAMEDIR:STRING="bin" \
	Index: games/xnethack/Makefile
	===================================================================
	--- games/xnethack/Makefile
	+++ games/xnethack/Makefile
	@@ -41,7 +41,7 @@
	GRAPHICS= # none
	.elif ${FLAVOR} == "qt"
	USES+= localbase pkgconfig qt:5
	-USE_QT= buildtools_build core gui multimedia network widgets
	+USE_QT= buildtools:build core gui multimedia network widgets
	MAKE_ENV+= MOCPATH=${MOC} LINK="${CXX} -pie"
	# Qt wants PIC for some reason. For C code, PIE should be enough.
	CFLAGS+= -I${QT_INCDIR} -fpie
	Index: graphics/appleseed/Makefile
	===================================================================
	--- graphics/appleseed/Makefile
	+++ graphics/appleseed/Makefile
	@@ -67,7 +67,7 @@
	STUDIO_DESC= Build appleseed.studio (Qt-based)
	STUDIO_LIB_DEPENDS= ${PY_BOOST}
	STUDIO_USES= qt:5
	-STUDIO_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,opengl,widgets
	+STUDIO_USE= QT=buildtools:build,qmake:build,concurrent,core,gui,opengl,widgets
	STUDIO_CMAKE_OFF= -DWITH_STUDIO:BOOL=OFF
	STUDIO_IMPLIES= PYTHON

	Index: graphics/cloudcompare/Makefile
	===================================================================
	--- graphics/cloudcompare/Makefile
	+++ graphics/cloudcompare/Makefile
	@@ -17,7 +17,7 @@
	GH_PROJECT= ${GH_ACCOUNT}
	GH_TUPLE= CloudCompare:CCCoreLib:f0d5450:CloudCompare/libs/qCC_db/extern/CCCoreLib

	-USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build svg linguisttools_build
	+USE_QT= concurrent core gui opengl printsupport widgets buildtools:build qmake:build svg linguisttools:build
	USE_LDCONFIG= yes

	# PDAL support disabled ATM
	Index: graphics/colmap/Makefile
	===================================================================
	--- graphics/colmap/Makefile
	+++ graphics/colmap/Makefile
	@@ -27,7 +27,7 @@
	sqlite
	USE_GITHUB= yes
	USE_GL= gl glew
	-USE_QT= qmake_build buildtools_build core gui opengl_build widgets
	+USE_QT= qmake:build buildtools:build core gui opengl:build widgets
	EXCLUDE= SQLite
	EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude lib/,}
	CMAKE_OFF= BOOST_STATIC CUDA_ENABLED
	Index: graphics/converseen/Makefile
	===================================================================
	--- graphics/converseen/Makefile
	+++ graphics/converseen/Makefile
	@@ -12,7 +12,7 @@

	USES= cmake compiler:c++11-lang magick:7 qt:5 tar:bzip2
	USE_QT= core gui network widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= Faster3ck
	Index: graphics/diffpdf/Makefile
	===================================================================
	--- graphics/diffpdf/Makefile
	+++ graphics/diffpdf/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang qmake qt:5 gl
	USE_GL= gl
	-USE_QT= buildtools linguist_build core gui printsupport widgets
	+USE_QT= buildtools linguist:build core gui printsupport widgets

	PLIST_FILES= bin/diffpdf

	Index: graphics/digikam/Makefile
	===================================================================
	--- graphics/digikam/Makefile
	+++ graphics/digikam/Makefile
	@@ -43,8 +43,8 @@
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui location network opengl \
	printsupport sql webchannel widgets x11extras xml xmlpatterns \
	- sql-sqlite3_run \
	- buildtools_build qmake_build
	+ sql-sqlite3:run \
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	USE_LDCONFIG= yes
	@@ -80,7 +80,7 @@
	CMAKE_DISABLE_FIND_PACKAGE_QtAV

	MYSQL_USES= mysql:server
	-MYSQL_USE= QT=sql-mysql_run
	+MYSQL_USE= QT=sql-mysql:run
	MYSQL_CMAKE_BOOL= ENABLE_INTERNALMYSQL \
	ENABLE_MYSQLSUPPORT
	MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
	Index: graphics/dilay/Makefile
	===================================================================
	--- graphics/dilay/Makefile
	+++ graphics/dilay/Makefile
	@@ -17,7 +17,7 @@
	GH_ACCOUNT= abau
	USE_CXXSTD= c++14
	USE_GL= gl
	-USE_QT= core gui opengl widgets xml buildtools_build
	+USE_QT= core gui opengl widgets xml buildtools:build

	MAKE_JOBS_UNSAFE= yes # Workaround for: https://github.com/abau/dilay/issues/19 parallel build fails (still a problem despite having been closed)

	Index: graphics/djview4/Makefile
	===================================================================
	--- graphics/djview4/Makefile
	+++ graphics/djview4/Makefile
	@@ -21,7 +21,7 @@
	USE_GL= gl
	USE_GNOME= glib20
	USE_QT= core gui network opengl printsupport widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_XORG= sm ice xext xt

	GNU_CONFIGURE= yes
	Index: graphics/drawpile/Makefile
	===================================================================
	--- graphics/drawpile/Makefile
	+++ graphics/drawpile/Makefile
	@@ -20,7 +20,7 @@
	USES= cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
	USE_GITHUB= yes
	GH_ACCOUNT= ${PORTNAME:tl}
	-USE_QT= core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui multimedia network sql svg widgets buildtools:build linguisttools:build qmake:build
	USE_KDE= archive dnssd

	OPTIONS_DEFINE= DOCS
	Index: graphics/dspdfviewer/Makefile
	===================================================================
	--- graphics/dspdfviewer/Makefile
	+++ graphics/dspdfviewer/Makefile
	@@ -15,7 +15,7 @@
	libpoppler-qt5.so:graphics/poppler-qt5

	USES= cmake:insource compiler:c++14-lang pkgconfig qt:5
	-USE_QT= core gui linguisttools widgets xml buildtools_build qmake_build
	+USE_QT= core gui linguisttools widgets xml buildtools:build qmake:build
	USE_LDCONFIG= yes

	USE_GITHUB= yes
	Index: graphics/dust3d/Makefile
	===================================================================
	--- graphics/dust3d/Makefile
	+++ graphics/dust3d/Makefile
	@@ -23,7 +23,7 @@
	USES= compiler:c++14-lang gmake qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= huxingyi
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	core gui network opengl widgets
	ALL_TARGET= all

	Index: graphics/engauge-digitizer/Makefile
	===================================================================
	--- graphics/engauge-digitizer/Makefile
	+++ graphics/engauge-digitizer/Makefile
	@@ -19,7 +19,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5 # pkgconfig is for https://github.com/markummitchell/engauge-digitizer/issues/423
	USE_GITHUB= yes
	GH_ACCOUNT= markummitchell
	-USE_QT= core gui printsupport sql xml widgets buildtools_build
	+USE_QT= core gui printsupport sql xml widgets buildtools:build
	USE_GL= gl
	CONFIGURE_ENV= OPENJPEG_INCLUDE=${PREFIX}/include/openjpeg-2.4 OPENJPEG_LIB=${PREFIX}/lib \
	POPPLER_INCLUDE=${PREFIX}/include/poppler/qt5 POPPLER_LIB=${PREFIX}/lib
	@@ -30,7 +30,7 @@
	OPTIONS_DEFINE= NLS DOCS
	OPTIONS_SUB= yes

	-DOCS_USE= QT=help,linguist_build
	+DOCS_USE= QT=help,linguist:build

	do-patch-NLS-on:
	@${REINPLACE_CMD} -e 's\|QCoreApplication::applicationDirPath () + "/translations",\|"${DATADIR}/translations",\|' ${WRKSRC}/src/Translator/TranslatorContainer.cpp
	Index: graphics/eos-movrec/Makefile
	===================================================================
	--- graphics/eos-movrec/Makefile
	+++ graphics/eos-movrec/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake compiler:c++11-lang dos2unix pkgconfig qt:5 tar:bzip2
	DOS2UNIX_FILES= main.cpp
	-USE_QT= buildtools_build qmake_build core gui widgets
	+USE_QT= buildtools:build qmake:build core gui widgets

	ICON_SIZES= 16x16 32x32 128x128 256x256 512x512

	Index: graphics/epsonscan2/Makefile
	===================================================================
	--- graphics/epsonscan2/Makefile
	+++ graphics/epsonscan2/Makefile
	@@ -33,7 +33,7 @@
	USES= cmake gettext-runtime gnome jpeg localbase qt:5 xorg
	USE_GNOME= glib20
	USE_LDCONFIG= ${PREFIX}/lib/epsonscan2
	-USE_QT= buildtools_build core gui qmake_build widgets
	+USE_QT= buildtools:build core gui qmake:build widgets
	USE_XORG= x11 xau xcb xdmcp

	EPSON_VERSION= 1.0.0.0
	Index: graphics/evolvotron/Makefile
	===================================================================
	--- graphics/evolvotron/Makefile
	+++ graphics/evolvotron/Makefile
	@@ -17,7 +17,7 @@
	LIB_DEPENDS= libboost_thread.so:devel/boost-libs

	USES= compiler:c++11-lib gl gnome python qmake qt:5
	-USE_QT= core gui widgets xml buildtools_build
	+USE_QT= core gui widgets xml buildtools:build
	USE_GL= gl
	QMAKE_ARGS= VERSION_NUMBER="${PORTVERSION}"
	QMAKE_SOURCE_PATH= ${WRKSRC}/main.pro
	Index: graphics/filmulator/Makefile
	===================================================================
	--- graphics/filmulator/Makefile
	+++ graphics/filmulator/Makefile
	@@ -22,7 +22,7 @@

	USES= cmake jpeg libarchive pkgconfig qt:5
	USE_GITHUB= yes
	-USE_QT= buildtools_build qmake_build core declarative gui \
	+USE_QT= buildtools:build qmake:build core declarative gui \
	network sql widgets

	GH_ACCOUNT= CarVac
	Index: graphics/fracplanet/Makefile
	===================================================================
	--- graphics/fracplanet/Makefile
	+++ graphics/fracplanet/Makefile
	@@ -19,7 +19,7 @@
	USES= compiler:c++11-lang gl gnome qmake:outsource qt:5
	USE_GL= gl glu
	QMAKE_ARGS= VERSION_NUMBER=${PORTVERSION}
	-USE_QT= buildtools_build core gui opengl
	+USE_QT= buildtools:build core gui opengl

	DESKTOP_ENTRIES= "Fracplanet" \
	"" \
	Index: graphics/fractgen/Makefile
	===================================================================
	--- graphics/fractgen/Makefile
	+++ graphics/fractgen/Makefile
	@@ -12,7 +12,7 @@

	USES= compiler:c++11-lang tar:xz cmake qt:5
	USE_QT= core xml widgets printsupport gui \
	- buildtools_build qmake_build linguisttools_build
	+ buildtools:build qmake:build linguisttools:build

	CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man

	Index: graphics/fraqtive/Makefile
	===================================================================
	--- graphics/fraqtive/Makefile
	+++ graphics/fraqtive/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= compiler:c++11-lang dos2unix gl qmake qt:5
	-USE_QT= core gui opengl widgets xml buildtools_build
	+USE_QT= core gui opengl widgets xml buildtools:build
	USE_GL= gl glu
	USE_GITHUB= yes
	GH_ACCOUNT= mimecorg
	Index: graphics/glaxnimate/Makefile
	===================================================================
	--- graphics/glaxnimate/Makefile
	+++ graphics/glaxnimate/Makefile
	@@ -15,7 +15,7 @@
	libpotrace.so:graphics/libpotrace

	USES= cmake compiler:c++17-lang gl libarchive python qt:5
	-USE_QT= concurrent core gui network svg xml widgets buildtools_build linguisttools_build qmake_build uitools_build
	+USE_QT= concurrent core gui network svg xml widgets buildtools:build linguisttools:build qmake:build uitools:build
	USE_GL= gl

	USE_GITLAB= yes
	Index: graphics/glbinding/Makefile
	===================================================================
	--- graphics/glbinding/Makefile
	+++ graphics/glbinding/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	USE_GITHUB= yes
	Index: graphics/gmic-qt/Makefile
	===================================================================
	--- graphics/gmic-qt/Makefile
	+++ graphics/gmic-qt/Makefile
	@@ -27,7 +27,7 @@

	USES= cmake compiler:c++14-lang pkgconfig qt:5 xorg
	USE_QT= core gui network widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_XORG= ice sm x11 xext

	USE_GITHUB= yes
	Index: graphics/gpxsee/Makefile
	===================================================================
	--- graphics/gpxsee/Makefile
	+++ graphics/gpxsee/Makefile
	@@ -12,8 +12,8 @@

	USES= compiler:c++11-lang desktop-file-utils gl qmake:outsource \
	qt:5 shared-mime-info
	-USE_QT= buildtools_build concurrent core gui network opengl printsupport \
	- sql sql-sqlite3_run widgets
	+USE_QT= buildtools:build concurrent core gui network opengl printsupport \
	+ sql sql-sqlite3:run widgets
	USE_GL= gl

	USE_GITHUB= yes
	@@ -24,12 +24,12 @@
	OPTIONS_DEFAULT= MAPS PBF TIFF
	OPTIONS_SUB= yes
	MAPS_DESC= Install map definitions of some well known global map services
	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build
	NLS_USES= gettext-runtime
	PBF_DESC= Support for PBF vector maps
	PBF_RUN_DEPENDS= ${QT_PLUGINDIR}/imageformats/libpbf.so:graphics/qtpbfimageplugin
	TIFF_DESC= Support for GeoTIFF images
	-TIFF_USE= QT=imageformats_run
	+TIFF_USE= QT=imageformats:run

	pre-build-NLS-on:
	( cd ${BUILD_WRKSRC} && ${LRELEASE} ${WRKSRC}/${PORTNAME}.pro )
	Index: graphics/gwenview/Makefile
	===================================================================
	--- graphics/gwenview/Makefile
	+++ graphics/gwenview/Makefile
	@@ -23,10 +23,10 @@
	kdelibs4support kimageformats kio libkdcraw libkipi \
	notifications parts service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network opengl phonon4 printsupport \
	svg widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: graphics/heimer/Makefile
	===================================================================
	--- graphics/heimer/Makefile
	+++ graphics/heimer/Makefile
	@@ -12,8 +12,8 @@
	LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING

	USES= cmake compiler:c++17-lang qt:5
	-USE_QT= core gui network svg widgets xml buildtools_build \
	- linguisttools_build qmake_build testlib_build
	+USE_QT= core gui network svg widgets xml buildtools:build \
	+ linguisttools:build qmake:build testlib:build
	TEST_TARGET= test

	PLIST_FILES= bin/heimer \
	Index: graphics/ikona/Makefile
	===================================================================
	--- graphics/ikona/Makefile
	+++ graphics/ikona/Makefile
	@@ -22,7 +22,7 @@
	USE_KDE= auth codecs config configwidgets coreaddons i18n \
	kirigami2 widgetsaddons
	USE_QT= core declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	pre-configure:
	${CP} ${DISTDIR}/${DISTNAME}.cargo.vendor${EXTRACT_SUFX} ${WRKSRC}/ikona.cargo.vendor.tar.xz
	Index: graphics/ipe/Makefile
	===================================================================
	--- graphics/ipe/Makefile
	+++ graphics/ipe/Makefile
	@@ -20,7 +20,7 @@

	USES= compiler:c++11-lib gmake gnome jpeg lua:52 pkgconfig shebangfix qt:5
	USE_GNOME= cairo
	-USE_QT= buildtools_build core gui qmake_build widgets
	+USE_QT= buildtools:build core gui qmake:build widgets
	USE_TEX= pdftex

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
	Index: graphics/kamera/Makefile
	===================================================================
	--- graphics/kamera/Makefile
	+++ graphics/kamera/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 localbase qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons doctools i18n \
	kio service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: graphics/kamerka/Makefile
	===================================================================
	--- graphics/kamerka/Makefile
	+++ graphics/kamerka/Makefile
	@@ -19,12 +19,12 @@
	USE_GITHUB= yes
	GH_ACCOUNT= dos1
	USE_QT= concurrent core dbus declarative gui network printsupport script xml widgets \
	- qmake_build buildtools_build
	+ qmake:build buildtools:build
	USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons crash \
	guiaddons i18n iconthemes init itemviews jobwidgets kdeclarative kdelibs4support \
	kio notifications package parts service solid sonnet textwidgets \
	unitconversion xmlgui widgetsaddons windowsystem \
	- doctools_build
	+ doctools:build
	USE_XORG= x11

	OPTIONS_DEFINE= NLS
	Index: graphics/katarakt/Makefile
	===================================================================
	--- graphics/katarakt/Makefile
	+++ graphics/katarakt/Makefile
	@@ -14,7 +14,7 @@
	LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5

	USES= compiler:c++11-lang gl pkgconfig qmake qt:5
	-USE_QT= buildtools_build core gui xml dbus network widgets
	+USE_QT= buildtools:build core gui xml dbus network widgets
	USE_GL= gl

	USE_GITLAB= yes
	Index: graphics/kcolorchooser/Makefile
	===================================================================
	--- graphics/kcolorchooser/Makefile
	+++ graphics/kcolorchooser/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons i18n \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: graphics/kcolorpicker/Makefile
	===================================================================
	--- graphics/kcolorpicker/Makefile
	+++ graphics/kcolorpicker/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= ksnip
	USE_QT= core gui widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	CMAKE_ON= BUILD_SHARED_LIBS

	Index: graphics/kdegraphics-mobipocket/Makefile
	===================================================================
	--- graphics/kdegraphics-mobipocket/Makefile
	+++ graphics/kdegraphics-mobipocket/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= completion config coreaddons jobwidgets kio service solid \
	widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_LDCONFIG= yes

	Index: graphics/kdegraphics-svgpart/Makefile
	===================================================================
	--- graphics/kdegraphics-svgpart/Makefile
	+++ graphics/kdegraphics-svgpart/Makefile
	@@ -11,9 +11,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n jobwidgets kio parts service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: graphics/kdegraphics-thumbnailers/Makefile
	===================================================================
	--- graphics/kdegraphics-thumbnailers/Makefile
	+++ graphics/kdegraphics-thumbnailers/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg
	USE_KDE= archive completion config coreaddons jobwidgets libkdcraw \
	libkexiv2 kio service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: graphics/kdiagram/Makefile
	===================================================================
	--- graphics/kdiagram/Makefile
	+++ graphics/kdiagram/Makefile
	@@ -14,7 +14,7 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core gui linguisttools printsupport sql svg widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	PLIST_SUB= SHLIB_VER="${PORTVERSION}" \
	SHLIB_SHVER="${PORTVERSION:R:R}"
	Index: graphics/kf5-kimageformats/Makefile
	===================================================================
	--- graphics/kf5-kimageformats/Makefile
	+++ graphics/kf5-kimageformats/Makefile
	@@ -10,9 +10,9 @@

	USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= archive \
	- ecm_build
	+ ecm:build
	USE_QT= core gui printsupport widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	CFLAGS+= -I${LOCALBASE}/include/Imath

	Index: graphics/kf5-kplotting/Makefile
	===================================================================
	--- graphics/kf5-kplotting/Makefile
	+++ graphics/kf5-kplotting/Makefile
	@@ -6,8 +6,8 @@
	COMMENT= KF5 lightweight plotting framework

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core gui uiplugin widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: graphics/kf5-kquickcharts/Makefile
	===================================================================
	--- graphics/kf5-kquickcharts/Makefile
	+++ graphics/kf5-kquickcharts/Makefile
	@@ -6,10 +6,10 @@
	COMMENT= KF5 QtQuick plugin providing high-performance charts

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build \
	- kirigami2_run
	+USE_KDE= ecm:build \
	+ kirigami2:run
	USE_QT= core declarative gui network quickcontrols2 \
	- buildtools_build qmake_build \
	- quickcontrols2_run
	+ buildtools:build qmake:build \
	+ quickcontrols2:run

	.include <bsd.port.mk>
	Index: graphics/kf5-prison/Makefile
	===================================================================
	--- graphics/kf5-prison/Makefile
	+++ graphics/kf5-prison/Makefile
	@@ -10,8 +10,8 @@
	libZXing.so:textproc/zxing-cpp

	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core declarative gui multimedia network widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: graphics/kgeotag/Makefile
	===================================================================
	--- graphics/kgeotag/Makefile
	+++ graphics/kgeotag/Makefile
	@@ -12,10 +12,10 @@

	USES= cmake compiler:c++17-lang kde:5 pkgconfig qt:5 tar:xz
	USE_QT= core gui widgets \
	- buildtools_build linguist_build qmake_build
	+ buildtools:build linguist:build qmake:build
	USE_KDE= coreaddons config configwidgets crash i18n libkexiv2 \
	marble xmlgui \
	- ecm_build
	+ ecm:build
	# From stage-qa; these are not checked explicitly, but link
	# transitively though other KDE components (mostly Marble).
	USE_QT+= dbus declarative location network printsupport webchannel xml
	Index: graphics/kgraphviewer/Makefile
	===================================================================
	--- graphics/kgraphviewer/Makefile
	+++ graphics/kgraphviewer/Makefile
	@@ -20,9 +20,9 @@
	USE_KDE= auth codecs completion config configwidgets \
	coreaddons i18n iconthemes jobwidgets kio parts service \
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build doctools_build
	+ ecm:build doctools:build
	USE_QT= concurrent core dbus gui network printsupport svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: graphics/kimageannotator/Makefile
	===================================================================
	--- graphics/kimageannotator/Makefile
	+++ graphics/kimageannotator/Makefile
	@@ -16,7 +16,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= ksnip
	USE_QT= core gui svg widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_XORG= x11

	CMAKE_ON= BUILD_SHARED_LIBS
	Index: graphics/kimagemapeditor/Makefile
	===================================================================
	--- graphics/kimagemapeditor/Makefile
	+++ graphics/kimagemapeditor/Makefile
	@@ -14,7 +14,7 @@
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui location network printsupport \
	webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: graphics/kipi-plugins/Makefile
	===================================================================
	--- graphics/kipi-plugins/Makefile
	+++ graphics/kipi-plugins/Makefile
	@@ -14,9 +14,9 @@
	USE_KDE= kio libkipi solid archive auth bookmarks codecs completion \
	config configwidgets coreaddons i18n itemviews jobwidgets \
	service widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS MEDIAWIKI KVKONTAKTE
	Index: graphics/klatexformula/Makefile
	===================================================================
	--- graphics/klatexformula/Makefile
	+++ graphics/klatexformula/Makefile
	@@ -16,8 +16,8 @@
	gl qt:5 shared-mime-info tar:bzip2 localbase
	USE_GL= gl
	USE_QT= core dbus gui sql svg widgets x11extras xml \
	- buildtools_build designer_build linguisttools_build \
	- qmake_build uitools_build
	+ buildtools:build designer:build linguisttools:build \
	+ qmake:build uitools:build
	USE_TEX= latex dvipsk
	USE_LDCONFIG= yes

	Index: graphics/knotter/Makefile
	===================================================================
	--- graphics/knotter/Makefile
	+++ graphics/knotter/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++11-lang desktop-file-utils gl qt:5
	USE_QT= core gui network printsupport script svg xml widgets \
	- buildtools_build linguisttools_build qmake_build uitools_build
	+ buildtools:build linguisttools:build qmake:build uitools:build
	USE_GL= gl

	USE_GITLAB= yes
	Index: graphics/kolourpaint/Makefile
	===================================================================
	--- graphics/kolourpaint/Makefile
	+++ graphics/kolourpaint/Makefile
	@@ -13,9 +13,9 @@
	itemmodels itemviews jobwidgets kdelibs4support kio libkexiv2 \
	libksane notifications parts service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= dbus concurrent core gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: graphics/kontrast/Makefile
	===================================================================
	--- graphics/kontrast/Makefile
	+++ graphics/kontrast/Makefile
	@@ -9,9 +9,9 @@
	USES= compiler:c++11-lang cmake pkgconfig \
	kde:5 qt:5 tar:xz
	USE_KDE= coreaddons i18n kdeclarative kirigami2 \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network quickcontrols2 sql svg widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: graphics/kooka/Makefile
	===================================================================
	--- graphics/kooka/Makefile
	+++ graphics/kooka/Makefile
	@@ -18,9 +18,9 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \
	ecm i18n iconthemes itemviews jobwidgets kio service solid sonnet \
	textwidgets widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	KDE_INVENT= 3ed25fb9a1a62b88240a4f0f403b1ad49cf0adeb
	Index: graphics/kphotoalbum/Makefile
	===================================================================
	--- graphics/kphotoalbum/Makefile
	+++ graphics/kphotoalbum/Makefile
	@@ -23,7 +23,7 @@
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui location network phonon4 \
	printsupport sql webchannel widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	SHEBANG_FILES= scripts/open-raw.pl scripts/kpa-backup.sh

	Index: graphics/kqtquickcharts/Makefile
	===================================================================
	--- graphics/kqtquickcharts/Makefile
	+++ graphics/kqtquickcharts/Makefile
	@@ -12,7 +12,7 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core declarative network gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: graphics/kquickimageeditor/Makefile
	===================================================================
	--- graphics/kquickimageeditor/Makefile
	+++ graphics/kquickimageeditor/Makefile
	@@ -13,7 +13,7 @@
	USES= cmake compiler:c++17-lang gl kde:5 pkgconfig qt:5 tar:xz
	USE_GL= gl
	USE_QT= core declarative gui network quickcontrols2 \
	- buildtools_build linguist_build qmake_build
	-USE_KDE= ecm_build
	+ buildtools:build linguist:build qmake:build
	+USE_KDE= ecm:build

	.include <bsd.port.mk>
	Index: graphics/krita/Makefile
	===================================================================
	--- graphics/krita/Makefile
	+++ graphics/krita/Makefile
	@@ -43,8 +43,8 @@
	USE_KDE= archive completion config coreaddons crash guiaddons i18n \
	itemmodels itemviews kio service widgetsaddons windowsystem
	USE_QT= concurrent core dbus declarative gui multimedia network printsupport \
	- sql svg testlib widgets x11extras xml sql-sqlite3_run \
	- buildtools_build qmake_build
	+ sql svg testlib widgets x11extras xml sql-sqlite3:run \
	+ buildtools:build qmake:build
	USE_XORG= ice sm xcb xext xi

	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_PyQt5:BOOL=true
	Index: graphics/ksanecore/Makefile
	===================================================================
	--- graphics/ksanecore/Makefile
	+++ graphics/ksanecore/Makefile
	@@ -9,9 +9,9 @@
	LIB_DEPENDS= libsane.so:graphics/sane-backends

	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core gui widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: graphics/kseexpr/Makefile
	===================================================================
	--- graphics/kseexpr/Makefile
	+++ graphics/kseexpr/Makefile
	@@ -13,7 +13,7 @@
	USES= bison cmake kde:5 qt:5
	USE_KDE= ecm i18n
	USE_LDCONFIG= yes
	-USE_QT= core gui widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui widgets buildtools:build linguisttools:build qmake:build

	CONFLICTS_INSTALL= seexpr

	Index: graphics/ksnip/Makefile
	===================================================================
	--- graphics/ksnip/Makefile
	+++ graphics/ksnip/Makefile
	@@ -16,10 +16,10 @@

	USES= cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 xorg
	USE_GITHUB= yes
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= concurrent core dbus gui network printsupport svg testlib \
	widgets x11extras xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_XORG= x11 xcb

	PORTSCOUT= limit:^[0-9]
	Index: graphics/kxstitch/Makefile
	===================================================================
	--- graphics/kxstitch/Makefile
	+++ graphics/kxstitch/Makefile
	@@ -13,10 +13,10 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \
	i18n itemviews jobwidgets kio service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network printsupport widgets x11extras \
	xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	.include <bsd.port.mk>
	Index: graphics/libQGLViewer/Makefile
	===================================================================
	--- graphics/libQGLViewer/Makefile
	+++ graphics/libQGLViewer/Makefile
	@@ -13,7 +13,7 @@

	USES= compiler:c++11-lang gl qmake qt:5
	USE_GL= gl glu
	-USE_QT= core designer gui opengl widgets xml buildtools_build
	+USE_QT= core designer gui opengl widgets xml buildtools:build
	USE_LDCONFIG= yes
	PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:C/\.[0-9]$//} SHL1=${DISTVERSION:C/\.[0-9]\.[0-9]$//}

	Index: graphics/libkdcraw/Makefile
	===================================================================
	--- graphics/libkdcraw/Makefile
	+++ graphics/libkdcraw/Makefile
	@@ -16,7 +16,7 @@
	USES= cmake compiler:c++11-lang jpeg kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes
	CMAKE_ARGS= -DWITH_OpenMP:BOOL=False \
	-DENABLE_RAWSPEED=True
	Index: graphics/libkexiv2/Makefile
	===================================================================
	--- graphics/libkexiv2/Makefile
	+++ graphics/libkexiv2/Makefile
	@@ -11,7 +11,7 @@
	USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: graphics/libkipi/Makefile
	===================================================================
	--- graphics/libkipi/Makefile
	+++ graphics/libkipi/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons i18n \
	libkdcraw libkexiv2 service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: graphics/libksane/Makefile
	===================================================================
	--- graphics/libksane/Makefile
	+++ graphics/libksane/Makefile
	@@ -11,9 +11,9 @@

	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= config i18n sonnet textwidgets wallet widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core gui widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: graphics/libprojectm/Makefile
	===================================================================
	--- graphics/libprojectm/Makefile
	+++ graphics/libprojectm/Makefile
	@@ -46,13 +46,13 @@

	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
	PULSEAUDIO_USES= qt:5
	-PULSEAUDIO_USE= qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build,linguisttools_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
	+PULSEAUDIO_USE= qt=core,gui,opengl,widgets,xml,buildtools:build,qmake:build,linguisttools:build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
	PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio
	PULSEAUDIO_CONFIGURE_ON= --enable-qt

	JACK_LIB_DEPENDS= libjack.so:audio/jack
	JACK_USES= qt:5
	-JACK_USE= qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build,linguisttools_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
	+JACK_USE= qt=core,gui,opengl,widgets,xml,buildtools:build,qmake:build,linguisttools:build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns
	JACK_CONFIGURE_ENABLE= jack
	JACK_CONFIGURE_ON= --enable-qt

	Index: graphics/luminance-qt5/Makefile
	===================================================================
	--- graphics/luminance-qt5/Makefile
	+++ graphics/luminance-qt5/Makefile
	@@ -27,7 +27,7 @@
	USES= cmake desktop-file-utils eigen:3 jpeg pkgconfig qt:5 tar:bzip2
	USE_QT= concurrent core declarative gui location network \
	printsupport sql svg widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	OPTIONS_DEFINE= CFITSIO DOCS HELPBROWSER
	OPTIONS_DEFAULT= CFITSIO HELPBROWSER
	Index: graphics/lximage-qt/Makefile
	===================================================================
	--- graphics/lximage-qt/Makefile
	+++ graphics/lximage-qt/Makefile
	@@ -16,7 +16,7 @@
	gnome localbase:ldflags lxqt pkgconfig qt:5 gnome tar:xz xorg

	USE_GNOME= glib20
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	network printsupport svg widgets x11extras
	USE_LXQT= buildtools libfmqt
	USE_XORG= ice sm x11 xcb xext xfixes
	Index: graphics/mandelbulber/Makefile
	===================================================================
	--- graphics/mandelbulber/Makefile
	+++ graphics/mandelbulber/Makefile
	@@ -23,7 +23,7 @@
	USES= cmake compiler:c++11-lang gnome jpeg localbase:ldflags \
	pkgconfig qt:5
	USE_QT= core widgets network gui multimedia testlib concurrent \
	- qmake_build buildtools_build uitools_build
	+ qmake:build buildtools:build uitools:build

	CMAKE_SOURCE_PATH= ${WRKSRC}/mandelbulber2/cmake

	Index: graphics/nomacs/Makefile
	===================================================================
	--- graphics/nomacs/Makefile
	+++ graphics/nomacs/Makefile
	@@ -22,7 +22,7 @@
	USES= cmake compiler:c++11-lang cpe desktop-file-utils \
	dos2unix pkgconfig qt:5
	USE_QT= concurrent core gui network printsupport svg widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	DOS2UNIX_FILES= ImageLounge/plugins/PaintPlugin/src/DkPaintPlugin.cpp \
	ImageLounge/src/DkGui/DkWidgets.cpp

	Index: graphics/okular/Makefile
	===================================================================
	--- graphics/okular/Makefile
	+++ graphics/okular/Makefile
	@@ -29,10 +29,10 @@
	kdelibs4support khtml kio libkexiv2 parts pty \
	service solid sonnet textwidgets threadweaver wallet \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network phonon4 printsupport speech \
	svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS PURPOSE
	Index: graphics/opencsg/Makefile
	===================================================================
	--- graphics/opencsg/Makefile
	+++ graphics/opencsg/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang gl qmake qt:5
	USE_GL= gl glesv2 glew
	-USE_QT= opengl qmake_build
	+USE_QT= opengl qmake:build
	WRKSRC= ${WRKDIR}/${DISTNAME}/src
	PLIST_SUB= PORTVERSION=${PORTVERSION}

	Index: graphics/opencv/Makefile
	===================================================================
	--- graphics/opencv/Makefile
	+++ graphics/opencv/Makefile
	@@ -125,7 +125,7 @@
	VTK_CMAKE_BOOL= WITH_VTK
	VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9
	VTK_USES= qt:5
	-VTK_USE= QT=buildtools_build,qmake_build
	+VTK_USE= QT=buildtools:build,qmake:build
	###

	# IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
	Index: graphics/openimageio/Makefile
	===================================================================
	--- graphics/openimageio/Makefile
	+++ graphics/openimageio/Makefile
	@@ -29,7 +29,7 @@

	USES= cmake jpeg compiler:c++14-lang iconv:wchar_t qt:5

	-USE_QT+= buildtools_build qmake_build
	+USE_QT+= buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= OpenImageIO
	@@ -66,7 +66,7 @@
	IMAGEVIEWER_IMPLIES= TOOLS
	IMAGEVIEWER_CMAKE_BOOL= USE_QT USE_OPENGL
	IMAGEVIEWER_USE= GL=gl,glu,glew \
	- QT=buildtools,core,gui,opengl,qmake_build,widgets
	+ QT=buildtools,core,gui,opengl,qmake:build,widgets

	OPENCV_CMAKE_BOOL= USE_OPENCV
	OPENCV_IMPLIES= OPENJPEG
	Index: graphics/openorienteering-mapper/Makefile
	===================================================================
	--- graphics/openorienteering-mapper/Makefile
	+++ graphics/openorienteering-mapper/Makefile
	@@ -19,7 +19,7 @@

	USES= cmake:noninja compiler:c++14-lang \
	desktop-file-utils gmake qt:5 shared-mime-info
	-USE_QT= buildtools_build help qmake_build concurrent core gui \
	+USE_QT= buildtools:build help qmake:build concurrent core gui \
	network printsupport testlib widgets
	USE_GITHUB= yes
	GH_ACCOUNT= OpenOrienteering
	@@ -34,20 +34,20 @@
	OPTIONS_SUB= yes
	DOCS_CMAKE_BOOL= Mapper_WITH_DOCS
	DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
	-DOCS_USE= QT=assistant_run
	+DOCS_USE= QT=assistant:run
	EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES
	GDAL_DESC= Use the GDAL library
	GDAL_CMAKE_BOOL= Mapper_USE_GDAL
	GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal
	NLS_CMAKE_BOOL= Mapper_WITH_NLS
	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build
	NLS_USES= gettext-runtime
	POSITIONING_DESC= GPS positioning
	POSITIONING_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=0
	POSITIONING_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=1
	POSITIONING_USE= QT=location,sensors,serialport
	TEST_CMAKE_BOOL= Mapper_WITH_TEST
	-TEST_USE= QT=testlib_build
	+TEST_USE= QT=testlib:build
	TEST_TEST_TARGET= test
	TIFF_DESC= Support for TIFF
	TIFF_USE= QT=imageformats
	Index: graphics/openshadinglanguage/Makefile
	===================================================================
	--- graphics/openshadinglanguage/Makefile
	+++ graphics/openshadinglanguage/Makefile
	@@ -24,7 +24,7 @@

	USES= bison cmake compiler:c++14-lang localbase ncurses qt:5

	-USE_QT= buildtools_build qmake_build
	+USE_QT= buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= AcademySoftwareFoundation
	@@ -45,7 +45,7 @@

	OSLTOY_DESC= Interactive shader edit and visualize tool
	OSLTOY_CMAKE_BOOL= USE_QT
	-OSLTOY_USE= QT=buildtools_build,core,gui,qmake_build,widgets
	+OSLTOY_USE= QT=buildtools:build,core,gui,qmake:build,widgets

	#CXXFLAGS+= -I${STAGEDIR}/include

	Index: graphics/osg34/Makefile
	===================================================================
	--- graphics/osg34/Makefile
	+++ graphics/osg34/Makefile
	@@ -94,7 +94,7 @@
	PDF_VARS= FORCE_REQUIRE+=Poppler-glib
	PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib
	QT5_USES= qt:5
	-QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit,widgets
	+QT5_USE= qt=buildtools:build,core,gui,opengl,qmake:build,webkit,widgets
	QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5
	QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
	QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
	Index: graphics/ospray/Makefile
	===================================================================
	--- graphics/ospray/Makefile
	+++ graphics/ospray/Makefile
	@@ -24,7 +24,7 @@
	USES= cmake:testing compiler:c++11-lang gl pkgconfig readline qt:5
	USE_GITHUB= yes
	USE_GL= gl glu
	-USE_QT= core gui opengl qmake_build
	+USE_QT= core gui opengl qmake:build
	USE_LDCONFIG= yes

	PLIST_SUB= VERSION=${PORTVERSION}
	Index: graphics/oyranos/Makefile
	===================================================================
	--- graphics/oyranos/Makefile
	+++ graphics/oyranos/Makefile
	@@ -34,7 +34,7 @@
	USE_LDCONFIG= yes
	USE_GNOME= libxml2
	USE_QT= core gui widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xcursor xext xfixes xinerama xrandr xrender xft xxf86vm
	CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
	LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
	Index: graphics/pcl-pointclouds/Makefile
	===================================================================
	--- graphics/pcl-pointclouds/Makefile
	+++ graphics/pcl-pointclouds/Makefile
	@@ -79,7 +79,7 @@

	VTK_DESC= Build VTK visualizations
	VTK_USES= gl qt:5
	-VTK_USE= GL=gl,glu QT=core,gui,opengl,widgets,buildtools_build,qmake_build
	+VTK_USE= GL=gl,glu QT=core,gui,opengl,widgets,buildtools:build,qmake:build
	VTK_CMAKE_BOOL= WITH_VTK
	VTK_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
	VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9
	Index: graphics/pencil2d/Makefile
	===================================================================
	--- graphics/pencil2d/Makefile
	+++ graphics/pencil2d/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5 \
	shared-mime-info
	-USE_QT= core gui multimedia svg testlib widgets xml xmlpatterns buildtools_build
	+USE_QT= core gui multimedia svg testlib widgets xml xmlpatterns buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: graphics/peruse/Makefile
	===================================================================
	--- graphics/peruse/Makefile
	+++ graphics/peruse/Makefile
	@@ -16,7 +16,7 @@
	kdeclarative kio newstuff package service solid \
	widgetsaddons windowsystem
	USE_QT= concurrent core dbus declarative gui network opengl sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: graphics/pfstools/Makefile
	===================================================================
	--- graphics/pfstools/Makefile
	+++ graphics/pfstools/Makefile
	@@ -86,7 +86,7 @@

	VIEW_CMAKE_BOOL= WITH_QT
	VIEW_USES= gl qt:5
	-VIEW_USE= GL=glut GL=gl,glu QT=core,gui,widgets,buildtools_build,qmake_build
	+VIEW_USE= GL=glut GL=gl,glu QT=core,gui,widgets,buildtools:build,qmake:build

	.include <bsd.port.options.mk>

	Index: graphics/photivo/Makefile
	===================================================================
	--- graphics/photivo/Makefile
	+++ graphics/photivo/Makefile
	@@ -23,7 +23,7 @@
	USES= cmake compiler:c++11-lib desktop-file-utils dos2unix \
	gettext-runtime gnome jpeg pkgconfig qt:5 zip
	USE_GNOME= glib20
	-USE_QT= qmake_build buildtools_build core gui network widgets
	+USE_QT= qmake:build buildtools:build core gui network widgets
	DOS2UNIX_FILES= Sources/ptImage.cpp Sources/ptCheck.cpp Sources/filemgmt/ptFileMgrWindow.h \
	Sources/ptImageHelper.h Sources/ptMainWindow.h Sources/ptImageHelper.cpp

	Index: graphics/photoflare/Makefile
	===================================================================
	--- graphics/photoflare/Makefile
	+++ graphics/photoflare/Makefile
	@@ -14,7 +14,7 @@

	USES= desktop-file-utils gl qmake qt:5 localbase pkgconfig
	USE_GITHUB= yes
	-USE_QT= core gui network printsupport widgets buildtools_build linguisttools_build
	+USE_QT= core gui network printsupport widgets buildtools:build linguisttools:build
	USE_GL= gl

	CXXFLAGS+= `pkg-config --cflags GraphicsMagick++`
	Index: graphics/photoqt/Makefile
	===================================================================
	--- graphics/photoqt/Makefile
	+++ graphics/photoqt/Makefile
	@@ -15,7 +15,7 @@
	localbase:ldflags qt:5
	USE_QT= core declarative graphicaleffects gui multimedia network \
	quickcontrols sql svg widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= luspi
	Index: graphics/phototonic/Makefile
	===================================================================
	--- graphics/phototonic/Makefile
	+++ graphics/phototonic/Makefile
	@@ -17,7 +17,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= oferkv
	USE_GL= gl
	-USE_QT= core gui imageformats svg widgets buildtools_build
	+USE_QT= core gui imageformats svg widgets buildtools:build

	post-patch:
	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \
	Index: graphics/poppler/Makefile
	===================================================================
	--- graphics/poppler/Makefile
	+++ graphics/poppler/Makefile
	@@ -80,7 +80,7 @@
	. elif ${_SLAVE_PORT} == qt5
	USES+= qt:5
	USE_QT= core gui widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	. elif ${_SLAVE_PORT} == qt6
	USES+= gl qt:6
	USE_GL+= gl opengl
	Index: graphics/py-python-poppler-qt5/Makefile
	===================================================================
	--- graphics/py-python-poppler-qt5/Makefile
	+++ graphics/py-python-poppler-qt5/Makefile
	@@ -19,7 +19,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= frescobaldi
	USE_GL= gl
	-USE_PYQT= pyqt5 sip_build
	+USE_PYQT= pyqt5 sip:build
	USE_PYTHON= flavors
	USE_QT= core gui xml

	Index: graphics/py-traitsui/Makefile
	===================================================================
	--- graphics/py-traitsui/Makefile
	+++ graphics/py-traitsui/Makefile
	@@ -33,7 +33,7 @@
	PYSIDE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR}
	QT5_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
	QT5_USES= pyqt:5
	-QT5_USE= PYQT=pyqt5_run
	+QT5_USE= PYQT=pyqt5:run
	WXPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython41>0:x11-toolkits/py-wxPython4@${PY_FLAVOR}

	.include <bsd.port.mk>
	Index: graphics/qcomicbook/Makefile
	===================================================================
	--- graphics/qcomicbook/Makefile
	+++ graphics/qcomicbook/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= stolowski
	USE_QT= core gui printsupport widgets x11extras\
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	OPTIONS_DEFINE= 7ZIP ACE RAR

	Index: graphics/qcustomplot-qt5/Makefile
	===================================================================
	--- graphics/qcustomplot-qt5/Makefile
	+++ graphics/qcustomplot-qt5/Makefile
	@@ -14,7 +14,7 @@
	LICENSE_FILE= ${WRKSRC}/GPL.txt

	USES= compiler:c++11-lang pkgconfig qt:5
	-USE_QT= core gui widgets printsupport buildtools_build
	+USE_QT= core gui widgets printsupport buildtools:build
	USE_LDCONFIG= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: graphics/qgis-ltr/Makefile
	===================================================================
	--- graphics/qgis-ltr/Makefile
	+++ graphics/qgis-ltr/Makefile
	@@ -106,10 +106,10 @@
	USE_GNOME= libxml2
	USE_LDCONFIG= yes
	USE_PYQT= pyqt5 qscintilla2 pysip sip
	-USE_QT= 3d buildtools_build core concurrent dbus declarative \
	- designer_build qdoc_build gamepad gui linguist_build location \
	- network printsupport qmake_build script serialport \
	- sql sql-pgsql sql-sqlite3 svg uitools_build \
	+USE_QT= 3d buildtools:build core concurrent dbus declarative \
	+ designer:build qdoc:build gamepad gui linguist:build location \
	+ network printsupport qmake:build script serialport \
	+ sql sql-pgsql sql-sqlite3 svg uitools:build \
	webengine webkit widgets xml

	SHEBANG_FILES= src/plugins/grass/scripts/*.py
	Index: graphics/qgis/Makefile
	===================================================================
	--- graphics/qgis/Makefile
	+++ graphics/qgis/Makefile
	@@ -104,10 +104,10 @@
	USE_GNOME= libxml2
	USE_LDCONFIG= yes
	USE_PYQT= pyqt5 qscintilla2 pysip sip
	-USE_QT= 3d buildtools_build core concurrent dbus declarative \
	- designer_build qdoc_build gamepad gui linguist_build location \
	- network printsupport qmake_build script serialport \
	- sql sql-pgsql sql-sqlite3 svg uitools_build \
	+USE_QT= 3d buildtools:build core concurrent dbus declarative \
	+ designer:build qdoc:build gamepad gui linguist:build location \
	+ network printsupport qmake:build script serialport \
	+ sql sql-pgsql sql-sqlite3 svg uitools:build \
	webengine webkit widgets xml

	SHEBANG_FILES= src/plugins/grass/scripts/*.py
	Index: graphics/qt5-3d/Makefile
	===================================================================
	--- graphics/qt5-3d/Makefile
	+++ graphics/qt5-3d/Makefile
	@@ -11,7 +11,7 @@

	USES= compiler:c++11-lang perl5 pkgconfig qmake:norecursive qt-dist:5,3d
	USE_PERL5= extract
	-USE_QT= concurrent core declarative gui network buildtools_build
	+USE_QT= concurrent core declarative gui network buildtools:build

	OPTIONS_DEFINE_amd64= AVX
	OPTIONS_DEFINE_i386= AVX
	Index: graphics/qt5-graphicaleffects/Makefile
	===================================================================
	--- graphics/qt5-graphicaleffects/Makefile
	+++ graphics/qt5-graphicaleffects/Makefile
	@@ -9,6 +9,6 @@
	BROKEN_armv6= fails to install: pkg-static: Unable to access file DropShadowBase.qmlc: No such file or directory

	USES= compiler:c++11-lang qmake qt-dist:5,graphicaleffects
	-USE_QT= buildtools_build core declarative gui
	+USE_QT= buildtools:build core declarative gui

	.include <bsd.port.mk>
	Index: graphics/qt5-imageformats/Makefile
	===================================================================
	--- graphics/qt5-imageformats/Makefile
	+++ graphics/qt5-imageformats/Makefile
	@@ -13,6 +13,6 @@
	libwebp.so:graphics/webp

	USES= compiler:c++11-lang localbase qmake qt-dist:5,imageformats
	-USE_QT= core gui buildtools_build
	+USE_QT= core gui buildtools:build

	.include <bsd.port.mk>
	Index: graphics/qt5-opengl/Makefile
	===================================================================
	--- graphics/qt5-opengl/Makefile
	+++ graphics/qt5-opengl/Makefile
	@@ -9,7 +9,7 @@
	USES= compiler:c++11-lang gl perl5 qmake:no_env qt-dist:5,base
	USE_GL= gl
	USE_PERL5= extract
	-USE_QT= core gui widgets qmake_build buildtools_build
	+USE_QT= core gui widgets qmake:build buildtools:build
	HAS_CONFIGURE= yes

	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
	Index: graphics/qt5-pixeltool/Makefile
	===================================================================
	--- graphics/qt5-pixeltool/Makefile
	+++ graphics/qt5-pixeltool/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt 5 screen magnifier

	USES= compiler:c++11-lang qmake qt-dist:5,tools
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build

	# qt5logo.png is installed by qt5-widgets.
	DESKTOP_ENTRIES="Qt 5 PixelTool" "" \
	Index: graphics/qt5-svg/Makefile
	===================================================================
	--- graphics/qt5-svg/Makefile
	+++ graphics/qt5-svg/Makefile
	@@ -7,6 +7,6 @@
	COMMENT= Qt SVG support module

	USES= compiler:c++11-lang qmake qt-dist:5,svg
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build

	.include <bsd.port.mk>
	Index: graphics/qt5-wayland/Makefile
	===================================================================
	--- graphics/qt5-wayland/Makefile
	+++ graphics/qt5-wayland/Makefile
	@@ -18,7 +18,7 @@
	USE_GL= egl gl
	USE_GNOME= glib20
	USE_QT= core dbus gui declarative \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcomposite

	QT_BINARIES= yes
	Index: graphics/qtawesome/Makefile
	===================================================================
	--- graphics/qtawesome/Makefile
	+++ graphics/qtawesome/Makefile
	@@ -11,7 +11,7 @@

	USE_GITHUB= yes
	USES= compiler:c++11-lang qmake qt:5
	-USE_QT= core gui qmake_build buildtools_build
	+USE_QT= core gui qmake:build buildtools:build

	GH_ACCOUNT= gamecreature
	GH_PROJECT= QtAwesome
	Index: graphics/qtpbfimageplugin/Makefile
	===================================================================
	--- graphics/qtpbfimageplugin/Makefile
	+++ graphics/qtpbfimageplugin/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libprotobuf-lite.so:devel/protobuf

	USES= compiler:c++11-lang gl qmake qt:5
	-USE_QT= core gui buildtools_build
	+USE_QT= core gui buildtools:build
	USE_GL= gl
	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

	Index: graphics/qtqr/Makefile
	===================================================================
	--- graphics/qtqr/Makefile
	+++ graphics/qtqr/Makefile
	@@ -18,7 +18,7 @@
	${PYTHON_PKGNAMEPREFIX}zbar-py>=1.0.4:graphics/py-zbar-py@${PY_FLAVOR}

	USES= desktop-file-utils pyqt:5 python:3.6+ shebangfix
	-USE_PYQT= pyqt5_run
	+USE_PYQT= pyqt5:run
	USE_PYTHON= autoplist distutils

	SHEBANG_FILES= qtqr.py
	Index: graphics/quickqanava/Makefile
	===================================================================
	--- graphics/quickqanava/Makefile
	+++ graphics/quickqanava/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++14-lang qt:5
	USE_QT= core declarative gui network quickcontrols2 \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= cneben
	Index: graphics/qvge/Makefile
	===================================================================
	--- graphics/qvge/Makefile
	+++ graphics/qvge/Makefile
	@@ -17,7 +17,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl qt:5 \
	shared-mime-info xorg
	USE_GL= gl
	-USE_QT= buildtools_build qmake_build core gui network opengl \
	+USE_QT= buildtools:build qmake:build core gui network opengl \
	printsupport svg widgets x11extras xml
	USE_XORG= x11

	Index: graphics/rapid-photo-downloader/Makefile
	===================================================================
	--- graphics/rapid-photo-downloader/Makefile
	+++ graphics/rapid-photo-downloader/Makefile
	@@ -36,7 +36,7 @@

	USES= desktop-file-utils gettext pyqt:5 python:3.6+ qt:5
	USE_PYTHON= autoplist distutils noflavors
	-USE_QT= imageformats_run
	+USE_QT= imageformats:run
	USE_PYQT= pyqt5 sip
	BINARY_ALIAS= python3=${PYTHON_VERSION}

	Index: graphics/scantailor/Makefile
	===================================================================
	--- graphics/scantailor/Makefile
	+++ graphics/scantailor/Makefile
	@@ -20,8 +20,8 @@
	shared-mime-info xorg
	USE_CXXSTD= gnu++98
	USE_GITHUB= yes
	-USE_QT= core gui network opengl widgets xml buildtools_build \
	- linguisttools_build qmake_build
	+USE_QT= core gui network opengl widgets xml buildtools:build \
	+ linguisttools:build qmake:build
	USE_XORG+= xrender

	GH_ACCOUNT= 4lex4
	Index: graphics/seexpr/Makefile
	===================================================================
	--- graphics/seexpr/Makefile
	+++ graphics/seexpr/Makefile
	@@ -16,7 +16,7 @@
	USES= bison cmake compiler:c++14-lang gl qt:5
	USE_GL= gl glu
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build qmake_build core gui opengl widgets
	+USE_QT= buildtools:build qmake:build core gui opengl widgets

	MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40

	@@ -38,7 +38,7 @@
	LLVM_CMAKE_OFF= -DENABLE_LLVM_BACKEND:BOOL=FALSE

	NLS_USES= kde:5
	-NLS_USE= KDE=ecm_build
	+NLS_USE= KDE=ecm:build
	NLS_CMAKE_OFF= -DBUILD_TRANSLATIONS:BOOL=FALSE

	PYTHON_BUILD_DEPENDS= sip:devel/py-sip4
	Index: graphics/showimage/Makefile
	===================================================================
	--- graphics/showimage/Makefile
	+++ graphics/showimage/Makefile
	@@ -16,9 +16,9 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons ecm i18n itemviews jobwidgets kio service solid \
	widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network xml widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: graphics/skanlite/Makefile
	===================================================================
	--- graphics/skanlite/Makefile
	+++ graphics/skanlite/Makefile
	@@ -15,9 +15,9 @@
	USE_KDE= auth config configwidgets codecs completion \
	coreaddons i18n jobwidgets kio \
	service solid widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core concurrent dbus gui network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: graphics/skanpage/Makefile
	===================================================================
	--- graphics/skanpage/Makefile
	+++ graphics/skanpage/Makefile
	@@ -17,9 +17,9 @@
	USE_KDE= auth config configwidgets codecs completion \
	coreaddons crash i18n jobwidgets kio kirigami2 purpose \
	service widgetsaddons xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core concurrent dbus declarative gui network printsupport \
	quickcontrols2 widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: graphics/spectacle/Makefile
	===================================================================
	--- graphics/spectacle/Makefile
	+++ graphics/spectacle/Makefile
	@@ -17,10 +17,10 @@
	dbusaddons globalaccel guiaddons i18n jobwidgets kdeclarative kio \
	libkipi newstuff notifications package purpose service solid wayland \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core concurrent dbus declarative gui network printsupport \
	quickcontrols svg widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11 xcb xext xfixes

	OPTIONS_DEFINE= DOCS
	Index: graphics/tiled/Makefile
	===================================================================
	--- graphics/tiled/Makefile
	+++ graphics/tiled/Makefile
	@@ -18,7 +18,7 @@
	USES= compiler:c++14-lang desktop-file-utils gl qmake qt:5 \
	pkgconfig shared-mime-info xorg
	USE_QT= core gui widgets opengl network declarative \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build
	USE_GL= gl
	USE_LDCONFIG= yes
	QMAKE_ARGS= SYSTEM_ZSTD=yes
	Index: graphics/vpaint/Makefile
	===================================================================
	--- graphics/vpaint/Makefile
	+++ graphics/vpaint/Makefile
	@@ -15,7 +15,7 @@
	GH_ACCOUNT= dalboris

	USES= compiler:c++11-lib eigen:3 gl qmake qt:5
	-USE_QT= core gui widgets opengl network qmake_build buildtools_build
	+USE_QT= core gui widgets opengl network qmake:build buildtools:build
	USE_GL= gl glu glew

	QMAKE_SOURCE_PATH= ${WRKSRC}/src/Gui
	Index: graphics/vulkan-caps-viewer/Makefile
	===================================================================
	--- graphics/vulkan-caps-viewer/Makefile
	+++ graphics/vulkan-caps-viewer/Makefile
	@@ -13,7 +13,7 @@

	USES= compiler:c++11-lib pkgconfig qmake qt:5
	USE_GITHUB= yes
	-USE_QT= qmake_build buildtools_build core gui network widgets
	+USE_QT= qmake:build buildtools:build core gui network widgets
	GH_ACCOUNT= SaschaWillems
	GH_PROJECT= VulkanCapsViewer
	GH_TUPLE= KhronosGroup:Vulkan-Headers:v1.3.226:vkheaders/Vulkan-Headers
	@@ -26,7 +26,7 @@
	OPTIONS_DEFAULT=WAYLAND X11

	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
	-WAYLAND_USE= QT=wayland_build
	+WAYLAND_USE= QT=wayland:build
	WAYLAND_QMAKE_ON= DEFINES+=WAYLAND

	X11_USE= QT=x11extras
	Index: graphics/vv/Makefile
	===================================================================
	--- graphics/vv/Makefile
	+++ graphics/vv/Makefile
	@@ -26,7 +26,7 @@
	USES= cmake compiler:c++11-lang eigen:3 jpeg qt:5 xorg
	USE_GITHUB= yes
	GH_ACCOUNT= open-vv
	-USE_QT= core designer gui network sql widgets xml buildtools_build qmake_build
	+USE_QT= core designer gui network sql widgets xml buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xt
	USE_CXXSTD= c++11

	Index: graphics/wrapland/Makefile
	===================================================================
	--- graphics/wrapland/Makefile
	+++ graphics/wrapland/Makefile
	@@ -18,9 +18,9 @@
	USES= cmake:testing gl kde:5 pkgconfig qt:5
	USE_GITLAB= yes
	USE_GL= egl
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build concurrent core gui
	+USE_QT= qmake:build buildtools:build concurrent core gui
	GL_ACCOUNT= kwinft
	GL_COMMIT= df61726a0955369f07399e8115454013b887903e
	PLIST_SUB= VERSION=${PORTVERSION}
	@@ -30,7 +30,7 @@
	OPTIONS_SUB= yes

	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
	-DOXYGEN_USE= QT=help_build
	+DOXYGEN_USE= QT=help:build
	DOXYGEN_CMAKE_BOOL= BUILD_QCH

	.include <bsd.port.mk>
	Index: graphics/xaos/Makefile
	===================================================================
	--- graphics/xaos/Makefile
	+++ graphics/xaos/Makefile
	@@ -18,7 +18,7 @@
	GH_PROJECT= XaoS

	USE_GL= gl
	-USE_QT= core gui opengl widgets buildtools_build linguisttools_build
	+USE_QT= core gui opengl widgets buildtools:build linguisttools:build

	QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include \
	LIBS+=-L${LOCALBASE}/lib
	Index: graphics/xpdf4/Makefile
	===================================================================
	--- graphics/xpdf4/Makefile
	+++ graphics/xpdf4/Makefile
	@@ -53,7 +53,7 @@
	GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1
	GUI_DESC= QT5 interface
	GUI_USES= qt:5 desktop-file-utils
	-GUI_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport
	+GUI_USE= QT=buildtools:build,qmake:build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport

	PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON
	PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF
	Index: graphics/yacreader/Makefile
	===================================================================
	--- graphics/yacreader/Makefile
	+++ graphics/yacreader/Makefile
	@@ -13,9 +13,9 @@

	USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
	USE_GITHUB= yes
	-USE_QT= qmake_build buildtools_build core concurrent_build declarative \
	- gui multimedia network quickcontrols2 sql sql-sqlite3_run svg \
	- testlib_build widgets
	+USE_QT= qmake:build buildtools:build core concurrent:build declarative \
	+ gui multimedia network quickcontrols2 sql sql-sqlite3:run svg \
	+ testlib:build widgets

	OPTIONS_DEFINE= OPENGL POPPLER
	OPTIONS_DEFAULT=OPENGL POPPLER
	Index: graphics/yafaray/Makefile
	===================================================================
	--- graphics/yafaray/Makefile
	+++ graphics/yafaray/Makefile
	@@ -41,7 +41,7 @@
	QT_DESC= Enable Qt Gui build
	QT_USES= qt:5
	QT_CMAKE_BOOL= WITH_QT
	-QT_USE= QT=core,gui,widgets,qmake_build,buildtools_build,qmake_build
	+QT_USE= QT=core,gui,widgets,qmake:build,buildtools:build,qmake:build

	post-install:
	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSES
	Index: graphics/zbar/Makefile
	===================================================================
	--- graphics/zbar/Makefile
	+++ graphics/zbar/Makefile
	@@ -69,7 +69,7 @@
	NLS_CONFIGURE_ENABLE= nls

	QT5_USES= qt:5
	-QT5_USE= QT=core,gui,widgets,x11extras,buildtools_build
	+QT5_USE= QT=core,gui,widgets,x11extras,buildtools:build
	QT5_CONFIGURE_WITH= qt qt5
	QT5_IMPLIES= X11

	Index: graphics/zint/Makefile
	===================================================================
	--- graphics/zint/Makefile
	+++ graphics/zint/Makefile
	@@ -16,7 +16,7 @@

	USES= cmake compiler:c++11-lang cpe qt:5
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build qmake_build uitools_build core gui \
	+USE_QT= buildtools:build qmake:build uitools:build core gui \
	svg widgets

	DESKTOP_ENTRIES="Zint" "Barcode generator" "" "zint-qt" "" false
	Index: irc/dxirc/Makefile
	===================================================================
	--- irc/dxirc/Makefile
	+++ irc/dxirc/Makefile
	@@ -40,6 +40,6 @@

	QT5_USES= qt:5
	QT5_USE= QT=core,gui,multimedia,network,widgets \
	- QT=buildtools_build,qmake_build
	+ QT=buildtools:build,qmake:build

	.include <bsd.port.mk>
	Index: irc/konversation/Makefile
	===================================================================
	--- irc/konversation/Makefile
	+++ irc/konversation/Makefile
	@@ -15,10 +15,10 @@
	emoticons globalaccel i18n iconthemes idletime itemviews \
	jobwidgets kio newstuff notifications notifyconfig parts service solid \
	sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build \
	- init_run
	+ ecm:build \
	+ init:run
	USE_QT= concurrent core dbus gui multimedia network phonon4 widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	SHEBANG_FILES= data/scripts/bug \
	Index: irc/kvirc/Makefile
	===================================================================
	--- irc/kvirc/Makefile
	+++ irc/kvirc/Makefile
	@@ -21,7 +21,7 @@
	service widgetsaddons windowsystem xmlgui
	USE_QT= core dbus gui multimedia network phonon4 printsupport sql svg \
	webkit widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xrender xscrnsaver
	USE_LDCONFIG= yes
	USE_GITHUB= yes
	Index: irc/quassel/Makefile
	===================================================================
	--- irc/quassel/Makefile
	+++ irc/quassel/Makefile
	@@ -18,7 +18,7 @@
	#GH_ACCOUNT= ${PORTNAME}
	#GH_PROJECT= ${PORTNAME}
	USE_OPENLDAP= yes
	-USE_QT= buildtools_build core network qmake_build
	+USE_QT= buildtools:build core network qmake:build

	CPE_VENDOR= quassel-irc
	CPE_PRODUCT= quassel_irc
	@@ -62,18 +62,18 @@

	KDE_DESC= Enable KDE integration for client / monolitic
	KDE_CMAKE_BOOL= WITH_KDE
	-KDE_USE= kde=configwidgets,coreaddons,notifications,notifyconfig,textwidgets,widgetsaddons,xmlgui,ecm_build
	+KDE_USE= kde=configwidgets,coreaddons,notifications,notifyconfig,textwidgets,widgetsaddons,xmlgui,ecm:build
	KDE_USES= kde:5

	SPELL_DESC= Enable spellcheck in client / monolitic via KF5Sonnet
	-SPELL_USE= kde=sonnet,ecm_build
	+SPELL_USE= kde=sonnet,ecm:build
	SPELL_USES= kde:5

	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build

	PGSQL_USE= qt=sql-pgsql

	-SQLITE3_USE= qt=sql-sqlite3_run
	+SQLITE3_USE= qt=sql-sqlite3:run

	_LIBVERSION= 0.14.0
	PLIST_SUB= LIBVERSION=${_LIBVERSION}
	Index: japanese/fcitx-skk/Makefile
	===================================================================
	--- japanese/fcitx-skk/Makefile
	+++ japanese/fcitx-skk/Makefile
	@@ -27,7 +27,7 @@

	.if ${PORT_OPTIONS:MQT5}
	USES+= qt:5
	-USE_QT= buildtools_build qmake_build gui widgets
	+USE_QT= buildtools:build qmake:build gui widgets
	USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt
	PLIST_SUB+= QT5=""
	LIB_DEPENDS+= libFcitxQt5WidgetsAddons.so:textproc/fcitx-qt5
	Index: japanese/kiten/Makefile
	===================================================================
	--- japanese/kiten/Makefile
	+++ japanese/kiten/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth archive codecs completion config configwidgets coreaddons \
	crash doctools i18n jobwidgets js khtml kio notifications \
	parts service sonnet textwidgets widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: lang/kf5-kross/Makefile
	===================================================================
	--- lang/kf5-kross/Makefile
	+++ lang/kf5-kross/Makefile
	@@ -12,10 +12,10 @@
	coreaddons i18n iconthemes itemviews \
	jobwidgets kio parts service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network script uiplugin \
	uitools widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: lang/kross-interpreters/Makefile
	===================================================================
	--- lang/kross-interpreters/Makefile
	+++ lang/kross-interpreters/Makefile
	@@ -8,9 +8,9 @@

	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= kross \
	- ecm_build
	+ ecm:build
	USE_QT= core gui script widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	CFLAGS+= -fdeclspec

	Index: lang/kturtle/Makefile
	===================================================================
	--- lang/kturtle/Makefile
	+++ lang/kturtle/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= attica auth codecs config configwidgets coreaddons crash \
	emoticons i18n init itemmodels kio newstuff \
	service sonnet textwidgets widgetsaddons xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: mail/trojita/Makefile
	===================================================================
	--- mail/trojita/Makefile
	+++ mail/trojita/Makefile
	@@ -24,7 +24,7 @@
	-DWITH_QT5:STRING=ON
	USES= cmake compiler:c++11-lib cpe desktop-file-utils gnome \
	localbase:ldflags qt:5 tar:xz
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	core dbus gui network sql sql-sqlite3 svg webkit widgets

	.include <bsd.port.mk>
	Index: math/acalc/Makefile
	===================================================================
	--- math/acalc/Makefile
	+++ math/acalc/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= anpp

	-USE_QT= core gui widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui widgets buildtools:build linguisttools:build qmake:build

	WRKSRC_SUBDIR= aCalc/aCalc

	Index: math/analitza/Makefile
	===================================================================
	--- math/analitza/Makefile
	+++ math/analitza/Makefile
	@@ -13,9 +13,9 @@

	USES= cmake compiler:c++11-lang eigen:3 gl kde:5 qt:5 tar:xz
	USE_GL= glu
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core declarative gui network opengl printsupport svg widgets xml \
	- buildtools_build linguisttools_build qmake_build testlib_build
	+ buildtools:build linguisttools:build qmake:build testlib:build

	USE_LDCONFIG= yes

	Index: math/asymptote/Makefile
	===================================================================
	--- math/asymptote/Makefile
	+++ math/asymptote/Makefile
	@@ -31,7 +31,7 @@
	USE_GNOME= librsvg2:run
	USE_PERL5= build
	USE_TEX= dvipsk formats
	-USE_PYQT= pyqt5_run
	+USE_PYQT= pyqt5:run

	CPPFLAGS+= -I${LOCALBASE}/include
	GNU_CONFIGURE= yes
	Index: math/cantor/Makefile
	===================================================================
	--- math/cantor/Makefile
	+++ math/cantor/Makefile
	@@ -22,11 +22,11 @@
	itemmodels itemviews init jobwidgets kdelibs4support kio \
	newstuff parts pty service solid sonnet syntaxhighlighting \
	texteditor textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui help location network \
	printsupport sql svg webchannel webengine \
	widgets xml xmlpatterns \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: math/cgal/Makefile
	===================================================================
	--- math/cgal/Makefile
	+++ math/cgal/Makefile
	@@ -40,7 +40,7 @@
	.if ${PORT_OPTIONS:MQT5}
	USES+= gl qt:5
	CMAKE_ARGS+= -DWITH_CGAL_Qt5=ON
	-USE_QT+= core gui opengl widgets svg buildtools_build qmake_build xml
	+USE_QT+= core gui opengl widgets svg buildtools:build qmake:build xml
	USE_GL+= gl glu
	.else
	CMAKE_ARGS+= -DWITH_CGAL_Qt5=OFF
	Index: math/g2o/Makefile
	===================================================================
	--- math/g2o/Makefile
	+++ math/g2o/Makefile
	@@ -20,7 +20,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= RainerKuemmerle
	USE_GL= gl glu
	-USE_QT= core gui opengl xml widgets buildtools_build qmake_build
	+USE_QT= core gui opengl xml widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	CMAKE_OFF= DO_SSE_AUTODETECT
	Index: math/gecode/Makefile
	===================================================================
	--- math/gecode/Makefile
	+++ math/gecode/Makefile
	@@ -46,7 +46,7 @@
	GIST_DESC= Enable gist, graphical and interactive search tool
	GIST_CONFIGURE_ENABLE= gist qt
	GIST_USES= gl qt:5
	-GIST_USE= gl=gl qt=core,gui,printsupport,widgets,qmake_build,buildtools_build
	+GIST_USE= gl=gl qt=core,gui,printsupport,widgets,qmake:build,buildtools:build
	GIST_IMPLIES= SHARED # because Qt must be built in a special way: error: "You must build your code with position independent code if Qt was built with -reduce-relocations"
	GIST_MAKE_ARGS= FREEBSD_LDFLAGS=-L${LOCALBASE}/lib

	Index: math/kalgebra/Makefile
	===================================================================
	--- math/kalgebra/Makefile
	+++ math/kalgebra/Makefile
	@@ -15,10 +15,10 @@
	USE_GL= glu
	USE_KDE= auth codecs config configwidgets coreaddons doctools i18n \
	kio service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network opengl printsupport \
	svg testlib webchannel widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CMAKE_ARGS= -DBUILD_mobile:BOOL=FALSE

	OPTIONS_DEFINE= DOCS WEBENGINE
	Index: math/kbruch/Makefile
	===================================================================
	--- math/kbruch/Makefile
	+++ math/kbruch/Makefile
	@@ -12,9 +12,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth config crash codecs configwidgets coreaddons doctools \
	i18n widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui xml widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: math/kcalc/Makefile
	===================================================================
	--- math/kcalc/Makefile
	+++ math/kcalc/Makefile
	@@ -14,9 +14,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash doctools \
	guiaddons i18n init notifications widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: math/kig/Makefile
	===================================================================
	--- math/kig/Makefile
	+++ math/kig/Makefile
	@@ -14,9 +14,9 @@
	crash doctools emoticons i18n iconthemes init itemmodels \
	jobwidgets kdelibs4support kio parts service solid sonnet syntaxhighlighting \
	texteditor textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport svg widgets xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	SHEBANG_FILES= pykig/pykig.py

	Index: math/kmplot/Makefile
	===================================================================
	--- math/kmplot/Makefile
	+++ math/kmplot/Makefile
	@@ -13,9 +13,9 @@
	iconthemes init itemmodels itemviews jobwidgets \
	kdelibs4support kio notifications parts service solid sonnet \
	textwidgets unitconversion widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: math/labplot/Makefile
	===================================================================
	--- math/labplot/Makefile
	+++ math/labplot/Makefile
	@@ -23,10 +23,10 @@
	jobwidgets kio newstuff notifications parts \
	service solid sonnet syntaxhighlighting textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport serialport \
	sql svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	CMAKE_OFF= ENABLE_LIBCERF
	Index: math/mathgl/Makefile
	===================================================================
	--- math/mathgl/Makefile
	+++ math/mathgl/Makefile
	@@ -55,7 +55,7 @@
	MPI_LIB_DEPENDS= libmpi.so:net/openmpi

	QT5_CMAKE_BOOL= enable-qt5
	-QT5_USE= QT=core,gui,opengl,printsupport,widgets,buildtools_build,qmake_build
	+QT5_USE= QT=core,gui,opengl,printsupport,widgets,buildtools:build,qmake:build
	QT5_USES= desktop-file-utils qt:5 shared-mime-info

	FLTK_CMAKE_BOOL= enable-fltk
	Index: math/mathmod/Makefile
	===================================================================
	--- math/mathmod/Makefile
	+++ math/mathmod/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lang dos2unix gl qmake qt:5
	USE_GL= gl
	-USE_QT= buildtools_build core gui opengl qmake_build widgets
	+USE_QT= buildtools:build core gui opengl qmake:build widgets

	PLIST_FILES= bin/${PORTNAME}

	Index: math/minizinc-ide/Makefile
	===================================================================
	--- math/minizinc-ide/Makefile
	+++ math/minizinc-ide/Makefile
	@@ -14,7 +14,7 @@
	USES= gl compiler:c++11-lang qmake qt:5
	USE_QT= core declarative gui location network printsupport \
	sql testlib webchannel webengine websockets widgets \
	- buildtools_build
	+ buildtools:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: math/mpsolve/Makefile
	===================================================================
	--- math/mpsolve/Makefile
	+++ math/mpsolve/Makefile
	@@ -30,6 +30,6 @@
	GUI_DESC= Graphical UI to solve polynomial equations visually
	GUI_CONFIGURE_OFF= --disable-ui
	GUI_USES= bison desktop-file-utils qt:5
	-GUI_USE= QT=core,gui,widgets,buildtools_build
	+GUI_USE= QT=core,gui,widgets,buildtools:build

	.include <bsd.port.mk>
	Index: math/octave/Makefile
	===================================================================
	--- math/octave/Makefile
	+++ math/octave/Makefile
	@@ -52,7 +52,7 @@
	USE_PERL5= build
	GNU_CONFIGURE= yes
	USE_QT= core gui help network opengl \
	- qmake_build buildtools_build linguist_build \
	+ qmake:build buildtools:build linguist:build \
	printsupport sql widgets \
	xml
	USE_XORG= x11 xext xfixes xft \
	Index: math/octomap/Makefile
	===================================================================
	--- math/octomap/Makefile
	+++ math/octomap/Makefile
	@@ -15,7 +15,7 @@
	LIB_DEPENDS= libQGLViewer-qt5.so:graphics/libQGLViewer

	USES= cmake:testing compiler:c++11-lang localbase:ldflags gl qt:5
	-USE_QT= core gui opengl xml widgets buildtools_build qmake_build
	+USE_QT= core gui opengl xml widgets buildtools:build qmake:build
	USE_GL= gl glu
	USE_LDCONFIG= yes

	Index: math/openmesh/Makefile
	===================================================================
	--- math/openmesh/Makefile
	+++ math/openmesh/Makefile
	@@ -15,7 +15,7 @@
	USES= cmake compiler:c++11-lang dos2unix gl qt:5 xorg
	DOS2UNIX_FILES= src/OpenMesh/Tools/CMakeLists.txt
	USE_QT= core concurrent gui help network opengl printsupport script scripttools sql svg x11extras xml xmlpatterns webkit widgets \
	- buildtools_build qmake_build uitools_build
	+ buildtools:build qmake:build uitools:build
	USE_GL= gl glu glut
	USE_XORG= xi xmu
	USE_LDCONFIG= yes
	Index: math/plplot/Makefile
	===================================================================
	--- math/plplot/Makefile
	+++ math/plplot/Makefile
	@@ -104,7 +104,7 @@
	THREADS_CMAKE_BOOL= THREADS_HAVE_PTHREAD_ARG

	QT5_USES= qt:5
	-QT5_USE= QT=core,gui,printsupport,svg,xml,widgets,buildtools_build,qmake_build
	+QT5_USE= QT=core,gui,printsupport,svg,xml,widgets,buildtools:build,qmake:build
	QT5_CMAKE_BOOL= ENABLE_qt

	WXGTK_LIB_DEPENDS= libagg.so:graphics/agg
	Index: math/qalculate-qt/Makefile
	===================================================================
	--- math/qalculate-qt/Makefile
	+++ math/qalculate-qt/Makefile
	@@ -19,7 +19,7 @@

	USES= compiler:c++11-lib gl pkgconfig qmake qt:5
	USE_GL= gl
	-USE_QT= buildtools_build linguisttools_build core gui network widgets
	+USE_QT= buildtools:build linguisttools:build core gui network widgets

	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes
	Index: math/qwtplot3d/Makefile
	===================================================================
	--- math/qwtplot3d/Makefile
	+++ math/qwtplot3d/Makefile
	@@ -11,7 +11,7 @@
	LIB_DEPENDS= libgl2ps.so:print/gl2ps

	USES= cmake compiler:c++17-lang gl qt:5
	-USE_QT= core gui opengl widgets buildtools_build qmake_build
	+USE_QT= core gui opengl widgets buildtools:build qmake:build
	USE_GL= gl glu
	USE_LDCONFIG= yes

	Index: math/rkward/Makefile
	===================================================================
	--- math/rkward/Makefile
	+++ math/rkward/Makefile
	@@ -23,7 +23,7 @@
	widgets xml
	USE_XORG= ice x11 xext
	USE_KDE= archive auth bookmarks codecs completion config configwidgets coreaddons\
	- crash doctools ecm i18n itemviews jobwidgets kate_run kdewebkit kio \
	+ crash doctools ecm i18n itemviews jobwidgets kate:run kdewebkit kio \
	notifications parts service solid sonnet syntaxhighlighting texteditor \
	textwidgets widgetsaddons windowsystem xmlgui

	Index: math/rocs/Makefile
	===================================================================
	--- math/rocs/Makefile
	+++ math/rocs/Makefile
	@@ -14,10 +14,10 @@
	crash i18n itemviews jobwidgets kdeclarative kio package parts \
	service solid sonnet syntaxhighlighting texteditor textwidgets \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative gui network script scripttools svg webkit \
	widgets xml xmlpatterns \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: math/speedcrunch/Makefile
	===================================================================
	--- math/speedcrunch/Makefile
	+++ math/speedcrunch/Makefile
	@@ -16,7 +16,7 @@
	BB_COMMIT= c0fc9c68d292

	USES= cmake compiler:c++11-lang qt:5 xorg
	-USE_QT= buildtools_build qmake_build core gui help sql widgets
	+USE_QT= buildtools:build qmake:build core gui help sql widgets
	USE_XORG= x11

	WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
	Index: math/vtk6/Makefile
	===================================================================
	--- math/vtk6/Makefile
	+++ math/vtk6/Makefile
	@@ -120,8 +120,8 @@

	.if ${PORT_OPTIONS:MQT5}
	USES+= qt:5
	-USE_QT= gui_build gui_run network_build network_run sql_build sql_run \
	- qmake_build opengl webkit_build buildtools webkit_run
	+USE_QT= gui:build gui:run network:build network:run sql:build sql:run \
	+ qmake:build opengl webkit:build buildtools webkit:run
	CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="5" \
	-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5
	PLIST_SUB+= QTV="qt5"
	Index: math/vtk8/Makefile
	===================================================================
	--- math/vtk8/Makefile
	+++ math/vtk8/Makefile
	@@ -63,7 +63,7 @@
	.endfor

	QT5_USES= qt:5
	-QT5_USE= QT=core,gui,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build
	+QT5_USE= QT=core,gui,sql,uiplugin,widgets,x11extras,qmake:build,buildtools:build
	QT5_CMAKE_ON= -DVTK_QT_VERSION:STRING="5" \
	-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \
	-DVTK_Group_Qt:BOOL=ON
	Index: math/vtk9/Makefile
	===================================================================
	--- math/vtk9/Makefile
	+++ math/vtk9/Makefile
	@@ -64,7 +64,7 @@
	PYTHON_VARS= SUB_FILES=PKG-INFO SUB_LIST=PORTVERSION=${PORTVERSION}

	QT5_USES= qt:5
	-QT5_USE= QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build
	+QT5_USE= QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake:build,buildtools:build
	QT5_CMAKE_ON= -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \
	-DVTK_GROUP_ENABLE_Qt:STRING=YES \
	-DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES
	Index: math/zegrapher/Makefile
	===================================================================
	--- math/zegrapher/Makefile
	+++ math/zegrapher/Makefile
	@@ -17,7 +17,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= AdelKS
	GH_TAGNAME= 6832bd61291b3e82bc05233ae74e8d7556abe910
	-USE_QT= core gui network printsupport svg widgets buildtools_build
	+USE_QT= core gui network printsupport svg widgets buildtools:build
	USE_GL= gl

	PLIST_FILES= bin/${PORTNAME} \
	Index: misc/actiona/Makefile
	===================================================================
	--- misc/actiona/Makefile
	+++ misc/actiona/Makefile
	@@ -20,7 +20,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= Jmgr
	USE_QT= concurrent core dbus gui multimedia network script scripttools speech sql widgets x11extras xml xmlpatterns \
	- buildtools_build uitools_build
	+ buildtools:build uitools:build
	USE_GNOME= gdkpixbuf2 glib20
	USE_GL= gl
	USE_XORG= x11 xtst
	@@ -30,7 +30,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build

	pre-build-NLS-on: # this is a hackish way to turn NLS on/off, asked the upstream to have the NLS option
	@cd ${WRKSRC} && ${MAKE_CMD} locale_release
	Index: misc/artikulate/Makefile
	===================================================================
	--- misc/artikulate/Makefile
	+++ misc/artikulate/Makefile
	@@ -10,10 +10,10 @@
	USE_KDE= archive attica auth codecs config configwidgets coreaddons \
	crash i18n kdeclarative newstuff service \
	widgetsaddons xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus declarative gui multimedia network sql testlib widgets \
	xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: misc/bibletime/Makefile
	===================================================================
	--- misc/bibletime/Makefile
	+++ misc/bibletime/Makefile
	@@ -14,7 +14,7 @@
	libsword.so:misc/sword

	USES= cmake compiler:c11 qt:5 tar:xz ssl
	-USE_QT= buildtools core dbus gui linguist_build network printsupport \
	+USE_QT= buildtools core dbus gui linguist:build network printsupport \
	script svg webkit widgets \
	- xml qmake_build testlib_build
	+ xml qmake:build testlib:build
	.include <bsd.port.mk>
	Index: misc/crosti/Makefile
	===================================================================
	--- misc/crosti/Makefile
	+++ misc/crosti/Makefile
	@@ -17,7 +17,7 @@
	shared-mime-info zip
	DOS2UNIX_GLOB= .cpp .csc .h .pro .txt .xml
	USE_GL= gl
	-USE_QT= concurrent core gui printsupport svg widgets buildtools_build
	+USE_QT= concurrent core gui printsupport svg widgets buildtools:build
	NO_WRKSUBDIR= yes

	.include <bsd.port.mk>
	Index: misc/ecflow/Makefile
	===================================================================
	--- misc/ecflow/Makefile
	+++ misc/ecflow/Makefile
	@@ -18,7 +18,7 @@
	RUN_DEPENDS= ${PY_DEPENDS}

	USES= cmake compiler:c++17-lang localbase perl5 pkgconfig python:3.6+ qt:5 shebangfix ssl
	-USE_QT= charts core gui network svg widgets buildtools_build qmake_build
	+USE_QT= charts core gui network svg widgets buildtools:build qmake:build

	SHEBANG_GLOB= .sh .in *.py

	Index: misc/edfbrowser/Makefile
	===================================================================
	--- misc/edfbrowser/Makefile
	+++ misc/edfbrowser/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= desktop-file-utils gl qmake qt:5 shared-mime-info
	-USE_QT= core gui network printsupport widgets buildtools_build
	+USE_QT= core gui network printsupport widgets buildtools:build
	USE_GL= gl

	OPTIONS_DEFINE= DOCS
	Index: misc/kde-thumbnailer-chm/Makefile
	===================================================================
	--- misc/kde-thumbnailer-chm/Makefile
	+++ misc/kde-thumbnailer-chm/Makefile
	@@ -14,9 +14,9 @@
	LIB_DEPENDS= libchm.so:misc/chmlib

	USES= cmake compiler:c++11-lang kde:5 qt:5 xorg
	-USE_KDE= ecm_build completion config coreaddons jobwidgets kio service solid \
	+USE_KDE= ecm:build completion config coreaddons jobwidgets kio service solid \
	widgetsaddons windowsystem
	-USE_QT= buildtools_build qmake_build concurrent core dbus gui network widgets
	+USE_QT= buildtools:build qmake:build concurrent core dbus gui network widgets
	USE_XORG= x11
	USE_GITHUB= yes
	GH_ACCOUNT= Caig
	Index: misc/kde-thumbnailer-epub/Makefile
	===================================================================
	--- misc/kde-thumbnailer-epub/Makefile
	+++ misc/kde-thumbnailer-epub/Makefile
	@@ -12,9 +12,9 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= cmake compiler:c++11-lang kde:5 qt:5 xorg
	-USE_KDE= ecm_build archive completion config coreaddons jobwidgets kio \
	+USE_KDE= ecm:build archive completion config coreaddons jobwidgets kio \
	service solid widgetsaddons windowsystem
	-USE_QT= buildtools_build qmake_build concurrent core dbus gui network \
	+USE_QT= buildtools:build qmake:build concurrent core dbus gui network \
	widgets xmlpatterns
	USE_XORG= x11

	Index: misc/kde-thumbnailer-fb2/Makefile
	===================================================================
	--- misc/kde-thumbnailer-fb2/Makefile
	+++ misc/kde-thumbnailer-fb2/Makefile
	@@ -12,9 +12,9 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= cmake compiler:c++11-lang kde:5 qt:5 xorg
	-USE_KDE= ecm_build archive completion config coreaddons jobwidgets kio \
	+USE_KDE= ecm:build archive completion config coreaddons jobwidgets kio \
	service solid widgetsaddons windowsystem
	-USE_QT= buildtools_build qmake_build concurrent core dbus gui network \
	+USE_QT= buildtools:build qmake:build concurrent core dbus gui network \
	widgets
	USE_XORG= x11

	Index: misc/kdeedu-data/Makefile
	===================================================================
	--- misc/kdeedu-data/Makefile
	+++ misc/kdeedu-data/Makefile
	@@ -8,7 +8,7 @@

	USES= cmake kde:5 qt:5 tar:xz
	USE_KDE= ecm
	-USE_QT= buildtools_build qmake_build
	+USE_QT= buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: misc/kf5-purpose/Makefile
	===================================================================
	--- misc/kf5-purpose/Makefile
	+++ misc/kf5-purpose/Makefile
	@@ -16,9 +16,9 @@
	USE_KDE= config completion coreaddons i18n kdeclarative kio \
	kirigami2 notifications jobwidgets service solid \
	widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: misc/kgeography/Makefile
	===================================================================
	--- misc/kgeography/Makefile
	+++ misc/kgeography/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons crash doctools \
	i18n iconthemes itemviews service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: misc/klettres/Makefile
	===================================================================
	--- misc/klettres/Makefile
	+++ misc/klettres/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= attica auth codecs completion config configwidgets coreaddons \
	crash emoticons i18n init itemmodels \
	kdelibs4support newstuff service widgetsaddons xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui network phonon4 svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	OPTIONS_DEFINE= DOCS

	Index: misc/kookbook/Makefile
	===================================================================
	--- misc/kookbook/Makefile
	+++ misc/kookbook/Makefile
	@@ -14,8 +14,8 @@
	LIB_DEPENDS= libmarkdown.so:textproc/discount

	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core declarative gui network printsupport widgets \
	- qmake_build buildtools_build testlib_build
	+ qmake:build buildtools:build testlib:build

	.include <bsd.port.mk>
	Index: misc/ktouch/Makefile
	===================================================================
	--- misc/ktouch/Makefile
	+++ misc/ktouch/Makefile
	@@ -13,10 +13,10 @@
	i18n iconthemes itemviews kcmutils kdeclarative kio newstuff package \
	parts service sonnet texteditor textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network quickcontrols2 script sql \
	testlib widgets x11extras xml xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xcb xext xkbfile

	OPTIONS_DEFINE= DOCS
	Index: misc/kwordquiz/Makefile
	===================================================================
	--- misc/kwordquiz/Makefile
	+++ misc/kwordquiz/Makefile
	@@ -14,9 +14,9 @@
	kdelibs4support kio libkeduvocdocument newstuff notifications \
	notifyconfig parts service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network phonon4 printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: misc/libkeduvocdocument/Makefile
	===================================================================
	--- misc/libkeduvocdocument/Makefile
	+++ misc/libkeduvocdocument/Makefile
	@@ -8,9 +8,9 @@

	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= archive config coreaddons i18n kio service \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: misc/molequeue/Makefile
	===================================================================
	--- misc/molequeue/Makefile
	+++ misc/molequeue/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	post-install:
	Index: misc/nn-insight/Makefile
	===================================================================
	--- misc/nn-insight/Makefile
	+++ misc/nn-insight/Makefile
	@@ -22,7 +22,7 @@
	libtcmalloc.so:devel/google-perftools

	USES= compiler:c++17-lang cmake pkgconfig qt:5
	-USE_QT= core gui svg widgets buildtools_build qmake_build
	+USE_QT= core gui svg widgets buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= yurivict
	Index: misc/openhantek/Makefile
	===================================================================
	--- misc/openhantek/Makefile
	+++ misc/openhantek/Makefile
	@@ -14,7 +14,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= OpenHantek
	GH_PROJECT= OpenHantek6022 # there's also the openhantek project which OpenHantek6022 is a fork of
	-USE_QT= core gui opengl printsupport widgets buildtools_build linguist_build qmake_build
	+USE_QT= core gui opengl printsupport widgets buildtools:build linguist:build qmake:build
	USE_GL= gl glu

	OPTIONS_DEFINE= HANTEK_AC
	Index: misc/openmvg/Makefile
	===================================================================
	--- misc/openmvg/Makefile
	+++ misc/openmvg/Makefile
	@@ -55,7 +55,7 @@
	GH_PROJECT= openMVG
	GH_TUPLE= openMVG-thirdparty:cereal:ac168fe:cereal/dependencies/cereal
	WRKSRC_SUBDIR= src
	-USE_QT= 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 \
	Index: misc/orange3/Makefile
	===================================================================
	--- misc/orange3/Makefile
	+++ misc/orange3/Makefile
	@@ -41,7 +41,7 @@

	USES= python:3.7+ pyqt:5
	USE_PYTHON= distutils cython autoplist noflavors
	-USE_PYQT= pyqt5_run webengine_run
	+USE_PYQT= pyqt5:run webengine:run

	USE_GITHUB= yes
	GH_ACCOUNT= biolab
	@@ -52,9 +52,9 @@
	.include <bsd.port.options.mk>

	.if ${ARCH} == aarch64 \|\| ${ARCH} == amd64 \|\| ${ARCH} == i386
	-USE_PYQT+= webengine_run
	+USE_PYQT+= webengine:run
	.else
	-USE_PYQT+= webkit_run
	+USE_PYQT+= webkit:run
	.endif

	xpost-install:
	Index: misc/orion/Makefile
	===================================================================
	--- misc/orion/Makefile
	+++ misc/orion/Makefile
	@@ -16,7 +16,7 @@
	USES= compiler:c++14-lang gl qmake qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= drac69
	-USE_QT= core declarative graphicaleffects gui network quickcontrols2 svg widgets buildtools_build
	+USE_QT= core declarative graphicaleffects gui network quickcontrols2 svg widgets buildtools:build
	USE_GL= gl

	PLIST_FILES= bin/${PORTNAME} \
	Index: misc/parley/Makefile
	===================================================================
	--- misc/parley/Makefile
	+++ misc/parley/Makefile
	@@ -16,10 +16,10 @@
	notifications kross khtml service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	libkeduvocdocument \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network multimedia \
	printsupport script svg webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xrender

	OPTIONS_DEFINE= DOCS
	Index: misc/qbrew/Makefile
	===================================================================
	--- misc/qbrew/Makefile
	+++ misc/qbrew/Makefile
	@@ -13,7 +13,7 @@

	USES= compiler:c++11-lang gl qmake qt:5
	USE_GL= gl
	-USE_QT= buildtools_build qmake_build \
	+USE_QT= buildtools:build qmake:build \
	core gui printsupport widgets xml

	QMAKE_ARGS= CONFIG+="configure"
	Index: misc/qt5-l10n/Makefile
	===================================================================
	--- misc/qt5-l10n/Makefile
	+++ misc/qt5-l10n/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt localized messages

	USES= qmake qt-dist:5,translations
	-USE_QT= qmake_build linguisttools_build
	+USE_QT= qmake:build linguisttools:build

	NO_ARCH= yes

	Index: misc/qt5ct/Makefile
	===================================================================
	--- misc/qt5ct/Makefile
	+++ misc/qt5ct/Makefile
	@@ -15,7 +15,7 @@
	USES= cmake compiler:c++11-lang gettext-runtime gl gnome qt:5 \
	tar:bz2 xorg
	USE_QT= concurrent core dbus gui paths svg widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_GL= egl gl
	USE_XORG= x11 xext xrender
	USE_GNOME= glib20
	Index: misc/tellico/Makefile
	===================================================================
	--- misc/tellico/Makefile
	+++ misc/tellico/Makefile
	@@ -29,9 +29,9 @@
	i18n iconthemes itemmodels itemviews jobwidgets js khtml kio \
	libkcddb libksane newstuff parts service solid sonnet \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	SHEBANG_FILES= src/fetch/scripts/dark_horse_comics.py \
	Index: misc/valentina/Makefile
	===================================================================
	--- misc/valentina/Makefile
	+++ misc/valentina/Makefile
	@@ -12,8 +12,8 @@
	BROKEN_i386= ld: error: failed to open bin/valentina: Cannot allocate memory

	USES= compiler:c++11-lang desktop-file-utils dos2unix gl gmake qmake qt:5
	-USE_QT= buildtools_build concurrent core gui linguisttools_build network \
	- opengl printsupport svg testlib_build widgets xml xmlpatterns
	+USE_QT= buildtools:build concurrent core gui linguisttools:build network \
	+ opengl printsupport svg testlib:build widgets xml xmlpatterns
	USE_GL= gl
	USE_LDCONFIG= yes

	Index: misc/veles/Makefile
	===================================================================
	--- misc/veles/Makefile
	+++ misc/veles/Makefile
	@@ -28,7 +28,7 @@
	SHEBANG_FILES= python/plugin python/proxy resources/install/postinst python/test_dis
	USE_GITHUB= yes
	GH_ACCOUNT= codilime
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build

	CMAKE_ARGS= -DFREEBSD_PYTHON_CMD:STRING=${PYTHON_CMD} \
	-DFREEBSD_PYTHON_EXENAME:STRING=${PYTHON_CMD:C/.*\///} \
	Index: multimedia/QtAV/Makefile
	===================================================================
	--- multimedia/QtAV/Makefile
	+++ multimedia/QtAV/Makefile
	@@ -21,7 +21,7 @@
	USES= compiler:c++11-lang gl qmake:outsource qt:5 xorg
	USE_GL= gl
	USE_QT= core declarative gui network opengl sql widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xext xv

	OPTIONS_DEFINE= OPENAL UCHARDET VAAPI PULSEAUDIO
	Index: multimedia/audacious/Makefile
	===================================================================
	--- multimedia/audacious/Makefile
	+++ multimedia/audacious/Makefile
	@@ -38,7 +38,7 @@
	.if ${FLAVOR} == qt5
	CONFIGURE_ARGS+= --enable-qt --disable-gtk
	USES+= qt:5
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets
	PLIST_SUB= QT5="" GTK2="@comment "
	.elif ${FLAVOR} == gtk2
	CONFIGURE_ARGS+= --disable-qt --enable-gtk
	Index: multimedia/avidemux/Makefile.common
	===================================================================
	--- multimedia/avidemux/Makefile.common
	+++ multimedia/avidemux/Makefile.common
	@@ -89,7 +89,7 @@
	USES+= gl qt:5 xorg
	USE_GL= gl glu
	USE_QT= core gui network widgets \
	- qmake_build buildtools_build linguist_build
	+ qmake:build buildtools:build linguist:build
	USE_XORG= x11
	CMAKE_ARGS+= -DENABLE_QT5:BOOL=ON
	PLIST_SUB+= QT5=""
	Index: multimedia/baka-mplayer/Makefile
	===================================================================
	--- multimedia/baka-mplayer/Makefile
	+++ multimedia/baka-mplayer/Makefile
	@@ -17,7 +17,7 @@
	GH_PROJECT= Baka-MPlayer

	USES= compiler:c++11-lib pkgconfig qmake qt:5
	-USE_QT= qmake_build buildtools_build gui network svg widgets x11extras
	+USE_QT= qmake:build buildtools:build gui network svg widgets x11extras
	QMAKE_SOURCE_PATH=${WRKSRC}/src
	QMAKE_ARGS= lupdate="${LUPDATE}" lrelease="${LRELEASE}"

	@@ -25,7 +25,7 @@
	OPTIONS_SUB= yes

	NLS_USES= qt:5
	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build
	NLS_QMAKE_ON= CONFIG+="install_translations"
	NOTO_DESC= Original look with Noto Sans font
	NOTO_RUN_DEPENDS= noto>0:x11-fonts/noto
	Index: multimedia/bino/Makefile
	===================================================================
	--- multimedia/bino/Makefile
	+++ multimedia/bino/Makefile
	@@ -19,7 +19,7 @@
	gnome iconv pkgconfig qt:5 tar:xz
	USE_GL= gl glu glew
	GNU_CONFIGURE= yes
	-USE_QT= buildtools_build core gui opengl widgets
	+USE_QT= buildtools:build core gui opengl widgets
	USE_CXXSTD= c++11

	# no port fow equalizer now, lirc detecting not working
	Index: multimedia/cineencoder/Makefile
	===================================================================
	--- multimedia/cineencoder/Makefile
	+++ multimedia/cineencoder/Makefile
	@@ -16,7 +16,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= CineEncoder
	GH_PROJECT= cine-encoder
	-USE_QT= buildtools_build qmake_build core gui multimedia \
	+USE_QT= buildtools:build qmake:build core gui multimedia \
	network svg widgets x11extras
	USE_XORG= x11 xext

	Index: multimedia/dragon/Makefile
	===================================================================
	--- multimedia/dragon/Makefile
	+++ multimedia/dragon/Makefile
	@@ -15,9 +15,9 @@
	dbusaddons doctools kio service sonnet textwidgets i18n \
	iconthemes jobwidgets notifications parts solid widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network phonon4 widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	CONFLICTS_INSTALL= dragon # bin/dragon
	Index: multimedia/dvbcut/Makefile
	===================================================================
	--- multimedia/dvbcut/Makefile
	+++ multimedia/dvbcut/Makefile
	@@ -21,7 +21,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl pkgconfig \
	qmake:outsource qt:5 shared-mime-info

	-USE_QT= core gui widgets xml buildtools_build linguisttools_build
	+USE_QT= core gui widgets xml buildtools:build linguisttools:build
	USE_GL= gl
	USE_GITHUB= yes
	GH_ACCOUNT= bernhardu
	Index: multimedia/ffaudioconverter/Makefile
	===================================================================
	--- multimedia/ffaudioconverter/Makefile
	+++ multimedia/ffaudioconverter/Makefile
	@@ -15,7 +15,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= Bleuzen
	-USE_QT= concurrent core gui widgets buildtools_build linguisttools_build
	+USE_QT= concurrent core gui widgets buildtools:build linguisttools:build
	USE_GL= gl

	PLIST_FILES= bin/ffaudioconverter \
	Index: multimedia/gstreamer1-plugins/Makefile.common
	===================================================================
	--- multimedia/gstreamer1-plugins/Makefile.common
	+++ multimedia/gstreamer1-plugins/Makefile.common
	@@ -402,7 +402,7 @@

	# qt
	gst_qt_USES= compiler:c++11-lang qt:5
	-gst_qt_USE_QT= core gui declarative buildtools_build network x11extras
	+gst_qt_USE_QT= core gui declarative buildtools:build network x11extras
	gst_qt_USE_GSTREAMER= gl
	gst_qt_PLIST_FILES= ${GST_LIB_DIR}/libgstqmlgl.so

	Index: multimedia/gstreamer1-qt/Makefile
	===================================================================
	--- multimedia/gstreamer1-qt/Makefile
	+++ multimedia/gstreamer1-qt/Makefile
	@@ -21,7 +21,7 @@
	USES= bison cmake compiler:c++11-lang gl gnome gstreamer pathfix pkgconfig qt:5 tar:xz
	USE_GL= gl
	USE_GNOME= glib20
	-USE_QT= buildtools_build qmake_build core declarative gui network opengl \
	+USE_QT= buildtools:build qmake:build core declarative gui network opengl \
	testlib widgets

	USE_LDCONFIG= yes
	Index: multimedia/haruna/Makefile
	===================================================================
	--- multimedia/haruna/Makefile
	+++ multimedia/haruna/Makefile
	@@ -17,11 +17,11 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \
	doctools filemetadata i18n iconthemes kirigami2 itemviews jobwidgets \
	kio service solid widgetsaddons windowsystem xmlgui \
	- ecm_build doctools_build \
	- breeze_run breeze-icons_run qqc2-desktop-style_run
	+ ecm:build doctools:build \
	+ breeze:run breeze-icons:run qqc2-desktop-style:run
	USE_QT= concurrent core dbus declarative gui network quickcontrols2 \
	widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: multimedia/kaffeine/Makefile
	===================================================================
	--- multimedia/kaffeine/Makefile
	+++ multimedia/kaffeine/Makefile
	@@ -20,9 +20,9 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons i18n itemviews kio solid dbusaddons jobwidgets \
	service widgetsaddons windowsystem xmlgui \
	- doctools_build
	+ doctools:build
	USE_QT= concurrent core dbus gui network phonon4 sql svg x11extras xml \
	- widgets qmake_build buildtools_build
	+ widgets qmake:build buildtools:build
	USE_XORG= x11 xscrnsaver

	CPE_VENDOR= kaffeine
	Index: multimedia/kamoso/Makefile
	===================================================================
	--- multimedia/kamoso/Makefile
	+++ multimedia/kamoso/Makefile
	@@ -15,10 +15,10 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons i18n itemviews jobwidgets kio kirigami2 \
	notifications purpose service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative graphicaleffects gui network \
	quickcontrols widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: multimedia/kdemultimedia-ffmpegthumbs/Makefile
	===================================================================
	--- multimedia/kdemultimedia-ffmpegthumbs/Makefile
	+++ multimedia/kdemultimedia-ffmpegthumbs/Makefile
	@@ -16,7 +16,7 @@
	USE_KDE= completion config coreaddons i18n jobwidgets kio service solid \
	widgetsaddons windowsystem
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: multimedia/kdenlive/Makefile
	===================================================================
	--- multimedia/kdenlive/Makefile
	+++ multimedia/kdenlive/Makefile
	@@ -25,12 +25,12 @@
	kdeclarative newstuff notifications notifyconfig package \
	service solid sonnet textwidgets widgetsaddons windowsystem \
	xmlgui \
	- ecm_build \
	- init_run
	+ ecm:build \
	+ init:run
	USE_QT= concurrent core dbus declarative gui multimedia network \
	networkauth quickcontrols2 xml \
	- buildtools_build qmake_build \
	- quickcontrols_run script svg webkit widgets
	+ buildtools:build qmake:build \
	+ quickcontrols:run script svg webkit widgets
	USE_XORG= x11
	CFLAGS+= -isystem${LOCALBASE}/include # linux/input.h
	CMAKE_ARGS= -DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFX}"
	Index: multimedia/kf5-kmediaplayer/Makefile
	===================================================================
	--- multimedia/kf5-kmediaplayer/Makefile
	+++ multimedia/kf5-kmediaplayer/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n jobwidgets kio parts service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: multimedia/kmplayer/Makefile
	===================================================================
	--- multimedia/kmplayer/Makefile
	+++ multimedia/kmplayer/Makefile
	@@ -33,13 +33,13 @@
	USE_GNOME= cairo gdkpixbuf2 gtk20
	USE_QT= concurrent core dbus gui network phonon4 printsupport \
	svg widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons crash ecm guiaddons i18n iconthemes init itemviews \
	jobwidgets mediaplayer notifications parts service \
	textwidgets unitconversion widgetsaddons windowsystem \
	xmlgui kdelibs4support kio solid sonnet \
	- doctools_build
	+ doctools:build
	USE_XORG= x11 xcb

	.include <bsd.port.mk>
	Index: multimedia/libopenshot/Makefile
	===================================================================
	--- multimedia/libopenshot/Makefile
	+++ multimedia/libopenshot/Makefile
	@@ -24,7 +24,7 @@
	GH_ACCOUNT= OpenShot
	USE_LDCONFIG= yes
	USE_PYTHON= flavors
	-USE_QT= core gui network multimedia widgets qmake_build buildtools_build
	+USE_QT= core gui network multimedia widgets qmake:build buildtools:build
	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
	USE_HW_ACCEL ENABLE_PYTHON\
	CMAKE_DISABLE_FIND_PACKAGE_Catch2\
	Index: multimedia/minitube/Makefile
	===================================================================
	--- multimedia/minitube/Makefile
	+++ multimedia/minitube/Makefile
	@@ -24,7 +24,7 @@

	USE_GL= gl
	USE_QT= core dbus declarative gui network script sql widgets \
	- buildtools_build imageformats_run sql-sqlite3_run \
	+ buildtools:build imageformats:run sql-sqlite3:run \
	x11extras

	QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} \
	@@ -32,7 +32,7 @@

	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes
	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build

	post-patch:
	# Remove BOM
	Index: multimedia/mkvtoolnix/Makefile
	===================================================================
	--- multimedia/mkvtoolnix/Makefile
	+++ multimedia/mkvtoolnix/Makefile
	@@ -26,7 +26,7 @@
	libgmp.so:math/gmp

	USES= compiler:c++17-lang iconv localbase pkgconfig qmake:no_env qt:5 tar:xz
	-USE_QT= buildtools_build concurrent core linguisttools_build multimedia svg
	+USE_QT= buildtools:build concurrent core linguisttools:build multimedia svg

	GNU_CONFIGURE= yes
	CONFIGURE_ENV+= ac_cv_path_PO4A=no
	Index: multimedia/mlt6-qt5/Makefile
	===================================================================
	--- multimedia/mlt6-qt5/Makefile
	+++ multimedia/mlt6-qt5/Makefile
	@@ -16,7 +16,7 @@
	USES= qt:5 xorg
	USE_CXXSTD= c++11
	USE_QT= core gui svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	CONFLICTS_INSTALL= mlt7-qt5
	Index: multimedia/mlt7-glaxnimate/Makefile
	===================================================================
	--- multimedia/mlt7-glaxnimate/Makefile
	+++ multimedia/mlt7-glaxnimate/Makefile
	@@ -16,7 +16,7 @@
	USES= qt:5 xorg
	USE_CXXSTD= c++11
	USE_QT= core gui svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	# Only enable Qt binding, and disable everything else
	Index: multimedia/mlt7-qt5/Makefile
	===================================================================
	--- multimedia/mlt7-qt5/Makefile
	+++ multimedia/mlt7-qt5/Makefile
	@@ -16,7 +16,7 @@
	USES= qt:5 xorg
	USE_CXXSTD= c++11
	USE_QT= core gui svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	CONFLICTS_INSTALL= mlt6-qt5
	Index: multimedia/mpc-qt/Makefile
	===================================================================
	--- multimedia/mpc-qt/Makefile
	+++ multimedia/mpc-qt/Makefile
	@@ -15,8 +15,8 @@
	USES= compiler:c++14-lang desktop-file-utils gl pkgconfig qmake qt:5
	USE_GITHUB= yes
	USE_GL= gl
	-USE_QT= qmake_build buildtools_build linguisttools_build \
	- core dbus gui network svg_run widgets x11extras
	+USE_QT= qmake:build buildtools:build linguisttools:build \
	+ core dbus gui network svg:run widgets x11extras
	QMAKE_ARGS= MPCQT_VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}"

	OPTIONS_DEFINE= DOCS
	Index: multimedia/musique/Makefile
	===================================================================
	--- multimedia/musique/Makefile
	+++ multimedia/musique/Makefile
	@@ -24,7 +24,7 @@
	flaviotordini:updater:18ce1d0:flaviotordini_updater/lib/updater

	USE_GL= gl
	-USE_QT= core dbus declarative gui network sql widgets buildtools_build
	+USE_QT= core dbus declarative gui network sql widgets buildtools:build

	QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE}

	@@ -34,7 +34,7 @@
	OPTIONS_DEFAULT= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguisttools_build
	+NLS_USE= QT=linguisttools:build

	post-patch-NLS-off:
	@${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${WRKSRC}/${PORTNAME}.pro
	Index: multimedia/mythtv/Makefile
	===================================================================
	--- multimedia/mythtv/Makefile
	+++ multimedia/mythtv/Makefile
	@@ -49,9 +49,9 @@
	GH_ACCOUNT= MythTV
	USE_GL= gl
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build core dbus gui imageformats_run \
	- linguist_build multimedia network opengl qmake_build script \
	- sql sql-mysql_run webkit widgets xml
	+USE_QT= buildtools:build core dbus gui imageformats:run \
	+ linguist:build multimedia network opengl qmake:build script \
	+ sql sql-mysql:run webkit widgets xml
	USE_XORG= x11 xv xrandr xxf86vm xinerama xext xcb

	HAS_CONFIGURE= yes
	Index: multimedia/obs-ndi/Makefile
	===================================================================
	--- multimedia/obs-ndi/Makefile
	+++ multimedia/obs-ndi/Makefile
	@@ -16,7 +16,7 @@
	USES= cmake compiler:c++11-lang localbase:ldflags qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= Palakis
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	BROKEN= ERROR: NDIlib_v4_load not found in loaded library: https://code.videolan.org/jbk/libndi/-/issues/9, bug#258694

	Index: multimedia/obs-scrab/Makefile
	===================================================================
	--- multimedia/obs-scrab/Makefile
	+++ multimedia/obs-scrab/Makefile
	@@ -16,7 +16,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= univrsal
	GH_PROJECT= scrab
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	CXXFLAGS+= -I${LOCALBASE}/include/obs

	Index: multimedia/obs-streamfx/Makefile
	===================================================================
	--- multimedia/obs-streamfx/Makefile
	+++ multimedia/obs-streamfx/Makefile
	@@ -18,7 +18,7 @@
	libobs.so:multimedia/obs-studio

	USES= cmake localbase:ldflags qt:5 # localbase:ldflags is related to https://github.com/Xaymar/obs-StreamFX/issues/828
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= Xaymar
	Index: multimedia/obs-studio/Makefile
	===================================================================
	--- multimedia/obs-studio/Makefile
	+++ multimedia/obs-studio/Makefile
	@@ -51,7 +51,7 @@

	USES= cmake compiler:c++17-lang gl gnome lua pkgconfig python:3.4+ \
	qt:5 xorg
	-USE_QT= core gui network svg widgets x11extras xml buildtools_build imageformats_run qmake_build
	+USE_QT= core gui network svg widgets x11extras xml buildtools:build imageformats:run qmake:build
	USE_GNOME= glib20
	USE_GL= gl
	USE_XORG= ice sm x11 xcb xcomposite xext xfixes xinerama xrandr
	Index: multimedia/obs-transition-matrix/Makefile
	===================================================================
	--- multimedia/obs-transition-matrix/Makefile
	+++ multimedia/obs-transition-matrix/Makefile
	@@ -16,7 +16,7 @@
	USES= cmake qt:5 compiler:c++11-lang
	USE_GITHUB= yes
	GH_ACCOUNT= admshao
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	CMAKE_ARGS= -DLIBOBS_INCLUDE_DIR=${LOCALBASE}/include

	Index: multimedia/obs-v4l2sink/Makefile
	===================================================================
	--- multimedia/obs-v4l2sink/Makefile
	+++ multimedia/obs-v4l2sink/Makefile
	@@ -16,7 +16,7 @@
	USES= cmake compiler:c++11-lang qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= CatxFish
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	CMAKE_ARGS= -DLIBOBS_INCLUDE_DIR=${LOCALBASE}/include/obs

	Index: multimedia/obs-websocket/Makefile
	===================================================================
	--- multimedia/obs-websocket/Makefile
	+++ multimedia/obs-websocket/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libobs.so:multimedia/obs-studio

	USES= cmake:insource compiler:c++17-lang localbase:ldflags qt:5 # insource because of https://github.com/obsproject/obs-websocket/issues/973
	-USE_QT= core gui widgets buildtools_build concurrent_build qmake_build
	+USE_QT= core gui widgets buildtools:build concurrent:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= obsproject
	Index: multimedia/olive/Makefile
	===================================================================
	--- multimedia/olive/Makefile
	+++ multimedia/olive/Makefile
	@@ -22,7 +22,7 @@
	DOS2UNIX_FILES= olive.pro \
	ui/graphview.cpp \
	ui/timelineheader.cpp
	-USE_QT= core gui multimedia network opengl svg widgets buildtools_build linguisttools_build
	+USE_QT= core gui multimedia network opengl svg widgets buildtools:build linguisttools:build
	USE_GL= gl

	DATADIR= ${PREFIX}/share/olive-editor
	Index: multimedia/opentoonz/Makefile
	===================================================================
	--- multimedia/opentoonz/Makefile
	+++ multimedia/opentoonz/Makefile
	@@ -28,7 +28,7 @@
	USE_GL= gl glew glu glut
	USE_QT= core gui multimedia network opengl printsupport \
	script serialport svg widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	CMAKE_ARGS= -DWITH_SYSTEM_LZO:BOOL=ON \
	-DWITH_SYSTEM_SUPERLU:BOOL=ON
	CMAKE_SOURCE_PATH= ${WRKSRC}/toonz/sources
	Index: multimedia/phonon-designerplugin/Makefile
	===================================================================
	--- multimedia/phonon-designerplugin/Makefile
	+++ multimedia/phonon-designerplugin/Makefile
	@@ -14,7 +14,7 @@
	USES= cmake:insource compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= ecm
	USE_QT= core designer gui phonon4 widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CMAKE_ON= PHONON_BUILD_PHONON4QT5
	PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/phononwidgets.so

	Index: multimedia/phonon-gstreamer/Makefile
	===================================================================
	--- multimedia/phonon-gstreamer/Makefile
	+++ multimedia/phonon-gstreamer/Makefile
	@@ -18,7 +18,7 @@
	USE_GNOME= glib20 libxml2
	USE_KDE= ecm
	USE_QT= core gui opengl phonon4 widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	CMAKE_ON= PHONON_BUILD_PHONON4QT5
	Index: multimedia/phonon-vlc/Makefile
	===================================================================
	--- multimedia/phonon-vlc/Makefile
	+++ multimedia/phonon-vlc/Makefile
	@@ -20,7 +20,7 @@
	USES+= compiler:c++11-lang kde:5 qt:5
	USE_KDE= ecm
	USE_QT= core gui widgets phonon4 \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CMAKE_ON= PHONON_BUILD_PHONON4QT5

	PHONON_PLUGIN= vlc
	Index: multimedia/phonon/Makefile
	===================================================================
	--- multimedia/phonon/Makefile
	+++ multimedia/phonon/Makefile
	@@ -21,7 +21,7 @@
	USE_LDCONFIG= yes
	USE_KDE= ecm
	USE_QT= core dbus gui opengl widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	PLIST_SUB= SHLIB_VER=${DISTVERSION}

	Index: multimedia/qmmp-plugin-pack-qt5/Makefile
	===================================================================
	--- multimedia/qmmp-plugin-pack-qt5/Makefile
	+++ multimedia/qmmp-plugin-pack-qt5/Makefile
	@@ -20,7 +20,7 @@

	USES= cmake pkgconfig qt:5 tar:bzip2
	USE_QT= core gui widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_SUB= yes
	Index: multimedia/qmmp-plugin-pack-qt6/Makefile
	===================================================================
	--- multimedia/qmmp-plugin-pack-qt6/Makefile
	+++ multimedia/qmmp-plugin-pack-qt6/Makefile
	@@ -19,7 +19,7 @@
	PORTSCOUT= limit:^1\..*

	USES= cmake pkgconfig qt:6 tar:bzip2
	-USE_QT= base tools_build
	+USE_QT= base tools:build
	USE_LDCONFIG= yes

	OPTIONS_SUB= yes
	Index: multimedia/qmmp-qt5/Makefile
	===================================================================
	--- multimedia/qmmp-qt5/Makefile
	+++ multimedia/qmmp-qt5/Makefile
	@@ -18,7 +18,7 @@

	USES= cmake gnome pathfix pkgconfig tar:bzip2
	USE_QT= core gui network widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_LDCONFIG= yes

	CMAKE_OFF= USE_MMS
	Index: multimedia/qmmp-qt6/Makefile
	===================================================================
	--- multimedia/qmmp-qt6/Makefile
	+++ multimedia/qmmp-qt6/Makefile
	@@ -18,7 +18,7 @@

	USES= cmake gl gnome pathfix pkgconfig qt:6 tar:bzip2
	USE_GL= gl opengl
	-USE_QT= base_build declarative_build tools_build
	+USE_QT= base:build declarative:build tools:build
	USE_LDCONFIG= yes

	CMAKE_OFF= USE_MMS
	Index: multimedia/qpwgraph/Makefile
	===================================================================
	--- multimedia/qpwgraph/Makefile
	+++ multimedia/qpwgraph/Makefile
	@@ -12,7 +12,7 @@
	LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire

	USES= cmake pkgconfig qt:5
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build

	USE_GITLAB= yes
	GL_SITE= https://gitlab.freedesktop.org
	Index: multimedia/qt5-multimedia/Makefile
	===================================================================
	--- multimedia/qt5-multimedia/Makefile
	+++ multimedia/qt5-multimedia/Makefile
	@@ -13,7 +13,7 @@
	USE_GL= gl
	USE_GNOME= glib20
	USE_QT= core declarative gui network opengl widgets \
	- buildtools_build
	+ buildtools:build
	USE_XORG= x11 xext xv

	QT_CONFIG= xlib
	Index: multimedia/qwinff/Makefile
	===================================================================
	--- multimedia/qwinff/Makefile
	+++ multimedia/qwinff/Makefile
	@@ -16,8 +16,8 @@

	USES= cmake:noninja compiler:c++11-lang qt:5
	USE_GITHUB= yes
	-USE_QT= core gui linguisttools network widgets buildtools_build \
	- qmake_build
	+USE_QT= core gui linguisttools network widgets buildtools:build \
	+ qmake:build

	post-patch:
	@${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \
	Index: multimedia/shotcut/Makefile
	===================================================================
	--- multimedia/shotcut/Makefile
	+++ multimedia/shotcut/Makefile
	@@ -22,7 +22,7 @@

	USE_GL= gl
	USE_QT= core declarative gui multimedia network opengl quickcontrols2 sql \
	- websockets widgets xml buildtools_build concurrent_build linguisttools_build
	+ websockets widgets xml buildtools:build concurrent:build linguisttools:build
	USE_SDL= sdl2
	USE_XORG= x11
	# Needed to be able to correctly check for updates in-app.
	Index: multimedia/simplescreenrecorder/Makefile
	===================================================================
	--- multimedia/simplescreenrecorder/Makefile
	+++ multimedia/simplescreenrecorder/Makefile
	@@ -12,7 +12,7 @@
	LIB_DEPENDS= libavformat.so:multimedia/ffmpeg

	USES= cmake compiler:c++11-lang pkgconfig qt:5 xorg
	-USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui widgets x11extras buildtools:build linguisttools:build qmake:build
	USE_XORG= x11 xext xfixes xi xinerama

	USE_GITHUB= yes
	Index: multimedia/smplayer-skins/Makefile
	===================================================================
	--- multimedia/smplayer-skins/Makefile
	+++ multimedia/smplayer-skins/Makefile
	@@ -10,7 +10,7 @@
	WWW= http://smplayer.sourceforge.net/

	USES= qt:5 tar:bzip2
	-USE_QT= buildtools_build
	+USE_QT= buildtools:build

	NO_ARCH= yes

	Index: multimedia/smplayer-themes/Makefile
	===================================================================
	--- multimedia/smplayer-themes/Makefile
	+++ multimedia/smplayer-themes/Makefile
	@@ -10,7 +10,7 @@
	WWW= http://smplayer.sourceforge.net/

	USES= qt:5 tar:bzip2
	-USE_QT= buildtools_build
	+USE_QT= buildtools:build

	NO_ARCH= yes

	Index: multimedia/smplayer/Makefile
	===================================================================
	--- multimedia/smplayer/Makefile
	+++ multimedia/smplayer/Makefile
	@@ -13,7 +13,7 @@
	USES= cpe compiler:c++11-lang desktop-file-utils dos2unix gl \
	gmake qmake qt:5 tar:bzip2 xorg
	USE_GL= gl
	-USE_QT= buildtools_build linguisttools_build \
	+USE_QT= buildtools:build linguisttools:build \
	core dbus gui network script widgets xml
	USE_XORG= x11 xext

	Index: multimedia/smtube/Makefile
	===================================================================
	--- multimedia/smtube/Makefile
	+++ multimedia/smtube/Makefile
	@@ -15,7 +15,7 @@

	USES= gl gmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= qmake_build buildtools_build linguisttools_build \
	+USE_QT= qmake:build buildtools:build linguisttools:build \
	core network script gui webkit widgets

	ALL_TARGET= #empty
	Index: multimedia/subtitlecomposer/Makefile
	===================================================================
	--- multimedia/subtitlecomposer/Makefile
	+++ multimedia/subtitlecomposer/Makefile
	@@ -20,8 +20,8 @@
	coreaddons jobwidgets i18n itemviews kio kross \
	parts service solid sonnet textwidgets widgetsaddons \
	windowsystem xmlgui \
	- doctools_build ecm_build
	-USE_QT= buildtools_build qmake_build testlib_build \
	+ doctools:build ecm:build
	+USE_QT= buildtools:build qmake:build testlib:build \
	concurrent core dbus gui network script widgets xml
	USE_XORG= x11

	Index: multimedia/vlc/Makefile
	===================================================================
	--- multimedia/vlc/Makefile
	+++ multimedia/vlc/Makefile
	@@ -275,7 +275,7 @@
	PULSEAUDIO_CONFIGURE_ENABLE= pulse

	QT5_USES= qt:5
	-QT5_USE= QT=gui,core,svg,widgets,x11extras,buildtools_build
	+QT5_USE= QT=gui,core,svg,widgets,x11extras,buildtools:build
	QT5_CONFIGURE_ENABLE= qt
	QT5_IMPLIES= X11

	Index: multimedia/webcamoid/Makefile
	===================================================================
	--- multimedia/webcamoid/Makefile
	+++ multimedia/webcamoid/Makefile
	@@ -22,7 +22,7 @@
	USE_GNOME= glib20
	USE_GL= gl
	USE_QT= concurrent core declarative gui multimedia network opengl quickcontrols2 svg widgets xml \
	- buildtools_build quickcontrols_run
	+ buildtools:build quickcontrols:run

	MAKE_ENV= NOOSS=1 # NOOSS is because the OSS module attempts to use kevent on OSS devices, which is broken in the base
	QMAKE_ARGS= INSTALLQMLDIR=${QT_QMLDIR} \
	Index: multimedia/zart/Makefile
	===================================================================
	--- multimedia/zart/Makefile
	+++ multimedia/zart/Makefile
	@@ -25,7 +25,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= c-koi
	GH_TAGNAME= 099554f
	-USE_QT= core gui network widgets xml buildtools_build
	+USE_QT= core gui network widgets xml buildtools:build

	GMIC_VERSION= 2.8.1

	Index: net-im/beebeep/Makefile
	===================================================================
	--- net-im/beebeep/Makefile
	+++ net-im/beebeep/Makefile
	@@ -17,7 +17,7 @@
	USES= compiler:c++17-lang pkgconfig \
	qmake qt:5 zip
	USE_QT= core gui multimedia network printsupport widgets x11extras xml \
	- buildtools_build linguist_build
	+ buildtools:build linguist:build

	do-install:
	${MKDIR} ${STAGEDIR}${LOCALBASE}/bin ${STAGEDIR}${QT_PLUGINDIR}/
	Index: net-im/chatterino2/Makefile
	===================================================================
	--- net-im/chatterino2/Makefile
	+++ net-im/chatterino2/Makefile
	@@ -18,7 +18,7 @@

	USES= compiler:c++17-lang gl pkgconfig qmake qt:5 ssl
	USE_QT= concurrent core gui multimedia network svg widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_GL= gl

	PLIST_FILES= bin/chatterino \
	Index: net-im/cutegram/Makefile
	===================================================================
	--- net-im/cutegram/Makefile
	+++ net-im/cutegram/Makefile
	@@ -24,7 +24,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl gnome qmake:outsource \
	qt:5 ssl
	USE_GL= gl
	-USE_QT= qmake_build buildtools_build dbus core declarative graphicaleffects \
	+USE_QT= qmake:build buildtools:build dbus core declarative graphicaleffects \
	gui multimedia network quickcontrols sql sql-sqlite3 xml \
	widgets webkit
	QMAKE_ARGS= LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \
	Index: net-im/gitterdone/Makefile
	===================================================================
	--- net-im/gitterdone/Makefile
	+++ net-im/gitterdone/Makefile
	@@ -10,8 +10,8 @@
	LICENSE= BSD2CLAUSE

	USES= compiler:c++11-lang gl qmake qt:5 shebangfix tar:xz
	-USE_QT= core gui network linguist_build \
	- buildtools_build widgets webkit svg
	+USE_QT= core gui network linguist:build \
	+ buildtools:build widgets webkit svg
	USE_GL+= gl
	USE_LDCONFIG= yes

	Index: net-im/kaccounts-integration/Makefile
	===================================================================
	--- net-im/kaccounts-integration/Makefile
	+++ net-im/kaccounts-integration/Makefile
	@@ -18,8 +18,8 @@
	USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
	i18n iconthemes kcmutils kdeclarative kio service wallet widgetsaddons \
	akonadi \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: net-im/kaccounts-providers/Makefile
	===================================================================
	--- net-im/kaccounts-providers/Makefile
	+++ net-im/kaccounts-providers/Makefile
	@@ -17,7 +17,7 @@
	USE_KDE= config coreaddons i18n kdeclarative kio package service
	USE_QT= concurrent core dbus declarative gui location network \
	xml webchannel webengine \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: net-im/kaidan/Makefile
	===================================================================
	--- net-im/kaidan/Makefile
	+++ net-im/kaidan/Makefile
	@@ -15,6 +15,6 @@
	USE_KDE= ecm kirigami2 notifications qqc2-desktop-style
	USE_QT= core dbus declarative gui location multimedia network \
	quickcontrols2 sql svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: net-im/kopete/Makefile
	===================================================================
	--- net-im/kopete/Makefile
	+++ net-im/kopete/Makefile
	@@ -21,11 +21,11 @@
	khtml kio notifications notifyconfig parts service solid sonnet \
	syntaxhighlighting texteditor textwidgets unitconversion wallet widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# KDE PIM components
	USE_KDE+= contacts identitymanagement libkleo pimtextedit
	USE_QT= concurrent core dbus gui network phonon4 printsupport sql widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	SHEBANG_FILES= protocols/winpopup/winpopup-install \
	Index: net-im/ktp-accounts-kcm/Makefile
	===================================================================
	--- net-im/ktp-accounts-kcm/Makefile
	+++ net-im/ktp-accounts-kcm/Makefile
	@@ -26,9 +26,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons i18n \
	iconthemes itemviews kcmutils kio notifications notifyconfig \
	service texteditor wallet widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= IRC JABBER SALUT DOCS
	Index: net-im/ktp-approver/Makefile
	===================================================================
	--- net-im/ktp-approver/Makefile
	+++ net-im/ktp-approver/Makefile
	@@ -15,9 +15,9 @@

	USES= compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons dbusaddons service i18n notifications \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: net-im/ktp-auth-handler/Makefile
	===================================================================
	--- net-im/ktp-auth-handler/Makefile
	+++ net-im/ktp-auth-handler/Makefile
	@@ -19,9 +19,9 @@
	qca qt:5 tar:xz xorg
	USE_KDE= completion config coreaddons i18n jobwidgets kdewebkit \
	kio wallet service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-call-ui/Makefile
	===================================================================
	--- net-im/ktp-call-ui/Makefile
	+++ net-im/ktp-call-ui/Makefile
	@@ -25,9 +25,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons iconthemes \
	i18n kcmutils kdeclarative notifications package service \
	wallet widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-common-internals/Makefile
	===================================================================
	--- net-im/ktp-common-internals/Makefile
	+++ net-im/ktp-common-internals/Makefile
	@@ -26,9 +26,9 @@
	kio notifications notifyconfig parts people service solid \
	sonnet syntaxhighlighting texteditor textwidgets wallet widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net-im/ktp-contact-list/Makefile
	===================================================================
	--- net-im/ktp-contact-list/Makefile
	+++ net-im/ktp-contact-list/Makefile
	@@ -17,9 +17,9 @@
	dbusaddons i18n iconthemes jobwidgets kcmutils kio \
	notifications notifyconfig people service solid wallet widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-contact-runner/Makefile
	===================================================================
	--- net-im/ktp-contact-runner/Makefile
	+++ net-im/ktp-contact-runner/Makefile
	@@ -15,9 +15,9 @@
	USES= compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons i18n package plasma-framework runner \
	service wallet \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network widgets xml\
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: net-im/ktp-desktop-applets/Makefile
	===================================================================
	--- net-im/ktp-desktop-applets/Makefile
	+++ net-im/ktp-desktop-applets/Makefile
	@@ -13,9 +13,9 @@

	USES= compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= plasma-framework windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-filetransfer-handler/Makefile
	===================================================================
	--- net-im/ktp-filetransfer-handler/Makefile
	+++ net-im/ktp-filetransfer-handler/Makefile
	@@ -16,9 +16,9 @@
	USE_KDE= auth bookmarks codecs completion config configwidgets \
	coreaddons i18n itemviews jobwidgets kio service solid \
	wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network xml widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-kded-module/Makefile
	===================================================================
	--- net-im/ktp-kded-module/Makefile
	+++ net-im/ktp-kded-module/Makefile
	@@ -17,7 +17,7 @@
	dbusaddons i18n idletime jobwidgets kcmutils kio notifications \
	service solid wallet widgetsaddons windowsystem
	USE_QT= concurrent core dbus gui network sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-send-file/Makefile
	===================================================================
	--- net-im/ktp-send-file/Makefile
	+++ net-im/ktp-send-file/Makefile
	@@ -18,9 +18,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n iconthemes jobwidgets kcmutils kio service solid wallet \
	widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-im/ktp-text-ui/Makefile
	===================================================================
	--- net-im/ktp-text-ui/Makefile
	+++ net-im/ktp-text-ui/Makefile
	@@ -20,10 +20,10 @@
	kcmutils kdewebkit kio notifications notifyconfig people \
	service solid sonnet textwidgets wallet widgetsaddons windowsystem \
	xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network \
	printsupport speech webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net-im/libaccounts-qt5/Makefile
	===================================================================
	--- net-im/libaccounts-qt5/Makefile
	+++ net-im/libaccounts-qt5/Makefile
	@@ -16,7 +16,7 @@
	USES= compiler:c++17-lang gettext-runtime gnome qmake \
	pathfix pkgconfig python qt:5 tar:bz2
	USE_GNOME= glib20
	-USE_QT= buildtools_build core qmake_build testlib xml
	+USE_QT= buildtools:build core qmake:build testlib xml

	# gitlab variables
	USE_GITLAB= yes
	Index: net-im/libqtelegram-ae/Makefile
	===================================================================
	--- net-im/libqtelegram-ae/Makefile
	+++ net-im/libqtelegram-ae/Makefile
	@@ -17,7 +17,7 @@
	GH_PROJECT= libqtelegram-aseman-edition

	USES= compiler:c++11-lang qmake:outsource qt:5 ssl
	-USE_QT= qmake_build buildtools_build core gui network multimedia
	+USE_QT= qmake:build buildtools:build core gui network multimedia
	USE_LDCONFIG= yes

	post-patch:
	Index: net-im/libquotient/Makefile
	===================================================================
	--- net-im/libquotient/Makefile
	+++ net-im/libquotient/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++14-lang qt:5 tar:xz
	USE_QT= core gui multimedia network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	USE_GITHUB= yes
	GH_ACCOUNT= quotient-im
	Index: net-im/neochat/Makefile
	===================================================================
	--- net-im/neochat/Makefile
	+++ net-im/neochat/Makefile
	@@ -24,9 +24,9 @@
	USE_QT= core dbus declarative graphicaleffects gui imageformats \
	multimedia network quickcontrols quickcontrols2 \
	svg widgets xml \
	- buildtools_build linguist_build qmake_build
	+ buildtools:build linguist:build qmake:build
	USE_KDE= config coreaddons dbusaddons i18n itemmodels kirigami2 notifications \
	qqc2-desktop-style \
	- ecm_build
	+ ecm:build

	.include <bsd.port.mk>
	Index: net-im/nheko/Makefile
	===================================================================
	--- net-im/nheko/Makefile
	+++ net-im/nheko/Makefile
	@@ -29,8 +29,8 @@
	localbase:ldflags pkgconfig qt:5 ssl tar:xz
	USE_QT= concurrent core dbus declarative gui multimedia network \
	quickcontrols2 svg widgets \
	- graphicaleffects_run \
	- buildtools_build linguist_build qmake_build
	+ graphicaleffects:run \
	+ buildtools:build linguist:build qmake:build

	# There is one external dependency: lmdb++
	# - lmdb++ is a single header file, it just needs to be included
	Index: net-im/psi/Makefile
	===================================================================
	--- net-im/psi/Makefile
	+++ net-im/psi/Makefile
	@@ -15,7 +15,7 @@
	USES= cmake compiler:c++11-lang desktop-file-utils minizip pkgconfig \
	qca qt:5 tar:xz xorg
	USE_QT= concurrent core dbus gui multimedia network svg widgets \
	- x11extras xml buildtools_build qmake_build imageformats_run
	+ x11extras xml buildtools:build qmake:build imageformats:run
	USE_XORG= ice sm x11 xcb xext xscrnsaver

	CMAKE_ARGS= -DIDN_LIBRARY:FILEPATH="${LOCALBASE}/lib/libidn.so" \
	Index: net-im/qTox/Makefile
	===================================================================
	--- net-im/qTox/Makefile
	+++ net-im/qTox/Makefile
	@@ -26,8 +26,8 @@

	USES= cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig qt:5
	USE_GITHUB= yes
	-USE_QT= core gui network xml opengl sql sql-sqlite3_run widgets svg \
	- concurrent_build buildtools_build linguisttools_build qmake_build testlib_build
	+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=${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
	CMAKE_OFF= USE_CCACHE
	Index: net-im/quaternion/Makefile
	===================================================================
	--- net-im/quaternion/Makefile
	+++ net-im/quaternion/Makefile
	@@ -20,7 +20,7 @@
	USE_GNOME= glib20
	USE_QT= core dbus declarative gui multimedia network widgets \
	quickcontrols quickcontrols2 \
	- buildtools_build linguist_build qmake_build
	+ buildtools:build linguist:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= quotient-im
	Index: net-im/qxmpp-qt5/Makefile
	===================================================================
	--- net-im/qxmpp-qt5/Makefile
	+++ net-im/qxmpp-qt5/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++17-lang libtool pathfix pkgconfig qt:5
	USE_QT= core gui network xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	USE_GITHUB= yes
	GH_ACCOUNT= qxmpp-project
	Index: net-im/ricochet/Makefile
	===================================================================
	--- net-im/ricochet/Makefile
	+++ net-im/ricochet/Makefile
	@@ -19,7 +19,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= ricochet-im
	USE_QT= core declarative gui multimedia network quickcontrols widgets \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build
	USE_GL= gl
	QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}

	Index: net-im/ruqola/Makefile
	===================================================================
	--- net-im/ruqola/Makefile
	+++ net-im/ruqola/Makefile
	@@ -20,10 +20,10 @@
	dbusaddons i18n iconthemes idletime itemviews jobwidgets kio kirigami2 \
	notifications notifyconfig prison service solid sonnet syntaxhighlighting \
	textwidgets widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative declarative gui multimedia \
	network networkauth speech sql xml websockets widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	PLIST_SUB= SO_VER=${DISTVERSION}
	Index: net-im/scudcloud/Makefile
	===================================================================
	--- net-im/scudcloud/Makefile
	+++ net-im/scudcloud/Makefile
	@@ -22,7 +22,7 @@
	OPTIONS_DEFINE= HUNSPELL

	USES= gnome python:3.5+ pyqt:5
	-USE_PYQT= sip_run pyqt5_run
	+USE_PYQT= sip:run pyqt5:run
	USE_GITHUB= yes
	USE_PYTHON= autoplist distutils optsuffix
	NO_ARCH= yes
	Index: net-im/spectral/Makefile
	===================================================================
	--- net-im/spectral/Makefile
	+++ net-im/spectral/Makefile
	@@ -17,7 +17,7 @@
	USE_GL= gl
	USE_QT= core dbus declarative graphicaleffects gui imageformats \
	multimedia network quickcontrols quickcontrols2 svg widgets \
	- buildtools_build linguist_build qmake_build testlib_build
	+ buildtools:build linguist:build qmake:build testlib:build

	CMAKE_ON= USE_INTREE_LIBQMC

	Index: net-im/teamwords/Makefile
	===================================================================
	--- net-im/teamwords/Makefile
	+++ net-im/teamwords/Makefile
	@@ -12,7 +12,7 @@

	USES= compiler:c++11-lang gl qmake qt:5
	USE_LDCONFIG= yes
	-USE_QT= core gui network webkit widgets buildtools_build
	+USE_QT= core gui network webkit widgets buildtools:build
	USE_GL= gl

	QMAKE_ARGS= CONFIG+="configure"
	Index: net-im/telegram-desktop/Makefile
	===================================================================
	--- net-im/telegram-desktop/Makefile
	+++ net-im/telegram-desktop/Makefile
	@@ -58,7 +58,7 @@

	.if ${FLAVOR} == qt5
	USES+= qt:5
	-USE_QT= buildtools_build core dbus gui imageformats network qmake_build \
	+USE_QT= buildtools:build core dbus gui imageformats network qmake:build \
	svg wayland widgets
	.else
	USES+= qt:6
	Index: net-im/telegramqml/Makefile
	===================================================================
	--- net-im/telegramqml/Makefile
	+++ net-im/telegramqml/Makefile
	@@ -18,7 +18,7 @@
	GH_PROJECT= TelegramQML

	USES= compiler:c++11-lang qmake:outsource qt:5 ssl
	-USE_QT= qmake_build buildtools_build core declarative sql xml multimedia
	+USE_QT= qmake:build buildtools:build core declarative sql xml multimedia
	USE_LDCONFIG= yes
	QMAKE_ARGS= BUILD_MODE+=lib \
	LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae"
	Index: net-im/telepathy-logger-qt5/Makefile
	===================================================================
	--- net-im/telepathy-logger-qt5/Makefile
	+++ net-im/telepathy-logger-qt5/Makefile
	@@ -23,7 +23,7 @@
	pkgconfig python:3.5+,build qt:5 tar:xz
	USE_GNOME= glib20 libxml2
	USE_KDE= ecm
	-USE_QT= 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

	Index: net-im/telepathy-qt/Makefile
	===================================================================
	--- net-im/telepathy-qt/Makefile
	+++ net-im/telepathy-qt/Makefile
	@@ -20,7 +20,7 @@
	pkgconfig python:3.5+,build qt:5
	USE_GNOME= glib20 libxslt:build
	USE_QT= core dbus gui network xml \
	- buildtools_build qmake_build testlib_build widgets_build
	+ buildtools:build qmake:build testlib:build widgets:build

	CMAKE_ON= ENABLE_FARSTREAM CMAKE_DISABLE_FIND_PACKAGE_Doxygen
	CMAKE_OFF= ENABLE_EXAMPLES ENABLE_FARSIGHT ENABLE_TESTS
	Index: net-mgmt/nagstamon/Makefile
	===================================================================
	--- net-mgmt/nagstamon/Makefile
	+++ net-mgmt/nagstamon/Makefile
	@@ -26,7 +26,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= HenriWahl
	GH_PROJECT= Nagstamon
	-USE_PYQT= pyqt5_run sip_run
	+USE_PYQT= pyqt5:run sip:run
	USE_PYTHON= autoplist distutils noflavors

	NO_ARCH= yes
	Index: net-mgmt/seafile-gui/Makefile
	===================================================================
	--- net-mgmt/seafile-gui/Makefile
	+++ net-mgmt/seafile-gui/Makefile
	@@ -27,7 +27,7 @@

	USE_GNOME= glib20
	USE_QT= core dbus gui network widgets \
	- qmake_build buildtools_build linguisttools_build
	+ qmake:build buildtools:build linguisttools:build
	CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:PATH=include/glib-2.0 \
	-DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \
	-DOPENSSL_LIBRARIES="-L${OPENSSLLIB} -lcrypto"
	Index: net-p2p/bitcoin/Makefile
	===================================================================
	--- net-p2p/bitcoin/Makefile
	+++ net-p2p/bitcoin/Makefile
	@@ -26,7 +26,7 @@
	.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
	USES+= desktop-file-utils
	USE_QT= core gui network widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	BUILD_DEPENDS+= protoc:devel/protobuf
	LIB_DEPENDS+= libprotobuf.so:devel/protobuf
	Index: net-p2p/ktorrent/Makefile
	===================================================================
	--- net-p2p/ktorrent/Makefile
	+++ net-p2p/ktorrent/Makefile
	@@ -22,10 +22,10 @@
	notifyconfig parts plotting service \
	solid sonnet syndication textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network phonon4 printsupport \
	script webchannel widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS WORKSPACE
	Index: net-p2p/libktorrent/Makefile
	===================================================================
	--- net-p2p/libktorrent/Makefile
	+++ net-p2p/libktorrent/Makefile
	@@ -13,9 +13,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qca qt:5 tar:xz xorg
	USE_KDE= archive completion config coreaddons crash i18n \
	jobwidgets kio service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net-p2p/litecoin/Makefile
	===================================================================
	--- net-p2p/litecoin/Makefile
	+++ net-p2p/litecoin/Makefile
	@@ -24,7 +24,7 @@
	.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
	USES+= desktop-file-utils
	USE_QT= core gui network widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	BUILD_DEPENDS+= protoc:devel/protobuf
	LIB_DEPENDS+= libprotobuf.so:devel/protobuf
	Index: net-p2p/namecoin/Makefile
	===================================================================
	--- net-p2p/namecoin/Makefile
	+++ net-p2p/namecoin/Makefile
	@@ -26,7 +26,7 @@

	.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
	USES+= desktop-file-utils qt:5
	-USE_QT= core buildtools gui linguisttools_build network qmake_build xml widgets
	+USE_QT= core buildtools gui linguisttools:build network qmake:build xml widgets

	BUILD_DEPENDS+= protoc:devel/protobuf \
	svg2png:graphics/svg2png
	Index: net-p2p/qbittorrent/Makefile
	===================================================================
	--- net-p2p/qbittorrent/Makefile
	+++ net-p2p/qbittorrent/Makefile
	@@ -21,7 +21,7 @@

	USES= compiler:c++14-lang cpe pkgconfig qmake:no_env qt:5 ssl tar:xz
	GNU_CONFIGURE= yes
	-USE_QT= core network sql xml buildtools_build linguisttools_build qmake_build
	+USE_QT= core network sql xml buildtools:build linguisttools:build qmake:build
	DESTDIRNAME= INSTALL_ROOT
	CONFIGURE_ENV+= openssl_CFLAGS="-I${OPENSSLINC}" openssl_LIBS="-L${OPENSSLLIB} -lssl"

	Index: net-p2p/retroshare/Makefile
	===================================================================
	--- net-p2p/retroshare/Makefile
	+++ net-p2p/retroshare/Makefile
	@@ -29,7 +29,7 @@
	USE_GNOME= libxml2 libxslt
	USE_GL= gl
	USE_QT= core gui multimedia printsupport network widgets xml \
	- buildtools_build uitools_build
	+ buildtools:build uitools:build
	DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro \
	retroshare-gui/src/gui/elastic/node.cpp

	Index: net-p2p/torrent-file-editor/Makefile
	===================================================================
	--- net-p2p/torrent-file-editor/Makefile
	+++ net-p2p/torrent-file-editor/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++11-lang desktop-file-utils qt:5
	USE_GITHUB= yes
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	core gui widgets

	CMAKE_ARGS= -DQT5_BUILD:BOOL=ON \
	Index: net-p2p/transmission-qt/Makefile
	===================================================================
	--- net-p2p/transmission-qt/Makefile
	+++ net-p2p/transmission-qt/Makefile
	@@ -6,7 +6,7 @@

	USES= compiler:c++11-lang qt:5
	NLS_USES= gettext-runtime:run qt:5
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	core dbus gui network widgets
	CMAKE_ON= USE_QT

	Index: net-p2p/zetacoin/Makefile
	===================================================================
	--- net-p2p/zetacoin/Makefile
	+++ net-p2p/zetacoin/Makefile
	@@ -26,7 +26,7 @@
	.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
	USES+= desktop-file-utils qt:5
	USE_QT= core gui network widgets \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	BUILD_DEPENDS+= protoc:devel/protobuf
	LIB_DEPENDS+= libprotobuf.so:devel/protobuf
	Index: net/akonadi-calendar/Makefile
	===================================================================
	--- net/akonadi-calendar/Makefile
	+++ net/akonadi-calendar/Makefile
	@@ -13,12 +13,12 @@
	dbusaddons kdelibs4support i18n iconthemes itemmodels \
	jobwidgets kio notifications service solid wallet \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime calendarcore calendarutils \
	contacts grantleetheme identitymanagement mailtransport mime pimtextedit
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/akonadi-contacts/Makefile
	===================================================================
	--- net/akonadi-contacts/Makefile
	+++ net/akonadi-contacts/Makefile
	@@ -17,11 +17,11 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	dbusaddons i18n iconthemes itemmodels jobwidgets kcmutils kio \
	prison service solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadimime calendarcore contacts grantleetheme libkleo mime
	USE_QT= concurrent core dbus gui network testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/akonadi-mime/Makefile
	===================================================================
	--- net/akonadi-mime/Makefile
	+++ net/akonadi-mime/Makefile
	@@ -10,11 +10,11 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 shared-mime-info tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
	i18n itemmodels kio service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi mime
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/akonadi-notes/Makefile
	===================================================================
	--- net/akonadi-notes/Makefile
	+++ net/akonadi-notes/Makefile
	@@ -9,11 +9,11 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= i18n \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi mime
	USE_QT= core xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/akonadi-search/Makefile
	===================================================================
	--- net/akonadi-search/Makefile
	+++ net/akonadi-search/Makefile
	@@ -13,11 +13,11 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	crash i18n itemmodels kcmutils package plasma-framework \
	runner service widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadimime calendarcore contacts mime
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/avahi-qt5/Makefile
	===================================================================
	--- net/avahi-qt5/Makefile
	+++ net/avahi-qt5/Makefile
	@@ -15,7 +15,7 @@

	AVAHI_SLAVE= qt5
	USES= compiler:c++11-lang qt:5
	-USE_QT= core buildtools_build
	+USE_QT= core buildtools:build
	AVAHI_PKGCONFIG=avahi-qt5.pc

	.include "${MASTERDIR}/Makefile"
	Index: net/calendarsupport/Makefile
	===================================================================
	--- net/calendarsupport/Makefile
	+++ net/calendarsupport/Makefile
	@@ -14,14 +14,14 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	guiaddons i18n iconthemes itemmodels jobwidgets kio service \
	solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar akonadinotes calendarcore calendarutils \
	holidays identitymanagement mime pimcommon \
	pimtextedit
	USE_QT= concurrent core dbus gui network printsupport uitools \
	widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/eventviews/Makefile
	===================================================================
	--- net/eventviews/Makefile
	+++ net/eventviews/Makefile
	@@ -14,13 +14,13 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	guiaddons i18n iconthemes itemmodels service widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar akonadicontacts calendarcore \
	calendarsupport calendarutils contacts holidays identitymanagement \
	libkdepim mime pimtextedit
	USE_QT= core gui printsupport uitools widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: net/incidenceeditor/Makefile
	===================================================================
	--- net/incidenceeditor/Makefile
	+++ net/incidenceeditor/Makefile
	@@ -15,7 +15,7 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n iconthemes itemmodels jobwidgets kio service solid sonnet \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime calendarcore \
	calendarsupport calendarutils contacts eventviews grantleetheme \
	@@ -23,7 +23,7 @@
	pimtextedit
	USE_QT= concurrent core dbus gui network printsupport uitools \
	webkit widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/kcalutils/Makefile
	===================================================================
	--- net/kcalutils/Makefile
	+++ net/kcalutils/Makefile
	@@ -10,11 +10,11 @@
	USES= cmake compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
	USE_KDE= codecs config coreaddons i18n iconthemes kdelibs4support \
	widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= calendarcore identitymanagement pimtextedit
	USE_QT= core gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kdenetwork-filesharing/Makefile
	===================================================================
	--- net/kdenetwork-filesharing/Makefile
	+++ net/kdenetwork-filesharing/Makefile
	@@ -8,9 +8,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= auth completion config coreaddons doctools i18n jobwidgets \
	kdeclarative kio package service solid widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net/kf5-kcalendarcore/Makefile
	===================================================================
	--- net/kf5-kcalendarcore/Makefile
	+++ net/kf5-kcalendarcore/Makefile
	@@ -12,9 +12,9 @@

	USES= bison cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= init \
	- ecm_build
	+ ecm:build
	USE_QT= core gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kf5-kcontacts/Makefile
	===================================================================
	--- net/kf5-kcontacts/Makefile
	+++ net/kf5-kcontacts/Makefile
	@@ -13,9 +13,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= codecs config coreaddons i18n \
	- ecm_build
	+ ecm:build
	USE_QT= core gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kf5-kdav/Makefile
	===================================================================
	--- net/kf5-kdav/Makefile
	+++ net/kf5-kdav/Makefile
	@@ -8,9 +8,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons i18n kio service \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network xml xmlpatterns \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kf5-kholidays/Makefile
	===================================================================
	--- net/kf5-kholidays/Makefile
	+++ net/kf5-kholidays/Makefile
	@@ -9,9 +9,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= emoticons init itemmodels itemviews \
	- ecm_build
	+ ecm:build
	USE_QT= core declarative gui network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: net/kf5-kxmlrpcclient/Makefile
	===================================================================
	--- net/kf5-kxmlrpcclient/Makefile
	+++ net/kf5-kxmlrpcclient/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons i18n kio service \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: net/kf5-syndication/Makefile
	===================================================================
	--- net/kf5-syndication/Makefile
	+++ net/kf5-syndication/Makefile
	@@ -10,9 +10,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= codecs service \
	- ecm_build
	+ ecm:build
	USE_QT= core xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: net/kget/Makefile
	===================================================================
	--- net/kget/Makefile
	+++ net/kget/Makefile
	@@ -24,9 +24,9 @@
	kdelibs4support kio notifications notifyconfig parts service \
	solid sonnet textwidgets unitconversion wallet widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport sql widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/kidentitymanagement/Makefile
	===================================================================
	--- net/kidentitymanagement/Makefile
	+++ net/kidentitymanagement/Makefile
	@@ -11,11 +11,11 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	emoticons i18n init itemmodels itemviews jobwidgets \
	kdelibs4support kio service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= pimtextedit
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/kimap/Makefile
	===================================================================
	--- net/kimap/Makefile
	+++ net/kimap/Makefile
	@@ -12,11 +12,11 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= codecs config coreaddons i18n kio service \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= mime
	USE_QT= concurrent core dbus network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kio-gdrive/Makefile
	===================================================================
	--- net/kio-gdrive/Makefile
	+++ net/kio-gdrive/Makefile
	@@ -19,9 +19,9 @@
	USE_KDE= completion config coreaddons i18n jobwidgets kio \
	notifications service solid widgetsaddons windowsystem \
	gapi \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: net/kio-zeroconf/Makefile
	===================================================================
	--- net/kio-zeroconf/Makefile
	+++ net/kio-zeroconf/Makefile
	@@ -8,7 +8,7 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg
	USE_KDE= config coreaddons dbusaddons dnssd i18n kio service
	USE_QT= concurrent core dbus network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: net/kitinerary/Makefile
	===================================================================
	--- net/kitinerary/Makefile
	+++ net/kitinerary/Makefile
	@@ -15,11 +15,11 @@
	shared-mime-info ssl tar:xz
	USE_GNOME= libxml2
	USE_KDE= archive codecs coreaddons i18n \
	- ecm_build
	+ ecm:build
	# Pim components
	USE_KDE+= calendarcore contacts kpkpass mime
	USE_QT= core declarative gui network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kldap/Makefile
	===================================================================
	--- net/kldap/Makefile
	+++ net/kldap/Makefile
	@@ -12,11 +12,11 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= completion config coreaddons i18n kio widgetsaddons service \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= mbox
	USE_QT= concurrent core dbus gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_OPENLDAP= yes
	USE_LDCONFIG= yes

	Index: net/kmailtransport/Makefile
	===================================================================
	--- net/kmailtransport/Makefile
	+++ net/kmailtransport/Makefile
	@@ -17,7 +17,7 @@
	# pim components
	USE_KDE+= akonadi akonadimime gapi ksmtp mime pimcommon
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/kmbox/Makefile
	===================================================================
	--- net/kmbox/Makefile
	+++ net/kmbox/Makefile
	@@ -12,7 +12,7 @@
	# pim components
	USE_KDE+= mime
	USE_QT= core gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kmime/Makefile
	===================================================================
	--- net/kmime/Makefile
	+++ net/kmime/Makefile
	@@ -11,9 +11,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= codecs emoticons i18n init itemmodels itemviews \
	- ecm_build
	+ ecm:build
	USE_QT= core \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/kontactinterface/Makefile
	===================================================================
	--- net/kontactinterface/Makefile
	+++ net/kontactinterface/Makefile
	@@ -12,9 +12,9 @@
	emoticons i18n iconthemes init itemmodels itemviews jobwidgets \
	kdelibs4support kio parts service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/kpeoplevcard/Makefile
	===================================================================
	--- net/kpeoplevcard/Makefile
	+++ net/kpeoplevcard/Makefile
	@@ -13,9 +13,9 @@

	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= contacts coreaddons i18n people \
	- ecm_build
	+ ecm:build
	USE_QT= core gui widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	PLIST_FILES= lib/cmake/KF5PeopleVCard/KF5PeopleVCardConfig.cmake \
	${QT_PLUGINDIR}/kpeople/datasource/KPeopleVCard.so
	Index: net/kpimtextedit/Makefile
	===================================================================
	--- net/kpimtextedit/Makefile
	+++ net/kpimtextedit/Makefile
	@@ -12,9 +12,9 @@
	emoticons i18n iconthemes init itemmodels itemviews jobwidgets \
	kdelibs4support kio service solid sonnet syntaxhighlighting textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network speech widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/krdc/Makefile
	===================================================================
	--- net/krdc/Makefile
	+++ net/krdc/Makefile
	@@ -15,9 +15,9 @@
	coreaddons dnssd doctools i18n iconthemes kcmutils \
	notifications notifyconfig service wallet widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/krfb/Makefile
	===================================================================
	--- net/krfb/Makefile
	+++ net/krfb/Makefile
	@@ -14,9 +14,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	crash dbusaddons dnssd doctools i18n notifications \
	wallet wayland widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb xdamage xext xtst

	OPTIONS_DEFINE= TELEPATHY DOCS
	Index: net/ksmtp/Makefile
	===================================================================
	--- net/ksmtp/Makefile
	+++ net/ksmtp/Makefile
	@@ -14,7 +14,7 @@
	# pim components
	USE_KDE+= mime
	USE_QT= concurrent core dbus network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_LDCONFIG= yes

	Index: net/ktnef/Makefile
	===================================================================
	--- net/ktnef/Makefile
	+++ net/ktnef/Makefile
	@@ -9,11 +9,11 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons i18n kdelibs4support \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= calendarcore calendarutils contacts
	USE_QT= core gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/landrop/Makefile
	===================================================================
	--- net/landrop/Makefile
	+++ net/landrop/Makefile
	@@ -20,7 +20,7 @@
	GH_PROJECT= LANDrop

	USE_GL= gl
	-USE_QT= buildtools_build core gui network widgets
	+USE_QT= buildtools:build core gui network widgets

	QMAKE_SOURCE_PATH= ${WRKSRC}/LANDrop/LANDrop.pro

	Index: net/libgravatar/Makefile
	===================================================================
	--- net/libgravatar/Makefile
	+++ net/libgravatar/Makefile
	@@ -11,11 +11,11 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons i18n kio \
	service sonnet textwidgets widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= pimcommon
	USE_QT= concurrent core dbus gui network testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: net/libkgapi/Makefile
	===================================================================
	--- net/libkgapi/Makefile
	+++ net/libkgapi/Makefile
	@@ -20,12 +20,12 @@
	itemmodels itemviews jobwidgets kdelibs4support kio \
	notifications parts service textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui solid sonnet wallet \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= calendarcore contacts
	USE_QT= concurrent core dbus declarative gui location network \
	printsupport webchannel webengine widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_LDCONFIG= yes

	Index: net/libksieve/Makefile
	===================================================================
	--- net/libksieve/Makefile
	+++ net/libksieve/Makefile
	@@ -14,13 +14,13 @@
	USE_KDE= archive attica auth codecs completion config configwidgets \
	coreaddons i18n iconthemes jobwidgets kio newstuff service \
	solid sonnet syntaxhighlighting wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi identitymanagement libkdepim mailtransport mime \
	pimcommon pimtextedit
	USE_QT= concurrent core dbus declarative gui location network printsupport \
	uitools webchannel webengine widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/libkvkontakte/Makefile
	===================================================================
	--- net/libkvkontakte/Makefile
	+++ net/libkvkontakte/Makefile
	@@ -15,6 +15,6 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons ecm i18n kdewebkit kio service widgetsaddons
	USE_QT= concurrent core dbus gui network webkit widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: net/libmaia/Makefile
	===================================================================
	--- net/libmaia/Makefile
	+++ net/libmaia/Makefile
	@@ -11,7 +11,7 @@
	USES= compiler:c++11-lang gmake qmake qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= wiedi
	-USE_QT= buildtools_build network xml
	+USE_QT= buildtools:build network xml

	PLIST_FILES= include/maia/maiaObject.h \
	include/maia/maiaXmlRpcClient.h \
	Index: net/libmediawiki/Makefile
	===================================================================
	--- net/libmediawiki/Makefile
	+++ net/libmediawiki/Makefile
	@@ -14,6 +14,6 @@
	USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
	USE_KDE= coreaddons ecm
	USE_QT= core network testlib \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: net/linphone/Makefile
	===================================================================
	--- net/linphone/Makefile
	+++ net/linphone/Makefile
	@@ -23,8 +23,8 @@
	GL_PROJECT= linphone-desktop
	GL_COMMIT= da40aed848da44e851d67a2039e7e966c5257d3b
	USE_QT= concurrent core dbus declarative gui linguisttools network \
	- quickcontrols2 speech svg testlib widgets buildtools_build \
	- qmake_build graphicaleffects_run quickcontrols_run
	+ quickcontrols2 speech svg testlib widgets buildtools:build \
	+ qmake:build graphicaleffects:run quickcontrols:run

	# Linphone's plugin API is implemented in a shared object with rather generic
	# SONAME and filename, libapp-plugin.so. For classic installation in the
	Index: net/mailcommon/Makefile
	===================================================================
	--- net/mailcommon/Makefile
	+++ net/mailcommon/Makefile
	@@ -20,14 +20,14 @@
	guiaddons i18n iconthemes itemmodels itemviews jobwidgets kio \
	service solid sonnet syntaxhighlighting textwidgets wallet \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme identitymanagement \
	imap ldap libkdepim libkleo mailimporter \
	mailtransport messagelib mime pimcommon pimtextedit
	USE_QT= concurrent core dbus network xml designer gui multimedia \
	phonon4 testlib uiplugin uitools webkit widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/mailimporter/Makefile
	===================================================================
	--- net/mailimporter/Makefile
	+++ net/mailimporter/Makefile
	@@ -12,11 +12,11 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= auth archive codecs config configwidgets coreaddons i18n itemmodels \
	kio service widgetsaddons \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadimime libkdepim mime pimcommon pimtextedit
	USE_QT= concurrent core dbus gui network uitools widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_LDCONFIG= yes

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
	Index: net/mediastreamer/Makefile
	===================================================================
	--- net/mediastreamer/Makefile
	+++ net/mediastreamer/Makefile
	@@ -71,7 +71,7 @@
	OPUS_CMAKE_BOOL= ENABLE_OPUS
	QTGL_IMPLIES= VIDEO
	QTGL_USES= qt:5
	-QTGL_USE= QT=core,declarative,gui,network,buildtools_build,qmake_build
	+QTGL_USE= QT=core,declarative,gui,network,buildtools:build,qmake:build
	QTGL_CMAKE_BOOL= ENABLE_QT_GL
	SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
	SPEEX_CMAKE_BOOL= ENABLE_SPEEX_CODEC
	Index: net/messagelib/Makefile
	===================================================================
	--- net/messagelib/Makefile
	+++ net/messagelib/Makefile
	@@ -22,7 +22,7 @@
	coreaddons guiaddons i18n iconthemes imap itemmodels itemviews jobwidgets \
	kdewebkit kio notifications service solid sonnet syntaxhighlighting \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \
	contacts grantleetheme gravatar identitymanagement \
	@@ -30,7 +30,7 @@
	mime pimcommon pimtextedit
	USE_QT= concurrent core dbus declarative gui location network printsupport \
	uitools webchannel webengine widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/nitroshare/Makefile
	===================================================================
	--- net/nitroshare/Makefile
	+++ net/nitroshare/Makefile
	@@ -17,7 +17,7 @@
	USES= cmake compiler:c++11-lang qt:5
	USE_GITHUB= yes
	GH_PROJECT= ${PORTNAME}-desktop
	-USE_QT= core gui network widgets buildtools_build qmake_build
	+USE_QT= core gui network widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: net/pimcommon/Makefile
	===================================================================
	--- net/pimcommon/Makefile
	+++ net/pimcommon/Makefile
	@@ -14,13 +14,13 @@
	coreaddons dbusaddons emoticons i18n init iconthemes itemmodels itemviews \
	jobwidgets kcmutils kio newstuff service solid sonnet textwidgets \
	wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# pim components
	USE_KDE+= akonadi akonadicontacts akonadisearch contacts grantleetheme imap ldap \
	libkdepim mime pimtextedit purpose
	USE_QT= concurrent core dbus designer gui network printsupport script testlib \
	uiplugin uitools webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: net/py-qt5-networkauth/Makefile
	===================================================================
	--- net/py-qt5-networkauth/Makefile
	+++ net/py-qt5-networkauth/Makefile
	@@ -17,7 +17,7 @@

	USES= gl pyqt:5 python:3.8+ qt:5
	USE_GL= gl
	-USE_PYQT= sip_build pyqt5
	+USE_PYQT= sip:build pyqt5
	USE_PYTHON= concurrent flavors py3kplist
	USE_QT= core gui network networkauth

	Index: net/qoauth-qt5/Makefile
	===================================================================
	--- net/qoauth-qt5/Makefile
	+++ net/qoauth-qt5/Makefile
	@@ -14,7 +14,7 @@

	USES= compiler:c++11-lang qmake:outsource qca qt:5
	USE_LDCONFIG= yes
	-USE_QT= core network testlib buildtools_build qmake_build
	+USE_QT= core network testlib buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= ayoy
	Index: net/qt5-network/Makefile
	===================================================================
	--- net/qt5-network/Makefile
	+++ net/qt5-network/Makefile
	@@ -11,7 +11,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base ssl
	USE_PERL5= extract
	-USE_QT= core buildtools_build
	+USE_QT= core buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= -no-gui -no-xcb

	Index: net/qt5-networkauth/Makefile
	===================================================================
	--- net/qt5-networkauth/Makefile
	+++ net/qt5-networkauth/Makefile
	@@ -9,6 +9,6 @@
	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5
	USE_PERL5= extract
	USE_QT= core network \
	- buildtools_build
	+ buildtools:build

	.include <bsd.port.mk>
	Index: net/quiterss/Makefile
	===================================================================
	--- net/quiterss/Makefile
	+++ net/quiterss/Makefile
	@@ -14,8 +14,8 @@

	USES= compiler:c++11-lang desktop-file-utils gl pkgconfig \
	qmake:outsource qt:5 sqlite
	-USE_QT= buildtools_build linguisttools_build core xml gui widgets \
	- network multimedia printsupport webkit sql sql-sqlite3_run
	+USE_QT= buildtools:build linguisttools:build core xml gui widgets \
	+ network multimedia printsupport webkit sql sql-sqlite3:run
	USE_GL= gl

	NO_WRKSUBDIR= yes
	Index: net/rclone-browser/Makefile
	===================================================================
	--- net/rclone-browser/Makefile
	+++ net/rclone-browser/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= kapitainsky
	GH_PROJECT= RcloneBrowser
	-USE_QT= buildtools_build core gui qmake_build widgets
	+USE_QT= buildtools:build core gui qmake:build widgets

	# Prepare for Qt5-5.15
	CFLAGS+= -Wno-deprecated
	Index: net/remmina/Makefile
	===================================================================
	--- net/remmina/Makefile
	+++ net/remmina/Makefile
	@@ -83,7 +83,7 @@
	GCRYPT_CMAKE_BOOL= WITH_GCRYPT

	KWALLET_USES= kde:5 qt:5
	-KWALLET_USE= kde=wallet qt=buildtools_build,core,gui,qmake_build
	+KWALLET_USE= kde=wallet qt=buildtools:build,core,gui,qmake:build
	KWALLET_CMAKE_BOOL= WITH_KF5WALLET

	NLS_CMAKE_BOOL= WITH_TRANSLATIONS
	Index: net/rsplib/Makefile
	===================================================================
	--- net/rsplib/Makefile
	+++ net/rsplib/Makefile
	@@ -12,7 +12,7 @@

	USES= cmake compiler:c++11-lang qt:5 shebangfix tar:xz
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build core gui qmake widgets xml
	+USE_QT= buildtools:build core gui qmake widgets xml

	CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
	-DDOCSDIR="${DOCSDIR}" \
	Index: net/rssguard/Makefile
	===================================================================
	--- net/rssguard/Makefile
	+++ net/rssguard/Makefile
	@@ -9,7 +9,7 @@
	LICENSE= GPLv3+

	USES= cmake qt:5
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	core dbus declarative gui multimedia network sql \
	widgets xml
	USE_GITHUB= yes
	Index: net/savvycan/Makefile
	===================================================================
	--- net/savvycan/Makefile
	+++ net/savvycan/Makefile
	@@ -12,7 +12,7 @@
	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}

	USES= compiler:c++11-lang gmake python:build,3.6+ qmake qt:5
	-USE_QT= buildtools_build core gui help printsupport serialbus \
	+USE_QT= buildtools:build core gui help printsupport serialbus \
	serialport websockets-qml widgets

	USE_GITHUB= yes
	Index: net/smb4k/Makefile
	===================================================================
	--- net/smb4k/Makefile
	+++ net/smb4k/Makefile
	@@ -18,10 +18,10 @@
	dbusaddons dnssd i18n iconthemes jobwidgets kio notifications \
	plasma-framework service solid wallet widgetsaddons \
	windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative gui network printsupport \
	testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	KDE_INVENT= 992987421af68f2695867722b8dc4ca30a4669ec network
	Index: net/spoofer/Makefile
	===================================================================
	--- net/spoofer/Makefile
	+++ net/spoofer/Makefile
	@@ -25,7 +25,7 @@
	OPTIONS_SUB= yes

	GUI_USES= gl qt:5
	-GUI_USE= GL=gl QT=buildtools_build,qmake_build,core,network,gui,widgets
	+GUI_USE= GL=gl QT=buildtools:build,qmake:build,core,network,gui,widgets
	GUI_CONFIGURE_ENABLE= manager
	GUI_VARS= USE_RC_SUBR=${PORTNAME}

	Index: net/wireshark/Makefile
	===================================================================
	--- net/wireshark/Makefile
	+++ net/wireshark/Makefile
	@@ -81,7 +81,7 @@
	OPUS_DESC= Build opus decoder plugin

	GUI_USES= qt:5
	-GUI_USE= qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build
	+GUI_USE= qt=core,gui,multimedia,widgets,printsupport,svg,buildtools:build,linguisttools:build,qmake:build

	LTO_CMAKE_BOOL= ENABLE_LTO
	LUA_USES= lua:51-52
	Index: net/wpa_supplicant_gui/Makefile
	===================================================================
	--- net/wpa_supplicant_gui/Makefile
	+++ net/wpa_supplicant_gui/Makefile
	@@ -15,8 +15,8 @@
	LICENSE_FILE= ${WRKSRC}/../COPYING

	USES= gl gmake qt:5 xorg
	-USE_QT= qmake_build buildtools_build linguisttools_build core gui \
	- widgets svg_run
	+USE_QT= qmake:build buildtools:build linguisttools:build core gui \
	+ widgets svg:run
	USE_GL= gl

	ALL_TARGET= wpa_gui-qt4
	Index: net/x2goclient/Makefile
	===================================================================
	--- net/x2goclient/Makefile
	+++ net/x2goclient/Makefile
	@@ -22,7 +22,7 @@
	USE_GL= gl
	USE_XORG= x11 xpm
	USE_QT= core gui network svg widgets x11extras \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}"

	OPTIONS_DEFINE= DOCS LDAP
	Index: polish/kadu/Makefile
	===================================================================
	--- polish/kadu/Makefile
	+++ polish/kadu/Makefile
	@@ -40,8 +40,8 @@
	USE_QT= concurrent core dbus declarative gui multimedia network \
	script scripttools sql webkit widgets x11extras \
	xml xmlpatterns \
	- buildtools_build linguisttools_build testlib_build \
	- qmake_build imageformats_run sql-sqlite3_run
	+ buildtools:build linguisttools:build testlib:build \
	+ qmake:build imageformats:run sql-sqlite3:run
	# Setting KADU_VERSION disables git invocation
	CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON \
	-DENABLE_TESTS=OFF
	Index: polish/qnapi/Makefile
	===================================================================
	--- polish/qnapi/Makefile
	+++ polish/qnapi/Makefile
	@@ -20,7 +20,7 @@

	USES= compiler:c++11-lib gl pkgconfig qmake qt:5
	USE_GL= gl
	-USE_QT= buildtools_build core gui network widgets xml
	+USE_QT= buildtools:build core gui network widgets xml

	CXXFLAGS+= -I${LOCALBASE}/include/maia

	Index: ports-mgmt/octopkg/Makefile
	===================================================================
	--- ports-mgmt/octopkg/Makefile
	+++ ports-mgmt/octopkg/Makefile
	@@ -16,7 +16,7 @@
	GH_ACCOUNT= aarnt

	USE_QT= core concurrent declarative gui linguist network xml widgets \
	- buildtools_build
	+ buildtools:build

	PLIST_FILES= bin/${PORTNAME} \
	lib/${PORTNAME}/${PORTNAME}-doas \
	Index: ports-mgmt/portrac/Makefile
	===================================================================
	--- ports-mgmt/portrac/Makefile
	+++ ports-mgmt/portrac/Makefile
	@@ -13,7 +13,7 @@
	USES= compiler:c++11-lib gl qmake qt:5 tar:bzip2
	USE_CXXSTD= c++11
	USE_GL= gl
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets

	PLIST_FILES= bin/portrac \
	share/portrac/portrac.png \
	Index: print/hplip/Makefile
	===================================================================
	--- print/hplip/Makefile
	+++ print/hplip/Makefile
	@@ -68,7 +68,7 @@
	X11_DESC= Graphical User Interface (Qt)
	X11_CONFIGURE_ENABLE= gui-build qt5
	X11_USES= pyqt:5
	-X11_USE= PYQT=pyqt5_run
	+X11_USE= PYQT=pyqt5:run

	XSANE_DESC= Install XSane for scanning (implies SCAN)
	XSANE_IMPLIES= SCAN
	Index: print/limereport/Makefile
	===================================================================
	--- print/limereport/Makefile
	+++ print/limereport/Makefile
	@@ -11,8 +11,8 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake compiler:c++11-lang dos2unix gl qt:5
	-USE_QT+= buildtools_build core gui script sql xml svg quickcontrols2 \
	- printsupport uitools network widgets declarative qmake_build
	+USE_QT+= buildtools:build core gui script sql xml svg quickcontrols2 \
	+ printsupport uitools network widgets declarative qmake:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: print/lyx/Makefile
	===================================================================
	--- print/lyx/Makefile
	+++ print/lyx/Makefile
	@@ -22,7 +22,7 @@

	USES= autoreconf compiler:c++11-lang desktop-file-utils gmake iconv \
	pkgconfig perl5 python qt:5 shebangfix tar:xz xorg
	-USE_QT= core concurrent gui svg widgets x11extras buildtools_build qmake_build
	+USE_QT= core concurrent gui svg widgets x11extras buildtools:build qmake:build
	USE_XORG= xcb
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --without-included-boost \
	Index: print/miktex/Makefile
	===================================================================
	--- print/miktex/Makefile
	+++ print/miktex/Makefile
	@@ -64,7 +64,7 @@
	UIQT_CMAKE_BOOL= WITH_UI_QT

	UIQT_USES= qt:5 gl
	-UIQT_USE= qt=core,concurrent,declarative,dbus,gui,linguisttools,network,printsupport,script,scripttools,uitools,widgets,xml,buildtools_build,qmake_build gl=gl
	+UIQT_USE= qt=core,concurrent,declarative,dbus,gui,linguisttools,network,printsupport,script,scripttools,uitools,widgets,xml,buildtools:build,qmake:build gl=gl

	CMAKE_ARGS= -DMIKTEX_SYSTEM_ETC_FONTS_CONFD_DIR=${LOCALBASE}/etc/fonts/conf.d \
	-DMIKTEX_SYSTEM_VAR_CACHE_DIR=${DATADIR}/cache \
	Index: print/posterazor/Makefile
	===================================================================
	--- print/posterazor/Makefile
	+++ print/posterazor/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= ehaupt
	USE_GL= gl
	-USE_QT= core gui printsupport widgets buildtools_build
	+USE_QT= core gui printsupport widgets buildtools:build

	QMAKE_SOURCE_PATH= ${WRKSRC}/src/posterazor.pro

	Index: print/print-manager/Makefile
	===================================================================
	--- print/print-manager/Makefile
	+++ print/print-manager/Makefile
	@@ -13,9 +13,9 @@
	dbusaddons i18n iconthemes itemviews jobwidgets kcmutils \
	kio notifications plasma-framework service solid widgetsaddons \
	windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	post-patch:
	Index: print/qpdfview/Makefile
	===================================================================
	--- print/qpdfview/Makefile
	+++ print/qpdfview/Makefile
	@@ -18,7 +18,7 @@
	USE_GL= gl
	USE_LDCONFIG= yes
	USE_QT= concurrent core dbus gui imageformats linguisttools \
	- printsupport sql sql-sqlite3 svg widgets xml buildtools_build
	+ printsupport sql sql-sqlite3 svg widgets xml buildtools:build

	QMAKE_SOURCE_PATH= ${PORTNAME}.pro

	Index: print/qt5-printsupport/Makefile
	===================================================================
	--- print/qt5-printsupport/Makefile
	+++ print/qt5-printsupport/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5= extract
	-USE_QT= core gui widgets qmake_build buildtools_build
	+USE_QT= core gui widgets qmake:build buildtools:build
	HAS_CONFIGURE= yes

	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
	Index: print/scribus-devel/Makefile
	===================================================================
	--- print/scribus-devel/Makefile
	+++ print/scribus-devel/Makefile
	@@ -39,8 +39,8 @@

	USES= cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \
	jpeg pkgconfig python:3.6+ qt:5 shared-mime-info tar:xz
	-USE_QT= buildtools_build core declarative gui linguisttools_build \
	- network opengl printsupport qmake_build widgets xml
	+USE_QT= buildtools:build core declarative gui linguisttools:build \
	+ network opengl printsupport qmake:build widgets xml
	DOS2UNIX_REGEX= .*\.(cpp\|h\|txt)
	USE_GNOME= libxml2

	Index: science/avogadro2/Makefile
	===================================================================
	--- science/avogadro2/Makefile
	+++ science/avogadro2/Makefile
	@@ -17,7 +17,7 @@
	libMoleQueueClient.so:misc/molequeue

	USES= cmake compiler:c++11-lang desktop-file-utils gl libarchive qt:5
	-USE_QT= core concurrent gui network widgets buildtools_build qmake_build
	+USE_QT= core concurrent gui network widgets buildtools:build qmake:build
	USE_GL= gl glew glu
	USE_LDCONFIG= yes

	Index: science/avogadrolibs/Makefile
	===================================================================
	--- science/avogadrolibs/Makefile
	+++ science/avogadrolibs/Makefile
	@@ -51,7 +51,7 @@

	QT5_CMAKE_BOOL= USE_QT
	QT5_USES= qt:5
	-QT5_USE= QT=core,concurrent,gui,network,svg,widgets,buildtools_build,qmake_build
	+QT5_USE= QT=core,concurrent,gui,network,svg,widgets,buildtools:build,qmake:build
	QT5_IMPLIES= OPENGL

	SPGLIB_DESC= Enable optional features using spglib
	Index: science/elmerfem/Makefile
	===================================================================
	--- science/elmerfem/Makefile
	+++ science/elmerfem/Makefile
	@@ -69,8 +69,8 @@

	_LIBSTAGEDIR= ${STAGEDIR}/${PREFIX}/lib/elmersolver
	_PYVERSION= ${PYTHON_VER}${PYTHON_ABIVER}
	-_QT5_LIBS= buildtools_build concurrent core declarative gui location \
	- network opengl printsupport qmake_build script sensors \
	+_QT5_LIBS= buildtools:build concurrent core declarative gui location \
	+ network opengl printsupport qmake:build script sensors \
	sql svg webchannel webkit widgets xml

	.include <bsd.port.pre.mk>
	Index: science/iboview/Makefile
	===================================================================
	--- science/iboview/Makefile
	+++ science/iboview/Makefile
	@@ -19,7 +19,7 @@

	USES= blaslapack:openblas fortran gl qmake:outsource qt:5 tar:bz2
	USE_GL= gl glu
	-USE_QT= buildtools_build core gui widgets opengl script svg
	+USE_QT= buildtools:build core gui widgets opengl script svg

	PLIST_FILES= bin/iboview

	Index: science/kalzium/Makefile
	===================================================================
	--- science/kalzium/Makefile
	+++ science/kalzium/Makefile
	@@ -24,12 +24,12 @@
	khtml kio newstuff notifications parts plotting service solid \
	sonnet textwidgets unitconversion widgetsaddons windowsystem \
	xmlgui \
	- ecm_build
	+ ecm:build
	USE_OCAML= yes
	NO_OCAML_RUNDEPENDS= yes
	USE_QT= concurrent core dbus declarative gui network opengl printsupport script svg \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: science/kst2/Makefile
	===================================================================
	--- science/kst2/Makefile
	+++ science/kst2/Makefile
	@@ -19,7 +19,7 @@
	USES= cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig \
	qt:5 shared-mime-info
	USE_QT= concurrent core gui network printsupport svg widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_LDCONFIG= yes

	KST_VERSION= 2.0.8
	Index: science/liggghts/Makefile
	===================================================================
	--- science/liggghts/Makefile
	+++ science/liggghts/Makefile
	@@ -23,7 +23,7 @@

	USES= compiler:c++17-lang cmake fortran gl jpeg python qt:5 xorg
	USE_XORG= ice sm x11 xext xt
	-USE_QT= core declarative gui network opengl sql widgets qmake_build buildtools_build
	+USE_QT= core declarative gui network opengl sql widgets qmake:build buildtools:build
	USE_GL= gl
	USE_LDCONFIG= yes

	Index: science/massxpert/Makefile
	===================================================================
	--- science/massxpert/Makefile
	+++ science/massxpert/Makefile
	@@ -21,8 +21,8 @@
	GL_ACCOUNT= debichem-team
	GL_COMMIT= a21ad33eee0314df202146392023dfb3868b7d84
	USE_GNOME= glib20
	-USE_QT= core gui printsupport svg widgets xml buildtools_build \
	- qmake_build
	+USE_QT= core gui printsupport svg widgets xml buildtools:build \
	+ qmake:build
	USE_XORG= ice sm x11 xau xcb xdmcp xext xrender

	.include <bsd.port.mk>
	Index: science/molsketch/Makefile
	===================================================================
	--- science/molsketch/Makefile
	+++ science/molsketch/Makefile
	@@ -17,7 +17,7 @@

	USES= cmake:noninja compiler:c++14-lang desktop-file-utils localbase:ldflags \
	pkgconfig qt:5 shared-mime-info # build fails with ninja, see https://sourceforge.net/p/molsketch/bugs/41/
	-USE_QT= core gui network printsupport svg widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core gui network printsupport svg widgets buildtools:build linguisttools:build qmake:build
	USE_LDCONFIG= ${PREFIX}/lib/molsketch

	CMAKE_ARGS= -DMSK_PREFIX:STRING=${PREFIX}
	Index: science/paraview/Makefile
	===================================================================
	--- science/paraview/Makefile
	+++ science/paraview/Makefile
	@@ -63,7 +63,7 @@
	pkgconfig python qt:5 shebangfix tar:xz xorg
	USE_GL= gl glew glu glut
	USE_GNOME= libxml2
	-USE_QT= buildtools_build core gui help network opengl qmake_build sql svg \
	+USE_QT= buildtools:build core gui help network opengl qmake:build sql svg \
	widgets x11extras xmlpatterns
	USE_XORG= ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xorgproto xrender \
	xxf86vm
	Index: science/pulseview/Makefile
	===================================================================
	--- science/pulseview/Makefile
	+++ science/pulseview/Makefile
	@@ -21,7 +21,7 @@

	USES= cmake compiler:c++14-lang desktop-file-utils gnome pkgconfig qt:5
	USE_GNOME= glibmm glib20 libsigc++20
	-USE_QT= buildtools_build core gui linguisttools_build qmake_build svg widgets
	+USE_QT= buildtools:build core gui linguisttools:build qmake:build svg widgets

	CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
	-DDISABLE_WERROR:BOOL=TRUE
	Index: science/py-pymol/Makefile
	===================================================================
	--- science/py-pymol/Makefile
	+++ science/py-pymol/Makefile
	@@ -41,7 +41,7 @@
	OPTIONS_DEFAULT= QT5

	QT5_USES= pyqt:5
	-QT5_USE= PYQT=pyqt5_run
	+QT5_USE= PYQT=pyqt5:run

	post-patch-TK-on:
	@${REINPLACE_CMD} -e ' \
	Index: science/py-veusz/Makefile
	===================================================================
	--- science/py-veusz/Makefile
	+++ science/py-veusz/Makefile
	@@ -19,7 +19,7 @@
	USE_GITHUB= yes
	USE_PYQT= pyqt5 sip
	USE_PYTHON= distutils concurrent autoplist
	-USE_QT= core gui xml widgets qmake_build
	+USE_QT= core gui xml widgets qmake:build
	SHEBANG_FILES= examples/embedexample.py

	post-install:
	Index: science/scidavis/Makefile
	===================================================================
	--- science/scidavis/Makefile
	+++ science/scidavis/Makefile
	@@ -20,7 +20,7 @@
	qt:5 shared-mime-info
	USE_GL= gl glu
	USE_QT= core gui opengl printsupport svg widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= highperformancecoder
	Index: science/shelxle/Makefile
	===================================================================
	--- science/shelxle/Makefile
	+++ science/shelxle/Makefile
	@@ -12,7 +12,7 @@

	USES= compiler:c++11-lang dos2unix gl qmake qt:5 tar:bz2
	DOS2UNIX_FILES= shelXle.pro
	-USE_QT= core gui network opengl widgets buildtools_build
	+USE_QT= core gui network opengl widgets buildtools:build
	USE_GL= gl

	PLIST_FILES= bin/shelxle \
	Index: science/step/Makefile
	===================================================================
	--- science/step/Makefile
	+++ science/step/Makefile
	@@ -18,10 +18,10 @@
	kdelibs4support khtml kio newstuff notifications parts \
	plotting service solid sonnet textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network opengl printsupport svg \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	CXXFLAGS_sparc64= -Wno-error=return-type

	Index: science/vipster/Makefile
	===================================================================
	--- science/vipster/Makefile
	+++ science/vipster/Makefile
	@@ -33,7 +33,7 @@
	DESKTOP_DESC= Build QT-based desktop app
	DESKTOP_CMAKE_BOOL= VIPSTER_DESKTOP
	DESKTOP_USES= qt:5
	-DESKTOP_USE= QT=core,gui,widgets,buildtools_build,qmake_build
	+DESKTOP_USE= QT=core,gui,widgets,buildtools:build,qmake:build

	LAMMPS_DESC= Interactive LAMMPS in desktop app
	LAMMPS_CMAKE_BOOL= VIPSTER_LAMMPS
	Index: science/xdrawchem/Makefile
	===================================================================
	--- science/xdrawchem/Makefile
	+++ science/xdrawchem/Makefile
	@@ -13,7 +13,7 @@
	LIB_DEPENDS= libopenbabel.so:science/openbabel

	USES= compiler:c++11-lang gl qmake qt:5
	-USE_QT= core gui network printsupport svg widgets xml buildtools_build
	+USE_QT= core gui network printsupport svg widgets xml buildtools:build
	USE_GL= gl

	USE_GITLAB= yes
	Index: security/fwbuilder/Makefile
	===================================================================
	--- security/fwbuilder/Makefile
	+++ security/fwbuilder/Makefile
	@@ -27,9 +27,9 @@
	USE_GITHUB= yes
	PLIST_SUB= PORTVERSION=${PORTVERSION}
	USE_QT= buildtools gui \
	- linguist_build \
	+ linguist:build \
	printsupport \
	- qmake_build \
	+ qmake:build \
	svg \
	xml

	Index: security/globalprotect-openconnect/Makefile
	===================================================================
	--- security/globalprotect-openconnect/Makefile
	+++ security/globalprotect-openconnect/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake:noninja qt:5
	USE_GITHUB= yes
	-USE_QT= buildtools core dbus declarative gui location network printsupport qmake_build webchannel webengine websockets widgets
	+USE_QT= buildtools core dbus declarative gui location network printsupport qmake:build webchannel webengine websockets widgets

	GH_ACCOUNT= yuezk
	GH_PROJECT= GlobalProtect-openconnect
	Index: security/gpgme/Makefile
	===================================================================
	--- security/gpgme/Makefile
	+++ security/gpgme/Makefile
	@@ -67,14 +67,14 @@
	. if ${SLAVEPORT} == "qt5"
	LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp
	USES+= compiler:c++11-lib pkgconfig qt:5
	-USE_QT= buildtools_build core
	+USE_QT= buildtools:build core
	CONFIGURE_ARGS+=--enable-languages="cpp qt"
	DOCSDIR= ${PORTNAME}${PKGNAMESUFFIX}

	OPTIONS_DEFINE+= DOXYGEN
	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \
	dot:graphics/graphviz
	-TEST_USE= QT=testlib_build
	+TEST_USE= QT=testlib:build
	. endif

	. if ${SLAVEPORT} == "python"
	Index: security/keepassxc/Makefile
	===================================================================
	--- security/keepassxc/Makefile
	+++ security/keepassxc/Makefile
	@@ -23,8 +23,8 @@

	USES= cmake compiler:c++17-lang desktop-file-utils pkgconfig qt:5 \
	readline shared-mime-info tar:xz xorg
	-USE_QT= concurrent core dbus gui network svg widgets buildtools_build \
	- linguisttools_build qmake_build testlib_build x11extras
	+USE_QT= concurrent core dbus gui network svg widgets buildtools:build \
	+ linguisttools:build qmake:build testlib:build x11extras
	USE_XORG= x11

	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
	Index: security/kf5-kdesu/Makefile
	===================================================================
	--- security/kf5-kdesu/Makefile
	+++ security/kf5-kdesu/Makefile
	@@ -7,9 +7,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= config coreaddons dbusaddons i18n pty service \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	.include <bsd.port.mk>
	Index: security/kgpg/Makefile
	===================================================================
	--- security/kgpg/Makefile
	+++ security/kgpg/Makefile
	@@ -15,9 +15,9 @@
	dbusaddons doctools grantleetheme i18n iconthemes itemmodels itemviews \
	jobwidgets kio notifications service solid sonnet textwidgets \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: security/kleopatra/Makefile
	===================================================================
	--- security/kleopatra/Makefile
	+++ security/kleopatra/Makefile
	@@ -19,9 +19,9 @@
	doctools i18n iconthemes itemmodels kcmutils notifications \
	service sonnet textwidgets widgetsaddons windowsystem xmlgui \
	libkleo mime \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network printsupport testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: security/kpkpass/Makefile
	===================================================================
	--- security/kpkpass/Makefile
	+++ security/kpkpass/Makefile
	@@ -9,7 +9,7 @@
	shared-mime-info tar:xz
	USE_KDE= archive ecm
	USE_QT= core gui testlib \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr

	Index: security/kwalletmanager/Makefile
	===================================================================
	--- security/kwalletmanager/Makefile
	+++ security/kwalletmanager/Makefile
	@@ -13,9 +13,9 @@
	itemmodels itemviews kcmutils kdelibs4support kio \
	jobwidgets notifications service wallet widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: security/libkleo/Makefile
	===================================================================
	--- security/libkleo/Makefile
	+++ security/libkleo/Makefile
	@@ -18,7 +18,7 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n itemmodels pimtextedit widgetsaddons windowsystem
	USE_QT= core gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	_CORETOOLS= md5sum sha1sum sha256sum sha512sum

	Index: security/lxqt-openssh-askpass/Makefile
	===================================================================
	--- security/lxqt-openssh-askpass/Makefile
	+++ security/lxqt-openssh-askpass/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++11-lang gettext-runtime kde:5 lxqt \
	pkgconfig qt:5 tar:xz gnome xorg
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools lxqt
	Index: security/lxqt-sudo/Makefile
	===================================================================
	--- security/lxqt-sudo/Makefile
	+++ security/lxqt-sudo/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++14-lang gettext kde:5 lxqt qt:5 \
	pkgconfig tar:xz gnome xorg
	-USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
	+USE_QT= buildtools:build qmake:build core dbus gui svg widgets \
	x11extras xml

	USE_KDE= windowsystem
	Index: security/nitrokey-app/Makefile
	===================================================================
	--- security/nitrokey-app/Makefile
	+++ security/nitrokey-app/Makefile
	@@ -19,7 +19,7 @@
	GH_TUPLE= Nitrokey:nitrokey-app:${DISTVERSIONPREFIX}${DISTVERSION}\
	tplgy:cppcodec:61d9b04:cppcodec

	-USE_QT= buildtools_build concurrent gui linguisttools_build qmake_build svg widgets
	+USE_QT= buildtools:build concurrent gui linguisttools:build qmake:build svg widgets

	post-extract:
	@${RMDIR} ${WRKSRC}/3rdparty/cppcodec
	Index: security/openconnect-gui/Makefile
	===================================================================
	--- security/openconnect-gui/Makefile
	+++ security/openconnect-gui/Makefile
	@@ -23,7 +23,7 @@
	USES= cmake:insource compiler:c++11-lang pkgconfig qt:5
	USE_GITHUB= nodefault
	GH_TUPLE= qtproject:qt-solutions:a8dda66d:qtsolutions/external/src/qt-solutions-master
	-USE_QT= buildtools_build concurrent core gui network qmake_build widgets
	+USE_QT= buildtools:build concurrent core gui network qmake:build widgets
	CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
	PLIST_FILES= bin/openconnect-gui

	Index: security/ophcrack/Makefile
	===================================================================
	--- security/ophcrack/Makefile
	+++ security/ophcrack/Makefile
	@@ -25,7 +25,7 @@
	X11_DESC= Build with Qt 5 GUI frontend

	X11_USES= pkgconfig qt:5
	-X11_USE= QT=buildtools_build,qmake_build,charts,core,gui,widgets
	+X11_USE= QT=buildtools:build,qmake:build,charts,core,gui,widgets
	X11_CONFIGURE_OFF= --disable-gui

	post-patch:
	Index: security/pinentry/Makefile
	===================================================================
	--- security/pinentry/Makefile
	+++ security/pinentry/Makefile
	@@ -97,7 +97,7 @@

	.if ${PINENTRY_GUI} == "qt5"
	USES+= compiler:c++11-lib qt:5
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build
	PLIST_FILES= bin/pinentry-qt5
	CONFIGURE_ARGS+=--enable-pinentry-qt5 \
	--program-suffix=5
	Index: security/plasma5-kscreenlocker/Makefile
	===================================================================
	--- security/plasma5-kscreenlocker/Makefile
	+++ security/plasma5-kscreenlocker/Makefile
	@@ -20,9 +20,9 @@
	kdeclarative layer-shell-qt notifications package \
	plasma-framework service sonnet textwidgets wayland \
	widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network qdbus widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= ice sm x11 xcb xcursor xext xi

	CPE_VENDOR= kde
	Index: security/plasma5-ksshaskpass/Makefile
	===================================================================
	--- security/plasma5-ksshaskpass/Makefile
	+++ security/plasma5-ksshaskpass/Makefile
	@@ -8,8 +8,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= coreaddons i18n wallet widgetsaddons \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: security/plasma5-kwallet-pam/Makefile
	===================================================================
	--- security/plasma5-kwallet-pam/Makefile
	+++ security/plasma5-kwallet-pam/Makefile
	@@ -12,7 +12,7 @@
	USES= cmake gettext kde:5 qt:5 tar:xz
	USE_KDE= ecm wallet
	USE_QT= gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	post-patch:
	@${REINPLACE_CMD} -e 's,socat,nc,' -e 's,/security,,' \
	Index: security/qtkeychain/Makefile
	===================================================================
	--- security/qtkeychain/Makefile
	+++ security/qtkeychain/Makefile
	@@ -21,7 +21,7 @@
	CMAKE_ARGS= -DBUILD_WITH_QT6=${_WITH_QT6_${FLAVOR}} \
	-DQT_MKSPECDIR_REL=${QT_MKSPECDIR_REL}
	USE_GITHUB= yes
	-_USE_QT_qt5= core dbus buildtools_build qmake_build
	+_USE_QT_qt5= core dbus buildtools:build qmake:build
	_USE_QT_qt6= base
	USE_QT= ${_USE_QT_${FLAVOR}}
	GH_ACCOUNT= frankosterfeld
	@@ -37,8 +37,8 @@
	LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret
	LIBSECRET_CMAKE_BOOL= LIBSECRET_SUPPORT

	-_QT_LINGUIST_qt5= linguisttools_build
	-_QT_LINGUIST_qt6= tools_build
	+_QT_LINGUIST_qt5= linguisttools:build
	+_QT_LINGUIST_qt6= tools:build
	NLS_USE= qt=${_QT_LINGUIST_${FLAVOR}}
	NLS_CMAKE_BOOL= BUILD_TRANSLATIONS

	Index: security/spass-qt5/Makefile
	===================================================================
	--- security/spass-qt5/Makefile
	+++ security/spass-qt5/Makefile
	@@ -4,7 +4,7 @@
	COMMENT= Secure password generator with a true RNG (Qt5 GUI)

	USES= qmake:no_env qt:5
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets

	MASTERDIR= ${.CURDIR}/../spass

	Index: security/xca/Makefile
	===================================================================
	--- security/xca/Makefile
	+++ security/xca/Makefile
	@@ -15,7 +15,7 @@

	USES= compiler:c++11-lang desktop-file-utils gmake localbase \
	pkgconfig qt:5 shared-mime-info ssl
	-USE_QT= buildtools_build core gui help linguist_build sql widgets
	+USE_QT= buildtools:build core gui help linguist:build sql widgets
	USE_CXXSTD= c++11

	GNU_CONFIGURE= yes
	Index: security/yubikey-manager-qt/Makefile
	===================================================================
	--- security/yubikey-manager-qt/Makefile
	+++ security/yubikey-manager-qt/Makefile
	@@ -20,7 +20,7 @@
	shebangfix
	USE_GL= gl
	USE_QT= core declarative graphicaleffects gui network quickcontrols \
	- quickcontrols2 svg widgets buildtools_build
	+ quickcontrols2 svg widgets buildtools:build

	USE_GITHUB= yes
	GH_ACCOUNT= Yubico
	Index: security/yubikey-personalization-gui/Makefile
	===================================================================
	--- security/yubikey-personalization-gui/Makefile
	+++ security/yubikey-personalization-gui/Makefile
	@@ -16,7 +16,7 @@

	USES= compiler:c++11-lang pkgconfig qmake qt:5
	USE_GITHUB= yes
	-USE_QT= buildtools_build core gui testlib_build widgets
	+USE_QT= buildtools:build core gui testlib:build widgets

	GH_ACCOUNT= Yubico

	Index: security/yubioath-desktop/Makefile
	===================================================================
	--- security/yubioath-desktop/Makefile
	+++ security/yubioath-desktop/Makefile
	@@ -21,7 +21,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl python:3.5+ qmake qt:5 \
	shebangfix ssl
	USE_GL= gl
	-USE_QT= core declarative gui network quickcontrols2 svg widgets buildtools_build
	+USE_QT= core declarative gui network quickcontrols2 svg widgets buildtools:build

	USE_GITHUB= yes
	GH_ACCOUNT= Yubico
	Index: sysutils/UEFITool/Makefile
	===================================================================
	--- sysutils/UEFITool/Makefile
	+++ sysutils/UEFITool/Makefile
	@@ -13,7 +13,7 @@
	USES= compiler:c++11-lang gl qmake:outsource qt:5
	USE_GITHUB= yes
	USE_GL= gl
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build

	WRKSRC_SUBDIR= ${PORTNAME}
	GH_ACCOUNT= LongSoft
	Index: sysutils/accounts-qml-module/Makefile
	===================================================================
	--- sysutils/accounts-qml-module/Makefile
	+++ sysutils/accounts-qml-module/Makefile
	@@ -17,7 +17,7 @@
	USES= compiler:c++11-lang gl pkgconfig qmake qt:5 tar:bz2
	USE_GL= gl
	USE_QT= core declarative gui network testlib xml \
	- buildtools_build qdoc_build qmake_build
	+ buildtools:build qdoc:build qmake:build
	# gitlab variables
	USE_GITLAB= yes
	GL_ACCOUNT= accounts-sso
	Index: sysutils/android-file-transfer/Makefile
	===================================================================
	--- sysutils/android-file-transfer/Makefile
	+++ sysutils/android-file-transfer/Makefile
	@@ -39,7 +39,7 @@
	PYTHON_PLIST_FILES= %%PYTHON_SITELIBDIR%%/aftl%%PYTHON_EXT_SUFFIX%%.so

	QT5_USES= qt:5
	-QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,core,gui,network,widgets
	+QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,core,gui,network,widgets
	QT5_CMAKE_BOOL= BUILD_QT_UI
	QT5_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=5
	QT5_PLIST_FILES= bin/android-file-transfer \
	Index: sysutils/angrysearch/Makefile
	===================================================================
	--- sysutils/angrysearch/Makefile
	+++ sysutils/angrysearch/Makefile
	@@ -19,7 +19,7 @@

	USES= python pyqt:5
	USE_PYTHON= autoplist distutils noflavors
	-USE_PYQT= pyqt5_run
	+USE_PYQT= pyqt5:run

	post-patch:
	@${REINPLACE_CMD} -e 's,Linux,${OPSYS}, ; s,linux,${OPSYS:tl}, \
	Index: sysutils/baloo-widgets/Makefile
	===================================================================
	--- sysutils/baloo-widgets/Makefile
	+++ sysutils/baloo-widgets/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= baloo completion config coreaddons emoticons filemetadata \
	i18n init itemmodels jobwidgets kio service solid \
	widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: sysutils/bareos-traymonitor/Makefile
	===================================================================
	--- sysutils/bareos-traymonitor/Makefile
	+++ sysutils/bareos-traymonitor/Makefile
	@@ -10,7 +10,7 @@
	CONFLICTS= bareos18-traymonitor bareos19-traymonitor bareos20-traymonitor

	USES= desktop-file-utils gettext-runtime pkgconfig qt:5
	-USE_QT= buildtools_build qmake_build uitools_build gui core widgets
	+USE_QT= buildtools:build qmake:build uitools:build gui core widgets
	WITH_BAT= yes

	PLIST= ${.CURDIR}/pkg-plist
	Index: sysutils/bareos18-traymonitor/Makefile
	===================================================================
	--- sysutils/bareos18-traymonitor/Makefile
	+++ sysutils/bareos18-traymonitor/Makefile
	@@ -10,7 +10,7 @@
	CONFLICTS= bacula*-bat bareos-traymonitor

	USES= pkgconfig gettext-runtime desktop-file-utils qt:5
	-USE_QT= buildtools_build qmake_build uitools_build gui core widgets
	+USE_QT= buildtools:build qmake:build uitools:build gui core widgets
	WITH_BAT= yes

	PLIST= ${.CURDIR}/pkg-plist
	Index: sysutils/bareos19-traymonitor/Makefile
	===================================================================
	--- sysutils/bareos19-traymonitor/Makefile
	+++ sysutils/bareos19-traymonitor/Makefile
	@@ -10,7 +10,7 @@
	CONFLICTS= bareos18-traymonitor bareos17-traymonitor bareos-traymonitor

	USES= desktop-file-utils gettext-runtime pkgconfig qt:5
	-USE_QT= buildtools_build qmake_build uitools_build gui core widgets
	+USE_QT= buildtools:build qmake:build uitools:build gui core widgets
	WITH_BAT= yes

	PLIST= ${.CURDIR}/pkg-plist
	Index: sysutils/bareos20-traymonitor/Makefile
	===================================================================
	--- sysutils/bareos20-traymonitor/Makefile
	+++ sysutils/bareos20-traymonitor/Makefile
	@@ -10,7 +10,7 @@
	CONFLICTS= bareos-traymonitor bareos18-traymonitor bareos19-traymonitor

	USES= desktop-file-utils gettext-runtime pkgconfig qt:5
	-USE_QT= buildtools_build qmake_build uitools_build gui core widgets
	+USE_QT= buildtools:build qmake:build uitools:build gui core widgets
	WITH_BAT= yes

	PLIST= ${.CURDIR}/pkg-plist
	Index: sysutils/barrier/Makefile
	===================================================================
	--- sysutils/barrier/Makefile
	+++ sysutils/barrier/Makefile
	@@ -34,7 +34,7 @@
	GUI_LIB_DEPENDS= libcurl.so:ftp/curl \
	libdns_sd.so:net/avahi-libdns
	GUI_USES= qt:5
	-GUI_USE= QT=core,gui,network,widgets,buildtools_build,qmake_build
	+GUI_USE= QT=core,gui,network,widgets,buildtools:build,qmake:build
	GUI_CMAKE_BOOL= BARRIER_BUILD_GUI

	post-extract:
	Index: sysutils/bsdisks/Makefile
	===================================================================
	--- sysutils/bsdisks/Makefile
	+++ sysutils/bsdisks/Makefile
	@@ -10,7 +10,7 @@

	USES= cmake compiler:c++11-lang qt:5

	-USE_QT= qmake_build buildtools_build core dbus
	+USE_QT= qmake:build buildtools:build core dbus

	USE_GITLAB= yes
	GL_SITE= https://foss.heptapod.net
	Index: sysutils/calamares/Makefile
	===================================================================
	--- sysutils/calamares/Makefile
	+++ sysutils/calamares/Makefile
	@@ -14,10 +14,10 @@

	USES= cmake compiler:c++17-lang cpe gettext kde:5 python qt:5
	USE_KDE= coreaddons dbusaddons \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network quickcontrols2 \
	svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	CMAKE_OFF= INSTALL_POLKIT

	Index: sysutils/daggy/Makefile
	===================================================================
	--- sysutils/daggy/Makefile
	+++ sysutils/daggy/Makefile
	@@ -16,7 +16,7 @@
	libyaml-cpp.so:devel/yaml-cpp

	USES= gl cmake compiler:c++17-lang localbase:ldflags pkgconfig qt:6 ssl
	-USE_QT= base tools_build
	+USE_QT= base tools:build
	USE_GL= gl
	USE_LDCONFIG= yes

	Index: sysutils/dsbbatmon/Makefile
	===================================================================
	--- sysutils/dsbbatmon/Makefile
	+++ sysutils/dsbbatmon/Makefile
	@@ -14,6 +14,6 @@
	USES= compiler:c++11-lang gl qmake qt:5 tar:tgz

	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets

	.include <bsd.port.mk>
	Index: sysutils/dsblogoutmgr/Makefile
	===================================================================
	--- sysutils/dsblogoutmgr/Makefile
	+++ sysutils/dsblogoutmgr/Makefile
	@@ -14,7 +14,7 @@
	USES= compiler:c++11-lang gl qmake qt:5 tar:tgz

	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets

	OPTIONS_DEFINE= METALOCK

	Index: sysutils/dsbmc/Makefile
	===================================================================
	--- sysutils/dsbmc/Makefile
	+++ sysutils/dsbmc/Makefile
	@@ -15,7 +15,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5 tar:tgz

	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets

	USE_GITHUB= yes
	GH_ACCOUNT= mrclksr
	Index: sysutils/dsbsu/Makefile
	===================================================================
	--- sysutils/dsbsu/Makefile
	+++ sysutils/dsbsu/Makefile
	@@ -12,7 +12,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 tar:tgz xorg
	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets

	USE_GITHUB= yes
	GH_ACCOUNT= mrclksr
	Index: sysutils/filelight/Makefile
	===================================================================
	--- sysutils/filelight/Makefile
	+++ sysutils/filelight/Makefile
	@@ -14,10 +14,10 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n jobwidgets kdeclarative kio package parts service \
	solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative gui network quickcontrols2 \
	script svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: sysutils/glogg/Makefile
	===================================================================
	--- sysutils/glogg/Makefile
	+++ sysutils/glogg/Makefile
	@@ -14,7 +14,7 @@
	LIB_DEPENDS= libboost_program_options.so:devel/boost-libs

	USES= compiler:c++11-lang desktop-file-utils qmake qt:5
	-USE_QT= core gui widgets dbus buildtools_build
	+USE_QT= core gui widgets dbus buildtools:build
	LDFLAGS+= -Wl,--as-needed # prevents stray USE_GL=gl, see bug#224488

	PLIST_FILES= bin/glogg \
	Index: sysutils/k3b/Makefile
	===================================================================
	--- sysutils/k3b/Makefile
	+++ sysutils/k3b/Makefile
	@@ -27,9 +27,9 @@
	configwidgets coreaddons filemetadata i18n iconthemes \
	itemviews jobwidgets kcmutils kio newstuff notifications \
	notifyconfig service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	# The ffmpeg-plugin needs patching
	Index: sysutils/k4dirstat/Makefile
	===================================================================
	--- sysutils/k4dirstat/Makefile
	+++ sysutils/k4dirstat/Makefile
	@@ -19,7 +19,7 @@
	CPE_PRODUCT= kdirstat
	USE_KDE= auth codecs completion config configwidgets coreaddons doctools \
	i18n iconthemes jobwidgets kio service widgetsaddons xmlgui
	-USE_QT= buildtools_build core gui dbus network qmake_build widgets xml
	+USE_QT= buildtools:build core gui dbus network qmake:build widgets xml

	post-patch:
	@${REINPLACE_CMD} -e \
	Index: sysutils/kbackup/Makefile
	===================================================================
	--- sysutils/kbackup/Makefile
	+++ sysutils/kbackup/Makefile
	@@ -11,9 +11,9 @@
	USE_KDE= archive auth bookmarks codecs completion config configwidgets \
	coreaddons guiaddons i18n iconthemes itemviews jobwidgets kio \
	notifications service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: sysutils/kcron/Makefile
	===================================================================
	--- sysutils/kcron/Makefile
	+++ sysutils/kcron/Makefile
	@@ -13,9 +13,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	doctools i18n iconthemes jobwidgets kio service solid widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: sysutils/kdebugsettings/Makefile
	===================================================================
	--- sysutils/kdebugsettings/Makefile
	+++ sysutils/kdebugsettings/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= completion config configwidgets coreaddons dbusaddons \
	guiaddons i18n iconthemes itemviews kio widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui testlib widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: sysutils/kdf/Makefile
	===================================================================
	--- sysutils/kdf/Makefile
	+++ sysutils/kdf/Makefile
	@@ -11,7 +11,7 @@
	i18n iconthemes jobwidgets kcmutils kio notifications service solid \
	widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: sysutils/kdialog/Makefile
	===================================================================
	--- sysutils/kdialog/Makefile
	+++ sysutils/kdialog/Makefile
	@@ -13,9 +13,9 @@
	itemviews jobwidgets kdelibs4support kio notifications parts \
	service solid sonnet textwidgets unitconversion widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/kf5-baloo/Makefile
	===================================================================
	--- sysutils/kf5-baloo/Makefile
	+++ sysutils/kf5-baloo/Makefile
	@@ -13,6 +13,6 @@
	filemetadata i18n idletime kio service \
	solid
	USE_QT= concurrent core dbus declarative gui network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: sysutils/kf5-kwallet/Makefile
	===================================================================
	--- sysutils/kf5-kwallet/Makefile
	+++ sysutils/kf5-kwallet/Makefile
	@@ -20,9 +20,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
	i18n iconthemes notifications service \
	widgetsaddons windowsystem \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= PINENTRY
	Index: sysutils/kfloppy/Makefile
	===================================================================
	--- sysutils/kfloppy/Makefile
	+++ sysutils/kfloppy/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons crash \
	doctools emoticons i18n init itemmodels kdelibs4support \
	kio widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: sysutils/khelpcenter/Makefile
	===================================================================
	--- sysutils/khelpcenter/Makefile
	+++ sysutils/khelpcenter/Makefile
	@@ -16,13 +16,13 @@
	itemmodels itemviews jobwidgets js kcmutils \
	kio khtml parts service solid sonnet textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	# This port depends on doctools; we need the entities and such for runtime
	# documentation support, where all the other KDE Plasma parts need it
	# only for the build-time documentation-generation.
	USE_KDE+= doctools
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	SHEBANG_FILES= searchhandlers/khc_mansearch.pl

	Index: sysutils/kio-fuse/Makefile
	===================================================================
	--- sysutils/kio-fuse/Makefile
	+++ sysutils/kio-fuse/Makefile
	@@ -13,7 +13,7 @@
	USES= cmake compiler:c++11-lang fuse:3 kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= config coreaddons kio service
	USE_QT= concurrent core dbus network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	PLIST_FILES= lib/libexec/kio-fuse \
	share/dbus-1/services/org.kde.KIOFuse.service
	Index: sysutils/kpmcore/Makefile
	===================================================================
	--- sysutils/kpmcore/Makefile
	+++ sysutils/kpmcore/Makefile
	@@ -10,9 +10,9 @@

	USES= cmake compiler:c++17-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth coreaddons i18n widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative \
	gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: sysutils/krename/Makefile
	===================================================================
	--- sysutils/krename/Makefile
	+++ sysutils/krename/Makefile
	@@ -20,7 +20,7 @@
	coreaddons crash i18n iconthemes itemviews jobwidgets \
	kio service solid widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui network xml widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/kshutdown/Makefile
	===================================================================
	--- sysutils/kshutdown/Makefile
	+++ sysutils/kshutdown/Makefile
	@@ -16,7 +16,7 @@
	dbusaddons ecm globalaccel i18n idletime \
	notifications notifyconfig widgetsaddons xmlgui
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}

	Index: sysutils/ksystemlog/Makefile
	===================================================================
	--- sysutils/ksystemlog/Makefile
	+++ sysutils/ksystemlog/Makefile
	@@ -11,9 +11,9 @@
	USE_KDE= archive auth codecs completion config configwidgets coreaddons \
	doctools i18n iconthemes itemviews jobwidgets kio \
	service solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport testlib widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: sysutils/libsysstat/Makefile
	===================================================================
	--- sysutils/libsysstat/Makefile
	+++ sysutils/libsysstat/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= cmake compiler:c++11-lang lxqt pkgconfig tar:xz qt:5
	-USE_QT= qmake_build buildtools_build core
	+USE_QT= qmake:build buildtools:build core
	USE_LXQT= buildtools
	USE_LDCONFIG= yes

	Index: sysutils/luckybackup/Makefile
	===================================================================
	--- sysutils/luckybackup/Makefile
	+++ sysutils/luckybackup/Makefile
	@@ -17,7 +17,7 @@
	USES= compiler:c++11-lang gl qmake qt:5

	USE_GL= gl
	-USE_QT= core gui network widgets buildtools_build
	+USE_QT= core gui network widgets buildtools:build

	post-patch:
	${REINPLACE_CMD} -e 's\|/usr\|$$$${PREFIX}\|g' -e '/INSTALLS/s\|debianmenu \|\|' \
	Index: sysutils/lxqt-admin/Makefile
	===================================================================
	--- sysutils/lxqt-admin/Makefile
	+++ sysutils/lxqt-admin/Makefile
	@@ -11,7 +11,7 @@

	USES= cmake compiler:c++11-lang gnome kde:5 localbase \
	lxqt pkgconfig tar:xz qt:5 xorg
	-USE_QT= buildtools_build qmake_build core dbus gui svg \
	+USE_QT= buildtools:build qmake:build core dbus gui svg \
	widgets x11extras xml
	USE_KDE= windowsystem
	USE_GNOME= glib20
	Index: sysutils/lxqt-config/Makefile
	===================================================================
	--- sysutils/lxqt-config/Makefile
	+++ sysutils/lxqt-config/Makefile
	@@ -16,7 +16,7 @@

	USES= cmake compiler:c++14-lang kde:5 localbase:ldflags lxqt qt:5 \
	pkgconfig tar:xz xorg gnome
	-USE_QT= buildtools_build qmake_build concurrent core dbus \
	+USE_QT= buildtools:build qmake:build concurrent core dbus \
	gui linguisttools svg widgets x11extras xml
	USE_KDE= libkscreen windowsystem
	USE_GNOME= glib20
	Index: sysutils/lxqt-policykit/Makefile
	===================================================================
	--- sysutils/lxqt-policykit/Makefile
	+++ sysutils/lxqt-policykit/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 gnome \
	localbase:ldflags lxqt pkgconfig tar:xz xorg
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools lxqt
	Index: sysutils/lxqt-powermanagement/Makefile
	===================================================================
	--- sysutils/lxqt-powermanagement/Makefile
	+++ sysutils/lxqt-powermanagement/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 \
	localbase:ldflags lxqt pkgconfig tar:xz gnome xorg
	-USE_QT= buildtools_build qmake_build core svg widgets x11extras \
	+USE_QT= buildtools:build qmake:build core svg widgets x11extras \
	dbus gui xml
	USE_GNOME= glib20
	USE_KDE= idletime solid windowsystem
	Index: sysutils/lxqt-qtplugin/Makefile
	===================================================================
	--- sysutils/lxqt-qtplugin/Makefile
	+++ sysutils/lxqt-qtplugin/Makefile
	@@ -18,7 +18,7 @@

	USE_XORG=xcb
	USE_GNOME=glib20
	-USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
	+USE_QT= buildtools:build qmake:build core dbus gui svg widgets \
	x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools qtxdg libfmqt
	Index: sysutils/plasma-pass/Makefile
	===================================================================
	--- sysutils/plasma-pass/Makefile
	+++ sysutils/plasma-pass/Makefile
	@@ -16,8 +16,8 @@

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons i18n itemmodels package plasma-framework service \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: sysutils/plasma5-discover/Makefile
	===================================================================
	--- sysutils/plasma5-discover/Makefile
	+++ sysutils/plasma5-discover/Makefile
	@@ -18,10 +18,10 @@
	kirigami2 newstuff notifications package plasma-framework \
	service solid textwidgets wallet widgetsaddons windowsystem \
	xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network svg widgets \
	x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	CPE_VENDOR= kde
	Index: sysutils/plasma5-drkonqi/Makefile
	===================================================================
	--- sysutils/plasma5-drkonqi/Makefile
	+++ sysutils/plasma5-drkonqi/Makefile
	@@ -12,9 +12,9 @@
	i18n idletime jobwidgets kio notifications service \
	syntaxhighlighting wallet widgetsaddons windowsystem \
	xmlrpcclient \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/plasma5-kde-cli-tools/Makefile
	===================================================================
	--- sysutils/plasma5-kde-cli-tools/Makefile
	+++ sysutils/plasma5-kde-cli-tools/Makefile
	@@ -15,10 +15,10 @@
	kdeclarative kdesu kio notifications parts plasma-workspace \
	pty service solid sonnet textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative gui network printsupport svg \
	widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11
	CPE_VENDOR= kde

	Index: sysutils/plasma5-kinfocenter/Makefile
	===================================================================
	--- sysutils/plasma5-kinfocenter/Makefile
	+++ sysutils/plasma5-kinfocenter/Makefile
	@@ -20,11 +20,11 @@
	kdeclarative kio notifications package parts service solid \
	sonnet textwidgets unitconversion wayland widgetsaddons \
	windowsystem xmlgui \
	- doctools_build ecm_build \
	- systemsettings_run
	+ doctools:build ecm:build \
	+ systemsettings:run
	USE_QT= concurrent core dbus declarative gui network printsupport \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	# TODO -- this should be handled correctly...
	Index: sysutils/plasma5-kmenuedit/Makefile
	===================================================================
	--- sysutils/plasma5-kmenuedit/Makefile
	+++ sysutils/plasma5-kmenuedit/Makefile
	@@ -13,9 +13,9 @@
	hotkeys i18n iconthemes init itemmodels itemviews jobwidgets \
	kio notifications parts service solid sonnet textwidgets \
	unitconversion widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/plasma5-ksysguard/Makefile
	===================================================================
	--- sysutils/plasma5-ksysguard/Makefile
	+++ sysutils/plasma5-ksysguard/Makefile
	@@ -16,9 +16,9 @@
	dbusaddons emoticons i18n iconthemes init itemmodels itemviews \
	jobwidgets kio libksysguard newstuff notifications service \
	solid widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= INOTIFY
	Index: sysutils/plasma5-ksystemstats/Makefile
	===================================================================
	--- sysutils/plasma5-ksystemstats/Makefile
	+++ sysutils/plasma5-ksystemstats/Makefile
	@@ -12,6 +12,6 @@
	USE_KDE= config coreaddons dbusaddons i18n kio libksysguard service \
	solid
	USE_QT= concurrent core dbus gui network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: sysutils/plasma5-libksysguard/Makefile
	===================================================================
	--- sysutils/plasma5-libksysguard/Makefile
	+++ sysutils/plasma5-libksysguard/Makefile
	@@ -14,7 +14,7 @@
	widgetsaddons windowsystem
	USE_QT= concurrent core dbus declarative gui network script webkit \
	widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= WEBENGINE
	Index: sysutils/plasma5-plasma-disks/Makefile
	===================================================================
	--- sysutils/plasma5-plasma-disks/Makefile
	+++ sysutils/plasma5-plasma-disks/Makefile
	@@ -31,7 +31,7 @@
	plasma-framework service solid widgetsaddons windowsystem
	USE_QT= concurrent core dbus declarative gui network quickcontrols \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	post-patch:
	Index: sysutils/plasma5-plasma-systemmonitor/Makefile
	===================================================================
	--- sysutils/plasma5-plasma-systemmonitor/Makefile
	+++ sysutils/plasma5-plasma-systemmonitor/Makefile
	@@ -15,7 +15,7 @@
	windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui network quickcontrols2 \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/plasma5-polkit-kde-agent-1/Makefile
	===================================================================
	--- sysutils/plasma5-polkit-kde-agent-1/Makefile
	+++ sysutils/plasma5-polkit-kde-agent-1/Makefile
	@@ -13,7 +13,7 @@
	USE_KDE= config coreaddons crash dbusaddons ecm i18n iconthemes \
	notifications widgetsaddons windowsystem
	USE_QT= core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/plasma5-powerdevil/Makefile
	===================================================================
	--- sysutils/plasma5-powerdevil/Makefile
	+++ sysutils/plasma5-powerdevil/Makefile
	@@ -18,10 +18,10 @@
	itemviews jobwidgets kio kirigami2 libkscreen notifications notifyconfig \
	parts plasma-workspace service solid sonnet textwidgets \
	unitconversion wayland widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets \
	x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb

	.include <bsd.port.mk>
	Index: sysutils/plasma5-systemsettings/Makefile
	===================================================================
	--- sysutils/plasma5-systemsettings/Makefile
	+++ sysutils/plasma5-systemsettings/Makefile
	@@ -14,9 +14,9 @@
	kdeclarative khtml kio kirigami2 notifications package parts \
	plasma-framework plasma-workspace runner service solid sonnet \
	textwidgets widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: sysutils/polkit-qt/Makefile
	===================================================================
	--- sysutils/polkit-qt/Makefile
	+++ sysutils/polkit-qt/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++11-lang gnome pkgconfig qt:5 tar:xz
	USE_GNOME= glib20
	-USE_QT= core dbus gui widgets buildtools_build qmake_build
	+USE_QT= core dbus gui widgets buildtools:build qmake:build
	CMAKE_OFF= BUILD_EXAMPLES \
	BUILD_TEST

	Index: sysutils/qdirstat/Makefile
	===================================================================
	--- sysutils/qdirstat/Makefile
	+++ sysutils/qdirstat/Makefile
	@@ -11,7 +11,7 @@

	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5 shebangfix
	USE_GL= gl
	-USE_QT= buildtools_build core gui widgets
	+USE_QT= buildtools:build core gui widgets

	OPTIONS_DEFINE= DOCS

	Index: sysutils/qsudo/Makefile
	===================================================================
	--- sysutils/qsudo/Makefile
	+++ sysutils/qsudo/Makefile
	@@ -16,7 +16,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= trueos
	GH_TAGNAME= 815e31c
	-USE_QT= core gui widgets buildtools_build
	+USE_QT= core gui widgets buildtools:build

	WRKSRC_SUBDIR= src-qt5
	LDFLAGS+= -Wl,--as-needed # prevents unnecessary USE_GL=gl, see bug#224488
	Index: sysutils/qtpass/Makefile
	===================================================================
	--- sysutils/qtpass/Makefile
	+++ sysutils/qtpass/Makefile
	@@ -18,7 +18,7 @@
	GH_ACCOUNT= IJhack
	GH_PROJECT= QtPass
	USE_GL= gl
	-USE_QT= core gui network testlib widgets buildtools_build linguisttools_build
	+USE_QT= core gui network testlib widgets buildtools:build linguisttools:build
	CPE_VENDOR= ijhack

	# Create a desktop entry for the port.
	Index: sysutils/signon-kwallet-extension/Makefile
	===================================================================
	--- sysutils/signon-kwallet-extension/Makefile
	+++ sysutils/signon-kwallet-extension/Makefile
	@@ -10,9 +10,9 @@

	USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= wallet \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= ${KDE_PREFIX}/${SE_DIR}
	PLIST_FILES= ${SE_DIR}/libkeyring-kwallet.so
	SE_DIR= lib/signon/extensions
	Index: sysutils/signon-plugin-oauth2/Makefile
	===================================================================
	--- sysutils/signon-plugin-oauth2/Makefile
	+++ sysutils/signon-plugin-oauth2/Makefile
	@@ -12,7 +12,7 @@

	USES= compiler:c++11-lang pkgconfig python qmake qt:5
	USE_QT= core network testlib \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= ${PREFIX}/lib/signon

	QMAKE_ENV= PREFIX=${PREFIX}
	Index: sysutils/signon-qt5/Makefile
	===================================================================
	--- sysutils/signon-qt5/Makefile
	+++ sysutils/signon-qt5/Makefile
	@@ -16,7 +16,7 @@
	qt:5 tar:bz2
	USE_GL= gl
	USE_QT= core dbus gui network sql testlib xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	# gitlab variables
	USE_GITLAB= yes
	Index: sysutils/signon-ui/Makefile
	===================================================================
	--- sysutils/signon-ui/Makefile
	+++ sysutils/signon-ui/Makefile
	@@ -21,7 +21,7 @@
	USE_GL= gl
	USE_GNOME= gdkpixbuf2 glib20
	USE_QT= core dbus declarative gui network webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	# gitlab variables
	USE_GITLAB= yes
	GL_ACCOUNT= accounts-sso
	Index: sysutils/sweeper/Makefile
	===================================================================
	--- sysutils/sweeper/Makefile
	+++ sysutils/sweeper/Makefile
	@@ -11,7 +11,7 @@
	coreaddons crash i18n kio service sonnet textwidgets \
	widgetsaddons xmlgui
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: sysutils/synergy/Makefile
	===================================================================
	--- sysutils/synergy/Makefile
	+++ sysutils/synergy/Makefile
	@@ -17,7 +17,7 @@

	USES= cmake compiler:c++14-lang cpe gnome localbase:ldflags qt:5 ssl xorg
	CPE_VENDOR= synergy-foss
	-USE_QT= core dbus network widgets buildtools_build linguisttools_build qmake_build
	+USE_QT= core dbus network widgets buildtools:build linguisttools:build qmake:build
	USE_GNOME= gdkpixbuf2 glib20
	USE_XORG= ice xtst x11 sm xext xinerama xrandr xi

	Index: sysutils/tarsnap-gui/Makefile
	===================================================================
	--- sysutils/tarsnap-gui/Makefile
	+++ sysutils/tarsnap-gui/Makefile
	@@ -12,7 +12,7 @@
	GH_ACCOUNT= Tarsnap

	USES= compiler:c++11-lib gl qmake qt:5
	-USE_QT= buildtools_build core gui network qmake_build sql sql-sqlite3 widgets
	+USE_QT= buildtools:build core gui network qmake:build sql sql-sqlite3 widgets
	USE_GL= gl

	PLIST_FILES= bin/tarsnap-gui
	Index: sysutils/twmn/Makefile
	===================================================================
	--- sysutils/twmn/Makefile
	+++ sysutils/twmn/Makefile
	@@ -16,7 +16,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= sboli
	GH_TAGNAME= 861a323
	-USE_QT= core dbus gui network widgets x11extras buildtools_build
	+USE_QT= core dbus gui network widgets x11extras buildtools:build
	LDFLAGS+= -Wl,--as-needed # see bug#224488

	# Fix build with Qt 5.13
	Index: sysutils/unetbootin/Makefile
	===================================================================
	--- sysutils/unetbootin/Makefile
	+++ sysutils/unetbootin/Makefile
	@@ -16,7 +16,7 @@
	mke2fs:sysutils/e2fsprogs

	USES= qt:5
	-USE_QT= buildtools_build linguisttools_build qmake_build \
	+USE_QT= buildtools:build linguisttools:build qmake:build \
	core gui network widgets
	QMAKE_ARGS= DEFINES+=LOCALBASE=\\\\\\\"${LOCALBASE}\\\\\\\"

	Index: textproc/dikt/Makefile
	===================================================================
	--- textproc/dikt/Makefile
	+++ textproc/dikt/Makefile
	@@ -16,7 +16,7 @@
	coreaddons dbusaddons guiaddons i18n iconthemes itemviews \
	jobwidgets kio service solid widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus gui network printsupport svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	PLIST_FILES= bin/dikt \
	share/applications/dikt.desktop \
	Index: textproc/fcitx-qt5/Makefile
	===================================================================
	--- textproc/fcitx-qt5/Makefile
	+++ textproc/fcitx-qt5/Makefile
	@@ -16,7 +16,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= fcitx
	USE_KDE= ecm
	-USE_QT= concurrent core dbus gui widgets buildtools_build qmake_build
	+USE_QT= concurrent core dbus gui widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: textproc/fcitx5-configtool/Makefile
	===================================================================
	--- textproc/fcitx5-configtool/Makefile
	+++ textproc/fcitx5-configtool/Makefile
	@@ -27,7 +27,7 @@

	USE_KDE= ecm coreaddons kdeclarative i18n itemviews kirigami2 package widgetsaddons
	USE_QT= concurrent core dbus declarative gui quickcontrols2 widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xkbfile
	USE_LDCONFIG= yes

	Index: textproc/fcitx5-qt/Makefile
	===================================================================
	--- textproc/fcitx5-qt/Makefile
	+++ textproc/fcitx5-qt/Makefile
	@@ -24,7 +24,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= fcitx
	USE_KDE= ecm
	-USE_QT= concurrent core dbus widgets buildtools_build qmake_build
	+USE_QT= concurrent core dbus widgets buildtools:build qmake:build
	USE_XORG= x11 xcb
	USE_LDCONFIG= yes

	Index: textproc/goldendict/Makefile
	===================================================================
	--- textproc/goldendict/Makefile
	+++ textproc/goldendict/Makefile
	@@ -21,7 +21,7 @@
	USE_GITHUB= yes
	GH_TAGNAME= 99982a1
	USE_XORG= x11 xtst
	-USE_QT= buildtools_build linguisttools_build core gui help \
	+USE_QT= buildtools:build linguisttools:build core gui help \
	network printsupport sql svg webkit widgets \
	x11extras xml
	QMAKE_ARGS= ${PORTNAME}.pro CONFIG+="zim_support"
	Index: textproc/highlight/Makefile
	===================================================================
	--- textproc/highlight/Makefile
	+++ textproc/highlight/Makefile
	@@ -29,7 +29,7 @@
	OPTIONS_SUB= yes

	GUI_USES= qt:5
	-GUI_USE= QT=buildtools_build,qmake_build,core,gui,widgets
	+GUI_USE= QT=buildtools:build,qmake:build,core,gui,widgets
	GUI_MAKE_ENV= QMAKE="${QMAKE}"
	GUI_ALL_TARGET= gui
	GUI_INSTALL_TARGET= install-gui
	Index: textproc/kdiff3/Makefile
	===================================================================
	--- textproc/kdiff3/Makefile
	+++ textproc/kdiff3/Makefile
	@@ -18,9 +18,9 @@
	coreaddons crash i18n iconthemes jobwidgets kio \
	parts service solid sonnet textwidgets widgetsaddons windowsystem \
	xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: textproc/kf5-kcodecs/Makefile
	===================================================================
	--- textproc/kf5-kcodecs/Makefile
	+++ textproc/kf5-kcodecs/Makefile
	@@ -8,8 +8,8 @@
	LICENSE= LGPL21

	USES= cmake compiler:c++11-lib gperf kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core linguisttools \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: textproc/kf5-sonnet/Makefile
	===================================================================
	--- textproc/kf5-sonnet/Makefile
	+++ textproc/kf5-sonnet/Makefile
	@@ -10,9 +10,9 @@
	libhunspell-1.7.so:textproc/hunspell

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core declarative gui linguisttools network uiplugin widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	# Disable examples -- they are not installed anyways.
	CMAKE_OFF= ENABLE_EXAMPLES
	Index: textproc/kf5-syntax-highlighting/Makefile
	===================================================================
	--- textproc/kf5-syntax-highlighting/Makefile
	+++ textproc/kf5-syntax-highlighting/Makefile
	@@ -6,9 +6,9 @@
	COMMENT= KF5 syntax highlighting engine for structured text and code

	USES= cmake compiler:c++11-lib kde:5 perl5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core gui network \
	- buildtools_build linguisttools_build testlib_build qmake_build
	+ buildtools:build linguisttools:build testlib:build qmake:build

	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=TRUE

	Index: textproc/kompare/Makefile
	===================================================================
	--- textproc/kompare/Makefile
	+++ textproc/kompare/Makefile
	@@ -13,9 +13,9 @@
	doctools i18n iconthemes jobwidgets kio parts service \
	solid sonnet syntaxhighlighting texteditor textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: textproc/kreport/Makefile
	===================================================================
	--- textproc/kreport/Makefile
	+++ textproc/kreport/Makefile
	@@ -16,7 +16,7 @@
	USE_KDE= config coreaddons ecm marble widgetsaddons
	USE_QT= core declarative gui location network webchannel \
	webengine webkit widgets xml \
	- buildtools_build printsupport qmake_build
	+ buildtools:build printsupport qmake:build

	CONFLICTS_INSTALL= calligra-2*

	Index: textproc/libkomparediff2/Makefile
	===================================================================
	--- textproc/libkomparediff2/Makefile
	+++ textproc/libkomparediff2/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons i18n kio parts \
	service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= yes

	OPTIONS_DEFINE= DOCS
	Index: textproc/markdownpart/Makefile
	===================================================================
	--- textproc/markdownpart/Makefile
	+++ textproc/markdownpart/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons i18n \
	jobwidgets kio parts service solid sonnet textwidgets widgetsaddons \
	windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: textproc/pageedit/Makefile
	===================================================================
	--- textproc/pageedit/Makefile
	+++ textproc/pageedit/Makefile
	@@ -17,6 +17,6 @@

	USE_QT= concurrent core declarative gui location network \
	printsupport webchannel webengine widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build

	.include <bsd.port.mk>
	Index: textproc/qstardict/Makefile
	===================================================================
	--- textproc/qstardict/Makefile
	+++ textproc/qstardict/Makefile
	@@ -15,7 +15,7 @@
	USE_GL= gl
	USE_GNOME= glib20
	USE_QT= core dbus gui network printsupport widgets xml \
	- buildtools_build linguisttools_build qmake_build
	+ buildtools:build linguisttools:build qmake:build
	USE_XORG= x11

	USE_GITHUB= yes
	Index: textproc/qt5-xml/Makefile
	===================================================================
	--- textproc/qt5-xml/Makefile
	+++ textproc/qt5-xml/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
	USE_PERL5= extract
	-USE_QT= core qmake_build buildtools_build
	+USE_QT= core qmake:build buildtools:build
	HAS_CONFIGURE= yes
	CONFIGURE_ARGS= -no-gui -no-xcb

	Index: textproc/qt5-xmlpatterns/Makefile
	===================================================================
	--- textproc/qt5-xmlpatterns/Makefile
	+++ textproc/qt5-xmlpatterns/Makefile
	@@ -7,7 +7,7 @@
	COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema

	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns
	-USE_QT= core declarative network buildtools_build
	+USE_QT= core declarative network buildtools:build

	QT_BINARIES= yes

	Index: textproc/retext/Makefile
	===================================================================
	--- textproc/retext/Makefile
	+++ textproc/retext/Makefile
	@@ -22,8 +22,8 @@
	GH_ACCOUNT= retext-project
	GH_PROJECT= retext
	USE_PYTHON= distutils autoplist noflavors
	-USE_QT= linguisttools_build
	-USE_PYQT= pyqt5_run sip_run
	+USE_QT= linguisttools:build
	+USE_PYQT= pyqt5:run sip:run

	BINARY_ALIAS= lrelease=${LRELEASE}

	Index: textproc/sigil/Makefile
	===================================================================
	--- textproc/sigil/Makefile
	+++ textproc/sigil/Makefile
	@@ -26,8 +26,8 @@

	USE_QT= concurrent core declarative gui location network printsupport \
	svg webchannel webengine widgets xml xmlpatterns \
	- buildtools_build linguisttools_build qmake_build \
	- imageformats_run
	+ buildtools:build linguisttools:build qmake:build \
	+ imageformats:run

	SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \
	src/Resource_Files/python3lib/*.py
	Index: textproc/uim-qt5/Makefile
	===================================================================
	--- textproc/uim-qt5/Makefile
	+++ textproc/uim-qt5/Makefile
	@@ -8,7 +8,7 @@
	USES= compiler:c++11-lang gl iconv kde:5 libtool qt:5
	USE_GL= gl
	USE_KDE= plasma-framework
	-USE_QT= buildtools_build core declarative gui network qmake_build widgets x11extras
	+USE_QT= buildtools:build core declarative gui network qmake:build widgets x11extras

	MASTERDIR= ${.CURDIR}/../../textproc/uim
	PKGDIR= ${.CURDIR}
	Index: www/choqok/Makefile
	===================================================================
	--- www/choqok/Makefile
	+++ www/choqok/Makefile
	@@ -23,9 +23,9 @@
	itemviews jobwidgets kcmutils kdewebkit kio notifications \
	notifyconfig parts purpose service solid sonnet textwidgets \
	wallet widgetsaddons windowsystem xmlgui \
	- kded_run
	+ kded:run
	USE_QT= concurrent core dbus gui network networkauth webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11
	USE_LDCONFIG= yes

	Index: www/cutelyst/Makefile
	===================================================================
	--- www/cutelyst/Makefile
	+++ www/cutelyst/Makefile
	@@ -13,7 +13,7 @@
	USES= cmake compiler:c++11-lang localbase qt:5
	USE_GITHUB= yes
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build linguisttools_build \
	+USE_QT= qmake:build buildtools:build linguisttools:build \
	core network sql

	# There are more views available and various plugins,
	Index: www/dooble/Makefile
	===================================================================
	--- www/dooble/Makefile
	+++ www/dooble/Makefile
	@@ -16,7 +16,7 @@
	GH_ACCOUNT= textbrowser

	USE_QT= concurrent core gui network printsupport sql webengine widgets \
	- xml buildtools_build qmake_build
	+ xml buildtools:build qmake:build
	USE_XORG= xcb

	QMAKE_SOURCE_PATH= ${PORTNAME}.pro
	Index: www/falkon/Makefile
	===================================================================
	--- www/falkon/Makefile
	+++ www/falkon/Makefile
	@@ -11,10 +11,10 @@

	USES= cmake desktop-file-utils kde:5 qt:5 ssl tar:xz xorg
	USE_KDE= archive i18n \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui location network printsupport \
	- sql webchannel webengine widgets x11extras sql-sqlite3_run \
	- buildtools_build qmake_build
	+ sql webchannel webengine widgets x11extras sql-sqlite3:run \
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb

	USE_LDCONFIG= yes
	Index: www/kdsoap/Makefile
	===================================================================
	--- www/kdsoap/Makefile
	+++ www/kdsoap/Makefile
	@@ -19,7 +19,7 @@

	USES= cmake compiler:c++11-lang localbase qt:5
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build linguisttools_build \
	+USE_QT= qmake:build buildtools:build linguisttools:build \
	core network widgets xml

	# No USE_GITHUB, but pretty close
	Index: www/kf5-kdewebkit/Makefile
	===================================================================
	--- www/kf5-kdewebkit/Makefile
	+++ www/kf5-kdewebkit/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	i18n jobwidgets kio parts service sonnet solid \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: www/kf5-khtml/Makefile
	===================================================================
	--- www/kf5-khtml/Makefile
	+++ www/kf5-khtml/Makefile
	@@ -15,10 +15,10 @@
	configwidgets coreaddons globalaccel i18n iconthemes \
	jobwidgets js kio notifications parts service solid sonnet \
	textwidgets wallet widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network phonon4 \
	printsupport widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	.include <bsd.port.mk>
	Index: www/kf5-kjs/Makefile
	===================================================================
	--- www/kf5-kjs/Makefile
	+++ www/kf5-kjs/Makefile
	@@ -8,8 +8,8 @@
	LIB_DEPENDS= libpcre.so:devel/pcre

	USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
	-USE_KDE= doctools_build ecm_build
	+USE_KDE= doctools:build ecm:build
	USE_QT= core \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: www/kf5-kjsembed/Makefile
	===================================================================
	--- www/kf5-kjsembed/Makefile
	+++ www/kf5-kjsembed/Makefile
	@@ -9,8 +9,8 @@
	USES= cmake compiler:c++11-lib gettext gl kde:5 qt:5 tar:xz
	USE_GL= gl
	USE_KDE= archive i18n js \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core gui svg uiplugin uitools widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: www/kristall/Makefile
	===================================================================
	--- www/kristall/Makefile
	+++ www/kristall/Makefile
	@@ -15,8 +15,8 @@

	USES= compiler:c++17-lang desktop-file-utils gl iconv pkgconfig \
	qt:5 shared-mime-info ssl
	-USE_QT= core gui multimedia network svg widgets buildtools_build \
	- linguisttools_build qmake_build
	+USE_QT= core gui multimedia network svg widgets buildtools:build \
	+ linguisttools:build qmake:build
	USE_GL= gl

	USE_GITHUB= yes
	Index: www/onlyoffice-documentserver/Makefile
	===================================================================
	--- www/onlyoffice-documentserver/Makefile
	+++ www/onlyoffice-documentserver/Makefile
	@@ -42,7 +42,7 @@

	USES= autoreconf:build dos2unix fakeroot gmake gnome iconv localbase nodejs:16,build pkgconfig \
	python:3.7+,build qt:5 trigger
	-USE_QT= qmake_build
	+USE_QT= qmake:build
	USE_GITHUB= yes
	GH_ACCOUNT= ONLYOFFICE
	GH_PROJECT= DocumentServer
	Index: www/otter-browser/Makefile
	===================================================================
	--- www/otter-browser/Makefile
	+++ www/otter-browser/Makefile
	@@ -24,7 +24,7 @@
	USES= cmake compiler:c++11-lib desktop-file-utils qt:5
	USE_QT= concurrent core dbus declarative gui multimedia network printsupport \
	script sql sql-sqlite3 svg widgets xmlpatterns \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= OtterBrowser
	Index: www/plasma5-plasma-browser-integration/Makefile
	===================================================================
	--- www/plasma5-plasma-browser-integration/Makefile
	+++ www/plasma5-plasma-browser-integration/Makefile
	@@ -13,7 +13,7 @@
	plasma-framework plasma-workspace purpose runner service \
	widgetsaddons windowsystem
	USE_QT= concurrent core declarative dbus gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: www/py-qt5-webengine/Makefile
	===================================================================
	--- www/py-qt5-webengine/Makefile
	+++ www/py-qt5-webengine/Makefile
	@@ -16,10 +16,10 @@

	USES= gl python:3.8+ pyqt:5 qt:5
	USE_GL= gl
	-USE_PYQT= sip_build pyqt5
	+USE_PYQT= sip:build pyqt5
	USE_PYTHON= concurrent flavors py3kplist
	USE_QT= core declarative gui location network printsupport webchannel \
	- webengine widgets qmake_build
	+ webengine widgets qmake:build

	PLIST_SUB= PYQT_WEBENGINE_VERSION=${DISTVERSION}

	Index: www/qhttpengine/Makefile
	===================================================================
	--- www/qhttpengine/Makefile
	+++ www/qhttpengine/Makefile
	@@ -14,7 +14,7 @@
	USES= cmake compiler:c++11-lang qt:5
	USE_GITHUB= yes
	GH_ACCOUNT= nitroshare
	-USE_QT= core network buildtools_build qmake_build
	+USE_QT= core network buildtools:build qmake:build
	USE_LDCONFIG= yes

	.include <bsd.port.mk>
	Index: www/qt5-webchannel/Makefile
	===================================================================
	--- www/qt5-webchannel/Makefile
	+++ www/qt5-webchannel/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,webchannel
	USE_QT= core declarative \
	- buildtools_build declarative-test_build testlib_build
	+ buildtools:build declarative-test:build testlib:build

	# The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted
	# tarball, which we need during the build.
	Index: www/qt5-webengine/Makefile
	===================================================================
	--- www/qt5-webengine/Makefile
	+++ www/qt5-webengine/Makefile
	@@ -77,7 +77,7 @@
	USE_GNOME= glib20 libxml2 libxslt
	USE_QT= core declarative gui location network printsupport \
	webchannel widgets \
	- buildtools_build designer_build qmake_build
	+ buildtools:build designer:build qmake:build
	USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \
	xrandr xrender xscrnsaver xtst

	Index: www/qt5-webglplugin/Makefile
	===================================================================
	--- www/qt5-webglplugin/Makefile
	+++ www/qt5-webglplugin/Makefile
	@@ -13,6 +13,6 @@
	USE_GL= gl
	USE_GNOME= glib20
	USE_QT= core dbus declarative gui network webchannel websockets \
	- buildtools_build
	+ buildtools:build

	.include <bsd.port.mk>
	Index: www/qt5-webkit/Makefile
	===================================================================
	--- www/qt5-webkit/Makefile
	+++ www/qt5-webkit/Makefile
	@@ -27,7 +27,7 @@
	USE_PERL5= build
	USE_QT= core declarative gui location network opengl printsupport \
	sensors webchannel widgets \
	- buildtools_build declarative-test_build qmake_build testlib_build
	+ buildtools:build declarative-test:build qmake:build testlib:build
	USE_RUBY= yes
	USE_XORG= x11 xcomposite xrender

	Index: www/qt5-websockets-qml/Makefile
	===================================================================
	--- www/qt5-websockets-qml/Makefile
	+++ www/qt5-websockets-qml/Makefile
	@@ -7,6 +7,6 @@
	COMMENT= Qt implementation of WebSocket protocol (QML bindings)

	USES= compiler:c++11-lang qmake qt-dist:5,websockets
	-USE_QT= buildtools_build core declarative network websockets
	+USE_QT= buildtools:build core declarative network websockets

	.include <bsd.port.mk>
	Index: www/qt5-websockets/Makefile
	===================================================================
	--- www/qt5-websockets/Makefile
	+++ www/qt5-websockets/Makefile
	@@ -8,6 +8,6 @@

	USES= compiler:c++11-lang perl5 qmake:norecursive qt-dist:5,websockets
	USE_PERL5= extract
	-USE_QT= buildtools_build core network
	+USE_QT= buildtools:build core network

	.include <bsd.port.mk>
	Index: www/qt5-webview/Makefile
	===================================================================
	--- www/qt5-webview/Makefile
	+++ www/qt5-webview/Makefile
	@@ -9,7 +9,7 @@
	USES= compiler:c++11-lang gl qmake:norecursive qt-dist:5
	USE_GL= gl
	USE_QT= core declarative gui location network webchannel \
	- buildtools_build
	+ buildtools:build

	.include <bsd.port.pre.mk>

	Index: www/wt/Makefile
	===================================================================
	--- www/wt/Makefile
	+++ www/wt/Makefile
	@@ -115,7 +115,7 @@

	QT5_CMAKE_BOOL= ENABLE_QT5
	QT5_USES= qt:5
	-QT5_USE= qt=buildtools_build,core
	+QT5_USE= qt=buildtools:build,core

	RESOURCES_CMAKE_BOOL= INSTALL_RESOURCES

	Index: x11-clocks/kteatime/Makefile
	===================================================================
	--- x11-clocks/kteatime/Makefile
	+++ x11-clocks/kteatime/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash doctools \
	i18n iconthemes notifications notifyconfig sonnet textwidgets \
	widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= DOCS

	Index: x11-clocks/ktimer/Makefile
	===================================================================
	--- x11-clocks/ktimer/Makefile
	+++ x11-clocks/ktimer/Makefile
	@@ -10,9 +10,9 @@
	USE_KDE= auth codecs completion config configwidgets coreaddons \
	dbusaddons doctools i18n iconthemes jobwidgets kio \
	notifications service solid widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: x11-fm/arqiver/Makefile
	===================================================================
	--- x11-fm/arqiver/Makefile
	+++ x11-fm/arqiver/Makefile
	@@ -12,7 +12,7 @@

	USES= cmake qt:5 tar:xz xorg
	USE_XORG= xcb
	-USE_QT= buildtools_build qmake_build \
	+USE_QT= buildtools:build qmake:build \
	core gui linguist svg widgets \
	x11extras

	Index: x11-fm/dolphin/Makefile
	===================================================================
	--- x11-fm/dolphin/Makefile
	+++ x11-fm/dolphin/Makefile
	@@ -22,9 +22,9 @@
	kio newstuff notifications parts service \
	solid sonnet texteditor textwidgets widgetsaddons \
	windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network phonon4 widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	SHLIB_VER= 5.0.0
	Index: x11-fm/konqueror/Makefile
	===================================================================
	--- x11-fm/konqueror/Makefile
	+++ x11-fm/konqueror/Makefile
	@@ -15,7 +15,7 @@
	textwidgets unitconversion wallet widgetsaddons windowsystem xmlgui
	USE_QT= concurrent core dbus declarative gui location network printsupport script \
	speech webchannel webengine widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext

	OPTIONS_DEFINE= DOCS
	Index: x11-fm/krusader2/Makefile
	===================================================================
	--- x11-fm/krusader2/Makefile
	+++ x11-fm/krusader2/Makefile
	@@ -18,7 +18,7 @@
	service solid sonnet textwidgets wallet widgetsaddons \
	windowsystem xmlgui
	USE_QT= concurrent core dbus gui network printsupport xml widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: x11-fm/pcmanfm-qt/Makefile
	===================================================================
	--- x11-fm/pcmanfm-qt/Makefile
	+++ x11-fm/pcmanfm-qt/Makefile
	@@ -16,7 +16,7 @@
	USES= cmake compiler:c++14-lang desktop-file-utils gnome\
	gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 qt:5 \
	tar:xz xorg
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	widgets x11extras
	USE_KDE= oxygen-icons5
	USE_LXQT= buildtools libfmqt
	Index: x11-fm/qtfm/Makefile
	===================================================================
	--- x11-fm/qtfm/Makefile
	+++ x11-fm/qtfm/Makefile
	@@ -15,7 +15,7 @@
	USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5
	USE_GL= gl
	USE_QT= concurrent core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= rodlie
	Index: x11-fonts/fontmatrix/Makefile
	===================================================================
	--- x11-fonts/fontmatrix/Makefile
	+++ x11-fonts/fontmatrix/Makefile
	@@ -17,6 +17,6 @@

	USE_GITHUB= yes
	USE_QT= buildtools core gui linguisttools network printsupport \
	- qmake_build sql svg webkit widgets xml
	+ qmake:build sql svg webkit widgets xml

	.include <bsd.port.mk>
	Index: x11-fonts/fontobene/Makefile
	===================================================================
	--- x11-fonts/fontobene/Makefile
	+++ x11-fonts/fontobene/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT

	USES= cmake compiler:c++11-lang qt:5
	-USE_QT= core buildtools_build qmake_build # core is needed for build to be checked by cmake, and for run because it is included from the headers
	+USE_QT= core buildtools:build qmake:build # core is needed for build to be checked by cmake, and for run because it is included from the headers

	USE_GITHUB= yes
	GH_PROJECT= ${PORTNAME}-qt5
	Index: x11-fonts/oxygen-fonts/Makefile
	===================================================================
	--- x11-fonts/oxygen-fonts/Makefile
	+++ x11-fonts/oxygen-fonts/Makefile
	@@ -16,11 +16,11 @@

	USES= cmake fonts:none kde:5 qt:5 tar:xz

	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	KDE_PLASMA_VERSION= ${DISTVERSION}
	KDE_PLASMA_BRANCH= Attic

	-USE_QT= buildtools_build qmake_build
	+USE_QT= buildtools:build qmake:build

	NO_ARCH= yes

	Index: x11-themes/Kvantum/Makefile
	===================================================================
	--- x11-themes/Kvantum/Makefile
	+++ x11-themes/Kvantum/Makefile
	@@ -20,7 +20,7 @@
	USE_LDCONFIG= yes
	USE_KDE= windowsystem
	USE_QT= core gui svg widgets x11extras \
	- buildtools_build linguisttools_build
	+ buildtools:build linguisttools:build
	USE_XORG= x11 xext

	WRKSRC_SUBDIR= ${PORTNAME}
	Index: x11-themes/adwaita-qt5/Makefile
	===================================================================
	--- x11-themes/adwaita-qt5/Makefile
	+++ x11-themes/adwaita-qt5/Makefile
	@@ -26,7 +26,7 @@
	_qt5_qt6_on= OFF
	_qt6_qt6_on= ON
	_qt5_use= core dbus gui widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	_qt6_use= base
	_qt5_plist_sub= QT_VERSION_SUFFIX=
	_qt6_plist_sub= QT_VERSION_SUFFIX=6
	Index: x11-themes/kf5-breeze-icons/Makefile
	===================================================================
	--- x11-themes/kf5-breeze-icons/Makefile
	+++ x11-themes/kf5-breeze-icons/Makefile
	@@ -12,8 +12,8 @@
	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}

	USES= compiler:c++11-lang cmake kde:5 python:3.5+,build qt:5 shebangfix tar:xz
	-USE_KDE= ecm_build
	-USE_QT= buildtools_build qmake_build testlib_build
	+USE_KDE= ecm:build
	+USE_QT= buildtools:build qmake:build testlib:build

	SHEBANG_FILES= svg-xml-script-template.py generate-24px-versions.py

	Index: x11-themes/kf5-kemoticons/Makefile
	===================================================================
	--- x11-themes/kf5-kemoticons/Makefile
	+++ x11-themes/kf5-kemoticons/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= archive config coreaddons service \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-themes/kf5-kiconthemes/Makefile
	===================================================================
	--- x11-themes/kf5-kiconthemes/Makefile
	+++ x11-themes/kf5-kiconthemes/Makefile
	@@ -8,13 +8,13 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= archive auth codecs config configwidgets coreaddons \
	i18n itemviews widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui script svg widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= ICONS
	OPTIONS_DEFAULT= ICONS
	ICONS_DESC= Install Breeze Icons
	-ICONS_USE= KDE=breeze-icons_run
	+ICONS_USE= KDE=breeze-icons:run

	.include <bsd.port.mk>
	Index: x11-themes/kf5-oxygen-icons5/Makefile
	===================================================================
	--- x11-themes/kf5-oxygen-icons5/Makefile
	+++ x11-themes/kf5-oxygen-icons5/Makefile
	@@ -6,14 +6,14 @@
	COMMENT= The Oxygen icon theme for KDE

	USES= cmake kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build # We only install icons.
	+USE_KDE= ecm:build # We only install icons.

	# The qmake dependency is only needed so that kf5-e-c-m can query qmake for
	# some installation directories.
	# We explicitly prevent it from looking for qt5-core and specify qmake's path
	# to avoid needlessly depending on qt5-core; we're just installing a ton of
	# icon files and do not even use the paths queried from qmake.
	-USE_QT= buildtools_build qmake_build
	+USE_QT= buildtools:build qmake:build

	NO_ARCH= yes

	Index: x11-themes/kf5-qqc2-desktop-style/Makefile
	===================================================================
	--- x11-themes/kf5-qqc2-desktop-style/Makefile
	+++ x11-themes/kf5-qqc2-desktop-style/Makefile
	@@ -9,8 +9,8 @@
	USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
	USE_KDE= auth codecs config configwidgets coreaddons iconthemes \
	kirigami2 widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-themes/lumina-themes/Makefile
	===================================================================
	--- x11-themes/lumina-themes/Makefile
	+++ x11-themes/lumina-themes/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_COMB= multi

	USES= qmake qt:5
	-USE_QT= qmake_build
	+USE_QT= qmake:build

	USE_GITHUB= yes
	GH_ACCOUNT= trueos
	Index: x11-themes/plasma5-breeze-gtk/Makefile
	===================================================================
	--- x11-themes/plasma5-breeze-gtk/Makefile
	+++ x11-themes/plasma5-breeze-gtk/Makefile
	@@ -16,7 +16,7 @@
	USE_GNOME= gdkpixbuf2
	USE_KDE= breeze ecm
	USE_QT= core \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	CMAKE_ARGS= -DPython3_EXECUTABLE:PATH=${PYTHON_CMD}

	BINARY_ALIAS= python3=${PYTHON_CMD}
	Index: x11-themes/plasma5-breeze/Makefile
	===================================================================
	--- x11-themes/plasma5-breeze/Makefile
	+++ x11-themes/plasma5-breeze/Makefile
	@@ -18,7 +18,7 @@
	kcmutils plasma-framework service wayland widgetsaddons \
	windowsystem
	USE_QT= core dbus declarative gui network widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb

	.include <bsd.port.mk>
	Index: x11-themes/plasma5-kde-gtk-config/Makefile
	===================================================================
	--- x11-themes/plasma5-kde-gtk-config/Makefile
	+++ x11-themes/plasma5-kde-gtk-config/Makefile
	@@ -20,9 +20,9 @@
	USE_KDE= archive attica auth codecs completion config configwidgets \
	coreaddons dbusaddons decoration guiaddons i18n iconthemes \
	jobwidgets kcmutils kio newstuff service widgetsaddons xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network svg widgets xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11 xcursor

	.include <bsd.port.mk>
	Index: x11-themes/plasma5-oxygen/Makefile
	===================================================================
	--- x11-themes/plasma5-oxygen/Makefile
	+++ x11-themes/plasma5-oxygen/Makefile
	@@ -17,7 +17,7 @@
	decoration ecm frameworkintegration guiaddons i18n kcmutils \
	service wayland widgetsaddons windowsystem
	USE_QT= core dbus declarative gui network widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb

	.include <bsd.port.mk>
	Index: x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
	===================================================================
	--- x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
	+++ x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
	@@ -13,8 +13,8 @@

	USES= cmake kde:5 qt:5 tar:xz
	USE_KDE= ecm
	-USE_QT= buildtools_build \
	- qmake_build
	+USE_QT= buildtools:build \
	+ qmake:build

	NO_ARCH= yes

	Index: x11-themes/qgnomeplatform/Makefile
	===================================================================
	--- x11-themes/qgnomeplatform/Makefile
	+++ x11-themes/qgnomeplatform/Makefile
	@@ -17,7 +17,7 @@
	USES= compiler:c++11-lang gl gnome pkgconfig qmake:outsource qt:5 xorg
	USE_GL= gl
	USE_GNOME= gtk30 cairo gdkpixbuf2
	-USE_QT= buildtools_build core gui widgets dbus wayland
	+USE_QT= buildtools:build core gui widgets dbus wayland
	USE_XORG= x11

	USE_GITHUB= yes
	Index: x11-themes/qt5-style-plugins/Makefile
	===================================================================
	--- x11-themes/qt5-style-plugins/Makefile
	+++ x11-themes/qt5-style-plugins/Makefile
	@@ -21,7 +21,7 @@
	GH_ACCOUNT= qt
	GH_PROJECT= qtstyleplugins
	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
	-USE_QT= core dbus gui widgets buildtools_build
	+USE_QT= core dbus gui widgets buildtools:build
	USE_GL= gl
	USE_XORG= x11 xext

	Index: x11-themes/qtcurve/Makefile
	===================================================================
	--- x11-themes/qtcurve/Makefile
	+++ x11-themes/qtcurve/Makefile
	@@ -54,8 +54,8 @@
	.if ${QTCURVE_SLAVE} == "utils"
	PKGNAMESUFFIX= -utils
	USES+= gettext-runtime kde:5 qt:5
	-USE_KDE+= i18n_build
	-USE_QT+= buildtools_build qmake_build
	+USE_KDE+= i18n:build
	+USE_QT+= buildtools:build qmake:build
	USE_LDCONFIG= yes
	BUILD_WRKSRC= ${WRKSRC}
	.else
	@@ -66,8 +66,8 @@
	PKGNAMEPREFIX= gtk2-
	PKGNAMESUFFIX= -theme
	USES+= gettext-runtime gnome kde:5 qt:5
	-USE_KDE= i18n_build
	-USE_QT+= buildtools_build qmake_build
	+USE_KDE= i18n:build
	+USE_QT+= buildtools:build qmake:build
	USE_GNOME= cairo gdkpixbuf2 gtk20 pango
	USE_LDCONFIG= yes

	@@ -84,9 +84,9 @@
	USE_KDE= archive completion config configwidgets coreaddons \
	frameworkintegration guiaddons i18n iconthemes \
	init kdelibs4support kio widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui printsupport svg widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	BUILD_WRKSRC= ${WRKSRC}/qt5
	.endif

	@@ -94,9 +94,9 @@
	CONFLICTS_INSTALL= kf5-style-qtcurve
	PKGNAMEPREFIX= qt5-style-
	USES+= kde:5 qt:5
	-USE_KDE= i18n_build
	+USE_KDE= i18n:build
	USE_QT= core dbus gui svg widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so
	.endif

	Index: x11-toolkits/color-widgets-qt5/Makefile
	===================================================================
	--- x11-toolkits/color-widgets-qt5/Makefile
	+++ x11-toolkits/color-widgets-qt5/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= cmake compiler:c++11-lang pkgconfig qt:5
	-USE_QT= core gui widgets buildtools_build qmake_build
	+USE_QT= core gui widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	SUFFIX= -qt5
	Index: x11-toolkits/ctk/Makefile
	===================================================================
	--- x11-toolkits/ctk/Makefile
	+++ x11-toolkits/ctk/Makefile
	@@ -15,7 +15,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= commontk
	USE_QT= concurrent core designer gui opengl sql widgets xml xmlpatterns \
	- buildtools_build uitools_build qmake_build testlib_build # see CMake/ctkMacroSetupQt.cmake
	+ buildtools:build uitools:build qmake:build testlib:build # see CMake/ctkMacroSetupQt.cmake
	USE_LDCONFIG= yes

	CMAKE_ARGS= -DCTK_QT_VERSION=5
	Index: x11-toolkits/kf5-attica/Makefile
	===================================================================
	--- x11-toolkits/kf5-attica/Makefile
	+++ x11-toolkits/kf5-attica/Makefile
	@@ -11,8 +11,8 @@
	LICENSE_COMB= dual

	USES= cmake compiler:c++11-lib kde:5 pathfix qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core network \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kcompletion/Makefile
	===================================================================
	--- x11-toolkits/kf5-kcompletion/Makefile
	+++ x11-toolkits/kf5-kcompletion/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= config widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core gui linguisttools widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kconfigwidgets/Makefile
	===================================================================
	--- x11-toolkits/kf5-kconfigwidgets/Makefile
	+++ x11-toolkits/kf5-kconfigwidgets/Makefile
	@@ -8,9 +8,9 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 shebangfix tar:xz
	USE_KDE= auth codecs config coreaddons guiaddons \
	i18n widgetsaddons \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	SHEBANG_FILES= src/preparetips5

	Index: x11-toolkits/kf5-kdesignerplugin/Makefile
	===================================================================
	--- x11-toolkits/kf5-kdesignerplugin/Makefile
	+++ x11-toolkits/kf5-kdesignerplugin/Makefile
	@@ -10,9 +10,9 @@
	coreaddons i18n iconthemes itemviews \
	jobwidgets kdewebkit kio plotting service solid sonnet \
	textwidgets widgetsaddons xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus designer gui linguisttools \
	network webkit widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kguiaddons/Makefile
	===================================================================
	--- x11-toolkits/kf5-kguiaddons/Makefile
	+++ x11-toolkits/kf5-kguiaddons/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lib desktop-file-utils kde:5 \
	pkgconfig qt:5 tar:xz xorg
	USE_KDE= plasma-wayland-protocols \
	- ecm_build
	+ ecm:build
	USE_QT= core gui wayland widgets x11extras \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= ice sm x11 xcb xext

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kirigami2/Makefile
	===================================================================
	--- x11-toolkits/kf5-kirigami2/Makefile
	+++ x11-toolkits/kf5-kirigami2/Makefile
	@@ -8,9 +8,9 @@

	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= kdeclarative \
	- ecm_build
	+ ecm:build
	USE_QT= core concurrent dbus declarative graphicaleffects gui \
	linguisttools network quickcontrols2 svg widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kitemviews/Makefile
	===================================================================
	--- x11-toolkits/kf5-kitemviews/Makefile
	+++ x11-toolkits/kf5-kitemviews/Makefile
	@@ -6,8 +6,8 @@
	COMMENT= KF5 widget addons for Qt Model/View

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core gui linguisttools uiplugin widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kjobwidgets/Makefile
	===================================================================
	--- x11-toolkits/kf5-kjobwidgets/Makefile
	+++ x11-toolkits/kf5-kjobwidgets/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= coreaddons widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui linguisttools widgets x11extras \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-ktextwidgets/Makefile
	===================================================================
	--- x11-toolkits/kf5-ktextwidgets/Makefile
	+++ x11-toolkits/kf5-ktextwidgets/Makefile
	@@ -8,9 +8,9 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= auth codecs completion config configwidgets \
	coreaddons i18n service sonnet widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	OPTIONS_DEFINE= AUDIO
	OPTIONS_DEFAULT= AUDIO
	Index: x11-toolkits/kf5-kwidgetsaddons/Makefile
	===================================================================
	--- x11-toolkits/kf5-kwidgetsaddons/Makefile
	+++ x11-toolkits/kf5-kwidgetsaddons/Makefile
	@@ -6,8 +6,8 @@
	COMMENT= KF5 addons to QtWidgets

	USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core gui linguisttools uiplugin uitools wayland widgets \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kf5-kxmlgui/Makefile
	===================================================================
	--- x11-toolkits/kf5-kxmlgui/Makefile
	+++ x11-toolkits/kf5-kxmlgui/Makefile
	@@ -9,8 +9,8 @@
	USE_KDE= attica5 auth codecs config configwidgets coreaddons \
	globalaccel guiaddons i18n iconthemes itemviews sonnet \
	textwidgets widgetsaddons windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network printsupport widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-toolkits/kproperty/Makefile
	===================================================================
	--- x11-toolkits/kproperty/Makefile
	+++ x11-toolkits/kproperty/Makefile
	@@ -13,7 +13,7 @@
	tar:xz
	USE_KDE= ecm config coreaddons guiaddons i18n widgetsaddons
	USE_QT= core declarative gui widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	CONFLICTS_INSTALL= calligra-2*

	Index: x11-toolkits/plasma5-kdeplasma-addons/Makefile
	===================================================================
	--- x11-toolkits/plasma5-kdeplasma-addons/Makefile
	+++ x11-toolkits/plasma5-kdeplasma-addons/Makefile
	@@ -15,10 +15,10 @@
	parts plasma-framework plasma-workspace runner service solid \
	sonnet textwidgets unitconversion widgetsaddons windowsystem \
	xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative graphicaleffects gui location \
	network printsupport script webchannel widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11

	OPTIONS_DEFINE= PURPOSE QTWEBENGINE
	Index: x11-toolkits/py-qt5-chart/Makefile
	===================================================================
	--- x11-toolkits/py-qt5-chart/Makefile
	+++ x11-toolkits/py-qt5-chart/Makefile
	@@ -18,8 +18,8 @@

	USES= gl python:3.8+ pyqt:5 qt:5
	USE_GL= gl
	-USE_PYQT= sip_build pyqt5
	+USE_PYQT= sip:build pyqt5
	USE_PYTHON= concurrent flavors py3kplist
	-USE_QT= charts core declarative gui qmake_build widgets
	+USE_QT= charts core declarative gui qmake:build widgets

	.include <bsd.port.mk>
	Index: x11-toolkits/qml-box2d/Makefile
	===================================================================
	--- x11-toolkits/qml-box2d/Makefile
	+++ x11-toolkits/qml-box2d/Makefile
	@@ -12,7 +12,7 @@
	GH_TAGNAME= 21e57f
	USE_GL= gl
	USE_QT= core declarative gui network \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_LDCONFIG= ${QT_QMLDIR}/Box2D.2.0/

	.include <bsd.port.mk>
	Index: x11-toolkits/qt5-charts/Makefile
	===================================================================
	--- x11-toolkits/qt5-charts/Makefile
	+++ x11-toolkits/qt5-charts/Makefile
	@@ -8,6 +8,6 @@

	USES= compiler:c++11-lang qmake qt-dist:5,charts tar:xz
	USE_QT= core declarative network gui widgets designer \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11-toolkits/qt5-datavis3d/Makefile
	===================================================================
	--- x11-toolkits/qt5-datavis3d/Makefile
	+++ x11-toolkits/qt5-datavis3d/Makefile
	@@ -6,7 +6,7 @@
	MAINTAINER= kde@FreeBSD.org
	COMMENT= Qt 5 3D data visualization module

	-USE_QT= core declarative network gui widgets designer buildtools_build
	+USE_QT= core declarative network gui widgets designer buildtools:build

	USES= compiler:c++11-lang qmake qt-dist:5,datavis3d

	Index: x11-toolkits/qt5-declarative-test/Makefile
	===================================================================
	--- x11-toolkits/qt5-declarative-test/Makefile
	+++ x11-toolkits/qt5-declarative-test/Makefile
	@@ -12,7 +12,7 @@
	qt-dist:5,declarative
	USE_GL= gl
	USE_QT= core declarative gui network sql testlib widgets \
	- buildtools_build
	+ buildtools:build

	CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick

	Index: x11-toolkits/qt5-declarative/Makefile
	===================================================================
	--- x11-toolkits/qt5-declarative/Makefile
	+++ x11-toolkits/qt5-declarative/Makefile
	@@ -11,7 +11,7 @@
	qt-dist:5
	USE_GL= gl
	USE_QT= core gui network sql widgets \
	- buildtools_build
	+ buildtools:build

	CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick

	Index: x11-toolkits/qt5-gamepad/Makefile
	===================================================================
	--- x11-toolkits/qt5-gamepad/Makefile
	+++ x11-toolkits/qt5-gamepad/Makefile
	@@ -9,6 +9,6 @@
	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto

	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,gamepad
	-USE_QT= core declarative gui buildtools_build
	+USE_QT= core declarative gui buildtools:build

	.include <bsd.port.mk>
	Index: x11-toolkits/qt5-gui/Makefile
	===================================================================
	--- x11-toolkits/qt5-gui/Makefile
	+++ x11-toolkits/qt5-gui/Makefile
	@@ -36,7 +36,7 @@
	USE_GL= egl gl
	USE_GNOME= glib20
	USE_PERL5= extract
	-USE_QT= core dbus network buildtools_build qmake_build
	+USE_QT= core dbus network buildtools:build qmake:build
	QT_BINARIES= yes
	QT_CONFIG= accessibility accessibility-atspi-bridge dbus \
	fontconfig glib opengl png system-freetype system-jpeg \
	Index: x11-toolkits/qt5-quick3d/Makefile
	===================================================================
	--- x11-toolkits/qt5-quick3d/Makefile
	+++ x11-toolkits/qt5-quick3d/Makefile
	@@ -12,7 +12,7 @@

	USES= compiler:c++11-lang qmake qt-dist:5
	USE_QT= core declarative gui network opengl \
	- buildtools_build
	+ buildtools:build

	QT_BINARIES= yes

	Index: x11-toolkits/qt5-quickcontrols/Makefile
	===================================================================
	--- x11-toolkits/qt5-quickcontrols/Makefile
	+++ x11-toolkits/qt5-quickcontrols/Makefile
	@@ -11,6 +11,6 @@

	USES= compiler:c++11-lang qmake qt-dist:5,quickcontrols
	USE_QT= core declarative gui widgets \
	- buildtools_build
	+ buildtools:build

	.include <bsd.port.mk>
	Index: x11-toolkits/qt5-quickcontrols2/Makefile
	===================================================================
	--- x11-toolkits/qt5-quickcontrols2/Makefile
	+++ x11-toolkits/qt5-quickcontrols2/Makefile
	@@ -11,7 +11,7 @@

	USES= compiler:c++11-lang qmake:norecursive qt-dist:5
	USE_QT= core declarative gui widgets \
	- buildtools_build
	+ buildtools:build
	QT_DIST= ${PORTNAME}

	.include <bsd.port.mk>
	Index: x11-toolkits/qt5-quicktimeline/Makefile
	===================================================================
	--- x11-toolkits/qt5-quicktimeline/Makefile
	+++ x11-toolkits/qt5-quicktimeline/Makefile
	@@ -9,6 +9,6 @@

	USES= compiler:c++11-lang qmake qt-dist:5
	USE_QT= core declarative quickcontrols \
	- buildtools_build
	+ buildtools:build

	.include <bsd.port.mk>
	Index: x11-toolkits/qt5-uiplugin/Makefile
	===================================================================
	--- x11-toolkits/qt5-uiplugin/Makefile
	+++ x11-toolkits/qt5-uiplugin/Makefile
	@@ -9,7 +9,7 @@
	USES= compiler:c++17-lang perl5 qmake qt-dist:5,tools
	USE_PERL5= extract
	USE_QT= core gui widgets \
	- buildtools_build # syncqt
	+ buildtools:build # syncqt

	BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
	INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
	Index: x11-toolkits/qt5-virtualkeyboard/Makefile
	===================================================================
	--- x11-toolkits/qt5-virtualkeyboard/Makefile
	+++ x11-toolkits/qt5-virtualkeyboard/Makefile
	@@ -10,7 +10,7 @@
	LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell

	USES= compiler:c++11-lang pkgconfig qmake qt-dist:5,virtualkeyboard xorg
	-USE_QT= core declarative network gui widgets svg buildtools_build
	+USE_QT= core declarative network gui widgets svg buildtools:build
	USE_XORG= xcb

	# Disable the builtin layouts -- otherwise we need to pull in a lot of other
	Index: x11-toolkits/qt5-widgets/Makefile
	===================================================================
	--- x11-toolkits/qt5-widgets/Makefile
	+++ x11-toolkits/qt5-widgets/Makefile
	@@ -8,7 +8,7 @@

	USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base xorg
	USE_PERL5= extract
	-USE_QT= core gui qmake_build buildtools_build
	+USE_QT= core gui qmake:build buildtools:build
	USE_XORG= x11
	HAS_CONFIGURE= yes

	Index: x11-toolkits/qt5pas/Makefile
	===================================================================
	--- x11-toolkits/qt5pas/Makefile
	+++ x11-toolkits/qt5pas/Makefile
	@@ -9,7 +9,7 @@
	WWW= https://wiki.lazarus.freepascal.org/index.php/Qt_Interface

	USES= compiler:c++11-lang qmake qt:5
	-USE_QT= buildtools_build core gui network printsupport x11extras
	+USE_QT= buildtools:build core gui network printsupport x11extras
	USE_LDCONFIG= yes

	QT5_VER_MIN= 5.6.1
	Index: x11-toolkits/qtermwidget/Makefile
	===================================================================
	--- x11-toolkits/qtermwidget/Makefile
	+++ x11-toolkits/qtermwidget/Makefile
	@@ -13,7 +13,7 @@
	USES= cmake compiler:c++11-lang gettext-runtime lxqt \
	pkgconfig qt:5 tar:xz
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build core gui qmake_build linguisttools widgets
	+USE_QT= buildtools:build core gui qmake:build linguisttools widgets
	USE_LXQT= buildtools

	CMAKE_ARGS+= -DQTERMWIDGET_USE_UTEMPTER=ON
	Index: x11-toolkits/qwt5-qt5/Makefile
	===================================================================
	--- x11-toolkits/qwt5-qt5/Makefile
	+++ x11-toolkits/qwt5-qt5/Makefile
	@@ -7,7 +7,7 @@
	WWW= http://qwt.sourceforge.net/

	USES= cmake compiler:c++17-lang qt:5
	-USE_QT= core gui printsupport svg widgets buildtools_build qmake_build
	+USE_QT= core gui printsupport svg widgets buildtools:build qmake:build
	USE_LDCONFIG= yes

	USE_GITHUB= yes
	Index: x11-toolkits/qwt6/Makefile
	===================================================================
	--- x11-toolkits/qwt6/Makefile
	+++ x11-toolkits/qwt6/Makefile
	@@ -11,7 +11,7 @@

	USES= compiler:c++11-lang gl gmake qmake qt:5 tar:bzip2
	USE_GL= gl
	-USE_QT= buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
	+USE_QT= buildtools:build widgets gui core designer gui opengl svg xml printsupport concurrent
	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

	DOCSDIR= ${PREFIX}/share/doc/qwt6-qt5
	Index: x11-wm/kwinft/Makefile
	===================================================================
	--- x11-wm/kwinft/Makefile
	+++ x11-wm/kwinft/Makefile
	@@ -30,14 +30,14 @@
	USES= cmake:testing gl kde:5 pkgconfig python:run qt:5 shebangfix xorg
	USE_GITLAB= yes
	USE_GL= egl
	-USE_KDE= ecm_build auth completion config configwidgets \
	+USE_KDE= ecm:build auth completion config configwidgets \
	coreaddons crash dbusaddons decoration globalaccel i18n \
	idletime kcmutils kdeclarative kio kscreenlocker newstuff \
	notifications package plasma-framework service textwidgets \
	widgetsaddons windowsystem xmlgui
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build core dbus declarative gui \
	- multimedia_run quickcontrols2_run widgets x11extras
	+USE_QT= qmake:build buildtools:build core dbus declarative gui \
	+ multimedia:run quickcontrols2:run widgets x11extras
	USE_XORG= pixman x11 xcb xi
	SHEBANG_FILES= kconf_update/.py kconf_update/.pl
	GL_COMMIT= 022f157ce4bd14fbe069ab6fe41647b70d20f004
	@@ -51,7 +51,7 @@
	BREEZE_USE= KDE=breeze
	BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze

	-DOCS_USE= KDE=doctools_build
	+DOCS_USE= KDE=doctools:build
	DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5DocTools

	QA11Y_DESC= Accessibility (focus tracking) for Zoom effect
	Index: x11-wm/lxqt-panel/Makefile
	===================================================================
	--- x11-wm/lxqt-panel/Makefile
	+++ x11-wm/lxqt-panel/Makefile
	@@ -20,7 +20,7 @@

	USES= cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 gnome \
	localbase:ldflags lxqt pkgconfig tar:xz xorg
	-USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
	+USE_QT= buildtools:build qmake:build core dbus gui svg widgets \
	x11extras xml concurrent
	USE_KDE= windowsystem
	USE_LXQT= buildtools lxqt globalkeys qtxdg
	Index: x11-wm/lxqt-session/Makefile
	===================================================================
	--- x11-wm/lxqt-session/Makefile
	+++ x11-wm/lxqt-session/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++14-lang kde:5 lxqt qt:5 \
	pkgconfig tar:xz xorg gnome
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools lxqt qtxdg
	Index: x11-wm/obconf-qt/Makefile
	===================================================================
	--- x11-wm/obconf-qt/Makefile
	+++ x11-wm/obconf-qt/Makefile
	@@ -18,7 +18,7 @@
	USES= cmake compiler:c++11-lang gettext-runtime localbase qt:5 \
	gnome lxqt pkgconfig tar:xz xorg

	-USE_QT= buildtools_build qmake_build core gui linguisttools \
	+USE_QT= buildtools:build qmake:build core gui linguisttools \
	widgets x11extras

	USE_LXQT= buildtools
	Index: x11-wm/plasma5-kdecoration/Makefile
	===================================================================
	--- x11-wm/plasma5-kdecoration/Makefile
	+++ x11-wm/plasma5-kdecoration/Makefile
	@@ -11,8 +11,8 @@
	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_LDCONFIG= yes
	USE_KDE= coreaddons i18n \
	- ecm_build
	+ ecm:build
	USE_QT= core gui \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: x11-wm/plasma5-kwin/Makefile
	===================================================================
	--- x11-wm/plasma5-kwin/Makefile
	+++ x11-wm/plasma5-kwin/Makefile
	@@ -41,12 +41,12 @@
	notifications package plasma-framework \
	plasma-wayland-protocols runner service sonnet textwidgets \
	wayland widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_LDCONFIG= yes
	USE_QT= concurrent core dbus declarative gui multimedia network script \
	sensors uiplugin uitools widgets x11extras xml \
	- buildtools_build qmake_build testlib_build \
	- quickcontrols2_run virtualkeyboard_run
	+ buildtools:build qmake:build testlib:build \
	+ quickcontrols2:run virtualkeyboard:run
	USE_XORG= ice sm x11 xcb xext xi
	SHEBANG_FILES= kconf_update/*.py \
	kconf_update/*.pl
	Index: x11/antimicro/Makefile
	===================================================================
	--- x11/antimicro/Makefile
	+++ x11/antimicro/Makefile
	@@ -20,7 +20,7 @@
	USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig \
	qt:5 sdl shared-mime-info xorg
	USE_XORG= x11 xi xtst
	-USE_QT= core gui linguisttools_build qmake_build buildtools_build widgets network
	+USE_QT= core gui linguisttools:build qmake:build buildtools:build widgets network
	USE_SDL= sdl2

	.include <bsd.port.mk>
	Index: x11/compton-conf/Makefile
	===================================================================
	--- x11/compton-conf/Makefile
	+++ x11/compton-conf/Makefile
	@@ -15,7 +15,7 @@

	USES= cmake compiler:c++14-lang localbase:ldflags lxqt qt:5 \
	pkgconfig tar:xz
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	widgets
	USE_LXQT= buildtools

	Index: x11/cool-retro-term/Makefile
	===================================================================
	--- x11/cool-retro-term/Makefile
	+++ x11/cool-retro-term/Makefile
	@@ -17,9 +17,9 @@

	USES= compiler:c++11-lang gl gmake qmake qt:5
	USE_GL= gl
	-USE_QT= qmake_build buildtools_build core declarative gui \
	- network sql widgets graphicaleffects_run \
	- quickcontrols_run sql-sqlite3_run
	+USE_QT= qmake:build buildtools:build core declarative gui \
	+ network sql widgets graphicaleffects:run \
	+ quickcontrols:run sql-sqlite3:run

	post-patch:
	@${REINPLACE_CMD} -e '/DEFINES +=/s,^macx:,,' \
	Index: x11/coreterminal/Makefile
	===================================================================
	--- x11/coreterminal/Makefile
	+++ x11/coreterminal/Makefile
	@@ -15,7 +15,7 @@
	RUN_DEPENDS= coregarage:deskutils/coregarage

	USES= cmake localbase:ldflags qt:5
	-USE_QT= buildtools_build core gui qmake_build serialport widgets
	+USE_QT= buildtools:build core gui qmake:build serialport widgets
	USE_GITLAB= yes

	GL_ACCOUNT= CuboCore
	Index: x11/disman/Makefile
	===================================================================
	--- x11/disman/Makefile
	+++ x11/disman/Makefile
	@@ -14,9 +14,9 @@

	USES= cmake:testing kde:5 qt:5
	USE_GITLAB= yes
	-USE_KDE= ecm_build coreaddons
	+USE_KDE= ecm:build coreaddons
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build core dbus gui
	+USE_QT= qmake:build buildtools:build core dbus gui
	GL_ACCOUNT= kwinft
	GL_COMMIT= a8fc81af423ab14513c7096b405cec3f58943495
	PLIST_SUB= VERSION=${PORTVERSION}
	Index: x11/dsbautostart/Makefile
	===================================================================
	--- x11/dsbautostart/Makefile
	+++ x11/dsbautostart/Makefile
	@@ -14,6 +14,6 @@
	USES= compiler:c++11-lang gl qmake qt:5 tar:tgz

	USE_GL= gl
	-USE_QT= buildtools_build core gui linguisttools_build widgets
	+USE_QT= buildtools:build core gui linguisttools:build widgets

	.include <bsd.port.mk>
	Index: x11/dsbxinput/Makefile
	===================================================================
	--- x11/dsbxinput/Makefile
	+++ x11/dsbxinput/Makefile
	@@ -13,7 +13,7 @@
	RUN_DEPENDS= xinput:x11/xinput

	USES= pyqt:5 python:3.8+ qt:5
	-USE_QT= linguisttools_build
	+USE_QT= linguisttools:build
	USE_GITHUB= yes
	GH_ACCOUNT= mrclksr
	GH_PROJECT= DSBXinput
	Index: x11/glcapsviewer/Makefile
	===================================================================
	--- x11/glcapsviewer/Makefile
	+++ x11/glcapsviewer/Makefile
	@@ -18,7 +18,7 @@

	USES= cmake compiler:c++11-lang gl qt:5 xorg
	USE_GL= gl glew glu
	-USE_QT= buildtools_build qmake_build core gui network widgets
	+USE_QT= buildtools:build qmake:build core gui network widgets
	USE_XORG= ice sm x11 xext

	PLIST_FILES= bin/glcapsviewer ${DATADIR_REL}/capslist.xml \
	Index: x11/kdisplay/Makefile
	===================================================================
	--- x11/kdisplay/Makefile
	+++ x11/kdisplay/Makefile
	@@ -17,10 +17,10 @@

	USES= cmake:testing kde:5 qt:5
	USE_GITLAB= yes
	-USE_KDE= ecm_build config coreaddons dbusaddons globalaccel i18n \
	+USE_KDE= ecm:build config coreaddons dbusaddons globalaccel i18n \
	kcmutils kdeclarative plasma-framework xmlgui
	USE_LDCONFIG= yes
	-USE_QT= qmake_build buildtools_build core dbus declarative gui \
	+USE_QT= qmake:build buildtools:build core dbus declarative gui \
	sensors widgets
	GL_ACCOUNT= kwinft
	GL_COMMIT= a4dcebd297fded753579c7aef5a874617d274b7f
	Index: x11/kf5-frameworkintegration/Makefile
	===================================================================
	--- x11/kf5-frameworkintegration/Makefile
	+++ x11/kf5-frameworkintegration/Makefile
	@@ -9,9 +9,9 @@
	qt:5 tar:xz xorg
	USE_KDE= auth attica codecs config configwidgets coreaddons i18n \
	iconthemes newstuff notifications widgetsaddons \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui network widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= xcb xcursor

	.include <bsd.port.mk>
	Index: x11/kf5-kactivities-stats/Makefile
	===================================================================
	--- x11/kf5-kactivities-stats/Makefile
	+++ x11/kf5-kactivities-stats/Makefile
	@@ -10,8 +10,8 @@

	USES= cmake compiler:c++11-lib kde:5 pathfix qt:5 tar:xz
	USE_KDE= activities config \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus sql \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11/kf5-kactivities/Makefile
	===================================================================
	--- x11/kf5-kactivities/Makefile
	+++ x11/kf5-kactivities/Makefile
	@@ -10,8 +10,8 @@

	USES= cmake compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz
	USE_KDE= config coreaddons service \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network sql \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11/kf5-kded/Makefile
	===================================================================
	--- x11/kf5-kded/Makefile
	+++ x11/kf5-kded/Makefile
	@@ -7,8 +7,8 @@

	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
	USE_KDE= config coreaddons crash dbusaddons service \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11/kf5-kdelibs4support/Makefile
	===================================================================
	--- x11/kf5-kdelibs4support/Makefile
	+++ x11/kf5-kdelibs4support/Makefile
	@@ -15,12 +15,12 @@
	i18n iconthemes itemviews jobwidgets kded kio notifications \
	parts service solid sonnet textwidgets unitconversion \
	widgetsaddons windowsystem xmlgui \
	- doctools_build ecm_build \
	- designerplugin_build designerplugin_run \
	- itemmodels_run
	+ doctools:build ecm:build \
	+ designerplugin:build designerplugin:run \
	+ itemmodels:run
	USE_QT= concurrent core dbus designer gui network \
	printsupport svg testlib widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= ice sm x11 xcb xext

	SHEBANG_FILES= src/kio/fileshareset
	Index: x11/kf5-kglobalaccel/Makefile
	===================================================================
	--- x11/kf5-kglobalaccel/Makefile
	+++ x11/kf5-kglobalaccel/Makefile
	@@ -11,9 +11,9 @@
	USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz xorg
	USE_KDE= config coreaddons crash dbusaddons i18n service \
	windowsystem \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui linguisttools widgets x11extras \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11 xcb

	.include <bsd.port.mk>
	Index: x11/kf5-kinit/Makefile
	===================================================================
	--- x11/kf5-kinit/Makefile
	+++ x11/kf5-kinit/Makefile
	@@ -9,9 +9,9 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
	USE_KDE= completion config coreaddons crash dbusaddons i18n \
	jobwidgets kio service solid widgetsaddons windowsystem \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= concurrent core dbus gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb

	.include <bsd.port.mk>
	Index: x11/kf5-krunner/Makefile
	===================================================================
	--- x11/kf5-krunner/Makefile
	+++ x11/kf5-krunner/Makefile
	@@ -9,8 +9,8 @@
	USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
	USE_KDE= activities config coreaddons i18n kio package plasma-framework \
	service solid threadweaver \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus declarative gui network widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11/kf5-kwayland/Makefile
	===================================================================
	--- x11/kf5-kwayland/Makefile
	+++ x11/kf5-kwayland/Makefile
	@@ -16,8 +16,8 @@
	USES= cmake compiler:c++11-lib gettext gl kde:5 pkgconfig \
	qt:5 tar:xz
	USE_GL= egl
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= concurrent core gui wayland \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build

	.include <bsd.port.mk>
	Index: x11/kf5-kwindowsystem/Makefile
	===================================================================
	--- x11/kf5-kwindowsystem/Makefile
	+++ x11/kf5-kwindowsystem/Makefile
	@@ -8,9 +8,9 @@
	LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms

	USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz xorg
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core gui linguisttools widgets x11extras \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= ice sm x11 xcb xext xfixes xrender

	.include <bsd.port.mk>
	Index: x11/kf5-plasma-framework/Makefile
	===================================================================
	--- x11/kf5-plasma-framework/Makefile
	+++ x11/kf5-plasma-framework/Makefile
	@@ -9,11 +9,11 @@
	USES= cmake compiler:c++11-lib gettext gl kde:5 pkgconfig qt:5 tar:xz xorg
	USE_GL= egl gl
	USE_KDE= activities archive auth codecs completion config \
	- configwidgets coreaddons dbusaddons doctools_build globalaccel \
	+ configwidgets coreaddons dbusaddons doctools:build globalaccel \
	guiaddons i18n iconthemes jobwidgets kirigami2 kio package \
	notifications service solid wayland windowsystem xmlgui kdeclarative \
	widgetsaddons
	-USE_QT= buildtools_build concurrent core dbus declarative gui network qmake_build \
	+USE_QT= buildtools:build concurrent core dbus declarative gui network qmake:build \
	script sql svg widgets x11extras xml
	USE_XORG= ice sm x11 xcb xext xrandr

	Index: x11/konsole/Makefile
	===================================================================
	--- x11/konsole/Makefile
	+++ x11/konsole/Makefile
	@@ -20,10 +20,10 @@
	iconthemes init itemmodels jobwidgets kio \
	newstuff notifications notifyconfig parts pty service solid sonnet \
	textwidgets widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network printsupport script scripttools sql \
	widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS
	Index: x11/libfm-qt/Makefile
	===================================================================
	--- x11/libfm-qt/Makefile
	+++ x11/libfm-qt/Makefile
	@@ -15,7 +15,7 @@

	USES= cmake compiler:c++14-lang gettext-runtime lxqt pkgconfig \
	qt:5 gnome shared-mime-info tar:xz xorg
	-USE_QT= buildtools_build qmake_build core gui linguisttools widgets \
	+USE_QT= buildtools:build qmake:build core gui linguisttools widgets \
	x11extras
	USE_GNOME= glib20
	USE_XORG= xcb
	Index: x11/lumina-core/Makefile
	===================================================================
	--- x11/lumina-core/Makefile
	+++ x11/lumina-core/Makefile
	@@ -28,7 +28,7 @@
	USE_GL= gl
	USE_XORG= x11 xdamage xcb
	USE_LDCONFIG= yes
	-USE_QT= buildtools_build concurrent core dbus declarative gui \
	+USE_QT= buildtools:build concurrent core dbus declarative gui \
	imageformats multimedia network svg widgets x11extras
	USE_GITHUB= yes
	GH_ACCOUNT= lumina-desktop
	@@ -46,7 +46,7 @@
	MULTIMEDIA_USES= gstreamer
	MULTIMEDIA_USE= GSTREAMER=core

	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	WRKSRC_SUBDIR= src-qt5/core
	Index: x11/lumina-coreutils/Makefile
	===================================================================
	--- x11/lumina-coreutils/Makefile
	+++ x11/lumina-coreutils/Makefile
	@@ -13,7 +13,7 @@
	RUN_DEPENDS= xrandr:x11/xrandr

	USES= compiler:c++11-lang qmake qt:5
	-USE_QT= buildtools_build concurrent core gui \
	+USE_QT= buildtools:build concurrent core gui \
	imageformats multimedia network \
	svg widgets x11extras
	USE_GITHUB= yes
	@@ -23,7 +23,7 @@
	OPTIONS_DEFINE= NLS
	OPTIONS_SUB= yes

	-NLS_USE= QT=linguist_build
	+NLS_USE= QT=linguist:build
	NLS_QMAKE_ON= CONFIG+=WITH_I18N

	WRKSRC_SUBDIR= src-qt5/core-utils
	Index: x11/lxqt-about/Makefile
	===================================================================
	--- x11/lxqt-about/Makefile
	+++ x11/lxqt-about/Makefile
	@@ -12,7 +12,7 @@
	LICENSE_FILE= ${WRKSRC}/COPYING

	USES= cmake compiler:c++11-lang kde:5 lxqt pkgconfig tar:xz qt:5 gnome xorg
	-USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
	+USE_QT= buildtools:build qmake:build core dbus gui svg widgets \
	x11extras xml
	USE_XORG= x11
	USE_KDE= windowsystem
	Index: x11/lxqt-globalkeys/Makefile
	===================================================================
	--- x11/lxqt-globalkeys/Makefile
	+++ x11/lxqt-globalkeys/Makefile
	@@ -11,7 +11,7 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USES= cmake compiler:c++14-lang kde:5 xorg lxqt pkgconfig qt:5 tar:xz gnome
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_LXQT= buildtools lxqt
	Index: x11/lxqt-runner/Makefile
	===================================================================
	--- x11/lxqt-runner/Makefile
	+++ x11/lxqt-runner/Makefile
	@@ -18,7 +18,7 @@

	USES= cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 \
	gnome localbase lxqt pkgconfig tar:xz xorg
	-USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
	+USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
	script svg widgets x11extras xml
	USE_KDE= windowsystem
	USE_GNOME= glib20
	Index: x11/pcdm/Makefile
	===================================================================
	--- x11/pcdm/Makefile
	+++ x11/pcdm/Makefile
	@@ -17,7 +17,7 @@

	USES= compiler:c++11-lang gl qmake qt:5 xorg
	USE_QT= core gui network svg multimedia imageformats \
	- buildtools_build x11extras widgets concurrent linguisttools_build
	+ buildtools:build x11extras widgets concurrent linguisttools:build
	USE_GL= gl
	USE_XORG= x11

	Index: x11/plasma-wayland-protocols/Makefile
	===================================================================
	--- x11/plasma-wayland-protocols/Makefile
	+++ x11/plasma-wayland-protocols/Makefile
	@@ -12,7 +12,7 @@

	USES= cmake kde:5 qt:5 tar:xz
	USE_KDE= ecm
	-USE_QT= buildtools_build qmake_build
	+USE_QT= buildtools:build qmake:build

	NO_ARCH= yes

	Index: x11/plasma5-kactivitymanagerd/Makefile
	===================================================================
	--- x11/plasma5-kactivitymanagerd/Makefile
	+++ x11/plasma5-kactivitymanagerd/Makefile
	@@ -14,7 +14,7 @@
	ecm globalaccel i18n kio service widgetsaddons windowsystem \
	xmlgui
	USE_QT= concurrent core dbus gui network sql widgets xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: x11/plasma5-kgamma5/Makefile
	===================================================================
	--- x11/plasma5-kgamma5/Makefile
	+++ x11/plasma5-kgamma5/Makefile
	@@ -12,9 +12,9 @@
	itemmodels itemviews jobwidgets kio notifications parts \
	service solid sonnet textwidgets unitconversion widgetsaddons \
	windowsystem xmlgui \
	- doctools_build ecm_build
	+ doctools:build ecm:build
	USE_QT= core dbus gui network printsupport widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xext xxf86vm

	.include <bsd.port.mk>
	Index: x11/plasma5-kscreen/Makefile
	===================================================================
	--- x11/plasma5-kscreen/Makefile
	+++ x11/plasma5-kscreen/Makefile
	@@ -13,9 +13,9 @@
	USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
	globalaccel i18n kcmutils kdeclarative libkscreen package \
	plasma-framework service widgetsaddons windowsystem xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus declarative gui network sensors widgets x11extras xml \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11 xcb xext xi

	.include <bsd.port.mk>
	Index: x11/plasma5-kwayland-integration/Makefile
	===================================================================
	--- x11/plasma5-kwayland-integration/Makefile
	+++ x11/plasma5-kwayland-integration/Makefile
	@@ -17,7 +17,7 @@
	USE_GL= gl
	USE_KDE= ecm guiaddons idletime plasma-wayland-protocols wayland windowsystem
	USE_QT= core gui wayland widgets \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: x11/plasma5-kwayland-server/Makefile
	===================================================================
	--- x11/plasma5-kwayland-server/Makefile
	+++ x11/plasma5-kwayland-server/Makefile
	@@ -18,6 +18,6 @@
	USE_GL= egl
	USE_KDE= ecm wayland
	USE_QT= concurrent core gui wayland \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11/plasma5-layer-shell-qt/Makefile
	===================================================================
	--- x11/plasma5-layer-shell-qt/Makefile
	+++ x11/plasma5-layer-shell-qt/Makefile
	@@ -15,6 +15,6 @@
	USE_GL= gl
	USE_KDE= ecm
	USE_QT= core gui wayland \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build

	.include <bsd.port.mk>
	Index: x11/plasma5-libkscreen/Makefile
	===================================================================
	--- x11/plasma5-libkscreen/Makefile
	+++ x11/plasma5-libkscreen/Makefile
	@@ -12,9 +12,9 @@
	USES= cmake compiler:c++11-lib kde:5 pathfix pkgconfig qt:5 tar:xz \
	xorg
	USE_KDE= plasma-wayland-protocols wayland \
	- ecm_build
	+ ecm:build
	USE_QT= core dbus gui x11extras \
	- buildtools_build qmake_build testlib_build
	+ buildtools:build qmake:build testlib:build
	USE_XORG= x11 xcb xrandr

	.include <bsd.port.mk>
	Index: x11/plasma5-plasma-desktop/Makefile
	===================================================================
	--- x11/plasma5-plasma-desktop/Makefile
	+++ x11/plasma5-plasma-desktop/Makefile
	@@ -39,12 +39,12 @@
	plasma-framework plasma-workspace runner service solid sonnet \
	textwidgets unitconversion wallet widgetsaddons windowsystem \
	xmlgui \
	- doctools_build ecm_build \
	- drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run \
	- ksysguard_run polkit-kde-agent-1_run systemsettings_run
	+ doctools:build ecm:build \
	+ drkonqi:run infocenter:run kde-cli-tools:run kmenuedit:run \
	+ ksysguard:run polkit-kde-agent-1:run systemsettings:run
	USE_QT= concurrent core dbus declarative gui network phonon4 \
	printsupport sql svg widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= ice sm x11 xcb xcursor xext xfixes xft xi xrender

	CPE_VENDOR= kde
	Index: x11/plasma5-plasma-integration/Makefile
	===================================================================
	--- x11/plasma5-plasma-integration/Makefile
	+++ x11/plasma5-plasma-integration/Makefile
	@@ -15,10 +15,10 @@
	coreaddons ecm i18n iconthemes itemviews jobwidgets kio \
	notifications service solid wayland widgetsaddons windowsystem \
	xmlgui \
	- qqc2-desktop-style_run
	+ qqc2-desktop-style:run
	USE_QT= concurrent core dbus declarative gui network quickcontrols2 \
	widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11 xcb xcursor

	SHEBANG_FILES= src/platformtheme/fonts_akregator.pl \
	Index: x11/plasma5-plasma-workspace/Makefile
	===================================================================
	--- x11/plasma5-plasma-workspace/Makefile
	+++ x11/plasma5-plasma-workspace/Makefile
	@@ -42,14 +42,14 @@
	plasma-framework plasma-integration prison pty runner service \
	solid sonnet syntaxhighlighting texteditor textwidgets unitconversion \
	wallet wayland widgetsaddons windowsystem xmlgui xmlrpcclient \
	- doctools_build ecm_build \
	- breeze-icons_run breeze_run kded_run kquickcharts_run \
	- milou_run oxygen-icons5_run
	+ doctools:build ecm:build \
	+ breeze-icons:run breeze:run kded:run kquickcharts:run \
	+ milou:run oxygen-icons5:run
	USE_QT= concurrent core dbus declarative graphicaleffects gui network \
	phonon4 printsupport qdbus script sql svg wayland webkit \
	widgets x11extras xml \
	- buildtools_build qmake_build testlib_build \
	- paths_run quickcontrols_run
	+ buildtools:build qmake:build testlib:build \
	+ paths:run quickcontrols:run
	USE_XORG= ice sm x11 xau xcb xcomposite xcursor xext xfixes xft xi xkbfile xrender xtst

	CPE_VENDOR= kde
	Index: x11/plasma5-plasma/Makefile
	===================================================================
	--- x11/plasma5-plasma/Makefile
	+++ x11/plasma5-plasma/Makefile
	@@ -21,6 +21,6 @@
	PHONON_DESC= Include phonon-gstreamer, for sound output

	PHONON_RUN_DEPENDS= ${QT_PLUGINDIR}/phonon4qt5_backend/phonon_gstreamer.so:multimedia/phonon-gstreamer
	-PULSEAUDIO_USE= KDE=plasma-pa_run
	+PULSEAUDIO_USE= KDE=plasma-pa:run

	.include <bsd.port.mk>
	Index: x11/qimageblitz/Makefile
	===================================================================
	--- x11/qimageblitz/Makefile
	+++ x11/qimageblitz/Makefile
	@@ -13,7 +13,7 @@

	USES= cmake compiler:c++11-lang qt:5
	USE_LDCONFIG= yes
	-USE_QT= core gui widgets qmake_build buildtools_build
	+USE_QT= core gui widgets qmake:build buildtools:build
	USE_CXXSTD= gnu++98

	SVN_URL= svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz
	Index: x11/qt5-x11extras/Makefile
	===================================================================
	--- x11/qt5-x11extras/Makefile
	+++ x11/qt5-x11extras/Makefile
	@@ -9,6 +9,6 @@
	USES= compiler:c++11-lang perl5 qmake qt-dist:5,x11extras perl5
	USE_PERL5= extract
	USE_QT= core gui \
	- buildtools_build # syncqt
	+ buildtools:build # syncqt

	.include <bsd.port.mk>
	Index: x11/qterminal/Makefile
	===================================================================
	--- x11/qterminal/Makefile
	+++ x11/qterminal/Makefile
	@@ -14,7 +14,7 @@

	USES= cmake compiler:c++11-lang gettext-runtime \
	localbase:ldflags lxqt pkgconfig qt:5 tar:xz xorg
	-USE_QT= buildtools_build core gui qmake_build dbus linguisttools \
	+USE_QT= buildtools:build core gui qmake:build dbus linguisttools \
	widgets x11extras
	USE_XORG= x11
	USE_LXQT= buildtools
	Index: x11/radare-cutter/Makefile
	===================================================================
	--- x11/radare-cutter/Makefile
	+++ x11/radare-cutter/Makefile
	@@ -23,7 +23,7 @@
	GH_TUPLE= radareorg:cutter-translations:8e1d24b:translations/translations

	USE_QT= core declarative gui linguist location network printsupport svg \
	- webchannel widgets buildtools_build
	+ webchannel widgets buildtools:build
	USE_GL= gl

	WRKSRC_SUBDIR= src
	Index: x11/rsibreak/Makefile
	===================================================================
	--- x11/rsibreak/Makefile
	+++ x11/rsibreak/Makefile
	@@ -15,7 +15,7 @@
	USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons doctools ecm \
	iconthemes i18n idletime notifications notifyconfig \
	sonnet textwidgets xmlgui widgetsaddons windowsystem
	-USE_QT= core dbus gui widgets xml buildtools_build qmake_build
	+USE_QT= core dbus gui widgets xml buildtools:build qmake:build
	USE_XORG= x11

	.include <bsd.port.mk>
	Index: x11/sddm/Makefile
	===================================================================
	--- x11/sddm/Makefile
	+++ x11/sddm/Makefile
	@@ -28,9 +28,9 @@
	USES= cmake compiler:c++11-lang cpe kde:5 pkgconfig python:build qt:5 xorg
	CPE_VENDOR= ${PORTNAME}_project
	USE_GITHUB= yes
	-USE_KDE= ecm_build
	+USE_KDE= ecm:build
	USE_QT= core declarative dbus gui network \
	- buildtools_build linguisttools_build qmake_build testlib_build
	+ buildtools:build linguisttools:build qmake:build testlib:build
	USE_XORG= xcb

	CONFLICTS_INSTALL= lightdm
	Index: x11/yakuake/Makefile
	===================================================================
	--- x11/yakuake/Makefile
	+++ x11/yakuake/Makefile
	@@ -16,9 +16,9 @@
	jobwidgets kio newstuff notifications notifyconfig parts \
	service solid sonnet textwidgets wayland widgetsaddons windowsystem \
	xmlgui \
	- ecm_build
	+ ecm:build
	USE_QT= concurrent core dbus gui network widgets x11extras xml \
	- buildtools_build qmake_build
	+ buildtools:build qmake:build
	USE_XORG= x11

	OPTIONS_DEFINE= DOCS

File Metadata

Mime Type: text/plain
Expires: Sun, Nov 15, 4:34 AM (15 h, 35 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 41719427
Default Alt Text: D36349.1794717263.diff (558 KB)

D36349.1794717263.diffNo OneTemporaryActions

D36349.1794717263.diffView Options

File Metadata

Event Timeline

D36349.1794717263.diff
No OneTemporary
Actions

D36349.1794717263.diff
View Options