Attachment 236123 Details for Bug 266034 – 0001-Mk-Uses-always-use-colon-for-build-run-suffix-v3

[patch] 0001-Mk-Uses-always-use-colon-for-build-run-suffix-v3

0001-Mk-Uses-always-use-colon-for-build-run-suffix-v3.patch (text/plain), 692.59 KB, created by Felix Palmen on 2022-08-26 06:25:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2022-08-26 06:25:15 UTC

Size: 692.59 KB

patch

obsolete

>From 2eff3993a22852d57c1f088b4e34ae45d5bbed1f Mon Sep 17 00:00:00 2001
>From: Felix Palmen <zirias@FreeBSD.org>
>Date: Thu, 25 Aug 2022 17:00:50 +0200
>Subject: [PATCH] Mk/Uses: always use colon for build/run suffix
>
>Most USES use a colon for build/run(/test) suffixes. Change kde.mk,
>qt.mk and pyqt.mk to do the same, and update all ports using that.
>---
> CHANGES                                         | 17 +++++++++++++++++
> Mk/Uses/kde.mk                                  | 16 ++++++++--------
> Mk/Uses/pyqt.mk                                 | 16 ++++++++--------
> Mk/Uses/qmake.mk                                |  2 +-
> Mk/Uses/qt.mk                                   | 12 ++++++------
> accessibility/gammy/Makefile                    |  2 +-
> accessibility/kmag/Makefile                     |  4 ++--
> accessibility/kmousetool/Makefile               |  4 ++--
> accessibility/kmouth/Makefile                   |  4 ++--
> accessibility/libqaccessibilityclient/Makefile  |  2 +-
> accessibility/qt5-speech/Makefile               |  2 +-
> archivers/ark/Makefile                          |  4 ++--
> archivers/kf5-karchive/Makefile                 |  4 ++--
> archivers/libarchive-qt/Makefile                |  2 +-
> archivers/lxqt-archiver/Makefile                |  2 +-
> archivers/quazip/Makefile                       |  2 +-
> archivers/v1541commander/Makefile               |  2 +-
> astro/gpsbabel/Makefile                         |  4 ++--
> astro/indiwebmanagerapp/Makefile                |  2 +-
> astro/kosmindoormap/Makefile                    |  4 ++--
> astro/kstars/Makefile                           |  4 ++--
> astro/marble/Makefile                           |  4 ++--
> astro/merkaartor/Makefile                       |  4 ++--
> astro/oskar/Makefile                            |  2 +-
> astro/stellarium/Makefile                       |  6 +++---
> astro/stellarsolver/Makefile                    |  2 +-
> audio/abgate-lv2/Makefile                       |  2 +-
> audio/amarok/Makefile                           |  4 ++--
> audio/audiocd-kio/Makefile                      |  2 +-
> audio/bambootracker/Makefile                    |  2 +-
> audio/cadence/Makefile                          |  2 +-
> audio/cantata/Makefile                          |  6 +++---
> audio/carla/Makefile                            |  2 +-
> audio/csoundqt/Makefile                         |  2 +-
> audio/dgedit/Makefile                           |  2 +-
> audio/dmidiplayer/Makefile                      |  2 +-
> audio/drumkv1-lv2/Makefile                      |  2 +-
> audio/drumstick/Makefile                        |  2 +-
> audio/dsbmixer/Makefile                         |  2 +-
> audio/elisa/Makefile                            |  2 +-
> audio/faustlive/Makefile                        |  2 +-
> audio/flacon/Makefile                           |  4 ++--
> audio/fmit/Makefile                             |  2 +-
> audio/guidolib/Makefile                         |  2 +-
> audio/hpsjam/Makefile                           |  2 +-
> audio/hydrogen/Makefile                         |  4 ++--
> audio/inscore/Makefile                          |  2 +-
> audio/jacktrip/Makefile                         |  2 +-
> audio/jalv/Makefile                             |  2 +-
> audio/jamulus/Makefile                          |  2 +-
> audio/juk/Makefile                              |  4 ++--
> audio/kid3-qt5/Makefile                         |  6 +++---
> audio/kmix/Makefile                             |  4 ++--
> audio/kwave/Makefile                            |  4 ++--
> audio/libechonest/Makefile                      |  4 ++--
> audio/libkcddb/Makefile                         |  4 ++--
> audio/libkcompactdisc/Makefile                  |  4 ++--
> audio/liblastfm-qt5/Makefile                    |  4 ++--
> audio/lmms/Makefile                             |  2 +-
> audio/midipp/Makefile                           |  2 +-
> audio/mixxx/Makefile                            |  4 ++--
> audio/mixxx22/Makefile                          |  4 ++--
> audio/mous/Makefile                             |  2 +-
> audio/mpz/Makefile                              |  2 +-
> audio/mumble/Makefile                           |  2 +-
> audio/murmur/Makefile                           |  4 ++--
> audio/muse-sequencer/Makefile                   |  2 +-
> audio/musescore/Makefile                        |  2 +-
> audio/mythplugin-mythmusic/Makefile             |  2 +-
> audio/noson-app/Makefile                        |  2 +-
> audio/openal-soft/Makefile                      |  2 +-
> audio/padthv1-lv2/Makefile                      |  2 +-
> audio/pavucontrol-qt/Makefile                   |  2 +-
> audio/pianobooster/Makefile                     |  2 +-
> audio/picard/Makefile                           |  2 +-
> audio/plasma5-plasma-pa/Makefile                |  4 ++--
> audio/polyphone/Makefile                        |  2 +-
> audio/pulseaudio-qt/Makefile                    |  4 ++--
> audio/qaudiosonar/Makefile                      |  2 +-
> audio/qjackctl/Makefile                         |  2 +-
> audio/qmidiarp/Makefile                         |  4 ++--
> audio/qmidictl/Makefile                         |  2 +-
> audio/qmidinet/Makefile                         |  2 +-
> audio/qsampler/Makefile                         |  2 +-
> audio/qsynth/Makefile                           |  4 ++--
> audio/qtractor/Makefile                         |  2 +-
> audio/quimup/Makefile                           |  2 +-
> audio/qxgedit/Makefile                          |  2 +-
> audio/rosegarden/Makefile                       |  2 +-
> audio/samplv1-lv2/Makefile                      |  2 +-
> audio/sayonara/Makefile                         |  4 ++--
> audio/sonic-visualiser/Makefile                 |  2 +-
> audio/soundkonverter/Makefile                   |  6 +++---
> audio/spectmorph/Makefile                       |  2 +-
> audio/spotify-qt/Makefile                       |  2 +-
> audio/strawberry/Makefile                       |  2 +-
> audio/supercollider/Makefile                    |  4 ++--
> audio/synthv1-lv2/Makefile                      |  2 +-
> audio/tiatracker/Makefile                       |  2 +-
> audio/traverso/Makefile                         |  2 +-
> audio/virtual_oss_ctl/Makefile                  |  2 +-
> audio/vmpk/Makefile                             |  2 +-
> audio/welle.io/Makefile                         |  2 +-
> benchmarks/glmark2/Makefile                     |  2 +-
> benchmarks/kdiskmark/Makefile                   |  4 ++--
> biology/sigviewer/Makefile                      |  2 +-
> biology/ugene/Makefile                          |  4 ++--
> cad/appcsxcad/Makefile                          |  2 +-
> cad/caneda/Makefile                             |  2 +-
> cad/freecad/Makefile                            |  2 +-
> cad/ktechlab/Makefile                           |  4 ++--
> cad/ldview/Makefile                             |  2 +-
> cad/leocad/Makefile                             |  2 +-
> cad/librecad/Makefile                           |  2 +-
> cad/librepcb/Makefile                           |  2 +-
> cad/meshlab/Makefile                            |  2 +-
> cad/openroad/Makefile                           |  2 +-
> cad/openscad-devel/Makefile                     |  2 +-
> cad/openscad/Makefile                           |  2 +-
> cad/py-pyfda/Makefile                           |  2 +-
> cad/qcad/Makefile                               |  2 +-
> cad/qcsxcad/Makefile                            |  2 +-
> cad/qelectrotech/Makefile                       |  2 +-
> cad/qucs-s/Makefile                             |  2 +-
> cad/veroroute/Makefile                          |  2 +-
> chinese/fcitx-libpinyin/Makefile                |  2 +-
> chinese/fcitx5-chinese-addons/Makefile          |  2 +-
> chinese/gcin-qt5/Makefile                       |  2 +-
> comms/cutecom/Makefile                          |  2 +-
> comms/inspectrum/Makefile                       |  2 +-
> comms/klog/Makefile                             |  6 +++---
> comms/libsdr-gui/Makefile                       |  2 +-
> comms/nanovna-saver/Makefile                    |  2 +-
> comms/qt5-connectivity/Makefile                 |  2 +-
> comms/qt5-sensors/Makefile                      |  2 +-
> comms/qt5-serialbus/Makefile                    |  2 +-
> comms/qt5-serialport/Makefile                   |  2 +-
> comms/sdr-wspr/Makefile                         |  2 +-
> comms/wsjtx/Makefile                            |  2 +-
> comms/wsjtz/Makefile                            |  2 +-
> comms/xcwcp/Makefile                            |  2 +-
> databases/akonadi/Makefile                      | 12 ++++++------
> databases/cutelyst-asql/Makefile                |  2 +-
> databases/kbibtex/Makefile                      |  4 ++--
> databases/kdb/Makefile                          |  2 +-
> databases/kexi/Makefile                         |  4 ++--
> databases/opendbviewer/Makefile                 |  2 +-
> databases/pgmodeler/Makefile                    |  2 +-
> databases/qt5-sql/Makefile                      |  2 +-
> databases/redisdesktopmanager/Makefile          |  2 +-
> databases/sqlitebrowser/Makefile                |  2 +-
> databases/sqlitestudio/Makefile                 |  4 ++--
> databases/symphytum/Makefile                    |  2 +-
> deskutils/akonadi-calendar-tools/Makefile       |  4 ++--
> deskutils/akonadi-import-wizard/Makefile        |  4 ++--
> deskutils/akonadiconsole/Makefile               |  4 ++--
> deskutils/akregator/Makefile                    |  4 ++--
> deskutils/ausweisapp2/Makefile                  |  2 +-
> deskutils/basket/Makefile                       |  2 +-
> deskutils/birdtray/Makefile                     |  4 ++--
> deskutils/calibre/Makefile                      |  2 +-
> deskutils/calindori/Makefile                    |  4 ++--
> deskutils/charmtimetracker/Makefile             |  2 +-
> deskutils/coolreader/Makefile                   |  2 +-
> deskutils/copyq/Makefile                        |  4 ++--
> deskutils/coregarage/Makefile                   |  2 +-
> deskutils/fet/Makefile                          |  2 +-
> deskutils/flameshot/Makefile                    |  2 +-
> deskutils/grantlee-editor/Makefile              |  4 ++--
> deskutils/grantleetheme/Makefile                |  4 ++--
> deskutils/itinerary/Makefile                    |  4 ++--
> deskutils/kaddressbook/Makefile                 |  6 +++---
> deskutils/kalarm/Makefile                       |  6 +++---
> deskutils/kalendar/Makefile                     |  6 +++---
> deskutils/kcharselect/Makefile                  |  4 ++--
> deskutils/kchmviewer/Makefile                   |  2 +-
> deskutils/kdeconnect-kde/Makefile               |  4 ++--
> deskutils/kdepim-addons/Makefile                |  4 ++--
> deskutils/kdepim-runtime/Makefile               |  2 +-
> deskutils/keditbookmarks/Makefile               |  4 ++--
> deskutils/kfind/Makefile                        |  4 ++--
> deskutils/kmail-account-wizard/Makefile         |  4 ++--
> deskutils/kmail/Makefile                        |  6 +++---
> deskutils/knotes/Makefile                       |  4 ++--
> deskutils/kodaskanna/Makefile                   |  4 ++--
> deskutils/kongress/Makefile                     |  4 ++--
> deskutils/kontact/Makefile                      |  4 ++--
> deskutils/korganizer/Makefile                   |  6 +++---
> deskutils/kruler/Makefile                       |  4 ++--
> deskutils/ktimetracker/Makefile                 |  4 ++--
> deskutils/kuserfeedback/Makefile                |  2 +-
> deskutils/latte-dock/Makefile                   |  4 ++--
> deskutils/libcprime/Makefile                    |  2 +-
> deskutils/libkdepim/Makefile                    |  4 ++--
> deskutils/libportal/Makefile                    |  2 +-
> deskutils/lumina-archiver/Makefile              |  4 ++--
> deskutils/lumina-calculator/Makefile            |  4 ++--
> deskutils/lumina-fileinfo/Makefile              |  4 ++--
> deskutils/lumina-fm/Makefile                    |  4 ++--
> deskutils/lumina-mediaplayer/Makefile           |  4 ++--
> deskutils/lumina-pdf/Makefile                   |  4 ++--
> deskutils/lumina-photo/Makefile                 |  4 ++--
> deskutils/lumina-screenshot/Makefile            |  4 ++--
> deskutils/lumina-textedit/Makefile              |  4 ++--
> deskutils/lxqt-notificationd/Makefile           |  2 +-
> deskutils/maliit-framework/Makefile             |  2 +-
> deskutils/maliit-keyboard/Makefile              |  2 +-
> deskutils/mbox-importer/Makefile                |  4 ++--
> deskutils/mindforger/Makefile                   |  2 +-
> deskutils/nextcloudclient/Makefile              |  4 ++--
> deskutils/owncloudclient/Makefile               |  2 +-
> deskutils/pim-data-exporter/Makefile            |  4 ++--
> deskutils/pim-sieve-editor/Makefile             |  4 ++--
> deskutils/plasma5-milou/Makefile                |  2 +-
> deskutils/plasma5-sddm-kcm/Makefile             |  2 +-
> .../plasma5-xdg-desktop-portal-kde/Makefile     |  4 ++--
> deskutils/qlipper/Makefile                      |  2 +-
> deskutils/qownnotes/Makefile                    |  2 +-
> deskutils/qtfeedback/Makefile                   |  2 +-
> deskutils/recoll/Makefile                       |  2 +-
> deskutils/semantik/Makefile                     |  2 +-
> deskutils/syncthingtray/Makefile                |  4 ++--
> deskutils/todour/Makefile                       |  2 +-
> deskutils/zanshin/Makefile                      |  4 ++--
> deskutils/znotes/Makefile                       |  2 +-
> devel/RStudio/Makefile                          |  2 +-
> devel/apitrace/Makefile                         |  2 +-
> devel/cervisia/Makefile                         |  4 ++--
> devel/cmake-doc/Makefile                        |  2 +-
> devel/cmake-gui/Makefile                        |  2 +-
> devel/codequery/Makefile                        |  2 +-
> devel/cppcheck/Makefile                         |  2 +-
> devel/dolphin-plugins/Makefile                  |  2 +-
> devel/doxygen/Makefile                          |  2 +-
> devel/easy-profiler/Makefile                    |  2 +-
> devel/elf-dissector/Makefile                    |  4 ++--
> devel/eql5/Makefile                             |  2 +-
> devel/fuel/Makefile                             |  2 +-
> devel/gammaray/Makefile                         |  2 +-
> devel/gitklient/Makefile                        |  2 +-
> devel/gitqlient/Makefile                        |  2 +-
> devel/grantlee5/Makefile                        |  2 +-
> devel/gwenhywfar/Makefile                       |  2 +-
> devel/heaptrack/Makefile                        |  2 +-
> devel/heimdall/Makefile                         |  2 +-
> devel/injeqt/Makefile                           |  2 +-
> devel/kapptemplate/Makefile                     |  4 ++--
> devel/kcachegrind/Makefile                      |  4 ++--
> devel/kdbg/Makefile                             |  2 +-
> devel/kde-dev-scripts/Makefile                  |  2 +-
> devel/kde-dev-utils/Makefile                    |  4 ++--
> devel/kdesdk-kio/Makefile                       |  4 ++--
> devel/kdesdk-thumbnailers/Makefile              |  4 ++--
> devel/kdesdk/Makefile                           |  2 +-
> devel/kdesvn/Makefile                           |  4 ++--
> devel/kdev-php/Makefile                         |  2 +-
> devel/kdev-python/Makefile                      |  2 +-
> devel/kdevelop-pg-qt/Makefile                   |  2 +-
> devel/kdevelop/Makefile                         |  4 ++--
> devel/kf5-extra-cmake-modules/Makefile          |  4 ++--
> devel/kf5-kauth/Makefile                        |  4 ++--
> devel/kf5-kbookmarks/Makefile                   |  4 ++--
> devel/kf5-kcmutils/Makefile                     |  4 ++--
> devel/kf5-kconfig/Makefile                      |  4 ++--
> devel/kf5-kcoreaddons/Makefile                  |  4 ++--
> devel/kf5-kcrash/Makefile                       |  4 ++--
> devel/kf5-kdbusaddons/Makefile                  |  4 ++--
> devel/kf5-kdeclarative/Makefile                 |  4 ++--
> devel/kf5-kdoctools/Makefile                    |  4 ++--
> devel/kf5-kfilemetadata/Makefile                |  4 ++--
> devel/kf5-ki18n/Makefile                        |  4 ++--
> devel/kf5-kidletime/Makefile                    |  4 ++--
> devel/kf5-kio/Makefile                          |  4 ++--
> devel/kf5-kitemmodels/Makefile                  |  4 ++--
> devel/kf5-knewstuff/Makefile                    |  4 ++--
> devel/kf5-knotifications/Makefile               |  4 ++--
> devel/kf5-knotifyconfig/Makefile                |  4 ++--
> devel/kf5-kpackage/Makefile                     |  4 ++--
> devel/kf5-kparts/Makefile                       |  2 +-
> devel/kf5-kpeople/Makefile                      |  4 ++--
> devel/kf5-kpty/Makefile                         |  4 ++--
> devel/kf5-kservice/Makefile                     |  4 ++--
> devel/kf5-ktexteditor/Makefile                  |  4 ++--
> devel/kf5-kunitconversion/Makefile              |  4 ++--
> devel/kf5-solid/Makefile                        |  4 ++--
> devel/kf5-threadweaver/Makefile                 |  4 ++--
> devel/kio-extras/Makefile                       |  4 ++--
> devel/kirigami-gallery/Makefile                 |  4 ++--
> devel/kpublictransport/Makefile                 |  2 +-
> devel/libdbusmenu-qt/Makefile                   |  2 +-
> devel/liblxqt/Makefile                          |  2 +-
> devel/libqtxdg/Makefile                         |  2 +-
> devel/liteide/Makefile                          |  2 +-
> devel/lokalize/Makefile                         |  4 ++--
> devel/lxqt-build-tools/Makefile                 |  2 +-
> devel/mercurial/Makefile                        |  2 +-
> devel/nextpnr/Makefile                          |  2 +-
> devel/okteta/Makefile                           |  2 +-
> devel/plasma5-khotkeys/Makefile                 |  4 ++--
> devel/plasma5-kwrited/Makefile                  |  2 +-
> devel/plasma5-plasma-sdk/Makefile               |  4 ++--
> devel/poxml/Makefile                            |  2 +-
> devel/py-pyface/Makefile                        |  2 +-
> devel/py-qt5-pyqt/Makefile                      |  2 +-
> devel/py-qt5-qscintilla2/Makefile               |  4 ++--
> devel/pyotherside-qt5/Makefile                  |  2 +-
> devel/pyside2-tools/Makefile                    |  2 +-
> devel/pyside2/Makefile                          |  4 ++--
> devel/qca/Makefile                              |  2 +-
> devel/qconf/Makefile                            |  2 +-
> devel/qcoro/Makefile                            |  2 +-
> devel/qgit/Makefile                             |  2 +-
> devel/qjson/Makefile                            |  2 +-
> devel/qschematic/Makefile                       |  2 +-
> devel/qscintilla2-designerplugin-qt5/Makefile   |  2 +-
> devel/qscintilla2-qt5/Makefile                  |  2 +-
> devel/qt5-assistant/Makefile                    |  2 +-
> devel/qt5-concurrent/Makefile                   |  2 +-
> devel/qt5-core/Makefile                         |  2 +-
> devel/qt5-dbus/Makefile                         |  2 +-
> devel/qt5-designer/Makefile                     |  4 ++--
> devel/qt5-help/Makefile                         |  2 +-
> devel/qt5-linguist/Makefile                     |  4 ++--
> devel/qt5-linguisttools/Makefile                |  2 +-
> devel/qt5-location/Makefile                     |  2 +-
> devel/qt5-qdbus/Makefile                        |  2 +-
> devel/qt5-qdbusviewer/Makefile                  |  2 +-
> devel/qt5-qdoc/Makefile                         |  2 +-
> devel/qt5-remoteobjects/Makefile                |  2 +-
> devel/qt5-script/Makefile                       |  2 +-
> devel/qt5-scripttools/Makefile                  |  2 +-
> devel/qt5-scxml/Makefile                        |  2 +-
> devel/qt5-testlib/Makefile                      |  2 +-
> devel/qt5-uitools/Makefile                      |  2 +-
> devel/qt5/Makefile.sqldrivers                   |  2 +-
> devel/qtcreator/Makefile                        |  4 ++--
> devel/redasm/Makefile                           |  2 +-
> devel/sasm/Makefile                             |  2 +-
> devel/shiboken2/Makefile                        |  2 +-
> devel/umbrello/Makefile                         |  4 ++--
> devel/vitables/Makefile                         |  2 +-
> devel/xelfviewer/Makefile                       |  2 +-
> devel/xopcodecalc/Makefile                      |  2 +-
> devel/xpeviewer/Makefile                        |  2 +-
> devel/zeal/Makefile                             |  2 +-
> dns/kf5-kdnssd/Makefile                         |  4 ++--
> dns/knock/Makefile                              |  2 +-
> dns/knot-resolver/Makefile                      |  4 ++--
> dns/qmdnsengine/Makefile                        |  2 +-
> editors/calligra/Makefile                       |  4 ++--
> editors/calligraplan/Makefile                   |  4 ++--
> editors/cpeditor/Makefile                       |  2 +-
> editors/encryptpad/Makefile                     |  2 +-
> editors/featherpad/Makefile                     |  2 +-
> editors/focuswriter/Makefile                    |  2 +-
> editors/ghostwriter/Makefile                    |  4 ++--
> editors/kate/Makefile                           |  4 ++--
> editors/kile/Makefile                           |  4 ++--
> editors/libreoffice/Makefile                    |  2 +-
> editors/mp/Makefile                             |  2 +-
> editors/neovim-qt/Makefile                      |  2 +-
> editors/notepadnext/Makefile                    |  4 ++--
> editors/tea/Makefile                            |  2 +-
> editors/texmaker/Makefile                       |  2 +-
> editors/texstudio/Makefile                      |  2 +-
> editors/texworks/Makefile                       |  2 +-
> emulators/aqemu/Makefile                        |  2 +-
> emulators/cemu/Makefile                         |  2 +-
> emulators/citra/Makefile                        |  2 +-
> emulators/dolphin-emu/Makefile                  |  2 +-
> emulators/emu64/Makefile                        |  2 +-
> emulators/fceux/Makefile                        |  2 +-
> emulators/libretro-kronos/Makefile              |  2 +-
> emulators/mame/Makefile                         |  2 +-
> emulators/mgba/Makefile                         |  2 +-
> emulators/mupen64plus-qt/Makefile               |  4 ++--
> emulators/ppsspp/Makefile                       |  2 +-
> emulators/qmc2/Makefile                         |  4 ++--
> emulators/ripes/Makefile                        |  2 +-
> emulators/rpcs3/Makefile                        |  2 +-
> emulators/ukncbtl/Makefile                      |  2 +-
> emulators/virtualbox-ose-legacy/Makefile        |  2 +-
> emulators/virtualbox-ose/Makefile               |  2 +-
> emulators/yuzu/Makefile                         |  4 ++--
> finance/alkimia/Makefile                        |  4 ++--
> finance/kmymoney/Makefile                       |  6 +++---
> finance/kraft/Makefile                          |  2 +-
> finance/qtbitcointrader/Makefile                |  2 +-
> finance/skrooge/Makefile                        |  6 +++---
> french/aster/Makefile                           |  2 +-
> games/2048-qt/Makefile                          |  2 +-
> games/LibreMines/Makefile                       |  2 +-
> games/auralquiz/Makefile                        |  2 +-
> games/blinken/Makefile                          |  4 ++--
> games/bomber/Makefile                           |  4 ++--
> games/bovo/Makefile                             |  4 ++--
> games/bubble-chains/Makefile                    |  2 +-
> games/chessx/Makefile                           |  2 +-
> games/cockatrice/Makefile                       |  4 ++--
> games/colorcode/Makefile                        |  2 +-
> games/connectagram/Makefile                     |  2 +-
> games/cutemaze/Makefile                         |  4 ++--
> games/doomsday/Makefile                         |  2 +-
> games/dustrac/Makefile                          |  2 +-
> games/freeciv/Makefile                          |  2 +-
> games/gcompris-qt/Makefile                      |  6 +++---
> games/gottet/Makefile                           |  2 +-
> games/granatier/Makefile                        |  4 ++--
> games/hedgewars/Makefile                        |  4 ++--
> games/hexalate/Makefile                         |  2 +-
> games/iqpuzzle/Makefile                         |  2 +-
> games/kanagram/Makefile                         |  4 ++--
> games/kapman/Makefile                           |  4 ++--
> games/katomic/Makefile                          |  4 ++--
> games/kblackbox/Makefile                        |  4 ++--
> games/kblocks/Makefile                          |  2 +-
> games/kbounce/Makefile                          |  4 ++--
> games/kbreakout/Makefile                        |  4 ++--
> games/kdiamond/Makefile                         |  4 ++--
> games/kfourinline/Makefile                      |  4 ++--
> games/kgoldrunner/Makefile                      |  4 ++--
> games/khangman/Makefile                         |  4 ++--
> games/kigo/Makefile                             |  4 ++--
> games/killbots/Makefile                         |  4 ++--
> games/kiriki/Makefile                           |  4 ++--
> games/kjumpingcube/Makefile                     |  4 ++--
> games/klickety/Makefile                         |  4 ++--
> games/klines/Makefile                           |  4 ++--
> games/kmahjongg/Makefile                        |  4 ++--
> games/kmines/Makefile                           |  4 ++--
> games/knavalbattle/Makefile                     |  4 ++--
> games/knetwalk/Makefile                         |  4 ++--
> games/knights/Makefile                          |  2 +-
> games/kolf/Makefile                             |  4 ++--
> games/kollision/Makefile                        |  4 ++--
> games/konquest/Makefile                         |  4 ++--
> games/kpat/Makefile                             |  4 ++--
> games/kreversi/Makefile                         |  4 ++--
> games/kshisen/Makefile                          |  4 ++--
> games/ksirk/Makefile                            |  2 +-
> games/ksnakeduel/Makefile                       |  4 ++--
> games/kspaceduel/Makefile                       |  4 ++--
> games/ksquares/Makefile                         |  4 ++--
> games/ksudoku/Makefile                          |  4 ++--
> games/ktuberling/Makefile                       |  4 ++--
> games/kubrick/Makefile                          |  4 ++--
> games/leela-zero/Makefile                       |  2 +-
> games/libkdegames/Makefile                      |  4 ++--
> games/libkmahjongg/Makefile                     |  4 ++--
> games/lskat/Makefile                            |  4 ++--
> games/multimc/Makefile                          |  4 ++--
> games/openage/Makefile                          |  2 +-
> games/openmw/Makefile                           |  4 ++--
> games/palapeli/Makefile                         |  2 +-
> games/peg-e/Makefile                            |  2 +-
> games/pentobi/Makefile                          |  2 +-
> games/picmi/Makefile                            |  4 ++--
> games/pokerth/Makefile                          |  2 +-
> games/py-mnemosyne/Makefile                     |  2 +-
> games/qnetwalk/Makefile                         |  2 +-
> games/simsu/Makefile                            |  2 +-
> games/solarus-quest-editor/Makefile             |  2 +-
> games/solarus/Makefile                          |  2 +-
> games/tanglet/Makefile                          |  2 +-
> games/tetzle/Makefile                           |  2 +-
> games/wyrmgus/Makefile                          |  2 +-
> games/xnethack/Makefile                         |  2 +-
> graphics/appleseed/Makefile                     |  2 +-
> graphics/cloudcompare/Makefile                  |  2 +-
> graphics/colmap/Makefile                        |  2 +-
> graphics/converseen/Makefile                    |  2 +-
> graphics/diffpdf/Makefile                       |  2 +-
> graphics/digikam/Makefile                       |  6 +++---
> graphics/dilay/Makefile                         |  2 +-
> graphics/djview4/Makefile                       |  2 +-
> graphics/drawpile/Makefile                      |  2 +-
> graphics/dspdfviewer/Makefile                   |  2 +-
> graphics/dust3d/Makefile                        |  2 +-
> graphics/engauge-digitizer/Makefile             |  4 ++--
> graphics/eos-movrec/Makefile                    |  2 +-
> graphics/epsonscan2/Makefile                    |  2 +-
> graphics/evolvotron/Makefile                    |  2 +-
> graphics/filmulator/Makefile                    |  2 +-
> graphics/fracplanet/Makefile                    |  2 +-
> graphics/fractgen/Makefile                      |  2 +-
> graphics/fraqtive/Makefile                      |  2 +-
> graphics/glaxnimate/Makefile                    |  2 +-
> graphics/glbinding/Makefile                     |  2 +-
> graphics/gmic-qt/Makefile                       |  2 +-
> graphics/gpxsee/Makefile                        |  8 ++++----
> graphics/gwenview/Makefile                      |  4 ++--
> graphics/heimer/Makefile                        |  4 ++--
> graphics/ikona/Makefile                         |  2 +-
> graphics/ipe/Makefile                           |  2 +-
> graphics/kamera/Makefile                        |  4 ++--
> graphics/kamerka/Makefile                       |  4 ++--
> graphics/katarakt/Makefile                      |  2 +-
> graphics/kcolorchooser/Makefile                 |  4 ++--
> graphics/kcolorpicker/Makefile                  |  2 +-
> graphics/kdegraphics-mobipocket/Makefile        |  4 ++--
> graphics/kdegraphics-svgpart/Makefile           |  4 ++--
> graphics/kdegraphics-thumbnailers/Makefile      |  4 ++--
> graphics/kdiagram/Makefile                      |  2 +-
> graphics/kf5-kimageformats/Makefile             |  4 ++--
> graphics/kf5-kplotting/Makefile                 |  4 ++--
> graphics/kf5-kquickcharts/Makefile              |  8 ++++----
> graphics/kf5-prison/Makefile                    |  4 ++--
> graphics/kgeotag/Makefile                       |  4 ++--
> graphics/kgraphviewer/Makefile                  |  4 ++--
> graphics/kimageannotator/Makefile               |  2 +-
> graphics/kimagemapeditor/Makefile               |  2 +-
> graphics/kipi-plugins/Makefile                  |  4 ++--
> graphics/klatexformula/Makefile                 |  4 ++--
> graphics/knotter/Makefile                       |  2 +-
> graphics/kolourpaint/Makefile                   |  4 ++--
> graphics/kontrast/Makefile                      |  4 ++--
> graphics/kooka/Makefile                         |  4 ++--
> graphics/kphotoalbum/Makefile                   |  2 +-
> graphics/kqtquickcharts/Makefile                |  2 +-
> graphics/kquickimageeditor/Makefile             |  4 ++--
> graphics/krita/Makefile                         |  4 ++--
> graphics/ksanecore/Makefile                     |  4 ++--
> graphics/kseexpr/Makefile                       |  2 +-
> graphics/ksnip/Makefile                         |  4 ++--
> graphics/kxstitch/Makefile                      |  4 ++--
> graphics/libQGLViewer/Makefile                  |  2 +-
> graphics/libkdcraw/Makefile                     |  2 +-
> graphics/libkexiv2/Makefile                     |  2 +-
> graphics/libkipi/Makefile                       |  4 ++--
> graphics/libksane/Makefile                      |  4 ++--
> graphics/libprojectm/Makefile                   |  4 ++--
> graphics/luminance-qt5/Makefile                 |  2 +-
> graphics/lximage-qt/Makefile                    |  2 +-
> graphics/mandelbulber/Makefile                  |  2 +-
> graphics/nomacs/Makefile                        |  2 +-
> graphics/okular/Makefile                        |  4 ++--
> graphics/opencsg/Makefile                       |  2 +-
> graphics/opencv/Makefile                        |  2 +-
> graphics/openimageio/Makefile                   |  4 ++--
> graphics/openorienteering-mapper/Makefile       |  8 ++++----
> graphics/openshadinglanguage/Makefile           |  4 ++--
> graphics/osg34/Makefile                         |  2 +-
> graphics/ospray/Makefile                        |  2 +-
> graphics/oyranos/Makefile                       |  2 +-
> graphics/pcl-pointclouds/Makefile               |  2 +-
> graphics/pencil2d/Makefile                      |  2 +-
> graphics/peruse/Makefile                        |  2 +-
> graphics/pfstools/Makefile                      |  2 +-
> graphics/photivo/Makefile                       |  2 +-
> graphics/photoflare/Makefile                    |  2 +-
> graphics/photoqt/Makefile                       |  2 +-
> graphics/phototonic/Makefile                    |  2 +-
> graphics/poppler/Makefile                       |  2 +-
> graphics/py-python-poppler-qt5/Makefile         |  2 +-
> graphics/py-traitsui/Makefile                   |  2 +-
> graphics/qcomicbook/Makefile                    |  2 +-
> graphics/qcustomplot-qt5/Makefile               |  2 +-
> graphics/qgis-ltr/Makefile                      |  8 ++++----
> graphics/qgis/Makefile                          |  8 ++++----
> graphics/qt5-3d/Makefile                        |  2 +-
> graphics/qt5-graphicaleffects/Makefile          |  2 +-
> graphics/qt5-imageformats/Makefile              |  2 +-
> graphics/qt5-opengl/Makefile                    |  2 +-
> graphics/qt5-pixeltool/Makefile                 |  2 +-
> graphics/qt5-svg/Makefile                       |  2 +-
> graphics/qt5-wayland/Makefile                   |  2 +-
> graphics/qtawesome/Makefile                     |  2 +-
> graphics/qtpbfimageplugin/Makefile              |  2 +-
> graphics/qtqr/Makefile                          |  2 +-
> graphics/quickqanava/Makefile                   |  2 +-
> graphics/qvge/Makefile                          |  2 +-
> graphics/rapid-photo-downloader/Makefile        |  2 +-
> graphics/scantailor/Makefile                    |  4 ++--
> graphics/seexpr/Makefile                        |  4 ++--
> graphics/showimage/Makefile                     |  4 ++--
> graphics/skanlite/Makefile                      |  4 ++--
> graphics/skanpage/Makefile                      |  4 ++--
> graphics/spectacle/Makefile                     |  4 ++--
> graphics/tiled/Makefile                         |  2 +-
> graphics/vpaint/Makefile                        |  2 +-
> graphics/vulkan-caps-viewer/Makefile            |  4 ++--
> graphics/vv/Makefile                            |  2 +-
> graphics/wrapland/Makefile                      |  6 +++---
> graphics/xaos/Makefile                          |  2 +-
> graphics/xpdf4/Makefile                         |  2 +-
> graphics/yacreader/Makefile                     |  4 ++--
> graphics/yafaray/Makefile                       |  2 +-
> graphics/zbar/Makefile                          |  2 +-
> graphics/zint/Makefile                          |  2 +-
> irc/dxirc/Makefile                              |  2 +-
> irc/konversation/Makefile                       |  6 +++---
> irc/kvirc/Makefile                              |  2 +-
> irc/quassel/Makefile                            | 10 +++++-----
> irc/srain/Makefile                              |  4 ++--
> japanese/fcitx-skk/Makefile                     |  2 +-
> japanese/kiten/Makefile                         |  4 ++--
> lang/kf5-kross/Makefile                         |  4 ++--
> lang/kross-interpreters/Makefile                |  4 ++--
> lang/kturtle/Makefile                           |  4 ++--
> lang/smlnj/Makefile                             |  2 +-
> mail/trojita/Makefile                           |  2 +-
> math/acalc/Makefile                             |  2 +-
> math/analitza/Makefile                          |  4 ++--
> math/asymptote/Makefile                         |  2 +-
> math/cantor/Makefile                            |  4 ++--
> math/cgal/Makefile                              |  2 +-
> math/g2o/Makefile                               |  2 +-
> math/gecode/Makefile                            |  2 +-
> math/kalgebra/Makefile                          |  4 ++--
> math/kbruch/Makefile                            |  4 ++--
> math/kcalc/Makefile                             |  4 ++--
> math/kig/Makefile                               |  4 ++--
> math/kmplot/Makefile                            |  4 ++--
> math/labplot/Makefile                           |  4 ++--
> math/mathgl/Makefile                            |  2 +-
> math/mathmod/Makefile                           |  2 +-
> math/minizinc-ide/Makefile                      |  2 +-
> math/mpsolve/Makefile                           |  2 +-
> math/octave/Makefile                            |  2 +-
> math/octomap/Makefile                           |  2 +-
> math/openmesh/Makefile                          |  2 +-
> math/plplot/Makefile                            |  2 +-
> math/qalculate-qt/Makefile                      |  2 +-
> math/qwtplot3d/Makefile                         |  2 +-
> math/rkward/Makefile                            |  2 +-
> math/rocs/Makefile                              |  4 ++--
> math/speedcrunch/Makefile                       |  2 +-
> math/taucs/Makefile                             |  2 +-
> math/vtk6/Makefile                              |  4 ++--
> math/vtk8/Makefile                              |  2 +-
> math/vtk9/Makefile                              |  2 +-
> math/zegrapher/Makefile                         |  2 +-
> misc/actiona/Makefile                           |  4 ++--
> misc/artikulate/Makefile                        |  4 ++--
> misc/bibletime/Makefile                         |  4 ++--
> misc/crosti/Makefile                            |  2 +-
> misc/ecflow/Makefile                            |  2 +-
> misc/edfbrowser/Makefile                        |  2 +-
> misc/ezc3d/Makefile                             |  2 +-
> misc/kde-thumbnailer-chm/Makefile               |  4 ++--
> misc/kde-thumbnailer-epub/Makefile              |  4 ++--
> misc/kde-thumbnailer-fb2/Makefile               |  4 ++--
> misc/kdeedu-data/Makefile                       |  2 +-
> misc/kf5-purpose/Makefile                       |  4 ++--
> misc/kgeography/Makefile                        |  4 ++--
> misc/klettres/Makefile                          |  4 ++--
> misc/kookbook/Makefile                          |  4 ++--
> misc/ktouch/Makefile                            |  4 ++--
> misc/kwordquiz/Makefile                         |  4 ++--
> misc/libkeduvocdocument/Makefile                |  4 ++--
> misc/molequeue/Makefile                         |  2 +-
> misc/nn-insight/Makefile                        |  2 +-
> misc/openhantek/Makefile                        |  2 +-
> misc/openmvg/Makefile                           |  2 +-
> misc/orange3/Makefile                           |  6 +++---
> misc/orion/Makefile                             |  2 +-
> misc/parley/Makefile                            |  4 ++--
> misc/qbrew/Makefile                             |  2 +-
> misc/qt5-l10n/Makefile                          |  2 +-
> misc/qt5ct/Makefile                             |  2 +-
> misc/tellico/Makefile                           |  4 ++--
> misc/valentina/Makefile                         |  4 ++--
> misc/veles/Makefile                             |  2 +-
> multimedia/QtAV/Makefile                        |  2 +-
> multimedia/audacious/Makefile                   |  2 +-
> multimedia/avidemux/Makefile.common             |  2 +-
> multimedia/baka-mplayer/Makefile                |  4 ++--
> multimedia/bino/Makefile                        |  2 +-
> multimedia/cineencoder/Makefile                 |  2 +-
> multimedia/dragon/Makefile                      |  4 ++--
> multimedia/dvbcut/Makefile                      |  2 +-
> multimedia/ffaudioconverter/Makefile            |  2 +-
> multimedia/gstreamer1-plugins/Makefile.common   |  2 +-
> multimedia/gstreamer1-qt/Makefile               |  2 +-
> multimedia/haruna/Makefile                      |  6 +++---
> multimedia/kaffeine/Makefile                    |  4 ++--
> multimedia/kamoso/Makefile                      |  4 ++--
> multimedia/kdemultimedia-ffmpegthumbs/Makefile  |  2 +-
> multimedia/kdenlive/Makefile                    |  8 ++++----
> multimedia/kf5-kmediaplayer/Makefile            |  4 ++--
> multimedia/kmplayer/Makefile                    |  4 ++--
> multimedia/libopenshot/Makefile                 |  2 +-
> multimedia/minitube/Makefile                    |  4 ++--
> multimedia/mkvtoolnix/Makefile                  |  2 +-
> multimedia/mlt6-qt5/Makefile                    |  2 +-
> multimedia/mlt7-glaxnimate/Makefile             |  2 +-
> multimedia/mlt7-qt5/Makefile                    |  2 +-
> multimedia/mpc-qt/Makefile                      |  4 ++--
> multimedia/mpv/Makefile                         |  2 +-
> multimedia/musique/Makefile                     |  4 ++--
> multimedia/mythtv/Makefile                      |  6 +++---
> multimedia/obs-ndi/Makefile                     |  2 +-
> multimedia/obs-scrab/Makefile                   |  2 +-
> multimedia/obs-streamfx/Makefile                |  2 +-
> multimedia/obs-studio/Makefile                  |  2 +-
> multimedia/obs-transition-matrix/Makefile       |  2 +-
> multimedia/obs-v4l2sink/Makefile                |  2 +-
> multimedia/obs-websocket/Makefile               |  2 +-
> multimedia/olive/Makefile                       |  2 +-
> multimedia/opentoonz/Makefile                   |  2 +-
> multimedia/phonon-designerplugin/Makefile       |  2 +-
> multimedia/phonon-gstreamer/Makefile            |  2 +-
> multimedia/phonon-vlc/Makefile                  |  2 +-
> multimedia/phonon/Makefile                      |  2 +-
> multimedia/qmmp-plugin-pack-qt5/Makefile        |  2 +-
> multimedia/qmmp-plugin-pack-qt6/Makefile        |  2 +-
> multimedia/qmmp-qt5/Makefile                    |  2 +-
> multimedia/qmmp-qt6/Makefile                    |  2 +-
> multimedia/qpwgraph/Makefile                    |  2 +-
> multimedia/qt5-multimedia/Makefile              |  2 +-
> multimedia/qwinff/Makefile                      |  4 ++--
> multimedia/shotcut/Makefile                     |  2 +-
> multimedia/simplescreenrecorder/Makefile        |  2 +-
> multimedia/smplayer-skins/Makefile              |  2 +-
> multimedia/smplayer-themes/Makefile             |  2 +-
> multimedia/smplayer/Makefile                    |  2 +-
> multimedia/smtube/Makefile                      |  2 +-
> multimedia/subtitlecomposer/Makefile            |  6 +++---
> multimedia/vlc/Makefile                         |  2 +-
> multimedia/webcamoid/Makefile                   |  2 +-
> multimedia/zart/Makefile                        |  2 +-
> net-im/beebeep/Makefile                         |  2 +-
> net-im/chatterino2/Makefile                     |  2 +-
> net-im/cutegram/Makefile                        |  2 +-
> net-im/gitterdone/Makefile                      |  4 ++--
> net-im/kaccounts-integration/Makefile           |  4 ++--
> net-im/kaccounts-providers/Makefile             |  2 +-
> net-im/kaidan/Makefile                          |  2 +-
> net-im/kopete/Makefile                          |  4 ++--
> net-im/ktp-accounts-kcm/Makefile                |  4 ++--
> net-im/ktp-approver/Makefile                    |  4 ++--
> net-im/ktp-auth-handler/Makefile                |  4 ++--
> net-im/ktp-call-ui/Makefile                     |  4 ++--
> net-im/ktp-common-internals/Makefile            |  4 ++--
> net-im/ktp-contact-list/Makefile                |  4 ++--
> net-im/ktp-contact-runner/Makefile              |  4 ++--
> net-im/ktp-desktop-applets/Makefile             |  4 ++--
> net-im/ktp-filetransfer-handler/Makefile        |  4 ++--
> net-im/ktp-kded-module/Makefile                 |  2 +-
> net-im/ktp-send-file/Makefile                   |  4 ++--
> net-im/ktp-text-ui/Makefile                     |  4 ++--
> net-im/libaccounts-qt5/Makefile                 |  2 +-
> net-im/libqtelegram-ae/Makefile                 |  2 +-
> net-im/libquotient/Makefile                     |  2 +-
> net-im/neochat/Makefile                         |  4 ++--
> net-im/nheko/Makefile                           |  4 ++--
> net-im/psi/Makefile                             |  2 +-
> net-im/qTox/Makefile                            |  4 ++--
> net-im/quaternion/Makefile                      |  2 +-
> net-im/qxmpp-qt5/Makefile                       |  2 +-
> net-im/ricochet/Makefile                        |  2 +-
> net-im/ruqola/Makefile                          |  4 ++--
> net-im/scudcloud/Makefile                       |  2 +-
> net-im/spectral/Makefile                        |  2 +-
> net-im/teamwords/Makefile                       |  2 +-
> net-im/telegram-desktop/Makefile                |  2 +-
> net-im/telegramqml/Makefile                     |  2 +-
> net-im/telepathy-logger-qt5/Makefile            |  2 +-
> net-im/telepathy-qt/Makefile                    |  2 +-
> net-mgmt/librenms/Makefile                      |  2 +-
> net-mgmt/nagstamon/Makefile                     |  2 +-
> net-mgmt/seafile-gui/Makefile                   |  2 +-
> net-p2p/arbitrum-avm/Makefile                   |  6 +++---
> net-p2p/bitcoin/Makefile                        |  2 +-
> net-p2p/ktorrent/Makefile                       |  4 ++--
> net-p2p/libktorrent/Makefile                    |  4 ++--
> net-p2p/litecoin/Makefile                       |  2 +-
> net-p2p/namecoin/Makefile                       |  2 +-
> net-p2p/qbittorrent/Makefile                    |  2 +-
> net-p2p/retroshare/Makefile                     |  2 +-
> net-p2p/torrent-file-editor/Makefile            |  2 +-
> net-p2p/transmission-qt/Makefile                |  2 +-
> net-p2p/zetacoin/Makefile                       |  2 +-
> net/akonadi-calendar/Makefile                   |  4 ++--
> net/akonadi-contacts/Makefile                   |  4 ++--
> net/akonadi-mime/Makefile                       |  4 ++--
> net/akonadi-notes/Makefile                      |  4 ++--
> net/akonadi-search/Makefile                     |  4 ++--
> net/avahi-qt5/Makefile                          |  2 +-
> net/calendarsupport/Makefile                    |  4 ++--
> net/eventviews/Makefile                         |  4 ++--
> net/incidenceeditor/Makefile                    |  4 ++--
> net/kcalutils/Makefile                          |  4 ++--
> net/kdenetwork-filesharing/Makefile             |  4 ++--
> net/kf5-kcalendarcore/Makefile                  |  4 ++--
> net/kf5-kcontacts/Makefile                      |  4 ++--
> net/kf5-kdav/Makefile                           |  4 ++--
> net/kf5-kholidays/Makefile                      |  4 ++--
> net/kf5-kxmlrpcclient/Makefile                  |  4 ++--
> net/kf5-syndication/Makefile                    |  4 ++--
> net/kget/Makefile                               |  4 ++--
> net/kidentitymanagement/Makefile                |  4 ++--
> net/kimap/Makefile                              |  4 ++--
> net/kio-gdrive/Makefile                         |  4 ++--
> net/kio-zeroconf/Makefile                       |  2 +-
> net/kitinerary/Makefile                         |  4 ++--
> net/kldap/Makefile                              |  4 ++--
> net/kmailtransport/Makefile                     |  2 +-
> net/kmbox/Makefile                              |  2 +-
> net/kmime/Makefile                              |  4 ++--
> net/kontactinterface/Makefile                   |  4 ++--
> net/kpeoplevcard/Makefile                       |  4 ++--
> net/kpimtextedit/Makefile                       |  4 ++--
> net/krdc/Makefile                               |  4 ++--
> net/krfb/Makefile                               |  4 ++--
> net/ksmtp/Makefile                              |  2 +-
> net/ktnef/Makefile                              |  4 ++--
> net/landrop/Makefile                            |  2 +-
> net/libgravatar/Makefile                        |  4 ++--
> net/libkgapi/Makefile                           |  4 ++--
> net/libksieve/Makefile                          |  4 ++--
> net/libkvkontakte/Makefile                      |  2 +-
> net/libmaia/Makefile                            |  2 +-
> net/libmediawiki/Makefile                       |  2 +-
> net/linphone/Makefile                           |  4 ++--
> net/mailcommon/Makefile                         |  4 ++--
> net/mailimporter/Makefile                       |  4 ++--
> net/messagelib/Makefile                         |  4 ++--
> net/nitroshare/Makefile                         |  2 +-
> net/pimcommon/Makefile                          |  4 ++--
> net/py-qt5-networkauth/Makefile                 |  2 +-
> net/qoauth-qt5/Makefile                         |  2 +-
> net/qt5-network/Makefile                        |  2 +-
> net/qt5-networkauth/Makefile                    |  2 +-
> net/quiterss/Makefile                           |  4 ++--
> net/rclone-browser/Makefile                     |  2 +-
> net/remmina/Makefile                            |  2 +-
> net/rsplib/Makefile                             |  2 +-
> net/rssguard/Makefile                           |  2 +-
> net/savvycan/Makefile                           |  2 +-
> net/smb4k/Makefile                              |  4 ++--
> net/spoofer/Makefile                            |  2 +-
> net/wireshark/Makefile                          |  2 +-
> net/wpa_supplicant_gui/Makefile                 |  4 ++--
> net/x2goclient/Makefile                         |  2 +-
> polish/kadu/Makefile                            |  4 ++--
> polish/qnapi/Makefile                           |  2 +-
> ports-mgmt/octopkg/Makefile                     |  2 +-
> ports-mgmt/portrac/Makefile                     |  2 +-
> print/hplip/Makefile                            |  2 +-
> print/limereport/Makefile                       |  4 ++--
> print/lyx/Makefile                              |  2 +-
> print/miktex/Makefile                           |  2 +-
> print/posterazor/Makefile                       |  2 +-
> print/print-manager/Makefile                    |  4 ++--
> print/qpdfview/Makefile                         |  2 +-
> print/qt5-printsupport/Makefile                 |  2 +-
> print/scribus-devel/Makefile                    |  4 ++--
> science/avogadro2/Makefile                      |  2 +-
> science/avogadrolibs/Makefile                   |  2 +-
> science/elmerfem/Makefile                       |  4 ++--
> science/iboview/Makefile                        |  2 +-
> science/kalzium/Makefile                        |  4 ++--
> science/kst2/Makefile                           |  2 +-
> science/liggghts/Makefile                       |  2 +-
> science/massxpert/Makefile                      |  4 ++--
> science/molsketch/Makefile                      |  2 +-
> science/paraview/Makefile                       |  2 +-
> science/pulseview/Makefile                      |  2 +-
> science/py-pymol/Makefile                       |  2 +-
> science/py-veusz/Makefile                       |  2 +-
> science/scidavis/Makefile                       |  2 +-
> science/shelxle/Makefile                        |  2 +-
> science/step/Makefile                           |  4 ++--
> science/vipster/Makefile                        |  2 +-
> science/xdrawchem/Makefile                      |  2 +-
> security/fwbuilder/Makefile                     |  4 ++--
> security/globalprotect-openconnect/Makefile     |  2 +-
> security/gpgme/Makefile                         |  4 ++--
> security/keepassxc/Makefile                     |  4 ++--
> security/kf5-kdesu/Makefile                     |  4 ++--
> security/kgpg/Makefile                          |  4 ++--
> security/kleopatra/Makefile                     |  4 ++--
> security/kpkpass/Makefile                       |  2 +-
> security/kwalletmanager/Makefile                |  4 ++--
> security/libkleo/Makefile                       |  2 +-
> security/lxqt-openssh-askpass/Makefile          |  2 +-
> security/lxqt-sudo/Makefile                     |  2 +-
> security/nitrokey-app/Makefile                  |  2 +-
> security/openconnect-gui/Makefile               |  2 +-
> security/ophcrack/Makefile                      |  2 +-
> security/pinentry/Makefile                      |  2 +-
> security/plasma5-kscreenlocker/Makefile         |  4 ++--
> security/plasma5-ksshaskpass/Makefile           |  4 ++--
> security/plasma5-kwallet-pam/Makefile           |  2 +-
> security/qtkeychain/Makefile                    |  4 ++--
> security/spass-qt5/Makefile                     |  2 +-
> security/xca/Makefile                           |  2 +-
> security/yubikey-manager-qt/Makefile            |  2 +-
> security/yubikey-personalization-gui/Makefile   |  2 +-
> security/yubioath-desktop/Makefile              |  2 +-
> sysutils/UEFITool/Makefile                      |  2 +-
> sysutils/accounts-qml-module/Makefile           |  2 +-
> sysutils/android-file-transfer/Makefile         |  2 +-
> sysutils/angrysearch/Makefile                   |  2 +-
> sysutils/baloo-widgets/Makefile                 |  4 ++--
> sysutils/bareos-traymonitor/Makefile            |  2 +-
> sysutils/bareos18-traymonitor/Makefile          |  2 +-
> sysutils/bareos19-traymonitor/Makefile          |  2 +-
> sysutils/bareos20-traymonitor/Makefile          |  2 +-
> sysutils/barrier/Makefile                       |  2 +-
> sysutils/bsdisks/Makefile                       |  2 +-
> sysutils/calamares/Makefile                     |  4 ++--
> sysutils/daggy/Makefile                         |  2 +-
> sysutils/dsbbatmon/Makefile                     |  2 +-
> sysutils/dsblogoutmgr/Makefile                  |  2 +-
> sysutils/dsbmc/Makefile                         |  2 +-
> sysutils/dsbsu/Makefile                         |  2 +-
> sysutils/filelight/Makefile                     |  4 ++--
> sysutils/glogg/Makefile                         |  2 +-
> sysutils/k3b/Makefile                           |  4 ++--
> sysutils/k4dirstat/Makefile                     |  2 +-
> sysutils/kbackup/Makefile                       |  4 ++--
> sysutils/kcron/Makefile                         |  4 ++--
> sysutils/kdebugsettings/Makefile                |  4 ++--
> sysutils/kdf/Makefile                           |  2 +-
> sysutils/kdialog/Makefile                       |  4 ++--
> sysutils/kf5-baloo/Makefile                     |  2 +-
> sysutils/kf5-kwallet/Makefile                   |  4 ++--
> sysutils/kfloppy/Makefile                       |  4 ++--
> sysutils/khelpcenter/Makefile                   |  4 ++--
> sysutils/kio-fuse/Makefile                      |  2 +-
> sysutils/kpmcore/Makefile                       |  4 ++--
> sysutils/krename/Makefile                       |  2 +-
> sysutils/kshutdown/Makefile                     |  2 +-
> sysutils/ksystemlog/Makefile                    |  4 ++--
> sysutils/libsysstat/Makefile                    |  2 +-
> sysutils/luckybackup/Makefile                   |  2 +-
> sysutils/lxqt-admin/Makefile                    |  2 +-
> sysutils/lxqt-config/Makefile                   |  2 +-
> sysutils/lxqt-policykit/Makefile                |  2 +-
> sysutils/lxqt-powermanagement/Makefile          |  2 +-
> sysutils/lxqt-qtplugin/Makefile                 |  2 +-
> sysutils/plasma-pass/Makefile                   |  4 ++--
> sysutils/plasma5-discover/Makefile              |  4 ++--
> sysutils/plasma5-drkonqi/Makefile               |  4 ++--
> sysutils/plasma5-kde-cli-tools/Makefile         |  4 ++--
> sysutils/plasma5-kinfocenter/Makefile           |  6 +++---
> sysutils/plasma5-kmenuedit/Makefile             |  4 ++--
> sysutils/plasma5-ksysguard/Makefile             |  4 ++--
> sysutils/plasma5-ksystemstats/Makefile          |  2 +-
> sysutils/plasma5-libksysguard/Makefile          |  2 +-
> sysutils/plasma5-plasma-disks/Makefile          |  2 +-
> sysutils/plasma5-plasma-systemmonitor/Makefile  |  2 +-
> sysutils/plasma5-polkit-kde-agent-1/Makefile    |  2 +-
> sysutils/plasma5-powerdevil/Makefile            |  4 ++--
> sysutils/plasma5-systemsettings/Makefile        |  4 ++--
> sysutils/polkit-qt/Makefile                     |  2 +-
> sysutils/qdirstat/Makefile                      |  2 +-
> sysutils/qsudo/Makefile                         |  2 +-
> sysutils/qtpass/Makefile                        |  2 +-
> sysutils/signon-kwallet-extension/Makefile      |  4 ++--
> sysutils/signon-plugin-oauth2/Makefile          |  2 +-
> sysutils/signon-qt5/Makefile                    |  2 +-
> sysutils/signon-ui/Makefile                     |  2 +-
> sysutils/sweeper/Makefile                       |  2 +-
> sysutils/synergy/Makefile                       |  2 +-
> sysutils/tarsnap-gui/Makefile                   |  2 +-
> sysutils/twmn/Makefile                          |  2 +-
> sysutils/unetbootin/Makefile                    |  2 +-
> textproc/dikt/Makefile                          |  2 +-
> textproc/fcitx-qt5/Makefile                     |  2 +-
> textproc/fcitx5-configtool/Makefile             |  2 +-
> textproc/fcitx5-qt/Makefile                     |  2 +-
> textproc/goldendict/Makefile                    |  2 +-
> textproc/highlight/Makefile                     |  2 +-
> textproc/kdiff3/Makefile                        |  4 ++--
> textproc/kf5-kcodecs/Makefile                   |  4 ++--
> textproc/kf5-sonnet/Makefile                    |  4 ++--
> textproc/kf5-syntax-highlighting/Makefile       |  4 ++--
> textproc/kompare/Makefile                       |  4 ++--
> textproc/kreport/Makefile                       |  2 +-
> textproc/libkomparediff2/Makefile               |  4 ++--
> textproc/markdownpart/Makefile                  |  4 ++--
> textproc/pageedit/Makefile                      |  2 +-
> textproc/qstardict/Makefile                     |  2 +-
> textproc/qt5-xml/Makefile                       |  2 +-
> textproc/qt5-xmlpatterns/Makefile               |  2 +-
> textproc/retext/Makefile                        |  4 ++--
> textproc/sigil/Makefile                         |  4 ++--
> textproc/uim-qt5/Makefile                       |  2 +-
> www/choqok/Makefile                             |  4 ++--
> www/cutelyst/Makefile                           |  2 +-
> www/dooble/Makefile                             |  2 +-
> www/falkon/Makefile                             |  6 +++---
> www/kdsoap/Makefile                             |  2 +-
> www/kf5-kdewebkit/Makefile                      |  4 ++--
> www/kf5-khtml/Makefile                          |  4 ++--
> www/kf5-kjs/Makefile                            |  4 ++--
> www/kf5-kjsembed/Makefile                       |  4 ++--
> www/kristall/Makefile                           |  4 ++--
> www/onlyoffice-documentserver/Makefile          |  2 +-
> www/otter-browser/Makefile                      |  2 +-
> www/plasma5-plasma-browser-integration/Makefile |  2 +-
> www/py-qt5-webengine/Makefile                   |  4 ++--
> www/qhttpengine/Makefile                        |  2 +-
> www/qt5-webchannel/Makefile                     |  2 +-
> www/qt5-webengine/Makefile                      |  2 +-
> www/qt5-webglplugin/Makefile                    |  2 +-
> www/qt5-webkit/Makefile                         |  2 +-
> www/qt5-websockets-qml/Makefile                 |  2 +-
> www/qt5-websockets/Makefile                     |  2 +-
> www/qt5-webview/Makefile                        |  2 +-
> www/wt/Makefile                                 |  2 +-
> x11-clocks/kteatime/Makefile                    |  4 ++--
> x11-clocks/ktimer/Makefile                      |  4 ++--
> x11-fm/arqiver/Makefile                         |  2 +-
> x11-fm/dolphin/Makefile                         |  4 ++--
> x11-fm/konqueror/Makefile                       |  2 +-
> x11-fm/krusader2/Makefile                       |  2 +-
> x11-fm/pcmanfm-qt/Makefile                      |  2 +-
> x11-fm/qtfm/Makefile                            |  2 +-
> x11-fonts/fontmatrix/Makefile                   |  2 +-
> x11-fonts/fontobene/Makefile                    |  2 +-
> x11-fonts/oxygen-fonts/Makefile                 |  4 ++--
> x11-themes/Kvantum/Makefile                     |  2 +-
> x11-themes/adwaita-qt5/Makefile                 |  2 +-
> x11-themes/kf5-breeze-icons/Makefile            |  4 ++--
> x11-themes/kf5-kemoticons/Makefile              |  4 ++--
> x11-themes/kf5-kiconthemes/Makefile             |  6 +++---
> x11-themes/kf5-oxygen-icons5/Makefile           |  4 ++--
> x11-themes/kf5-qqc2-desktop-style/Makefile      |  4 ++--
> x11-themes/lumina-themes/Makefile               |  2 +-
> x11-themes/plasma5-breeze-gtk/Makefile          |  2 +-
> x11-themes/plasma5-breeze/Makefile              |  2 +-
> x11-themes/plasma5-kde-gtk-config/Makefile      |  4 ++--
> x11-themes/plasma5-oxygen/Makefile              |  2 +-
> .../Makefile                                    |  4 ++--
> x11-themes/qgnomeplatform/Makefile              |  2 +-
> x11-themes/qt5-style-plugins/Makefile           |  2 +-
> x11-themes/qtcurve/Makefile                     | 16 ++++++++--------
> x11-toolkits/color-widgets-qt5/Makefile         |  2 +-
> x11-toolkits/ctk/Makefile                       |  2 +-
> x11-toolkits/kf5-attica/Makefile                |  4 ++--
> x11-toolkits/kf5-kcompletion/Makefile           |  4 ++--
> x11-toolkits/kf5-kconfigwidgets/Makefile        |  4 ++--
> x11-toolkits/kf5-kdesignerplugin/Makefile       |  4 ++--
> x11-toolkits/kf5-kguiaddons/Makefile            |  4 ++--
> x11-toolkits/kf5-kirigami2/Makefile             |  4 ++--
> x11-toolkits/kf5-kitemviews/Makefile            |  4 ++--
> x11-toolkits/kf5-kjobwidgets/Makefile           |  4 ++--
> x11-toolkits/kf5-ktextwidgets/Makefile          |  4 ++--
> x11-toolkits/kf5-kwidgetsaddons/Makefile        |  4 ++--
> x11-toolkits/kf5-kxmlgui/Makefile               |  4 ++--
> x11-toolkits/kproperty/Makefile                 |  2 +-
> x11-toolkits/plasma5-kdeplasma-addons/Makefile  |  4 ++--
> x11-toolkits/py-qt5-chart/Makefile              |  4 ++--
> x11-toolkits/qml-box2d/Makefile                 |  2 +-
> x11-toolkits/qt5-charts/Makefile                |  2 +-
> x11-toolkits/qt5-datavis3d/Makefile             |  2 +-
> x11-toolkits/qt5-declarative-test/Makefile      |  2 +-
> x11-toolkits/qt5-declarative/Makefile           |  2 +-
> x11-toolkits/qt5-gamepad/Makefile               |  2 +-
> x11-toolkits/qt5-gui/Makefile                   |  2 +-
> x11-toolkits/qt5-quick3d/Makefile               |  2 +-
> x11-toolkits/qt5-quickcontrols/Makefile         |  2 +-
> x11-toolkits/qt5-quickcontrols2/Makefile        |  2 +-
> x11-toolkits/qt5-quicktimeline/Makefile         |  2 +-
> x11-toolkits/qt5-uiplugin/Makefile              |  2 +-
> x11-toolkits/qt5-virtualkeyboard/Makefile       |  2 +-
> x11-toolkits/qt5-widgets/Makefile               |  2 +-
> x11-toolkits/qt5pas/Makefile                    |  2 +-
> x11-toolkits/qtermwidget/Makefile               |  2 +-
> x11-toolkits/qwt5-qt5/Makefile                  |  2 +-
> x11-toolkits/qwt6/Makefile                      |  2 +-
> x11-wm/kwinft/Makefile                          |  8 ++++----
> x11-wm/lxqt-panel/Makefile                      |  2 +-
> x11-wm/lxqt-session/Makefile                    |  2 +-
> x11-wm/obconf-qt/Makefile                       |  2 +-
> x11-wm/plasma5-kdecoration/Makefile             |  4 ++--
> x11-wm/plasma5-kwin/Makefile                    |  6 +++---
> x11/antimicro/Makefile                          |  2 +-
> x11/compton-conf/Makefile                       |  2 +-
> x11/cool-retro-term/Makefile                    |  6 +++---
> x11/coreterminal/Makefile                       |  2 +-
> x11/disman/Makefile                             |  4 ++--
> x11/dsbautostart/Makefile                       |  2 +-
> x11/dsbxinput/Makefile                          |  2 +-
> x11/glcapsviewer/Makefile                       |  2 +-
> x11/kdisplay/Makefile                           |  4 ++--
> x11/kf5-frameworkintegration/Makefile           |  4 ++--
> x11/kf5-kactivities-stats/Makefile              |  4 ++--
> x11/kf5-kactivities/Makefile                    |  4 ++--
> x11/kf5-kded/Makefile                           |  4 ++--
> x11/kf5-kdelibs4support/Makefile                |  8 ++++----
> x11/kf5-kglobalaccel/Makefile                   |  4 ++--
> x11/kf5-kinit/Makefile                          |  4 ++--
> x11/kf5-krunner/Makefile                        |  4 ++--
> x11/kf5-kwayland/Makefile                       |  4 ++--
> x11/kf5-kwindowsystem/Makefile                  |  4 ++--
> x11/kf5-plasma-framework/Makefile               |  4 ++--
> x11/konsole/Makefile                            |  4 ++--
> x11/libfm-qt/Makefile                           |  2 +-
> x11/lumina-core/Makefile                        |  4 ++--
> x11/lumina-coreutils/Makefile                   |  4 ++--
> x11/lxqt-about/Makefile                         |  2 +-
> x11/lxqt-globalkeys/Makefile                    |  2 +-
> x11/lxqt-runner/Makefile                        |  2 +-
> x11/pcdm/Makefile                               |  2 +-
> x11/plasma-wayland-protocols/Makefile           |  2 +-
> x11/plasma5-kactivitymanagerd/Makefile          |  2 +-
> x11/plasma5-kgamma5/Makefile                    |  4 ++--
> x11/plasma5-kscreen/Makefile                    |  4 ++--
> x11/plasma5-kwayland-integration/Makefile       |  2 +-
> x11/plasma5-kwayland-server/Makefile            |  2 +-
> x11/plasma5-layer-shell-qt/Makefile             |  2 +-
> x11/plasma5-libkscreen/Makefile                 |  4 ++--
> x11/plasma5-plasma-desktop/Makefile             |  8 ++++----
> x11/plasma5-plasma-integration/Makefile         |  4 ++--
> x11/plasma5-plasma-workspace/Makefile           | 10 +++++-----
> x11/plasma5-plasma/Makefile                     |  2 +-
> x11/qimageblitz/Makefile                        |  2 +-
> x11/qt5-x11extras/Makefile                      |  2 +-
> x11/qterminal/Makefile                          |  2 +-
> x11/radare-cutter/Makefile                      |  2 +-
> x11/rsibreak/Makefile                           |  2 +-
> x11/sddm/Makefile                               |  4 ++--
> x11/yakuake/Makefile                            |  4 ++--
> 1118 files changed, 1670 insertions(+), 1653 deletions(-)
>
>diff --git a/CHANGES b/CHANGES
>index 0145bd859742..6f158688be1e 100644
>--- a/CHANGES
>+++ b/CHANGES
>@@ -10,6 +10,23 @@ in the release notes and/or placed into UPDATING.
> 
> 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
>+
> 20220821:
> AUTHOR: kde@FreeBSD.org
> 
>diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
>index 7014f4de20e9..7a977638fdf4 100644
>--- a/Mk/Uses/kde.mk
>+++ b/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 @@ _KDE_OPTIONS=		bogus ${OPTIONS_DEFINE}
> .        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} \
>@@ -869,18 +869,18 @@ kde-${comp}_PATH=		${kde-${comp}${_KDE_VERSION}_LIB}
> _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}} == ""
>diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
>index a421a438056b..33ce894a4f04 100644
>--- a/Mk/Uses/pyqt.mk
>+++ b/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_PYQT_ALL+=				${_USE_SIP_ALL} \
> 					${_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 @@ py-${comp}_test_TEST_DEPENDS?=		${py-${comp}_TEST_DEPENDS}
> _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
>diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk
>index 48304c742493..e6fc0758026a 100644
>--- a/Mk/Uses/qmake.mk
>+++ b/Mk/Uses/qmake.mk
>@@ -110,7 +110,7 @@ QMAKE_SOURCE_PATH?=	# empty
> 
> # 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)
>diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
>index de8a8a628330..c65b246e54a6 100644
>--- a/Mk/Uses/qt.mk
>+++ b/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
>@@ -395,18 +395,18 @@ _USE_QT_ALL=		${_USE_QT_COMMON} \
> 			${_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}} == ""
>diff --git a/accessibility/gammy/Makefile b/accessibility/gammy/Makefile
>index 18af99564c27..1f96d444c64c 100644
>--- a/accessibility/gammy/Makefile
>+++ b/accessibility/gammy/Makefile
>@@ -14,7 +14,7 @@ USE_GITHUB=	yes
> 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 \
>diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
>index f0766d057fd9..4647a13ec1f2 100644
>--- a/accessibility/kmag/Makefile
>+++ b/accessibility/kmag/Makefile
>@@ -11,9 +11,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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
> 
>diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
>index 7185a8c7f9b6..14c9e729d053 100644
>--- a/accessibility/kmousetool/Makefile
>+++ b/accessibility/kmousetool/Makefile
>@@ -10,9 +10,9 @@ LICENSE=	GPLv2
> 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
>diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
>index c1927b360785..ac9e82243e27 100644
>--- a/accessibility/kmouth/Makefile
>+++ b/accessibility/kmouth/Makefile
>@@ -11,9 +11,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/accessibility/libqaccessibilityclient/Makefile b/accessibility/libqaccessibilityclient/Makefile
>index ee0a4e0d2f1a..0dcb67dd5ea4 100644
>--- a/accessibility/libqaccessibilityclient/Makefile
>+++ b/accessibility/libqaccessibilityclient/Makefile
>@@ -13,6 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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>
>diff --git a/accessibility/qt5-speech/Makefile b/accessibility/qt5-speech/Makefile
>index 31d32bfc4319..9941bd89b597 100644
>--- a/accessibility/qt5-speech/Makefile
>+++ b/accessibility/qt5-speech/Makefile
>@@ -10,7 +10,7 @@ USES=		compiler:c++11-lang gl pkgconfig perl5 qmake:outsource,norecursive \
> 		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_RADIO=		BACKEND
>diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
>index 0cce61e0127c..e5f418b5e022 100644
>--- a/archivers/ark/Makefile
>+++ b/archivers/ark/Makefile
>@@ -13,9 +13,9 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
>diff --git a/archivers/kf5-karchive/Makefile b/archivers/kf5-karchive/Makefile
>index 939780dad89f..121cf1c51d82 100644
>--- a/archivers/kf5-karchive/Makefile
>+++ b/archivers/kf5-karchive/Makefile
>@@ -9,8 +9,8 @@ COMMENT=	KF5 library that provides classes for handling archive formats
> 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>
>diff --git a/archivers/libarchive-qt/Makefile b/archivers/libarchive-qt/Makefile
>index 36d94e154b97..d73ddec78a2a 100644
>--- a/archivers/libarchive-qt/Makefile
>+++ b/archivers/libarchive-qt/Makefile
>@@ -9,7 +9,7 @@ LICENSE=	GPLv3
> 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
> 
>diff --git a/archivers/lxqt-archiver/Makefile b/archivers/lxqt-archiver/Makefile
>index f371749711ad..8412f8f66900 100644
>--- a/archivers/lxqt-archiver/Makefile
>+++ b/archivers/lxqt-archiver/Makefile
>@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/unzip:archivers/unzip
> 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
>diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
>index c2fafd0e005c..c67d4022ea03 100644
>--- a/archivers/quazip/Makefile
>+++ b/archivers/quazip/Makefile
>@@ -15,7 +15,7 @@ GH_ACCOUNT=	stachenov
> 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 \
>diff --git a/archivers/v1541commander/Makefile b/archivers/v1541commander/Makefile
>index 2bd539c18bc8..be1e4b5c0c7f 100644
>--- a/archivers/v1541commander/Makefile
>+++ b/archivers/v1541commander/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	lib1541img.so:archivers/lib1541img
> 
> 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
>diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile
>index f066ea914f48..bcafa03c096c 100644
>--- a/astro/gpsbabel/Makefile
>+++ b/astro/gpsbabel/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv2+
> 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
> 
>@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
> 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
> 
>diff --git a/astro/indiwebmanagerapp/Makefile b/astro/indiwebmanagerapp/Makefile
>index 4760004ba181..94b5aaa6522d 100644
>--- a/astro/indiwebmanagerapp/Makefile
>+++ b/astro/indiwebmanagerapp/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake iconv gettext kde:5 ninja qt:5 pkgconfig python:3.5+
> 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_GITHUB=	yes
> GH_ACCOUNT=	rlancaste
>diff --git a/astro/kosmindoormap/Makefile b/astro/kosmindoormap/Makefile
>index 3afd9e2b8f70..935055eed3f0 100644
>--- a/astro/kosmindoormap/Makefile
>+++ b/astro/kosmindoormap/Makefile
>@@ -9,9 +9,9 @@ LIB_DEPENDS=	libprotobuf.so:devel/protobuf
> 
> 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
> 
>diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
>index 6caa55cc4f75..b051183f32ed 100644
>--- a/astro/kstars/Makefile
>+++ b/astro/kstars/Makefile
>@@ -27,10 +27,10 @@ USE_KDE=	attica auth bookmarks codecs completion config configwidgets\
> 		iconthemes init itemviews jobwidgets kio newstuff notifications \
> 		notifyconfig parts plotting service solid texteditor \
> 		widgetsaddons 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
> 
> .include <bsd.port.mk>
>diff --git a/astro/marble/Makefile b/astro/marble/Makefile
>index 276c316298e0..3515a5acf4af 100644
>--- a/astro/marble/Makefile
>+++ b/astro/marble/Makefile
>@@ -16,10 +16,10 @@ USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
>diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
>index 66951a97bba6..7e34b4564771 100644
>--- a/astro/merkaartor/Makefile
>+++ b/astro/merkaartor/Makefile
>@@ -19,7 +19,7 @@ GH_ACCOUNT=	openstreetmap
> 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
> 
>@@ -43,7 +43,7 @@ ZBAR_BROKEN=	Does not build with option ZBAR selected
> DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
> 
> NLS_USES=	qt:5
>-NLS_USE=	QT=linguisttools_build
>+NLS_USE=	QT=linguisttools:build
> 
> OPTIONS_SUB=	yes
> 
>diff --git a/astro/oskar/Makefile b/astro/oskar/Makefile
>index 73715f47e62a..938835e3a521 100644
>--- a/astro/oskar/Makefile
>+++ b/astro/oskar/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
> 
> 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
>diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
>index eff11c835d51..deaecdd51c7e 100644
>--- a/astro/stellarium/Makefile
>+++ b/astro/stellarium/Makefile
>@@ -14,7 +14,7 @@ GH_ACCOUNT=	Stellarium
> 
> 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
> 
>@@ -46,7 +46,7 @@ GPS_CMAKE_OFF=		-DENABLE_GPS:BOOL=OFF
> 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
>@@ -55,7 +55,7 @@ SCRIPTS_CMAKE_OFF=	-DENABLE_SCRIPTING:BOOL=OFF
> 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
>diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
>index 124b9f996084..d78e59f2bee6 100644
>--- a/astro/stellarsolver/Makefile
>+++ b/astro/stellarsolver/Makefile
>@@ -12,7 +12,7 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
> 		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
> 
>diff --git a/audio/abgate-lv2/Makefile b/audio/abgate-lv2/Makefile
>index a2e63b850a95..0132482fc463 100644
>--- a/audio/abgate-lv2/Makefile
>+++ b/audio/abgate-lv2/Makefile
>@@ -17,7 +17,7 @@ USES=		compiler:c++11-lang gl gmake gnome pkgconfig qt:5 xorg
> 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
>diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
>index 3d0be4d8077c..5979e87f81f1 100644
>--- a/audio/amarok/Makefile
>+++ b/audio/amarok/Makefile
>@@ -24,7 +24,7 @@ USES=		cmake compiler:c++11-lang cpe desktop-file-utils \
> 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 \
>@@ -32,7 +32,7 @@ USE_KDE=	archive auth attica bookmarks codecs config configwidgets \
> 		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
> 
>diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile
>index 3dd935d985d6..28fc42fb836b 100644
>--- a/audio/audiocd-kio/Makefile
>+++ b/audio/audiocd-kio/Makefile
>@@ -21,7 +21,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
>diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile
>index 34a0ecaaedc1..c745c8960bae 100644
>--- a/audio/bambootracker/Makefile
>+++ b/audio/bambootracker/Makefile
>@@ -19,7 +19,7 @@ USES=		compiler:c++14-lang desktop-file-utils gl qmake qt:5 \
> 
> USE_GL=		gl
> USE_QT=		buildtools core gui multimedia network widgets \
>-		linguisttools_build
>+		linguisttools:build
> 
> DATADIR=	${PREFIX}/share/BambooTracker
> DOCSDIR=	${PREFIX}/share/doc/BambooTracker
>diff --git a/audio/cadence/Makefile b/audio/cadence/Makefile
>index f84b0f9dfaef..1ddb13c4dfb3 100644
>--- a/audio/cadence/Makefile
>+++ b/audio/cadence/Makefile
>@@ -17,7 +17,7 @@ SHEBANG_FILES=	src/*.py
> 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
>diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
>index e02ab35375e7..d542ec1f2b58 100644
>--- a/audio/cantata/Makefile
>+++ b/audio/cantata/Makefile
>@@ -13,8 +13,8 @@ USES=			cmake compiler:c++11-lang cpe pkgconfig qt:5 shebangfix
> 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
>@@ -71,7 +71,7 @@ MUSICBRAINZ_IMPLIES=	CDPARANOIA
> 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 \
>diff --git a/audio/carla/Makefile b/audio/carla/Makefile
>index bc4ccd288bcf..671cd3c9f847 100644
>--- a/audio/carla/Makefile
>+++ b/audio/carla/Makefile
>@@ -21,7 +21,7 @@ USES=		compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \
> 		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
>diff --git a/audio/csoundqt/Makefile b/audio/csoundqt/Makefile
>index ec6bd46e9f57..239288458aac 100644
>--- a/audio/csoundqt/Makefile
>+++ b/audio/csoundqt/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libcsound64.so:audio/csound
> 
> 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" \
>diff --git a/audio/dgedit/Makefile b/audio/dgedit/Makefile
>index bd5488db2346..81f3f33a810b 100644
>--- a/audio/dgedit/Makefile
>+++ b/audio/dgedit/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libao.so:audio/libao \
> 		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
> 
>diff --git a/audio/dmidiplayer/Makefile b/audio/dmidiplayer/Makefile
>index 0a3ff9845dc5..cd664d4624df 100644
>--- a/audio/dmidiplayer/Makefile
>+++ b/audio/dmidiplayer/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libdrumstick-rt.so:audio/drumstick \
> 		libuchardet.so:textproc/uchardet
> 
> USES=		compiler:c++11-lang cmake desktop-file-utils pkgconfig qt:5 tar:bz2
>-USE_QT=		core gui printsupport widgets buildtools_build linguisttools qmake_build
>+USE_QT=		core gui printsupport widgets buildtools:build linguisttools qmake:build
> 
> CMAKE_ON=	EMBED_TRANSLATIONS
> CMAKE_OFF=	BUILD_DOCS
>diff --git a/audio/drumkv1-lv2/Makefile b/audio/drumkv1-lv2/Makefile
>index 3c0b011fc42d..740fadfa9a83 100644
>--- a/audio/drumkv1-lv2/Makefile
>+++ b/audio/drumkv1-lv2/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libjack.so:audio/jack \
> 		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
>diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile
>index 1e38e58a7d70..1c99cee0f039 100644
>--- a/audio/drumstick/Makefile
>+++ b/audio/drumstick/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
> RUN_DEPENDS=	${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont
> 
> USES=		compiler:c++11-lang cmake pkgconfig qt:5 shared-mime-info tar:bz2
>-USE_QT=		core gui network svg testlib uiplugin widgets buildtools_build linguisttools_build qmake_build
>+USE_QT=		core gui network svg testlib uiplugin widgets buildtools:build linguisttools:build qmake:build
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=		PULSEAUDIO MANPAGES
>diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile
>index 9a09403eb4d2..baea47dad3de 100644
>--- a/audio/dsbmixer/Makefile
>+++ b/audio/dsbmixer/Makefile
>@@ -13,7 +13,7 @@ RUN_DEPENDS=	dsbwrtsysctl:sysutils/dsbwrtsysctl
> 
> 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
>diff --git a/audio/elisa/Makefile b/audio/elisa/Makefile
>index 8cffe385129d..7571a5673b34 100644
>--- a/audio/elisa/Makefile
>+++ b/audio/elisa/Makefile
>@@ -16,7 +16,7 @@ USE_KDE=	auth baloo5 bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS VLC
> OPTIONS_DEFAULT=	DOCS VLC
>diff --git a/audio/faustlive/Makefile b/audio/faustlive/Makefile
>index 5121901923e8..34b810724822 100644
>--- a/audio/faustlive/Makefile
>+++ b/audio/faustlive/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \
> 		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
>diff --git a/audio/flacon/Makefile b/audio/flacon/Makefile
>index 78414848babd..48ccf3d8c291 100644
>--- a/audio/flacon/Makefile
>+++ b/audio/flacon/Makefile
>@@ -15,8 +15,8 @@ TEST_DEPENDS=	flac:audio/flac mac:audio/mac mediainfo:multimedia/mediainfo \
> 
> 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:
>diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
>index d8695fa6a491..b6fcaa8a2c7d 100644
>--- a/audio/fmit/Makefile
>+++ b/audio/fmit/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3
> 
> 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
>diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile
>index 1d2b7c1daea4..ff97df45809a 100644
>--- a/audio/guidolib/Makefile
>+++ b/audio/guidolib/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/audio/hpsjam/Makefile b/audio/hpsjam/Makefile
>index 1db0782e43c9..7464e8f2bd0b 100644
>--- a/audio/hpsjam/Makefile
>+++ b/audio/hpsjam/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS= \
> 
> 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
>diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
>index b9205f996f06..8a4e3dcf2ca3 100644
>--- a/audio/hydrogen/Makefile
>+++ b/audio/hydrogen/Makefile
>@@ -14,8 +14,8 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
> 
> 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
>diff --git a/audio/inscore/Makefile b/audio/inscore/Makefile
>index d0e752f85244..c498a2d5ce07 100644
>--- a/audio/inscore/Makefile
>+++ b/audio/inscore/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libGUIDOEngine.so:audio/guidolib \
> 
> 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
>diff --git a/audio/jacktrip/Makefile b/audio/jacktrip/Makefile
>index 0cd1c9283921..e52aa795676c 100644
>--- a/audio/jacktrip/Makefile
>+++ b/audio/jacktrip/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libjack.so:audio/jack \
> 		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
>diff --git a/audio/jalv/Makefile b/audio/jalv/Makefile
>index b15b22be09e2..8b5c00f29e90 100644
>--- a/audio/jalv/Makefile
>+++ b/audio/jalv/Makefile
>@@ -24,7 +24,7 @@ USES=		compiler:c++11-lang gnome pkgconfig python:build qmake:no_configure,no_en
> 		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
> 
>diff --git a/audio/jamulus/Makefile b/audio/jamulus/Makefile
>index 58a4fc3db590..38dcb485d0a5 100644
>--- a/audio/jamulus/Makefile
>+++ b/audio/jamulus/Makefile
>@@ -16,7 +16,7 @@ FLAVOR?=	${FLAVORS:[1]}
> 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
>diff --git a/audio/juk/Makefile b/audio/juk/Makefile
>index db57b1a3d627..d4725b41fa03 100644
>--- a/audio/juk/Makefile
>+++ b/audio/juk/Makefile
>@@ -14,9 +14,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/audio/kid3-qt5/Makefile b/audio/kid3-qt5/Makefile
>index 454488f99f62..3f3c22a54794 100644
>--- a/audio/kid3-qt5/Makefile
>+++ b/audio/kid3-qt5/Makefile
>@@ -18,7 +18,7 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gnome \
> 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 \
>@@ -38,7 +38,7 @@ KID3_APPS+=	QT
> # 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
>@@ -77,7 +77,7 @@ TAGLIB_DESC=		Various audio formats support via Taglib
> 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
>diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
>index 3198b3fb873b..105ce04e4034 100644
>--- a/audio/kmix/Makefile
>+++ b/audio/kmix/Makefile
>@@ -14,9 +14,9 @@ USE_KDE=	auth codecs config configwidgets coreaddons dbusaddons \
> 		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
> 
> # we want the KF5 version of kmix
> CMAKE_ARGS=	-DKMIX_KF5_BUILD:BOOL=TRUE
>diff --git a/audio/kwave/Makefile b/audio/kwave/Makefile
>index 0d6cf318f4b4..359690012a17 100644
>--- a/audio/kwave/Makefile
>+++ b/audio/kwave/Makefile
>@@ -21,9 +21,9 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_GROUP=			AUDIOPLUGIN
> OPTIONS_GROUP_AUDIOPLUGIN=	ALSA PULSEAUDIO
>diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
>index 6faa181f25f0..1cd4852079c0 100644
>--- a/audio/libechonest/Makefile
>+++ b/audio/libechonest/Makefile
>@@ -16,14 +16,14 @@ USE_LDCONFIG=	yes
> 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>
>diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
>index fff03a189595..edca7807745d 100644
>--- a/audio/libkcddb/Makefile
>+++ b/audio/libkcddb/Makefile
>@@ -11,9 +11,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
>index 83450de61f0f..5992b349e508 100644
>--- a/audio/libkcompactdisc/Makefile
>+++ b/audio/libkcompactdisc/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KDE library for interfacing with audio CDs
> 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
>diff --git a/audio/liblastfm-qt5/Makefile b/audio/liblastfm-qt5/Makefile
>index e493af3d7994..2441c1aaa77f 100644
>--- a/audio/liblastfm-qt5/Makefile
>+++ b/audio/liblastfm-qt5/Makefile
>@@ -16,7 +16,7 @@ USE_GITHUB=	yes
> 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
> 
>@@ -34,7 +34,7 @@ FINGERPRINT_CMAKE_BOOL=	BUILD_FINGERPRINT
> 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
> 
>diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
>index 849c4e6e9df8..342a92e6c4d2 100644
>--- a/audio/lmms/Makefile
>+++ b/audio/lmms/Makefile
>@@ -37,7 +37,7 @@ GH_ACCOUNT=	LMMS
> 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 \
>diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
>index 62e3a4634e60..07b2abec0b11 100644
>--- a/audio/midipp/Makefile
>+++ b/audio/midipp/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libumidi20.so:audio/libumidi
> 
> 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
>diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
>index f3c7479b9800..7dece5e6cc73 100644
>--- a/audio/mixxx/Makefile
>+++ b/audio/mixxx/Makefile
>@@ -38,8 +38,8 @@ USE_XORG=	ice sm x11 xext
> 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*
>diff --git a/audio/mixxx22/Makefile b/audio/mixxx22/Makefile
>index 6d0faf3723bf..4701044fa6b0 100644
>--- a/audio/mixxx22/Makefile
>+++ b/audio/mixxx22/Makefile
>@@ -39,8 +39,8 @@ USE_GL=		gl glu
> 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
> 
>diff --git a/audio/mous/Makefile b/audio/mous/Makefile
>index 43bdb62230f7..582465dfa1ea 100644
>--- a/audio/mous/Makefile
>+++ b/audio/mous/Makefile
>@@ -71,7 +71,7 @@ OSS_CMAKE_BOOL=		WITH_PLUGIN_OSS
> 
> 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
>diff --git a/audio/mpz/Makefile b/audio/mpz/Makefile
>index 819a4136aa21..84e79bb93142 100644
>--- a/audio/mpz/Makefile
>+++ b/audio/mpz/Makefile
>@@ -15,7 +15,7 @@ GH_ACCOUNT=	olegantonyan
> 
> 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
>diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
>index 42ced7066e5a..293af298e7ab 100644
>--- a/audio/mumble/Makefile
>+++ b/audio/mumble/Makefile
>@@ -37,7 +37,7 @@ GH_TUPLE=	mumble-voip:mumble:${DISTVERSION} \
> 		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
>diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
>index e7d8e99efd4e..457b61b7c6b0 100644
>--- a/audio/murmur/Makefile
>+++ b/audio/murmur/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libprotobuf.so:devel/protobuf
> 
> 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
>@@ -47,7 +47,7 @@ MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
> 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
>diff --git a/audio/muse-sequencer/Makefile b/audio/muse-sequencer/Makefile
>index a16c3969e18b..0ea58eae42ed 100644
>--- a/audio/muse-sequencer/Makefile
>+++ b/audio/muse-sequencer/Makefile
>@@ -28,7 +28,7 @@ LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
> 
> 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
> 
>diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
>index f1d31827c9a8..f94842028f74 100644
>--- a/audio/musescore/Makefile
>+++ b/audio/musescore/Makefile
>@@ -22,7 +22,7 @@ USE_QT=		concurrent core declarative designer graphicaleffects gui \
> 		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
>diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
>index 80ffa3a420da..414c3d671367 100644
>--- a/audio/mythplugin-mythmusic/Makefile
>+++ b/audio/mythplugin-mythmusic/Makefile
>@@ -21,7 +21,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	MythTV
> GH_PROJECT=	mythtv
> USE_LDCONFIG=	yes
>-USE_QT=		buildtools_build core gui qmake_build sql xml
>+USE_QT=		buildtools:build core gui qmake:build sql xml
> 
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
>diff --git a/audio/noson-app/Makefile b/audio/noson-app/Makefile
>index eaaebade0df6..e055c900866a 100644
>--- a/audio/noson-app/Makefile
>+++ b/audio/noson-app/Makefile
>@@ -12,7 +12,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac
> 
> 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
> 
>diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
>index 6674bc2840da..2908ba7397f7 100644
>--- a/audio/openal-soft/Makefile
>+++ b/audio/openal-soft/Makefile
>@@ -33,7 +33,7 @@ CONFIG_DESC=	Install configuration utility (needs Qt 5)
> 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
> 
>diff --git a/audio/padthv1-lv2/Makefile b/audio/padthv1-lv2/Makefile
>index 18b91453612e..0383441c914f 100644
>--- a/audio/padthv1-lv2/Makefile
>+++ b/audio/padthv1-lv2/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
> 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
>diff --git a/audio/pavucontrol-qt/Makefile b/audio/pavucontrol-qt/Makefile
>index bc4d9f290621..56615a4517dc 100644
>--- a/audio/pavucontrol-qt/Makefile
>+++ b/audio/pavucontrol-qt/Makefile
>@@ -12,7 +12,7 @@ LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> 
> 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
>diff --git a/audio/pianobooster/Makefile b/audio/pianobooster/Makefile
>index 2d2f708585e5..014dcbce926e 100644
>--- a/audio/pianobooster/Makefile
>+++ b/audio/pianobooster/Makefile
>@@ -18,7 +18,7 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gl pkgconfig qt:5
> 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
>diff --git a/audio/picard/Makefile b/audio/picard/Makefile
>index 7b0f3c98d53b..b189820d97ae 100644
>--- a/audio/picard/Makefile
>+++ b/audio/picard/Makefile
>@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \
> 
> 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
>diff --git a/audio/plasma5-plasma-pa/Makefile b/audio/plasma5-plasma-pa/Makefile
>index 5e00338e9b78..7c7a1444b532 100644
>--- a/audio/plasma5-plasma-pa/Makefile
>+++ b/audio/plasma5-plasma-pa/Makefile
>@@ -13,9 +13,9 @@ USES=		cmake compiler:c++11-lib gettext gnome kde:5 pkgconfig qt:5 \
> 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
>diff --git a/audio/polyphone/Makefile b/audio/polyphone/Makefile
>index 3d2ae7aac1bf..c4d0c656853d 100644
>--- a/audio/polyphone/Makefile
>+++ b/audio/polyphone/Makefile
>@@ -22,7 +22,7 @@ DOS2UNIX_FILES=	polyphone.pro \
> 		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
> 
>diff --git a/audio/pulseaudio-qt/Makefile b/audio/pulseaudio-qt/Makefile
>index 1e72fba295be..37cf6853672a 100644
>--- a/audio/pulseaudio-qt/Makefile
>+++ b/audio/pulseaudio-qt/Makefile
>@@ -11,8 +11,8 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
> 
> 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>
>diff --git a/audio/qaudiosonar/Makefile b/audio/qaudiosonar/Makefile
>index f4784709c94c..69eb599b9617 100644
>--- a/audio/qaudiosonar/Makefile
>+++ b/audio/qaudiosonar/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libjack.so:audio/jack
> 
> 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
>diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
>index 2a75ad9801b3..3fe1b0a2bc69 100644
>--- a/audio/qjackctl/Makefile
>+++ b/audio/qjackctl/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
> 
>diff --git a/audio/qmidiarp/Makefile b/audio/qmidiarp/Makefile
>index 8e4bd277ed48..4c58e2746a9d 100644
>--- a/audio/qmidiarp/Makefile
>+++ b/audio/qmidiarp/Makefile
>@@ -21,8 +21,8 @@ USES=		autoreconf compiler:c++11-lib desktop-file-utils \
> 		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
>diff --git a/audio/qmidictl/Makefile b/audio/qmidictl/Makefile
>index c9d8c2a7b32c..ae13c73a458c 100644
>--- a/audio/qmidictl/Makefile
>+++ b/audio/qmidictl/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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}
>diff --git a/audio/qmidinet/Makefile b/audio/qmidinet/Makefile
>index a07379289c6e..b7e20d2b406a 100644
>--- a/audio/qmidinet/Makefile
>+++ b/audio/qmidinet/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
> 
>diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
>index a7a0ab107cfb..3a579c892864 100644
>--- a/audio/qsampler/Makefile
>+++ b/audio/qsampler/Makefile
>@@ -17,7 +17,7 @@ USES=		cmake compiler:c++17-lang desktop-file-utils gl localbase:ldflags pkgconf
> 		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
>diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
>index 7013309eabea..1ed534333a6f 100644
>--- a/audio/qsynth/Makefile
>+++ b/audio/qsynth/Makefile
>@@ -13,8 +13,8 @@ LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
> 
> 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
>diff --git a/audio/qtractor/Makefile b/audio/qtractor/Makefile
>index eeb7983d31df..caa12dcb577e 100644
>--- a/audio/qtractor/Makefile
>+++ b/audio/qtractor/Makefile
>@@ -41,7 +41,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
> 
> 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=		core gui svg widgets x11extras xml buildtools:build linguisttools:build qmake:build
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}_${DISTVERSION}
> 
>diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
>index e9ce921a4156..b8701c5f6dfc 100644
>--- a/audio/quimup/Makefile
>+++ b/audio/quimup/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
> 		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
>diff --git a/audio/qxgedit/Makefile b/audio/qxgedit/Makefile
>index e15de724930c..6d959f578038 100644
>--- a/audio/qxgedit/Makefile
>+++ b/audio/qxgedit/Makefile
>@@ -12,6 +12,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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>
>diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
>index 3d01ad583f81..32002b6514ee 100644
>--- a/audio/rosegarden/Makefile
>+++ b/audio/rosegarden/Makefile
>@@ -29,7 +29,7 @@ USES=		alias cmake compiler:c++11-lib desktop-file-utils \
> 		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
>diff --git a/audio/samplv1-lv2/Makefile b/audio/samplv1-lv2/Makefile
>index b3af5b50c405..ec948cc151db 100644
>--- a/audio/samplv1-lv2/Makefile
>+++ b/audio/samplv1-lv2/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
> 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
>diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile
>index a7d99c873abd..a63ee8dfc9b8 100644
>--- a/audio/sayonara/Makefile
>+++ b/audio/sayonara/Makefile
>@@ -15,8 +15,8 @@ USES=		cmake compiler:c++11-lib desktop-file-utils gnome gstreamer pkgconfig \
> 		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
>diff --git a/audio/sonic-visualiser/Makefile b/audio/sonic-visualiser/Makefile
>index 45450823181a..0b5aebb79cac 100644
>--- a/audio/sonic-visualiser/Makefile
>+++ b/audio/sonic-visualiser/Makefile
>@@ -26,7 +26,7 @@ LIB_DEPENDS=	libcapnp.so:devel/capnproto \
> 
> 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
> 
>diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
>index de7cc0b2d972..9bc2aa10b3ae 100644
>--- a/audio/soundkonverter/Makefile
>+++ b/audio/soundkonverter/Makefile
>@@ -16,14 +16,14 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
> GH_ACCOUNT=	dfaust
> USES=		cmake compiler:c++11-lang kde:5 qt:5
> 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
> WRKSRC_SUBDIR=	src
> 
> OPTIONS_DEFAULT=	VORBIS FLAC NORMALIZE VORBISGAIN
>diff --git a/audio/spectmorph/Makefile b/audio/spectmorph/Makefile
>index cd72cbab3b1e..c33325d8f3e9 100644
>--- a/audio/spectmorph/Makefile
>+++ b/audio/spectmorph/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libao.so:audio/libao \
> 		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
>diff --git a/audio/spotify-qt/Makefile b/audio/spotify-qt/Makefile
>index 93f0cd381714..d607f7a3408b 100644
>--- a/audio/spotify-qt/Makefile
>+++ b/audio/spotify-qt/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	spotifyd:audio/spotifyd
> 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 \
>diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
>index 3223bf502ac3..055e7ae3edd7 100644
>--- a/audio/strawberry/Makefile
>+++ b/audio/strawberry/Makefile
>@@ -23,7 +23,7 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gettext-runtime \
> 
> 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 \
>diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
>index 300fe9f438c7..5979ab05b0d5 100644
>--- a/audio/supercollider/Makefile
>+++ b/audio/supercollider/Makefile
>@@ -19,8 +19,8 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> 
> 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
>diff --git a/audio/synthv1-lv2/Makefile b/audio/synthv1-lv2/Makefile
>index 9b45e75799fb..4437f525aaeb 100644
>--- a/audio/synthv1-lv2/Makefile
>+++ b/audio/synthv1-lv2/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libjack.so:audio/jack \
> 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
>diff --git a/audio/tiatracker/Makefile b/audio/tiatracker/Makefile
>index 1f193cc3ff30..82888aecf9e7 100644
>--- a/audio/tiatracker/Makefile
>+++ b/audio/tiatracker/Makefile
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/license.txt
> 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`
>diff --git a/audio/traverso/Makefile b/audio/traverso/Makefile
>index 1d2e9587f812..c9b894e4cfbd 100644
>--- a/audio/traverso/Makefile
>+++ b/audio/traverso/Makefile
>@@ -27,7 +27,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
> 		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
> 
>diff --git a/audio/virtual_oss_ctl/Makefile b/audio/virtual_oss_ctl/Makefile
>index 6edfecc9cb24..7ad4dad7f007 100644
>--- a/audio/virtual_oss_ctl/Makefile
>+++ b/audio/virtual_oss_ctl/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3
> 
> 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
>diff --git a/audio/vmpk/Makefile b/audio/vmpk/Makefile
>index 8e669637e657..9ef9cb61c41a 100644
>--- a/audio/vmpk/Makefile
>+++ b/audio/vmpk/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libdrumstick-rt.so:audio/drumstick
> 
> USES=		compiler:c++11-lang cmake localbase:ldflags pkgconfig qt:5 tar:bz2 xorg
> USE_QT=		core gui network svg widgets x11extras \
>-		buildtools_build linguisttools_build qmake_build
>+		buildtools:build linguisttools:build qmake:build
> USE_XORG=	xcb
> 
> CMAKE_ON=	EMBED_TRANSLATIONS
>diff --git a/audio/welle.io/Makefile b/audio/welle.io/Makefile
>index 48de1f2c757f..288e71be539a 100644
>--- a/audio/welle.io/Makefile
>+++ b/audio/welle.io/Makefile
>@@ -19,7 +19,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile
>index 4e53148abb50..f61aa4a9f82f 100644
>--- a/benchmarks/glmark2/Makefile
>+++ b/benchmarks/glmark2/Makefile
>@@ -40,7 +40,7 @@ X11_USE=		XORG=x11
> X11_VARS=		PLATFORMS+="x11-gl x11-glesv2"
> 
> post-patch:
>-	@${REINPLACE_CMD} -e "/lib/s/, 'dl'//" ${WRKSRC}/src/wscript_build
>+	@${REINPLACE_CMD} -e "/lib/s/, 'dl'//" ${WRKSRC}/src/wscript:build
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff --git a/benchmarks/kdiskmark/Makefile b/benchmarks/kdiskmark/Makefile
>index 53f7344f2042..a62f5ab37bf7 100644
>--- a/benchmarks/kdiskmark/Makefile
>+++ b/benchmarks/kdiskmark/Makefile
>@@ -14,9 +14,9 @@ GH_ACCOUNT=	JonMagon
> 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 \
> 		core gui widgets
>-USE_KDE=	ecm_build
>+USE_KDE=	ecm:build
> 
> OPTIONS_DEFINE=	CLEARCACHE KF5AUTH
> KF5AUTH_IMPLIES=	CLEARCACHE
>diff --git a/biology/sigviewer/Makefile b/biology/sigviewer/Makefile
>index dba6986ee79c..8a3c318801d3 100644
>--- a/biology/sigviewer/Makefile
>+++ b/biology/sigviewer/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libbiosig.so:biology/biosig \
> 		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
>diff --git a/biology/ugene/Makefile b/biology/ugene/Makefile
>index 245951aff815..5a7d51c1d15c 100644
>--- a/biology/ugene/Makefile
>+++ b/biology/ugene/Makefile
>@@ -19,10 +19,10 @@ GH_ACCOUNT=	ugeneunipro
> 
> 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}" \
>diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
>index 498c53df7a27..7427cd35391f 100644
>--- a/cad/appcsxcad/Makefile
>+++ b/cad/appcsxcad/Makefile
>@@ -22,7 +22,7 @@ LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
> 		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
> 
>diff --git a/cad/caneda/Makefile b/cad/caneda/Makefile
>index 488278a0cdf9..be578b06d38d 100644
>--- a/cad/caneda/Makefile
>+++ b/cad/caneda/Makefile
>@@ -16,7 +16,7 @@ USES=		cmake compiler:c++11-lang desktop-file-utils qt:5 \
> 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
> 
>diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
>index af4b3297c240..299665012c3a 100644
>--- a/cad/freecad/Makefile
>+++ b/cad/freecad/Makefile
>@@ -40,7 +40,7 @@ USE_GITHUB=	yes
> 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
> 
>diff --git a/cad/ktechlab/Makefile b/cad/ktechlab/Makefile
>index 142b45503aeb..7391262f5dac 100644
>--- a/cad/ktechlab/Makefile
>+++ b/cad/ktechlab/Makefile
>@@ -16,12 +16,12 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gnome kde:5 \
> 		localbase qt:5 shared-mime-info
> 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 texteditor textwidgets unitconversion widgetsaddons windowsystem xmlgui \
>-		doctools_build
>+		doctools:build
> USE_GNOME=	glib20
> 
> CXXFLAGS+=	-I${LOCALBASE}/lib/glib-2.0/include
>diff --git a/cad/ldview/Makefile b/cad/ldview/Makefile
>index 28e38ac620fe..c21991f2c064 100644
>--- a/cad/ldview/Makefile
>+++ b/cad/ldview/Makefile
>@@ -18,7 +18,7 @@ RUN_DEPENDS=	bash:shells/bash \
> 		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
> 
>diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
>index a4aaab8c78bb..5a1bdbe49ab2 100644
>--- a/cad/leocad/Makefile
>+++ b/cad/leocad/Makefile
>@@ -15,7 +15,7 @@ RUN_DEPENDS=	ldraw>0:cad/ldraw
> 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
>diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
>index 3de4c7f2ee44..763337654690 100644
>--- a/cad/librecad/Makefile
>+++ b/cad/librecad/Makefile
>@@ -22,7 +22,7 @@ GH_ACCOUNT=	LibreCAD
> 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}"
> 
>diff --git a/cad/librepcb/Makefile b/cad/librepcb/Makefile
>index b932ff4e5e3a..85517157739e 100644
>--- a/cad/librepcb/Makefile
>+++ b/cad/librepcb/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
> 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}
>diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
>index deb47c9b6bf3..a42fc3c858a4 100644
>--- a/cad/meshlab/Makefile
>+++ b/cad/meshlab/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libmpirxx.so:math/mpir
> 
> 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
>diff --git a/cad/openroad/Makefile b/cad/openroad/Makefile
>index 9bf8bfdefe63..2a684f21b6c0 100644
>--- a/cad/openroad/Makefile
>+++ b/cad/openroad/Makefile
>@@ -27,7 +27,7 @@ LIB_DEPENDS=	libcudd.so:math/cudd \
> 		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
>diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
>index 8e5c3301ebb1..105242a3441b 100644
>--- a/cad/openscad-devel/Makefile
>+++ b/cad/openscad-devel/Makefile
>@@ -35,7 +35,7 @@ USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
> USE_GITHUB=	yes
> USE_GL=		gl glu glew
> USE_GNOME=	cairo 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_ACCOUNT=	microsoft:mimalloc
> GH_PROJECT=	MCAD:mcad mimalloc:mimalloc
>diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
>index e5dbd3fd35be..63e316af1bda 100644
>--- a/cad/openscad/Makefile
>+++ b/cad/openscad/Makefile
>@@ -30,7 +30,7 @@ USES=		bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
> 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}
>diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile
>index affa11757084..22e253328853 100644
>--- a/cad/py-pyfda/Makefile
>+++ b/cad/py-pyfda/Makefile
>@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
> 
> USES=		python:3.7+ pyqt:5
> USE_PYTHON=	distutils autoplist
>-USE_PYQT=	pyqt5_run
>+USE_PYQT=	pyqt5:run
> NO_ARCH=	yes
> 
> post-extract:
>diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
>index b29af32d7120..968618e76940 100644
>--- a/cad/qcad/Makefile
>+++ b/cad/qcad/Makefile
>@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bash:shells/bash	\
> 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
>diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
>index 76b32a84da47..1cbf2ca53102 100644
>--- a/cad/qcsxcad/Makefile
>+++ b/cad/qcsxcad/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
> 		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
>diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
>index 6d05b7ec580b..7bd6c094658d 100644
>--- a/cad/qelectrotech/Makefile
>+++ b/cad/qelectrotech/Makefile
>@@ -17,7 +17,7 @@ USES=		compiler:c++11-lib desktop-file-utils gl kde:5 qmake qt:5 \
> 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
>diff --git a/cad/qucs-s/Makefile b/cad/qucs-s/Makefile
>index a35348c2cede..06cd585410c5 100644
>--- a/cad/qucs-s/Makefile
>+++ b/cad/qucs-s/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv2
> 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
>diff --git a/cad/veroroute/Makefile b/cad/veroroute/Makefile
>index 2c118b1d1f13..d8e285fd334b 100644
>--- a/cad/veroroute/Makefile
>+++ b/cad/veroroute/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	GPLv3
> 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
>diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
>index f4a5bd634960..821d6f43e1a0 100644
>--- a/chinese/fcitx-libpinyin/Makefile
>+++ b/chinese/fcitx-libpinyin/Makefile
>@@ -32,7 +32,7 @@ QT5_DESC=	Enable Qtr for dictmanager
> 
> .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
>diff --git a/chinese/fcitx5-chinese-addons/Makefile b/chinese/fcitx5-chinese-addons/Makefile
>index 2dcbc44c2d8d..03ada0673b69 100644
>--- a/chinese/fcitx5-chinese-addons/Makefile
>+++ b/chinese/fcitx5-chinese-addons/Makefile
>@@ -31,7 +31,7 @@ USE_LDCONFIG=	yes
> 
> 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
> 
>diff --git a/chinese/gcin-qt5/Makefile b/chinese/gcin-qt5/Makefile
>index e488aa1d4675..8c7c77791071 100644
>--- a/chinese/gcin-qt5/Makefile
>+++ b/chinese/gcin-qt5/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libgcin-im-client.so:chinese/gcin
> 
> 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}"
>diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
>index b4217705d0b2..c47db6a36847 100644
>--- a/comms/cutecom/Makefile
>+++ b/comms/cutecom/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/comms/inspectrum/Makefile b/comms/inspectrum/Makefile
>index 9b81503b9a77..6514c855214c 100644
>--- a/comms/inspectrum/Makefile
>+++ b/comms/inspectrum/Makefile
>@@ -19,7 +19,7 @@ USE_GITHUB=	yes
> 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>
>diff --git a/comms/klog/Makefile b/comms/klog/Makefile
>index 59ab9786189b..e063c3717c89 100644
>--- a/comms/klog/Makefile
>+++ b/comms/klog/Makefile
>@@ -12,9 +12,9 @@ LIB_DEPENDS=	libhamlib.so:comms/hamlib
> 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
> 
>diff --git a/comms/libsdr-gui/Makefile b/comms/libsdr-gui/Makefile
>index f143b8548551..238faf776de4 100644
>--- a/comms/libsdr-gui/Makefile
>+++ b/comms/libsdr-gui/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
> 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
> 
>diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile
>index cbafd38641c8..3d26abeeeba2 100644
>--- a/comms/nanovna-saver/Makefile
>+++ b/comms/nanovna-saver/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PY_DEPENDS}
> 
> 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
>diff --git a/comms/qt5-connectivity/Makefile b/comms/qt5-connectivity/Makefile
>index e0d37eed3eab..2db1641dbb03 100644
>--- a/comms/qt5-connectivity/Makefile
>+++ b/comms/qt5-connectivity/Makefile
>@@ -7,6 +7,6 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile
>index 41c9e62151b6..8215c3d5c678 100644
>--- a/comms/qt5-sensors/Makefile
>+++ b/comms/qt5-sensors/Makefile
>@@ -7,6 +7,6 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile
>index ba8702ac3a8b..8d6383b666f7 100644
>--- a/comms/qt5-serialbus/Makefile
>+++ b/comms/qt5-serialbus/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt functions to access industrial bus systems
> 
> 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>
>diff --git a/comms/qt5-serialport/Makefile b/comms/qt5-serialport/Makefile
>index 59b1509c0960..6d146d533fc4 100644
>--- a/comms/qt5-serialport/Makefile
>+++ b/comms/qt5-serialport/Makefile
>@@ -8,6 +8,6 @@ COMMENT=	Qt functions to access serial ports
> 
> 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>
>diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile
>index f314e3e84efd..9caf5832be85 100644
>--- a/comms/sdr-wspr/Makefile
>+++ b/comms/sdr-wspr/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libsdr-gui.so:comms/libsdr-gui
> 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
>diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
>index 4c872d9a4997..e5ba0c772602 100644
>--- a/comms/wsjtx/Makefile
>+++ b/comms/wsjtx/Makefile
>@@ -23,7 +23,7 @@ USES=	cmake:noninja compiler:c++11-lang fortran gl libedit \
> 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
> 
>diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile
>index 92aba1d8f107..aff32b50f78e 100644
>--- a/comms/wsjtz/Makefile
>+++ b/comms/wsjtz/Makefile
>@@ -30,7 +30,7 @@ USES=		cmake compiler:c++11-lib fortran gl \
> 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}"
>diff --git a/comms/xcwcp/Makefile b/comms/xcwcp/Makefile
>index e02a04418477..ce378cc023ce 100644
>--- a/comms/xcwcp/Makefile
>+++ b/comms/xcwcp/Makefile
>@@ -11,7 +11,7 @@ LIB_DEPENDS=	libcw.so:comms/unixcw
> 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
>diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
>index 5a1cf9e3056c..97ffa3239be3 100644
>--- a/databases/akonadi/Makefile
>+++ b/databases/akonadi/Makefile
>@@ -19,10 +19,10 @@ USE_GNOME=	libxml2
> 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
> CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
> 
> USE_LDCONFIG=	yes
>@@ -35,7 +35,7 @@ OPTIONS_DEFAULT=	MYSQL
> 
> 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
>@@ -44,12 +44,12 @@ PGSQL_DESC=		Install PostgreSQL Qt plugin
> # 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>
>diff --git a/databases/cutelyst-asql/Makefile b/databases/cutelyst-asql/Makefile
>index 41307f9d721e..ce84e367830a 100644
>--- a/databases/cutelyst-asql/Makefile
>+++ b/databases/cutelyst-asql/Makefile
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
>index 73d64dc3fc78..6f0016b8b500 100644
>--- a/databases/kbibtex/Makefile
>+++ b/databases/kbibtex/Makefile
>@@ -19,10 +19,10 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
> 		kio parts service solid sonnet 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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	WEBENGINE
>diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
>index 15da7d0ccd86..342c84ecfc2c 100644
>--- a/databases/kdb/Makefile
>+++ b/databases/kdb/Makefile
>@@ -17,7 +17,7 @@ USES=			cmake compiler:c++11-lang kde:5 \
> 			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
>diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
>index 942aaef75210..0e8c28f18e81 100644
>--- a/databases/kexi/Makefile
>+++ b/databases/kexi/Makefile
>@@ -19,9 +19,9 @@ USE_KDE=		auth bookmarks codecs completion config \
> 			configwidgets coreaddons crash ecm guiaddons i18n \
> 			iconthemes itemviews jobwidgets kio parts service \
> 			solid sonnet texteditor textwidgets widgetsaddons \
>-			xmlgui breeze-icons_build
>+			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
> 
> CONFLICTS_INSTALL=	calligra-2*
> 
>diff --git a/databases/opendbviewer/Makefile b/databases/opendbviewer/Makefile
>index 4d7987782786..de28a2791eea 100644
>--- a/databases/opendbviewer/Makefile
>+++ b/databases/opendbviewer/Makefile
>@@ -13,7 +13,7 @@ USES=		cmake compiler:c++11-lang magick:6,build qt:5
> 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
>diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
>index 40f6bdd4e511..dc9a1fbec4ea 100644
>--- a/databases/pgmodeler/Makefile
>+++ b/databases/pgmodeler/Makefile
>@@ -16,7 +16,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile
>index 673754c7b302..fa1f1ed8cbff 100644
>--- a/databases/qt5-sql/Makefile
>+++ b/databases/qt5-sql/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt SQL database integration module
> 
> 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
> 
>diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
>index 8d625d9f2093..1bc3938d3392 100644
>--- a/databases/redisdesktopmanager/Makefile
>+++ b/databases/redisdesktopmanager/Makefile
>@@ -39,7 +39,7 @@ GH_TUPLE=		uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager
> 			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 \
>diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
>index 82ed0ea8a069..960028adb83a 100644
>--- a/databases/sqlitebrowser/Makefile
>+++ b/databases/sqlitebrowser/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
> 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
>diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
>index bf8dec8613f4..95bbeec8d5a5 100644
>--- a/databases/sqlitestudio/Makefile
>+++ b/databases/sqlitestudio/Makefile
>@@ -28,8 +28,8 @@ PLUGIN_PRINTING_USE=			QT=printsupport
> 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
>diff --git a/databases/symphytum/Makefile b/databases/symphytum/Makefile
>index 095e7b7a0f53..2f1d52d29c77 100644
>--- a/databases/symphytum/Makefile
>+++ b/databases/symphytum/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD2CLAUSE
> 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
>diff --git a/deskutils/akonadi-calendar-tools/Makefile b/deskutils/akonadi-calendar-tools/Makefile
>index 1c4e428a06ea..416c6813da3f 100644
>--- a/deskutils/akonadi-calendar-tools/Makefile
>+++ b/deskutils/akonadi-calendar-tools/Makefile
>@@ -13,12 +13,12 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
>diff --git a/deskutils/akonadi-import-wizard/Makefile b/deskutils/akonadi-import-wizard/Makefile
>index 591324efb699..3b2a68b879ca 100644
>--- a/deskutils/akonadi-import-wizard/Makefile
>+++ b/deskutils/akonadi-import-wizard/Makefile
>@@ -16,13 +16,13 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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
>diff --git a/deskutils/akonadiconsole/Makefile b/deskutils/akonadiconsole/Makefile
>index 939ea7c13a7b..1a0e464c7647 100644
>--- a/deskutils/akonadiconsole/Makefile
>+++ b/deskutils/akonadiconsole/Makefile
>@@ -21,14 +21,14 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
>diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile
>index 197fcaef45a4..2f79c7d480e1 100644
>--- a/deskutils/akregator/Makefile
>+++ b/deskutils/akregator/Makefile
>@@ -18,13 +18,13 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/ausweisapp2/Makefile b/deskutils/ausweisapp2/Makefile
>index b18945da15a1..40481e81d911 100644
>--- a/deskutils/ausweisapp2/Makefile
>+++ b/deskutils/ausweisapp2/Makefile
>@@ -21,7 +21,7 @@ GH_ACCOUNT=	Governikus
> 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}
>diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
>index 73c737b148bb..6ee38c417648 100644
>--- a/deskutils/basket/Makefile
>+++ b/deskutils/basket/Makefile
>@@ -23,7 +23,7 @@ USE_KDE=	ecm archive auth codecs completion config configwidgets \
> 		notifications parts service 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
>diff --git a/deskutils/birdtray/Makefile b/deskutils/birdtray/Makefile
>index 4a93fcff8bfd..e51f7bf1a1e6 100644
>--- a/deskutils/birdtray/Makefile
>+++ b/deskutils/birdtray/Makefile
>@@ -13,8 +13,8 @@ USES=		cmake compiler:c++11-lib gettext kde:5 localbase qt:5 tar:xz \
> 		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
> 
>diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
>index 8ba58da7cd5a..447a20f9d02a 100644
>--- a/deskutils/calibre/Makefile
>+++ b/deskutils/calibre/Makefile
>@@ -60,7 +60,7 @@ USES=		desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
> 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
>diff --git a/deskutils/calindori/Makefile b/deskutils/calindori/Makefile
>index 6dcbdae06d85..0d63015b07c1 100644
>--- a/deskutils/calindori/Makefile
>+++ b/deskutils/calindori/Makefile
>@@ -15,10 +15,10 @@ USE_GL=		gl
> 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
> 
>diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
>index 4daedc7486cb..f85b1be42b32 100644
>--- a/deskutils/charmtimetracker/Makefile
>+++ b/deskutils/charmtimetracker/Makefile
>@@ -25,7 +25,7 @@ GH_PROJECT=	Charm
> 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>
>diff --git a/deskutils/coolreader/Makefile b/deskutils/coolreader/Makefile
>index 5848306609f0..797edda88d63 100644
>--- a/deskutils/coolreader/Makefile
>+++ b/deskutils/coolreader/Makefile
>@@ -22,7 +22,7 @@ USES=		qt:5 cmake:noninja pkgconfig desktop-file-utils jpeg
> 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
>diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile
>index 84452f352036..023236e58947 100644
>--- a/deskutils/copyq/Makefile
>+++ b/deskutils/copyq/Makefile
>@@ -32,8 +32,8 @@ USE_KDE=	notifications
> 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
>diff --git a/deskutils/coregarage/Makefile b/deskutils/coregarage/Makefile
>index e08b5d13619b..8aad545b67bb 100644
>--- a/deskutils/coregarage/Makefile
>+++ b/deskutils/coregarage/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libarchiveqt5.so:archivers/libarchive-qt \
> 		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
>diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
>index 51feacee04d7..eba245a04c51 100644
>--- a/deskutils/fet/Makefile
>+++ b/deskutils/fet/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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
> 
>diff --git a/deskutils/flameshot/Makefile b/deskutils/flameshot/Makefile
>index 4a5e5e8645c8..a994b0c206a3 100644
>--- a/deskutils/flameshot/Makefile
>+++ b/deskutils/flameshot/Makefile
>@@ -18,7 +18,7 @@ GH_ACCOUNT=	flameshot-org
> 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' \
>diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile
>index 6332727f3549..ca9e869648a9 100644
>--- a/deskutils/grantlee-editor/Makefile
>+++ b/deskutils/grantlee-editor/Makefile
>@@ -19,13 +19,13 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/grantleetheme/Makefile b/deskutils/grantleetheme/Makefile
>index 301ea33a09cb..c8c4317fe1ad 100644
>--- a/deskutils/grantleetheme/Makefile
>+++ b/deskutils/grantleetheme/Makefile
>@@ -11,9 +11,9 @@ USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 \
> 		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
>diff --git a/deskutils/itinerary/Makefile b/deskutils/itinerary/Makefile
>index 5c27f6449115..7fcc1075223a 100644
>--- a/deskutils/itinerary/Makefile
>+++ b/deskutils/itinerary/Makefile
>@@ -8,10 +8,10 @@ COMMENT=	Digital travel assistant for KDE
> USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 qt:5 tar:xz
> USE_KDE=	calendarcore coreaddons contacts crash dbusaddons i18n mime \
> 		kpkpass notifications kosm kitinerary kpublictransport qqc2-desktop-style \
>-		ecm_build
>+		ecm:build
> USE_QT=		core dbus declarative gui location network quick3d quickcontrols2 \
> 		testlib widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/deskutils/kaddressbook/Makefile b/deskutils/kaddressbook/Makefile
>index 14ee0692f6a5..fc606dfef43c 100644
>--- a/deskutils/kaddressbook/Makefile
>+++ b/deskutils/kaddressbook/Makefile
>@@ -16,13 +16,13 @@ USES=		cmake compiler:c++11-lib desktop-file-utils gettext grantlee:5 kde:5 \
> USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		i18n iconthemes itemmodels jobwidgets kcmutils kio parts \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/kalarm/Makefile b/deskutils/kalarm/Makefile
>index a48ec71a861b..3fe06aec757e 100644
>--- a/deskutils/kalarm/Makefile
>+++ b/deskutils/kalarm/Makefile
>@@ -13,16 +13,16 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
>diff --git a/deskutils/kalendar/Makefile b/deskutils/kalendar/Makefile
>index e4f7ab0544af..30a429be46bd 100644
>--- a/deskutils/kalendar/Makefile
>+++ b/deskutils/kalendar/Makefile
>@@ -12,15 +12,15 @@ USES=		cmake compiler:c++17-lang desktop-file-utils grantlee:5 kde:5 \
> 		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>
>diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
>index c01fa00285a1..83b582a384fa 100644
>--- a/deskutils/kcharselect/Makefile
>+++ b/deskutils/kcharselect/Makefile
>@@ -11,9 +11,9 @@ BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-
> 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
> 
>diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
>index 5a160a139f44..572c53675ba2 100644
>--- a/deskutils/kchmviewer/Makefile
>+++ b/deskutils/kchmviewer/Makefile
>@@ -12,7 +12,7 @@ LIB_DEPENDS=	libchm.so:misc/chmlib \
> 
> USES=		compiler:c++11-lang dos2unix qmake:outsource qt:5 xorg
> USE_QT=		core dbus gui network printsupport webkit widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> USE_XORG=	x11
> 
> USE_GITHUB=	yes
>diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
>index a99849d85f5f..ebbb3b8c2c72 100644
>--- a/deskutils/kdeconnect-kde/Makefile
>+++ b/deskutils/kdeconnect-kde/Makefile
>@@ -23,10 +23,10 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
>diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile
>index cdc583686298..60a44e530bf2 100644
>--- a/deskutils/kdepim-addons/Makefile
>+++ b/deskutils/kdepim-addons/Makefile
>@@ -21,7 +21,7 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
> 		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 \
>@@ -32,7 +32,7 @@ USE_KDE+=	akonadi akonadicalendar akonadicontacts akonadiimportwizard \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile
>index 5ea10158a813..479ca014724d 100644
>--- a/deskutils/kdepim-runtime/Makefile
>+++ b/deskutils/kdepim-runtime/Makefile
>@@ -30,7 +30,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadinotes \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/keditbookmarks/Makefile b/deskutils/keditbookmarks/Makefile
>index 08591daa35a2..df4a190ac253 100644
>--- a/deskutils/keditbookmarks/Makefile
>+++ b/deskutils/keditbookmarks/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/deskutils/kfind/Makefile b/deskutils/kfind/Makefile
>index b78272b19488..9badd8e94b71 100644
>--- a/deskutils/kfind/Makefile
>+++ b/deskutils/kfind/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/deskutils/kmail-account-wizard/Makefile b/deskutils/kmail-account-wizard/Makefile
>index 1b273a0d04f3..688fe5279996 100644
>--- a/deskutils/kmail-account-wizard/Makefile
>+++ b/deskutils/kmail-account-wizard/Makefile
>@@ -17,12 +17,12 @@ USE_KDE=	attica auth codecs config configwidgets coreaddons crash \
> 		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
>diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile
>index 9f8d471360e0..f11f7b84ab17 100644
>--- a/deskutils/kmail/Makefile
>+++ b/deskutils/kmail/Makefile
>@@ -27,17 +27,17 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/knotes/Makefile b/deskutils/knotes/Makefile
>index 46f4eb58ec90..1f948d2b4094 100644
>--- a/deskutils/knotes/Makefile
>+++ b/deskutils/knotes/Makefile
>@@ -20,9 +20,9 @@ USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
> 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
> 
>diff --git a/deskutils/kodaskanna/Makefile b/deskutils/kodaskanna/Makefile
>index ab20893906ad..40b9714f224e 100644
>--- a/deskutils/kodaskanna/Makefile
>+++ b/deskutils/kodaskanna/Makefile
>@@ -18,9 +18,9 @@ USE_XORG=	x11
> 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>
>diff --git a/deskutils/kongress/Makefile b/deskutils/kongress/Makefile
>index 98820021393a..30ec383520ba 100644
>--- a/deskutils/kongress/Makefile
>+++ b/deskutils/kongress/Makefile
>@@ -15,9 +15,9 @@ USE_GL=		gl
> 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
>diff --git a/deskutils/kontact/Makefile b/deskutils/kontact/Makefile
>index 8420eb49565d..b2529834aee2 100644
>--- a/deskutils/kontact/Makefile
>+++ b/deskutils/kontact/Makefile
>@@ -11,12 +11,12 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 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
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile
>index 8330e2fad7fc..b9b09b47d388 100644
>--- a/deskutils/korganizer/Makefile
>+++ b/deskutils/korganizer/Makefile
>@@ -14,16 +14,16 @@ USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
>index b927a6a1bc14..c92699eaa4fb 100644
>--- a/deskutils/kruler/Makefile
>+++ b/deskutils/kruler/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KDE screen ruler
> 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
>diff --git a/deskutils/ktimetracker/Makefile b/deskutils/ktimetracker/Makefile
>index a2ea95471aea..a91f46cd7ffc 100644
>--- a/deskutils/ktimetracker/Makefile
>+++ b/deskutils/ktimetracker/Makefile
>@@ -15,8 +15,8 @@ USE_KDE=	kio sonnet auth calendarcore codecs config configwidgets \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/deskutils/kuserfeedback/Makefile b/deskutils/kuserfeedback/Makefile
>index 8ffd9aed26e1..995a4ef60626 100644
>--- a/deskutils/kuserfeedback/Makefile
>+++ b/deskutils/kuserfeedback/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 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
> 
>diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile
>index 7e1aa38ddd52..a7c3ecccbaa2 100644
>--- a/deskutils/latte-dock/Makefile
>+++ b/deskutils/latte-dock/Makefile
>@@ -17,10 +17,10 @@ USE_KDE=	activities archive attica auth codecs completion config \
> 		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>
>diff --git a/deskutils/libcprime/Makefile b/deskutils/libcprime/Makefile
>index d44e48979427..03364b50b3a9 100644
>--- a/deskutils/libcprime/Makefile
>+++ b/deskutils/libcprime/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv3
> 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
> 
>diff --git a/deskutils/libkdepim/Makefile b/deskutils/libkdepim/Makefile
>index 89f86303ae57..f4165c0936b1 100644
>--- a/deskutils/libkdepim/Makefile
>+++ b/deskutils/libkdepim/Makefile
>@@ -13,12 +13,12 @@ USES=		cmake gettext compiler:c++11-lib kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/deskutils/libportal/Makefile b/deskutils/libportal/Makefile
>index 762f797856b0..58475d747259 100644
>--- a/deskutils/libportal/Makefile
>+++ b/deskutils/libportal/Makefile
>@@ -12,7 +12,7 @@ BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
> 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
>diff --git a/deskutils/lumina-archiver/Makefile b/deskutils/lumina-archiver/Makefile
>index 7cdad42bfccc..892c1f0ce703 100644
>--- a/deskutils/lumina-archiver/Makefile
>+++ b/deskutils/lumina-archiver/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
> 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
>@@ -20,7 +20,7 @@ GH_PROJECT=	lumina
> 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.*
>diff --git a/deskutils/lumina-calculator/Makefile b/deskutils/lumina-calculator/Makefile
>index f69315d1f53c..b14b2dbbfeef 100644
>--- a/deskutils/lumina-calculator/Makefile
>+++ b/deskutils/lumina-calculator/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
> 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
>@@ -18,7 +18,7 @@ GH_TAGNAME=	159fc375
> 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.*
>diff --git a/deskutils/lumina-fileinfo/Makefile b/deskutils/lumina-fileinfo/Makefile
>index 9c12e0c4affb..44165792d0ed 100644
>--- a/deskutils/lumina-fileinfo/Makefile
>+++ b/deskutils/lumina-fileinfo/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
> 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
>@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> 
> NLS_QMAKE_ON=	CONFIG+=WITH_I18N
>-NLS_USE=	QT=linguist_build
>+NLS_USE=	QT=linguist:build
> 
> CONFLICTS_INSTALL=	lumina-1.2.*
> 
>diff --git a/deskutils/lumina-fm/Makefile b/deskutils/lumina-fm/Makefile
>index f570949b5a78..043d29bda377 100644
>--- a/deskutils/lumina-fm/Makefile
>+++ b/deskutils/lumina-fm/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Insight file manager from the Lumina Desktop
> 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
>@@ -19,7 +19,7 @@ GH_PROJECT=	lumina
> 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.*
>diff --git a/deskutils/lumina-mediaplayer/Makefile b/deskutils/lumina-mediaplayer/Makefile
>index 06866e03dc07..911d6681e822 100644
>--- a/deskutils/lumina-mediaplayer/Makefile
>+++ b/deskutils/lumina-mediaplayer/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/../../../LICENSE
> 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
>@@ -21,7 +21,7 @@ GH_PROJECT=	lumina
> 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}
>diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile
>index 763c92b729b4..7e1c216befa8 100644
>--- a/deskutils/lumina-pdf/Makefile
>+++ b/deskutils/lumina-pdf/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	PDF viewer from the Lumina Desktop
> 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
>@@ -33,7 +33,7 @@ MUPDF_QMAKE_ON=		USE_MUPDF=true
> 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
>diff --git a/deskutils/lumina-photo/Makefile b/deskutils/lumina-photo/Makefile
>index 374e0d5b5144..94d91154cbe7 100644
>--- a/deskutils/lumina-photo/Makefile
>+++ b/deskutils/lumina-photo/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Image viewer utility from the Lumina Desktop
> 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
>@@ -19,7 +19,7 @@ GH_PROJECT=	lumina
> 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}
>diff --git a/deskutils/lumina-screenshot/Makefile b/deskutils/lumina-screenshot/Makefile
>index 03361d2967a7..8b2eade211a3 100644
>--- a/deskutils/lumina-screenshot/Makefile
>+++ b/deskutils/lumina-screenshot/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libxcb-ewmh.so:x11/xcb-util-wm \
> 		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
>@@ -26,7 +26,7 @@ GH_PROJECT=	lumina
> 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.*
>diff --git a/deskutils/lumina-textedit/Makefile b/deskutils/lumina-textedit/Makefile
>index bad7ca0ca8d3..21195a8e1e51 100644
>--- a/deskutils/lumina-textedit/Makefile
>+++ b/deskutils/lumina-textedit/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
> 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
>@@ -20,7 +20,7 @@ GH_PROJECT=	lumina
> 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.*
>diff --git a/deskutils/lxqt-notificationd/Makefile b/deskutils/lxqt-notificationd/Makefile
>index 240d6aca5123..d8a0b06f5750 100644
>--- a/deskutils/lxqt-notificationd/Makefile
>+++ b/deskutils/lxqt-notificationd/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	LGPL21+
> 
> 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
>diff --git a/deskutils/maliit-framework/Makefile b/deskutils/maliit-framework/Makefile
>index f2f4bf3eaee5..efccefa99284 100644
>--- a/deskutils/maliit-framework/Makefile
>+++ b/deskutils/maliit-framework/Makefile
>@@ -18,7 +18,7 @@ USE_GITHUB=	yes
> 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 \
>diff --git a/deskutils/maliit-keyboard/Makefile b/deskutils/maliit-keyboard/Makefile
>index 22250f562416..2f81059be2ef 100644
>--- a/deskutils/maliit-keyboard/Makefile
>+++ b/deskutils/maliit-keyboard/Makefile
>@@ -18,7 +18,7 @@ GH_ACCOUNT=	maliit
> 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
> 
>diff --git a/deskutils/mbox-importer/Makefile b/deskutils/mbox-importer/Makefile
>index 6b375f9c777e..a9130ccc0dcb 100644
>--- a/deskutils/mbox-importer/Makefile
>+++ b/deskutils/mbox-importer/Makefile
>@@ -14,13 +14,13 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
> 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
>diff --git a/deskutils/mindforger/Makefile b/deskutils/mindforger/Makefile
>index 947f92e28f14..14d830333823 100644
>--- a/deskutils/mindforger/Makefile
>+++ b/deskutils/mindforger/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv2+
> 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
>diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
>index 1aadc00f9675..9c5d5bec3bee 100644
>--- a/deskutils/nextcloudclient/Makefile
>+++ b/deskutils/nextcloudclient/Makefile
>@@ -16,8 +16,8 @@ LIB_DEPENDS=	libinotify.so:devel/libinotify \
> 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 \
>diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
>index 4d4832f40bbe..89a997ef4559 100644
>--- a/deskutils/owncloudclient/Makefile
>+++ b/deskutils/owncloudclient/Makefile
>@@ -24,7 +24,7 @@ USE_KDE=	completion config coreaddons jobwidgets kio service \
> 		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"
>diff --git a/deskutils/pim-data-exporter/Makefile b/deskutils/pim-data-exporter/Makefile
>index 2d2a60007469..14bc08978729 100644
>--- a/deskutils/pim-data-exporter/Makefile
>+++ b/deskutils/pim-data-exporter/Makefile
>@@ -16,13 +16,13 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/deskutils/pim-sieve-editor/Makefile b/deskutils/pim-sieve-editor/Makefile
>index 9e18800dab43..3a6fe427f9df 100644
>--- a/deskutils/pim-sieve-editor/Makefile
>+++ b/deskutils/pim-sieve-editor/Makefile
>@@ -11,11 +11,11 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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
> 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
>diff --git a/deskutils/plasma5-milou/Makefile b/deskutils/plasma5-milou/Makefile
>index 28957c442c38..fb65c71b20b0 100644
>--- a/deskutils/plasma5-milou/Makefile
>+++ b/deskutils/plasma5-milou/Makefile
>@@ -9,6 +9,6 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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>
>diff --git a/deskutils/plasma5-sddm-kcm/Makefile b/deskutils/plasma5-sddm-kcm/Makefile
>index 22efb03210bf..a4565045006b 100644
>--- a/deskutils/plasma5-sddm-kcm/Makefile
>+++ b/deskutils/plasma5-sddm-kcm/Makefile
>@@ -12,7 +12,7 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
> 		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>
>diff --git a/deskutils/plasma5-xdg-desktop-portal-kde/Makefile b/deskutils/plasma5-xdg-desktop-portal-kde/Makefile
>index 327d8945407b..a00fbed365ef 100644
>--- a/deskutils/plasma5-xdg-desktop-portal-kde/Makefile
>+++ b/deskutils/plasma5-xdg-desktop-portal-kde/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/deskutils/qlipper/Makefile b/deskutils/qlipper/Makefile
>index 8b0acb73f45b..5b1b54144bcf 100644
>--- a/deskutils/qlipper/Makefile
>+++ b/deskutils/qlipper/Makefile
>@@ -20,7 +20,7 @@ LXQTAUTOSTART_DESC=		Create autostart entry for LXQt
> 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
>diff --git a/deskutils/qownnotes/Makefile b/deskutils/qownnotes/Makefile
>index e0cd21b3d12e..8f699b560fc5 100644
>--- a/deskutils/qownnotes/Makefile
>+++ b/deskutils/qownnotes/Makefile
>@@ -13,7 +13,7 @@ RUN_DEPENDS=	git:devel/git
> 
> 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
>diff --git a/deskutils/qtfeedback/Makefile b/deskutils/qtfeedback/Makefile
>index f357fa5b9eff..44bbacdaeb1a 100644
>--- a/deskutils/qtfeedback/Makefile
>+++ b/deskutils/qtfeedback/Makefile
>@@ -12,7 +12,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
>index 5eb0fc9a3f56..7ee366e541b2 100644
>--- a/deskutils/recoll/Makefile
>+++ b/deskutils/recoll/Makefile
>@@ -25,7 +25,7 @@ USE_LDCONFIG=	yes
> 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 \
>diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
>index bc6c9c8d4280..41958b2d1600 100644
>--- a/deskutils/semantik/Makefile
>+++ b/deskutils/semantik/Makefile
>@@ -16,7 +16,7 @@ USE_KDE=	auth config configwidgets coreaddons i18n iconthemes \
> 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 \
>diff --git a/deskutils/syncthingtray/Makefile b/deskutils/syncthingtray/Makefile
>index 5fac3f09cefd..06756ec6e5d5 100644
>--- a/deskutils/syncthingtray/Makefile
>+++ b/deskutils/syncthingtray/Makefile
>@@ -26,8 +26,8 @@ GH_TUPLE=	Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION}:syncthingtray/
> 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
> 
>diff --git a/deskutils/todour/Makefile b/deskutils/todour/Makefile
>index 6215311028b6..5f77cc690816 100644
>--- a/deskutils/todour/Makefile
>+++ b/deskutils/todour/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Qt-based UI for editing of todo.txt files
> 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
>diff --git a/deskutils/zanshin/Makefile b/deskutils/zanshin/Makefile
>index 1f7f0f1d8348..aa4011d569d4 100644
>--- a/deskutils/zanshin/Makefile
>+++ b/deskutils/zanshin/Makefile
>@@ -17,9 +17,9 @@ USE_KDE=	akonadi auth bookmarks codecs completion config configwidgets \
> 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
> 
> .include <bsd.port.mk>
>diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
>index b7f1c522cda7..01396ed8ef10 100644
>--- a/deskutils/znotes/Makefile
>+++ b/deskutils/znotes/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
>index b8e68a946620..17a28a79bf07 100644
>--- a/devel/RStudio/Makefile
>+++ b/devel/RStudio/Makefile
>@@ -69,7 +69,7 @@ GIN_VERSION=	2.1.2
> 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}
>diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile
>index 880543472582..6f4542b8381e 100644
>--- a/devel/apitrace/Makefile
>+++ b/devel/apitrace/Makefile
>@@ -32,7 +32,7 @@ OPTIONS_SUB=		yes
> 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
>diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
>index 5ba0d84ef9c4..db1f7a9ed405 100644
>--- a/devel/cervisia/Makefile
>+++ b/devel/cervisia/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
>index 13cb15f01348..033ad1391087 100644
>--- a/devel/cmake-doc/Makefile
>+++ b/devel/cmake-doc/Makefile
>@@ -16,7 +16,7 @@ DISTINFO_FILE=	${.CURDIR}/../cmake/distinfo
> 
> 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
>diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
>index 579c9d1fbc9f..b01088874a86 100644
>--- a/devel/cmake-gui/Makefile
>+++ b/devel/cmake-gui/Makefile
>@@ -26,7 +26,7 @@ qt6_CONFLICTS_INSTALL=	cmake-gui-qt5
> 
> 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}" \
>diff --git a/devel/codequery/Makefile b/devel/codequery/Makefile
>index f1a7497e728a..a749ba6d2111 100644
>--- a/devel/codequery/Makefile
>+++ b/devel/codequery/Makefile
>@@ -18,7 +18,7 @@ USE_GITHUB=	yes
> 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
> 
>diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
>index bbda31225289..e89214aba01f 100644
>--- a/devel/cppcheck/Makefile
>+++ b/devel/cppcheck/Makefile
>@@ -23,7 +23,7 @@ RUN_DEPENDS=		cppcheck:devel/cppcheck
> 
> 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
>diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins/Makefile
>index 211f97acc619..0b1283fe4b05 100644
>--- a/devel/dolphin-plugins/Makefile
>+++ b/devel/dolphin-plugins/Makefile
>@@ -15,7 +15,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
>index ff54afd7658e..4d7e936efabb 100644
>--- a/devel/doxygen/Makefile
>+++ b/devel/doxygen/Makefile
>@@ -47,7 +47,7 @@ GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
> 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
> 
>diff --git a/devel/easy-profiler/Makefile b/devel/easy-profiler/Makefile
>index 3f1adee09e24..e7261c50948f 100644
>--- a/devel/easy-profiler/Makefile
>+++ b/devel/easy-profiler/Makefile
>@@ -15,7 +15,7 @@ LICENSE_FILE_MIT=	${WRKSRC}/easy_profiler_core/LICENSE.MIT
> 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
>diff --git a/devel/elf-dissector/Makefile b/devel/elf-dissector/Makefile
>index 85fb11827d7d..bf7285c8cf37 100644
>--- a/devel/elf-dissector/Makefile
>+++ b/devel/elf-dissector/Makefile
>@@ -18,9 +18,9 @@ USES=		cmake compiler:c++17-lang \
> 		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
> 
>diff --git a/devel/eql5/Makefile b/devel/eql5/Makefile
>index ebe29a7640c4..389bae1fc8ba 100644
>--- a/devel/eql5/Makefile
>+++ b/devel/eql5/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libecl.so:lang/ecl
> 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
> 
>diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile
>index 948126e83242..e0352aca613c 100644
>--- a/devel/fuel/Makefile
>+++ b/devel/fuel/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	fossil:devel/fossil
> 
> 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 \
>diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile
>index 40742a35fba0..31511ace5a09 100644
>--- a/devel/gammaray/Makefile
>+++ b/devel/gammaray/Makefile
>@@ -19,7 +19,7 @@ USES=		cmake kde:5 pkgconfig qt:5
> 
> 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
>diff --git a/devel/gitklient/Makefile b/devel/gitklient/Makefile
>index df2b59d02ce1..12e317eef002 100644
>--- a/devel/gitklient/Makefile
>+++ b/devel/gitklient/Makefile
>@@ -18,7 +18,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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>
>diff --git a/devel/gitqlient/Makefile b/devel/gitqlient/Makefile
>index ca06f736c3fc..679ddec4c05f 100644
>--- a/devel/gitqlient/Makefile
>+++ b/devel/gitqlient/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/devel/grantlee5/Makefile b/devel/grantlee5/Makefile
>index 40e0f5b55468..269d779447c6 100644
>--- a/devel/grantlee5/Makefile
>+++ b/devel/grantlee5/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	LGPL21
> 
> PORTSCOUT=	limit:^5\.
> 
>-USE_QT=		buildtools_build core gui qmake_build script declarative
>+USE_QT=		buildtools:build core gui qmake:build script declarative
> USES=		cmake compiler:c++11-lib grantlee:5,selfbuild qt:5
> USE_CXXSTD=	c++11
> CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=FALSE
>diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
>index 1baf858b330b..265d77e34c56 100644
>--- a/devel/gwenhywfar/Makefile
>+++ b/devel/gwenhywfar/Makefile
>@@ -75,7 +75,7 @@ USE_GNOME+=	cairo gdkpixbuf2 gtk30
> 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}
>diff --git a/devel/heaptrack/Makefile b/devel/heaptrack/Makefile
>index 87a4f06ffa72..216a7066982b 100644
>--- a/devel/heaptrack/Makefile
>+++ b/devel/heaptrack/Makefile
>@@ -21,6 +21,6 @@ USE_KDE=	auth auth codecs completion config config \
> 		jobwidgets kio kio service threadweaver \
> 		widgetsaddons windowsystem
> USE_QT=		concurrent core dbus gui network widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/devel/heimdall/Makefile b/devel/heimdall/Makefile
>index 8d9aaa393187..48abb29e04c2 100644
>--- a/devel/heimdall/Makefile
>+++ b/devel/heimdall/Makefile
>@@ -18,7 +18,7 @@ OPTIONS_DEFAULT=GUI
> 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
>diff --git a/devel/injeqt/Makefile b/devel/injeqt/Makefile
>index aaad3903dcc9..2d9aeb3c945d 100644
>--- a/devel/injeqt/Makefile
>+++ b/devel/injeqt/Makefile
>@@ -13,7 +13,7 @@ USE_GITHUB=	yes
> 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 \
>diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile
>index 4cea12d15b73..68846303e42c 100644
>--- a/devel/kapptemplate/Makefile
>+++ b/devel/kapptemplate/Makefile
>@@ -12,9 +12,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
>index 41cc2ade0f55..d74a81a3b3ea 100644
>--- a/devel/kcachegrind/Makefile
>+++ b/devel/kcachegrind/Makefile
>@@ -10,9 +10,9 @@ USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 python:run qt:5 \
> 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
> 
> SHEBANG_FILES=	converters/dprof2calltree \
> 		converters/hotshot2calltree.in \
>diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
>index c6ea7b343f10..fbe3972233db 100644
>--- a/devel/kdbg/Makefile
>+++ b/devel/kdbg/Makefile
>@@ -12,7 +12,7 @@ USES=		cmake compiler:c++11-lang kde:5 qt:5
> 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_GITHUB=	yes
> GH_ACCOUNT=	j6t
> 
>diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts/Makefile
>index b73aa1aa9538..d18fcb9b6c44 100644
>--- a/devel/kde-dev-scripts/Makefile
>+++ b/devel/kde-dev-scripts/Makefile
>@@ -7,7 +7,7 @@ COMMENT=	KDE development scripts
> 
> 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 \
>diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils/Makefile
>index 43e5ea139533..254b7fb20a35 100644
>--- a/devel/kde-dev-utils/Makefile
>+++ b/devel/kde-dev-utils/Makefile
>@@ -10,9 +10,9 @@ USE_GL=		gl
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/kdesdk-kio/Makefile b/devel/kdesdk-kio/Makefile
>index ac0cdd9b3042..d92c91458915 100644
>--- a/devel/kdesdk-kio/Makefile
>+++ b/devel/kdesdk-kio/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	KIO workers useful for software development
> 
> 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
> 
>diff --git a/devel/kdesdk-thumbnailers/Makefile b/devel/kdesdk-thumbnailers/Makefile
>index 65212d51b9ba..ff7afd72b6bd 100644
>--- a/devel/kdesdk-thumbnailers/Makefile
>+++ b/devel/kdesdk-thumbnailers/Makefile
>@@ -10,9 +10,9 @@ LIB_DEPENDS=	libgettextpo.so:devel/gettext-tools
> USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile
>index 4d920d857a6a..51e6508c488c 100644
>--- a/devel/kdesdk/Makefile
>+++ b/devel/kdesdk/Makefile
>@@ -38,7 +38,7 @@ KAPPTEMPLATE_DESC=	Template generator
> 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
>diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
>index 8cf1e77a3f1e..df2a12972b51 100644
>--- a/devel/kdesvn/Makefile
>+++ b/devel/kdesvn/Makefile
>@@ -22,9 +22,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		coreaddons dbusaddons ecm i18n iconthemes itemviews jobwidgets \
> 		kio notifications parts service sonnet texteditor textwidgets \
> 		wallet widgetsaddons xmlgui \
>-		doctools_build
>+		doctools:build
> USE_QT=		concurrent core dbus gui network sql widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> PORTSCOUT=	ignore:1
> 
>diff --git a/devel/kdev-php/Makefile b/devel/kdev-php/Makefile
>index b4748e8b4deb..604980724c47 100644
>--- a/devel/kdev-php/Makefile
>+++ b/devel/kdev-php/Makefile
>@@ -15,7 +15,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
> 		i18n itemmodels jobwidgets kcmutils kio parts service sonnet \
> 		texteditor textwidgets threadweaver widgetsaddons xmlgui
> USE_QT=		concurrent core dbus gui network webkit widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> # Versioning values, to reduce plist churn (match with devel/kdevelop)
> PLATFORM_VER=	37
>diff --git a/devel/kdev-python/Makefile b/devel/kdev-python/Makefile
>index fcb4008d1b51..67d2f7c9b589 100644
>--- a/devel/kdev-python/Makefile
>+++ b/devel/kdev-python/Makefile
>@@ -15,7 +15,7 @@ USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
> 		ecm i18n itemmodels jobwidgets kio newstuff parts service \
> 		sonnet texteditor textwidgets threadweaver widgetsaddons xmlgui
> USE_QT=		concurrent core dbus gui network widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> # Versioning values, to reduce plist churn (match with devel/kdevelop)
> PLATFORM_VER=	37
>diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
>index 9f9dc090c6bf..2e8092769726 100644
>--- a/devel/kdevelop-pg-qt/Makefile
>+++ b/devel/kdevelop-pg-qt/Makefile
>@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
> 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*
> 
>diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
>index 99d1752cd406..3e5a1ea7f0b8 100644
>--- a/devel/kdevelop/Makefile
>+++ b/devel/kdevelop/Makefile
>@@ -31,10 +31,10 @@ USE_KDE=	archive attica auth bookmarks codecs completion config configwidgets \
> 		runner service solid sonnet texteditor textwidgets threadweaver \
> 		widgetsaddons windowsystem xmlgui
> USE_QT=		concurrent core dbus declarative gui help network \
>-		script sql widgets xml buildtools_build qmake_build
>+		script sql widgets xml buildtools:build qmake:build
> 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.
>diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile
>index 06c5f591e041..b0af99ec97ba 100644
>--- a/devel/kf5-extra-cmake-modules/Makefile
>+++ b/devel/kf5-extra-cmake-modules/Makefile
>@@ -9,9 +9,9 @@ LICENSE=	BSD3CLAUSE
> 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/*
>diff --git a/devel/kf5-kauth/Makefile b/devel/kf5-kauth/Makefile
>index 99a0476e0b41..9a232a264601 100644
>--- a/devel/kf5-kauth/Makefile
>+++ b/devel/kf5-kauth/Makefile
>@@ -10,8 +10,8 @@ LIB_DEPENDS=	libpolkit-qt5-core-1.so:sysutils/polkit-qt
> 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>
>diff --git a/devel/kf5-kbookmarks/Makefile b/devel/kf5-kbookmarks/Makefile
>index 74fdc619c935..9f465f6b7654 100644
>--- a/devel/kf5-kbookmarks/Makefile
>+++ b/devel/kf5-kbookmarks/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	KF5 library for bookmarks and the XBEL format
> 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>
>diff --git a/devel/kf5-kcmutils/Makefile b/devel/kf5-kcmutils/Makefile
>index 083f94959e25..c177cf1f2a37 100644
>--- a/devel/kf5-kcmutils/Makefile
>+++ b/devel/kf5-kcmutils/Makefile
>@@ -9,8 +9,8 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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>
>diff --git a/devel/kf5-kconfig/Makefile b/devel/kf5-kconfig/Makefile
>index 5abc556cc8cb..89f50631f166 100644
>--- a/devel/kf5-kconfig/Makefile
>+++ b/devel/kf5-kconfig/Makefile
>@@ -10,8 +10,8 @@ LICENSE=	LGPL21+
> 
> 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 xml \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-kcoreaddons/Makefile b/devel/kf5-kcoreaddons/Makefile
>index cd7bded7cd61..d32c1109fd19 100644
>--- a/devel/kf5-kcoreaddons/Makefile
>+++ b/devel/kf5-kcoreaddons/Makefile
>@@ -9,9 +9,9 @@ LICENSE=	LGPL21+ BSD3CLAUSE
> 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
>diff --git a/devel/kf5-kcrash/Makefile b/devel/kf5-kcrash/Makefile
>index 154d2ebb79da..9ac7b309316e 100644
>--- a/devel/kf5-kcrash/Makefile
>+++ b/devel/kf5-kcrash/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	KF5 library to handle crash analysis and bug report from apps
> 
> 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>
>diff --git a/devel/kf5-kdbusaddons/Makefile b/devel/kf5-kdbusaddons/Makefile
>index c7be66836c4d..487fc16ef5fe 100644
>--- a/devel/kf5-kdbusaddons/Makefile
>+++ b/devel/kf5-kdbusaddons/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	KF5 addons to QtDBus
> 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 x11extras \
>-		buildtools_build linguisttools_build qmake_build testlib_build
>+		buildtools:build linguisttools:build qmake:build testlib:build
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-kdeclarative/Makefile b/devel/kf5-kdeclarative/Makefile
>index b5f049f1b469..67494a1eb4ed 100644
>--- a/devel/kf5-kdeclarative/Makefile
>+++ b/devel/kf5-kdeclarative/Makefile
>@@ -12,8 +12,8 @@ USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig \
> USE_KDE=	completion config coreaddons globalaccel guiaddons i18n \
> 		iconthemes jobwidgets kio notifications package service 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
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-kdoctools/Makefile b/devel/kf5-kdoctools/Makefile
>index 408fc0d363d0..b579018aa45a 100644
>--- a/devel/kf5-kdoctools/Makefile
>+++ b/devel/kf5-kdoctools/Makefile
>@@ -14,8 +14,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xs
> 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>
>diff --git a/devel/kf5-kfilemetadata/Makefile b/devel/kf5-kfilemetadata/Makefile
>index 54eef80f1346..bb110e020dd0 100644
>--- a/devel/kf5-kfilemetadata/Makefile
>+++ b/devel/kf5-kfilemetadata/Makefile
>@@ -17,8 +17,8 @@ LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
> 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 xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-ki18n/Makefile b/devel/kf5-ki18n/Makefile
>index f6b643ca7029..c8ead42be555 100644
>--- a/devel/kf5-ki18n/Makefile
>+++ b/devel/kf5-ki18n/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 advanced internationalization framework
> 
> 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>
>diff --git a/devel/kf5-kidletime/Makefile b/devel/kf5-kidletime/Makefile
>index 7adb819edd8f..5750aa6a26a6 100644
>--- a/devel/kf5-kidletime/Makefile
>+++ b/devel/kf5-kidletime/Makefile
>@@ -6,9 +6,9 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/devel/kf5-kio/Makefile b/devel/kf5-kio/Makefile
>index 7fc3cb5ebb6b..03086e34e055 100644
>--- a/devel/kf5-kio/Makefile
>+++ b/devel/kf5-kio/Makefile
>@@ -13,9 +13,9 @@ USE_KDE=	archive auth bookmarks codecs completion config \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-kitemmodels/Makefile b/devel/kf5-kitemmodels/Makefile
>index 32d7231a5682..3c18086c5a4a 100644
>--- a/devel/kf5-kitemmodels/Makefile
>+++ b/devel/kf5-kitemmodels/Makefile
>@@ -6,8 +6,8 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/devel/kf5-knewstuff/Makefile b/devel/kf5-knewstuff/Makefile
>index 7ea850721c25..6a5b6d572b8e 100644
>--- a/devel/kf5-knewstuff/Makefile
>+++ b/devel/kf5-knewstuff/Makefile
>@@ -10,8 +10,8 @@ USE_KDE=	archive attica5 auth codecs completion config \
> 		configwidgets coreaddons i18n iconthemes itemviews \
> 		jobwidgets kio kirigami2 package service 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
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile
>index 38b1d75a66e0..7c4c4ca762d9 100644
>--- a/devel/kf5-knotifications/Makefile
>+++ b/devel/kf5-knotifications/Makefile
>@@ -11,9 +11,9 @@ LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
> 
> 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
>diff --git a/devel/kf5-knotifyconfig/Makefile b/devel/kf5-knotifyconfig/Makefile
>index 3f5c4ecad743..dbaecbdfb4ce 100644
>--- a/devel/kf5-knotifyconfig/Makefile
>+++ b/devel/kf5-knotifyconfig/Makefile
>@@ -10,9 +10,9 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra
> USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	completion config coreaddons i18n jobwidgets kio \
> 		service widgetsaddons windowsystem \
>-		ecm_build
>+		ecm:build
> USE_QT=		concurrent core dbus gui network phonon4 widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> OPTIONS_DEFINE=		AUDIO
> OPTIONS_DEFAULT=	AUDIO
>diff --git a/devel/kf5-kpackage/Makefile b/devel/kf5-kpackage/Makefile
>index 7e9f0051eea3..8a2f8936d82c 100644
>--- a/devel/kf5-kpackage/Makefile
>+++ b/devel/kf5-kpackage/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 library to load and install packages
> 
> 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>
>diff --git a/devel/kf5-kparts/Makefile b/devel/kf5-kparts/Makefile
>index 80a4e305c7d5..e7569aa81560 100644
>--- a/devel/kf5-kparts/Makefile
>+++ b/devel/kf5-kparts/Makefile
>@@ -10,6 +10,6 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		i18n iconthemes jobwidgets kio notifications service \
> 		sonnet textwidgets widgetsaddons windowsystem xmlgui
> USE_QT=		concurrent core dbus gui network widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-kpeople/Makefile b/devel/kf5-kpeople/Makefile
>index 1a03138212ac..fc52c6164ff0 100644
>--- a/devel/kf5-kpeople/Makefile
>+++ b/devel/kf5-kpeople/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 library providing access to contacts
> 
> 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>
>diff --git a/devel/kf5-kpty/Makefile b/devel/kf5-kpty/Makefile
>index c556e7e0ee8f..0430637556f1 100644
>--- a/devel/kf5-kpty/Makefile
>+++ b/devel/kf5-kpty/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 pty abstraction
> 
> 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>
>diff --git a/devel/kf5-kservice/Makefile b/devel/kf5-kservice/Makefile
>index 5c20092607df..cb3cc8fc41c8 100644
>--- a/devel/kf5-kservice/Makefile
>+++ b/devel/kf5-kservice/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	KF5 advanced plugin and service introspection
> 
> 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"
>diff --git a/devel/kf5-ktexteditor/Makefile b/devel/kf5-ktexteditor/Makefile
>index 17b888b79f89..f71d5a2929c9 100644
>--- a/devel/kf5-ktexteditor/Makefile
>+++ b/devel/kf5-ktexteditor/Makefile
>@@ -13,9 +13,9 @@ USE_KDE=	archive auth codecs completion config configwidgets \
> 		coreaddons guiaddons i18n iconthemes itemviews \
> 		jobwidgets kio parts service 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
> 
> .include <bsd.port.mk>
>diff --git a/devel/kf5-kunitconversion/Makefile b/devel/kf5-kunitconversion/Makefile
>index 3b3181a0c27b..5cb03110e283 100644
>--- a/devel/kf5-kunitconversion/Makefile
>+++ b/devel/kf5-kunitconversion/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 library for unit conversion
> 
> 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>
>diff --git a/devel/kf5-solid/Makefile b/devel/kf5-solid/Makefile
>index 91ff34a46e59..d7e0d5793af3 100644
>--- a/devel/kf5-solid/Makefile
>+++ b/devel/kf5-solid/Makefile
>@@ -8,10 +8,10 @@ COMMENT=	KF5 hardware integration and detection
> 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
> 
>diff --git a/devel/kf5-threadweaver/Makefile b/devel/kf5-threadweaver/Makefile
>index 3b57a334c966..7c37e82175ef 100644
>--- a/devel/kf5-threadweaver/Makefile
>+++ b/devel/kf5-threadweaver/Makefile
>@@ -6,8 +6,8 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile
>index 850bee70aebb..81a2810f1cc8 100644
>--- a/devel/kio-extras/Makefile
>+++ b/devel/kio-extras/Makefile
>@@ -17,10 +17,10 @@ USE_KDE=	activities archive auth bookmarks codecs completion config \
> 		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=	xcursor
> SHEBANG_FILES=	info/kde-info2html
> 
>diff --git a/devel/kirigami-gallery/Makefile b/devel/kirigami-gallery/Makefile
>index bc119690cfda..967d9249d6b9 100644
>--- a/devel/kirigami-gallery/Makefile
>+++ b/devel/kirigami-gallery/Makefile
>@@ -10,9 +10,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL-2
> 
> 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
> 
>diff --git a/devel/kpublictransport/Makefile b/devel/kpublictransport/Makefile
>index ce085e7cecd9..2f52e01194d9 100644
>--- a/devel/kpublictransport/Makefile
>+++ b/devel/kpublictransport/Makefile
>@@ -10,7 +10,7 @@ LIB_DEPENDS=	libprotobuf.so:devel/protobuf
> 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
> 
>diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
>index f521ec9ab28b..e625f5849df2 100644
>--- a/devel/libdbusmenu-qt/Makefile
>+++ b/devel/libdbusmenu-qt/Makefile
>@@ -19,7 +19,7 @@ qt6_PKGNAMESUFFIX=	6
> 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//}
>diff --git a/devel/liblxqt/Makefile b/devel/liblxqt/Makefile
>index 61c5ce2419c3..2b06a22892f9 100644
>--- a/devel/liblxqt/Makefile
>+++ b/devel/liblxqt/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libpolkit-qt5-core-1.so:sysutils/polkit-qt
> 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
>diff --git a/devel/libqtxdg/Makefile b/devel/libqtxdg/Makefile
>index 518530c31b02..8a57f348897d 100644
>--- a/devel/libqtxdg/Makefile
>+++ b/devel/libqtxdg/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	LGPL21+
> 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
> 
>diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile
>index 4bfb8137b553..aeb2161ac5a1 100644
>--- a/devel/liteide/Makefile
>+++ b/devel/liteide/Makefile
>@@ -33,7 +33,7 @@ GH_TUPLE=	visualfc:gocode:901895f2a886:visualfc_gocode \
> 
> 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
> 
>diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile
>index 6be4e8a23c63..dc9d2ea14dd2 100644
>--- a/devel/lokalize/Makefile
>+++ b/devel/lokalize/Makefile
>@@ -13,9 +13,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/lxqt-build-tools/Makefile b/devel/lxqt-build-tools/Makefile
>index 0afc9d5b86d7..8a65263511d6 100644
>--- a/devel/lxqt-build-tools/Makefile
>+++ b/devel/lxqt-build-tools/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD3CLAUSE
> 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>
>diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
>index 95e81dc32e37..07c71b257b00 100644
>--- a/devel/mercurial/Makefile
>+++ b/devel/mercurial/Makefile
>@@ -41,7 +41,7 @@ CONTRIB_FILES=	bash_completion \
> 		python-hook-examples.py \
> 		simplemerge \
> 		tcsh_completion \
>-		tcsh_completion_build.sh \
>+		tcsh_completion:build.sh \
> 		undumprevlog \
> 		zsh_completion \
> 		vim/HGAnnotate.vim \
>diff --git a/devel/nextpnr/Makefile b/devel/nextpnr/Makefile
>index 4a9b3fa26d14..c0a6406be3bf 100644
>--- a/devel/nextpnr/Makefile
>+++ b/devel/nextpnr/Makefile
>@@ -21,7 +21,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 		${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
>diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
>index 8b88c3dc2727..3b15ea0cecdf 100644
>--- a/devel/okteta/Makefile
>+++ b/devel/okteta/Makefile
>@@ -16,7 +16,7 @@ USE_KDE=	attica auth bookmarks codecs completion crash \
> 		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_LDCONFIG=	yes
> 
> .include <bsd.port.mk>
>diff --git a/devel/plasma5-khotkeys/Makefile b/devel/plasma5-khotkeys/Makefile
>index 46cd99dc90c0..feed9254fe44 100644
>--- a/devel/plasma5-khotkeys/Makefile
>+++ b/devel/plasma5-khotkeys/Makefile
>@@ -13,10 +13,10 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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>
>diff --git a/devel/plasma5-kwrited/Makefile b/devel/plasma5-kwrited/Makefile
>index c70c1370acb6..5616617ae35a 100644
>--- a/devel/plasma5-kwrited/Makefile
>+++ b/devel/plasma5-kwrited/Makefile
>@@ -8,6 +8,6 @@ COMMENT=	Plasma5 daemon listening for wall and write messages
> 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>
>diff --git a/devel/plasma5-plasma-sdk/Makefile b/devel/plasma5-plasma-sdk/Makefile
>index ef4fd8b7e856..c07844bbbdcc 100644
>--- a/devel/plasma5-plasma-sdk/Makefile
>+++ b/devel/plasma5-plasma-sdk/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
> 		jobwidgets kdeclarative kio kirigami2 newstuff package parts \
> 		plasma-framework service sonnet 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
> 
> .include <bsd.port.mk>
>diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile
>index 528e34a4ccf9..3ae62120ac32 100644
>--- a/devel/poxml/Makefile
>+++ b/devel/poxml/Makefile
>@@ -9,7 +9,7 @@ USES=		cmake compiler:c++11-lang gettext-tools:build,run \
> 		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
> 
>diff --git a/devel/py-pyface/Makefile b/devel/py-pyface/Makefile
>index 0bdf6eea8c01..d2377d38dd41 100644
>--- a/devel/py-pyface/Makefile
>+++ b/devel/py-pyface/Makefile
>@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=	QT5
> 
> 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
>diff --git a/devel/py-qt5-pyqt/Makefile b/devel/py-qt5-pyqt/Makefile
>index 0de377664f93..ab0d2b6707be 100644
>--- a/devel/py-qt5-pyqt/Makefile
>+++ b/devel/py-qt5-pyqt/Makefile
>@@ -23,7 +23,7 @@ USE_QT=		connectivity core dbus declarative designer gui help imageformats locat
> 		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}
> 
>diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
>index 2fae74325ea3..fef701adc9cd 100644
>--- a/devel/py-qt5-qscintilla2/Makefile
>+++ b/devel/py-qt5-qscintilla2/Makefile
>@@ -16,9 +16,9 @@ DESTDIRNAME=	INSTALL_ROOT
> 
> 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
>diff --git a/devel/pyotherside-qt5/Makefile b/devel/pyotherside-qt5/Makefile
>index acc16ff361de..9665e47054f0 100644
>--- a/devel/pyotherside-qt5/Makefile
>+++ b/devel/pyotherside-qt5/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/devel/pyside2-tools/Makefile b/devel/pyside2-tools/Makefile
>index c67e47025397..6ac85e2208d5 100644
>--- a/devel/pyside2-tools/Makefile
>+++ b/devel/pyside2-tools/Makefile
>@@ -22,7 +22,7 @@ USE_GL=		gl
> 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
> 
>diff --git a/devel/pyside2/Makefile b/devel/pyside2/Makefile
>index e79b08c266ff..81b8bde5584e 100644
>--- a/devel/pyside2/Makefile
>+++ b/devel/pyside2/Makefile
>@@ -19,9 +19,9 @@ USES=		cmake gl python:3.5+ qt:5 tar:xz
> 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
> 
>diff --git a/devel/qca/Makefile b/devel/qca/Makefile
>index 1e46890de5b0..80f657ae75d3 100644
>--- a/devel/qca/Makefile
>+++ b/devel/qca/Makefile
>@@ -22,7 +22,7 @@ CONFIGURE_ENV=	QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
> USE_LDCONFIG=	yes
> 
> CMAKE_ARGS+=	-DQCA_SUFFIX=qt5
>-USE_QT=	core buildtools_build qmake_build
>+USE_QT=	core buildtools:build qmake:build
> 
> PLIST_SUB=	SHLIB_VER=${PORTVERSION}
> 
>diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile
>index 465ce664438f..cf68d1581edc 100644
>--- a/devel/qconf/Makefile
>+++ b/devel/qconf/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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}"
> 
>diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile
>index 510f6cee7b81..0c5ecdf890f5 100644
>--- a/devel/qcoro/Makefile
>+++ b/devel/qcoro/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSES/MIT.txt
> 
> 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
>diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile
>index 470e121df8c6..3de1adf4c9ac 100644
>--- a/devel/qgit/Makefile
>+++ b/devel/qgit/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv2
> 
> 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
>diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
>index b1020f160255..5d3c938a1fcb 100644
>--- a/devel/qjson/Makefile
>+++ b/devel/qjson/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake compiler:c++11-lang pathfix qt:5
> 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
> 
>diff --git a/devel/qschematic/Makefile b/devel/qschematic/Makefile
>index 6c4fcb575f85..c09d0854010d 100644
>--- a/devel/qschematic/Makefile
>+++ b/devel/qschematic/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/license.txt
> 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
>diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile
>index 2869501eb307..d8c97b6a9796 100644
>--- a/devel/qscintilla2-designerplugin-qt5/Makefile
>+++ b/devel/qscintilla2-designerplugin-qt5/Makefile
>@@ -14,7 +14,7 @@ DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
> 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
> 
>diff --git a/devel/qscintilla2-qt5/Makefile b/devel/qscintilla2-qt5/Makefile
>index b1455ddb45f2..49d5ef167b71 100644
>--- a/devel/qscintilla2-qt5/Makefile
>+++ b/devel/qscintilla2-qt5/Makefile
>@@ -11,7 +11,7 @@ COMMENT=	Qt 5 port of the Scintilla C++ editor class
> 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
>diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile
>index fe9a167bb187..5f3ec75199b0 100644
>--- a/devel/qt5-assistant/Makefile
>+++ b/devel/qt5-assistant/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt 5 documentation browser
> 
> 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" "" \
>diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile
>index 6f3a42df0736..9532f9a11665 100644
>--- a/devel/qt5-concurrent/Makefile
>+++ b/devel/qt5-concurrent/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt multi-threading module
> 
> 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
> 
>diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
>index 72f79a7bde55..8c6afd62223c 100644
>--- a/devel/qt5-core/Makefile
>+++ b/devel/qt5-core/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libdouble-conversion.so:devel/double-conversion \
> 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
>diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile
>index 48334177fa16..394cca577a21 100644
>--- a/devel/qt5-dbus/Makefile
>+++ b/devel/qt5-dbus/Makefile
>@@ -10,7 +10,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus
> 
> 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
> 
>diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile
>index 08ee9e3742cf..e934d46cfb37 100644
>--- a/devel/qt5-designer/Makefile
>+++ b/devel/qt5-designer/Makefile
>@@ -7,8 +7,8 @@ MAINTAINER=	kde@FreeBSD.org
> 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" \
>diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile
>index b1c5f0c525ca..5874e078890b 100644
>--- a/devel/qt5-help/Makefile
>+++ b/devel/qt5-help/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt online help integration module
> 
> 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
> 
>diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile
>index 6a8fc0357cf0..e9905b63f786 100644
>--- a/devel/qt5-linguist/Makefile
>+++ b/devel/qt5-linguist/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	Qt 5 translation tool
> 
> 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" \
>diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile
>index 6d2865306381..fb1ba802315c 100644
>--- a/devel/qt5-linguisttools/Makefile
>+++ b/devel/qt5-linguisttools/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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
>diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile
>index 1353a8619338..bc214ee8080f 100644
>--- a/devel/qt5-location/Makefile
>+++ b/devel/qt5-location/Makefile
>@@ -8,6 +8,6 @@ COMMENT=	Qt location module
> 
> 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>
>diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile
>index 7453bb6f64ee..9df08d2a2bb8 100644
>--- a/devel/qt5-qdbus/Makefile
>+++ b/devel/qt5-qdbus/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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}
>diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile
>index c2f155acb4dd..1c9ab1c24173 100644
>--- a/devel/qt5-qdbusviewer/Makefile
>+++ b/devel/qt5-qdbusviewer/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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" \
>diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile
>index dd9057daeb82..5209a254a63b 100644
>--- a/devel/qt5-qdoc/Makefile
>+++ b/devel/qt5-qdoc/Makefile
>@@ -11,7 +11,7 @@ BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT}
> 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}
>diff --git a/devel/qt5-remoteobjects/Makefile b/devel/qt5-remoteobjects/Makefile
>index e45379e18a39..cb6d056625e2 100644
>--- a/devel/qt5-remoteobjects/Makefile
>+++ b/devel/qt5-remoteobjects/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Qt5 Remote Objects module
> 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
> 
>diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile
>index 1959ca52be7f..dd8c47f5e32e 100644
>--- a/devel/qt5-script/Makefile
>+++ b/devel/qt5-script/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt 4-compatible scripting module
> 
> 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=.
>diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile
>index 6ca53d33c143..9a0bbbc07d8f 100644
>--- a/devel/qt5-scripttools/Makefile
>+++ b/devel/qt5-scripttools/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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}
>diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile
>index 9f298f8b5484..a14f407ea823 100644
>--- a/devel/qt5-scxml/Makefile
>+++ b/devel/qt5-scxml/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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
> 
>diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile
>index e41d1fb4eb9f..e883878f2180 100644
>--- a/devel/qt5-testlib/Makefile
>+++ b/devel/qt5-testlib/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt unit testing module
> 
> 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
> 
>diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile
>index f461ff941f07..e1f89eae815d 100644
>--- a/devel/qt5-uitools/Makefile
>+++ b/devel/qt5-uitools/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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}
>diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers
>index b5b2ec9a5429..3d602de97985 100644
>--- a/devel/qt5/Makefile.sqldrivers
>+++ b/devel/qt5/Makefile.sqldrivers
>@@ -8,7 +8,7 @@ COMMENT?=	Qt ${DB_DESC} database plugin
> 
> 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
> 
>diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
>index 96c08ff0c884..89895343476b 100644
>--- a/devel/qtcreator/Makefile
>+++ b/devel/qtcreator/Makefile
>@@ -79,10 +79,10 @@ DOCS_DESC=		Install the Qt5 api documentation
> 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
>diff --git a/devel/redasm/Makefile b/devel/redasm/Makefile
>index 4788331d6eeb..dc99a78897b3 100644
>--- a/devel/redasm/Makefile
>+++ b/devel/redasm/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Interactive, multiarchitecture disassembler
> 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
>diff --git a/devel/sasm/Makefile b/devel/sasm/Makefile
>index e45607fc5801..f2b5c21f4787 100644
>--- a/devel/sasm/Makefile
>+++ b/devel/sasm/Makefile
>@@ -13,7 +13,7 @@ USES=		compiler:c++11-lang gl qmake qt:5
> 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
> 
>diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile
>index 8335a5384fdf..3e56e27aa1d9 100644
>--- a/devel/shiboken2/Makefile
>+++ b/devel/shiboken2/Makefile
>@@ -23,7 +23,7 @@ USES=		cmake compiler:c++11-lang gnome python:3.5-3.9 qt:5 shebangfix tar:xz
> 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
>diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
>index 3df834f89c1c..29f7189309fd 100644
>--- a/devel/umbrello/Makefile
>+++ b/devel/umbrello/Makefile
>@@ -14,9 +14,9 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile
>index 1bca3f5c9348..c7103fdfcf16 100644
>--- a/devel/vitables/Makefile
>+++ b/devel/vitables/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYNUMPY} \
> 
> 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
>diff --git a/devel/xelfviewer/Makefile b/devel/xelfviewer/Makefile
>index ec65b72d8e49..a8c204c48191 100644
>--- a/devel/xelfviewer/Makefile
>+++ b/devel/xelfviewer/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/devel/xopcodecalc/Makefile b/devel/xopcodecalc/Makefile
>index ac24addec3a9..0983c198d4a3 100644
>--- a/devel/xopcodecalc/Makefile
>+++ b/devel/xopcodecalc/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/devel/xpeviewer/Makefile b/devel/xpeviewer/Makefile
>index 2172ff9b7ab1..9db3b01733ae 100644
>--- a/devel/xpeviewer/Makefile
>+++ b/devel/xpeviewer/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile
>index b5a952f3c5ad..8a85eef12336 100644
>--- a/devel/zeal/Makefile
>+++ b/devel/zeal/Makefile
>@@ -19,7 +19,7 @@ USE_GL=		gl  # Dependency added by qt5-gui.
> 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
>diff --git a/dns/kf5-kdnssd/Makefile b/dns/kf5-kdnssd/Makefile
>index 88bd9b3ff59b..185b69cdafd6 100644
>--- a/dns/kf5-kdnssd/Makefile
>+++ b/dns/kf5-kdnssd/Makefile
>@@ -6,9 +6,9 @@ MAINTAINER=	kde@FreeBSD.org
> 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
>diff --git a/dns/knock/Makefile b/dns/knock/Makefile
>index 2fd658e4cede..5fe3d3c06a75 100644
>--- a/dns/knock/Makefile
>+++ b/dns/knock/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PY_DEPENDS}
> 
> 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
>diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
>index ef4efa5819c1..32939161eb46 100644
>--- a/dns/knot-resolver/Makefile
>+++ b/dns/knot-resolver/Makefile
>@@ -114,8 +114,8 @@ ROOTKEYS_MESON_OFF=	-Dinstall_root_keys=disabled
> ROOTKEYS_PLIST_FILES=	${ETCDIR}/root.keys
> 
> TESTCONF_BROKEN=	missing luajit basexx package
>-TESTCONF_MESON_ON=	-Dconfig_tests=enabled
>-TESTCONF_MESON_OFF=	-Dconfig_tests=disabled
>+TESTCONF_MESON_ON=	-Dconfig:tests=enabled
>+TESTCONF_MESON_OFF=	-Dconfig:tests=disabled
> 
> TESTEXTRA_BROKEN=		CMake Error: The source directory misses CMakeLists.txt
> TESTEXTRA_BUILD_DEPENDS=	git:devel/git
>diff --git a/dns/qmdnsengine/Makefile b/dns/qmdnsengine/Makefile
>index 302c66f7aa32..9e0b870a0368 100644
>--- a/dns/qmdnsengine/Makefile
>+++ b/dns/qmdnsengine/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 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>
>diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
>index 6ae0285b5087..2a734cead274 100644
>--- a/editors/calligra/Makefile
>+++ b/editors/calligra/Makefile
>@@ -51,8 +51,8 @@ USE_KDE=	akonadicontacts activities archive auth bookmarks codecs completion \
> 		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
>diff --git a/editors/calligraplan/Makefile b/editors/calligraplan/Makefile
>index 95dcbbcdfa62..c8be2742a77a 100644
>--- a/editors/calligraplan/Makefile
>+++ b/editors/calligraplan/Makefile
>@@ -18,9 +18,9 @@ USE_KDE=	activities akonadi archive auth bookmarks codecs completion config \
> 		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
>diff --git a/editors/cpeditor/Makefile b/editors/cpeditor/Makefile
>index 16f679f87312..346c470edfad 100644
>--- a/editors/cpeditor/Makefile
>+++ b/editors/cpeditor/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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 \
>diff --git a/editors/encryptpad/Makefile b/editors/encryptpad/Makefile
>index d19919065208..8f240d1fdef6 100644
>--- a/editors/encryptpad/Makefile
>+++ b/editors/encryptpad/Makefile
>@@ -20,7 +20,7 @@ GH_ACCOUNT=	evpo
> 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}
> 
>diff --git a/editors/featherpad/Makefile b/editors/featherpad/Makefile
>index 5b9e4b3aaf36..361b212bc3dd 100644
>--- a/editors/featherpad/Makefile
>+++ b/editors/featherpad/Makefile
>@@ -16,7 +16,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile
>index d5188b5a1cda..cdcc68c51083 100644
>--- a/editors/focuswriter/Makefile
>+++ b/editors/focuswriter/Makefile
>@@ -19,7 +19,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	gottcode
> USE_GL=		gl
> USE_QT=		concurrent core gui multimedia network printsupport widgets \
>-		buildtools_build linguisttools_build
>+		buildtools:build linguisttools:build
> 
> PORTDATA=	*
> PORTDOCS=	ChangeLog CREDITS README
>diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile
>index 88cf853c99ba..6152d2eb689d 100644
>--- a/editors/ghostwriter/Makefile
>+++ b/editors/ghostwriter/Makefile
>@@ -13,8 +13,8 @@ LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
> 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
>diff --git a/editors/kate/Makefile b/editors/kate/Makefile
>index e19a7f4fcb38..8a50deb04c84 100644
>--- a/editors/kate/Makefile
>+++ b/editors/kate/Makefile
>@@ -17,9 +17,9 @@ USE_KDE=	activities attica auth bookmarks codecs completion config \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/editors/kile/Makefile b/editors/kile/Makefile
>index 2cbba5b0226f..af56f519c96b 100644
>--- a/editors/kile/Makefile
>+++ b/editors/kile/Makefile
>@@ -20,9 +20,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		init itemviews jobwidgets js khtml kio parts service solid \
> 		sonnet texteditor textwidgets widgetsaddons windowsystem xmlgui \
> 		okular \
>-		doctools_build
>+		doctools:build
> USE_QT=		concurrent core dbus gui network script widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> SHEBANG_FILES=	*.pl
> 
> KDE_INVENT=	09ee4ef0417165b93da82c1fc057b9e1713a0c05 office
>diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
>index 64923cbdcc90..29cd143fc8f2 100644
>--- a/editors/libreoffice/Makefile
>+++ b/editors/libreoffice/Makefile
>@@ -228,7 +228,7 @@ MARIADB_CONFIGURE_ENABLE=	mariadb-sdbc
> 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
>diff --git a/editors/mp/Makefile b/editors/mp/Makefile
>index 9f917f9b799d..0361242fda80 100644
>--- a/editors/mp/Makefile
>+++ b/editors/mp/Makefile
>@@ -66,7 +66,7 @@ NCURSES_CFLAGS=		-I${NCURSESBASE}/include
> 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
>diff --git a/editors/neovim-qt/Makefile b/editors/neovim-qt/Makefile
>index 7223751babd4..73fc67079aa8 100644
>--- a/editors/neovim-qt/Makefile
>+++ b/editors/neovim-qt/Makefile
>@@ -16,7 +16,7 @@ RUN_DEPENDS=	neovim>=0:editors/neovim
> 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
>diff --git a/editors/notepadnext/Makefile b/editors/notepadnext/Makefile
>index a85929bc3fb3..a48ad973c43e 100644
>--- a/editors/notepadnext/Makefile
>+++ b/editors/notepadnext/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
> 
>@@ -22,7 +22,7 @@ GH_PROJECT=	NotepadNext
> 
> GH_TUPLE=	alex-spataru:QSimpleUpdater:62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd:alex_spataru_QSimpleUpdater/src/QSimpleUpdater \
> 		editorconfig:editorconfig-core-qt:52820d59769fcba6d0ed94f685406c0383fe1a30:editorconfig_editorconfig_core_qt/src/editorconfig-core-qt \
>-		editorconfig:editorconfig-core-test:70840cfaf6a06766ab61e975b8a1fe3b891ee08e:editorconfig_editorconfig_core_test/src/editorconfig-core-qt/tests \
>+		editorconfig:editorconfig-core-test:70840cfaf6a06766ab61e975b8a1fe3b891ee08e:editorconfig_editorconfig_core:test/src/editorconfig-core-qt/tests \
> 		githubuser0xFFFF:Qt-Advanced-Docking-System:d5fefaa35fb53e299b7f39b0d8f541954c710d94:githubuser0xFFFF_Qt_Advanced_Docking_System/src/ads \
> 		itay-grudev:SingleApplication:d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c:itay_grudev_SingleApplication/src/singleapplication
> 
>diff --git a/editors/tea/Makefile b/editors/tea/Makefile
>index 828090cb6590..a4ec5d6b6981 100644
>--- a/editors/tea/Makefile
>+++ b/editors/tea/Makefile
>@@ -15,7 +15,7 @@ OPTIONS_GROUP_SPELL=	ASPELL HUNSPELL
> 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
> 
>diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
>index 274173599fc7..54585bb2e148 100644
>--- a/editors/texmaker/Makefile
>+++ b/editors/texmaker/Makefile
>@@ -16,7 +16,7 @@ USES=		compiler:c++11-lang desktop-file-utils ghostscript:x11,run \
> 		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
>diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
>index 0558674ed795..47f1693c8b94 100644
>--- a/editors/texstudio/Makefile
>+++ b/editors/texstudio/Makefile
>@@ -18,7 +18,7 @@ USES=		compiler:c++11-lang desktop-file-utils dos2unix \
> 		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
>diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
>index 4caee913efcc..f57ddf7ec007 100644
>--- a/editors/texworks/Makefile
>+++ b/editors/texworks/Makefile
>@@ -19,7 +19,7 @@ USES=		compiler:c++11-lang cmake desktop-file-utils pkgconfig \
> 		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
> 
>diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
>index 893673cca53e..e5e22fc3092e 100644
>--- a/emulators/aqemu/Makefile
>+++ b/emulators/aqemu/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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
>diff --git a/emulators/cemu/Makefile b/emulators/cemu/Makefile
>index 3cbf9b0a826c..9cf9c7d9f735 100644
>--- a/emulators/cemu/Makefile
>+++ b/emulators/cemu/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libpng.so:graphics/png
> 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
>diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
>index 5e137a9d8579..eac8f464ff76 100644
>--- a/emulators/citra/Makefile
>+++ b/emulators/citra/Makefile
>@@ -82,7 +82,7 @@ SDL_PLIST_FILES=bin/${PORTNAME} \
> 		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" \
>diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
>index 8410e55eafe8..6b390d5c38a0 100644
>--- a/emulators/dolphin-emu/Makefile
>+++ b/emulators/dolphin-emu/Makefile
>@@ -53,7 +53,7 @@ GH_TAGNAME=	7321802
> 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 \
>diff --git a/emulators/emu64/Makefile b/emulators/emu64/Makefile
>index c04f96c321ac..04acad89faa0 100644
>--- a/emulators/emu64/Makefile
>+++ b/emulators/emu64/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libquazip1-qt5.so:archivers/quazip \
> 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
> 
>diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
>index 75d2c9cf7a1f..d3931efb1c78 100644
>--- a/emulators/fceux/Makefile
>+++ b/emulators/fceux/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libminizip.so:archivers/minizip
> 
> 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
>diff --git a/emulators/libretro-kronos/Makefile b/emulators/libretro-kronos/Makefile
>index 84e3b40e5703..4a39e5dd5a1f 100644
>--- a/emulators/libretro-kronos/Makefile
>+++ b/emulators/libretro-kronos/Makefile
>@@ -23,7 +23,7 @@ USE_GL=	gl glew glu
> 
> USE_LDCONFIG=	yes
> 
>-USE_QT=	core opengl buildtools_build qmake_build
>+USE_QT=	core opengl buildtools:build qmake:build
> 
> USE_SDL=	sdl2
> 
>diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
>index 580c3ea461e4..e7816e9059f7 100644
>--- a/emulators/mame/Makefile
>+++ b/emulators/mame/Makefile
>@@ -26,7 +26,7 @@ GH_ACCOUNT=	mamedev
> 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
> 
>diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile
>index 15c4edc6dcc5..148a0aa7686c 100644
>--- a/emulators/mgba/Makefile
>+++ b/emulators/mgba/Makefile
>@@ -65,7 +65,7 @@ MAGICK_USES=		magick:6
> 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>
>diff --git a/emulators/mupen64plus-qt/Makefile b/emulators/mupen64plus-qt/Makefile
>index 969d071f3635..2e568f600c26 100644
>--- a/emulators/mupen64plus-qt/Makefile
>+++ b/emulators/mupen64plus-qt/Makefile
>@@ -20,8 +20,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \
> 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
>diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
>index 44076a00396a..286d07edc06a 100644
>--- a/emulators/ppsspp/Makefile
>+++ b/emulators/ppsspp/Makefile
>@@ -62,7 +62,7 @@ LIBRETRO_CMAKE_BOOL=	LIBRETRO
> 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
>diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
>index e7c29198ed09..0400990e7170 100644
>--- a/emulators/qmc2/Makefile
>+++ b/emulators/qmc2/Makefile
>@@ -17,8 +17,8 @@ NO_WRKSUBDIR=	yes
> 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
>diff --git a/emulators/ripes/Makefile b/emulators/ripes/Makefile
>index feaf797bdc57..62317f9d290b 100644
>--- a/emulators/ripes/Makefile
>+++ b/emulators/ripes/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	MIT
> 
> 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}
> 
>diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
>index 99d48ba45013..ce373d15a7a6 100644
>--- a/emulators/rpcs3/Makefile
>+++ b/emulators/rpcs3/Makefile
>@@ -38,7 +38,7 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.12.0-2-gc2aa9dd:hidapi/3rdparty/hidapi/hidapi \
> 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
>diff --git a/emulators/ukncbtl/Makefile b/emulators/ukncbtl/Makefile
>index bbd6eaa9c9a8..23aa1d874ec5 100644
>--- a/emulators/ukncbtl/Makefile
>+++ b/emulators/ukncbtl/Makefile
>@@ -13,7 +13,7 @@ USES=		compiler:c++11-lang gl qmake qt:5
> 
> 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
>diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
>index a3264e6412e0..46338fd5e567 100644
>--- a/emulators/virtualbox-ose-legacy/Makefile
>+++ b/emulators/virtualbox-ose-legacy/Makefile
>@@ -157,7 +157,7 @@ CONFIGURE_ARGS+=	--enable-qt5
> 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
>diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
>index 1895ea2ce532..3c1f4cf466e1 100644
>--- a/emulators/virtualbox-ose/Makefile
>+++ b/emulators/virtualbox-ose/Makefile
>@@ -161,7 +161,7 @@ CONFIGURE_ARGS+=	--enable-qt5
> 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
>diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
>index 939b019f6571..7315ab372e5b 100644
>--- a/emulators/yuzu/Makefile
>+++ b/emulators/yuzu/Makefile
>@@ -78,7 +78,7 @@ JACK_BUILD_DEPENDS=	jackit>0:audio/jack
> 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
> 
>@@ -86,7 +86,7 @@ PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio
> 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 \
>diff --git a/finance/alkimia/Makefile b/finance/alkimia/Makefile
>index bbb5390fda24..73cf122c73b0 100644
>--- a/finance/alkimia/Makefile
>+++ b/finance/alkimia/Makefile
>@@ -20,10 +20,10 @@ USES=		cmake compiler:c++11-lang kde:5 pathfix perl5 qt:5 \
> 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
>diff --git a/finance/kmymoney/Makefile b/finance/kmymoney/Makefile
>index adc9ad61cdf3..d1275a6ef53e 100644
>--- a/finance/kmymoney/Makefile
>+++ b/finance/kmymoney/Makefile
>@@ -17,10 +17,10 @@ LIB_DEPENDS=	libalkimia5.so:finance/alkimia \
> 
> 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
>diff --git a/finance/kraft/Makefile b/finance/kraft/Makefile
>index f1da23a4c93b..69500e3f4c01 100644
>--- a/finance/kraft/Makefile
>+++ b/finance/kraft/Makefile
>@@ -19,7 +19,7 @@ USE_KDE=	akonadi akonadicontacts \
> 		auth codecs config configwidgets contacts coreaddons \
> 		i18n itemmodels widgetsaddons
> USE_QT=		core dbus gui sql widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> SHEBANG_FILES=	manual/makeman.sh
> 
>diff --git a/finance/qtbitcointrader/Makefile b/finance/qtbitcointrader/Makefile
>index 64a59b5a5330..0dd4c2722df6 100644
>--- a/finance/qtbitcointrader/Makefile
>+++ b/finance/qtbitcointrader/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv3
> 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
>diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
>index 4b4a63782ef5..5e081a7e232e 100644
>--- a/finance/skrooge/Makefile
>+++ b/finance/skrooge/Makefile
>@@ -25,13 +25,13 @@ USE_KDE=	activities archive attica5 auth bookmarks codecs completion \
> 		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 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
> SHEBANG_FILES=	plugins/import/skrooge_import_backend/skrooge-sabb.py \
> 		skgbankmodeler/skrooge-coinmarketcap.py \
> 		skgbankmodeler/skrooge-cryptocompare.py \
>diff --git a/french/aster/Makefile b/french/aster/Makefile
>index 9459cc6d0844..656d96725213 100644
>--- a/french/aster/Makefile
>+++ b/french/aster/Makefile
>@@ -46,7 +46,7 @@ RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
> 
> 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.*
> 
>diff --git a/games/2048-qt/Makefile b/games/2048-qt/Makefile
>index a25a5c0dfe65..0ee7423197de 100644
>--- a/games/2048-qt/Makefile
>+++ b/games/2048-qt/Makefile
>@@ -15,7 +15,7 @@ GH_ACCOUNT=	xiaoyong
> 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
>diff --git a/games/LibreMines/Makefile b/games/LibreMines/Makefile
>index 64a1d75c6ed3..b953416904af 100644
>--- a/games/LibreMines/Makefile
>+++ b/games/LibreMines/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv3
> 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
>diff --git a/games/auralquiz/Makefile b/games/auralquiz/Makefile
>index 0bb07f011a89..a49f679a4133 100644
>--- a/games/auralquiz/Makefile
>+++ b/games/auralquiz/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libtag.so:audio/taglib
> 
> 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
> 
>diff --git a/games/blinken/Makefile b/games/blinken/Makefile
>index 607d298e91bf..5d6f634ca7e0 100644
>--- a/games/blinken/Makefile
>+++ b/games/blinken/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Memory enhancement game
> 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
> 
>diff --git a/games/bomber/Makefile b/games/bomber/Makefile
>index fe0bc0443c11..b4abffb59143 100644
>--- a/games/bomber/Makefile
>+++ b/games/bomber/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	${${PORTNAME:tu}_DESC}
> 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
> 
>diff --git a/games/bovo/Makefile b/games/bovo/Makefile
>index 7bd86063b800..af96f329bb0c 100644
>--- a/games/bovo/Makefile
>+++ b/games/bovo/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	${${PORTNAME:tu}_DESC}
> 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
> 
>diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
>index 3bc4dcb3790f..c3018d90896c 100644
>--- a/games/bubble-chains/Makefile
>+++ b/games/bubble-chains/Makefile
>@@ -15,7 +15,7 @@ GH_ACCOUNT=	ArsMasiuk
> 
> 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}"
>diff --git a/games/chessx/Makefile b/games/chessx/Makefile
>index 6150a9b4615d..7bcbbd2c7751 100644
>--- a/games/chessx/Makefile
>+++ b/games/chessx/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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 \
>diff --git a/games/cockatrice/Makefile b/games/cockatrice/Makefile
>index 503e58fa547e..02a4e8a8a52d 100644
>--- a/games/cockatrice/Makefile
>+++ b/games/cockatrice/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
> 
>@@ -31,7 +31,7 @@ SERVATRICE_CMAKE_OFF=	-DWITH_SERVER=OFF
> 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
> 
>diff --git a/games/colorcode/Makefile b/games/colorcode/Makefile
>index d90513cc3b70..dfb9a64b4e5a 100644
>--- a/games/colorcode/Makefile
>+++ b/games/colorcode/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	GPLv3+
> 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 \
>diff --git a/games/connectagram/Makefile b/games/connectagram/Makefile
>index 0628b90b2815..796a73ae30bb 100644
>--- a/games/connectagram/Makefile
>+++ b/games/connectagram/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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}
> 
>diff --git a/games/cutemaze/Makefile b/games/cutemaze/Makefile
>index 26bf6d963471..cb186b78d4ef 100644
>--- a/games/cutemaze/Makefile
>+++ b/games/cutemaze/Makefile
>@@ -12,8 +12,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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}
>diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile
>index a2231ec9957a..aa33886e9ddc 100644
>--- a/games/doomsday/Makefile
>+++ b/games/doomsday/Makefile
>@@ -21,7 +21,7 @@ USE_GL=		gl glu
> 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
> 
>diff --git a/games/dustrac/Makefile b/games/dustrac/Makefile
>index 019273dd0134..cd054069b4b0 100644
>--- a/games/dustrac/Makefile
>+++ b/games/dustrac/Makefile
>@@ -20,7 +20,7 @@ GH_TAGNAME=	ae380b8  # includes crash fix
> 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} \
>diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
>index af0de9f031e3..e113dff942d0 100644
>--- a/games/freeciv/Makefile
>+++ b/games/freeciv/Makefile
>@@ -75,7 +75,7 @@ PGSQL_CONFIGURE_ON=	--with-postgres-prefix=${LOCALBASE}
> 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}
>diff --git a/games/gcompris-qt/Makefile b/games/gcompris-qt/Makefile
>index 9b91e37bc00b..31a7d834222b 100644
>--- a/games/gcompris-qt/Makefile
>+++ b/games/gcompris-qt/Makefile
>@@ -15,11 +15,11 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
> 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
> 
>diff --git a/games/gottet/Makefile b/games/gottet/Makefile
>index c44d70248f34..1503630efda2 100644
>--- a/games/gottet/Makefile
>+++ b/games/gottet/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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}
> 
>diff --git a/games/granatier/Makefile b/games/granatier/Makefile
>index 7eb8971095bb..1992fc1048cb 100644
>--- a/games/granatier/Makefile
>+++ b/games/granatier/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
>index ff4945ea03c4..f97aacd37708 100644
>--- a/games/hedgewars/Makefile
>+++ b/games/hedgewars/Makefile
>@@ -22,8 +22,8 @@ USES=		cmake:noninja desktop-file-utils fpc gl lua:51 pkgconfig qt:5 \
> 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
>diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile
>index 6f321934202a..7d31100ebe1f 100644
>--- a/games/hexalate/Makefile
>+++ b/games/hexalate/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		compiler:c++11-lib gl gnome qmake qt:5 tar:bzip2
>-USE_QT=		core gui widgets buildtools_build linguisttools_build
>+USE_QT=		core gui widgets buildtools:build linguisttools:build
> USE_GL=		gl
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>diff --git a/games/iqpuzzle/Makefile b/games/iqpuzzle/Makefile
>index d28d94b960f0..a0da2a0e7bf3 100644
>--- a/games/iqpuzzle/Makefile
>+++ b/games/iqpuzzle/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv3
> 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
>diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
>index dea967e79074..7efa39bfe4c9 100644
>--- a/games/kanagram/Makefile
>+++ b/games/kanagram/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/kapman/Makefile b/games/kapman/Makefile
>index d686a46624e6..7282327861fa 100644
>--- a/games/kapman/Makefile
>+++ b/games/kapman/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 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
> 
>diff --git a/games/katomic/Makefile b/games/katomic/Makefile
>index cd9bf94e8d90..1a76d13ed5d5 100644
>--- a/games/katomic/Makefile
>+++ b/games/katomic/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 \
> 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
>diff --git a/games/kblackbox/Makefile b/games/kblackbox/Makefile
>index 8dedfb8c6879..f27d29aafd2b 100644
>--- a/games/kblackbox/Makefile
>+++ b/games/kblackbox/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile
>index fb6723dae5fb..8728a3896171 100644
>--- a/games/kblocks/Makefile
>+++ b/games/kblocks/Makefile
>@@ -10,7 +10,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
>diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile
>index f6792e7aed75..ca6bdd749bc6 100644
>--- a/games/kbounce/Makefile
>+++ b/games/kbounce/Makefile
>@@ -10,10 +10,10 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
>diff --git a/games/kbreakout/Makefile b/games/kbreakout/Makefile
>index 7ae145f8ef6e..4006e03f804d 100644
>--- a/games/kbreakout/Makefile
>+++ b/games/kbreakout/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 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
> 
>diff --git a/games/kdiamond/Makefile b/games/kdiamond/Makefile
>index 41cfbea5d6e8..3abba20e489c 100644
>--- a/games/kdiamond/Makefile
>+++ b/games/kdiamond/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 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
> 
>diff --git a/games/kfourinline/Makefile b/games/kfourinline/Makefile
>index 1a34062e00b2..b8013597357b 100644
>--- a/games/kfourinline/Makefile
>+++ b/games/kfourinline/Makefile
>@@ -10,9 +10,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
>diff --git a/games/kgoldrunner/Makefile b/games/kgoldrunner/Makefile
>index 86ade734d22c..63f4e9344888 100644
>--- a/games/kgoldrunner/Makefile
>+++ b/games/kgoldrunner/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 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
> 
>diff --git a/games/khangman/Makefile b/games/khangman/Makefile
>index 4b30a50d3791..e510f29162dc 100644
>--- a/games/khangman/Makefile
>+++ b/games/khangman/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
>diff --git a/games/kigo/Makefile b/games/kigo/Makefile
>index 1723c6023d39..3c5bb0980e86 100644
>--- a/games/kigo/Makefile
>+++ b/games/kigo/Makefile
>@@ -10,9 +10,9 @@ USE_KDE=	attica auth codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/games/killbots/Makefile b/games/killbots/Makefile
>index 23a12f052ff8..55cc056389cc 100644
>--- a/games/killbots/Makefile
>+++ b/games/killbots/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 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
> 
>diff --git a/games/kiriki/Makefile b/games/kiriki/Makefile
>index 93252cc8d419..55579130e70c 100644
>--- a/games/kiriki/Makefile
>+++ b/games/kiriki/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	${${PORTNAME:tu}_DESC}
> 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
> 
>diff --git a/games/kjumpingcube/Makefile b/games/kjumpingcube/Makefile
>index 9afd284b6015..55c6af5c56ba 100644
>--- a/games/kjumpingcube/Makefile
>+++ b/games/kjumpingcube/Makefile
>@@ -10,9 +10,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/games/klickety/Makefile b/games/klickety/Makefile
>index c472db6b1ad5..030041fbacde 100644
>--- a/games/klickety/Makefile
>+++ b/games/klickety/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/games/klines/Makefile b/games/klines/Makefile
>index 5e3416c7fa2d..597d2d704e1f 100644
>--- a/games/klines/Makefile
>+++ b/games/klines/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 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
> 
>diff --git a/games/kmahjongg/Makefile b/games/kmahjongg/Makefile
>index 6ae70ee495b9..e2ebd6bb1592 100644
>--- a/games/kmahjongg/Makefile
>+++ b/games/kmahjongg/Makefile
>@@ -11,9 +11,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/kmines/Makefile b/games/kmines/Makefile
>index 723e58abb0a2..4935e87f5933 100644
>--- a/games/kmines/Makefile
>+++ b/games/kmines/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 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
> 
>diff --git a/games/knavalbattle/Makefile b/games/knavalbattle/Makefile
>index 211cf633520c..1fc7375285e8 100644
>--- a/games/knavalbattle/Makefile
>+++ b/games/knavalbattle/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/knetwalk/Makefile b/games/knetwalk/Makefile
>index 01a82a8ebfe5..f233f79e79e7 100644
>--- a/games/knetwalk/Makefile
>+++ b/games/knetwalk/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 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
> 
>diff --git a/games/knights/Makefile b/games/knights/Makefile
>index 38515821da06..e9abe4c2d07d 100644
>--- a/games/knights/Makefile
>+++ b/games/knights/Makefile
>@@ -16,7 +16,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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
> 
>diff --git a/games/kolf/Makefile b/games/kolf/Makefile
>index 3f83a0c8414b..046dbce8ce3f 100644
>--- a/games/kolf/Makefile
>+++ b/games/kolf/Makefile
>@@ -11,10 +11,10 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
>diff --git a/games/kollision/Makefile b/games/kollision/Makefile
>index fa011ac1e9dc..e311168cb4b1 100644
>--- a/games/kollision/Makefile
>+++ b/games/kollision/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 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
> 
>diff --git a/games/konquest/Makefile b/games/konquest/Makefile
>index 93fe275be40e..c33e2ad18cc9 100644
>--- a/games/konquest/Makefile
>+++ b/games/konquest/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 \
> 		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
> 
>diff --git a/games/kpat/Makefile b/games/kpat/Makefile
>index 482a8566c5d2..17aef4385237 100644
>--- a/games/kpat/Makefile
>+++ b/games/kpat/Makefile
>@@ -14,9 +14,9 @@ USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
> 		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
>diff --git a/games/kreversi/Makefile b/games/kreversi/Makefile
>index 6e674e4e5cce..2bce84793124 100644
>--- a/games/kreversi/Makefile
>+++ b/games/kreversi/Makefile
>@@ -10,9 +10,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/games/kshisen/Makefile b/games/kshisen/Makefile
>index 13b5055ef151..2e9c20c25a17 100644
>--- a/games/kshisen/Makefile
>+++ b/games/kshisen/Makefile
>@@ -11,9 +11,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile
>index 1c4b5db27816..386faae93693 100644
>--- a/games/ksirk/Makefile
>+++ b/games/ksirk/Makefile
>@@ -10,7 +10,7 @@ USE_KDE=	attica auth codecs completion config configwidgets \
> 		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
>diff --git a/games/ksnakeduel/Makefile b/games/ksnakeduel/Makefile
>index 0a7808f0b310..6fd1aa699a2e 100644
>--- a/games/ksnakeduel/Makefile
>+++ b/games/ksnakeduel/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 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
> 
>diff --git a/games/kspaceduel/Makefile b/games/kspaceduel/Makefile
>index 1773619db6f2..545f9b1aba8e 100644
>--- a/games/kspaceduel/Makefile
>+++ b/games/kspaceduel/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	${${PORTNAME:tu}_DESC}
> 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
> 
>diff --git a/games/ksquares/Makefile b/games/ksquares/Makefile
>index 8b0fda9e1d3d..63ce489e5038 100644
>--- a/games/ksquares/Makefile
>+++ b/games/ksquares/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 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
> 
>diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
>index d8f1b449d2c8..8cd9f705f4a3 100644
>--- a/games/ksudoku/Makefile
>+++ b/games/ksudoku/Makefile
>@@ -10,10 +10,10 @@ USE_GL=		gl glu
> 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
> 
>diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile
>index 9f7f2e86c590..e4b7bc91e513 100644
>--- a/games/ktuberling/Makefile
>+++ b/games/ktuberling/Makefile
>@@ -12,10 +12,10 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
>diff --git a/games/kubrick/Makefile b/games/kubrick/Makefile
>index 60c5122dfb9d..5909e82d5802 100644
>--- a/games/kubrick/Makefile
>+++ b/games/kubrick/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gl kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/games/leela-zero/Makefile b/games/leela-zero/Makefile
>index 20121c842bf6..951eb13d9368 100644
>--- a/games/leela-zero/Makefile
>+++ b/games/leela-zero/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
> 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
>diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile
>index c5cefffa2dc9..6c1939a98234 100644
>--- a/games/libkdegames/Makefile
>+++ b/games/libkdegames/Makefile
>@@ -14,9 +14,9 @@ USE_KDE=	archive attica auth bookmarks codecs completion config \
> 		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
>diff --git a/games/libkmahjongg/Makefile b/games/libkmahjongg/Makefile
>index 490485dc3e02..691cdbddfa9b 100644
>--- a/games/libkmahjongg/Makefile
>+++ b/games/libkmahjongg/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Library for the Mahjongg Solitaire for KDE 5
> 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
>diff --git a/games/lskat/Makefile b/games/lskat/Makefile
>index 3d3d4faf6b77..b3308689c851 100644
>--- a/games/lskat/Makefile
>+++ b/games/lskat/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	${${PORTNAME:tu}_DESC}
> 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
> 
>diff --git a/games/multimc/Makefile b/games/multimc/Makefile
>index 1b803ddc78cb..549fa11485bf 100644
>--- a/games/multimc/Makefile
>+++ b/games/multimc/Makefile
>@@ -18,8 +18,8 @@ GH_TUPLE=	MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus
> 		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
>diff --git a/games/openage/Makefile b/games/openage/Makefile
>index 2027a6181166..7e100ee6c9dc 100644
>--- a/games/openage/Makefile
>+++ b/games/openage/Makefile
>@@ -33,7 +33,7 @@ USE_GITHUB=	yes
> 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
> 
>diff --git a/games/openmw/Makefile b/games/openmw/Makefile
>index a7b04e0e224c..3138b2b43348 100644
>--- a/games/openmw/Makefile
>+++ b/games/openmw/Makefile
>@@ -23,8 +23,8 @@ USES=		cmake compiler:c++17-lang gl openal pkgconfig qt:5 sdl xorg
> 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 \
>diff --git a/games/palapeli/Makefile b/games/palapeli/Makefile
>index 00bac05199fd..e05d00257a31 100644
>--- a/games/palapeli/Makefile
>+++ b/games/palapeli/Makefile
>@@ -11,7 +11,7 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
>index 2e4b46b82c54..05c52443819c 100644
>--- a/games/peg-e/Makefile
>+++ b/games/peg-e/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		compiler:c++17-lang gl gnome qmake qt:5 tar:bzip2
>-USE_QT=		core gui widgets qmake_build buildtools_build linguisttools_build
>+USE_QT=		core gui widgets qmake:build buildtools:build linguisttools:build
> USE_GL=		gl
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>diff --git a/games/pentobi/Makefile b/games/pentobi/Makefile
>index 3019d0b84ee1..3c0c67fd6518 100644
>--- a/games/pentobi/Makefile
>+++ b/games/pentobi/Makefile
>@@ -17,7 +17,7 @@ USES=		compiler:c++14-lang cmake desktop-file-utils gettext-tools gnome qt:5 \
> 		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=	*
>diff --git a/games/picmi/Makefile b/games/picmi/Makefile
>index 3ba82b470483..977fda7d6b61 100644
>--- a/games/picmi/Makefile
>+++ b/games/picmi/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 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
>index 06189d17f2d1..630fad934827 100644
>--- a/games/pokerth/Makefile
>+++ b/games/pokerth/Makefile
>@@ -26,7 +26,7 @@ BROKEN=		error: use of undeclared identifier '_1'
> 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
>diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
>index 39b4d7c4e511..9f974a3a7bca 100644
>--- a/games/py-mnemosyne/Makefile
>+++ b/games/py-mnemosyne/Makefile
>@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
> 		${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
>diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
>index 587ed1055900..80d3d2c07717 100644
>--- a/games/qnetwalk/Makefile
>+++ b/games/qnetwalk/Makefile
>@@ -12,7 +12,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/games/simsu/Makefile b/games/simsu/Makefile
>index 7716fae885f1..aeb69b71107b 100644
>--- a/games/simsu/Makefile
>+++ b/games/simsu/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		compiler:c++17-lang gl qmake qt:5 tar:bzip2
>-USE_QT=		core gui widgets concurrent printsupport buildtools_build linguisttools_build
>+USE_QT=		core gui widgets concurrent printsupport buildtools:build linguisttools:build
> USE_GL=		gl
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
>index 8f6b342fe327..aec020e47b00 100644
>--- a/games/solarus-quest-editor/Makefile
>+++ b/games/solarus-quest-editor/Makefile
>@@ -27,7 +27,7 @@ GL_COMMIT=	e541e1312c242bff10aa1fb84a7eb8b6cb8504ba
> 
> 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
>diff --git a/games/solarus/Makefile b/games/solarus/Makefile
>index b8e9c2ae10d8..2a3bd4812b8b 100644
>--- a/games/solarus/Makefile
>+++ b/games/solarus/Makefile
>@@ -24,7 +24,7 @@ GL_ACCOUNT=	solarus-games
> 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
>diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
>index 21839036385e..67a84877ca85 100644
>--- a/games/tanglet/Makefile
>+++ b/games/tanglet/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/data/LICENSES/GPL-3.0.txt
> 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}
> 
>diff --git a/games/tetzle/Makefile b/games/tetzle/Makefile
>index 8af3df7c88ff..f3925230792d 100644
>--- a/games/tetzle/Makefile
>+++ b/games/tetzle/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		compiler:c++17-lang desktop-file-utils gl gnome qmake qt:5 tar:bzip2
>-USE_QT=		core gui widgets opengl buildtools_build linguisttools_build
>+USE_QT=		core gui widgets opengl buildtools:build linguisttools:build
> USE_GL=		gl
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
>index 40bfde9b4f01..d482c8434cc9 100644
>--- a/games/wyrmgus/Makefile
>+++ b/games/wyrmgus/Makefile
>@@ -23,7 +23,7 @@ GH_PROJECT=	Wyrmgus
> 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" \
>diff --git a/games/xnethack/Makefile b/games/xnethack/Makefile
>index 7f621cab17ae..d646122ae7c6 100644
>--- a/games/xnethack/Makefile
>+++ b/games/xnethack/Makefile
>@@ -40,7 +40,7 @@ GRAPHICS=	X11_GRAPHICS
> 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
>diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
>index a9f52217de48..da4452714247 100644
>--- a/graphics/appleseed/Makefile
>+++ b/graphics/appleseed/Makefile
>@@ -66,7 +66,7 @@ PYTHON_CMAKE_ON=	-DWITH_PYTHON3_BINDINGS:BOOL=ON
> 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
> 
>diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
>index 7be1b9013b63..6b6eccb52e57 100644
>--- a/graphics/cloudcompare/Makefile
>+++ b/graphics/cloudcompare/Makefile
>@@ -16,7 +16,7 @@ GH_ACCOUNT=	CloudCompare
> 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
>diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
>index 64fd408963d5..3ec42cbf7874 100644
>--- a/graphics/colmap/Makefile
>+++ b/graphics/colmap/Makefile
>@@ -26,7 +26,7 @@ USES=		cmake compiler:${OPENMP}c++11-lib eigen:3 gl localbase qt:5 \
> 		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
>diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
>index abac427f7961..8eef4e20ba0b 100644
>--- a/graphics/converseen/Makefile
>+++ b/graphics/converseen/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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
>diff --git a/graphics/diffpdf/Makefile b/graphics/diffpdf/Makefile
>index 5bc2d1e6e012..05da735b749a 100644
>--- a/graphics/diffpdf/Makefile
>+++ b/graphics/diffpdf/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
> 
> 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
> 
>diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
>index 32945244bb0a..4fc29e922dcb 100644
>--- a/graphics/digikam/Makefile
>+++ b/graphics/digikam/Makefile
>@@ -42,8 +42,8 @@ USE_KDE=	archive auth bookmarks calendarcore codecs completion config \
> 		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
>@@ -79,7 +79,7 @@ MEDIAPLAYER_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_FFmpeg \
> 				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 \
>diff --git a/graphics/dilay/Makefile b/graphics/dilay/Makefile
>index 8ecc60456a79..3261edd8c101 100644
>--- a/graphics/dilay/Makefile
>+++ b/graphics/dilay/Makefile
>@@ -16,7 +16,7 @@ USE_GITHUB=	yes
> 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)
> 
>diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
>index 5155af96fe56..b95a22362f57 100644
>--- a/graphics/djview4/Makefile
>+++ b/graphics/djview4/Makefile
>@@ -20,7 +20,7 @@ USES=		autoreconf desktop-file-utils gettext-runtime gl gmake gnome \
> 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
>diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
>index 20a082400011..d566f8e8e4db 100644
>--- a/graphics/drawpile/Makefile
>+++ b/graphics/drawpile/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
> 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
>diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile
>index be1524cd6d76..10c122179648 100644
>--- a/graphics/dspdfviewer/Makefile
>+++ b/graphics/dspdfviewer/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
> 		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
>diff --git a/graphics/dust3d/Makefile b/graphics/dust3d/Makefile
>index 38c2846ae1d9..58021a068597 100644
>--- a/graphics/dust3d/Makefile
>+++ b/graphics/dust3d/Makefile
>@@ -22,7 +22,7 @@ LIB_DEPENDS=	libgmp.so:math/gmp libmpfr.so:math/mpfr
> 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
> 
>diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile
>index 1cd979b8e13e..3fefddf243ff 100644
>--- a/graphics/engauge-digitizer/Makefile
>+++ b/graphics/engauge-digitizer/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
> 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
>@@ -29,7 +29,7 @@ CXXFLAGS+=	`pkg-config --cflags libopenjp2` # workaround for https://github.com/
> 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
>diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
>index 7bdea4769a68..9a762cc204aa 100644
>--- a/graphics/eos-movrec/Makefile
>+++ b/graphics/eos-movrec/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
> 
> 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
> 
>diff --git a/graphics/epsonscan2/Makefile b/graphics/epsonscan2/Makefile
>index a084a5e2f44e..acbe61616b9e 100644
>--- a/graphics/epsonscan2/Makefile
>+++ b/graphics/epsonscan2/Makefile
>@@ -32,7 +32,7 @@ RUN_DEPENDS=	avahi-browse:net/avahi-app
> 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
>diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
>index 8f2c60d90298..c41d99286f31 100644
>--- a/graphics/evolvotron/Makefile
>+++ b/graphics/evolvotron/Makefile
>@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/graphics/filmulator/Makefile b/graphics/filmulator/Makefile
>index 71b4708f09fd..bae4d502fc54 100644
>--- a/graphics/filmulator/Makefile
>+++ b/graphics/filmulator/Makefile
>@@ -21,7 +21,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 
> 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
>diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
>index b33643dcbd69..e21ae70aa6c2 100644
>--- a/graphics/fracplanet/Makefile
>+++ b/graphics/fracplanet/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
> 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" \
> 			"" \
>diff --git a/graphics/fractgen/Makefile b/graphics/fractgen/Makefile
>index ecfbb41e48d8..8baaae4d5c59 100644
>--- a/graphics/fractgen/Makefile
>+++ b/graphics/fractgen/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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
> 
>diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
>index 91bddfbd58b8..be94e2e463c4 100644
>--- a/graphics/fraqtive/Makefile
>+++ b/graphics/fraqtive/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	GPLv3+
> 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
>diff --git a/graphics/glaxnimate/Makefile b/graphics/glaxnimate/Makefile
>index 6f8faed7f96a..9b6fe7bef0d1 100644
>--- a/graphics/glaxnimate/Makefile
>+++ b/graphics/glaxnimate/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 		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
>diff --git a/graphics/glbinding/Makefile b/graphics/glbinding/Makefile
>index 9e7590548e16..3ce526b05512 100644
>--- a/graphics/glbinding/Makefile
>+++ b/graphics/glbinding/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	MIT
> 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
>diff --git a/graphics/gmic-qt/Makefile b/graphics/gmic-qt/Makefile
>index b5a2858d8ef1..9ef8d1a35e81 100644
>--- a/graphics/gmic-qt/Makefile
>+++ b/graphics/gmic-qt/Makefile
>@@ -26,7 +26,7 @@ gimp_PKGNAMESUFFIX=	-gimp
> 
> 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
>diff --git a/graphics/gpxsee/Makefile b/graphics/gpxsee/Makefile
>index b00b0b2591d2..efb5346c47b3 100644
>--- a/graphics/gpxsee/Makefile
>+++ b/graphics/gpxsee/Makefile
>@@ -11,8 +11,8 @@ LICENSE_FILE=	${WRKSRC}/licence.txt
> 
> 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
>@@ -23,12 +23,12 @@ OPTIONS_DEFINE=	MAPS NLS PBF TIFF
> 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 )
>diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
>index 9c4997978e66..05965caea068 100644
>--- a/graphics/gwenview/Makefile
>+++ b/graphics/gwenview/Makefile
>@@ -22,10 +22,10 @@ USE_KDE=	activities auth baloo bookmarks codecs completion config \
> 		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
>diff --git a/graphics/heimer/Makefile b/graphics/heimer/Makefile
>index 4c9735383b63..9b1d11866b14 100644
>--- a/graphics/heimer/Makefile
>+++ b/graphics/heimer/Makefile
>@@ -11,8 +11,8 @@ LICENSE_COMB=	multi
> LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
> 
> USES=		cmake compiler:c++14-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 \
>diff --git a/graphics/ikona/Makefile b/graphics/ikona/Makefile
>index 29cd4f608d08..41ccb0e24d17 100644
>--- a/graphics/ikona/Makefile
>+++ b/graphics/ikona/Makefile
>@@ -21,7 +21,7 @@ USE_GNOME=		cairo gdkpixbuf2 glib20 libxml2 pango
> 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
>diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
>index 923d934453fd..0eed41dd5835 100644
>--- a/graphics/ipe/Makefile
>+++ b/graphics/ipe/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 
> 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
>diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
>index 8e49e9831763..b95c79fac1ef 100644
>--- a/graphics/kamera/Makefile
>+++ b/graphics/kamera/Makefile
>@@ -10,9 +10,9 @@ LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
> 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
> 
>diff --git a/graphics/kamerka/Makefile b/graphics/kamerka/Makefile
>index fe2519065f2f..daac1a29c560 100644
>--- a/graphics/kamerka/Makefile
>+++ b/graphics/kamerka/Makefile
>@@ -18,12 +18,12 @@ USES=		cmake compiler:c++11-lang kde:5 qt:5
> 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
> 
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
>diff --git a/graphics/katarakt/Makefile b/graphics/katarakt/Makefile
>index 800ea09ca68a..295eb60fce57 100644
>--- a/graphics/katarakt/Makefile
>+++ b/graphics/katarakt/Makefile
>@@ -13,7 +13,7 @@ BUILD_DEPENDS=	a2x:textproc/asciidoc
> 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
>diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
>index b7f87292cc75..ff260f3a81c5 100644
>--- a/graphics/kcolorchooser/Makefile
>+++ b/graphics/kcolorchooser/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KDE application to select colors from the screen or from a palette
> 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
> 
>diff --git a/graphics/kcolorpicker/Makefile b/graphics/kcolorpicker/Makefile
>index 4ceecd604544..1583e0f53e9c 100644
>--- a/graphics/kcolorpicker/Makefile
>+++ b/graphics/kcolorpicker/Makefile
>@@ -13,7 +13,7 @@ USES=		cmake compiler:c++11-lang qt:5
> USE_GITHUB=	yes
> GH_ACCOUNT=	ksnip
> USE_QT=		core widgets \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> 
> CMAKE_ON=	BUILD_SHARED_LIBS
> 
>diff --git a/graphics/kdegraphics-mobipocket/Makefile b/graphics/kdegraphics-mobipocket/Makefile
>index 6eb6296134fb..fc6546168490 100644
>--- a/graphics/kdegraphics-mobipocket/Makefile
>+++ b/graphics/kdegraphics-mobipocket/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Mobipocket plugins for Strigi indexing and thumbnails
> 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
> 
>diff --git a/graphics/kdegraphics-svgpart/Makefile b/graphics/kdegraphics-svgpart/Makefile
>index 9deb4ba3650f..c5edc0d077d5 100644
>--- a/graphics/kdegraphics-svgpart/Makefile
>+++ b/graphics/kdegraphics-svgpart/Makefile
>@@ -10,8 +10,8 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> .include <bsd.port.mk>
>diff --git a/graphics/kdegraphics-thumbnailers/Makefile b/graphics/kdegraphics-thumbnailers/Makefile
>index 95952a33d67f..9f7f4500456d 100644
>--- a/graphics/kdegraphics-thumbnailers/Makefile
>+++ b/graphics/kdegraphics-thumbnailers/Makefile
>@@ -10,8 +10,8 @@ LIB_DEPENDS=	 libqmobipocket.so:graphics/kdegraphics-mobipocket
> USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz
> 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
> 
> .include <bsd.port.mk>
>diff --git a/graphics/kdiagram/Makefile b/graphics/kdiagram/Makefile
>index b6d49d3f2dc0..63d5084ce7d8 100644
>--- a/graphics/kdiagram/Makefile
>+++ b/graphics/kdiagram/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.GPL.txt
> 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}"
>diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
>index 9946f7000950..0053b443cc13 100644
>--- a/graphics/kf5-kimageformats/Makefile
>+++ b/graphics/kf5-kimageformats/Makefile
>@@ -10,9 +10,9 @@ LIB_DEPENDS=	libImath.so:math/Imath
> 
> 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
> 
>diff --git a/graphics/kf5-kplotting/Makefile b/graphics/kf5-kplotting/Makefile
>index bfdb5a340122..46880d4dde92 100644
>--- a/graphics/kf5-kplotting/Makefile
>+++ b/graphics/kf5-kplotting/Makefile
>@@ -6,8 +6,8 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/graphics/kf5-kquickcharts/Makefile b/graphics/kf5-kquickcharts/Makefile
>index 50aab5183f24..65ade3fa782f 100644
>--- a/graphics/kf5-kquickcharts/Makefile
>+++ b/graphics/kf5-kquickcharts/Makefile
>@@ -6,10 +6,10 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/graphics/kf5-prison/Makefile b/graphics/kf5-prison/Makefile
>index cf868b1d831f..6ed2c128ff70 100644
>--- a/graphics/kf5-prison/Makefile
>+++ b/graphics/kf5-prison/Makefile
>@@ -10,8 +10,8 @@ LIB_DEPENDS=	libdmtx.so:graphics/libdmtx \
> 		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>
>diff --git a/graphics/kgeotag/Makefile b/graphics/kgeotag/Makefile
>index 55ee95d41822..1e17f1062a32 100644
>--- a/graphics/kgeotag/Makefile
>+++ b/graphics/kgeotag/Makefile
>@@ -11,10 +11,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
> 
> 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
>diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile
>index 55924bad9e18..7ede0787e89d 100644
>--- a/graphics/kgraphviewer/Makefile
>+++ b/graphics/kgraphviewer/Makefile
>@@ -19,8 +19,8 @@ USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 tar:xz \
> USE_KDE=	auth codecs completion config configwidgets \
> 		coreaddons i18n iconthemes jobwidgets kio parts service \
> 		sonnet textwidgets widgetsaddons 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
> 
> .include <bsd.port.mk>
>diff --git a/graphics/kimageannotator/Makefile b/graphics/kimageannotator/Makefile
>index e78eaf63703b..c47d3d9c214e 100644
>--- a/graphics/kimageannotator/Makefile
>+++ b/graphics/kimageannotator/Makefile
>@@ -15,7 +15,7 @@ USES=		cmake localbase compiler:c++11-lang qt:5 xorg
> 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
>diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile
>index 67acd8c99702..36e2a13b1ec6 100644
>--- a/graphics/kimagemapeditor/Makefile
>+++ b/graphics/kimagemapeditor/Makefile
>@@ -13,7 +13,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
>index 545d78bf8c9e..20d1dc4c7ae5 100644
>--- a/graphics/kipi-plugins/Makefile
>+++ b/graphics/kipi-plugins/Makefile
>@@ -13,9 +13,9 @@ USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig \
> 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
> 
> OPTIONS_DEFINE=		DOCS MEDIAWIKI KVKONTAKTE
> OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
>diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
>index c63ac4b7afd6..96f576800f28 100644
>--- a/graphics/klatexformula/Makefile
>+++ b/graphics/klatexformula/Makefile
>@@ -14,8 +14,8 @@ BUILD_DEPENDS=	help2man:misc/help2man
> USES=		cmake compiler:c++11-lang desktop-file-utils ghostscript:run \
> 		qt:5 shared-mime-info tar:bzip2 localbase
> 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
> 
>diff --git a/graphics/knotter/Makefile b/graphics/knotter/Makefile
>index 95dfc1118832..82dd9a0e1646 100644
>--- a/graphics/knotter/Makefile
>+++ b/graphics/knotter/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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
>diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
>index 21f566db6cdb..892d6962d1e0 100644
>--- a/graphics/kolourpaint/Makefile
>+++ b/graphics/kolourpaint/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/graphics/kontrast/Makefile b/graphics/kontrast/Makefile
>index ba299a288c55..362215f92a2d 100644
>--- a/graphics/kontrast/Makefile
>+++ b/graphics/kontrast/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Color contrast checker
> 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
> 
>diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile
>index 58ceb1eef3d2..3a7a30c47c1a 100644
>--- a/graphics/kooka/Makefile
>+++ b/graphics/kooka/Makefile
>@@ -17,9 +17,9 @@ USES=		cmake compiler:c++11-lang kde:5 pkgconfig qt:5
> USE_KDE=	auth bookmarks codecs completion config configwidgets coreaddons \
> 		ecm i18n iconthemes itemviews jobwidgets kio service solid sonnet \
> 		textwidgets widgetsaddons xmlgui \
>-		doctools_build
>+		doctools:build
> USE_QT=		concurrent core dbus gui network printsupport widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> KDE_INVENT=	3ed25fb9a1a62b88240a4f0f403b1ad49cf0adeb
> 
>diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
>index 9ed87769ec04..1d2ffe51d45f 100644
>--- a/graphics/kphotoalbum/Makefile
>+++ b/graphics/kphotoalbum/Makefile
>@@ -23,7 +23,7 @@ USE_KDE=	archive auth codecs completion config \
> 		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
> SHEBANG_FILES=	scripts/open-raw.pl scripts/kpa-backup.sh
> 
> OPTIONS_DEFINE=	WEBENGINE
>diff --git a/graphics/kqtquickcharts/Makefile b/graphics/kqtquickcharts/Makefile
>index 7c94b09c4b7a..e1cfbc17e623 100644
>--- a/graphics/kqtquickcharts/Makefile
>+++ b/graphics/kqtquickcharts/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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
> 
>diff --git a/graphics/kquickimageeditor/Makefile b/graphics/kquickimageeditor/Makefile
>index d9fdb8986c60..40b027b695cd 100644
>--- a/graphics/kquickimageeditor/Makefile
>+++ b/graphics/kquickimageeditor/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
> 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>
>diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
>index 21ee21c3e1b5..7f4b89fdfb2d 100644
>--- a/graphics/krita/Makefile
>+++ b/graphics/krita/Makefile
>@@ -41,8 +41,8 @@ USES=		cmake:noninja gmake compiler:c++11-lib desktop-file-utils \
> 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
>diff --git a/graphics/ksanecore/Makefile b/graphics/ksanecore/Makefile
>index fd6f74cebd27..3126bf0f18b5 100644
>--- a/graphics/ksanecore/Makefile
>+++ b/graphics/ksanecore/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Library providing logic to interface scanners
> 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
>diff --git a/graphics/kseexpr/Makefile b/graphics/kseexpr/Makefile
>index 2a4d64bceded..b6ea673cce05 100644
>--- a/graphics/kseexpr/Makefile
>+++ b/graphics/kseexpr/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 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
> 
>diff --git a/graphics/ksnip/Makefile b/graphics/ksnip/Makefile
>index 335e8682112d..8ebf5a0fc90c 100644
>--- a/graphics/ksnip/Makefile
>+++ b/graphics/ksnip/Makefile
>@@ -14,10 +14,10 @@ LIB_DEPENDS=	libkColorPicker.so:graphics/kcolorpicker \
> 
> USES=		cmake compiler:c++11-lang 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]
>diff --git a/graphics/kxstitch/Makefile b/graphics/kxstitch/Makefile
>index 16d317c3bdda..7ae6ffd82c21 100644
>--- a/graphics/kxstitch/Makefile
>+++ b/graphics/kxstitch/Makefile
>@@ -12,10 +12,10 @@ USES=		cmake compiler:c++11-lang desktop-file-utils magick:6 kde:5 qt:5 tar:xz \
> USE_KDE=	auth bookmarks codecs completion config configwidgets coreaddons \
> 		i18n itemviews jobwidgets kio service solid sonnet textwidgets \
> 		widgetsaddons 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>
>diff --git a/graphics/libQGLViewer/Makefile b/graphics/libQGLViewer/Makefile
>index 04300eaffdf2..7f5dd1b4594f 100644
>--- a/graphics/libQGLViewer/Makefile
>+++ b/graphics/libQGLViewer/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENCE
> 
> 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]$//}
> 
>diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
>index 84fd3f7eb555..b924ade4c19c 100644
>--- a/graphics/libkdcraw/Makefile
>+++ b/graphics/libkdcraw/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libjasper.so:graphics/jasper \
> 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
>diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
>index a241142b58eb..3ce3f1447e8e 100644
>--- a/graphics/libkexiv2/Makefile
>+++ b/graphics/libkexiv2/Makefile
>@@ -10,7 +10,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2
> 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>
>diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
>index d859489d0b5b..973f46f95296 100644
>--- a/graphics/libkipi/Makefile
>+++ b/graphics/libkipi/Makefile
>@@ -10,9 +10,9 @@ LICENSE=	GPLv2+
> 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>
>diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
>index 2079f7286aca..58203537a6a0 100644
>--- a/graphics/libksane/Makefile
>+++ b/graphics/libksane/Makefile
>@@ -10,9 +10,9 @@ LIB_DEPENDS=	libsane.so:graphics/sane-backends \
> 
> 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
>diff --git a/graphics/libprojectm/Makefile b/graphics/libprojectm/Makefile
>index 3cebb6ced5f0..f4a2b676011d 100644
>--- a/graphics/libprojectm/Makefile
>+++ b/graphics/libprojectm/Makefile
>@@ -45,13 +45,13 @@ OPTIONS_SUB=			yes
> 
> 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
> 
>diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
>index 74f23625226a..9adebe1b3d87 100644
>--- a/graphics/luminance-qt5/Makefile
>+++ b/graphics/luminance-qt5/Makefile
>@@ -26,7 +26,7 @@ CFLAGS+=	-I${LOCALBASE}/include/Imath
> 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
>diff --git a/graphics/lximage-qt/Makefile b/graphics/lximage-qt/Makefile
>index 6a927b8bd653..85bb0c44a6d9 100644
>--- a/graphics/lximage-qt/Makefile
>+++ b/graphics/lximage-qt/Makefile
>@@ -15,7 +15,7 @@ USES=	cmake compiler:c++14-lang desktop-file-utils gettext-runtime \
> 	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
>diff --git a/graphics/mandelbulber/Makefile b/graphics/mandelbulber/Makefile
>index bd9ce91e3a38..5a527f93ca22 100644
>--- a/graphics/mandelbulber/Makefile
>+++ b/graphics/mandelbulber/Makefile
>@@ -22,7 +22,7 @@ GH_PROJECT=	${PORTNAME}2
> 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
> 
>diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
>index 71dde2b99efb..6e334d9aaf1b 100644
>--- a/graphics/nomacs/Makefile
>+++ b/graphics/nomacs/Makefile
>@@ -21,7 +21,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
> 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
> 
>diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
>index 88ed2ab6990e..53ec3c1a5ba0 100644
>--- a/graphics/okular/Makefile
>+++ b/graphics/okular/Makefile
>@@ -28,10 +28,10 @@ USE_KDE=	activities archive auth bookmarks codecs completion config \
> 		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
> 
> OPTIONS_DEFINE=	DOCS PURPOSE
> OPTIONS_DEFAULT=	PURPOSE
>diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
>index 3d1bd63fd99f..731c843a7e3b 100644
>--- a/graphics/opencsg/Makefile
>+++ b/graphics/opencsg/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/../license.txt
> 
> 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}
> 
>diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
>index 12c78bc75869..cdc9fc2cc45c 100644
>--- a/graphics/opencv/Makefile
>+++ b/graphics/opencv/Makefile
>@@ -125,7 +125,7 @@ VTK_DESC=		Include VTK library support (build opencv_viz module)
> 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)
>diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
>index 6dba4d5dc115..fb029f2e4f9d 100644
>--- a/graphics/openimageio/Makefile
>+++ b/graphics/openimageio/Makefile
>@@ -28,7 +28,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 
> 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
>@@ -65,7 +65,7 @@ IMAGEVIEWER_USES=	gl
> 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
>diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
>index 0894d5425759..a9a01e3a57c1 100644
>--- a/graphics/openorienteering-mapper/Makefile
>+++ b/graphics/openorienteering-mapper/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
> 
> 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
>@@ -33,20 +33,20 @@ OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
> 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
>diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
>index ebc3a21dec7c..f3e1cfb316ae 100644
>--- a/graphics/openshadinglanguage/Makefile
>+++ b/graphics/openshadinglanguage/Makefile
>@@ -23,7 +23,7 @@ RUN_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
> 
> 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
>@@ -44,7 +44,7 @@ MATERIALX_CMAKE_BOOL=	OSL_BUILD_MATERIALX
> 
> 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
> 
>diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile
>index 30d051872c4d..8296c313bd9d 100644
>--- a/graphics/osg34/Makefile
>+++ b/graphics/osg34/Makefile
>@@ -93,7 +93,7 @@ PDF_USE=		gnome=cairo
> 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"
>diff --git a/graphics/ospray/Makefile b/graphics/ospray/Makefile
>index df0bb642f3c7..49ed43b7fcb3 100644
>--- a/graphics/ospray/Makefile
>+++ b/graphics/ospray/Makefile
>@@ -23,7 +23,7 @@ LIB_DEPENDS=	libbenchmark.so:devel/benchmark \
> 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}
>diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
>index fc3178969c6f..e0817a36a31d 100644
>--- a/graphics/oyranos/Makefile
>+++ b/graphics/oyranos/Makefile
>@@ -33,7 +33,7 @@ USE_GL=		gl
> 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}
>diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
>index fa71f01976c7..46e2e236cc4a 100644
>--- a/graphics/pcl-pointclouds/Makefile
>+++ b/graphics/pcl-pointclouds/Makefile
>@@ -78,7 +78,7 @@ QT5_BROKEN=		WITH_QT doesn't do anything, should be used by apps, but apps is al
> 
> 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
>diff --git a/graphics/pencil2d/Makefile b/graphics/pencil2d/Makefile
>index 229f958126d2..c9b02bc4cbac 100644
>--- a/graphics/pencil2d/Makefile
>+++ b/graphics/pencil2d/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
> 
> 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
>diff --git a/graphics/peruse/Makefile b/graphics/peruse/Makefile
>index 6d7d43b743a0..a167b77934c3 100644
>--- a/graphics/peruse/Makefile
>+++ b/graphics/peruse/Makefile
>@@ -12,7 +12,7 @@ USE_KDE=	archive attica baloo completion config coreaddons crash ecm filemetadat
> 		iconthemes jobwidgets kdeclarative kio newstuff package service \
> 		widgetsaddons windowsystem 
> USE_QT=		concurrent core dbus declarative gui network opengl sql widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> KDE_INVENT=	8d1de5f4a7c4a6ca7444b0c55cb9aaa44a982a78
> 
>diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
>index 7dca9ef56889..f8d93e966564 100644
>--- a/graphics/pfstools/Makefile
>+++ b/graphics/pfstools/Makefile
>@@ -85,7 +85,7 @@ GLVIEW_USE=		GL=glut GL=gl,glu
> 
> 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>
> 
>diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
>index d22b21af0d16..8d718983eda0 100644
>--- a/graphics/photivo/Makefile
>+++ b/graphics/photivo/Makefile
>@@ -22,7 +22,7 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
> 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
> 
>diff --git a/graphics/photoflare/Makefile b/graphics/photoflare/Makefile
>index d73629660c23..17e3fb8a06ff 100644
>--- a/graphics/photoflare/Makefile
>+++ b/graphics/photoflare/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick
> 
> 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++`
>diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile
>index 1ec2bf970877..bcb0ac6d705d 100644
>--- a/graphics/photoqt/Makefile
>+++ b/graphics/photoqt/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake compiler:c++11-lib desktop-file-utils \
> 		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
>diff --git a/graphics/phototonic/Makefile b/graphics/phototonic/Makefile
>index 26765ca15990..0a404cb08f32 100644
>--- a/graphics/phototonic/Makefile
>+++ b/graphics/phototonic/Makefile
>@@ -16,7 +16,7 @@ USES=		compiler:c++11-lang desktop-file-utils gettext gl qmake qt:5
> 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' \
>diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
>index 7ccc5ec49b0c..f53e358e7a67 100644
>--- a/graphics/poppler/Makefile
>+++ b/graphics/poppler/Makefile
>@@ -79,7 +79,7 @@ BINARY_ALIAS+=		python3=${PYTHON_CMD}
> .  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
>diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile
>index a62ebbb7a52d..82397e140c17 100644
>--- a/graphics/py-python-poppler-qt5/Makefile
>+++ b/graphics/py-python-poppler-qt5/Makefile
>@@ -18,7 +18,7 @@ USES=		compiler:c++11-lang gl pkgconfig pyqt:5 python:3.7-3.9 qt:5
> 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
> 
>diff --git a/graphics/py-traitsui/Makefile b/graphics/py-traitsui/Makefile
>index 76df80c0ddf4..f391205fc507 100644
>--- a/graphics/py-traitsui/Makefile
>+++ b/graphics/py-traitsui/Makefile
>@@ -32,7 +32,7 @@ WXPYTHON_DESC=	wxPython backend
> 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>
>diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
>index 443afd230181..0bb7e0112373 100644
>--- a/graphics/qcomicbook/Makefile
>+++ b/graphics/qcomicbook/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake compiler:c++11-lang pkgconfig qt:5
> 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
> 
>diff --git a/graphics/qcustomplot-qt5/Makefile b/graphics/qcustomplot-qt5/Makefile
>index fe0294f9ed2c..0b3ba197588e 100644
>--- a/graphics/qcustomplot-qt5/Makefile
>+++ b/graphics/qcustomplot-qt5/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	GPLv3
> 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}
>diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
>index c97a273c4823..72aa26a12801 100644
>--- a/graphics/qgis-ltr/Makefile
>+++ b/graphics/qgis-ltr/Makefile
>@@ -105,10 +105,10 @@ USE_GL=		gl
> 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
>diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
>index c42713c36908..6660886bd6e4 100644
>--- a/graphics/qgis/Makefile
>+++ b/graphics/qgis/Makefile
>@@ -103,10 +103,10 @@ USE_GL=		gl
> 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
>diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
>index 0a09c659616b..2feaafa75395 100644
>--- a/graphics/qt5-3d/Makefile
>+++ b/graphics/qt5-3d/Makefile
>@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassimp.so:multimedia/assimp
> 
> 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
>diff --git a/graphics/qt5-graphicaleffects/Makefile b/graphics/qt5-graphicaleffects/Makefile
>index 8da4ad88ab9a..f897e1197f93 100644
>--- a/graphics/qt5-graphicaleffects/Makefile
>+++ b/graphics/qt5-graphicaleffects/Makefile
>@@ -9,6 +9,6 @@ COMMENT=	Qt Quick graphical effects
> 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>
>diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile
>index b162cc84f564..9ed2948a12a9 100644
>--- a/graphics/qt5-imageformats/Makefile
>+++ b/graphics/qt5-imageformats/Makefile
>@@ -13,6 +13,6 @@ LIB_DEPENDS=	libjasper.so:graphics/jasper \
> 		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>
>diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile
>index 5194184c2245..8769038a9b31 100644
>--- a/graphics/qt5-opengl/Makefile
>+++ b/graphics/qt5-opengl/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Qt 5-compatible OpenGL support module
> 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}
>diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile
>index 8c8c280adb74..d6dd54ea2416 100644
>--- a/graphics/qt5-pixeltool/Makefile
>+++ b/graphics/qt5-pixeltool/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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" "" \
>diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile
>index a30943019569..7d9c78463ff8 100644
>--- a/graphics/qt5-svg/Makefile
>+++ b/graphics/qt5-svg/Makefile
>@@ -7,6 +7,6 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile
>index 93ffcacbfa27..18a78b46a028 100644
>--- a/graphics/qt5-wayland/Makefile
>+++ b/graphics/qt5-wayland/Makefile
>@@ -18,7 +18,7 @@ USES=		compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
> 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
>diff --git a/graphics/qtawesome/Makefile b/graphics/qtawesome/Makefile
>index 19ecaf5dda38..58ba58bc8e29 100644
>--- a/graphics/qtawesome/Makefile
>+++ b/graphics/qtawesome/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	MIT
> 
> 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
>diff --git a/graphics/qtpbfimageplugin/Makefile b/graphics/qtpbfimageplugin/Makefile
>index 1bbb5f6bd9c1..543aea8edb47 100644
>--- a/graphics/qtpbfimageplugin/Makefile
>+++ b/graphics/qtpbfimageplugin/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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}
> 
>diff --git a/graphics/qtqr/Makefile b/graphics/qtqr/Makefile
>index 1a8c9e864d39..be63b2f966f1 100644
>--- a/graphics/qtqr/Makefile
>+++ b/graphics/qtqr/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYNUMPY} \
> 		${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
>diff --git a/graphics/quickqanava/Makefile b/graphics/quickqanava/Makefile
>index 9446272f8261..b76f53d6fbb8 100644
>--- a/graphics/quickqanava/Makefile
>+++ b/graphics/quickqanava/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/licence.txt
> 
> 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
>diff --git a/graphics/qvge/Makefile b/graphics/qvge/Makefile
>index 689df3d1c512..e14f0fbe08ad 100644
>--- a/graphics/qvge/Makefile
>+++ b/graphics/qvge/Makefile
>@@ -16,7 +16,7 @@ GH_ACCOUNT=	ArsMasiuk
> 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
> 
>diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile
>index 77efc0c48fac..f39046ec3309 100644
>--- a/graphics/rapid-photo-downloader/Makefile
>+++ b/graphics/rapid-photo-downloader/Makefile
>@@ -35,7 +35,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
> 
> 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}
> 
>diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
>index 2eda9f1ea708..fc235af392e2 100644
>--- a/graphics/scantailor/Makefile
>+++ b/graphics/scantailor/Makefile
>@@ -19,8 +19,8 @@ USES=		cmake compiler:c++11-lang desktop-file-utils jpeg qt:5 \
> 		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
>diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
>index 5da454dd04cf..ea2e6b769a95 100644
>--- a/graphics/seexpr/Makefile
>+++ b/graphics/seexpr/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libpng.so:graphics/png
> 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
> 
>@@ -37,7 +37,7 @@ LLVM_LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_DEFAULT}
> 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
>diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile
>index 39d6bbfbcc14..1b284fc90fd4 100644
>--- a/graphics/showimage/Makefile
>+++ b/graphics/showimage/Makefile
>@@ -15,8 +15,8 @@ USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:bzip2
> USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		coreaddons ecm i18n itemviews jobwidgets kio service solid \
> 		widgetsaddons xmlgui \
>-		doctools_build
>+		doctools:build
> USE_QT=		concurrent core dbus gui network xml widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
>index 55b725045935..acb290ca4bad 100644
>--- a/graphics/skanlite/Makefile
>+++ b/graphics/skanlite/Makefile
>@@ -14,8 +14,8 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> USE_KDE=	auth config configwidgets codecs completion \
> 		coreaddons i18n jobwidgets kio \
> 		service widgetsaddons 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
> 
> .include <bsd.port.mk>
>diff --git a/graphics/skanpage/Makefile b/graphics/skanpage/Makefile
>index 6cc2effcc1ad..63c89e3c5818 100644
>--- a/graphics/skanpage/Makefile
>+++ b/graphics/skanpage/Makefile
>@@ -16,10 +16,10 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> 
> 
>diff --git a/graphics/spectacle/Makefile b/graphics/spectacle/Makefile
>index 97e9377a47af..50e704e1e756 100644
>--- a/graphics/spectacle/Makefile
>+++ b/graphics/spectacle/Makefile
>@@ -16,10 +16,10 @@ USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
> 		dbusaddons globalaccel 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
>diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
>index 49e30309c84a..a86e5e06ef80 100644
>--- a/graphics/tiled/Makefile
>+++ b/graphics/tiled/Makefile
>@@ -17,7 +17,7 @@ GH_ACCOUNT=	bjorn
> 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
>diff --git a/graphics/vpaint/Makefile b/graphics/vpaint/Makefile
>index de5b0083f3c1..2143cddfe514 100644
>--- a/graphics/vpaint/Makefile
>+++ b/graphics/vpaint/Makefile
>@@ -14,7 +14,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile
>index 202efe98dca0..45fd2cfdc3e0 100644
>--- a/graphics/vulkan-caps-viewer/Makefile
>+++ b/graphics/vulkan-caps-viewer/Makefile
>@@ -11,7 +11,7 @@ LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
> 
> 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.224:vkheaders/Vulkan-Headers
>@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	WAYLAND X11
> 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
>diff --git a/graphics/vv/Makefile b/graphics/vv/Makefile
>index 3abd607a9c7c..e2f318ba88bd 100644
>--- a/graphics/vv/Makefile
>+++ b/graphics/vv/Makefile
>@@ -25,7 +25,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 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
> 
>diff --git a/graphics/wrapland/Makefile b/graphics/wrapland/Makefile
>index 50cb9dba3cc6..339903af574c 100644
>--- a/graphics/wrapland/Makefile
>+++ b/graphics/wrapland/Makefile
>@@ -17,9 +17,9 @@ TEST_DEPENDS=	${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
> 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}
>@@ -29,7 +29,7 @@ OPTIONS_DEFAULT=DOXYGEN
> 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>
>diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
>index 08dbfacfafa8..5cc5e9efad8f 100644
>--- a/graphics/xaos/Makefile
>+++ b/graphics/xaos/Makefile
>@@ -17,7 +17,7 @@ GH_ACCOUNT=	xaos-project
> 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
>diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile
>index 8b43857fb14f..95ce89cd0c0d 100644
>--- a/graphics/xpdf4/Makefile
>+++ b/graphics/xpdf4/Makefile
>@@ -52,7 +52,7 @@ LIBPAPER_LIB_DEPENDS=	libpaper.so:print/libpaper
> 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
>diff --git a/graphics/yacreader/Makefile b/graphics/yacreader/Makefile
>index b7f5795f2ef2..14de0771b701 100644
>--- a/graphics/yacreader/Makefile
>+++ b/graphics/yacreader/Makefile
>@@ -13,8 +13,8 @@ LIB_DEPENDS=	libunarr.so:archivers/unarr
> 
> 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 sql sql-sqlite3_run svg widgets
>+USE_QT=		qmake:build buildtools:build core concurrent:build declarative \
>+		gui multimedia network sql sql-sqlite3:run svg widgets
> 
> OPTIONS_DEFINE=	OPENGL POPPLER
> OPTIONS_DEFAULT=OPENGL POPPLER
>diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
>index 628444375c3f..1b5f3a9113b8 100644
>--- a/graphics/yafaray/Makefile
>+++ b/graphics/yafaray/Makefile
>@@ -40,7 +40,7 @@ OPTIONS_SUB=	yes
> 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
>diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
>index 9da3b986819e..65a30021a9ea 100644
>--- a/graphics/zbar/Makefile
>+++ b/graphics/zbar/Makefile
>@@ -68,7 +68,7 @@ NLS_LDFLAGS=			-lintl
> 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
> 
>diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile
>index f9567cfdfe8e..b1f1e4a4e04e 100644
>--- a/graphics/zint/Makefile
>+++ b/graphics/zint/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libpng.so:graphics/png
> 
> 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
>diff --git a/irc/dxirc/Makefile b/irc/dxirc/Makefile
>index cfdbdc4da8d7..a03c9fc30a9f 100644
>--- a/irc/dxirc/Makefile
>+++ b/irc/dxirc/Makefile
>@@ -39,6 +39,6 @@ NOTIFY_RUN_DEPENDS=	notify-send:devel/libnotify
> 
> 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>
>diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
>index 37372ef27bab..12fdb2570153 100644
>--- a/irc/konversation/Makefile
>+++ b/irc/konversation/Makefile
>@@ -14,10 +14,10 @@ USE_KDE=	archive attica auth bookmarks codecs completion config \
> 		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
> 
> SHEBANG_FILES=	data/scripts/bug \
> 		data/scripts/cmd \
>diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
>index 1b833893a37d..ce5cd163a8cc 100644
>--- a/irc/kvirc/Makefile
>+++ b/irc/kvirc/Makefile
>@@ -20,7 +20,7 @@ USE_KDE=	auth codecs config configwidgets coreaddons i18n notifications \
> 		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
>diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
>index dac624ac4104..47fb465b178c 100644
>--- a/irc/quassel/Makefile
>+++ b/irc/quassel/Makefile
>@@ -17,7 +17,7 @@ USE_GITHUB=	nodefault
> #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
>@@ -61,18 +61,18 @@ MONO_PREVENTS_MSG=	Quassel core server should be installed via irc/quassel-core
> 
> 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}
>diff --git a/irc/srain/Makefile b/irc/srain/Makefile
>index a6f4c40bd787..a6c6b8a8787b 100644
>--- a/irc/srain/Makefile
>+++ b/irc/srain/Makefile
>@@ -23,8 +23,8 @@ USE_GITHUB=		yes
> GH_ACCOUNT=		SrainApp
> 
> DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
>-DOCS_MESON_ON=		-Ddoc_builders=html,man
>-DOCS_MESON_OFF=		-Ddoc_builders=
>+DOCS_MESON_ON=		-Ddoc:builders=html,man
>+DOCS_MESON_OFF=		-Ddoc:builders=
> 
> .include <bsd.port.pre.mk>
> 
>diff --git a/japanese/fcitx-skk/Makefile b/japanese/fcitx-skk/Makefile
>index 704cfeb3ecc0..3d21992f754b 100644
>--- a/japanese/fcitx-skk/Makefile
>+++ b/japanese/fcitx-skk/Makefile
>@@ -26,7 +26,7 @@ QT5_DESC=	Enable Qt for GUI configuration
> 
> .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
>diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
>index de189af17933..8068875a6c46 100644
>--- a/japanese/kiten/Makefile
>+++ b/japanese/kiten/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
>diff --git a/lang/kf5-kross/Makefile b/lang/kf5-kross/Makefile
>index 71017a6e8476..74f6d72f363d 100644
>--- a/lang/kf5-kross/Makefile
>+++ b/lang/kf5-kross/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/lang/kross-interpreters/Makefile b/lang/kross-interpreters/Makefile
>index 082b4edfdbee..69ca3710cd21 100644
>--- a/lang/kross-interpreters/Makefile
>+++ b/lang/kross-interpreters/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	Language interpreters to enable in-process scripting with Kross
> 
> 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
> 
>diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile
>index e1f75ba8c94d..fc7113ddb001 100644
>--- a/lang/kturtle/Makefile
>+++ b/lang/kturtle/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
>index ff042a3bc3ad..174682525f72 100644
>--- a/lang/smlnj/Makefile
>+++ b/lang/smlnj/Makefile
>@@ -156,7 +156,7 @@ RECOMPILEDIR=
> .endif
> 
> MLRUNTIMEPATCHES_CMD=	cd ${FILESDIR} && \
>-			( ${LS} do-patch-base_runtime_* 2>&- || \
>+			( ${LS} do-patch-base:runtime_* 2>&- || \
> 			  ${TRUE} )
> MLSTANDARDPATCHES_CMD=	cd ${FILESDIR} && \
> 			( for srcdir in ${MLSTDSRCDIRS} ; \
>diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
>index 551fb6c55206..e93aa6d1695b 100644
>--- a/mail/trojita/Makefile
>+++ b/mail/trojita/Makefile
>@@ -23,7 +23,7 @@ CMAKE_ARGS+=	-DWITH_CLEARTEXT_PLUGIN:STRING=ON -DWITH_DBUS:STRING=ON \
> 		-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>
>diff --git a/math/acalc/Makefile b/math/acalc/Makefile
>index be414c4d53c8..f500dfc8d521 100644
>--- a/math/acalc/Makefile
>+++ b/math/acalc/Makefile
>@@ -14,7 +14,7 @@ USES=		compiler:c++14-lang qmake qt:5 tar:xz
> 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
> 
>diff --git a/math/analitza/Makefile b/math/analitza/Makefile
>index faa5ba29bda3..b9dfd5d47135 100644
>--- a/math/analitza/Makefile
>+++ b/math/analitza/Makefile
>@@ -12,9 +12,9 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
> 
> 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
> 
>diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
>index 085df1314dd3..0177426c5477 100644
>--- a/math/asymptote/Makefile
>+++ b/math/asymptote/Makefile
>@@ -30,7 +30,7 @@ USE_GL=		gl glu glut
> 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
>diff --git a/math/cantor/Makefile b/math/cantor/Makefile
>index aa092518c408..56e70378d931 100644
>--- a/math/cantor/Makefile
>+++ b/math/cantor/Makefile
>@@ -21,11 +21,11 @@ USE_KDE=	attica auth archive bookmarks codecs completion config \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	LUAJIT MAXIMA OCTAVE R SAGE SCILAB DOCS
>diff --git a/math/cgal/Makefile b/math/cgal/Makefile
>index bd4c379d7245..ae4d472569a5 100644
>--- a/math/cgal/Makefile
>+++ b/math/cgal/Makefile
>@@ -39,7 +39,7 @@ VISUALIZATION_LIB_DEPENDS=	libgeomview.so:graphics/geomview
> .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
>diff --git a/math/g2o/Makefile b/math/g2o/Makefile
>index 3a9a4ff419f2..096b664ed0a6 100644
>--- a/math/g2o/Makefile
>+++ b/math/g2o/Makefile
>@@ -19,7 +19,7 @@ USES=		cmake compiler:c++11-lang gl eigen:3 blaslapack:netlib qt:5
> 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
>diff --git a/math/gecode/Makefile b/math/gecode/Makefile
>index f3b507c9158d..3260dff033a4 100644
>--- a/math/gecode/Makefile
>+++ b/math/gecode/Makefile
>@@ -45,7 +45,7 @@ FLATZINC_CONFIGURE_ENABLE=	flatzinc
> 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
> 
>diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
>index 53cf0203980a..7a9dd26bc88b 100644
>--- a/math/kalgebra/Makefile
>+++ b/math/kalgebra/Makefile
>@@ -14,10 +14,10 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gettext gl kde:5 \
> 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
>diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile
>index f6c0a690c846..d05bd6db11fb 100644
>--- a/math/kbruch/Makefile
>+++ b/math/kbruch/Makefile
>@@ -11,9 +11,9 @@ BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-
> 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
> 
>diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
>index 9e77be0c9c6c..3d6d9f86fa39 100644
>--- a/math/kcalc/Makefile
>+++ b/math/kcalc/Makefile
>@@ -13,9 +13,9 @@ BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-
> 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
> 
>diff --git a/math/kig/Makefile b/math/kig/Makefile
>index 2c4332328fff..f88eb2a68829 100644
>--- a/math/kig/Makefile
>+++ b/math/kig/Makefile
>@@ -13,9 +13,9 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
> 		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
> SHEBANG_FILES=	pykig/pykig.py
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile
>index 93e06ebc5b6f..183529a4a584 100644
>--- a/math/kmplot/Makefile
>+++ b/math/kmplot/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/math/labplot/Makefile b/math/labplot/Makefile
>index 91107f7bcfac..24de2aa7e7de 100644
>--- a/math/labplot/Makefile
>+++ b/math/labplot/Makefile
>@@ -26,10 +26,10 @@ USE_KDE=	archive attica auth bookmarks codecs completion config configwidgets \
> 		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
> 
> CMAKE_OFF=	ENABLE_LIBCERF
> CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_KUserFeedback
>diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile
>index c160903f70e3..912405666419 100644
>--- a/math/mathgl/Makefile
>+++ b/math/mathgl/Makefile
>@@ -54,7 +54,7 @@ MPI_CMAKE_BOOL=		enable-mpi
> 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
>diff --git a/math/mathmod/Makefile b/math/mathmod/Makefile
>index e9a1a1e347d5..6e0e6446f9ec 100644
>--- a/math/mathmod/Makefile
>+++ b/math/mathmod/Makefile
>@@ -14,7 +14,7 @@ GH_PROJECT=	${PORTNAME:tl}
> 
> 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}
> 
>diff --git a/math/minizinc-ide/Makefile b/math/minizinc-ide/Makefile
>index 699a0a36f97a..ef0b48a39dfc 100644
>--- a/math/minizinc-ide/Makefile
>+++ b/math/minizinc-ide/Makefile
>@@ -13,7 +13,7 @@ RUN_DEPENDS=	minizinc:math/minizinc
> 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
>diff --git a/math/mpsolve/Makefile b/math/mpsolve/Makefile
>index b4593f6802d7..cebbef106e79 100644
>--- a/math/mpsolve/Makefile
>+++ b/math/mpsolve/Makefile
>@@ -29,6 +29,6 @@ OPTIONS_SUB=		yes
> 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>
>diff --git a/math/octave/Makefile b/math/octave/Makefile
>index 8b772d71daa9..d431747a1127 100644
>--- a/math/octave/Makefile
>+++ b/math/octave/Makefile
>@@ -51,7 +51,7 @@ USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
> 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 \
>diff --git a/math/octomap/Makefile b/math/octomap/Makefile
>index 223a55bcf127..2a208db1235a 100644
>--- a/math/octomap/Makefile
>+++ b/math/octomap/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/octovis/LICENSE.txt
> 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
> 
>diff --git a/math/openmesh/Makefile b/math/openmesh/Makefile
>index d8adce976836..9f80e7d80b6a 100644
>--- a/math/openmesh/Makefile
>+++ b/math/openmesh/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/math/plplot/Makefile b/math/plplot/Makefile
>index 99189da1b543..71fb82586a9a 100644
>--- a/math/plplot/Makefile
>+++ b/math/plplot/Makefile
>@@ -103,7 +103,7 @@ TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION:STRING="${TK_VER}" \
> 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
>diff --git a/math/qalculate-qt/Makefile b/math/qalculate-qt/Makefile
>index 974e21f04615..dc4213fae70c 100644
>--- a/math/qalculate-qt/Makefile
>+++ b/math/qalculate-qt/Makefile
>@@ -18,7 +18,7 @@ RUN_DEPENDS=	gnuplot:math/gnuplot
> 
> 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
>diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile
>index 0f5669fe31fe..51f34e56ccb5 100644
>--- a/math/qwtplot3d/Makefile
>+++ b/math/qwtplot3d/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	3D plotting widgets for Qt
> 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
> 
>diff --git a/math/rkward/Makefile b/math/rkward/Makefile
>index e73782fd3868..5fc3971266b0 100644
>--- a/math/rkward/Makefile
>+++ b/math/rkward/Makefile
>@@ -22,7 +22,7 @@ USE_QT=		buildtools concurrent core dbus declarative gui location	\
> 		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
> 
>diff --git a/math/rocs/Makefile b/math/rocs/Makefile
>index a3b8d55c2615..dda765de086b 100644
>--- a/math/rocs/Makefile
>+++ b/math/rocs/Makefile
>@@ -13,10 +13,10 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> 
>diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
>index 1a32ee4bcad1..4e868b679a2f 100644
>--- a/math/speedcrunch/Makefile
>+++ b/math/speedcrunch/Makefile
>@@ -15,7 +15,7 @@ BB_PROJECT=	${PORTNAME}
> 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}
>diff --git a/math/taucs/Makefile b/math/taucs/Makefile
>index d041df16cc0d..13c2bcbb2d69 100644
>--- a/math/taucs/Makefile
>+++ b/math/taucs/Makefile
>@@ -41,7 +41,7 @@ PICFLAG?=	-fpic
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's/succedd/succeed/' \
>-		${WRKSRC}/progs/taucs_blas_underscore_test.c
>+		${WRKSRC}/progs/taucs_blas_underscore:test.c
> 	@${REINPLACE_CMD} -e 's/SUCCEDD/SUCCEED/' \
> 		${WRKSRC}/progs/test_linsolve.c
> 
>diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile
>index d357b31658fc..4731b7979c18 100644
>--- a/math/vtk6/Makefile
>+++ b/math/vtk6/Makefile
>@@ -119,8 +119,8 @@ PLIST_SUB+=	MPI="@comment "
> 
> .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"
>diff --git a/math/vtk8/Makefile b/math/vtk8/Makefile
>index 37d002652672..d8658b7e423a 100644
>--- a/math/vtk8/Makefile
>+++ b/math/vtk8/Makefile
>@@ -62,7 +62,7 @@ $w_DESC=	$w wrapping
> .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
>diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile
>index 41abd1e3041d..3c99af52ff00 100644
>--- a/math/vtk9/Makefile
>+++ b/math/vtk9/Makefile
>@@ -63,7 +63,7 @@ PYTHON_CMAKE_ON=	-DVTK_PYTHON_VERSION=${PYTHON_MAJOR_VER} -DPython3_EXECUTABLE=$
> 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
>diff --git a/math/zegrapher/Makefile b/math/zegrapher/Makefile
>index c10f292cd8ec..4c89a90136c7 100644
>--- a/math/zegrapher/Makefile
>+++ b/math/zegrapher/Makefile
>@@ -16,7 +16,7 @@ USES=		compiler:c++11-lang desktop-file-utils gl qmake qt:5
> 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} \
>diff --git a/misc/actiona/Makefile b/misc/actiona/Makefile
>index 27b76f9a6d63..3d26154afeaf 100644
>--- a/misc/actiona/Makefile
>+++ b/misc/actiona/Makefile
>@@ -19,7 +19,7 @@ USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig qmake \
> 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
>@@ -29,7 +29,7 @@ QMAKE_ARGS=	PKGCONFIG_OPENCV=opencv4
> 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
>diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
>index 88160a59e25d..115ea9514cd3 100644
>--- a/misc/artikulate/Makefile
>+++ b/misc/artikulate/Makefile
>@@ -9,10 +9,10 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
>diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
>index 8aff1501916c..c5c012b09a42 100644
>--- a/misc/bibletime/Makefile
>+++ b/misc/bibletime/Makefile
>@@ -13,6 +13,6 @@ LIB_DEPENDS=	libclucene-core.so:textproc/clucene \
> 		libsword.so:misc/sword
> 
> USES=		cmake compiler:c11 qt:5 tar:xz ssl
>-USE_QT=		buildtools core dbus gui linguist_build network script svg \
>-		webkit xml qmake_build testlib_build
>+USE_QT=		buildtools core dbus gui linguist:build network script svg \
>+		webkit xml qmake:build testlib:build
> .include <bsd.port.mk>
>diff --git a/misc/crosti/Makefile b/misc/crosti/Makefile
>index 0df6e8739cc7..74d0cf0c07b6 100644
>--- a/misc/crosti/Makefile
>+++ b/misc/crosti/Makefile
>@@ -16,7 +16,7 @@ USES=		compiler:c++11-lang desktop-file-utils dos2unix gl qmake qt:5 \
> 		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>
>diff --git a/misc/ecflow/Makefile b/misc/ecflow/Makefile
>index a616d8999a16..2acb21fbfdf2 100644
>--- a/misc/ecflow/Makefile
>+++ b/misc/ecflow/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
> 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
> 
>diff --git a/misc/edfbrowser/Makefile b/misc/edfbrowser/Makefile
>index dc5eec54395b..6287a19316d3 100644
>--- a/misc/edfbrowser/Makefile
>+++ b/misc/edfbrowser/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	GPLv3
> 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
>diff --git a/misc/ezc3d/Makefile b/misc/ezc3d/Makefile
>index 3fb688c79ee1..1b46a55f8d19 100644
>--- a/misc/ezc3d/Makefile
>+++ b/misc/ezc3d/Makefile
>@@ -20,6 +20,6 @@ CMAKE_TESTING_ON=	BUILD_TESTS
> CMAKE_TESTING_TARGET=	gtest
> 
> post-test:
>-	@cd ${TEST_WRKSRC}/test && ./ezc3d_test
>+	@cd ${TEST_WRKSRC}/test && ./ezc3d:test
> 
> .include <bsd.port.mk>
>diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile
>index 8f678609e35f..7e43c79975cf 100644
>--- a/misc/kde-thumbnailer-chm/Makefile
>+++ b/misc/kde-thumbnailer-chm/Makefile
>@@ -13,8 +13,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libchm.so:misc/chmlib
> 
> USES=		cmake compiler:c++11-lang kde:5 qt:5
>-USE_KDE=	ecm_build kio
>-USE_QT=		buildtools_build qmake_build gui
>+USE_KDE=	ecm:build kio
>+USE_QT=		buildtools:build qmake:build gui
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	Caig
>diff --git a/misc/kde-thumbnailer-epub/Makefile b/misc/kde-thumbnailer-epub/Makefile
>index cdfe178942f2..4d36bd4aa463 100644
>--- a/misc/kde-thumbnailer-epub/Makefile
>+++ b/misc/kde-thumbnailer-epub/Makefile
>@@ -11,8 +11,8 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		cmake compiler:c++11-lang kde:5 qt:5
>-USE_KDE=	archive ecm_build kio
>-USE_QT=		buildtools_build qmake_build gui xmlpatterns
>+USE_KDE=	archive ecm:build kio
>+USE_QT=		buildtools:build qmake:build gui xmlpatterns
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	Caig
>diff --git a/misc/kde-thumbnailer-fb2/Makefile b/misc/kde-thumbnailer-fb2/Makefile
>index f7723b377e5f..4307d10b3868 100644
>--- a/misc/kde-thumbnailer-fb2/Makefile
>+++ b/misc/kde-thumbnailer-fb2/Makefile
>@@ -11,8 +11,8 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		cmake compiler:c++11-lang kde:5 qt:5
>-USE_KDE=	archive ecm_build kio
>-USE_QT=		buildtools_build qmake_build gui
>+USE_KDE=	archive ecm:build kio
>+USE_QT=		buildtools:build qmake:build gui
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	Caig
>diff --git a/misc/kdeedu-data/Makefile b/misc/kdeedu-data/Makefile
>index 6ab3558fff36..b5c7f87424d1 100644
>--- a/misc/kdeedu-data/Makefile
>+++ b/misc/kdeedu-data/Makefile
>@@ -7,7 +7,7 @@ COMMENT=	KDE edu data files
> 
> 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
> 
>diff --git a/misc/kf5-purpose/Makefile b/misc/kf5-purpose/Makefile
>index 9470dc61783d..5466c59e829a 100644
>--- a/misc/kf5-purpose/Makefile
>+++ b/misc/kf5-purpose/Makefile
>@@ -16,8 +16,8 @@ USE_GNOME=	intltool
> USE_KDE=	config completion coreaddons i18n kdeclarative kio \
> 		kirigami2 notifications jobwidgets service widgetsaddons \
> 		windowsystem \
>-		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>
>diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
>index c12dcdfea53c..941cd097d3af 100644
>--- a/misc/kgeography/Makefile
>+++ b/misc/kgeography/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KDE geography trainer
> 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
> 
>diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
>index a4e9c9020749..a298f6244c94 100644
>--- a/misc/klettres/Makefile
>+++ b/misc/klettres/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
>diff --git a/misc/kookbook/Makefile b/misc/kookbook/Makefile
>index 96ff7a90dc45..e3de04c7a895 100644
>--- a/misc/kookbook/Makefile
>+++ b/misc/kookbook/Makefile
>@@ -13,8 +13,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> BUILD_DEPENDS=	${LOCALBASE}/lib/libmarkdown.a: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>
>diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
>index 97d682250285..c9e9d1a743a8 100644
>--- a/misc/ktouch/Makefile
>+++ b/misc/ktouch/Makefile
>@@ -12,10 +12,10 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons doctools \
> 		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
>diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
>index 9f9a8b96b0e0..428412178bce 100644
>--- a/misc/kwordquiz/Makefile
>+++ b/misc/kwordquiz/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/misc/libkeduvocdocument/Makefile b/misc/libkeduvocdocument/Makefile
>index 728266bc0904..c9c48d1a2333 100644
>--- a/misc/libkeduvocdocument/Makefile
>+++ b/misc/libkeduvocdocument/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	Library for reading and writing vocabulary files
> 
> 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
> 
>diff --git a/misc/molequeue/Makefile b/misc/molequeue/Makefile
>index f01f61cbc0c0..564daa668df7 100644
>--- a/misc/molequeue/Makefile
>+++ b/misc/molequeue/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	GPLv2
> 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:
>diff --git a/misc/nn-insight/Makefile b/misc/nn-insight/Makefile
>index 6203e7a50326..a40efbeb68ad 100644
>--- a/misc/nn-insight/Makefile
>+++ b/misc/nn-insight/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libcgraph.so:graphics/graphviz \
> 		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
>diff --git a/misc/openhantek/Makefile b/misc/openhantek/Makefile
>index 1b370b3a86f2..a5d242f3eaa3 100644
>--- a/misc/openhantek/Makefile
>+++ b/misc/openhantek/Makefile
>@@ -13,7 +13,7 @@ USES=		cmake compiler:c++11-lang gl localbase qt:5
> 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
>diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
>index 56c467bd3987..cb5937704678 100644
>--- a/misc/openmvg/Makefile
>+++ b/misc/openmvg/Makefile
>@@ -54,7 +54,7 @@ GH_ACCOUNT=	openMVG
> 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 \
>diff --git a/misc/orange3/Makefile b/misc/orange3/Makefile
>index ef470aa498b4..ae14e4ba07b5 100644
>--- a/misc/orange3/Makefile
>+++ b/misc/orange3/Makefile
>@@ -40,7 +40,7 @@ RUN_DEPENDS=	${PYNUMPY} \
> 
> 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
>@@ -51,9 +51,9 @@ LDFLAGS+=	-Xlinker -strip-all # strip, stage-qa doesn't catch that it isn't stri
> .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:
>diff --git a/misc/orion/Makefile b/misc/orion/Makefile
>index 0e202801afa9..c27940354c3a 100644
>--- a/misc/orion/Makefile
>+++ b/misc/orion/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libmpv.so:multimedia/mpv
> 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} \
>diff --git a/misc/parley/Makefile b/misc/parley/Makefile
>index 980fc2ab64b9..65a916c0194a 100644
>--- a/misc/parley/Makefile
>+++ b/misc/parley/Makefile
>@@ -15,10 +15,10 @@ USE_KDE=	attica auth codecs completion configwidgets coreaddons config \
> 		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=	x11 xrender
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
>index 45002bd98cdc..c31d6358588a 100644
>--- a/misc/qbrew/Makefile
>+++ b/misc/qbrew/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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"
>diff --git a/misc/qt5-l10n/Makefile b/misc/qt5-l10n/Makefile
>index 75eb251bd02e..8cccb4f4e456 100644
>--- a/misc/qt5-l10n/Makefile
>+++ b/misc/qt5-l10n/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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
> 
>diff --git a/misc/qt5ct/Makefile b/misc/qt5ct/Makefile
>index b3788a69af51..d35f766910ce 100644
>--- a/misc/qt5ct/Makefile
>+++ b/misc/qt5ct/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 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
>diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
>index b9ab5d3dd782..6d566146f04f 100644
>--- a/misc/tellico/Makefile
>+++ b/misc/tellico/Makefile
>@@ -28,9 +28,9 @@ USE_KDE=	archive attica5 auth bookmarks codecs completion config \
> 		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 widgets xml  \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> 
> SHEBANG_FILES=	src/fetch/scripts/dark_horse_comics.py \
> 		src/fetch/scripts/fr.allocine.py
>diff --git a/misc/valentina/Makefile b/misc/valentina/Makefile
>index 538071341f04..dfa6fddf9ce9 100644
>--- a/misc/valentina/Makefile
>+++ b/misc/valentina/Makefile
>@@ -11,8 +11,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE_GPL.txt
> 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
> 
>diff --git a/misc/veles/Makefile b/misc/veles/Makefile
>index a34cc475b504..42e653f3f708 100644
>--- a/misc/veles/Makefile
>+++ b/misc/veles/Makefile
>@@ -27,7 +27,7 @@ SHEBANG_GLOB=	*.py
> 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/.*\///} \
>diff --git a/multimedia/QtAV/Makefile b/multimedia/QtAV/Makefile
>index bb5cac8da2a0..537a76a9b66f 100644
>--- a/multimedia/QtAV/Makefile
>+++ b/multimedia/QtAV/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=		libass.so:multimedia/libass \
> 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
>diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
>index 2098ea81482b..1e21329c6ad1 100644
>--- a/multimedia/audacious/Makefile
>+++ b/multimedia/audacious/Makefile
>@@ -37,7 +37,7 @@ CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
> .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
>diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
>index 13e3c6c1328d..9c71ff96fd16 100644
>--- a/multimedia/avidemux/Makefile.common
>+++ b/multimedia/avidemux/Makefile.common
>@@ -89,7 +89,7 @@ USE_GNOME+=	libxslt
> 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=""
>diff --git a/multimedia/baka-mplayer/Makefile b/multimedia/baka-mplayer/Makefile
>index a9bafa0ef85b..37be2f55b147 100644
>--- a/multimedia/baka-mplayer/Makefile
>+++ b/multimedia/baka-mplayer/Makefile
>@@ -16,7 +16,7 @@ GH_ACCOUNT=	u8sand
> 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}"
> 
>@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS NLS NOTO
> 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
>diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
>index f7256f1c3a78..de46d7dfaf99 100644
>--- a/multimedia/bino/Makefile
>+++ b/multimedia/bino/Makefile
>@@ -18,7 +18,7 @@ USES=		autoreconf compiler:c++11-lang desktop-file-utils gl gmake \
> 		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
>diff --git a/multimedia/cineencoder/Makefile b/multimedia/cineencoder/Makefile
>index 12f6562bcc4e..a2e2de9d6d7d 100644
>--- a/multimedia/cineencoder/Makefile
>+++ b/multimedia/cineencoder/Makefile
>@@ -15,7 +15,7 @@ USES=		pkgconfig qt:5 xorg
> 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
> 
>diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile
>index 6f51b5df4b83..134b518a0d4e 100644
>--- a/multimedia/dragon/Makefile
>+++ b/multimedia/dragon/Makefile
>@@ -13,9 +13,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
> CONFLICTS_INSTALL=	dragon # bin/dragon
> 
>diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
>index 098b86ed0b85..67fc628aa37c 100644
>--- a/multimedia/dvbcut/Makefile
>+++ b/multimedia/dvbcut/Makefile
>@@ -20,7 +20,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
> 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
>diff --git a/multimedia/ffaudioconverter/Makefile b/multimedia/ffaudioconverter/Makefile
>index 9eac2828fb25..9f24306cd0f3 100644
>--- a/multimedia/ffaudioconverter/Makefile
>+++ b/multimedia/ffaudioconverter/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
> 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 \
>diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
>index 535903229003..32f089ad0616 100644
>--- a/multimedia/gstreamer1-plugins/Makefile.common
>+++ b/multimedia/gstreamer1-plugins/Makefile.common
>@@ -407,7 +407,7 @@ gst_pulse_PLIST_FILES=	${GST_LIB_DIR}/libgstpulseaudio.so
> 
> # 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
> 
>diff --git a/multimedia/gstreamer1-qt/Makefile b/multimedia/gstreamer1-qt/Makefile
>index 420dd5b23f31..8426bd900415 100644
>--- a/multimedia/gstreamer1-qt/Makefile
>+++ b/multimedia/gstreamer1-qt/Makefile
>@@ -20,7 +20,7 @@ CONFLICTS_INSTALL=	gstreamer${PKGNAMESUFFIX}
> 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
>diff --git a/multimedia/haruna/Makefile b/multimedia/haruna/Makefile
>index b41af4653448..21d5bf3ef5ff 100644
>--- a/multimedia/haruna/Makefile
>+++ b/multimedia/haruna/Makefile
>@@ -14,10 +14,10 @@ USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz
> USE_KDE=	auth bookmarks codecs completion config configwidgets coreaddons \
> 		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 xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
>index dac574b7829f..4eef2316fb32 100644
>--- a/multimedia/kaffeine/Makefile
>+++ b/multimedia/kaffeine/Makefile
>@@ -19,9 +19,9 @@ USES=		cmake compiler:c++11-lang cpe desktop-file-utils gettext \
> 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=	xscrnsaver
> 
> CPE_VENDOR=	kaffeine
>diff --git a/multimedia/kamoso/Makefile b/multimedia/kamoso/Makefile
>index da96ed9d9385..f3414f593aa8 100644
>--- a/multimedia/kamoso/Makefile
>+++ b/multimedia/kamoso/Makefile
>@@ -14,10 +14,10 @@ USE_GNOME=	glib20
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/multimedia/kdemultimedia-ffmpegthumbs/Makefile b/multimedia/kdemultimedia-ffmpegthumbs/Makefile
>index 0661a3a2c210..358ebb4914b2 100644
>--- a/multimedia/kdemultimedia-ffmpegthumbs/Makefile
>+++ b/multimedia/kdemultimedia-ffmpegthumbs/Makefile
>@@ -15,6 +15,6 @@ USES=		cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
> 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
> 
> .include <bsd.port.mk>
>diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
>index 45d96712757f..593f95bb99be 100644
>--- a/multimedia/kdenlive/Makefile
>+++ b/multimedia/kdenlive/Makefile
>@@ -24,12 +24,12 @@ USE_KDE=	archive attica auth bookmarks codecs completion config \
> 		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}"
>diff --git a/multimedia/kf5-kmediaplayer/Makefile b/multimedia/kf5-kmediaplayer/Makefile
>index 3194a3d66f64..238c663b7a18 100644
>--- a/multimedia/kf5-kmediaplayer/Makefile
>+++ b/multimedia/kf5-kmediaplayer/Makefile
>@@ -9,8 +9,8 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		i18n jobwidgets kio parts service 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 
> 
> .include <bsd.port.mk>
>diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
>index 2bd960303cd4..ae16f15297f0 100644
>--- a/multimedia/kmplayer/Makefile
>+++ b/multimedia/kmplayer/Makefile
>@@ -32,13 +32,13 @@ USES=		cmake compiler:c++11-lang cpe desktop-file-utils gettext-runtime \
> 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>
>diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
>index fb15653fb7e1..cebc07ffac8a 100644
>--- a/multimedia/libopenshot/Makefile
>+++ b/multimedia/libopenshot/Makefile
>@@ -23,7 +23,7 @@ USE_GITHUB=	yes
> 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\
>diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
>index b1d3046df133..aadfbf439ace 100644
>--- a/multimedia/minitube/Makefile
>+++ b/multimedia/minitube/Makefile
>@@ -23,7 +23,7 @@ GH_TUPLE=	\
> 
> 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} \
>@@ -31,7 +31,7 @@ QMAKE_ARGS=	QMAKE_LRELEASE=${LRELEASE} \
> 
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
>-NLS_USE=	QT=linguisttools_build
>+NLS_USE=	QT=linguisttools:build
> 
> post-patch:
> # Remove BOM
>diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
>index 052e44f481ed..e6265393754e 100644
>--- a/multimedia/mkvtoolnix/Makefile
>+++ b/multimedia/mkvtoolnix/Makefile
>@@ -25,7 +25,7 @@ LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
> 		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
>diff --git a/multimedia/mlt6-qt5/Makefile b/multimedia/mlt6-qt5/Makefile
>index fef7bc744931..55057ea95533 100644
>--- a/multimedia/mlt6-qt5/Makefile
>+++ b/multimedia/mlt6-qt5/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libexif.so:graphics/libexif \
> 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
>diff --git a/multimedia/mlt7-glaxnimate/Makefile b/multimedia/mlt7-glaxnimate/Makefile
>index 8a16d93261e9..06e3ed8b2af7 100644
>--- a/multimedia/mlt7-glaxnimate/Makefile
>+++ b/multimedia/mlt7-glaxnimate/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libexif.so:graphics/libexif \
> 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
>diff --git a/multimedia/mlt7-qt5/Makefile b/multimedia/mlt7-qt5/Makefile
>index 3a14ba98d0ea..b1b4f5d86613 100644
>--- a/multimedia/mlt7-qt5/Makefile
>+++ b/multimedia/mlt7-qt5/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libexif.so:graphics/libexif \
> 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
>diff --git a/multimedia/mpc-qt/Makefile b/multimedia/mpc-qt/Makefile
>index 20bbdc9c98cb..fde3f39b5f6c 100644
>--- a/multimedia/mpc-qt/Makefile
>+++ b/multimedia/mpc-qt/Makefile
>@@ -14,8 +14,8 @@ LIB_DEPENDS=	libmpv.so:multimedia/mpv
> 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
>diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
>index b194920157e9..0cba25763359 100644
>--- a/multimedia/mpv/Makefile
>+++ b/multimedia/mpv/Makefile
>@@ -197,7 +197,7 @@ CONFIGURE_ARGS+=	--disable-vaapi-wayland
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \
>-		${WRKSRC}/wscript_build.py
>+		${WRKSRC}/wscript:build.py
> 
> post-patch-MANPAGES-on:
> 	@${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \
>diff --git a/multimedia/musique/Makefile b/multimedia/musique/Makefile
>index 6df1cbd3042a..f93718073ada 100644
>--- a/multimedia/musique/Makefile
>+++ b/multimedia/musique/Makefile
>@@ -23,7 +23,7 @@ GH_TUPLE=	\
> 		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}
> 
>@@ -33,7 +33,7 @@ OPTIONS_DEFINE=		NLS
> 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
>diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
>index 7d51a20fc771..ccec1ffc4ab5 100644
>--- a/multimedia/mythtv/Makefile
>+++ b/multimedia/mythtv/Makefile
>@@ -41,9 +41,9 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	MythTV
> USE_GL=		gl
> USE_LDCONFIG=	yes
>-USE_QT=		buildtools_build core dbus gui imageformats_run \
>-		linguist_build network opengl qmake_build script sql \
>-		sql-mysql_run webkit widgets xml
>+USE_QT=		buildtools:build core dbus gui imageformats:run \
>+		linguist:build network opengl qmake:build script sql \
>+		sql-mysql:run webkit widgets xml
> USE_XORG=	x11 xv xrandr xxf86vm xinerama xext xcb
> 
> HAS_CONFIGURE=	yes
>diff --git a/multimedia/obs-ndi/Makefile b/multimedia/obs-ndi/Makefile
>index 0ce4f02b9bad..3c2b7d716b21 100644
>--- a/multimedia/obs-ndi/Makefile
>+++ b/multimedia/obs-ndi/Makefile
>@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libndi.so:multimedia/libndi
> 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
> 
>diff --git a/multimedia/obs-scrab/Makefile b/multimedia/obs-scrab/Makefile
>index 0ddc47c0be3e..8eed89934100 100644
>--- a/multimedia/obs-scrab/Makefile
>+++ b/multimedia/obs-scrab/Makefile
>@@ -15,7 +15,7 @@ USES=		cmake localbase:ldflags qt:5
> 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
> 
>diff --git a/multimedia/obs-streamfx/Makefile b/multimedia/obs-streamfx/Makefile
>index 026f809e4b28..607c438878af 100644
>--- a/multimedia/obs-streamfx/Makefile
>+++ b/multimedia/obs-streamfx/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 		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
>diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
>index ccde077f5ae0..aaad30ff43aa 100644
>--- a/multimedia/obs-studio/Makefile
>+++ b/multimedia/obs-studio/Makefile
>@@ -50,7 +50,7 @@ LIB_DEPENDS_powerpc64le=	libluajit-5.1.so:lang/luajit-openresty
> 
> 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
>diff --git a/multimedia/obs-transition-matrix/Makefile b/multimedia/obs-transition-matrix/Makefile
>index b759f6a45031..5fd73590cd25 100644
>--- a/multimedia/obs-transition-matrix/Makefile
>+++ b/multimedia/obs-transition-matrix/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libobs.so:multimedia/obs-studio
> 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
> 
>diff --git a/multimedia/obs-v4l2sink/Makefile b/multimedia/obs-v4l2sink/Makefile
>index f4b9306e7c2b..0a84b489aaab 100644
>--- a/multimedia/obs-v4l2sink/Makefile
>+++ b/multimedia/obs-v4l2sink/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libobs.so:multimedia/obs-studio
> 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
> 
>diff --git a/multimedia/obs-websocket/Makefile b/multimedia/obs-websocket/Makefile
>index 8ba6b0a639fd..0a5df33bd527 100644
>--- a/multimedia/obs-websocket/Makefile
>+++ b/multimedia/obs-websocket/Makefile
>@@ -12,7 +12,7 @@ BUILD_DEPENDS=	websocketpp>0:devel/websocketpp
> 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
>diff --git a/multimedia/olive/Makefile b/multimedia/olive/Makefile
>index 0d42fd97732a..bb7e43ac67e2 100644
>--- a/multimedia/olive/Makefile
>+++ b/multimedia/olive/Makefile
>@@ -21,7 +21,7 @@ GH_ACCOUNT=	olive-editor
> 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
>diff --git a/multimedia/opentoonz/Makefile b/multimedia/opentoonz/Makefile
>index 67992ee4c75b..0b7d92b83e84 100644
>--- a/multimedia/opentoonz/Makefile
>+++ b/multimedia/opentoonz/Makefile
>@@ -27,7 +27,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile
>index 0d50f1db50f7..deaecaf100be 100644
>--- a/multimedia/phonon-designerplugin/Makefile
>+++ b/multimedia/phonon-designerplugin/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	LGPL21
> 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
> 
>diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
>index 24a646ee3953..5b98cce25896 100644
>--- a/multimedia/phonon-gstreamer/Makefile
>+++ b/multimedia/phonon-gstreamer/Makefile
>@@ -17,7 +17,7 @@ USE_GL=		gl
> 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
>diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
>index dae79973df4a..ffd822ee31fa 100644
>--- a/multimedia/phonon-vlc/Makefile
>+++ b/multimedia/phonon-vlc/Makefile
>@@ -19,7 +19,7 @@ USES=		cmake pkgconfig tar:xz
> 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
>diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
>index 59b1a78e665b..cef29e6d530d 100644
>--- a/multimedia/phonon/Makefile
>+++ b/multimedia/phonon/Makefile
>@@ -20,7 +20,7 @@ CMAKE_OFF=	PHONON_BUILD_DESIGNER_PLUGIN \
> 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}
> 
>diff --git a/multimedia/qmmp-plugin-pack-qt5/Makefile b/multimedia/qmmp-plugin-pack-qt5/Makefile
>index ccd4521b5101..359786859008 100644
>--- a/multimedia/qmmp-plugin-pack-qt5/Makefile
>+++ b/multimedia/qmmp-plugin-pack-qt5/Makefile
>@@ -19,7 +19,7 @@ PORTSCOUT=	limit:^1\..*
> 
> 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
>diff --git a/multimedia/qmmp-plugin-pack-qt6/Makefile b/multimedia/qmmp-plugin-pack-qt6/Makefile
>index 21fc98c6eaa0..5df540404fe3 100644
>--- a/multimedia/qmmp-plugin-pack-qt6/Makefile
>+++ b/multimedia/qmmp-plugin-pack-qt6/Makefile
>@@ -18,7 +18,7 @@ CONFLICTS=	${PORTNAME}-qt5
> 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
>diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
>index d115be79bcd9..86968f9f6289 100644
>--- a/multimedia/qmmp-qt5/Makefile
>+++ b/multimedia/qmmp-qt5/Makefile
>@@ -17,7 +17,7 @@ PORTSCOUT=	limit:^1\..*
> 
> 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
>diff --git a/multimedia/qmmp-qt6/Makefile b/multimedia/qmmp-qt6/Makefile
>index 2148e94edc07..8525c19b18cb 100644
>--- a/multimedia/qmmp-qt6/Makefile
>+++ b/multimedia/qmmp-qt6/Makefile
>@@ -16,7 +16,7 @@ PORTSCOUT=	limit:^1\..*
> 
> 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
>diff --git a/multimedia/qpwgraph/Makefile b/multimedia/qpwgraph/Makefile
>index ed3f0e642f41..7e6356d3e97e 100644
>--- a/multimedia/qpwgraph/Makefile
>+++ b/multimedia/qpwgraph/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
> 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
>diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile
>index a7c958564a5b..f71d29e03967 100644
>--- a/multimedia/qt5-multimedia/Makefile
>+++ b/multimedia/qt5-multimedia/Makefile
>@@ -13,7 +13,7 @@ USES=		compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
> 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
>diff --git a/multimedia/qwinff/Makefile b/multimedia/qwinff/Makefile
>index 660e66014c33..300882ac160e 100644
>--- a/multimedia/qwinff/Makefile
>+++ b/multimedia/qwinff/Makefile
>@@ -15,8 +15,8 @@ RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
> 
> 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}|" \
>diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
>index 5436a2e01ab5..11ec3da11b09 100644
>--- a/multimedia/shotcut/Makefile
>+++ b/multimedia/shotcut/Makefile
>@@ -21,7 +21,7 @@ GH_ACCOUNT=	mltframework
> 
> 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.
>diff --git a/multimedia/simplescreenrecorder/Makefile b/multimedia/simplescreenrecorder/Makefile
>index e6790e76d4da..3ec27fd92c41 100644
>--- a/multimedia/simplescreenrecorder/Makefile
>+++ b/multimedia/simplescreenrecorder/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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
>diff --git a/multimedia/smplayer-skins/Makefile b/multimedia/smplayer-skins/Makefile
>index 3f720693a8b8..f0dbe809acc9 100644
>--- a/multimedia/smplayer-skins/Makefile
>+++ b/multimedia/smplayer-skins/Makefile
>@@ -9,7 +9,7 @@ MAINTAINER=	vvd@unislabs.com
> COMMENT=	Skins for SMPlayer (Skinnable GUI)
> 
> USES=		qt:5 tar:bzip2
>-USE_QT=		buildtools_build
>+USE_QT=		buildtools:build
> 
> NO_ARCH=	yes
> 
>diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile
>index f3e5ee753d29..1637d4430b8b 100644
>--- a/multimedia/smplayer-themes/Makefile
>+++ b/multimedia/smplayer-themes/Makefile
>@@ -9,7 +9,7 @@ MAINTAINER=	vvd@unislabs.com
> COMMENT=	Themes for SMPlayer
> 
> USES=		qt:5 tar:bzip2
>-USE_QT=		buildtools_build
>+USE_QT=		buildtools:build
> 
> NO_ARCH=	yes
> 
>diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
>index d10861f83084..9e6ebe64ea49 100644
>--- a/multimedia/smplayer/Makefile
>+++ b/multimedia/smplayer/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/Copying.txt
> 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
> 
>diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
>index ac6cfaa1e408..0d9d57d6da94 100644
>--- a/multimedia/smtube/Makefile
>+++ b/multimedia/smtube/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	yt-dlp:www/yt-dlp
> 
> 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
>diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
>index ece34595e15a..60fd564f3e59 100644
>--- a/multimedia/subtitlecomposer/Makefile
>+++ b/multimedia/subtitlecomposer/Makefile
>@@ -15,10 +15,10 @@ LIB_DEPENDS=	libicui18n.so:devel/icu \
> 
> USES=		compiler:c++11-lang cmake desktop-file-utils gettext \
> 		kde:5 openal pkgconfig qt:5 shared-mime-info tar:xz
>-USE_KDE=	auth codecs config configwidgets coreaddons ecm_build i18n \
>+USE_KDE=	auth codecs config configwidgets coreaddons ecm:build i18n \
> 		kio kross sonnet textwidgets widgetsaddons xmlgui \
>-		doctools_build
>-USE_QT=		buildtools_build qmake_build testlib_build core gui widgets
>+		doctools:build
>+USE_QT=		buildtools:build qmake:build testlib:build core gui widgets
> 
> # Requires PocketSphinx-5prealpha
> SPHINX_DESC=	Speech recognition via PocketSphinx
>diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
>index d5de8d583f19..fe65139f5488 100644
>--- a/multimedia/vlc/Makefile
>+++ b/multimedia/vlc/Makefile
>@@ -274,7 +274,7 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> 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
> 
>diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile
>index 3fbe96801742..c9b704c07241 100644
>--- a/multimedia/webcamoid/Makefile
>+++ b/multimedia/webcamoid/Makefile
>@@ -21,7 +21,7 @@ USE_GITHUB=	yes
> 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} \
>diff --git a/multimedia/zart/Makefile b/multimedia/zart/Makefile
>index f2231c58952b..4fee6d763738 100644
>--- a/multimedia/zart/Makefile
>+++ b/multimedia/zart/Makefile
>@@ -24,7 +24,7 @@ USES=		compiler:c++11-lang pkgconfig qmake qt:5
> 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
> 
>diff --git a/net-im/beebeep/Makefile b/net-im/beebeep/Makefile
>index 2ef2f22c9493..ba6cd3d47194 100644
>--- a/net-im/beebeep/Makefile
>+++ b/net-im/beebeep/Makefile
>@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 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}/
>diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile
>index 145e698ce8ed..a51ce7eed24f 100644
>--- a/net-im/chatterino2/Makefile
>+++ b/net-im/chatterino2/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> 
> 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 \
>diff --git a/net-im/cutegram/Makefile b/net-im/cutegram/Makefile
>index 4c6c322af346..1715e96379d5 100644
>--- a/net-im/cutegram/Makefile
>+++ b/net-im/cutegram/Makefile
>@@ -22,7 +22,7 @@ GH_SUBDIR=	Cutegram/asemantools:tools
> 
> USES=		compiler:c++11-lang desktop-file-utils gnome 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 \
> 		widgets dbus webkit quickcontrols graphicaleffects sql-sqlite3
> QMAKE_ARGS=	LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \
> 		TELEGRAMQML_INCLUDE_PATH="${LOCALBASE}/include/telegramqml"
>diff --git a/net-im/gitterdone/Makefile b/net-im/gitterdone/Makefile
>index afb454908056..11dc905f0a40 100644
>--- a/net-im/gitterdone/Makefile
>+++ b/net-im/gitterdone/Makefile
>@@ -9,8 +9,8 @@ COMMENT=	Gitter Client based on Qt5
> 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
> 
>diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile
>index b8bbc853792c..f16dbb0a7b5b 100644
>--- a/net-im/kaccounts-integration/Makefile
>+++ b/net-im/kaccounts-integration/Makefile
>@@ -17,8 +17,8 @@ USES=		cmake compiler:c++11-lang gettext pkgconfig kde:5 \
> 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>
>diff --git a/net-im/kaccounts-providers/Makefile b/net-im/kaccounts-providers/Makefile
>index 1822984fe3e2..51793219fd6c 100644
>--- a/net-im/kaccounts-providers/Makefile
>+++ b/net-im/kaccounts-providers/Makefile
>@@ -15,7 +15,7 @@ USES=		cmake compiler:c++11-lang gettext gnome kde:5 \
> USE_GNOME=	intltool
> USE_KDE=	config coreaddons i18n kdeclarative kio package service
> USE_QT=		concurrent core dbus declarative gui network xml webengine \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/kaidan/Makefile b/net-im/kaidan/Makefile
>index 7b6190523591..310cf202f5e3 100644
>--- a/net-im/kaidan/Makefile
>+++ b/net-im/kaidan/Makefile
>@@ -14,6 +14,6 @@ USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 \
> 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>
>diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
>index 841eed8faab9..bba1a3b5ed5e 100644
>--- a/net-im/kopete/Makefile
>+++ b/net-im/kopete/Makefile
>@@ -20,11 +20,11 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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
> 
> SHEBANG_FILES=	protocols/winpopup/winpopup-install \
> 		protocols/winpopup/winpopup-send \
>diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile
>index bb4be3a6e83b..edbf859e70bb 100644
>--- a/net-im/ktp-accounts-kcm/Makefile
>+++ b/net-im/ktp-accounts-kcm/Makefile
>@@ -25,9 +25,9 @@ USE_GNOME=	intltool
> 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
>diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile
>index cb0348a84704..4a779a73b597 100644
>--- a/net-im/ktp-approver/Makefile
>+++ b/net-im/ktp-approver/Makefile
>@@ -14,9 +14,9 @@ RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
> 
> 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
> 
>diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile
>index d0c040e6b240..6e4c390ab841 100644
>--- a/net-im/ktp-auth-handler/Makefile
>+++ b/net-im/ktp-auth-handler/Makefile
>@@ -18,9 +18,9 @@ USES=		compiler:c++11-lang cmake gettext kde:5 pkgconfig \
> 		qca qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/ktp-call-ui/Makefile b/net-im/ktp-call-ui/Makefile
>index e521ce8f9a5e..7bf89a85d164 100644
>--- a/net-im/ktp-call-ui/Makefile
>+++ b/net-im/ktp-call-ui/Makefile
>@@ -24,9 +24,9 @@ USE_GNOME=	glib20
> 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
>diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
>index 8b3b0b6bc3e6..9e941ba11bad 100644
>--- a/net-im/ktp-common-internals/Makefile
>+++ b/net-im/ktp-common-internals/Makefile
>@@ -25,9 +25,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile
>index 878e0c6bc506..a73d52e9c11c 100644
>--- a/net-im/ktp-contact-list/Makefile
>+++ b/net-im/ktp-contact-list/Makefile
>@@ -16,9 +16,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile
>index c5e520ce3c00..d643ca3ae5a6 100644
>--- a/net-im/ktp-contact-runner/Makefile
>+++ b/net-im/ktp-contact-runner/Makefile
>@@ -14,9 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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
> 
>diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile
>index 68e8825d9d02..64d681788272 100644
>--- a/net-im/ktp-desktop-applets/Makefile
>+++ b/net-im/ktp-desktop-applets/Makefile
>@@ -12,9 +12,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 
> USES=		compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile
>index f3000d65f776..aa85035d6e78 100644
>--- a/net-im/ktp-filetransfer-handler/Makefile
>+++ b/net-im/ktp-filetransfer-handler/Makefile
>@@ -15,9 +15,9 @@ USES=		compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/ktp-kded-module/Makefile b/net-im/ktp-kded-module/Makefile
>index 738675b2959b..c753e834a13d 100644
>--- a/net-im/ktp-kded-module/Makefile
>+++ b/net-im/ktp-kded-module/Makefile
>@@ -16,7 +16,7 @@ USE_KDE=	activities auth codecs completion config configwidgets coreaddons \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile
>index 1a3ca7f570f8..0693246eb68e 100644
>--- a/net-im/ktp-send-file/Makefile
>+++ b/net-im/ktp-send-file/Makefile
>@@ -17,9 +17,9 @@ USES=		compiler:c++11-lang cmake gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
>index c14f3a68ca5e..748a430d01ed 100644
>--- a/net-im/ktp-text-ui/Makefile
>+++ b/net-im/ktp-text-ui/Makefile
>@@ -19,10 +19,10 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/net-im/libaccounts-qt5/Makefile b/net-im/libaccounts-qt5/Makefile
>index 78044667a2b6..97954d17e673 100644
>--- a/net-im/libaccounts-qt5/Makefile
>+++ b/net-im/libaccounts-qt5/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib
> 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
>diff --git a/net-im/libqtelegram-ae/Makefile b/net-im/libqtelegram-ae/Makefile
>index 470b3d50c664..bbd18acdb490 100644
>--- a/net-im/libqtelegram-ae/Makefile
>+++ b/net-im/libqtelegram-ae/Makefile
>@@ -16,7 +16,7 @@ GH_ACCOUNT=	Aseman-Land
> 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:
>diff --git a/net-im/libquotient/Makefile b/net-im/libquotient/Makefile
>index a6ac13746022..9440463bdc57 100644
>--- a/net-im/libquotient/Makefile
>+++ b/net-im/libquotient/Makefile
>@@ -12,7 +12,7 @@ CONFLICTS=	libqmatrixclient\*
> 
> 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
>diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile
>index 7f290791fd0a..c81b387495a7 100644
>--- a/net-im/neochat/Makefile
>+++ b/net-im/neochat/Makefile
>@@ -22,9 +22,9 @@ USE_GL=		gl
> 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>
>diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile
>index 4b76d9a1e9ce..40b8c051d593 100644
>--- a/net-im/nheko/Makefile
>+++ b/net-im/nheko/Makefile
>@@ -28,8 +28,8 @@ USES=		cmake compiler:c++17-lang desktop-file-utils \
> 		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
>diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
>index fa40b3cc5368..bc0e230a15e2 100644
>--- a/net-im/psi/Makefile
>+++ b/net-im/psi/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libidn.so:dns/libidn
> 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" \
>diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
>index 70c78607afde..4fda8fb41ed9 100644
>--- a/net-im/qTox/Makefile
>+++ b/net-im/qTox/Makefile
>@@ -25,8 +25,8 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 
> 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
>diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile
>index 9615bd1d89b7..03add21faf8d 100644
>--- a/net-im/quaternion/Makefile
>+++ b/net-im/quaternion/Makefile
>@@ -19,7 +19,7 @@ USES=		cmake compiler:c++17-lang gettext-runtime gnome \
> 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
>diff --git a/net-im/qxmpp-qt5/Makefile b/net-im/qxmpp-qt5/Makefile
>index 81e750f66fb8..144bfbc25028 100644
>--- a/net-im/qxmpp-qt5/Makefile
>+++ b/net-im/qxmpp-qt5/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL
> 
> 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
>diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
>index da558da86411..81bcf0c18d8f 100644
>--- a/net-im/ricochet/Makefile
>+++ b/net-im/ricochet/Makefile
>@@ -18,7 +18,7 @@ USES=		compiler:c++11-lib gl gmake pkgconfig qmake qt:5 ssl
> 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}
> 
>diff --git a/net-im/ruqola/Makefile b/net-im/ruqola/Makefile
>index 5e9306e80c35..18e9f8e4e740 100644
>--- a/net-im/ruqola/Makefile
>+++ b/net-im/ruqola/Makefile
>@@ -18,10 +18,10 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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 xml websockets widgets \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> 
> PLIST_SUB=	SO_VER=${DISTVERSION}
> 
>diff --git a/net-im/scudcloud/Makefile b/net-im/scudcloud/Makefile
>index 4bf2cec1c68b..8a9550a89640 100644
>--- a/net-im/scudcloud/Makefile
>+++ b/net-im/scudcloud/Makefile
>@@ -21,7 +21,7 @@ HUNSPELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${P
> 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
>diff --git a/net-im/spectral/Makefile b/net-im/spectral/Makefile
>index fcfb6d146307..6d6eea42a1ee 100644
>--- a/net-im/spectral/Makefile
>+++ b/net-im/spectral/Makefile
>@@ -16,7 +16,7 @@ USES=		cmake compiler:c++17-lang gl pkgconfig qt:5 tar:bz2
> 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
> 
>diff --git a/net-im/teamwords/Makefile b/net-im/teamwords/Makefile
>index b11bc7656aa4..d49aab8d5ce4 100644
>--- a/net-im/teamwords/Makefile
>+++ b/net-im/teamwords/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	LGPL3
> 
> 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"
>diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
>index 35427f0e6b8e..84e6f2997a49 100644
>--- a/net-im/telegram-desktop/Makefile
>+++ b/net-im/telegram-desktop/Makefile
>@@ -57,7 +57,7 @@ GH_PROJECT=	tdesktop
> 
> .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
>diff --git a/net-im/telegramqml/Makefile b/net-im/telegramqml/Makefile
>index 38a1c5d946bb..74421e8829fb 100644
>--- a/net-im/telegramqml/Makefile
>+++ b/net-im/telegramqml/Makefile
>@@ -17,7 +17,7 @@ GH_ACCOUNT=	Aseman-Land
> 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"
>diff --git a/net-im/telepathy-logger-qt5/Makefile b/net-im/telepathy-logger-qt5/Makefile
>index 31761ce5cccd..c6b183725092 100644
>--- a/net-im/telepathy-logger-qt5/Makefile
>+++ b/net-im/telepathy-logger-qt5/Makefile
>@@ -22,7 +22,7 @@ USES=		bison:build cmake compiler:c++11-lang gnome kde:5 \
> 		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
> 
>diff --git a/net-im/telepathy-qt/Makefile b/net-im/telepathy-qt/Makefile
>index f07e4f290631..119ebca8ded5 100644
>--- a/net-im/telepathy-qt/Makefile
>+++ b/net-im/telepathy-qt/Makefile
>@@ -19,7 +19,7 @@ USES=		cmake compiler:c++11-lang gettext gnome gstreamer localbase:ldflags pathf
> 		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
>diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
>index 2f3c4094600c..a6dfe9f4072f 100644
>--- a/net-mgmt/librenms/Makefile
>+++ b/net-mgmt/librenms/Makefile
>@@ -31,7 +31,7 @@ USE_RC_SUBR=	librenms
> 
> SHEBANG_FILES=	../${PORTNAME}-vendor-${PORTVERSION}/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
> 		../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php \
>-		poller-wrapper.py poller.php scripts/auth_test.php \
>+		poller-wrapper.py poller.php scripts/auth:test.php \
> 		scripts/check_requirements.py scripts/github-remove \
> 		scripts/Migration/Standard_Conversion/convert_no_xml.sh \
> 		scripts/Migration/Standard_Conversion/destwork_no_xml.sh \
>diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
>index 20bacdf6b3b8..18cc08cea66d 100644
>--- a/net-mgmt/nagstamon/Makefile
>+++ b/net-mgmt/nagstamon/Makefile
>@@ -24,7 +24,7 @@ CPE_VENDOR=	henri_wahl
> 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
>diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
>index 416ca34ac085..0a716587ba79 100644
>--- a/net-mgmt/seafile-gui/Makefile
>+++ b/net-mgmt/seafile-gui/Makefile
>@@ -26,7 +26,7 @@ GH_PROJECT=	seafile-client
> 
> 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"
>diff --git a/net-p2p/arbitrum-avm/Makefile b/net-p2p/arbitrum-avm/Makefile
>index ed9df0378909..6fb0304e8bd2 100644
>--- a/net-p2p/arbitrum-avm/Makefile
>+++ b/net-p2p/arbitrum-avm/Makefile
>@@ -32,13 +32,13 @@ USES=		cmake
> CMAKE_OFF=	HUNTER_ENABLED
> CMAKE_SOURCE_PATH=	${WRKSRC}/packages/arb-avm-cpp
> 
>-PLIST_FILES=	bin/arbcore_runner \
>+PLIST_FILES=	bin/arbcore:runner \
> 		bin/avm_runner \
> 		bin/avm_tests
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/arbcore_runner \
>-		${STAGEDIR}${PREFIX}/bin/arbcore_runner
>+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/arbcore:runner \
>+		${STAGEDIR}${PREFIX}/bin/arbcore:runner
> 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/avm_runner \
> 		${STAGEDIR}${PREFIX}/bin/avm_runner
> 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/avm_tests \
>diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
>index 4448b740ff1a..24770bcb2b92 100644
>--- a/net-p2p/bitcoin/Makefile
>+++ b/net-p2p/bitcoin/Makefile
>@@ -25,7 +25,7 @@ SLAVE_PORT?=	no
> .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
>diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
>index fef7672391d2..435445bea3da 100644
>--- a/net-p2p/ktorrent/Makefile
>+++ b/net-p2p/ktorrent/Makefile
>@@ -20,10 +20,10 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=		DOCS WORKSPACE
> OPTIONS_DEFAULT=	WORKSPACE
>diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
>index 9e146bc077cb..efdfb672c32f 100644
>--- a/net-p2p/libktorrent/Makefile
>+++ b/net-p2p/libktorrent/Makefile
>@@ -12,9 +12,9 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
> USES=		cmake compiler:c++11-lang gettext kde:5 qca qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
>index 84f7f00643b5..aa2a9709cc0c 100644
>--- a/net-p2p/litecoin/Makefile
>+++ b/net-p2p/litecoin/Makefile
>@@ -23,7 +23,7 @@ SLAVE_PORT?=	no
> .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
>diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
>index 352174688f3f..a55318492377 100644
>--- a/net-p2p/namecoin/Makefile
>+++ b/net-p2p/namecoin/Makefile
>@@ -25,7 +25,7 @@ SLAVE_PORT?=	no
> 
> .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
>diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
>index 4c2f5e89f747..dcc8ba101e97 100644
>--- a/net-p2p/qbittorrent/Makefile
>+++ b/net-p2p/qbittorrent/Makefile
>@@ -20,7 +20,7 @@ nox_PLIST=		${MASTERDIR}/pkg-plist-nox
> 
> 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"
> 
>diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
>index 41040a12a13e..17a805e71789 100644
>--- a/net-p2p/retroshare/Makefile
>+++ b/net-p2p/retroshare/Makefile
>@@ -28,7 +28,7 @@ RS_REVISION=	0e6d27a
> 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
> 
>diff --git a/net-p2p/torrent-file-editor/Makefile b/net-p2p/torrent-file-editor/Makefile
>index a3a6a10a6a91..d1a598cccea6 100644
>--- a/net-p2p/torrent-file-editor/Makefile
>+++ b/net-p2p/torrent-file-editor/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	GPLv3+
> 
> 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 \
>diff --git a/net-p2p/transmission-qt/Makefile b/net-p2p/transmission-qt/Makefile
>index 2d87b5ad3725..40531b695402 100644
>--- a/net-p2p/transmission-qt/Makefile
>+++ b/net-p2p/transmission-qt/Makefile
>@@ -6,7 +6,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 
> 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
> 
>diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
>index edde1bf0a51d..b3cf59b58478 100644
>--- a/net-p2p/zetacoin/Makefile
>+++ b/net-p2p/zetacoin/Makefile
>@@ -25,7 +25,7 @@ SLAVE_PORT?=	no
> .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
>diff --git a/net/akonadi-calendar/Makefile b/net/akonadi-calendar/Makefile
>index ab070831a5e7..cd5629d745fc 100644
>--- a/net/akonadi-calendar/Makefile
>+++ b/net/akonadi-calendar/Makefile
>@@ -11,12 +11,12 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		dbusaddons kdelibs4support i18n iconthemes itemmodels \
> 		jobwidgets kio 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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/akonadi-contacts/Makefile b/net/akonadi-contacts/Makefile
>index dff84ba2fa33..1f185962d27f 100644
>--- a/net/akonadi-contacts/Makefile
>+++ b/net/akonadi-contacts/Makefile
>@@ -17,11 +17,11 @@ USES=		cmake compiler:c++11-lib gettext grantlee:5 kde:5 \
> 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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/akonadi-mime/Makefile b/net/akonadi-mime/Makefile
>index ea7143288a3c..d5576c8e0202 100644
>--- a/net/akonadi-mime/Makefile
>+++ b/net/akonadi-mime/Makefile
>@@ -10,11 +10,11 @@ LICENSE=	LGPL21
> 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
>diff --git a/net/akonadi-notes/Makefile b/net/akonadi-notes/Makefile
>index f3f51886d0d9..43f56ed567ce 100644
>--- a/net/akonadi-notes/Makefile
>+++ b/net/akonadi-notes/Makefile
>@@ -9,11 +9,11 @@ LICENSE=	LGPL21
> 
> 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
>diff --git a/net/akonadi-search/Makefile b/net/akonadi-search/Makefile
>index 96bd8edb1612..a2b15c56fc40 100644
>--- a/net/akonadi-search/Makefile
>+++ b/net/akonadi-search/Makefile
>@@ -13,11 +13,11 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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
>diff --git a/net/avahi-qt5/Makefile b/net/avahi-qt5/Makefile
>index 8c7dd4cbaafc..dc6bea621a02 100644
>--- a/net/avahi-qt5/Makefile
>+++ b/net/avahi-qt5/Makefile
>@@ -15,7 +15,7 @@ PLIST=		${.CURDIR}/pkg-plist
> 
> 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"
>diff --git a/net/calendarsupport/Makefile b/net/calendarsupport/Makefile
>index 4775e746076a..04d51debad90 100644
>--- a/net/calendarsupport/Makefile
>+++ b/net/calendarsupport/Makefile
>@@ -13,14 +13,14 @@ 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 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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/net/eventviews/Makefile b/net/eventviews/Makefile
>index 8c683603f171..59a313f99c30 100644
>--- a/net/eventviews/Makefile
>+++ b/net/eventviews/Makefile
>@@ -13,13 +13,13 @@ LIB_DEPENDS=	libKGantt.so:graphics/kdiagram
> 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
>diff --git a/net/incidenceeditor/Makefile b/net/incidenceeditor/Makefile
>index a63547f6f495..4b83da69ac87 100644
>--- a/net/incidenceeditor/Makefile
>+++ b/net/incidenceeditor/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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 \
>@@ -22,7 +22,7 @@ USE_KDE+=	akonadi akonadicalendar akonadicontacts akonadimime calendarcore \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/net/kcalutils/Makefile b/net/kcalutils/Makefile
>index c72f265593c4..50e3b324f0be 100644
>--- a/net/kcalutils/Makefile
>+++ b/net/kcalutils/Makefile
>@@ -10,11 +10,11 @@ LICENSE=	LGPL21
> 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
>diff --git a/net/kdenetwork-filesharing/Makefile b/net/kdenetwork-filesharing/Makefile
>index d50dfc72c827..15e05d17c87e 100644
>--- a/net/kdenetwork-filesharing/Makefile
>+++ b/net/kdenetwork-filesharing/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KDE Filesharing via Samba
> USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net/kf5-kcalendarcore/Makefile b/net/kf5-kcalendarcore/Makefile
>index 520639749afe..e8b18b4f2b6b 100644
>--- a/net/kf5-kcalendarcore/Makefile
>+++ b/net/kf5-kcalendarcore/Makefile
>@@ -12,9 +12,9 @@ LIB_DEPENDS=	libical.so:devel/libical
> 
> 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
>diff --git a/net/kf5-kcontacts/Makefile b/net/kf5-kcontacts/Makefile
>index 35f1f8749ef5..fb49bf63310c 100644
>--- a/net/kf5-kcontacts/Makefile
>+++ b/net/kf5-kcontacts/Makefile
>@@ -13,9 +13,9 @@ RUN_DEPENDS=	iso-codes>=0:misc/iso-codes
> 
> 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
>diff --git a/net/kf5-kdav/Makefile b/net/kf5-kdav/Makefile
>index 28174d7daddf..2cd628140e8c 100644
>--- a/net/kf5-kdav/Makefile
>+++ b/net/kf5-kdav/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	DAV protocol implementation with KJobs
> 
> 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
>diff --git a/net/kf5-kholidays/Makefile b/net/kf5-kholidays/Makefile
>index 8bd6faf2ec4d..f0afad79cef7 100644
>--- a/net/kf5-kholidays/Makefile
>+++ b/net/kf5-kholidays/Makefile
>@@ -9,9 +9,9 @@ LICENSE=	LGPL21
> 
> 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>
>diff --git a/net/kf5-kxmlrpcclient/Makefile b/net/kf5-kxmlrpcclient/Makefile
>index 120b268f4ad7..9750b8e469a5 100644
>--- a/net/kf5-kxmlrpcclient/Makefile
>+++ b/net/kf5-kxmlrpcclient/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 interaction with XMLRPC services
> 
> 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>
>diff --git a/net/kf5-syndication/Makefile b/net/kf5-syndication/Makefile
>index 79984a71170f..4a4bc57af5bd 100644
>--- a/net/kf5-syndication/Makefile
>+++ b/net/kf5-syndication/Makefile
>@@ -10,9 +10,9 @@ LICENSE=	LGPL21
> 
> 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>
>diff --git a/net/kget/Makefile b/net/kget/Makefile
>index 6a59cbcf7044..aaaae50e59c0 100644
>--- a/net/kget/Makefile
>+++ b/net/kget/Makefile
>@@ -24,9 +24,9 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
>diff --git a/net/kidentitymanagement/Makefile b/net/kidentitymanagement/Makefile
>index 387b289f5a9b..71dcebcb9281 100644
>--- a/net/kidentitymanagement/Makefile
>+++ b/net/kidentitymanagement/Makefile
>@@ -11,11 +11,11 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/kimap/Makefile b/net/kimap/Makefile
>index a82dcc22e5bc..b8472e6941ed 100644
>--- a/net/kimap/Makefile
>+++ b/net/kimap/Makefile
>@@ -12,11 +12,11 @@ LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
> 
> 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
>diff --git a/net/kio-gdrive/Makefile b/net/kio-gdrive/Makefile
>index 365be67ad68e..c8b8ea4011f0 100644
>--- a/net/kio-gdrive/Makefile
>+++ b/net/kio-gdrive/Makefile
>@@ -18,9 +18,9 @@ USE_GNOME=	intltool
> 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
> 
>diff --git a/net/kio-zeroconf/Makefile b/net/kio-zeroconf/Makefile
>index 1f612464f60a..a37976511702 100644
>--- a/net/kio-zeroconf/Makefile
>+++ b/net/kio-zeroconf/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	KDE Network monitor for DNS-SD services (Zeroconf)
> USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz
> USE_KDE=	config coreaddons dbusaddons dnssd i18n kio service
> USE_QT=		concurrent core dbus network \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile
>index 031e5287efbd..5626f1635384 100644
>--- a/net/kitinerary/Makefile
>+++ b/net/kitinerary/Makefile
>@@ -15,11 +15,11 @@ USES=		compiler:c++11-lang cmake gettext gnome kde:5 pkgconfig qt:5 \
> 		shared-mime-info ssl tar:xz
> USE_GNOME=	libxml2
> USE_KDE=	archive 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
>diff --git a/net/kldap/Makefile b/net/kldap/Makefile
>index 4bbd45d60e18..604dbab959a5 100644
>--- a/net/kldap/Makefile
>+++ b/net/kldap/Makefile
>@@ -12,11 +12,11 @@ LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
> 
> 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
> 
>diff --git a/net/kmailtransport/Makefile b/net/kmailtransport/Makefile
>index 11b10809d24b..4f067d660f6c 100644
>--- a/net/kmailtransport/Makefile
>+++ b/net/kmailtransport/Makefile
>@@ -17,7 +17,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons i18n \
> # 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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/kmbox/Makefile b/net/kmbox/Makefile
>index 36ddb32181e7..2a0caaceb406 100644
>--- a/net/kmbox/Makefile
>+++ b/net/kmbox/Makefile
>@@ -12,7 +12,7 @@ USE_KDE=	ecm
> # 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
>diff --git a/net/kmime/Makefile b/net/kmime/Makefile
>index fe84af0f448a..0d425fd9d44c 100644
>--- a/net/kmime/Makefile
>+++ b/net/kmime/Makefile
>@@ -11,9 +11,9 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
> 
> 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
>diff --git a/net/kontactinterface/Makefile b/net/kontactinterface/Makefile
>index 46eda1734ea2..cd4474801415 100644
>--- a/net/kontactinterface/Makefile
>+++ b/net/kontactinterface/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/kpeoplevcard/Makefile b/net/kpeoplevcard/Makefile
>index a2d4be18c57b..26ca2a620e54 100644
>--- a/net/kpeoplevcard/Makefile
>+++ b/net/kpeoplevcard/Makefile
>@@ -12,9 +12,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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
>diff --git a/net/kpimtextedit/Makefile b/net/kpimtextedit/Makefile
>index 7ddbc9d904fa..98a034d5eb6b 100644
>--- a/net/kpimtextedit/Makefile
>+++ b/net/kpimtextedit/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/krdc/Makefile b/net/krdc/Makefile
>index 40cc0b7a0203..ee7cbfea68f3 100644
>--- a/net/krdc/Makefile
>+++ b/net/krdc/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> CMAKE_ON=	WITH_VNC
>diff --git a/net/krfb/Makefile b/net/krfb/Makefile
>index baf86e62433a..14a0dfea75cb 100644
>--- a/net/krfb/Makefile
>+++ b/net/krfb/Makefile
>@@ -13,9 +13,9 @@ USES=		alias cmake compiler:c++11-lib gettext jpeg \
> 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
>diff --git a/net/ksmtp/Makefile b/net/ksmtp/Makefile
>index 7c26b0e79eb7..afb0a8c5e330 100644
>--- a/net/ksmtp/Makefile
>+++ b/net/ksmtp/Makefile
>@@ -13,7 +13,7 @@ USE_KDE=	config coreaddons i18n kio service
> # pim components
> USE_KDE+=	mime
> USE_QT=		concurrent core dbus network \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> USE_LDCONFIG=	yes
> 
>diff --git a/net/ktnef/Makefile b/net/ktnef/Makefile
>index ad90a506b6aa..20586b826011 100644
>--- a/net/ktnef/Makefile
>+++ b/net/ktnef/Makefile
>@@ -9,11 +9,11 @@ LICENSE=	LGPL21
> 
> 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
>diff --git a/net/landrop/Makefile b/net/landrop/Makefile
>index 1590f98df513..d889efa89b1b 100644
>--- a/net/landrop/Makefile
>+++ b/net/landrop/Makefile
>@@ -19,7 +19,7 @@ GH_ACCOUNT=	LANDrop
> 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
> 
>diff --git a/net/libgravatar/Makefile b/net/libgravatar/Makefile
>index e08b2874a5bf..edc68e016d0b 100644
>--- a/net/libgravatar/Makefile
>+++ b/net/libgravatar/Makefile
>@@ -10,11 +10,11 @@ LICENSE=	LGPL21
> 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
>diff --git a/net/libkgapi/Makefile b/net/libkgapi/Makefile
>index 60f497b94bfb..15d832783796 100644
>--- a/net/libkgapi/Makefile
>+++ b/net/libkgapi/Makefile
>@@ -19,12 +19,12 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
>diff --git a/net/libksieve/Makefile b/net/libksieve/Makefile
>index cc8d917731cd..509b7753b305 100644
>--- a/net/libksieve/Makefile
>+++ b/net/libksieve/Makefile
>@@ -14,13 +14,13 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/libkvkontakte/Makefile b/net/libkvkontakte/Makefile
>index b213c389bd4c..28fdb5790813 100644
>--- a/net/libkvkontakte/Makefile
>+++ b/net/libkvkontakte/Makefile
>@@ -14,6 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 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=		core gui network webkit widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/net/libmaia/Makefile b/net/libmaia/Makefile
>index 9ec25f8d80cb..03c708614271 100644
>--- a/net/libmaia/Makefile
>+++ b/net/libmaia/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	XML-RPC library for Qt
> 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 \
>diff --git a/net/libmediawiki/Makefile b/net/libmediawiki/Makefile
>index 253ac070af75..949ac6001ac6 100644
>--- a/net/libmediawiki/Makefile
>+++ b/net/libmediawiki/Makefile
>@@ -18,6 +18,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 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>
>diff --git a/net/linphone/Makefile b/net/linphone/Makefile
>index 78b167c1ed8a..13191cf40083 100644
>--- a/net/linphone/Makefile
>+++ b/net/linphone/Makefile
>@@ -22,8 +22,8 @@ GL_ACCOUNT=	public
> 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
>diff --git a/net/mailcommon/Makefile b/net/mailcommon/Makefile
>index 778d6e697b1c..154fd1cc3f2c 100644
>--- a/net/mailcommon/Makefile
>+++ b/net/mailcommon/Makefile
>@@ -19,14 +19,14 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/net/mailimporter/Makefile b/net/mailimporter/Makefile
>index ecd6bffcd9ec..b7238ce2c6d7 100644
>--- a/net/mailimporter/Makefile
>+++ b/net/mailimporter/Makefile
>@@ -12,11 +12,11 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
> 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
> 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
>diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
>index 83c447c2a161..ca84fa360aa8 100644
>--- a/net/messagelib/Makefile
>+++ b/net/messagelib/Makefile
>@@ -20,7 +20,7 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		coreaddons guiaddons i18n iconthemes imap itemmodels itemviews jobwidgets \
> 		kdewebkit kio 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 \
>@@ -28,7 +28,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadisearch calendarcore \
> 		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_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=		INOTIFY DOCS
>diff --git a/net/nitroshare/Makefile b/net/nitroshare/Makefile
>index 9bd93541de3d..7173ff450861 100644
>--- a/net/nitroshare/Makefile
>+++ b/net/nitroshare/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libqhttpengine.so:www/qhttpengine \
> 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>
>diff --git a/net/pimcommon/Makefile b/net/pimcommon/Makefile
>index 6e9f3d8386d9..e3937fbcf17c 100644
>--- a/net/pimcommon/Makefile
>+++ b/net/pimcommon/Makefile
>@@ -14,13 +14,13 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
> DESCR=		${.CURDIR:H:H}/deskutils/kdepim/pkg-descr
>diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile
>index 417b283b834e..55aa91b7d946 100644
>--- a/net/py-qt5-networkauth/Makefile
>+++ b/net/py-qt5-networkauth/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
> 
> 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
> 
>diff --git a/net/qoauth-qt5/Makefile b/net/qoauth-qt5/Makefile
>index feeecd75511c..0b703ebad3c8 100644
>--- a/net/qoauth-qt5/Makefile
>+++ b/net/qoauth-qt5/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
>index 0f6cf1e330d5..c5263f8dd3df 100644
>--- a/net/qt5-network/Makefile
>+++ b/net/qt5-network/Makefile
>@@ -11,7 +11,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
> 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
> 
>diff --git a/net/qt5-networkauth/Makefile b/net/qt5-networkauth/Makefile
>index d3a3422d3636..2255dfdc9dbf 100644
>--- a/net/qt5-networkauth/Makefile
>+++ b/net/qt5-networkauth/Makefile
>@@ -9,6 +9,6 @@ COMMENT=	Qt network auth module
> 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>
>diff --git a/net/quiterss/Makefile b/net/quiterss/Makefile
>index 3c779521e862..9a6ff0ea1cb8 100644
>--- a/net/quiterss/Makefile
>+++ b/net/quiterss/Makefile
>@@ -13,8 +13,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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
>diff --git a/net/rclone-browser/Makefile b/net/rclone-browser/Makefile
>index 84f9bd9e138b..c1b6d7ab5090 100644
>--- a/net/rclone-browser/Makefile
>+++ b/net/rclone-browser/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake pkgconfig qt:5
> 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
>diff --git a/net/remmina/Makefile b/net/remmina/Makefile
>index 38e74dc40177..44be27dab759 100644
>--- a/net/remmina/Makefile
>+++ b/net/remmina/Makefile
>@@ -82,7 +82,7 @@ GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
> 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
>diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
>index e7d23a84278a..a182921594da 100644
>--- a/net/rsplib/Makefile
>+++ b/net/rsplib/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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}" \
>diff --git a/net/rssguard/Makefile b/net/rssguard/Makefile
>index 6c15d36dba28..d45fb755b369 100644
>--- a/net/rssguard/Makefile
>+++ b/net/rssguard/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Simple (yet powerful) Qt5 feed reader
> 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
>diff --git a/net/savvycan/Makefile b/net/savvycan/Makefile
>index 7f82cf9b10f7..60921be0e6a0 100644
>--- a/net/savvycan/Makefile
>+++ b/net/savvycan/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	MIT
> 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
>diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
>index 830d65593c5d..541c06bb803d 100644
>--- a/net/smb4k/Makefile
>+++ b/net/smb4k/Makefile
>@@ -17,10 +17,10 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
> KDE_INVENT=	992987421af68f2695867722b8dc4ca30a4669ec network
> 
>diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
>index 6cb18bb37a77..d14289911ced 100644
>--- a/net/spoofer/Makefile
>+++ b/net/spoofer/Makefile
>@@ -24,7 +24,7 @@ OPTIONS_DEFAULT=GUI
> 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}
> 
>diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
>index d317eb1e669c..5e2052860a3f 100644
>--- a/net/wireshark/Makefile
>+++ b/net/wireshark/Makefile
>@@ -80,7 +80,7 @@ CISCODUMP_DESC=		Build ciscodump extcap tool
> 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
>diff --git a/net/wpa_supplicant_gui/Makefile b/net/wpa_supplicant_gui/Makefile
>index 3026d6ac2bd8..762748953031 100644
>--- a/net/wpa_supplicant_gui/Makefile
>+++ b/net/wpa_supplicant_gui/Makefile
>@@ -14,8 +14,8 @@ LICENSE=	BSD3CLAUSE
> 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
>diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
>index 1947e54362e2..f021b443c3a2 100644
>--- a/net/x2goclient/Makefile
>+++ b/net/x2goclient/Makefile
>@@ -21,7 +21,7 @@ USES=		compiler:c++11-lang gl pkgconfig qmake qt:5 xorg
> 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
>diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
>index 3e1f8b43ae14..4dea3882f095 100644
>--- a/polish/kadu/Makefile
>+++ b/polish/kadu/Makefile
>@@ -39,8 +39,8 @@ USE_GNOME=	glib20
> 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
>diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
>index 903aaa680db7..b82bda3c13b4 100644
>--- a/polish/qnapi/Makefile
>+++ b/polish/qnapi/Makefile
>@@ -19,7 +19,7 @@ USE_GITHUB=	yes
> 
> 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
> 
>diff --git a/ports-mgmt/octopkg/Makefile b/ports-mgmt/octopkg/Makefile
>index e0b4d41c86b6..d427dc6e2025 100644
>--- a/ports-mgmt/octopkg/Makefile
>+++ b/ports-mgmt/octopkg/Makefile
>@@ -15,7 +15,7 @@ USE_GITHUB=	yes
> 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 \
>diff --git a/ports-mgmt/portrac/Makefile b/ports-mgmt/portrac/Makefile
>index d4c763b0cf68..34adbec439f8 100644
>--- a/ports-mgmt/portrac/Makefile
>+++ b/ports-mgmt/portrac/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	BSD2CLAUSE
> 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 \
>diff --git a/print/hplip/Makefile b/print/hplip/Makefile
>index a0f74c843c1c..064cac9ebdc6 100644
>--- a/print/hplip/Makefile
>+++ b/print/hplip/Makefile
>@@ -67,7 +67,7 @@ NETWORK_CONFIGURE_ENABLE=	network-build
> 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
>diff --git a/print/limereport/Makefile b/print/limereport/Makefile
>index d18c513fe8a3..e2d3a8408f63 100644
>--- a/print/limereport/Makefile
>+++ b/print/limereport/Makefile
>@@ -10,8 +10,8 @@ LICENSE=	GPLv3
> 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
>diff --git a/print/lyx/Makefile b/print/lyx/Makefile
>index e2fa3a249a62..dca9d2c384e8 100644
>--- a/print/lyx/Makefile
>+++ b/print/lyx/Makefile
>@@ -21,7 +21,7 @@ MINOR_VERSION=	6.1
> 
> 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 \
>diff --git a/print/miktex/Makefile b/print/miktex/Makefile
>index dbcca4dd644c..0bbf91d8142c 100644
>--- a/print/miktex/Makefile
>+++ b/print/miktex/Makefile
>@@ -63,7 +63,7 @@ MANPAGES_CMAKE_BOOL=	WITH_MAN_PAGES
> 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 \
>diff --git a/print/posterazor/Makefile b/print/posterazor/Makefile
>index b793778650dd..19c5883bc9fd 100644
>--- a/print/posterazor/Makefile
>+++ b/print/posterazor/Makefile
>@@ -14,7 +14,7 @@ USES=		compiler:c++11-lang dos2unix gl localbase:ldflags qmake qt:5
> 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
> 
>diff --git a/print/print-manager/Makefile b/print/print-manager/Makefile
>index 73d282bf1271..d635d200a9f3 100644
>--- a/print/print-manager/Makefile
>+++ b/print/print-manager/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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
> 
> post-patch:
> 	${REINPLACE_CMD} '/CUPS_DATADIR/s|/usr/share/cups|${LOCALBASE}/share/cups|' \
>diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
>index 62b04c08d036..4dd76be02344 100644
>--- a/print/qpdfview/Makefile
>+++ b/print/qpdfview/Makefile
>@@ -17,7 +17,7 @@ USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5
> 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
> 
>diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile
>index 38fe74a6cafb..a62b8603597d 100644
>--- a/print/qt5-printsupport/Makefile
>+++ b/print/qt5-printsupport/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt print support module
> 
> 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}
>diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
>index 3ef691cebb57..7b30694e3801 100644
>--- a/print/scribus-devel/Makefile
>+++ b/print/scribus-devel/Makefile
>@@ -38,8 +38,8 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
> 
> 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
> 
>diff --git a/science/avogadro2/Makefile b/science/avogadro2/Makefile
>index 7e2d41cc02f2..31e81e695e7f 100644
>--- a/science/avogadro2/Makefile
>+++ b/science/avogadro2/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libAvogadroCore.so:science/avogadrolibs \
> 		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
> 
>diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile
>index 9b1708fa7f2f..4aa865489077 100644
>--- a/science/avogadrolibs/Makefile
>+++ b/science/avogadrolibs/Makefile
>@@ -50,7 +50,7 @@ OPENGL_USE=		GL=gl,glew,glu
> 
> 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
>diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
>index 69c198240fb5..b3250f09a0e3 100644
>--- a/science/elmerfem/Makefile
>+++ b/science/elmerfem/Makefile
>@@ -68,8 +68,8 @@ OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 \
> 
> _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>
>diff --git a/science/iboview/Makefile b/science/iboview/Makefile
>index d711fdceae5c..41f1341cfbee 100644
>--- a/science/iboview/Makefile
>+++ b/science/iboview/Makefile
>@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	amd64
> 
> 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
> 
>diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
>index c8e26728b886..cc031407e17a 100644
>--- a/science/kalzium/Makefile
>+++ b/science/kalzium/Makefile
>@@ -23,12 +23,12 @@ USE_KDE=	auth archive attica bookmarks codecs completion config configwidgets \
> 		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_LDCONFIG=	yes
> 
>diff --git a/science/kst2/Makefile b/science/kst2/Makefile
>index 304916a2315d..adceb562cede 100644
>--- a/science/kst2/Makefile
>+++ b/science/kst2/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libgsl.so:math/gsl \
> 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
>diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile
>index 8725ba0b32f1..f45fe2bd345f 100644
>--- a/science/liggghts/Makefile
>+++ b/science/liggghts/Makefile
>@@ -22,7 +22,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 
> 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
> 
>diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
>index cf46abf5111f..6442252dd385 100644
>--- a/science/massxpert/Makefile
>+++ b/science/massxpert/Makefile
>@@ -20,8 +20,8 @@ GL_SITE=	https://salsa.debian.org/
> 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>
>diff --git a/science/molsketch/Makefile b/science/molsketch/Makefile
>index d9a7c7343a9c..4d9b6930e925 100644
>--- a/science/molsketch/Makefile
>+++ b/science/molsketch/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libopenbabel.so:science/openbabel
> 
> 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}
>diff --git a/science/paraview/Makefile b/science/paraview/Makefile
>index d47cf0853fa4..aba58873421c 100644
>--- a/science/paraview/Makefile
>+++ b/science/paraview/Makefile
>@@ -62,7 +62,7 @@ USES=		alias cmake compiler:c11 eigen:3 fortran gl gnome jpeg localbase	\
> 		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
>diff --git a/science/pulseview/Makefile b/science/pulseview/Makefile
>index 8a7325360722..61806ca166bf 100644
>--- a/science/pulseview/Makefile
>+++ b/science/pulseview/Makefile
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 
> 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
>diff --git a/science/py-pymol/Makefile b/science/py-pymol/Makefile
>index 8550d013d755..fb1c995d8cd5 100644
>--- a/science/py-pymol/Makefile
>+++ b/science/py-pymol/Makefile
>@@ -40,7 +40,7 @@ OPTIONS_SINGLE_GUI=	QT5 TK
> OPTIONS_DEFAULT=	QT5
> 
> QT5_USES=	pyqt:5
>-QT5_USE=	PYQT=pyqt5_run
>+QT5_USE=	PYQT=pyqt5:run
> 
> post-patch-TK-on:
> 	@${REINPLACE_CMD} -e ' \
>diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile
>index 038ca736b658..305955ccad7f 100644
>--- a/science/py-veusz/Makefile
>+++ b/science/py-veusz/Makefile
>@@ -18,7 +18,7 @@ USES=		compiler:c++11-lang python:3.5+ pyqt:5 qt:5 shebangfix
> 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:
>diff --git a/science/scidavis/Makefile b/science/scidavis/Makefile
>index df3f12156151..1630de471377 100644
>--- a/science/scidavis/Makefile
>+++ b/science/scidavis/Makefile
>@@ -19,7 +19,7 @@ USES=		cmake compiler:c++17-lang desktop-file-utils gl pkgconfig \
> 		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
>diff --git a/science/shelxle/Makefile b/science/shelxle/Makefile
>index 823718d2a849..63242296cdf3 100644
>--- a/science/shelxle/Makefile
>+++ b/science/shelxle/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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 \
>diff --git a/science/step/Makefile b/science/step/Makefile
>index b0ab7f764e91..f58137552c91 100644
>--- a/science/step/Makefile
>+++ b/science/step/Makefile
>@@ -17,10 +17,10 @@ USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
> 		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
> CXXFLAGS_sparc64=	-Wno-error=return-type
> 
> SHEBANG_FILES=	step/data/extractxml
>diff --git a/science/vipster/Makefile b/science/vipster/Makefile
>index 3be42027cc1f..338d088d3828 100644
>--- a/science/vipster/Makefile
>+++ b/science/vipster/Makefile
>@@ -32,7 +32,7 @@ CMAKE_OFF=		VIPSTER_DOWNLOAD_DEPENDENCIES
> 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
>diff --git a/science/xdrawchem/Makefile b/science/xdrawchem/Makefile
>index eadef997bb91..a037f41fc0c8 100644
>--- a/science/xdrawchem/Makefile
>+++ b/science/xdrawchem/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 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
>diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
>index 788adf3b56c7..c3a355424fb6 100644
>--- a/security/fwbuilder/Makefile
>+++ b/security/fwbuilder/Makefile
>@@ -26,9 +26,9 @@ USES=		autoreconf:build gmake libtool qmake:no_configure qt:5 ssl
> USE_GITHUB=	yes
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
> USE_QT=		buildtools gui \
>-		linguist_build \
>+		linguist:build \
> 		printsupport \
>-		qmake_build \
>+		qmake:build \
> 		svg \
> 		xml
> 
>diff --git a/security/globalprotect-openconnect/Makefile b/security/globalprotect-openconnect/Makefile
>index 5636e8c06056..910021f818cf 100644
>--- a/security/globalprotect-openconnect/Makefile
>+++ b/security/globalprotect-openconnect/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libopenconnect.so:security/openconnect
> 
> 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
>diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
>index fb3f12fb6511..05a6b54c42c1 100644
>--- a/security/gpgme/Makefile
>+++ b/security/gpgme/Makefile
>@@ -66,14 +66,14 @@ NO_TEST=	yes
> .  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"
>diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
>index 5815bce71015..bdd237ff2039 100644
>--- a/security/keepassxc/Makefile
>+++ b/security/keepassxc/Makefile
>@@ -22,8 +22,8 @@ LIB_DEPENDS=	libargon2.so:security/libargon2 \
> 
> 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//}
>diff --git a/security/kf5-kdesu/Makefile b/security/kf5-kdesu/Makefile
>index 67e996b16c9c..b73cb92f4696 100644
>--- a/security/kf5-kdesu/Makefile
>+++ b/security/kf5-kdesu/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	KF5 integration with su for elevated privileges
> 
> 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>
>diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
>index d70cd82f1144..be7a6a5a2cd2 100644
>--- a/security/kgpg/Makefile
>+++ b/security/kgpg/Makefile
>@@ -14,9 +14,9 @@ USE_KDE=	akonadi akonadicontacts archive auth bookmarks codecs \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/security/kleopatra/Makefile b/security/kleopatra/Makefile
>index d08bc480b025..99edeb31a7bf 100644
>--- a/security/kleopatra/Makefile
>+++ b/security/kleopatra/Makefile
>@@ -17,9 +17,9 @@ USE_KDE=	auth codecs config configwidgets coreaddons crash dbusaddons \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/security/kpkpass/Makefile b/security/kpkpass/Makefile
>index b603030d299e..bf62bf18ea7f 100644
>--- a/security/kpkpass/Makefile
>+++ b/security/kpkpass/Makefile
>@@ -9,7 +9,7 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 \
> 		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
> 
>diff --git a/security/kwalletmanager/Makefile b/security/kwalletmanager/Makefile
>index 1e03d7279e0c..a8025a5cd70b 100644
>--- a/security/kwalletmanager/Makefile
>+++ b/security/kwalletmanager/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	archive auth codecs config configwidgets coreaddons crash \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/security/libkleo/Makefile b/security/libkleo/Makefile
>index 5ec75b93cf30..9ca25c358077 100644
>--- a/security/libkleo/Makefile
>+++ b/security/libkleo/Makefile
>@@ -18,7 +18,7 @@ USE_KDE=	codecs completion config coreaddons i18n itemmodels \
> 		widgetsaddons windowsystem \
> 		pimtextedit
> USE_QT=		core gui widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> _CORETOOLS=	md5sum sha1sum sha256sum sha512sum
> 
>diff --git a/security/lxqt-openssh-askpass/Makefile b/security/lxqt-openssh-askpass/Makefile
>index 616f6efb8a36..a18583d90c1a 100644
>--- a/security/lxqt-openssh-askpass/Makefile
>+++ b/security/lxqt-openssh-askpass/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	LGPL21+
> 
> 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
>diff --git a/security/lxqt-sudo/Makefile b/security/lxqt-sudo/Makefile
>index 40d581e46d5d..dce8ab1ca857 100644
>--- a/security/lxqt-sudo/Makefile
>+++ b/security/lxqt-sudo/Makefile
>@@ -12,7 +12,7 @@ RUN_DEPENDS=	sudo:security/sudo
> 
> 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
>diff --git a/security/nitrokey-app/Makefile b/security/nitrokey-app/Makefile
>index 89e2afeb8cc2..130770fbaa38 100644
>--- a/security/nitrokey-app/Makefile
>+++ b/security/nitrokey-app/Makefile
>@@ -18,7 +18,7 @@ GH_ACCOUNT=	Nitrokey
> 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
>diff --git a/security/openconnect-gui/Makefile b/security/openconnect-gui/Makefile
>index f86899a6e245..4c15e4e101a9 100644
>--- a/security/openconnect-gui/Makefile
>+++ b/security/openconnect-gui/Makefile
>@@ -22,7 +22,7 @@ RUN_DEPENDS=	openconnect:security/openconnect \
> 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
> 
>diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
>index 2ce0fe5a8ffb..f7e8d8d4f924 100644
>--- a/security/ophcrack/Makefile
>+++ b/security/ophcrack/Makefile
>@@ -24,7 +24,7 @@ OPTIONS_DEFAULT=	X11
> 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:
>diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
>index 48a77258e72d..ac759ec280e1 100644
>--- a/security/pinentry/Makefile
>+++ b/security/pinentry/Makefile
>@@ -96,7 +96,7 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome3
> 
> .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
>diff --git a/security/plasma5-kscreenlocker/Makefile b/security/plasma5-kscreenlocker/Makefile
>index d18bf37e97ee..b3d7a2b3bafe 100644
>--- a/security/plasma5-kscreenlocker/Makefile
>+++ b/security/plasma5-kscreenlocker/Makefile
>@@ -18,9 +18,9 @@ USE_KDE=	auth codecs config configwidgets coreaddons crash emoticons \
> 		kdeclarative layer-shell-qt notifications package \
> 		plasma-framework 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
>diff --git a/security/plasma5-ksshaskpass/Makefile b/security/plasma5-ksshaskpass/Makefile
>index 5f68aab0c3d7..4905b285e029 100644
>--- a/security/plasma5-ksshaskpass/Makefile
>+++ b/security/plasma5-ksshaskpass/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	Plasma5 ssh-add frontend
> 
> 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>
>diff --git a/security/plasma5-kwallet-pam/Makefile b/security/plasma5-kwallet-pam/Makefile
>index 1e4ac247c271..d0901052a425 100644
>--- a/security/plasma5-kwallet-pam/Makefile
>+++ b/security/plasma5-kwallet-pam/Makefile
>@@ -11,7 +11,7 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
> 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,,' \
>diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
>index 036e9bb8f271..5b7ccf6cb296 100644
>--- a/security/qtkeychain/Makefile
>+++ b/security/qtkeychain/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:5
> USE_GITHUB=	yes
>-USE_QT=		core dbus buildtools_build qmake_build
>+USE_QT=		core dbus buildtools:build qmake:build
> GH_ACCOUNT=	frankosterfeld
> USE_LDCONFIG=	yes
> OPTIONS_SUB=	yes
>@@ -24,7 +24,7 @@ LIBSECRET_DESC=		Enable libsecret backend
> LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
> LIBSECRET_CMAKE_BOOL=	LIBSECRET_SUPPORT
> 
>-NLS_USE=		qt=linguisttools_build
>+NLS_USE=		qt=linguisttools:build
> NLS_CMAKE_BOOL=		BUILD_TRANSLATIONS
> 
> .include <bsd.port.mk>
>diff --git a/security/spass-qt5/Makefile b/security/spass-qt5/Makefile
>index a1e61b1188fb..7bcdca060cc8 100644
>--- a/security/spass-qt5/Makefile
>+++ b/security/spass-qt5/Makefile
>@@ -4,7 +4,7 @@ PKGNAMESUFFIX=	-qt5
> 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
> 
>diff --git a/security/xca/Makefile b/security/xca/Makefile
>index 82c42eb1faa9..710b7dec2fcb 100644
>--- a/security/xca/Makefile
>+++ b/security/xca/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl
> 
> 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
>diff --git a/security/yubikey-manager-qt/Makefile b/security/yubikey-manager-qt/Makefile
>index 9a5e145989e4..8eedb9b5f989 100644
>--- a/security/yubikey-manager-qt/Makefile
>+++ b/security/yubikey-manager-qt/Makefile
>@@ -19,7 +19,7 @@ USES=		compiler:c++11-lang gl pkgconfig python:3.5+ qt:5 qmake \
> 		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
>diff --git a/security/yubikey-personalization-gui/Makefile b/security/yubikey-personalization-gui/Makefile
>index efbebd34e73a..34fc2b752fbe 100644
>--- a/security/yubikey-personalization-gui/Makefile
>+++ b/security/yubikey-personalization-gui/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libykpers-1.so:security/ykpers \
> 
> 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
> 
>diff --git a/security/yubioath-desktop/Makefile b/security/yubioath-desktop/Makefile
>index 04bcfe59f079..c24827e94983 100644
>--- a/security/yubioath-desktop/Makefile
>+++ b/security/yubioath-desktop/Makefile
>@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yubikey-manager>=0.7.0:security/py-yubikey-m
> 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
>diff --git a/sysutils/UEFITool/Makefile b/sysutils/UEFITool/Makefile
>index 41f2aaa96802..87ec27444637 100644
>--- a/sysutils/UEFITool/Makefile
>+++ b/sysutils/UEFITool/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/../LICENSE.md
> 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
>diff --git a/sysutils/accounts-qml-module/Makefile b/sysutils/accounts-qml-module/Makefile
>index f1fc416706d5..251bebe61bc6 100644
>--- a/sysutils/accounts-qml-module/Makefile
>+++ b/sysutils/accounts-qml-module/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt5 \
> 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
>diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
>index 481cd9b9aa1c..c3a968fff5f6 100644
>--- a/sysutils/android-file-transfer/Makefile
>+++ b/sysutils/android-file-transfer/Makefile
>@@ -38,7 +38,7 @@ PYTHON_CMAKE_BOOL=	BUILD_PYTHON
> 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 \
>diff --git a/sysutils/angrysearch/Makefile b/sysutils/angrysearch/Makefile
>index 917f06f3d2e8..378828abf971 100644
>--- a/sysutils/angrysearch/Makefile
>+++ b/sysutils/angrysearch/Makefile
>@@ -18,7 +18,7 @@ GH_PROJECT=	ANGRYsearch
> 
> 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}, \
>diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
>index 264a5c916ef3..623b51af0fd8 100644
>--- a/sysutils/baloo-widgets/Makefile
>+++ b/sysutils/baloo-widgets/Makefile
>@@ -13,9 +13,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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_LDCONFIG=	yes
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile
>index 1d0f3a9b7d04..52275af4858a 100644
>--- a/sysutils/bareos-traymonitor/Makefile
>+++ b/sysutils/bareos-traymonitor/Makefile
>@@ -9,7 +9,7 @@ LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
> 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
>+USE_QT=		buildtools:build qmake:build uitools:build gui core
> WITH_BAT=	yes
> 
> PLIST=		${.CURDIR}/pkg-plist
>diff --git a/sysutils/bareos18-traymonitor/Makefile b/sysutils/bareos18-traymonitor/Makefile
>index 73ac06d95ca9..5d5cc41e8bd1 100644
>--- a/sysutils/bareos18-traymonitor/Makefile
>+++ b/sysutils/bareos18-traymonitor/Makefile
>@@ -10,7 +10,7 @@ LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
> CONFLICTS=	bacula*-bat bareos-traymonitor
> 
> USES=		pkgconfig gettext-runtime desktop-file-utils qt:5
>-USE_QT=		buildtools_build qmake_build uitools_build gui core
>+USE_QT=		buildtools:build qmake:build uitools:build gui core
> WITH_BAT=	yes
> 
> PLIST=		${.CURDIR}/pkg-plist
>diff --git a/sysutils/bareos19-traymonitor/Makefile b/sysutils/bareos19-traymonitor/Makefile
>index ce861d3ba5f8..93caa8e41921 100644
>--- a/sysutils/bareos19-traymonitor/Makefile
>+++ b/sysutils/bareos19-traymonitor/Makefile
>@@ -9,7 +9,7 @@ LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
> 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
>+USE_QT=		buildtools:build qmake:build uitools:build gui core
> WITH_BAT=	yes
> 
> PLIST=		${.CURDIR}/pkg-plist
>diff --git a/sysutils/bareos20-traymonitor/Makefile b/sysutils/bareos20-traymonitor/Makefile
>index ff5270b3176d..00a257307214 100644
>--- a/sysutils/bareos20-traymonitor/Makefile
>+++ b/sysutils/bareos20-traymonitor/Makefile
>@@ -9,7 +9,7 @@ LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
> 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
>+USE_QT=		buildtools:build qmake:build uitools:build gui core
> WITH_BAT=	yes
> 
> PLIST=		${.CURDIR}/pkg-plist
>diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile
>index c1fff1d739df..86ec6acd3ef8 100644
>--- a/sysutils/barrier/Makefile
>+++ b/sysutils/barrier/Makefile
>@@ -33,7 +33,7 @@ GUI_DESC=	Build configuration utility (requires Qt 5)
> 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:
>diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile
>index 2e8796d1b284..702c075c3b1d 100644
>--- a/sysutils/bsdisks/Makefile
>+++ b/sysutils/bsdisks/Makefile
>@@ -9,7 +9,7 @@ LICENSE=	BSD3CLAUSE
> 
> 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
>diff --git a/sysutils/calamares/Makefile b/sysutils/calamares/Makefile
>index 8059b57ac23f..b7a450d2152f 100644
>--- a/sysutils/calamares/Makefile
>+++ b/sysutils/calamares/Makefile
>@@ -14,10 +14,10 @@ LIB_DEPENDS=	libicui18n.so:devel/icu \
> 
> 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
> 		
>diff --git a/sysutils/daggy/Makefile b/sysutils/daggy/Makefile
>index 0e47623a0a5f..8e72101488dd 100644
>--- a/sysutils/daggy/Makefile
>+++ b/sysutils/daggy/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libbotan-2.so:security/botan2 \
> USES=		compiler:c++17-lang gl localbase:ldflags pkgconfig cmake qt:5
> USE_GITHUB=	yes
> GH_ACCOUNT=	synacker
>-USE_QT=		core gui network buildtools_build qmake_build
>+USE_QT=		core gui network buildtools:build qmake:build
> USE_GL=		gl
> USE_LDCONFIG=	yes
> 
>diff --git a/sysutils/dsbbatmon/Makefile b/sysutils/dsbbatmon/Makefile
>index 128c3a5c95b5..5df85d4f11cd 100644
>--- a/sysutils/dsbbatmon/Makefile
>+++ b/sysutils/dsbbatmon/Makefile
>@@ -13,6 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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>
>diff --git a/sysutils/dsblogoutmgr/Makefile b/sysutils/dsblogoutmgr/Makefile
>index b0c453ba4495..8b4011d23f39 100644
>--- a/sysutils/dsblogoutmgr/Makefile
>+++ b/sysutils/dsblogoutmgr/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
> 
>diff --git a/sysutils/dsbmc/Makefile b/sysutils/dsbmc/Makefile
>index a016778ce9c8..9c18981c5fb8 100644
>--- a/sysutils/dsbmc/Makefile
>+++ b/sysutils/dsbmc/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	dsbmd>=0.3:sysutils/dsbmd
> 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
>diff --git a/sysutils/dsbsu/Makefile b/sysutils/dsbsu/Makefile
>index 3d82efc50706..45faebd8025e 100644
>--- a/sysutils/dsbsu/Makefile
>+++ b/sysutils/dsbsu/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
>diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
>index b15cc045220f..5316853a4a95 100644
>--- a/sysutils/filelight/Makefile
>+++ b/sysutils/filelight/Makefile
>@@ -13,9 +13,9 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gettext \
> USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		i18n jobwidgets kdeclarative kio parts service solid sonnet textwidgets \
> 		widgetsaddons windowsystem xmlgui \
>-		doctools_build ecm_build
>+		doctools:build ecm:build
> USE_QT=		concurrent core dbus gui network quickcontrols2 script svg widgets xml \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/sysutils/glogg/Makefile b/sysutils/glogg/Makefile
>index a8e7c52f2345..6345f41b7aee 100644
>--- a/sysutils/glogg/Makefile
>+++ b/sysutils/glogg/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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 \
>diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
>index 5bc85d2ab952..2b3df777382f 100644
>--- a/sysutils/k3b/Makefile
>+++ b/sysutils/k3b/Makefile
>@@ -26,9 +26,9 @@ USE_KDE=	archive attica auth bookmarks codecs completion config \
> 		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
> 
> # The ffmpeg-plugin needs patching
> CMAKE_ARGS=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=FALSE
>diff --git a/sysutils/k4dirstat/Makefile b/sysutils/k4dirstat/Makefile
>index 57c6f20c7778..58d43f1061d2 100644
>--- a/sysutils/k4dirstat/Makefile
>+++ b/sysutils/k4dirstat/Makefile
>@@ -18,7 +18,7 @@ CPE_VENDOR=	kdirstat_project
> 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 \
>diff --git a/sysutils/kbackup/Makefile b/sysutils/kbackup/Makefile
>index badb0311a97d..2fd894975e1c 100644
>--- a/sysutils/kbackup/Makefile
>+++ b/sysutils/kbackup/Makefile
>@@ -10,9 +10,9 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/sysutils/kcron/Makefile b/sysutils/kcron/Makefile
>index 4573b5a01db3..bb79d4aa225c 100644
>--- a/sysutils/kcron/Makefile
>+++ b/sysutils/kcron/Makefile
>@@ -12,9 +12,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/sysutils/kdebugsettings/Makefile b/sysutils/kdebugsettings/Makefile
>index 64498609101f..5d3f5cd086bc 100644
>--- a/sysutils/kdebugsettings/Makefile
>+++ b/sysutils/kdebugsettings/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KDE application to enable/disable qCDebug
> 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
> 
>diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
>index 9a17e8abd9c9..4d281366f077 100644
>--- a/sysutils/kdf/Makefile
>+++ b/sysutils/kdf/Makefile
>@@ -10,7 +10,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons doctools \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/sysutils/kdialog/Makefile b/sysutils/kdialog/Makefile
>index 3a6e2e6a43f0..0cc62042f7f2 100644
>--- a/sysutils/kdialog/Makefile
>+++ b/sysutils/kdialog/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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>
>diff --git a/sysutils/kf5-baloo/Makefile b/sysutils/kf5-baloo/Makefile
>index 88c2fca21a22..17a6e075a315 100644
>--- a/sysutils/kf5-baloo/Makefile
>+++ b/sysutils/kf5-baloo/Makefile
>@@ -13,6 +13,6 @@ USE_KDE=	config coreaddons crash dbusaddons \
> 		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>
>diff --git a/sysutils/kf5-kwallet/Makefile b/sysutils/kf5-kwallet/Makefile
>index a082fdca6241..eee8ff4da7cb 100644
>--- a/sysutils/kf5-kwallet/Makefile
>+++ b/sysutils/kf5-kwallet/Makefile
>@@ -19,9 +19,9 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qca qt:5 tar:xz
> 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
> 
> OPTIONS_DEFINE=		PINENTRY
> OPTIONS_DEFAULT=	PINENTRY
>diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
>index f5c7849737b8..a72f63bfe961 100644
>--- a/sysutils/kfloppy/Makefile
>+++ b/sysutils/kfloppy/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 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
> 
>diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
>index 9316e0845d6f..76f8c44460a7 100644
>--- a/sysutils/khelpcenter/Makefile
>+++ b/sysutils/khelpcenter/Makefile
>@@ -15,13 +15,13 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
> 		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
> SHEBANG_FILES=	searchhandlers/khc_mansearch.pl
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/sysutils/kio-fuse/Makefile b/sysutils/kio-fuse/Makefile
>index b94252fc7397..0432003f6e3d 100644
>--- a/sysutils/kio-fuse/Makefile
>+++ b/sysutils/kio-fuse/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
> 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
>diff --git a/sysutils/kpmcore/Makefile b/sysutils/kpmcore/Makefile
>index b37078167d25..b22d7111c054 100644
>--- a/sysutils/kpmcore/Makefile
>+++ b/sysutils/kpmcore/Makefile
>@@ -9,9 +9,9 @@ LIB_DEPENDS=	libpolkit-qt5-core-1.so:sysutils/polkit-qt
> 
> 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>
>diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
>index dd94d2d5254e..ab8d1e8ce41c 100644
>--- a/sysutils/krename/Makefile
>+++ b/sysutils/krename/Makefile
>@@ -19,6 +19,6 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
>index e802f5b2ac40..1206802a17c2 100644
>--- a/sysutils/kshutdown/Makefile
>+++ b/sysutils/kshutdown/Makefile
>@@ -15,7 +15,7 @@ USE_KDE=	auth codecs config configwidgets coreaddons crash \
> 		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}
> 
>diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile
>index 8502d1c00cdb..108db01810ad 100644
>--- a/sysutils/ksystemlog/Makefile
>+++ b/sysutils/ksystemlog/Makefile
>@@ -10,9 +10,9 @@ USES=		cmake compiler:c++11-lang gettext kde:5 pkgconfig \
> 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/sysutils/libsysstat/Makefile b/sysutils/libsysstat/Makefile
>index 16b71fe6dad4..a250e9b42a5b 100644
>--- a/sysutils/libsysstat/Makefile
>+++ b/sysutils/libsysstat/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	LGPL21+
> 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
> 
>diff --git a/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
>index fefad09665b3..1e8681ebf7d0 100644
>--- a/sysutils/luckybackup/Makefile
>+++ b/sysutils/luckybackup/Makefile
>@@ -16,7 +16,7 @@ RUN_DEPENDS=	rsync:net/rsync \
> 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 ||' \
>diff --git a/sysutils/lxqt-admin/Makefile b/sysutils/lxqt-admin/Makefile
>index f1f5e15f61f8..2a59a08bfe5e 100644
>--- a/sysutils/lxqt-admin/Makefile
>+++ b/sysutils/lxqt-admin/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	LGPL21+
> 
> 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
>diff --git a/sysutils/lxqt-config/Makefile b/sysutils/lxqt-config/Makefile
>index f28d5d97eb23..bda0de9d0c4b 100644
>--- a/sysutils/lxqt-config/Makefile
>+++ b/sysutils/lxqt-config/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libudev.so:devel/libudev-devd
> 
> 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
>diff --git a/sysutils/lxqt-policykit/Makefile b/sysutils/lxqt-policykit/Makefile
>index ff82c0eb51e6..31eb491fe088 100644
>--- a/sysutils/lxqt-policykit/Makefile
>+++ b/sysutils/lxqt-policykit/Makefile
>@@ -13,7 +13,7 @@ LIB_DEPENDS=	libpolkit-qt5-agent-1.so:sysutils/polkit-qt \
> 
> 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
>diff --git a/sysutils/lxqt-powermanagement/Makefile b/sysutils/lxqt-powermanagement/Makefile
>index 52247d25b6e5..fe09c1b71185 100644
>--- a/sysutils/lxqt-powermanagement/Makefile
>+++ b/sysutils/lxqt-powermanagement/Makefile
>@@ -13,7 +13,7 @@ RUN_DEPENDS=	upower:sysutils/upower
> 
> 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
>diff --git a/sysutils/lxqt-qtplugin/Makefile b/sysutils/lxqt-qtplugin/Makefile
>index 61402bfa827a..716b71fdb6a2 100644
>--- a/sysutils/lxqt-qtplugin/Makefile
>+++ b/sysutils/lxqt-qtplugin/Makefile
>@@ -17,7 +17,7 @@ USES=	cmake compiler:c++14-lang gnome kde:5 lxqt pkgconfig tar:xz qt:5 \
> 
> 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
>diff --git a/sysutils/plasma-pass/Makefile b/sysutils/plasma-pass/Makefile
>index fe984ff77933..7841e5ed7939 100644
>--- a/sysutils/plasma-pass/Makefile
>+++ b/sysutils/plasma-pass/Makefile
>@@ -15,8 +15,8 @@ RUN_DEPENDS=	pass:sysutils/password-store
> 
> 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=		core dbus declarative gui network \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/plasma5-discover/Makefile b/sysutils/plasma5-discover/Makefile
>index 92e151885819..d7f7ac21eddc 100644
>--- a/sysutils/plasma5-discover/Makefile
>+++ b/sysutils/plasma5-discover/Makefile
>@@ -16,10 +16,10 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
> 		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
> 
> CPE_VENDOR=	kde
> 
>diff --git a/sysutils/plasma5-drkonqi/Makefile b/sysutils/plasma5-drkonqi/Makefile
>index e36fdb21eb86..b0fa9bcf2c78 100644
>--- a/sysutils/plasma5-drkonqi/Makefile
>+++ b/sysutils/plasma5-drkonqi/Makefile
>@@ -10,8 +10,8 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/plasma5-kde-cli-tools/Makefile b/sysutils/plasma5-kde-cli-tools/Makefile
>index 695fd5a96bff..b6c3d2bd8dec 100644
>--- a/sysutils/plasma5-kde-cli-tools/Makefile
>+++ b/sysutils/plasma5-kde-cli-tools/Makefile
>@@ -12,10 +12,10 @@ USE_KDE=	activities auth bookmarks codecs completion config \
> 		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
> 
>diff --git a/sysutils/plasma5-kinfocenter/Makefile b/sysutils/plasma5-kinfocenter/Makefile
>index a15bd32b06f2..ce1993a51952 100644
>--- a/sysutils/plasma5-kinfocenter/Makefile
>+++ b/sysutils/plasma5-kinfocenter/Makefile
>@@ -19,11 +19,11 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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...
>diff --git a/sysutils/plasma5-kmenuedit/Makefile b/sysutils/plasma5-kmenuedit/Makefile
>index ce1cbfbe1b4d..c50a5c326bcb 100644
>--- a/sysutils/plasma5-kmenuedit/Makefile
>+++ b/sysutils/plasma5-kmenuedit/Makefile
>@@ -11,8 +11,8 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/plasma5-ksysguard/Makefile b/sysutils/plasma5-ksysguard/Makefile
>index aa26b72ce885..7cb784d1f69a 100644
>--- a/sysutils/plasma5-ksysguard/Makefile
>+++ b/sysutils/plasma5-ksysguard/Makefile
>@@ -15,9 +15,9 @@ USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
> 		dbusaddons emoticons i18n iconthemes init itemmodels itemviews \
> 		jobwidgets kio libksysguard newstuff notifications service \
> 		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
> 
> OPTIONS_DEFINE=		INOTIFY
> OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
>diff --git a/sysutils/plasma5-ksystemstats/Makefile b/sysutils/plasma5-ksystemstats/Makefile
>index a2c141081b4e..5d0607e3de13 100644
>--- a/sysutils/plasma5-ksystemstats/Makefile
>+++ b/sysutils/plasma5-ksystemstats/Makefile
>@@ -11,6 +11,6 @@ USES=		cmake compiler:c++17-lang kde:5 qt:5 tar:xz
> 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>
>diff --git a/sysutils/plasma5-libksysguard/Makefile b/sysutils/plasma5-libksysguard/Makefile
>index 76a936b3d7e2..ae90a5cb9ac4 100644
>--- a/sysutils/plasma5-libksysguard/Makefile
>+++ b/sysutils/plasma5-libksysguard/Makefile
>@@ -12,7 +12,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		windowsystem
> USE_QT=		concurrent core dbus declarative gui network script webkit \
> 		widgets x11extras xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> OPTIONS_DEFINE=	WEBENGINE
> 
>diff --git a/sysutils/plasma5-plasma-disks/Makefile b/sysutils/plasma5-plasma-disks/Makefile
>index 033d8e1749f8..6837c8e5e172 100644
>--- a/sysutils/plasma5-plasma-disks/Makefile
>+++ b/sysutils/plasma5-plasma-disks/Makefile
>@@ -29,7 +29,7 @@ USE_KDE=	activities auth codecs config configwidgets coreaddons \
> 		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
> 
> post-patch:
> 	${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" \
>diff --git a/sysutils/plasma5-plasma-systemmonitor/Makefile b/sysutils/plasma5-plasma-systemmonitor/Makefile
>index cef8199ab022..ff4a91957c55 100644
>--- a/sysutils/plasma5-plasma-systemmonitor/Makefile
>+++ b/sysutils/plasma5-plasma-systemmonitor/Makefile
>@@ -13,6 +13,6 @@ USE_KDE=	attica auth codecs config configwidgets coreaddons dbusaddons \
> 		windowsystem xmlgui
> USE_QT=		concurrent core dbus declarative gui network quickcontrols2 \
> 		widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/plasma5-polkit-kde-agent-1/Makefile b/sysutils/plasma5-polkit-kde-agent-1/Makefile
>index 07d7ed753f73..a5807daa5f5d 100644
>--- a/sysutils/plasma5-polkit-kde-agent-1/Makefile
>+++ b/sysutils/plasma5-polkit-kde-agent-1/Makefile
>@@ -11,6 +11,6 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/plasma5-powerdevil/Makefile b/sysutils/plasma5-powerdevil/Makefile
>index 76568a5e31ea..107e6d3415b7 100644
>--- a/sysutils/plasma5-powerdevil/Makefile
>+++ b/sysutils/plasma5-powerdevil/Makefile
>@@ -16,10 +16,10 @@ USE_KDE=	activities auth bookmarks codecs completion config \
> 		itemviews jobwidgets kio 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=	xcb
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/plasma5-systemsettings/Makefile b/sysutils/plasma5-systemsettings/Makefile
>index 5cca422307e9..8fd4f58e9c5a 100644
>--- a/sysutils/plasma5-systemsettings/Makefile
>+++ b/sysutils/plasma5-systemsettings/Makefile
>@@ -12,8 +12,8 @@ USE_KDE=	activities activities-stats auth codecs completion config \
> 		kdeclarative khtml kio kirigami2 package parts \
> 		plasma-workspace service 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
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
>index 75bcad0cf968..2e0501fb6ef5 100644
>--- a/sysutils/polkit-qt/Makefile
>+++ b/sysutils/polkit-qt/Makefile
>@@ -12,7 +12,7 @@ LIB_DEPENDS=	libpolkit-agent-1.so:sysutils/polkit
> 
> 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
> 
>diff --git a/sysutils/qdirstat/Makefile b/sysutils/qdirstat/Makefile
>index 77fc8b02eb15..c740e97af104 100644
>--- a/sysutils/qdirstat/Makefile
>+++ b/sysutils/qdirstat/Makefile
>@@ -10,7 +10,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> 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
> 
>diff --git a/sysutils/qsudo/Makefile b/sysutils/qsudo/Makefile
>index dd1c80f7d401..9d76a245b90a 100644
>--- a/sysutils/qsudo/Makefile
>+++ b/sysutils/qsudo/Makefile
>@@ -15,7 +15,7 @@ USES=		compiler:c++11-lang qmake qt:5
> 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
>diff --git a/sysutils/qtpass/Makefile b/sysutils/qtpass/Makefile
>index 14073ccc8b35..37d1a0a0861b 100644
>--- a/sysutils/qtpass/Makefile
>+++ b/sysutils/qtpass/Makefile
>@@ -17,7 +17,7 @@ USE_GITHUB=	yes
> 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.
>diff --git a/sysutils/signon-kwallet-extension/Makefile b/sysutils/signon-kwallet-extension/Makefile
>index cb11630273d7..656ea8b1439a 100644
>--- a/sysutils/signon-kwallet-extension/Makefile
>+++ b/sysutils/signon-kwallet-extension/Makefile
>@@ -9,9 +9,9 @@ LIB_DEPENDS=	libsignon-qt5.so:sysutils/signon-qt5
> 
> 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
>diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile
>index cfc7ecd1d476..c1cc4335821c 100644
>--- a/sysutils/signon-plugin-oauth2/Makefile
>+++ b/sysutils/signon-plugin-oauth2/Makefile
>@@ -11,7 +11,7 @@ LIB_DEPENDS=	libsignon-qt5.so:sysutils/signon-qt5
> 
> 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}
>diff --git a/sysutils/signon-qt5/Makefile b/sysutils/signon-qt5/Makefile
>index 6941fc17793c..3513779dbb00 100644
>--- a/sysutils/signon-qt5/Makefile
>+++ b/sysutils/signon-qt5/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> USES=		compiler:c++11-lang gettext pathfix pkgconfig python qmake \
> 		qt:5 tar:bz2
> USE_QT=		core dbus gui network sql testlib xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> # gitlab variables
> USE_GITLAB=	yes
>diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile
>index 431d821f3f1e..222c0663e881 100644
>--- a/sysutils/signon-ui/Makefile
>+++ b/sysutils/signon-ui/Makefile
>@@ -20,7 +20,7 @@ USES=		compiler:c++11-lang gettext-runtime gl gnome pkgconfig python \
> 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
>diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
>index 68183c12dba3..2b0d1ae20c51 100644
>--- a/sysutils/sweeper/Makefile
>+++ b/sysutils/sweeper/Makefile
>@@ -10,7 +10,7 @@ USE_KDE=	activities-stats auth bookmarks codecs config configwidgets \
> 		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
> 
>diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
>index be0b48277ad5..dde026e7aaf3 100644
>--- a/sysutils/synergy/Makefile
>+++ b/sysutils/synergy/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 
> 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
> 
>diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile
>index 264b9168c930..dd62c9ccd3df 100644
>--- a/sysutils/tarsnap-gui/Makefile
>+++ b/sysutils/tarsnap-gui/Makefile
>@@ -11,7 +11,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/sysutils/twmn/Makefile b/sysutils/twmn/Makefile
>index df1f89cbf6da..cfb2ef747b42 100644
>--- a/sysutils/twmn/Makefile
>+++ b/sysutils/twmn/Makefile
>@@ -15,7 +15,7 @@ USES=		compiler:c++11-lang qmake qt:5
> 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
>diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile
>index 5367f31bd306..07422b432716 100644
>--- a/sysutils/unetbootin/Makefile
>+++ b/sysutils/unetbootin/Makefile
>@@ -15,7 +15,7 @@ RUN_DEPENDS=	7zz:archivers/7-zip \
> 		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}\\\\\\\"
> 
>diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile
>index c24ff45743cd..815a33b5e148 100644
>--- a/textproc/dikt/Makefile
>+++ b/textproc/dikt/Makefile
>@@ -15,7 +15,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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 \
>diff --git a/textproc/fcitx-qt5/Makefile b/textproc/fcitx-qt5/Makefile
>index 409bca52ee3d..2e38808b6d6e 100644
>--- a/textproc/fcitx-qt5/Makefile
>+++ b/textproc/fcitx-qt5/Makefile
>@@ -15,7 +15,7 @@ USES=		compiler:c++11-lib cmake gettext kde:5 pkgconfig qt:5
> 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>
>diff --git a/textproc/fcitx5-configtool/Makefile b/textproc/fcitx5-configtool/Makefile
>index ebc709b83497..0f51b29e7aa3 100644
>--- a/textproc/fcitx5-configtool/Makefile
>+++ b/textproc/fcitx5-configtool/Makefile
>@@ -26,7 +26,7 @@ GH_ACCOUNT=	fcitx
> 
> 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
> 
>diff --git a/textproc/fcitx5-qt/Makefile b/textproc/fcitx5-qt/Makefile
>index 876d852b7424..b15dd817f2f7 100644
>--- a/textproc/fcitx5-qt/Makefile
>+++ b/textproc/fcitx5-qt/Makefile
>@@ -23,7 +23,7 @@ PLIST_SUB=	VER=${PORTVERSION}
> 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
> 
>diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
>index 5773718afd2e..c80c624cffd5 100644
>--- a/textproc/goldendict/Makefile
>+++ b/textproc/goldendict/Makefile
>@@ -20,7 +20,7 @@ USES=		compiler:c++11-lang gnome iconv:wchar_t pkgconfig \
> 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"
>diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
>index a14f42f6eb8a..9bb3222a5826 100644
>--- a/textproc/highlight/Makefile
>+++ b/textproc/highlight/Makefile
>@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	DOCS GUI
> 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
>diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
>index 8ab4ea6d3543..badc804962ab 100644
>--- a/textproc/kdiff3/Makefile
>+++ b/textproc/kdiff3/Makefile
>@@ -17,9 +17,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> DOCSDIR_REL=	share/doc/HTML
>diff --git a/textproc/kf5-kcodecs/Makefile b/textproc/kf5-kcodecs/Makefile
>index ab93a8f558e2..37f9469383e0 100644
>--- a/textproc/kf5-kcodecs/Makefile
>+++ b/textproc/kf5-kcodecs/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	KF5 library for string manipulation
> 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>
>diff --git a/textproc/kf5-sonnet/Makefile b/textproc/kf5-sonnet/Makefile
>index 4a9fe60cec73..aa85134cd5b9 100644
>--- a/textproc/kf5-sonnet/Makefile
>+++ b/textproc/kf5-sonnet/Makefile
>@@ -9,9 +9,9 @@ LIB_DEPENDS=	libaspell.so:textproc/aspell \
> 		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 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
>diff --git a/textproc/kf5-syntax-highlighting/Makefile b/textproc/kf5-syntax-highlighting/Makefile
>index e2192c98f67e..23a306fa6ad8 100644
>--- a/textproc/kf5-syntax-highlighting/Makefile
>+++ b/textproc/kf5-syntax-highlighting/Makefile
>@@ -6,9 +6,9 @@ MAINTAINER=	kde@FreeBSD.org
> 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
> 
>diff --git a/textproc/kompare/Makefile b/textproc/kompare/Makefile
>index 653a33e12a16..aa049c855c53 100644
>--- a/textproc/kompare/Makefile
>+++ b/textproc/kompare/Makefile
>@@ -12,9 +12,9 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile
>index 8a09a7db09ec..16a8825e09d5 100644
>--- a/textproc/kreport/Makefile
>+++ b/textproc/kreport/Makefile
>@@ -14,7 +14,7 @@ USES=			cmake compiler:c++11-lang gettext kde:5 \
> 			python:3.5+ qt:5 tar:xz
> USE_KDE=		config coreaddons ecm marble widgetsaddons
> USE_QT=			core declarative gui network webkit widgets xml \
>-			buildtools_build printsupport qmake_build
>+			buildtools:build printsupport qmake:build
> 
> CONFLICTS_INSTALL=	calligra-2*
> 
>diff --git a/textproc/libkomparediff2/Makefile b/textproc/libkomparediff2/Makefile
>index e1cd62dda01d..51a8fb557ee6 100644
>--- a/textproc/libkomparediff2/Makefile
>+++ b/textproc/libkomparediff2/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Library to compare files and strings
> 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
>diff --git a/textproc/markdownpart/Makefile b/textproc/markdownpart/Makefile
>index 52fcc3df2d57..43dd7dea1d69 100644
>--- a/textproc/markdownpart/Makefile
>+++ b/textproc/markdownpart/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 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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/textproc/pageedit/Makefile b/textproc/pageedit/Makefile
>index 02af91b5fad6..bacb124c3484 100644
>--- a/textproc/pageedit/Makefile
>+++ b/textproc/pageedit/Makefile
>@@ -16,6 +16,6 @@ GH_PROJECT=	PageEdit
> 
> 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>
>diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
>index 8f19041dd37f..907508e8a56b 100644
>--- a/textproc/qstardict/Makefile
>+++ b/textproc/qstardict/Makefile
>@@ -14,7 +14,7 @@ USES=		compiler:c++11-lang gl gnome pkgconfig qmake qt:5 tar:bzip2 xorg
> 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
>diff --git a/textproc/qt5-xml/Makefile b/textproc/qt5-xml/Makefile
>index 4af46d33a536..60db446925db 100644
>--- a/textproc/qt5-xml/Makefile
>+++ b/textproc/qt5-xml/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt SAX and DOM implementations
> 
> 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
> 
>diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile
>index 0fecf854476b..deff21e0c5ff 100644
>--- a/textproc/qt5-xmlpatterns/Makefile
>+++ b/textproc/qt5-xmlpatterns/Makefile
>@@ -7,7 +7,7 @@ MAINTAINER=	kde@FreeBSD.org
> 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
> 
>diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile
>index 4df6b8b831eb..449ee9f09f98 100644
>--- a/textproc/retext/Makefile
>+++ b/textproc/retext/Makefile
>@@ -21,8 +21,8 @@ USE_GITHUB=	yes
> 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}
> 
>diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
>index d2a76f0f46a6..7ab9dbef9165 100644
>--- a/textproc/sigil/Makefile
>+++ b/textproc/sigil/Makefile
>@@ -25,8 +25,8 @@ USE_LDCONFIG=	${PREFIX}/lib/sigil
> 
> 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
>diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile
>index f6c9ef2145d6..5f90d7e11dff 100644
>--- a/textproc/uim-qt5/Makefile
>+++ b/textproc/uim-qt5/Makefile
>@@ -8,7 +8,7 @@ LIB_DEPENDS=	libuim.so:textproc/uim
> 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}
>diff --git a/www/choqok/Makefile b/www/choqok/Makefile
>index 232c2406cd7d..418a8dee665a 100644
>--- a/www/choqok/Makefile
>+++ b/www/choqok/Makefile
>@@ -21,9 +21,9 @@ USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
> 		itemviews jobwidgets kcmutils kdewebkit kio notifications \
> 		notifyconfig parts purpose service solid sonnet textwidgets \
> 		wallet widgetsaddons 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_LDCONFIG=	yes
> 
>diff --git a/www/cutelyst/Makefile b/www/cutelyst/Makefile
>index a3e62d538a0f..cccdab9583a7 100644
>--- a/www/cutelyst/Makefile
>+++ b/www/cutelyst/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 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,
>diff --git a/www/dooble/Makefile b/www/dooble/Makefile
>index 6a247f814c78..b200e5ac648c 100644
>--- a/www/dooble/Makefile
>+++ b/www/dooble/Makefile
>@@ -15,7 +15,7 @@ USE_GITHUB=	yes
> 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
>diff --git a/www/falkon/Makefile b/www/falkon/Makefile
>index edc07ef3eaff..e4446c9794ff 100644
>--- a/www/falkon/Makefile
>+++ b/www/falkon/Makefile
>@@ -10,10 +10,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> 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=	xcb
> 
> USE_LDCONFIG=	yes
>diff --git a/www/kdsoap/Makefile b/www/kdsoap/Makefile
>index ae5ab577eb45..971af86b5d40 100644
>--- a/www/kdsoap/Makefile
>+++ b/www/kdsoap/Makefile
>@@ -18,7 +18,7 @@ LICENSE_FILE_AGPLv3=	${WRKSRC}/LICENSE.AGPL3-modified.txt
> 
> 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
>diff --git a/www/kf5-kdewebkit/Makefile b/www/kf5-kdewebkit/Makefile
>index 002beeae6298..32e84426f8d3 100644
>--- a/www/kf5-kdewebkit/Makefile
>+++ b/www/kf5-kdewebkit/Makefile
>@@ -9,8 +9,8 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		i18n jobwidgets kio parts service sonnet textwidgets \
> 		wallet widgetsaddons xmlgui \
>-		ecm_build
>+		ecm:build
> USE_QT=		concurrent core dbus gui network webkit widgets xml \
>-		buildtools_build qmake_build 
>+		buildtools:build qmake:build 
> 
> .include <bsd.port.mk>
>diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile
>index 4edff557c7fc..97466fd2a579 100644
>--- a/www/kf5-khtml/Makefile
>+++ b/www/kf5-khtml/Makefile
>@@ -14,10 +14,10 @@ USE_KDE=	archive auth bookmarks codecs completion config \
> 		configwidgets coreaddons globalaccel i18n iconthemes \
> 		jobwidgets js kio notifications parts service 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>
>diff --git a/www/kf5-kjs/Makefile b/www/kf5-kjs/Makefile
>index beda6f826146..e6012cff7e69 100644
>--- a/www/kf5-kjs/Makefile
>+++ b/www/kf5-kjs/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	KF5 library providing an ECMAScript interpreter
> 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>
>diff --git a/www/kf5-kjsembed/Makefile b/www/kf5-kjsembed/Makefile
>index c8b36023ce12..dd0f052d70fc 100644
>--- a/www/kf5-kjsembed/Makefile
>+++ b/www/kf5-kjsembed/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 library for binding JavaScript objects to QObjects
> 
> USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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>
>diff --git a/www/kristall/Makefile b/www/kristall/Makefile
>index 74133072af73..6cd3a3bc428d 100644
>--- a/www/kristall/Makefile
>+++ b/www/kristall/Makefile
>@@ -14,8 +14,8 @@ LIB_DEPENDS=	libcmark.so:textproc/cmark \
> 
> 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
>diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
>index 9f7316f46880..27ca601d2e01 100644
>--- a/www/onlyoffice-documentserver/Makefile
>+++ b/www/onlyoffice-documentserver/Makefile
>@@ -41,7 +41,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLA
> 
> 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
>diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
>index 29277ccd7e4a..7cd2737c57ff 100644
>--- a/www/otter-browser/Makefile
>+++ b/www/otter-browser/Makefile
>@@ -23,7 +23,7 @@ LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
> 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
>diff --git a/www/plasma5-plasma-browser-integration/Makefile b/www/plasma5-plasma-browser-integration/Makefile
>index 9a0bd4d119b7..d75ad0f7c492 100644
>--- a/www/plasma5-plasma-browser-integration/Makefile
>+++ b/www/plasma5-plasma-browser-integration/Makefile
>@@ -12,6 +12,6 @@ USE_KDE=	activities completion config coreaddons crash dbusaddons \
> 		plasma-framework plasma-workspace purpose runner service \
> 		widgetsaddons windowsystem
> USE_QT=		concurrent core dbus gui network widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
>index f6efaa0a4b9f..e9d6996b52fc 100644
>--- a/www/py-qt5-webengine/Makefile
>+++ b/www/py-qt5-webengine/Makefile
>@@ -15,10 +15,10 @@ LICENSE=	GPLv3
> 
> 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}
> 
>diff --git a/www/qhttpengine/Makefile b/www/qhttpengine/Makefile
>index 738024ea7763..fc4b70fa6df1 100644
>--- a/www/qhttpengine/Makefile
>+++ b/www/qhttpengine/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 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>
>diff --git a/www/qt5-webchannel/Makefile b/www/qt5-webchannel/Makefile
>index 583bc556f052..a9fe15e99133 100644
>--- a/www/qt5-webchannel/Makefile
>+++ b/www/qt5-webchannel/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt 5 library for integration of C++/QML with HTML/js clients
> 
> 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.
>diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
>index 9a96210e4808..3291d8c86145 100644
>--- a/www/qt5-webengine/Makefile
>+++ b/www/qt5-webengine/Makefile
>@@ -77,7 +77,7 @@ USE_GL=		gl
> 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
> 
>diff --git a/www/qt5-webglplugin/Makefile b/www/qt5-webglplugin/Makefile
>index 69e9a96afaf3..bd77d4405d22 100644
>--- a/www/qt5-webglplugin/Makefile
>+++ b/www/qt5-webglplugin/Makefile
>@@ -13,6 +13,6 @@ USES=		compiler:c++11-lang gl gnome qmake:norecursive qt-dist:5
> USE_GL=		gl
> USE_GNOME=	glib20
> USE_QT=		core dbus declarative gui network webchannel websockets \
>-		buildtools_build
>+		buildtools:build
> 
> .include <bsd.port.mk>
>diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
>index 5828f7a3961d..7b1874c03c50 100644
>--- a/www/qt5-webkit/Makefile
>+++ b/www/qt5-webkit/Makefile
>@@ -26,7 +26,7 @@ USE_GNOME=		glib20 libxml2 libxslt
> 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
> 
>diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile
>index fe16e7d19d6f..b7f117a7dfa9 100644
>--- a/www/qt5-websockets-qml/Makefile
>+++ b/www/qt5-websockets-qml/Makefile
>@@ -7,6 +7,6 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/www/qt5-websockets/Makefile b/www/qt5-websockets/Makefile
>index 56ca500451ca..8021b81ca0d2 100644
>--- a/www/qt5-websockets/Makefile
>+++ b/www/qt5-websockets/Makefile
>@@ -8,6 +8,6 @@ COMMENT=	Qt implementation of WebSocket protocol
> 
> 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>
>diff --git a/www/qt5-webview/Makefile b/www/qt5-webview/Makefile
>index 84ad1fe8a297..c2019721d30d 100644
>--- a/www/qt5-webview/Makefile
>+++ b/www/qt5-webview/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Qt component for displaying web content
> 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>
> 
>diff --git a/www/wt/Makefile b/www/wt/Makefile
>index 127556dfbcad..db7c90e49892 100644
>--- a/www/wt/Makefile
>+++ b/www/wt/Makefile
>@@ -114,7 +114,7 @@ POSTGRES_CMAKE_ON=	-DPOSTGRES_PREFIX:STRING=${LOCALBASE} \
> 
> 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
> 
>diff --git a/x11-clocks/kteatime/Makefile b/x11-clocks/kteatime/Makefile
>index be4b9a06a30a..b743c08aa5b3 100644
>--- a/x11-clocks/kteatime/Makefile
>+++ b/x11-clocks/kteatime/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 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
> 
>diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer/Makefile
>index 87cfdcfa7e4c..97b7c669c36e 100644
>--- a/x11-clocks/ktimer/Makefile
>+++ b/x11-clocks/ktimer/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 \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/x11-fm/arqiver/Makefile b/x11-fm/arqiver/Makefile
>index d806d747fa26..d4553135381e 100644
>--- a/x11-fm/arqiver/Makefile
>+++ b/x11-fm/arqiver/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	GPLv3
> 
> 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
> 
>diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile
>index ba2f6e2b428f..2a3924da2378 100644
>--- a/x11-fm/dolphin/Makefile
>+++ b/x11-fm/dolphin/Makefile
>@@ -20,9 +20,9 @@ USE_KDE=	activities attica auth baloo baloo-widgets bookmarks codecs \
> 		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
> 
> SHLIB_VER=	5.0.0
> PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}" \
>diff --git a/x11-fm/konqueror/Makefile b/x11-fm/konqueror/Makefile
>index 9f4230aab50c..6b2e8fab1d12 100644
>--- a/x11-fm/konqueror/Makefile
>+++ b/x11-fm/konqueror/Makefile
>@@ -14,7 +14,7 @@ USE_KDE=	activities  archive auth bookmarks codecs completion config configwidge
> 		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
>diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
>index 9cef7d43262c..0caca029c633 100644
>--- a/x11-fm/krusader2/Makefile
>+++ b/x11-fm/krusader2/Makefile
>@@ -17,6 +17,6 @@ USE_KDE=	archive auth auth bookmarks codecs completion config \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/x11-fm/pcmanfm-qt/Makefile b/x11-fm/pcmanfm-qt/Makefile
>index 7d53e2315969..fced33eaf388 100644
>--- a/x11-fm/pcmanfm-qt/Makefile
>+++ b/x11-fm/pcmanfm-qt/Makefile
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
> 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
>diff --git a/x11-fm/qtfm/Makefile b/x11-fm/qtfm/Makefile
>index 23b06a4bcd37..f803888a5cff 100644
>--- a/x11-fm/qtfm/Makefile
>+++ b/x11-fm/qtfm/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libinotify.so:devel/libinotify
> 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
>diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile
>index ff5165dff24d..ba890e1efb9e 100644
>--- a/x11-fonts/fontmatrix/Makefile
>+++ b/x11-fonts/fontmatrix/Makefile
>@@ -16,6 +16,6 @@ USES=		cmake compiler:c++11-lang qt:5
> 
> 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>
>diff --git a/x11-fonts/fontobene/Makefile b/x11-fonts/fontobene/Makefile
>index b0f1ac1a3ff3..50dd3635ee7b 100644
>--- a/x11-fonts/fontobene/Makefile
>+++ b/x11-fonts/fontobene/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
> 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
>diff --git a/x11-fonts/oxygen-fonts/Makefile b/x11-fonts/oxygen-fonts/Makefile
>index 36c6d7f48517..a0502d6b90db 100644
>--- a/x11-fonts/oxygen-fonts/Makefile
>+++ b/x11-fonts/oxygen-fonts/Makefile
>@@ -15,11 +15,11 @@ BUILD_DEPENDS=	fontforge:print/fontforge
> 
> 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
> 
>diff --git a/x11-themes/Kvantum/Makefile b/x11-themes/Kvantum/Makefile
>index b3bc02fc2076..f1229814521b 100644
>--- a/x11-themes/Kvantum/Makefile
>+++ b/x11-themes/Kvantum/Makefile
>@@ -19,7 +19,7 @@ USE_GL=		gl
> 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}
>diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile
>index f532bc925251..8847688f3914 100644
>--- a/x11-themes/adwaita-qt5/Makefile
>+++ b/x11-themes/adwaita-qt5/Makefile
>@@ -25,7 +25,7 @@ _qt_version?=	5
> _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
>diff --git a/x11-themes/kf5-breeze-icons/Makefile b/x11-themes/kf5-breeze-icons/Makefile
>index 1bb965f0a51b..1037eb872110 100644
>--- a/x11-themes/kf5-breeze-icons/Makefile
>+++ b/x11-themes/kf5-breeze-icons/Makefile
>@@ -12,8 +12,8 @@ BUILD_DEPENDS=	bash:shells/bash \
> 		${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
> 
>diff --git a/x11-themes/kf5-kemoticons/Makefile b/x11-themes/kf5-kemoticons/Makefile
>index 0bba0e34c7ab..1050734fb278 100644
>--- a/x11-themes/kf5-kemoticons/Makefile
>+++ b/x11-themes/kf5-kemoticons/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 library to convert emoticons
> 
> 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>
>diff --git a/x11-themes/kf5-kiconthemes/Makefile b/x11-themes/kf5-kiconthemes/Makefile
>index 09d1b52fb575..f421ce1cf60b 100644
>--- a/x11-themes/kf5-kiconthemes/Makefile
>+++ b/x11-themes/kf5-kiconthemes/Makefile
>@@ -8,13 +8,13 @@ COMMENT=	KF5 library for handling icons in applications
> 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>
>diff --git a/x11-themes/kf5-oxygen-icons5/Makefile b/x11-themes/kf5-oxygen-icons5/Makefile
>index 9ce25a792792..9b4a0d27bad8 100644
>--- a/x11-themes/kf5-oxygen-icons5/Makefile
>+++ b/x11-themes/kf5-oxygen-icons5/Makefile
>@@ -6,14 +6,14 @@ MAINTAINER=	kde@FreeBSD.org
> 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
> 
>diff --git a/x11-themes/kf5-qqc2-desktop-style/Makefile b/x11-themes/kf5-qqc2-desktop-style/Makefile
>index 29901cf3c3a1..27e7af5e493b 100644
>--- a/x11-themes/kf5-qqc2-desktop-style/Makefile
>+++ b/x11-themes/kf5-qqc2-desktop-style/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	Qt QuickControl2 style for KDE
> 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 gui declarative network widgets xml \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/x11-themes/lumina-themes/Makefile b/x11-themes/lumina-themes/Makefile
>index 97ea7b9b70b4..dde5511d3a3b 100644
>--- a/x11-themes/lumina-themes/Makefile
>+++ b/x11-themes/lumina-themes/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	BSD2CLAUSE CC0-1.0
> LICENSE_COMB=	multi
> 
> USES=	qmake qt:5
>-USE_QT=		qmake_build
>+USE_QT=		qmake:build
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	trueos
>diff --git a/x11-themes/plasma5-breeze-gtk/Makefile b/x11-themes/plasma5-breeze-gtk/Makefile
>index a7c4581e627f..3c75ad8c8f13 100644
>--- a/x11-themes/plasma5-breeze-gtk/Makefile
>+++ b/x11-themes/plasma5-breeze-gtk/Makefile
>@@ -16,7 +16,7 @@ USES=		cmake compiler:c++11-lang gnome kde:5 pkgconfig python:3.4+ \
> 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}
>diff --git a/x11-themes/plasma5-breeze/Makefile b/x11-themes/plasma5-breeze/Makefile
>index 991ad213712b..c3098cbfce2a 100644
>--- a/x11-themes/plasma5-breeze/Makefile
>+++ b/x11-themes/plasma5-breeze/Makefile
>@@ -16,7 +16,7 @@ USE_KDE=	auth breeze-icons codecs config configwidgets coreaddons \
> 		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=	xcb
> 
> .include <bsd.port.mk>
>diff --git a/x11-themes/plasma5-kde-gtk-config/Makefile b/x11-themes/plasma5-kde-gtk-config/Makefile
>index 3b8641170f81..b0cb19a8b6a3 100644
>--- a/x11-themes/plasma5-kde-gtk-config/Makefile
>+++ b/x11-themes/plasma5-kde-gtk-config/Makefile
>@@ -18,9 +18,9 @@ USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 gtk30
> 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=	xcursor
> 
> .include <bsd.port.mk>
>diff --git a/x11-themes/plasma5-oxygen/Makefile b/x11-themes/plasma5-oxygen/Makefile
>index 1607eb116f33..8d7da9d5f7d8 100644
>--- a/x11-themes/plasma5-oxygen/Makefile
>+++ b/x11-themes/plasma5-oxygen/Makefile
>@@ -15,7 +15,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons \
> 		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=	xcb
> 
> .include <bsd.port.mk>
>diff --git a/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile b/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
>index 247e7a5611b1..1314b56e4c1c 100644
>--- a/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
>+++ b/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
>@@ -12,8 +12,8 @@ LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL3
> 
> 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
> 
>diff --git a/x11-themes/qgnomeplatform/Makefile b/x11-themes/qgnomeplatform/Makefile
>index 103138069be1..17712ff01904 100644
>--- a/x11-themes/qgnomeplatform/Makefile
>+++ b/x11-themes/qgnomeplatform/Makefile
>@@ -16,7 +16,7 @@ LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
> 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
>diff --git a/x11-themes/qt5-style-plugins/Makefile b/x11-themes/qt5-style-plugins/Makefile
>index aa4446147e3f..3aa70ec75b53 100644
>--- a/x11-themes/qt5-style-plugins/Makefile
>+++ b/x11-themes/qt5-style-plugins/Makefile
>@@ -20,7 +20,7 @@ USE_GITHUB=	yes
> 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
> 
>diff --git a/x11-themes/qtcurve/Makefile b/x11-themes/qtcurve/Makefile
>index a09d2043595c..4ffb3f00c43b 100644
>--- a/x11-themes/qtcurve/Makefile
>+++ b/x11-themes/qtcurve/Makefile
>@@ -53,8 +53,8 @@ PLIST=		${PKGDIR}/pkg-plist.${QTCURVE_SLAVE}
> .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
>@@ -65,8 +65,8 @@ LIB_DEPENDS+=	libqtcurve-utils.so:x11-themes/qtcurve-utils
> 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
> 
>@@ -83,9 +83,9 @@ USES+=		kde:5 qt:5
> 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
> 
>@@ -93,9 +93,9 @@ BUILD_WRKSRC=	${WRKSRC}/qt5
> 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
> 
>diff --git a/x11-toolkits/color-widgets-qt5/Makefile b/x11-toolkits/color-widgets-qt5/Makefile
>index 5f266eb46486..5c7974ddaf4d 100644
>--- a/x11-toolkits/color-widgets-qt5/Makefile
>+++ b/x11-toolkits/color-widgets-qt5/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	LGPL3
> 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
>diff --git a/x11-toolkits/ctk/Makefile b/x11-toolkits/ctk/Makefile
>index 6a758fae0f09..508f3058c344 100644
>--- a/x11-toolkits/ctk/Makefile
>+++ b/x11-toolkits/ctk/Makefile
>@@ -14,7 +14,7 @@ USES=		cmake compiler:c++11-lib qt:5
> 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
>diff --git a/x11-toolkits/kf5-attica/Makefile b/x11-toolkits/kf5-attica/Makefile
>index 68bdec590c06..7997b9a6824e 100644
>--- a/x11-toolkits/kf5-attica/Makefile
>+++ b/x11-toolkits/kf5-attica/Makefile
>@@ -11,8 +11,8 @@ LICENSE=	LGPL21 LGPL3
> 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>
>diff --git a/x11-toolkits/kf5-kcompletion/Makefile b/x11-toolkits/kf5-kcompletion/Makefile
>index 81f9fc827765..8d9f78186677 100644
>--- a/x11-toolkits/kf5-kcompletion/Makefile
>+++ b/x11-toolkits/kf5-kcompletion/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 text completion helpers and widgets
> 
> 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>
>diff --git a/x11-toolkits/kf5-kconfigwidgets/Makefile b/x11-toolkits/kf5-kconfigwidgets/Makefile
>index be1271c430bb..1cb82a112504 100644
>--- a/x11-toolkits/kf5-kconfigwidgets/Makefile
>+++ b/x11-toolkits/kf5-kconfigwidgets/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KF5 widgets for configuration dialogs
> 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
> 
>diff --git a/x11-toolkits/kf5-kdesignerplugin/Makefile b/x11-toolkits/kf5-kdesignerplugin/Makefile
>index 84b41a50b879..6d6ad5d1d85c 100644
>--- a/x11-toolkits/kf5-kdesignerplugin/Makefile
>+++ b/x11-toolkits/kf5-kdesignerplugin/Makefile
>@@ -10,9 +10,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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>
>diff --git a/x11-toolkits/kf5-kguiaddons/Makefile b/x11-toolkits/kf5-kguiaddons/Makefile
>index b0af8a25fb59..14bb3d583c29 100644
>--- a/x11-toolkits/kf5-kguiaddons/Makefile
>+++ b/x11-toolkits/kf5-kguiaddons/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	KF5 addons to QtGui
> 
> USES=		cmake compiler:c++11-lib 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>
>diff --git a/x11-toolkits/kf5-kirigami2/Makefile b/x11-toolkits/kf5-kirigami2/Makefile
>index d8c50acc8b4e..b4d8221dd2f3 100644
>--- a/x11-toolkits/kf5-kirigami2/Makefile
>+++ b/x11-toolkits/kf5-kirigami2/Makefile
>@@ -7,9 +7,9 @@ COMMENT=	QtQuick based components set
> 
> USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	kdeclarative \
>-		ecm_build
>+		ecm:build
> USE_QT=		core 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>
>diff --git a/x11-toolkits/kf5-kitemviews/Makefile b/x11-toolkits/kf5-kitemviews/Makefile
>index 6686d04d8e0e..c102eeec1bfc 100644
>--- a/x11-toolkits/kf5-kitemviews/Makefile
>+++ b/x11-toolkits/kf5-kitemviews/Makefile
>@@ -6,8 +6,8 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/x11-toolkits/kf5-kjobwidgets/Makefile b/x11-toolkits/kf5-kjobwidgets/Makefile
>index d825cfff6546..0b0a53c210ec 100644
>--- a/x11-toolkits/kf5-kjobwidgets/Makefile
>+++ b/x11-toolkits/kf5-kjobwidgets/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 widgets for tracking KJob instance
> 
> 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>
>diff --git a/x11-toolkits/kf5-ktextwidgets/Makefile b/x11-toolkits/kf5-ktextwidgets/Makefile
>index 1694c9868f15..049e581fbcd4 100644
>--- a/x11-toolkits/kf5-ktextwidgets/Makefile
>+++ b/x11-toolkits/kf5-ktextwidgets/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KF5 advanced text editing widgets
> 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
>diff --git a/x11-toolkits/kf5-kwidgetsaddons/Makefile b/x11-toolkits/kf5-kwidgetsaddons/Makefile
>index 4c1136fa80b2..72c35c4d7047 100644
>--- a/x11-toolkits/kf5-kwidgetsaddons/Makefile
>+++ b/x11-toolkits/kf5-kwidgetsaddons/Makefile
>@@ -6,8 +6,8 @@ MAINTAINER=	kde@FreeBSD.org
> 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>
>diff --git a/x11-toolkits/kf5-kxmlgui/Makefile b/x11-toolkits/kf5-kxmlgui/Makefile
>index b4571e5f9837..39bd84304f61 100644
>--- a/x11-toolkits/kf5-kxmlgui/Makefile
>+++ b/x11-toolkits/kf5-kxmlgui/Makefile
>@@ -9,8 +9,8 @@ USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> 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>
>diff --git a/x11-toolkits/kproperty/Makefile b/x11-toolkits/kproperty/Makefile
>index 214e917f0356..2ac5d239a81c 100644
>--- a/x11-toolkits/kproperty/Makefile
>+++ b/x11-toolkits/kproperty/Makefile
>@@ -12,7 +12,7 @@ USES=			cmake compiler:c++11-lang gettext kde:5 qt:5 \
> 			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*
> 
>diff --git a/x11-toolkits/plasma5-kdeplasma-addons/Makefile b/x11-toolkits/plasma5-kdeplasma-addons/Makefile
>index 5803ad929d46..d703527bbceb 100644
>--- a/x11-toolkits/plasma5-kdeplasma-addons/Makefile
>+++ b/x11-toolkits/plasma5-kdeplasma-addons/Makefile
>@@ -14,10 +14,10 @@ USE_KDE=	activities archive attica auth bookmarks codecs completion \
> 		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
> 
> OPTIONS_DEFINE=	PURPOSE QTWEBENGINE
> OPTIONS_DEFAULT=	PURPOSE
>diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile
>index 5b25456686b5..397a08778c6e 100644
>--- a/x11-toolkits/py-qt5-chart/Makefile
>+++ b/x11-toolkits/py-qt5-chart/Makefile
>@@ -17,8 +17,8 @@ LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
> 
> 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>
>diff --git a/x11-toolkits/qml-box2d/Makefile b/x11-toolkits/qml-box2d/Makefile
>index 902768f1d03f..3e229e5551a0 100644
>--- a/x11-toolkits/qml-box2d/Makefile
>+++ b/x11-toolkits/qml-box2d/Makefile
>@@ -11,7 +11,7 @@ USE_GITHUB=	yes
> 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>
>diff --git a/x11-toolkits/qt5-charts/Makefile b/x11-toolkits/qt5-charts/Makefile
>index 14c58462c082..716c0d569ddf 100644
>--- a/x11-toolkits/qt5-charts/Makefile
>+++ b/x11-toolkits/qt5-charts/Makefile
>@@ -8,6 +8,6 @@ COMMENT=	Qt 5 charts module
> 
> 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>
>diff --git a/x11-toolkits/qt5-datavis3d/Makefile b/x11-toolkits/qt5-datavis3d/Makefile
>index 0c12da08eb89..cd4ac491d3d5 100644
>--- a/x11-toolkits/qt5-datavis3d/Makefile
>+++ b/x11-toolkits/qt5-datavis3d/Makefile
>@@ -6,7 +6,7 @@ PKGNAMEPREFIX=	qt5-
> 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
> 
>diff --git a/x11-toolkits/qt5-declarative-test/Makefile b/x11-toolkits/qt5-declarative-test/Makefile
>index 5f2efafc6478..7bcdb1030ac5 100644
>--- a/x11-toolkits/qt5-declarative-test/Makefile
>+++ b/x11-toolkits/qt5-declarative-test/Makefile
>@@ -11,7 +11,7 @@ USES=		compiler:c++11-lang gl python:build qmake:norecursive \
> 		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
> 
>diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile
>index 0ad36a26d97d..8ae919a75534 100644
>--- a/x11-toolkits/qt5-declarative/Makefile
>+++ b/x11-toolkits/qt5-declarative/Makefile
>@@ -10,7 +10,7 @@ USES=		compiler:c++11-lang gl python:build qmake:norecursive \
> 		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
> 
>diff --git a/x11-toolkits/qt5-gamepad/Makefile b/x11-toolkits/qt5-gamepad/Makefile
>index 0178a9a388b3..225c393a03f6 100644
>--- a/x11-toolkits/qt5-gamepad/Makefile
>+++ b/x11-toolkits/qt5-gamepad/Makefile
>@@ -9,6 +9,6 @@ COMMENT=	Qt 5 Gamepad Module
> 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>
>diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
>index bfa46c4a8acd..b88214695abf 100644
>--- a/x11-toolkits/qt5-gui/Makefile
>+++ b/x11-toolkits/qt5-gui/Makefile
>@@ -36,7 +36,7 @@ USES=			compiler:c++11-lang gl gnome jpeg localbase \
> 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 \
>diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile
>index 4d7d9cc85c7a..b41d81be4a81 100644
>--- a/x11-toolkits/qt5-quick3d/Makefile
>+++ b/x11-toolkits/qt5-quick3d/Makefile
>@@ -11,7 +11,7 @@ LIB_DEPENDS=	libassimp.so:multimedia/assimp
> 
> USES=		compiler:c++11-lang qmake qt-dist:5
> USE_QT=		core declarative gui network opengl \
>-		buildtools_build
>+		buildtools:build
> 
> QT_BINARIES=	yes
> 
>diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile
>index 5d316783c830..39f4eea76c7b 100644
>--- a/x11-toolkits/qt5-quickcontrols/Makefile
>+++ b/x11-toolkits/qt5-quickcontrols/Makefile
>@@ -10,6 +10,6 @@ BROKEN_armv6=		fails to install: pkg-static: Unable to access file ApplicationWi
> 
> USES=		compiler:c++11-lang qmake qt-dist:5,quickcontrols
> USE_QT=		core declarative gui widgets \
>-		buildtools_build
>+		buildtools:build
> 
> .include <bsd.port.mk>
>diff --git a/x11-toolkits/qt5-quickcontrols2/Makefile b/x11-toolkits/qt5-quickcontrols2/Makefile
>index 195a8676eabb..36e7c3f61cb2 100644
>--- a/x11-toolkits/qt5-quickcontrols2/Makefile
>+++ b/x11-toolkits/qt5-quickcontrols2/Makefile
>@@ -10,7 +10,7 @@ BROKEN_armv6=		fails to install: pkg-static: Unable to access file DayOfWeekRow.
> 
> 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>
>diff --git a/x11-toolkits/qt5-quicktimeline/Makefile b/x11-toolkits/qt5-quicktimeline/Makefile
>index b982c9cada13..b3ffdfa74203 100644
>--- a/x11-toolkits/qt5-quicktimeline/Makefile
>+++ b/x11-toolkits/qt5-quicktimeline/Makefile
>@@ -8,6 +8,6 @@ COMMENT=	Set of controls for building complete interfaces in Qt Quick Timeline
> 
> USES=		compiler:c++11-lang qmake qt-dist:5
> USE_QT=		core declarative quickcontrols \
>-		buildtools_build
>+		buildtools:build
> 
> .include <bsd.port.mk>
>diff --git a/x11-toolkits/qt5-uiplugin/Makefile b/x11-toolkits/qt5-uiplugin/Makefile
>index 6bcd9a26da0e..9b79c5b4c05e 100644
>--- a/x11-toolkits/qt5-uiplugin/Makefile
>+++ b/x11-toolkits/qt5-uiplugin/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Custom Qt widget plugin interface for Qt Designer
> 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}
>diff --git a/x11-toolkits/qt5-virtualkeyboard/Makefile b/x11-toolkits/qt5-virtualkeyboard/Makefile
>index e6b402ae5ba6..ecad7920eef0 100644
>--- a/x11-toolkits/qt5-virtualkeyboard/Makefile
>+++ b/x11-toolkits/qt5-virtualkeyboard/Makefile
>@@ -9,7 +9,7 @@ COMMENT=	Qt 5 Virtual Keyboard Module
> LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
> 
> USES=		compiler:c++11-lang pkgconfig qmake qt-dist:5,virtualkeyboard
>-USE_QT=		core declarative network gui widgets svg buildtools_build
>+USE_QT=		core declarative network gui widgets svg buildtools:build
> 
> # Disable the builtin layouts -- otherwise we need to pull in a lot of other
> # stuff.
>diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
>index bbd1812627d7..d67e9579e8f2 100644
>--- a/x11-toolkits/qt5-widgets/Makefile
>+++ b/x11-toolkits/qt5-widgets/Makefile
>@@ -8,7 +8,7 @@ COMMENT=	Qt C++ widgets module
> 
> 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
> 
>diff --git a/x11-toolkits/qt5pas/Makefile b/x11-toolkits/qt5pas/Makefile
>index 43b699f5168a..43c8321ba635 100644
>--- a/x11-toolkits/qt5pas/Makefile
>+++ b/x11-toolkits/qt5pas/Makefile
>@@ -8,7 +8,7 @@ MAINTAINER=	acm@FreeBSD.org
> COMMENT=	Qt5 binding for FreePascal
> 
> 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
>diff --git a/x11-toolkits/qtermwidget/Makefile b/x11-toolkits/qtermwidget/Makefile
>index 4e6bc3b91fd0..e6549660348c 100644
>--- a/x11-toolkits/qtermwidget/Makefile
>+++ b/x11-toolkits/qtermwidget/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/x11-toolkits/qwt5-qt5/Makefile b/x11-toolkits/qwt5-qt5/Makefile
>index 8978f04e6d04..087ce304a1a6 100644
>--- a/x11-toolkits/qwt5-qt5/Makefile
>+++ b/x11-toolkits/qwt5-qt5/Makefile
>@@ -6,7 +6,7 @@ MAINTAINER=	makc@FreeBSD.org
> COMMENT=	Qt Widgets for Technical Applications
> 
> 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
>diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
>index 1e8609101bbe..d8f7f81cd233 100644
>--- a/x11-toolkits/qwt6/Makefile
>+++ b/x11-toolkits/qwt6/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Qt Widgets for Technical Applications
> 
> 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
>diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile
>index b6c6c336c2a5..ea372f427572 100644
>--- a/x11-wm/kwinft/Makefile
>+++ b/x11-wm/kwinft/Makefile
>@@ -29,14 +29,14 @@ CONFLICTS_INSTALL=	plasma5-kwin # bin/kwin_wayland
> 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
>@@ -50,7 +50,7 @@ BREEZE_DESC=		Default window decoration plugin
> 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
>diff --git a/x11-wm/lxqt-panel/Makefile b/x11-wm/lxqt-panel/Makefile
>index 4b6a4a50b4c6..f89986c1dfc0 100644
>--- a/x11-wm/lxqt-panel/Makefile
>+++ b/x11-wm/lxqt-panel/Makefile
>@@ -19,7 +19,7 @@ RUN_DEPENDS=	lxmenu-data>=0.1.2:x11/lxmenu-data
> 
> 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
>diff --git a/x11-wm/lxqt-session/Makefile b/x11-wm/lxqt-session/Makefile
>index 8091057587ba..447cb5d9ff4e 100644
>--- a/x11-wm/lxqt-session/Makefile
>+++ b/x11-wm/lxqt-session/Makefile
>@@ -12,7 +12,7 @@ BUILD_DEPENDS=	xdg-user-dirs-update:devel/xdg-user-dirs
> 
> 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
>diff --git a/x11-wm/obconf-qt/Makefile b/x11-wm/obconf-qt/Makefile
>index 268ed6f4ca13..1bf872d2eaba 100644
>--- a/x11-wm/obconf-qt/Makefile
>+++ b/x11-wm/obconf-qt/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libobt.so:x11-wm/openbox \
> 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
>diff --git a/x11-wm/plasma5-kdecoration/Makefile b/x11-wm/plasma5-kdecoration/Makefile
>index bd5ef35cd08d..44cbefad2aba 100644
>--- a/x11-wm/plasma5-kdecoration/Makefile
>+++ b/x11-wm/plasma5-kdecoration/Makefile
>@@ -10,8 +10,8 @@ LICENSE=	LGPL21
> 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>
>diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile
>index 0a9def8ca3e0..e23c8ed71f07 100644
>--- a/x11-wm/plasma5-kwin/Makefile
>+++ b/x11-wm/plasma5-kwin/Makefile
>@@ -39,12 +39,12 @@ USE_KDE=	activities attica auth breeze codecs completion config \
> 		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
>diff --git a/x11/antimicro/Makefile b/x11/antimicro/Makefile
>index 181f0fcafdcb..13755cba0527 100644
>--- a/x11/antimicro/Makefile
>+++ b/x11/antimicro/Makefile
>@@ -19,7 +19,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> 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>
>diff --git a/x11/compton-conf/Makefile b/x11/compton-conf/Makefile
>index 922dec9c1faf..c440403d775c 100644
>--- a/x11/compton-conf/Makefile
>+++ b/x11/compton-conf/Makefile
>@@ -14,7 +14,7 @@ RUN_DEPENDS=	compton:x11-wm/compton
> 
> 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
> 
>diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
>index 9056a0aa4256..cd083a56056c 100644
>--- a/x11/cool-retro-term/Makefile
>+++ b/x11/cool-retro-term/Makefile
>@@ -16,9 +16,9 @@ GH_SUBDIR=	${GH_PROJECT}
> 
> 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:,,' \
>diff --git a/x11/coreterminal/Makefile b/x11/coreterminal/Makefile
>index 9fe3627d3f55..d01fa3c2a9bc 100644
>--- a/x11/coreterminal/Makefile
>+++ b/x11/coreterminal/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libqtermwidget5.so:x11-toolkits/qtermwidget \
> 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
>diff --git a/x11/disman/Makefile b/x11/disman/Makefile
>index fa4578a6ba02..3f694b7f298c 100644
>--- a/x11/disman/Makefile
>+++ b/x11/disman/Makefile
>@@ -13,9 +13,9 @@ TEST_DEPENDS=	${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
> 
> 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}
>diff --git a/x11/dsbautostart/Makefile b/x11/dsbautostart/Makefile
>index 3a8faf631b8b..c0e2036691bf 100644
>--- a/x11/dsbautostart/Makefile
>+++ b/x11/dsbautostart/Makefile
>@@ -13,6 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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>
>diff --git a/x11/dsbxinput/Makefile b/x11/dsbxinput/Makefile
>index f3551e058481..b348e4ec06d3 100644
>--- a/x11/dsbxinput/Makefile
>+++ b/x11/dsbxinput/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 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
>diff --git a/x11/glcapsviewer/Makefile b/x11/glcapsviewer/Makefile
>index 1e2eb6789d91..d5887888abf8 100644
>--- a/x11/glcapsviewer/Makefile
>+++ b/x11/glcapsviewer/Makefile
>@@ -17,7 +17,7 @@ GH_TAGNAME=	26e160c
> 
> 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 \
>diff --git a/x11/kdisplay/Makefile b/x11/kdisplay/Makefile
>index 3cec9fc4020d..cdbdf59905c9 100644
>--- a/x11/kdisplay/Makefile
>+++ b/x11/kdisplay/Makefile
>@@ -16,10 +16,10 @@ TEST_DEPENDS=	${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
> 
> 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
>diff --git a/x11/kf5-frameworkintegration/Makefile b/x11/kf5-frameworkintegration/Makefile
>index 4cb589e3ea78..2a4e730e23c7 100644
>--- a/x11/kf5-frameworkintegration/Makefile
>+++ b/x11/kf5-frameworkintegration/Makefile
>@@ -9,9 +9,9 @@ USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig \
> 		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>
>diff --git a/x11/kf5-kactivities-stats/Makefile b/x11/kf5-kactivities-stats/Makefile
>index ad2a16430c00..4d333cb9669e 100644
>--- a/x11/kf5-kactivities-stats/Makefile
>+++ b/x11/kf5-kactivities-stats/Makefile
>@@ -10,8 +10,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
> 
> 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>
>diff --git a/x11/kf5-kactivities/Makefile b/x11/kf5-kactivities/Makefile
>index 2991300e680e..bf04e8048b64 100644
>--- a/x11/kf5-kactivities/Makefile
>+++ b/x11/kf5-kactivities/Makefile
>@@ -10,8 +10,8 @@ BUILD_DEPENDS=	boost-libs>1.53:devel/boost-libs
> 
> 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>
>diff --git a/x11/kf5-kded/Makefile b/x11/kf5-kded/Makefile
>index 64f09fbeae6a..1630ed0213b5 100644
>--- a/x11/kf5-kded/Makefile
>+++ b/x11/kf5-kded/Makefile
>@@ -7,8 +7,8 @@ COMMENT=	KF5 extensible daemon for providing system level services
> 
> 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>
>diff --git a/x11/kf5-kdelibs4support/Makefile b/x11/kf5-kdelibs4support/Makefile
>index f1c27ede7e1d..0ef87db0f5ac 100644
>--- a/x11/kf5-kdelibs4support/Makefile
>+++ b/x11/kf5-kdelibs4support/Makefile
>@@ -14,12 +14,12 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		i18n iconthemes itemviews jobwidgets kded kio notifications \
> 		parts service solid 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 widgets x11extras xml \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> USE_XORG=	ice sm x11 xext
> 
> SHEBANG_FILES=	src/kio/fileshareset
>diff --git a/x11/kf5-kglobalaccel/Makefile b/x11/kf5-kglobalaccel/Makefile
>index 26bd8e3833b9..bb6da23eac2d 100644
>--- a/x11/kf5-kglobalaccel/Makefile
>+++ b/x11/kf5-kglobalaccel/Makefile
>@@ -10,9 +10,9 @@ LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
> 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=	xcb
> 
> .include <bsd.port.mk>
>diff --git a/x11/kf5-kinit/Makefile b/x11/kf5-kinit/Makefile
>index 114ab989eccf..5be12c197374 100644
>--- a/x11/kf5-kinit/Makefile
>+++ b/x11/kf5-kinit/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KF5 process launcher to speed up launching KDE applications
> USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
> USE_KDE=	completion config coreaddons crash i18n \
> 		jobwidgets kio service 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>
>diff --git a/x11/kf5-krunner/Makefile b/x11/kf5-krunner/Makefile
>index e5c902d703fa..715e30ebec90 100644
>--- a/x11/kf5-krunner/Makefile
>+++ b/x11/kf5-krunner/Makefile
>@@ -8,8 +8,8 @@ COMMENT=	KF5 parallelized query system
> USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
> USE_KDE=	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>
>diff --git a/x11/kf5-kwayland/Makefile b/x11/kf5-kwayland/Makefile
>index 528e129e4aba..a48e937b38db 100644
>--- a/x11/kf5-kwayland/Makefile
>+++ b/x11/kf5-kwayland/Makefile
>@@ -16,8 +16,8 @@ LICENSE_COMB=	dual
> 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>
>diff --git a/x11/kf5-kwindowsystem/Makefile b/x11/kf5-kwindowsystem/Makefile
>index 504e0d4e7cd1..7e9586291412 100644
>--- a/x11/kf5-kwindowsystem/Makefile
>+++ b/x11/kf5-kwindowsystem/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	KF5 library for access to the windowing system
> 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>
>diff --git a/x11/kf5-plasma-framework/Makefile b/x11/kf5-plasma-framework/Makefile
>index 3fcb06b62f67..9c1b40f1a4a0 100644
>--- a/x11/kf5-plasma-framework/Makefile
>+++ b/x11/kf5-plasma-framework/Makefile
>@@ -8,11 +8,11 @@ COMMENT=	KF5 plugin based UI runtime used to write user interfaces
> 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 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
> 
>diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
>index 68e41cc640a7..c9dd05da9714 100644
>--- a/x11/konsole/Makefile
>+++ b/x11/konsole/Makefile
>@@ -19,10 +19,10 @@ USE_KDE=	auth attica bookmarks codecs completion config configwidgets \
> 		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
> 
> OPTIONS_DEFINE=	DOCS
> 
>diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile
>index f515a294ffbf..3d28592449e4 100644
>--- a/x11/libfm-qt/Makefile
>+++ b/x11/libfm-qt/Makefile
>@@ -14,7 +14,7 @@ LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
> 
> 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
>diff --git a/x11/lumina-core/Makefile b/x11/lumina-core/Makefile
>index 356388f9d0cd..bb0a7c75f513 100644
>--- a/x11/lumina-core/Makefile
>+++ b/x11/lumina-core/Makefile
>@@ -27,7 +27,7 @@ USES=		compiler:c++11-lang gl qmake qt:5 xorg
> 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
>@@ -45,7 +45,7 @@ TRUEOS_QMAKE_ON=	DEFAULT_SETTINGS=TrueOS
> 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
>diff --git a/x11/lumina-coreutils/Makefile b/x11/lumina-coreutils/Makefile
>index acda5163300d..ff232f4b8e1a 100644
>--- a/x11/lumina-coreutils/Makefile
>+++ b/x11/lumina-coreutils/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/../../LICENSE
> 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
>@@ -22,7 +22,7 @@ GH_PROJECT=	lumina
> 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
>diff --git a/x11/lxqt-about/Makefile b/x11/lxqt-about/Makefile
>index 4766daffd4ea..6710cc53a0db 100644
>--- a/x11/lxqt-about/Makefile
>+++ b/x11/lxqt-about/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	LGPL21+
> 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
>diff --git a/x11/lxqt-globalkeys/Makefile b/x11/lxqt-globalkeys/Makefile
>index 8b1e998e8839..c4b0e7917fee 100644
>--- a/x11/lxqt-globalkeys/Makefile
>+++ b/x11/lxqt-globalkeys/Makefile
>@@ -10,7 +10,7 @@ LICENSE=	LGPL21+
> 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
>diff --git a/x11/lxqt-runner/Makefile b/x11/lxqt-runner/Makefile
>index 715f9da9ed04..aa91cab93bce 100644
>--- a/x11/lxqt-runner/Makefile
>+++ b/x11/lxqt-runner/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libmuparser.so:math/muparser
> 
> 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
>diff --git a/x11/pcdm/Makefile b/x11/pcdm/Makefile
>index cd260430be4d..1209356c0b57 100644
>--- a/x11/pcdm/Makefile
>+++ b/x11/pcdm/Makefile
>@@ -16,7 +16,7 @@ RUN_DEPENDS=	xorg-minimal>=0:x11/xorg-minimal \
> 
> 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
> 
>diff --git a/x11/plasma-wayland-protocols/Makefile b/x11/plasma-wayland-protocols/Makefile
>index bbce794db29d..5042a02740f0 100644
>--- a/x11/plasma-wayland-protocols/Makefile
>+++ b/x11/plasma-wayland-protocols/Makefile
>@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 
> 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
> 
>diff --git a/x11/plasma5-kactivitymanagerd/Makefile b/x11/plasma5-kactivitymanagerd/Makefile
>index 7d3fbc981502..cdaec3152e11 100644
>--- a/x11/plasma5-kactivitymanagerd/Makefile
>+++ b/x11/plasma5-kactivitymanagerd/Makefile
>@@ -13,6 +13,6 @@ USE_KDE=	auth codecs config configwidgets coreaddons crash dbusaddons \
> 		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
> 
> .include <bsd.port.mk>
>diff --git a/x11/plasma5-kgamma5/Makefile b/x11/plasma5-kgamma5/Makefile
>index 23f1262beee7..851b44f6e2d3 100644
>--- a/x11/plasma5-kgamma5/Makefile
>+++ b/x11/plasma5-kgamma5/Makefile
>@@ -11,9 +11,9 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
> 		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>
>diff --git a/x11/plasma5-kscreen/Makefile b/x11/plasma5-kscreen/Makefile
>index ae04043e1985..38b93bcf01ae 100644
>--- a/x11/plasma5-kscreen/Makefile
>+++ b/x11/plasma5-kscreen/Makefile
>@@ -9,8 +9,8 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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 xml \
>-		buildtools_build qmake_build testlib_build
>+		buildtools:build qmake:build testlib:build
> 
> .include <bsd.port.mk>
>diff --git a/x11/plasma5-kwayland-integration/Makefile b/x11/plasma5-kwayland-integration/Makefile
>index 317ee2b057b2..c1867062a661 100644
>--- a/x11/plasma5-kwayland-integration/Makefile
>+++ b/x11/plasma5-kwayland-integration/Makefile
>@@ -13,6 +13,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
> USES=		cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
> USE_KDE=	ecm guiaddons idletime plasma-wayland-protocols wayland windowsystem
> USE_QT=		core gui widgets \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/x11/plasma5-kwayland-server/Makefile b/x11/plasma5-kwayland-server/Makefile
>index 38c36c899c23..0977fbc26d4a 100644
>--- a/x11/plasma5-kwayland-server/Makefile
>+++ b/x11/plasma5-kwayland-server/Makefile
>@@ -17,6 +17,6 @@ USES=		cmake compiler:c++11-lang gl kde:5 pkgconfig qt:5 tar:xz
> 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>
>diff --git a/x11/plasma5-layer-shell-qt/Makefile b/x11/plasma5-layer-shell-qt/Makefile
>index cae8ee45c33f..cd80e6c35ceb 100644
>--- a/x11/plasma5-layer-shell-qt/Makefile
>+++ b/x11/plasma5-layer-shell-qt/Makefile
>@@ -11,6 +11,6 @@ LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
> USES=		cmake compiler:c++11-lang gettext kde:5 pkgconfig qt:5 tar:xz
> USE_KDE=	ecm
> USE_QT=		core wayland \
>-		buildtools_build qmake_build
>+		buildtools:build qmake:build
> 
> .include <bsd.port.mk>
>diff --git a/x11/plasma5-libkscreen/Makefile b/x11/plasma5-libkscreen/Makefile
>index bda9d8d0776c..d1114ae2ade1 100644
>--- a/x11/plasma5-libkscreen/Makefile
>+++ b/x11/plasma5-libkscreen/Makefile
>@@ -8,9 +8,9 @@ COMMENT=	Plasma5 screen management library
> 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>
>diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
>index 745ba8c6cbd3..aa5e1b569c72 100644
>--- a/x11/plasma5-plasma-desktop/Makefile
>+++ b/x11/plasma5-plasma-desktop/Makefile
>@@ -38,12 +38,12 @@ USE_KDE=	activities activities-stats archive attica auth baloo \
> 		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
>diff --git a/x11/plasma5-plasma-integration/Makefile b/x11/plasma5-plasma-integration/Makefile
>index 39108e95600b..9139194fbc01 100644
>--- a/x11/plasma5-plasma-integration/Makefile
>+++ b/x11/plasma5-plasma-integration/Makefile
>@@ -13,10 +13,10 @@ USE_KDE=	auth bookmarks breeze codecs completion config configwidgets \
> 		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=	xcb xcursor
> 
> SHEBANG_FILES=	src/platformtheme/fonts_akregator.pl \
>diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
>index cdf8c7ef20ba..335c9126b81e 100644
>--- a/x11/plasma5-plasma-workspace/Makefile
>+++ b/x11/plasma5-plasma-workspace/Makefile
>@@ -38,14 +38,14 @@ USE_KDE=	activities activities-stats activitymanagerd archive attica \
> 		plasma-framework plasma-integration prison pty runner service \
> 		solid sonnet 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 xkbfile xrender xtst
> 
> CPE_VENDOR=	kde
>diff --git a/x11/plasma5-plasma/Makefile b/x11/plasma5-plasma/Makefile
>index 1c9494307b74..78ff840af90b 100644
>--- a/x11/plasma5-plasma/Makefile
>+++ b/x11/plasma5-plasma/Makefile
>@@ -22,6 +22,6 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
> 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>
>diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
>index 196d60776c43..629ed5897744 100644
>--- a/x11/qimageblitz/Makefile
>+++ b/x11/qimageblitz/Makefile
>@@ -12,7 +12,7 @@ FETCH_DEPENDS=	svn:devel/subversion
> 
> 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
>diff --git a/x11/qt5-x11extras/Makefile b/x11/qt5-x11extras/Makefile
>index d83132e409e5..9c2b119b21bf 100644
>--- a/x11/qt5-x11extras/Makefile
>+++ b/x11/qt5-x11extras/Makefile
>@@ -9,6 +9,6 @@ COMMENT=	Qt platform-specific features for X11-based systems
> 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>
>diff --git a/x11/qterminal/Makefile b/x11/qterminal/Makefile
>index e7e4460aac4a..5f83b02cffef 100644
>--- a/x11/qterminal/Makefile
>+++ b/x11/qterminal/Makefile
>@@ -13,7 +13,7 @@ RUN_DEPENDS=	liberation-fonts-ttf>=2.00:x11-fonts/liberation-fonts-ttf
> 
> 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
>diff --git a/x11/radare-cutter/Makefile b/x11/radare-cutter/Makefile
>index 56ee7d9c0bbf..b97f0e1127bf 100644
>--- a/x11/radare-cutter/Makefile
>+++ b/x11/radare-cutter/Makefile
>@@ -22,7 +22,7 @@ GH_PROJECT=	r2cutter
> 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
>diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
>index 71d28bbe9a20..a8edc212e4a0 100644
>--- a/x11/rsibreak/Makefile
>+++ b/x11/rsibreak/Makefile
>@@ -13,6 +13,6 @@ USES=		cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
> 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
> 
> .include <bsd.port.mk>
>diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
>index 7493f9aafa79..4f5b3f8005ee 100644
>--- a/x11/sddm/Makefile
>+++ b/x11/sddm/Makefile
>@@ -27,9 +27,9 @@ RUN_DEPENDS=	dbus-run-session:devel/dbus \
> 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
>diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
>index 2b581b8e9c68..418be4b9348f 100644
>--- a/x11/yakuake/Makefile
>+++ b/x11/yakuake/Makefile
>@@ -15,9 +15,9 @@ USE_KDE=	attica auth archive codecs completion config configwidgets \
> 		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
>-- 
>2.37.1
>

Actions: View | Diff

Attachments on bug 266034: 236111 | 236114 | 236123 | 236390