aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES21
-rw-r--r--Mk/Scripts/qa.sh6
-rw-r--r--Mk/Uses/qmake.mk137
-rw-r--r--Mk/Uses/qt-dist.mk377
-rw-r--r--Mk/Uses/qt.mk500
-rw-r--r--Mk/bsd.port.mk8
-rw-r--r--Mk/bsd.qt.mk810
-rw-r--r--Mk/bsd.sanity.mk7
-rw-r--r--accessibility/jovie-kde4/Makefile4
-rw-r--r--accessibility/kaccessible-kde4/Makefile4
-rw-r--r--accessibility/kmag-kde4/Makefile4
-rw-r--r--accessibility/kmag/Makefile4
-rw-r--r--accessibility/kmousetool-kde4/Makefile4
-rw-r--r--accessibility/kmousetool/Makefile4
-rw-r--r--accessibility/kmouth-kde4/Makefile4
-rw-r--r--accessibility/kmouth/Makefile4
-rw-r--r--accessibility/qt4-accessible/Makefile4
-rw-r--r--accessibility/qt5-speech/Makefile5
-rw-r--r--archivers/ark-kde4/Makefile4
-rw-r--r--archivers/ark/Makefile4
-rw-r--r--archivers/kf5-karchive/Makefile4
-rw-r--r--archivers/quazip/Makefile8
-rw-r--r--astro/gpsbabel/Makefile9
-rw-r--r--astro/gpsd/Makefile3
-rw-r--r--astro/kstars-kde4/Makefile4
-rw-r--r--astro/kstars/Makefile4
-rw-r--r--astro/libkgeomap-kde4/Makefile4
-rw-r--r--astro/libkgeomap/Makefile4
-rw-r--r--astro/marble-kde4/Makefile4
-rw-r--r--astro/marble/Makefile4
-rw-r--r--astro/merkaartor/Makefile7
-rw-r--r--astro/qlandkartegt/Makefile4
-rw-r--r--astro/qmapshack/Makefile4
-rw-r--r--astro/stellarium-qt4/Makefile8
-rw-r--r--astro/stellarium/Makefile12
-rw-r--r--astro/xglobe/Makefile4
-rw-r--r--audio/abgate-lv2/Makefile4
-rw-r--r--audio/acoustid-fingerprinter/Makefile4
-rw-r--r--audio/amarok-kde4/Makefile4
-rw-r--r--audio/audex/Makefile4
-rw-r--r--audio/audiocd-kio/Makefile4
-rw-r--r--audio/cantata/Makefile10
-rw-r--r--audio/carla/Makefile4
-rw-r--r--audio/clementine-player/Makefile4
-rw-r--r--audio/creox/Makefile4
-rw-r--r--audio/cueplayer/Makefile4
-rw-r--r--audio/dream/Makefile4
-rw-r--r--audio/drumstick/Makefile4
-rw-r--r--audio/dsbmixer/Makefile4
-rw-r--r--audio/dssi/Makefile4
-rw-r--r--audio/esperanza/Makefile5
-rw-r--r--audio/flacon/Makefile4
-rw-r--r--audio/fmit/Makefile4
-rw-r--r--audio/guidolib/Makefile4
-rw-r--r--audio/hydrogen/Makefile4
-rw-r--r--audio/jalv/Makefile5
-rw-r--r--audio/juk-kde4/Makefile4
-rw-r--r--audio/juk/Makefile4
-rw-r--r--audio/kid3-kde4/Makefile15
-rw-r--r--audio/kio-audiocd-kde4/Makefile4
-rw-r--r--audio/kmix-kde4/Makefile4
-rw-r--r--audio/kmix/Makefile4
-rw-r--r--audio/kscd-kde4/Makefile4
-rw-r--r--audio/kstreamripper/Makefile4
-rw-r--r--audio/kwave/Makefile4
-rw-r--r--audio/lastfm-desktop/Makefile7
-rw-r--r--audio/libechonest/Makefile6
-rw-r--r--audio/libkcddb-kde4/Makefile4
-rw-r--r--audio/libkcddb/Makefile4
-rw-r--r--audio/libkcompactdisc-kde4/Makefile4
-rw-r--r--audio/libkcompactdisc/Makefile4
-rw-r--r--audio/liblastfm/Makefile13
-rw-r--r--audio/lmms/Makefile4
-rw-r--r--audio/midipp/Makefile6
-rw-r--r--audio/minitunes/Makefile4
-rw-r--r--audio/mixxx/Makefile4
-rw-r--r--audio/mixxx20/Makefile4
-rw-r--r--audio/mous/Makefile3
-rw-r--r--audio/mumble/Makefile7
-rw-r--r--audio/murmur/Makefile10
-rw-r--r--audio/musescore/Makefile4
-rw-r--r--audio/mythplugin-mythmusic/Makefile3
-rw-r--r--audio/openal-soft/Makefile3
-rw-r--r--audio/padthv1-lv2/Makefile4
-rw-r--r--audio/pc-mixer/Makefile4
-rw-r--r--audio/plasma5-plasma-pa/Makefile4
-rw-r--r--audio/polyphone/Makefile4
-rw-r--r--audio/qjackctl/Makefile6
-rw-r--r--audio/qmidiarp/Makefile4
-rw-r--r--audio/qmpdclient/Makefile10
-rw-r--r--audio/qsampler/Makefile13
-rw-r--r--audio/qsynth/Makefile4
-rw-r--r--audio/quimup/Makefile4
-rw-r--r--audio/rosegarden/Makefile13
-rw-r--r--audio/sayonara/Makefile4
-rw-r--r--audio/simon/Makefile4
-rw-r--r--audio/skype-call-recorder/Makefile4
-rw-r--r--audio/sonic-visualiser/Makefile4
-rw-r--r--audio/soundkonverter/Makefile4
-rw-r--r--audio/supercollider/Makefile4
-rw-r--r--audio/synthpod-lv2/Makefile6
-rw-r--r--audio/virtual_oss_ctl/Makefile4
-rw-r--r--audio/vmpk/Makefile6
-rw-r--r--biology/clustalx/Makefile4
-rw-r--r--biology/ugene/Makefile4
-rw-r--r--cad/freecad/Makefile4
-rw-r--r--cad/fritzing/Makefile4
-rw-r--r--cad/klayout/Makefile4
-rw-r--r--cad/layouteditor/Makefile4
-rw-r--r--cad/leocad/Makefile4
-rw-r--r--cad/librecad/Makefile4
-rw-r--r--cad/meshlab/Makefile4
-rw-r--r--cad/openscad-devel/Makefile4
-rw-r--r--cad/openscad/Makefile4
-rw-r--r--cad/qcad/Makefile4
-rw-r--r--cad/qelectrotech/Makefile4
-rw-r--r--cad/qfsm/Makefile4
-rw-r--r--cad/qucs/Makefile4
-rw-r--r--chinese/fcitx-libpinyin/Makefile3
-rw-r--r--chinese/fcitx/Makefile5
-rw-r--r--chinese/gcin-qt4/Makefile4
-rw-r--r--chinese/gcin-qt5/Makefile4
-rw-r--r--chinese/qt4-codecs-cn/Makefile4
-rw-r--r--chinese/qt4-codecs-tw/Makefile4
-rw-r--r--chinese/qterm/Makefile13
-rw-r--r--comms/cutecom/Makefile5
-rw-r--r--comms/dabstick-radio/Makefile4
-rw-r--r--comms/gnuradio/Makefile4
-rw-r--r--comms/gqrx/Makefile5
-rw-r--r--comms/hamfax/Makefile4
-rw-r--r--comms/inspectrum/Makefile4
-rw-r--r--comms/klog/Makefile4
-rw-r--r--comms/kremotecontrol-kde4/Makefile4
-rw-r--r--comms/libsdr-gui/Makefile4
-rw-r--r--comms/linpsk/Makefile4
-rw-r--r--comms/py-qt5-serialport/Makefile4
-rw-r--r--comms/qsstv/Makefile4
-rw-r--r--comms/qt5-connectivity/Makefile5
-rw-r--r--comms/qt5-sensors/Makefile5
-rw-r--r--comms/qt5-serialbus/Makefile5
-rw-r--r--comms/qt5-serialport/Makefile5
-rw-r--r--comms/qtel/Makefile3
-rw-r--r--comms/sdr-wspr/Makefile4
-rw-r--r--comms/svxlink/Makefile2
-rw-r--r--comms/wsjtx/Makefile6
-rw-r--r--comms/xcwcp/Makefile4
-rw-r--r--databases/akonadi-kde4/Makefile11
-rw-r--r--databases/akonadi/Makefile14
-rw-r--r--databases/kbibtex/Makefile4
-rw-r--r--databases/kdb/Makefile4
-rw-r--r--databases/kexi/Makefile4
-rw-r--r--databases/pgmodeler/Makefile4
-rw-r--r--databases/py-qt4-sql/Makefile4
-rw-r--r--databases/py-qt5-sql/Makefile4
-rw-r--r--databases/qt4-sql/Makefile4
-rw-r--r--databases/qt5-sql/Makefile4
-rw-r--r--databases/redisdesktopmanager/Makefile4
-rw-r--r--databases/sqlitebrowser/Makefile4
-rw-r--r--databases/sqliteman/Makefile4
-rw-r--r--databases/sqlitestudio/Makefile6
-rw-r--r--databases/tora/Makefile16
-rw-r--r--deskutils/akonadi-calendar-tools/Makefile4
-rw-r--r--deskutils/akonadi-import-wizard/Makefile4
-rw-r--r--deskutils/akonadiconsole/Makefile4
-rw-r--r--deskutils/akregator/Makefile4
-rw-r--r--deskutils/basket/Makefile4
-rw-r--r--deskutils/cairo-dock-plugins/Makefile4
-rw-r--r--deskutils/calibre/Makefile4
-rw-r--r--deskutils/cdcat/Makefile4
-rw-r--r--deskutils/charmtimetracker/Makefile4
-rw-r--r--deskutils/copyq/Makefile4
-rw-r--r--deskutils/fbreader/Makefile3
-rw-r--r--deskutils/fet/Makefile12
-rw-r--r--deskutils/flameshot/Makefile4
-rw-r--r--deskutils/grantlee-editor/Makefile4
-rw-r--r--deskutils/grantleetheme/Makefile4
-rw-r--r--deskutils/homerun/Makefile4
-rw-r--r--deskutils/kaddressbook/Makefile4
-rw-r--r--deskutils/kalarm/Makefile4
-rw-r--r--deskutils/kcharselect-kde4/Makefile4
-rw-r--r--deskutils/kcharselect/Makefile4
-rw-r--r--deskutils/kchmviewer/Makefile4
-rw-r--r--deskutils/kdeconnect/Makefile4
-rw-r--r--deskutils/kdepim-addons/Makefile4
-rw-r--r--deskutils/kdepim-apps-libs/Makefile4
-rw-r--r--deskutils/kdepim-kde4/Makefile4
-rw-r--r--deskutils/kdepim-runtime-kde4/Makefile4
-rw-r--r--deskutils/kdepim-runtime/Makefile4
-rw-r--r--deskutils/kdepimlibs-kde4/Makefile4
-rw-r--r--deskutils/kdeplasma-addons-kde4/Makefile4
-rw-r--r--deskutils/keditbookmarks/Makefile4
-rw-r--r--deskutils/kfind/Makefile4
-rw-r--r--deskutils/kmail-account-wizard/Makefile4
-rw-r--r--deskutils/kmail/Makefile4
-rw-r--r--deskutils/knotes/Makefile4
-rw-r--r--deskutils/kontact/Makefile4
-rw-r--r--deskutils/korganizer/Makefile4
-rw-r--r--deskutils/kruler-kde4/Makefile4
-rw-r--r--deskutils/kruler/Makefile4
-rw-r--r--deskutils/ksshaskpass/Makefile4
-rw-r--r--deskutils/latte-dock/Makefile4
-rw-r--r--deskutils/launchy/Makefile4
-rw-r--r--deskutils/libkdepim/Makefile4
-rw-r--r--deskutils/lumina-archiver/Makefile6
-rw-r--r--deskutils/lumina-calculator/Makefile6
-rw-r--r--deskutils/lumina-fileinfo/Makefile6
-rw-r--r--deskutils/lumina-fm/Makefile6
-rw-r--r--deskutils/lumina-mediaplayer/Makefile6
-rw-r--r--deskutils/lumina-notify/Makefile6
-rw-r--r--deskutils/lumina-pdf/Makefile6
-rw-r--r--deskutils/lumina-screenshot/Makefile6
-rw-r--r--deskutils/lumina-textedit/Makefile6
-rw-r--r--deskutils/lumina-xdg-entry/Makefile6
-rw-r--r--deskutils/mbox-importer/Makefile4
-rw-r--r--deskutils/nextcloudclient/Makefile4
-rw-r--r--deskutils/owncloudclient/Makefile4
-rw-r--r--deskutils/pim-data-exporter/Makefile4
-rw-r--r--deskutils/pim-sieve-editor/Makefile5
-rw-r--r--deskutils/plasma-applet-cwp/Makefile4
-rw-r--r--deskutils/plasma-applet-daisy/Makefile4
-rw-r--r--deskutils/plasma-applet-fancytasks/Makefile4
-rw-r--r--deskutils/plasma-applet-panelspacer/Makefile4
-rw-r--r--deskutils/plasma-applet-qstardict/Makefile4
-rw-r--r--deskutils/plasma-applet-serverstatuswidget/Makefile4
-rw-r--r--deskutils/plasma-applet-simpleweatherforecast/Makefile4
-rw-r--r--deskutils/plasma-applet-teacooker/Makefile4
-rw-r--r--deskutils/plasma-applet-yawp/Makefile4
-rw-r--r--deskutils/plasma5-milou/Makefile4
-rw-r--r--deskutils/plasma5-sddm-kcm/Makefile4
-rw-r--r--deskutils/qorganizer/Makefile4
-rw-r--r--deskutils/qrfcview/Makefile4
-rw-r--r--deskutils/qtm/Makefile4
-rw-r--r--deskutils/recoll/Makefile8
-rw-r--r--deskutils/semantik/Makefile5
-rw-r--r--deskutils/silence/Makefile4
-rw-r--r--deskutils/strigiclient/Makefile3
-rw-r--r--deskutils/superkaramba-kde4/Makefile4
-rw-r--r--deskutils/tuxcards/Makefile4
-rw-r--r--deskutils/vym/Makefile7
-rw-r--r--deskutils/znotes/Makefile6
-rw-r--r--devel/RStudio/Makefile4
-rw-r--r--devel/ace/Makefile3
-rw-r--r--devel/apiextractor/Makefile4
-rw-r--r--devel/apitrace/Makefile3
-rw-r--r--devel/automoc4/Makefile4
-rw-r--r--devel/cervisia-kde4/Makefile4
-rw-r--r--devel/cervisia/Makefile4
-rw-r--r--devel/cmake-doc/Makefile4
-rw-r--r--devel/cmake-gui/Makefile4
-rw-r--r--devel/codequery/Makefile4
-rw-r--r--devel/cppcheck/Makefile3
-rw-r--r--devel/dolphin-plugins-kde4/Makefile4
-rw-r--r--devel/dolphin-plugins/Makefile4
-rw-r--r--devel/doxygen/Makefile6
-rw-r--r--devel/edb/Makefile4
-rw-r--r--devel/fuel/Makefile6
-rw-r--r--devel/gecode/Makefile3
-rw-r--r--devel/generatorrunner/Makefile4
-rw-r--r--devel/grantlee/Makefile4
-rw-r--r--devel/grantlee5/Makefile4
-rw-r--r--devel/gwenhywfar/Makefile8
-rw-r--r--devel/heimdall/Makefile3
-rw-r--r--devel/injeqt/Makefile4
-rw-r--r--devel/kapptemplate-kde4/Makefile4
-rw-r--r--devel/kapptemplate/Makefile4
-rw-r--r--devel/kaptain/Makefile4
-rw-r--r--devel/kcachegrind-kde4/Makefile4
-rw-r--r--devel/kcachegrind/Makefile4
-rw-r--r--devel/kdbg/Makefile4
-rw-r--r--devel/kde-dev-scripts-kde4/Makefile4
-rw-r--r--devel/kde-dev-scripts/Makefile4
-rw-r--r--devel/kde-dev-utils-kde4/Makefile4
-rw-r--r--devel/kde-dev-utils/Makefile4
-rw-r--r--devel/kdesdk-kioslaves-kde4/Makefile4
-rw-r--r--devel/kdesdk-strigi-analyzers-kde4/Makefile4
-rw-r--r--devel/kdesdk-thumbnailers-kde4/Makefile4
-rw-r--r--devel/kdesdk-thumbnailers/Makefile4
-rw-r--r--devel/kdesdk/Makefile6
-rw-r--r--devel/kdesvn-kde4/Makefile4
-rw-r--r--devel/kdesvn/Makefile4
-rw-r--r--devel/kdev-php/Makefile4
-rw-r--r--devel/kdev-python/Makefile4
-rw-r--r--devel/kdevelop-kde4/Makefile4
-rw-r--r--devel/kdevelop-pg-qt-kde4/Makefile4
-rw-r--r--devel/kdevelop-pg-qt/Makefile4
-rw-r--r--devel/kdevelop-php-docs-kde4/Makefile4
-rw-r--r--devel/kdevelop-php-kde4/Makefile4
-rw-r--r--devel/kdevelop/Makefile9
-rw-r--r--devel/kdevplatform-kde4/Makefile4
-rw-r--r--devel/kf5-extra-cmake-modules/Makefile10
-rw-r--r--devel/kf5-kapidox/Makefile4
-rw-r--r--devel/kf5-kauth/Makefile4
-rw-r--r--devel/kf5-kbookmarks/Makefile4
-rw-r--r--devel/kf5-kcmutils/Makefile4
-rw-r--r--devel/kf5-kconfig/Makefile4
-rw-r--r--devel/kf5-kcoreaddons/Makefile4
-rw-r--r--devel/kf5-kcrash/Makefile4
-rw-r--r--devel/kf5-kdbusaddons/Makefile4
-rw-r--r--devel/kf5-kdeclarative/Makefile4
-rw-r--r--devel/kf5-kdoctools/Makefile4
-rw-r--r--devel/kf5-kfilemetadata/Makefile4
-rw-r--r--devel/kf5-ki18n/Makefile4
-rw-r--r--devel/kf5-kidletime/Makefile4
-rw-r--r--devel/kf5-kio/Makefile4
-rw-r--r--devel/kf5-kitemmodels/Makefile4
-rw-r--r--devel/kf5-knewstuff/Makefile4
-rw-r--r--devel/kf5-knotifications/Makefile4
-rw-r--r--devel/kf5-knotifyconfig/Makefile4
-rw-r--r--devel/kf5-kpackage/Makefile4
-rw-r--r--devel/kf5-kparts/Makefile4
-rw-r--r--devel/kf5-kpeople/Makefile4
-rw-r--r--devel/kf5-kpty/Makefile4
-rw-r--r--devel/kf5-kservice/Makefile4
-rw-r--r--devel/kf5-ktexteditor/Makefile4
-rw-r--r--devel/kf5-kunitconversion/Makefile4
-rw-r--r--devel/kf5-solid/Makefile4
-rw-r--r--devel/kf5-threadweaver/Makefile4
-rw-r--r--devel/kio-extras/Makefile7
-rw-r--r--devel/libdbusmenu-qt/Makefile6
-rw-r--r--devel/libkgapi-kde4/Makefile4
-rw-r--r--devel/libkolab/Makefile4
-rw-r--r--devel/liblxqt-l10n/Makefile4
-rw-r--r--devel/liblxqt/Makefile4
-rw-r--r--devel/libqtxdg/Makefile6
-rw-r--r--devel/liteide/Makefile6
-rw-r--r--devel/lokalize-kde4/Makefile4
-rw-r--r--devel/lokalize/Makefile4
-rw-r--r--devel/lxqt-build-tools/Makefile4
-rw-r--r--devel/okteta-kde4/Makefile4
-rw-r--r--devel/okteta/Makefile4
-rw-r--r--devel/p5-perlkde-kde4/Makefile4
-rw-r--r--devel/p5-perlqt-kde4/Makefile4
-rw-r--r--devel/piklab/Makefile4
-rw-r--r--devel/plasma5-khotkeys/Makefile4
-rw-r--r--devel/plasma5-kwrited/Makefile4
-rw-r--r--devel/plasma5-plasma-sdk/Makefile4
-rw-r--r--devel/poxml-kde4/Makefile4
-rw-r--r--devel/poxml/Makefile4
-rw-r--r--devel/py-krosspython-kde4/Makefile4
-rw-r--r--devel/py-pykde4-kde4/Makefile4
-rw-r--r--devel/py-pykdeuic4-kde4/Makefile4
-rw-r--r--devel/py-qt4-assistant/Makefile4
-rw-r--r--devel/py-qt4-core/Makefile4
-rw-r--r--devel/py-qt4-dbus/Makefile4
-rw-r--r--devel/py-qt4-dbussupport/Makefile4
-rw-r--r--devel/py-qt4-declarative/Makefile4
-rw-r--r--devel/py-qt4-designer/Makefile4
-rw-r--r--devel/py-qt4-designerplugin/Makefile4
-rw-r--r--devel/py-qt4-help/Makefile4
-rw-r--r--devel/py-qt4-qscintilla2/Makefile5
-rw-r--r--devel/py-qt4-script/Makefile4
-rw-r--r--devel/py-qt4-scripttools/Makefile4
-rw-r--r--devel/py-qt4-test/Makefile4
-rw-r--r--devel/py-qt5-core/Makefile4
-rw-r--r--devel/py-qt5-dbus/Makefile4
-rw-r--r--devel/py-qt5-dbussupport/Makefile4
-rw-r--r--devel/py-qt5-designer/Makefile4
-rw-r--r--devel/py-qt5-designerplugin/Makefile4
-rw-r--r--devel/py-qt5-help/Makefile4
-rw-r--r--devel/py-qt5-qscintilla2/Makefile5
-rw-r--r--devel/py-qt5-test/Makefile4
-rw-r--r--devel/pyside-tools/Makefile4
-rw-r--r--devel/pyside/Makefile4
-rw-r--r--devel/qbs/Makefile7
-rw-r--r--devel/qbzr/Makefile4
-rw-r--r--devel/qca/Makefile6
-rw-r--r--devel/qconf/Makefile5
-rw-r--r--devel/qdevelop/Makefile9
-rw-r--r--devel/qgit/Makefile4
-rw-r--r--devel/qjson/Makefile6
-rw-r--r--devel/qprog/Makefile4
-rw-r--r--devel/qross/Makefile4
-rw-r--r--devel/qscintilla2-designerplugin-qt5/Makefile4
-rw-r--r--devel/qscintilla2-designerplugin/Makefile4
-rw-r--r--devel/qscintilla2-qt5/Makefile4
-rw-r--r--devel/qscintilla2/Makefile4
-rw-r--r--devel/qt-maybe/Makefile3
-rw-r--r--devel/qt4-assistant-adp/Makefile4
-rw-r--r--devel/qt4-assistant/Makefile4
-rw-r--r--devel/qt4-corelib/Makefile5
-rw-r--r--devel/qt4-dbus/Makefile5
-rw-r--r--devel/qt4-designer/Makefile4
-rw-r--r--devel/qt4-help-tools/Makefile4
-rw-r--r--devel/qt4-help/Makefile4
-rw-r--r--devel/qt4-libqtassistantclient/Makefile4
-rw-r--r--devel/qt4-linguist/Makefile4
-rw-r--r--devel/qt4-linguisttools/Makefile4
-rw-r--r--devel/qt4-makeqpf/Makefile4
-rw-r--r--devel/qt4-moc/Makefile3
-rw-r--r--devel/qt4-porting/Makefile4
-rw-r--r--devel/qt4-qdbusviewer/Makefile5
-rw-r--r--devel/qt4-qdoc3/Makefile4
-rw-r--r--devel/qt4-qmake/Makefile4
-rw-r--r--devel/qt4-qmlviewer/Makefile4
-rw-r--r--devel/qt4-qt3support/Makefile5
-rw-r--r--devel/qt4-qtsolutions-singleapplication/Makefile4
-rw-r--r--devel/qt4-qtsolutions-soap/Makefile3
-rw-r--r--devel/qt4-qvfb/Makefile4
-rw-r--r--devel/qt4-rcc/Makefile3
-rw-r--r--devel/qt4-script/Makefile5
-rw-r--r--devel/qt4-scripttools/Makefile4
-rw-r--r--devel/qt4-testlib/Makefile4
-rw-r--r--devel/qt4-uic/Makefile3
-rw-r--r--devel/qt4-uic3/Makefile4
-rw-r--r--devel/qt4/Makefile8
-rw-r--r--devel/qt4/Makefile.sqldrivers5
-rw-r--r--devel/qt5-assistant/Makefile5
-rw-r--r--devel/qt5-buildtools/Makefile4
-rw-r--r--devel/qt5-concurrent/Makefile4
-rw-r--r--devel/qt5-core/Makefile4
-rw-r--r--devel/qt5-dbus/Makefile4
-rw-r--r--devel/qt5-designer/Makefile8
-rw-r--r--devel/qt5-help/Makefile5
-rw-r--r--devel/qt5-linguist/Makefile5
-rw-r--r--devel/qt5-linguisttools/Makefile5
-rw-r--r--devel/qt5-location/Makefile5
-rw-r--r--devel/qt5-qdbus/Makefile5
-rw-r--r--devel/qt5-qdbusviewer/Makefile5
-rw-r--r--devel/qt5-qdoc-data/Makefile4
-rw-r--r--devel/qt5-qdoc/Makefile5
-rw-r--r--devel/qt5-qmake/Makefile4
-rw-r--r--devel/qt5-script/Makefile5
-rw-r--r--devel/qt5-scripttools/Makefile5
-rw-r--r--devel/qt5-scxml/Makefile5
-rw-r--r--devel/qt5-testlib/Makefile4
-rw-r--r--devel/qt5-uitools/Makefile5
-rw-r--r--devel/qt5/Makefile4
-rw-r--r--devel/qt5/Makefile.sqldrivers4
-rw-r--r--devel/qtcreator/Makefile10
-rw-r--r--devel/qtscriptgenerator/Makefile6
-rw-r--r--devel/ruby-korundum-kde4/Makefile4
-rw-r--r--devel/ruby-krossruby-kde4/Makefile4
-rw-r--r--devel/ruby-qtruby-kde4/Makefile4
-rw-r--r--devel/shiboken/Makefile4
-rw-r--r--devel/smokegen-kde4/Makefile4
-rw-r--r--devel/smokekde-kde4/Makefile4
-rw-r--r--devel/smokeqt-kde4/Makefile4
-rw-r--r--devel/subcommander2/Makefile5
-rw-r--r--devel/svn2git/Makefile4
-rw-r--r--devel/thrift-cpp/Makefile3
-rw-r--r--devel/umbrello-kde4/Makefile4
-rw-r--r--devel/umbrello/Makefile4
-rw-r--r--devel/universalindentgui/Makefile4
-rw-r--r--devel/zeal/Makefile4
-rw-r--r--dns/kf5-kdnssd/Makefile10
-rw-r--r--editors/calligra/Makefile4
-rw-r--r--editors/calligraplan/Makefile4
-rw-r--r--editors/encryptpad/Makefile4
-rw-r--r--editors/focuswriter/Makefile4
-rw-r--r--editors/kate-kde4/Makefile4
-rw-r--r--editors/kate-plugin-pate-kde4/Makefile4
-rw-r--r--editors/kate/Makefile4
-rw-r--r--editors/kile-kde4/Makefile4
-rw-r--r--editors/kile/Makefile4
-rw-r--r--editors/klat4/Makefile4
-rw-r--r--editors/lfhex/Makefile4
-rw-r--r--editors/libreoffice/Makefile5
-rw-r--r--editors/mp/Makefile8
-rw-r--r--editors/neovim-qt/Makefile4
-rw-r--r--editors/plume-creator-devel/Makefile4
-rw-r--r--editors/tea/Makefile6
-rw-r--r--editors/texmacs/Makefile5
-rw-r--r--editors/texmaker/Makefile6
-rw-r--r--editors/texstudio/Makefile10
-rw-r--r--editors/textroom/Makefile4
-rw-r--r--editors/texworks/Makefile4
-rw-r--r--editors/yzis/Makefile8
-rw-r--r--emulators/aqemu/Makefile4
-rw-r--r--emulators/citra/Makefile4
-rw-r--r--emulators/dboxfe/Makefile4
-rw-r--r--emulators/higan/Makefile3
-rw-r--r--emulators/mame/Makefile4
-rw-r--r--emulators/mgba/Makefile4
-rw-r--r--emulators/mupen64plus-qt/Makefile4
-rw-r--r--emulators/ppsspp/Makefile3
-rw-r--r--emulators/q4wine/Makefile7
-rw-r--r--emulators/qmc2/Makefile4
-rw-r--r--emulators/qtemu/Makefile7
-rw-r--r--emulators/rpcs3/Makefile4
-rw-r--r--emulators/swine/Makefile4
-rw-r--r--emulators/virtualbox-ose/Makefile6
-rw-r--r--emulators/yabause/Makefile10
-rw-r--r--finance/alkimia/Makefile11
-rw-r--r--finance/kmymoney-kde4/Makefile4
-rw-r--r--finance/kmymoney/Makefile10
-rw-r--r--finance/qhacc/Makefile4
-rw-r--r--finance/skrooge/Makefile4
-rw-r--r--french/aster/Makefile4
-rw-r--r--ftp/plasma-applet-ftpmonitor/Makefile4
-rw-r--r--ftp/scythia/Makefile4
-rw-r--r--games/2048-qt/Makefile4
-rw-r--r--games/allacrost/Makefile4
-rw-r--r--games/anki/Makefile4
-rw-r--r--games/arx-libertatis/Makefile5
-rw-r--r--games/auralquiz/Makefile4
-rw-r--r--games/blinken-kde4/Makefile4
-rw-r--r--games/blinken/Makefile4
-rw-r--r--games/bomber-kde4/Makefile4
-rw-r--r--games/bomber/Makefile4
-rw-r--r--games/bovo-kde4/Makefile4
-rw-r--r--games/bovo/Makefile4
-rw-r--r--games/bubble-chains/Makefile4
-rw-r--r--games/capicity/Makefile4
-rw-r--r--games/capitalism/Makefile4
-rw-r--r--games/chessx/Makefile4
-rw-r--r--games/cockatrice/Makefile8
-rw-r--r--games/colorcode/Makefile4
-rw-r--r--games/connectagram/Makefile4
-rw-r--r--games/cutemaze/Makefile4
-rw-r--r--games/doomsday/Makefile4
-rw-r--r--games/dustrac/Makefile4
-rw-r--r--games/flightgear/Makefile3
-rw-r--r--games/flukz/Makefile4
-rw-r--r--games/gcompris-qt/Makefile4
-rw-r--r--games/goldencheetah/Makefile4
-rw-r--r--games/gottet/Makefile4
-rw-r--r--games/granatier-kde4/Makefile4
-rw-r--r--games/granatier/Makefile4
-rw-r--r--games/hedgewars/Makefile4
-rw-r--r--games/hexalate/Makefile4
-rw-r--r--games/jag/Makefile4
-rw-r--r--games/kajongg-kde4/Makefile4
-rw-r--r--games/kajongg/Makefile4
-rw-r--r--games/kanagram-kde4/Makefile4
-rw-r--r--games/kanagram/Makefile4
-rw-r--r--games/kapman-kde4/Makefile4
-rw-r--r--games/kapman/Makefile4
-rw-r--r--games/kardsgt/Makefile4
-rw-r--r--games/katomic-kde4/Makefile4
-rw-r--r--games/katomic/Makefile4
-rw-r--r--games/kblackbox-kde4/Makefile4
-rw-r--r--games/kblackbox/Makefile4
-rw-r--r--games/kblocks-kde4/Makefile4
-rw-r--r--games/kblocks/Makefile4
-rw-r--r--games/kbounce-kde4/Makefile4
-rw-r--r--games/kbounce/Makefile4
-rw-r--r--games/kbreakout-kde4/Makefile4
-rw-r--r--games/kbreakout/Makefile4
-rw-r--r--games/kcheckers/Makefile4
-rw-r--r--games/kdiamond-kde4/Makefile4
-rw-r--r--games/kdiamond/Makefile4
-rw-r--r--games/kfourinline-kde4/Makefile4
-rw-r--r--games/kfourinline/Makefile4
-rw-r--r--games/kgoldrunner-kde4/Makefile4
-rw-r--r--games/kgoldrunner/Makefile4
-rw-r--r--games/khangman-kde4/Makefile4
-rw-r--r--games/khangman/Makefile4
-rw-r--r--games/kigo-kde4/Makefile4
-rw-r--r--games/kigo/Makefile4
-rw-r--r--games/killbots-kde4/Makefile4
-rw-r--r--games/killbots/Makefile4
-rw-r--r--games/kiriki-kde4/Makefile4
-rw-r--r--games/kiriki/Makefile4
-rw-r--r--games/kjumpingcube-kde4/Makefile4
-rw-r--r--games/kjumpingcube/Makefile4
-rw-r--r--games/klickety-kde4/Makefile4
-rw-r--r--games/klickety/Makefile4
-rw-r--r--games/klines-kde4/Makefile4
-rw-r--r--games/klines/Makefile4
-rw-r--r--games/kmahjongg-kde4/Makefile4
-rw-r--r--games/kmahjongg/Makefile4
-rw-r--r--games/kmines-kde4/Makefile4
-rw-r--r--games/kmines/Makefile4
-rw-r--r--games/knavalbattle-kde4/Makefile4
-rw-r--r--games/knavalbattle/Makefile4
-rw-r--r--games/knetwalk-kde4/Makefile4
-rw-r--r--games/knetwalk/Makefile4
-rw-r--r--games/knights-kde4/Makefile4
-rw-r--r--games/kolf-kde4/Makefile4
-rw-r--r--games/kolf/Makefile4
-rw-r--r--games/kollision-kde4/Makefile4
-rw-r--r--games/kollision/Makefile4
-rw-r--r--games/konquest-kde4/Makefile4
-rw-r--r--games/konquest/Makefile4
-rw-r--r--games/kpat-kde4/Makefile4
-rw-r--r--games/kpat/Makefile4
-rw-r--r--games/kreversi-kde4/Makefile4
-rw-r--r--games/kreversi/Makefile4
-rw-r--r--games/kshisen-kde4/Makefile4
-rw-r--r--games/kshisen/Makefile4
-rw-r--r--games/ksirk-kde4/Makefile4
-rw-r--r--games/ksirk/Makefile4
-rw-r--r--games/ksnakeduel-kde4/Makefile4
-rw-r--r--games/ksnakeduel/Makefile4
-rw-r--r--games/kspaceduel-kde4/Makefile4
-rw-r--r--games/kspaceduel/Makefile4
-rw-r--r--games/ksquares-kde4/Makefile4
-rw-r--r--games/ksquares/Makefile4
-rw-r--r--games/ksudoku-kde4/Makefile4
-rw-r--r--games/ksudoku/Makefile4
-rw-r--r--games/ktuberling-kde4/Makefile4
-rw-r--r--games/ktuberling/Makefile4
-rw-r--r--games/kubrick-kde4/Makefile4
-rw-r--r--games/kubrick/Makefile4
-rw-r--r--games/libkdegames-kde4/Makefile4
-rw-r--r--games/libkdegames/Makefile4
-rw-r--r--games/libkmahjongg-kde4/Makefile4
-rw-r--r--games/libkmahjongg/Makefile4
-rw-r--r--games/lskat-kde4/Makefile4
-rw-r--r--games/lskat/Makefile4
-rw-r--r--games/multimc/Makefile4
-rw-r--r--games/openmw/Makefile4
-rw-r--r--games/openpref/Makefile4
-rw-r--r--games/pairs-kde4/Makefile4
-rw-r--r--games/palapeli-kde4/Makefile4
-rw-r--r--games/palapeli/Makefile4
-rw-r--r--games/peg-e/Makefile4
-rw-r--r--games/pentobi/Makefile4
-rw-r--r--games/picmi-kde4/Makefile4
-rw-r--r--games/picmi/Makefile4
-rw-r--r--games/pokerth/Makefile4
-rw-r--r--games/qgo/Makefile4
-rw-r--r--games/qnetwalk/Makefile4
-rw-r--r--games/qtads/Makefile4
-rw-r--r--games/quackle/Makefile4
-rw-r--r--games/simsu/Makefile4
-rw-r--r--games/solarus-quest-editor/Makefile4
-rw-r--r--games/solarus/Makefile4
-rw-r--r--games/spellathon/Makefile4
-rw-r--r--games/sudoku-sensei/Makefile4
-rw-r--r--games/tanglet/Makefile4
-rw-r--r--games/tbe/Makefile4
-rw-r--r--games/tetzle/Makefile4
-rw-r--r--games/valyriatear/Makefile3
-rw-r--r--games/warzone2100/Makefile6
-rw-r--r--games/xptools/Makefile4
-rw-r--r--german/tipp10/Makefile4
-rw-r--r--graphics/appleseed/Makefile3
-rw-r--r--graphics/aqsis/Makefile4
-rw-r--r--graphics/autoq3d/Makefile4
-rw-r--r--graphics/burplex/Makefile4
-rw-r--r--graphics/cloudcompare/Makefile7
-rw-r--r--graphics/colmap/Makefile4
-rw-r--r--graphics/converseen/Makefile4
-rw-r--r--graphics/darknock/Makefile4
-rw-r--r--graphics/diffpdf/Makefile4
-rw-r--r--graphics/digikam-kde4/Makefile7
-rw-r--r--graphics/digikam-kde4/Makefile.common4
-rw-r--r--graphics/digikam/Makefile7
-rw-r--r--graphics/dilay/Makefile4
-rw-r--r--graphics/djview4/Makefile6
-rw-r--r--graphics/drawpile/Makefile4
-rw-r--r--graphics/dspdfviewer/Makefile4
-rw-r--r--graphics/easypaint/Makefile4
-rw-r--r--graphics/engauge-digitizer/Makefile6
-rw-r--r--graphics/eos-movrec/Makefile4
-rw-r--r--graphics/evolvotron/Makefile4
-rw-r--r--graphics/fracplanet/Makefile5
-rw-r--r--graphics/fraqtive/Makefile4
-rw-r--r--graphics/gle-graphics/Makefile4
-rw-r--r--graphics/gmic-qt/Makefile4
-rw-r--r--graphics/gnash/Makefile5
-rw-r--r--graphics/gpxsee/Makefile11
-rw-r--r--graphics/graphviz/Makefile5
-rw-r--r--graphics/gwenview-kde4/Makefile4
-rw-r--r--graphics/gwenview/Makefile4
-rw-r--r--graphics/ipe/Makefile4
-rw-r--r--graphics/kamera-kde4/Makefile4
-rw-r--r--graphics/kamera/Makefile4
-rw-r--r--graphics/kcolorchooser-kde4/Makefile4
-rw-r--r--graphics/kcolorchooser/Makefile4
-rw-r--r--graphics/kcoloredit/Makefile4
-rw-r--r--graphics/kdegraphics-mobipocket-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-mobipocket/Makefile4
-rw-r--r--graphics/kdegraphics-strigi-analyzer-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-svgpart-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-svgpart/Makefile4
-rw-r--r--graphics/kdegraphics-thumbnailers-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-thumbnailers/Makefile4
-rw-r--r--graphics/kdegraphics/Makefile4
-rw-r--r--graphics/kdiagram/Makefile4
-rw-r--r--graphics/kf5-kimageformats/Makefile4
-rw-r--r--graphics/kf5-kplotting/Makefile4
-rw-r--r--graphics/kf5-prison/Makefile4
-rw-r--r--graphics/kgraphviewer/Makefile4
-rw-r--r--graphics/kiconedit/Makefile4
-rw-r--r--graphics/kimagemapeditor/Makefile4
-rw-r--r--graphics/kipiplugins/Makefile4
-rw-r--r--graphics/klatexformula/Makefile4
-rw-r--r--graphics/kolourpaint-kde4/Makefile4
-rw-r--r--graphics/kolourpaint/Makefile4
-rw-r--r--graphics/kphotoalbum-kde4/Makefile4
-rw-r--r--graphics/kphotoalbum/Makefile4
-rw-r--r--graphics/kpovmodeler/Makefile4
-rw-r--r--graphics/kqtquickcharts-kde4/Makefile4
-rw-r--r--graphics/krita/Makefile5
-rw-r--r--graphics/ksaneplugin-kde4/Makefile4
-rw-r--r--graphics/ksnapshot-kde4/Makefile4
-rw-r--r--graphics/libQGLViewer/Makefile4
-rw-r--r--graphics/libkdcraw-kde4/Makefile4
-rw-r--r--graphics/libkdcraw/Makefile4
-rw-r--r--graphics/libkexiv2-kde4/Makefile4
-rw-r--r--graphics/libkexiv2/Makefile4
-rw-r--r--graphics/libkipi-kde4/Makefile4
-rw-r--r--graphics/libkipi/Makefile4
-rw-r--r--graphics/libksane-kde4/Makefile4
-rw-r--r--graphics/libksane/Makefile4
-rw-r--r--graphics/libkscreen/Makefile4
-rw-r--r--graphics/lprof-devel/Makefile4
-rw-r--r--graphics/luminance-qt5/Makefile4
-rw-r--r--graphics/luminance/Makefile4
-rw-r--r--graphics/luxrender/Makefile3
-rw-r--r--graphics/lximage-qt/Makefile4
-rw-r--r--graphics/lximageqt-l10n/Makefile4
-rw-r--r--graphics/meshviewer/Makefile4
-rw-r--r--graphics/mitsuba/Makefile4
-rw-r--r--graphics/natron/Makefile4
-rw-r--r--graphics/nomacs/Makefile4
-rw-r--r--graphics/nvidia-texture-tools/Makefile3
-rw-r--r--graphics/okular-kde4/Makefile4
-rw-r--r--graphics/okular/Makefile4
-rw-r--r--graphics/opencsg/Makefile4
-rw-r--r--graphics/opencv/Makefile3
-rw-r--r--graphics/openimageio/Makefile3
-rw-r--r--graphics/openorienteering-mapper/Makefile17
-rw-r--r--graphics/osg-devel/Makefile6
-rw-r--r--graphics/osg/Makefile6
-rw-r--r--graphics/oyranos/Makefile4
-rw-r--r--graphics/pencil/Makefile4
-rw-r--r--graphics/pfstools/Makefile5
-rw-r--r--graphics/photivo/Makefile6
-rw-r--r--graphics/photoqt/Makefile4
-rw-r--r--graphics/phototonic/Makefile4
-rw-r--r--graphics/poppler/Makefile6
-rw-r--r--graphics/prison/Makefile4
-rw-r--r--graphics/py-qt4-svg/Makefile4
-rw-r--r--graphics/py-qt5-svg/Makefile4
-rw-r--r--graphics/qcomicbook/Makefile4
-rw-r--r--graphics/qgis/Makefile4
-rw-r--r--graphics/qt4-iconengines/Makefile5
-rw-r--r--graphics/qt4-imageformats/Makefile5
-rw-r--r--graphics/qt4-opengl/Makefile4
-rw-r--r--graphics/qt4-pixeltool/Makefile4
-rw-r--r--graphics/qt4-svg/Makefile4
-rw-r--r--graphics/qt5-3d/Makefile5
-rw-r--r--graphics/qt5-graphicaleffects/Makefile5
-rw-r--r--graphics/qt5-imageformats/Makefile5
-rw-r--r--graphics/qt5-opengl/Makefile4
-rw-r--r--graphics/qt5-pixeltool/Makefile5
-rw-r--r--graphics/qt5-svg/Makefile5
-rw-r--r--graphics/qt5-wayland/Makefile5
-rw-r--r--graphics/qtawesome/Makefile6
-rw-r--r--graphics/qxv/Makefile4
-rw-r--r--graphics/scantailor/Makefile4
-rw-r--r--graphics/seexpr/Makefile4
-rw-r--r--graphics/showimage/Makefile4
-rw-r--r--graphics/skanlite-kde4/Makefile4
-rw-r--r--graphics/skanlite/Makefile4
-rw-r--r--graphics/smillaenlarger/Makefile4
-rw-r--r--graphics/spectacle/Makefile4
-rw-r--r--graphics/structuresynth/Makefile4
-rw-r--r--graphics/tiled/Makefile4
-rw-r--r--graphics/tulip/Makefile14
-rw-r--r--graphics/xpdf4/Makefile4
-rw-r--r--graphics/yagf/Makefile4
-rw-r--r--graphics/zbar/Makefile3
-rw-r--r--graphics/zint/Makefile4
-rw-r--r--irc/dxirc/Makefile10
-rw-r--r--irc/konversation/Makefile4
-rw-r--r--irc/kvirc/Makefile10
-rw-r--r--irc/quassel/Makefile17
-rw-r--r--japanese/fcitx-skk/Makefile3
-rw-r--r--japanese/kiten-kde4/Makefile4
-rw-r--r--japanese/kiten/Makefile4
-rw-r--r--japanese/mozc-server/Makefile3
-rw-r--r--japanese/qt4-codecs-jp/Makefile4
-rw-r--r--java/classpath/Makefile3
-rw-r--r--korean/qt4-codecs-kr/Makefile4
-rw-r--r--lang/basic256/Makefile4
-rw-r--r--lang/kf5-kross/Makefile4
-rw-r--r--lang/kross-interpreters/Makefile4
-rw-r--r--lang/kturtle-kde4/Makefile4
-rw-r--r--lang/kturtle/Makefile4
-rw-r--r--lang/py-qt5-qml/Makefile4
-rw-r--r--lang/qt5-qml/Makefile5
-rw-r--r--mail/emailrelay/Makefile3
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/kshowmail/Makefile4
-rw-r--r--mail/qgmailnotifier/Makefile4
-rw-r--r--mail/trojita/Makefile4
-rw-r--r--math/abakus/Makefile4
-rw-r--r--math/acalc/Makefile4
-rw-r--r--math/analitza-kde4/Makefile4
-rw-r--r--math/analitza/Makefile4
-rw-r--r--math/cantor-kde4/Makefile4
-rw-r--r--math/cantor/Makefile4
-rw-r--r--math/cgal/Makefile3
-rw-r--r--math/freemat/Makefile4
-rw-r--r--math/g2o/Makefile4
-rw-r--r--math/kalgebra-kde4/Makefile4
-rw-r--r--math/kalgebra/Makefile4
-rw-r--r--math/kbruch-kde4/Makefile4
-rw-r--r--math/kbruch/Makefile4
-rw-r--r--math/kcalc-kde4/Makefile4
-rw-r--r--math/kcalc/Makefile4
-rw-r--r--math/kig-kde4/Makefile4
-rw-r--r--math/kig/Makefile4
-rw-r--r--math/kmplot-kde4/Makefile4
-rw-r--r--math/kmplot/Makefile4
-rw-r--r--math/labplot/Makefile4
-rw-r--r--math/mathgl/Makefile4
-rw-r--r--math/mathmod/Makefile4
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/plplot/Makefile3
-rw-r--r--math/qtiplot/Makefile10
-rw-r--r--math/qtoctave/Makefile4
-rw-r--r--math/qwtplot3d-qt4/Makefile4
-rw-r--r--math/rkward-kde/Makefile4
-rw-r--r--math/rocs-kde4/Makefile4
-rw-r--r--math/rocs/Makefile4
-rw-r--r--math/speedcrunch/Makefile4
-rw-r--r--math/vtk5/Makefile4
-rw-r--r--math/vtk6/Makefile10
-rw-r--r--misc/artikulate-kde4/Makefile4
-rw-r--r--misc/artikulate/Makefile4
-rw-r--r--misc/bibletime/Makefile4
-rw-r--r--misc/crosti/Makefile4
-rw-r--r--misc/kde-thumbnailer-chm/Makefile4
-rw-r--r--misc/kde-thumbnailer-epub/Makefile4
-rw-r--r--misc/kde-thumbnailer-fb2/Makefile4
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk4
-rw-r--r--misc/kdeedu-data/Makefile4
-rw-r--r--misc/kf5-purpose/Makefile4
-rw-r--r--misc/kgeography-kde4/Makefile4
-rw-r--r--misc/kgeography/Makefile4
-rw-r--r--misc/klettres-kde4/Makefile4
-rw-r--r--misc/klettres/Makefile4
-rw-r--r--misc/krecipes-kde4/Makefile16
-rw-r--r--misc/ktouch-kde4/Makefile4
-rw-r--r--misc/ktouch/Makefile4
-rw-r--r--misc/kwordquiz-kde4/Makefile4
-rw-r--r--misc/kwordquiz/Makefile4
-rw-r--r--misc/libkdeedu-kde4/Makefile4
-rw-r--r--misc/libkeduvocdocument/Makefile4
-rw-r--r--misc/lxi-tools/Makefile4
-rw-r--r--misc/openmvg/Makefile4
-rw-r--r--misc/parley-kde4/Makefile4
-rw-r--r--misc/parley/Makefile4
-rw-r--r--misc/qbrew/Makefile4
-rw-r--r--misc/qmetro/Makefile4
-rw-r--r--misc/qt4-doc/Makefile3
-rw-r--r--misc/qt4-l10n/Makefile4
-rw-r--r--misc/qt4-qtconfig/Makefile8
-rw-r--r--misc/qt4-qtdemo/Makefile5
-rw-r--r--misc/qt5-doc/Makefile4
-rw-r--r--misc/qt5-examples/Makefile4
-rw-r--r--misc/qt5-l10n/Makefile5
-rw-r--r--misc/qt5ct/Makefile4
-rw-r--r--misc/saaghar/Makefile4
-rw-r--r--misc/tellico-kde4/Makefile4
-rw-r--r--multimedia/2mandvd/Makefile4
-rw-r--r--multimedia/QtAV/Makefile4
-rw-r--r--multimedia/abby/Makefile4
-rw-r--r--multimedia/avidemux/Makefile.common4
-rw-r--r--multimedia/baka-mplayer/Makefile7
-rw-r--r--multimedia/bino/Makefile4
-rw-r--r--multimedia/clipgrab/Makefile4
-rw-r--r--multimedia/dragon-kde4/Makefile4
-rw-r--r--multimedia/dragon/Makefile4
-rw-r--r--multimedia/dvbcut/Makefile6
-rw-r--r--multimedia/gstreamer-qt4/Makefile4
-rw-r--r--multimedia/gstreamer1-qt/Makefile6
-rw-r--r--multimedia/k9copy-kde4/Makefile4
-rw-r--r--multimedia/kaffeine/Makefile4
-rw-r--r--multimedia/kamoso/Makefile4
-rw-r--r--multimedia/kdemultimedia-ffmpegthumbs-kde4/Makefile4
-rw-r--r--multimedia/kdemultimedia-ffmpegthumbs/Makefile4
-rw-r--r--multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile4
-rw-r--r--multimedia/kdemultimedia/Makefile4
-rw-r--r--multimedia/kdenlive-kde4/Makefile4
-rw-r--r--multimedia/kdenlive/Makefile4
-rw-r--r--multimedia/kf5-kmediaplayer/Makefile4
-rw-r--r--multimedia/kmplayer-kde4/Makefile4
-rw-r--r--multimedia/kplayer-kde4/Makefile4
-rw-r--r--multimedia/mediadownloader/Makefile4
-rw-r--r--multimedia/minitube/Makefile7
-rw-r--r--multimedia/mkvtoolnix/Makefile4
-rw-r--r--multimedia/mlt-qt4/Makefile3
-rw-r--r--multimedia/mlt-qt5/Makefile3
-rw-r--r--multimedia/mpc-qt/Makefile4
-rw-r--r--multimedia/mythtv/Makefile5
-rw-r--r--multimedia/obs-studio/Makefile4
-rw-r--r--multimedia/phonon-designerplugin/Makefile8
-rw-r--r--multimedia/phonon-gstreamer/Makefile8
-rw-r--r--multimedia/phonon-vlc/Makefile8
-rw-r--r--multimedia/phonon-xine/Makefile4
-rw-r--r--multimedia/phonon/Makefile8
-rw-r--r--multimedia/py-openlp/Makefile4
-rw-r--r--multimedia/py-qt4-multimedia/Makefile4
-rw-r--r--multimedia/py-qt4-phonon/Makefile4
-rw-r--r--multimedia/py-qt5-multimedia/Makefile4
-rw-r--r--multimedia/py-qt5-multimediawidgets/Makefile4
-rw-r--r--multimedia/qmmp-plugin-pack-qt5/Makefile7
-rw-r--r--multimedia/qmmp-plugin-pack/Makefile10
-rw-r--r--multimedia/qmmp-qt5/Makefile28
-rw-r--r--multimedia/qmmp/Makefile31
-rw-r--r--multimedia/qt4-mobility/Makefile16
-rw-r--r--multimedia/qt4-multimedia/Makefile4
-rw-r--r--multimedia/qt5-multimedia/Makefile5
-rw-r--r--multimedia/shotcut/Makefile7
-rw-r--r--multimedia/simplescreenrecorder/Makefile4
-rw-r--r--multimedia/smplayer-skins/Makefile4
-rw-r--r--multimedia/smplayer-themes/Makefile4
-rw-r--r--multimedia/smplayer/Makefile10
-rw-r--r--multimedia/smtube/Makefile10
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile4
-rw-r--r--multimedia/umplayer/Makefile4
-rw-r--r--multimedia/vlc/Makefile6
-rw-r--r--multimedia/webcamoid/Makefile4
-rw-r--r--multimedia/webvfx-qt5/Makefile4
-rw-r--r--net-im/cutegram/Makefile4
-rw-r--r--net-im/diligent/Makefile4
-rw-r--r--net-im/ekiga/Makefile3
-rw-r--r--net-im/gitterdone/Makefile4
-rw-r--r--net-im/hotot/Makefile4
-rw-r--r--net-im/kaccounts-integration/Makefile4
-rw-r--r--net-im/kaccounts-providers/Makefile4
-rw-r--r--net-im/kmess-kde4/Makefile4
-rw-r--r--net-im/kopete-kde4/Makefile4
-rw-r--r--net-im/kopete/Makefile4
-rw-r--r--net-im/ktp-accounts-kcm-kde4/Makefile4
-rw-r--r--net-im/ktp-accounts-kcm/Makefile4
-rw-r--r--net-im/ktp-approver-kde4/Makefile4
-rw-r--r--net-im/ktp-approver/Makefile4
-rw-r--r--net-im/ktp-auth-handler-kde4/Makefile4
-rw-r--r--net-im/ktp-auth-handler/Makefile4
-rw-r--r--net-im/ktp-call-ui/Makefile4
-rw-r--r--net-im/ktp-common-internals-kde4/Makefile4
-rw-r--r--net-im/ktp-common-internals/Makefile4
-rw-r--r--net-im/ktp-contact-list-kde4/Makefile4
-rw-r--r--net-im/ktp-contact-list/Makefile4
-rw-r--r--net-im/ktp-contact-runner-kde4/Makefile4
-rw-r--r--net-im/ktp-contact-runner/Makefile4
-rw-r--r--net-im/ktp-desktop-applets-kde4/Makefile4
-rw-r--r--net-im/ktp-desktop-applets/Makefile4
-rw-r--r--net-im/ktp-filetransfer-handler-kde4/Makefile4
-rw-r--r--net-im/ktp-filetransfer-handler/Makefile4
-rw-r--r--net-im/ktp-kded-integration-module-kde4/Makefile4
-rw-r--r--net-im/ktp-kded-module/Makefile4
-rw-r--r--net-im/ktp-send-file-kde4/Makefile4
-rw-r--r--net-im/ktp-send-file/Makefile4
-rw-r--r--net-im/ktp-text-ui-kde4/Makefile4
-rw-r--r--net-im/ktp-text-ui/Makefile4
-rw-r--r--net-im/libaccounts-qt5/Makefile4
-rw-r--r--net-im/libjreen/Makefile4
-rw-r--r--net-im/libqtelegram-ae/Makefile4
-rw-r--r--net-im/licq-qt-gui/Makefile4
-rw-r--r--net-im/plasma-applet-ktp-kde4/Makefile4
-rw-r--r--net-im/psi/Makefile4
-rw-r--r--net-im/psimedia/Makefile5
-rw-r--r--net-im/qTox/Makefile4
-rw-r--r--net-im/qxmpp/Makefile6
-rw-r--r--net-im/ramblercontacts/Makefile4
-rw-r--r--net-im/ricochet/Makefile4
-rw-r--r--net-im/teamwords/Makefile4
-rw-r--r--net-im/telegram-desktop/Makefile4
-rw-r--r--net-im/telegramqml/Makefile4
-rw-r--r--net-im/telepathy-accounts-signon/Makefile4
-rw-r--r--net-im/telepathy-logger-qt4/Makefile4
-rw-r--r--net-im/telepathy-logger-qt5/Makefile4
-rw-r--r--net-im/telepathy-qt4/Makefile6
-rw-r--r--net-im/vacuum-im/Makefile4
-rw-r--r--net-mgmt/nagiosagent/Makefile4
-rw-r--r--net-mgmt/qkismet/Makefile4
-rw-r--r--net-mgmt/seafile-gui/Makefile4
-rw-r--r--net-mgmt/vidalia/Makefile4
-rw-r--r--net-p2p/amule-devel/Makefile4
-rw-r--r--net-p2p/amule/Makefile4
-rw-r--r--net-p2p/bitcoin/Makefile10
-rw-r--r--net-p2p/dogecoin/Makefile4
-rw-r--r--net-p2p/eiskaltdcpp-qt/Makefile12
-rw-r--r--net-p2p/ktorrent-kde4/Makefile4
-rw-r--r--net-p2p/ktorrent/Makefile4
-rw-r--r--net-p2p/libktorrent-kde4/Makefile4
-rw-r--r--net-p2p/libktorrent/Makefile4
-rw-r--r--net-p2p/litecoin/Makefile10
-rw-r--r--net-p2p/namecoin/Makefile6
-rw-r--r--net-p2p/qbittorrent/Makefile9
-rw-r--r--net-p2p/qtum/Makefile4
-rw-r--r--net-p2p/retroshare/Makefile4
-rw-r--r--net-p2p/torrent-file-editor/Makefile6
-rw-r--r--net-p2p/transmission-qt4/Makefile5
-rw-r--r--net-p2p/transmission-qt5/Makefile5
-rw-r--r--net-p2p/valknut/Makefile4
-rw-r--r--net-p2p/zetacoin/Makefile10
-rw-r--r--net/akonadi-calendar/Makefile4
-rw-r--r--net/akonadi-contacts/Makefile4
-rw-r--r--net/akonadi-mime/Makefile4
-rw-r--r--net/akonadi-notes/Makefile4
-rw-r--r--net/akonadi-search/Makefile4
-rw-r--r--net/avahi-qt4/Makefile3
-rw-r--r--net/cagibi/Makefile4
-rw-r--r--net/calendarsupport/Makefile4
-rw-r--r--net/eventviews/Makefile4
-rw-r--r--net/hupnp/Makefile4
-rw-r--r--net/incidenceeditor/Makefile4
-rw-r--r--net/kalarmcal/Makefile4
-rw-r--r--net/kblog/Makefile4
-rw-r--r--net/kcalcore/Makefile4
-rw-r--r--net/kcalutils/Makefile4
-rw-r--r--net/kcontacts/Makefile4
-rw-r--r--net/kdav/Makefile4
-rw-r--r--net/kdenetwork-filesharing-kde4/Makefile4
-rw-r--r--net/kdenetwork-filesharing/Makefile4
-rw-r--r--net/kdenetwork-strigi-analyzers-kde4/Makefile4
-rw-r--r--net/kdenetwork/Makefile4
-rw-r--r--net/kf5-kholidays/Makefile4
-rw-r--r--net/kf5-kxmlrpcclient/Makefile4
-rw-r--r--net/kget-kde4/Makefile4
-rw-r--r--net/kget/Makefile4
-rw-r--r--net/kidentitymanagement/Makefile4
-rw-r--r--net/kimap/Makefile4
-rw-r--r--net/kio-gdrive/Makefile4
-rw-r--r--net/kio-upnp-ms/Makefile4
-rw-r--r--net/kldap/Makefile4
-rw-r--r--net/kmailtransport/Makefile4
-rw-r--r--net/kmbox/Makefile4
-rw-r--r--net/kmime/Makefile4
-rw-r--r--net/knemo-kde4/Makefile4
-rw-r--r--net/kontactinterface/Makefile4
-rw-r--r--net/kpimtextedit/Makefile4
-rw-r--r--net/krdc-kde4/Makefile4
-rw-r--r--net/krdc/Makefile4
-rw-r--r--net/krfb-kde4/Makefile4
-rw-r--r--net/krfb/Makefile4
-rw-r--r--net/ksmtp/Makefile4
-rw-r--r--net/ktnef/Makefile4
-rw-r--r--net/kwooty/Makefile4
-rw-r--r--net/libgravatar/Makefile4
-rw-r--r--net/libkfbapi/Makefile4
-rw-r--r--net/libkgapi/Makefile4
-rw-r--r--net/libksieve/Makefile4
-rw-r--r--net/libkvkontakte-kde4/Makefile4
-rw-r--r--net/libkvkontakte/Makefile4
-rw-r--r--net/libmaia/Makefile4
-rw-r--r--net/libmediawiki/Makefile4
-rw-r--r--net/mailcommon/Makefile4
-rw-r--r--net/mailimporter/Makefile4
-rw-r--r--net/messagelib/Makefile4
-rw-r--r--net/ostinato/Makefile4
-rw-r--r--net/pimcommon/Makefile4
-rw-r--r--net/py-qt4-network/Makefile4
-rw-r--r--net/py-qt5-network/Makefile4
-rw-r--r--net/qjsonrpc/Makefile4
-rw-r--r--net/qoauth-qt5/Makefile4
-rw-r--r--net/qoauth/Makefile4
-rw-r--r--net/qt4-network/Makefile5
-rw-r--r--net/qt5-network/Makefile5
-rw-r--r--net/qtweetlib/Makefile4
-rw-r--r--net/quiterss/Makefile10
-rw-r--r--net/rsplib/Makefile4
-rw-r--r--net/smb4k-kde4/Makefile4
-rw-r--r--net/spoofer/Makefile4
-rw-r--r--net/syndication/Makefile4
-rw-r--r--net/wireshark/Makefile3
-rw-r--r--net/wpa_gui/Makefile4
-rw-r--r--net/x2goclient/Makefile4
-rw-r--r--net/zeroconf-ioslave-kde4/Makefile4
-rw-r--r--net/zeroconf-ioslave/Makefile4
-rw-r--r--polish/kadu/Makefile4
-rw-r--r--polish/qfaktury/Makefile4
-rw-r--r--polish/qnapi/Makefile4
-rw-r--r--ports-mgmt/octopkg/Makefile4
-rw-r--r--ports-mgmt/packagekit/Makefile3
-rw-r--r--ports-mgmt/portrac/Makefile4
-rw-r--r--print/kover/Makefile4
-rw-r--r--print/kpdftool/Makefile4
-rw-r--r--print/lyx/Makefile4
-rw-r--r--print/print-manager-kde4/Makefile4
-rw-r--r--print/print-manager/Makefile4
-rw-r--r--print/py-qt5-printsupport/Makefile4
-rw-r--r--print/qpdfview/Makefile6
-rw-r--r--print/qt5-printsupport/Makefile4
-rw-r--r--print/scribus/Makefile4
-rw-r--r--science/avogadro/Makefile4
-rw-r--r--science/iboview/Makefile4
-rw-r--r--science/kalzium-kde4/Makefile4
-rw-r--r--science/kalzium/Makefile4
-rw-r--r--science/kst2/Makefile6
-rw-r--r--science/libgeodecomp/Makefile3
-rw-r--r--science/massxpert/Makefile4
-rw-r--r--science/paraview/Makefile4
-rw-r--r--science/pulseview/Makefile4
-rw-r--r--science/py-veusz/Makefile4
-rw-r--r--science/qtresistors/Makefile4
-rw-r--r--science/silo/Makefile4
-rw-r--r--science/step-kde4/Makefile4
-rw-r--r--science/step/Makefile4
-rw-r--r--security/fwbuilder/Makefile4
-rw-r--r--security/gpgme/Makefile6
-rw-r--r--security/ike/Makefile3
-rw-r--r--security/keepassx-devel/Makefile4
-rw-r--r--security/keepassx/Makefile4
-rw-r--r--security/keepassx2/Makefile4
-rw-r--r--security/keepassxc/Makefile7
-rw-r--r--security/kf5-kdesu/Makefile4
-rw-r--r--security/kgpg-kde4/Makefile4
-rw-r--r--security/kgpg/Makefile4
-rw-r--r--security/kleopatra/Makefile4
-rw-r--r--security/kqoauth/Makefile4
-rw-r--r--security/kwalletmanager-kde4/Makefile4
-rw-r--r--security/kwalletmanager/Makefile4
-rw-r--r--security/libkleo/Makefile4
-rw-r--r--security/openconnect-gui/Makefile4
-rw-r--r--security/ophcrack/Makefile3
-rw-r--r--security/pinentry/Makefile8
-rw-r--r--security/plasma5-kscreenlocker/Makefile4
-rw-r--r--security/plasma5-ksshaskpass/Makefile4
-rw-r--r--security/plasma5-kwallet-pam/Makefile4
-rw-r--r--security/qtkeychain/Makefile6
-rw-r--r--security/quantis/Makefile5
-rw-r--r--security/tpmmanager/Makefile4
-rw-r--r--security/xca/Makefile8
-rw-r--r--security/yubikey-personalization-gui/Makefile4
-rw-r--r--sysutils/UEFITool/Makefile4
-rw-r--r--sysutils/android-file-transfer/Makefile6
-rw-r--r--sysutils/bacula-bat/Makefile4
-rw-r--r--sysutils/bacula9-bat/Makefile4
-rw-r--r--sysutils/baloo-kde4/Makefile4
-rw-r--r--sysutils/baloo-widgets-kde4/Makefile4
-rw-r--r--sysutils/baloo-widgets/Makefile4
-rw-r--r--sysutils/bareos-traymonitor/Makefile4
-rw-r--r--sysutils/bareos16-bat/Makefile4
-rw-r--r--sysutils/bareos16-traymonitor/Makefile4
-rw-r--r--sysutils/bsdisks/Makefile4
-rw-r--r--sysutils/dsbbatmon/Makefile4
-rw-r--r--sysutils/dsblogoutmgr/Makefile4
-rw-r--r--sysutils/filelight-kde4/Makefile4
-rw-r--r--sysutils/filelight/Makefile4
-rw-r--r--sysutils/glogg/Makefile4
-rw-r--r--sysutils/k3b-kde4/Makefile4
-rw-r--r--sysutils/k3b/Makefile4
-rw-r--r--sysutils/kbackup/Makefile4
-rw-r--r--sysutils/kcm-polkit-kde/Makefile4
-rw-r--r--sysutils/kcron-kde4/Makefile4
-rw-r--r--sysutils/kcron/Makefile4
-rw-r--r--sysutils/kdebugsettings/Makefile4
-rw-r--r--sysutils/kdf-kde4/Makefile4
-rw-r--r--sysutils/kdf/Makefile4
-rw-r--r--sysutils/kdialog/Makefile4
-rw-r--r--sysutils/kdirstat/Makefile4
-rw-r--r--sysutils/kf5-baloo/Makefile4
-rw-r--r--sysutils/kf5-kwallet/Makefile4
-rw-r--r--sysutils/kfilemetadata-kde4/Makefile4
-rw-r--r--sysutils/kfloppy-kde4/Makefile4
-rw-r--r--sysutils/kfloppy/Makefile4
-rw-r--r--sysutils/khelpcenter/Makefile4
-rw-r--r--sysutils/knutclient-kde4/Makefile4
-rw-r--r--sysutils/krename/Makefile4
-rw-r--r--sysutils/kshutdown-kde4/Makefile4
-rw-r--r--sysutils/ksystemlog-kde4/Makefile4
-rw-r--r--sysutils/ksystemlog/Makefile4
-rw-r--r--sysutils/kuser-kde4/Makefile4
-rw-r--r--sysutils/luckybackup/Makefile4
-rw-r--r--sysutils/nepomuk-core-kde4/Makefile4
-rw-r--r--sysutils/nepomuk-widgets-kde4/Makefile4
-rw-r--r--sysutils/pc-networkmanager/Makefile4
-rw-r--r--sysutils/pcbsd-syscache/Makefile4
-rw-r--r--sysutils/pcbsd-utils-qt5/Makefile4
-rw-r--r--sysutils/pcbsd-utils/Makefile4
-rw-r--r--sysutils/plasma5-discover/Makefile4
-rw-r--r--sysutils/plasma5-drkonqi/Makefile4
-rw-r--r--sysutils/plasma5-kde-cli-tools/Makefile4
-rw-r--r--sysutils/plasma5-kinfocenter/Makefile4
-rw-r--r--sysutils/plasma5-kmenuedit/Makefile4
-rw-r--r--sysutils/plasma5-ksysguard/Makefile4
-rw-r--r--sysutils/plasma5-libksysguard/Makefile4
-rw-r--r--sysutils/plasma5-polkit-kde-agent-1/Makefile4
-rw-r--r--sysutils/plasma5-powerdevil/Makefile4
-rw-r--r--sysutils/plasma5-systemsettings/Makefile4
-rw-r--r--sysutils/plasma5-user-manager/Makefile4
-rw-r--r--sysutils/policykit-qt/Makefile4
-rw-r--r--sysutils/polkit-kde/Makefile4
-rw-r--r--sysutils/polkit-qt/Makefile7
-rw-r--r--sysutils/qdirstat/Makefile4
-rw-r--r--sysutils/qpxtool/Makefile14
-rw-r--r--sysutils/qsudo/Makefile4
-rw-r--r--sysutils/qsynergy/Makefile4
-rw-r--r--sysutils/qt5-qtdiag/Makefile5
-rw-r--r--sysutils/qt5-qtpaths/Makefile5
-rw-r--r--sysutils/qt5-qtplugininfo/Makefile5
-rw-r--r--sysutils/qtpass/Makefile4
-rw-r--r--sysutils/qzeitgeist/Makefile4
-rw-r--r--sysutils/searchmonkey/Makefile4
-rw-r--r--sysutils/signon-kwallet-extension/Makefile4
-rw-r--r--sysutils/signon-plugin-oauth2/Makefile4
-rw-r--r--sysutils/signon-qt5/Makefile4
-rw-r--r--sysutils/signon-ui/Makefile4
-rw-r--r--sysutils/sweeper-kde4/Makefile4
-rw-r--r--sysutils/sweeper/Makefile4
-rw-r--r--sysutils/sysadm-client/Makefile4
-rw-r--r--sysutils/sysadm/Makefile4
-rw-r--r--sysutils/tarsnap-gui/Makefile4
-rw-r--r--sysutils/trueos-libqt5/Makefile4
-rw-r--r--sysutils/twmn/Makefile4
-rw-r--r--sysutils/unetbootin/Makefile3
-rw-r--r--textproc/ansifilter/Makefile4
-rw-r--r--textproc/beediff/Makefile4
-rw-r--r--textproc/dikt/Makefile4
-rw-r--r--textproc/dixit/Makefile4
-rw-r--r--textproc/fcitx-qt5/Makefile4
-rw-r--r--textproc/goldendict/Makefile4
-rw-r--r--textproc/ibus-qt/Makefile4
-rw-r--r--textproc/kdiff3/Makefile4
-rw-r--r--textproc/kf5-kcodecs/Makefile4
-rw-r--r--textproc/kf5-sonnet/Makefile4
-rw-r--r--textproc/kf5-syntax-highlighting/Makefile4
-rw-r--r--textproc/kompare-kde4/Makefile4
-rw-r--r--textproc/kompare/Makefile4
-rw-r--r--textproc/kreport/Makefile4
-rw-r--r--textproc/libkomparediff2-kde4/Makefile4
-rw-r--r--textproc/libkomparediff2/Makefile4
-rw-r--r--textproc/py-qt4-xml/Makefile4
-rw-r--r--textproc/py-qt4-xmlpatterns/Makefile4
-rw-r--r--textproc/py-qt5-xml/Makefile4
-rw-r--r--textproc/py-qt5-xmlpatterns/Makefile4
-rw-r--r--textproc/qstardict/Makefile7
-rw-r--r--textproc/qt4-clucene/Makefile4
-rw-r--r--textproc/qt4-xml/Makefile4
-rw-r--r--textproc/qt4-xmlpatterns-tool/Makefile4
-rw-r--r--textproc/qt4-xmlpatterns/Makefile4
-rw-r--r--textproc/qt5-xml/Makefile4
-rw-r--r--textproc/qt5-xmlpatterns/Makefile5
-rw-r--r--textproc/scim-bridge-qt4/Makefile5
-rw-r--r--textproc/sigil/Makefile4
-rw-r--r--textproc/soprano/Makefile4
-rw-r--r--textproc/uim-kde4/Makefile4
-rw-r--r--textproc/uim-qt4/Makefile4
-rw-r--r--textproc/xxdiff/Makefile4
-rw-r--r--www/aria2fe/Makefile4
-rw-r--r--www/bookmarkbridge/Makefile4
-rw-r--r--www/choqok-kde4/Makefile4
-rw-r--r--www/choqok/Makefile4
-rw-r--r--www/cutelyst/Makefile4
-rw-r--r--www/cutycapt/Makefile4
-rw-r--r--www/falkon/Makefile4
-rw-r--r--www/kdewebdev-kde4/Makefile4
-rw-r--r--www/kf5-kdewebkit/Makefile4
-rw-r--r--www/kf5-khtml/Makefile4
-rw-r--r--www/kf5-kjs/Makefile4
-rw-r--r--www/kf5-kjsembed/Makefile4
-rw-r--r--www/kpartsplugin/Makefile4
-rw-r--r--www/kwebkitpart/Makefile4
-rw-r--r--www/otter-browser/Makefile8
-rw-r--r--www/plasma5-plasma-browser-integration/Makefile4
-rw-r--r--www/py-qt4-webkit/Makefile4
-rw-r--r--www/py-qt5-webchannel/Makefile4
-rw-r--r--www/py-qt5-webengine/Makefile4
-rw-r--r--www/py-qt5-webkit/Makefile4
-rw-r--r--www/py-qt5-webkitwidgets/Makefile4
-rw-r--r--www/qt4-webkit/Makefile7
-rw-r--r--www/qt5-webchannel/Makefile5
-rw-r--r--www/qt5-webengine/Makefile5
-rw-r--r--www/qt5-webkit/Makefile4
-rw-r--r--www/qt5-websockets-qml/Makefile5
-rw-r--r--www/qt5-websockets/Makefile5
-rw-r--r--www/qupzilla-qt4/Makefile7
-rw-r--r--www/qupzilla-qt5/Makefile7
-rw-r--r--www/qutebrowser/Makefile4
-rw-r--r--www/rekonq/Makefile4
-rw-r--r--www/wt/Makefile3
-rw-r--r--x11-clocks/amor-kde4/Makefile4
-rw-r--r--x11-clocks/kteatime-kde4/Makefile4
-rw-r--r--x11-clocks/kteatime/Makefile4
-rw-r--r--x11-clocks/ktimer-kde4/Makefile4
-rw-r--r--x11-clocks/ktimer/Makefile4
-rw-r--r--x11-clocks/ktux-kde4/Makefile4
-rw-r--r--x11-clocks/plasma-applet-adjustableclock/Makefile4
-rw-r--r--x11-clocks/plasma-applet-geekclock/Makefile4
-rw-r--r--x11-fm/dolphin/Makefile4
-rw-r--r--x11-fm/konqueror/Makefile4
-rw-r--r--x11-fm/krusader2-kde4/Makefile4
-rw-r--r--x11-fm/krusader2/Makefile4
-rw-r--r--x11-fm/pcmanfm-qt/Makefile4
-rw-r--r--x11-fm/pcmanfmqt-l10n/Makefile4
-rw-r--r--x11-fm/qtfm/Makefile4
-rw-r--r--x11-fm/ultracopier/Makefile4
-rw-r--r--x11-fonts/fontmatrix/Makefile4
-rw-r--r--x11-themes/adwaita-qt/Makefile6
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile4
-rw-r--r--x11-themes/kde-base-artwork-kde4/Makefile4
-rw-r--r--x11-themes/kde-gtk-config/Makefile4
-rw-r--r--x11-themes/kde-wallpapers-kde4/Makefile4
-rw-r--r--x11-themes/kde4-style-bespin/Makefile4
-rw-r--r--x11-themes/kde4-style-nitrogen/Makefile4
-rw-r--r--x11-themes/kde4-style-oxygen-transparent/Makefile4
-rw-r--r--x11-themes/kde4-style-polyester/Makefile4
-rw-r--r--x11-themes/kde4-style-skulpture/Makefile4
-rw-r--r--x11-themes/kde4-windeco-crystal/Makefile4
-rw-r--r--x11-themes/kde4-windeco-dekorator/Makefile4
-rw-r--r--x11-themes/kdeartwork-kde4/Makefile4
-rw-r--r--x11-themes/kf5-breeze-icons/Makefile4
-rw-r--r--x11-themes/kf5-kemoticons/Makefile4
-rw-r--r--x11-themes/kf5-kiconthemes/Makefile4
-rw-r--r--x11-themes/kf5-oxygen-icons5/Makefile4
-rw-r--r--x11-themes/kf5-qqc2-desktop-style/Makefile4
-rw-r--r--x11-themes/lumina-themes/Makefile4
-rw-r--r--x11-themes/plasma5-breeze-gtk/Makefile4
-rw-r--r--x11-themes/plasma5-breeze-kde4/Makefile4
-rw-r--r--x11-themes/plasma5-breeze/Makefile4
-rw-r--r--x11-themes/plasma5-kde-gtk-config/Makefile4
-rw-r--r--x11-themes/plasma5-oxygen/Makefile4
-rw-r--r--x11-themes/plasma5-plasma-workspace-wallpapers/Makefile4
-rw-r--r--x11-themes/qt4-style-Kvantum/Makefile4
-rw-r--r--x11-themes/qt4-style-float/Makefile4
-rw-r--r--x11-themes/qt4-style-phase/Makefile4
-rw-r--r--x11-themes/qt4-style-quantumstyle/Makefile4
-rw-r--r--x11-themes/qt5-style-Kvantum/Makefile4
-rw-r--r--x11-themes/qt5-style-plugins/Makefile6
-rw-r--r--x11-themes/qt5-style-plugins/pkg-plist3
-rw-r--r--x11-themes/qtcurve/Makefile16
-rw-r--r--x11-toolkits/attica/Makefile4
-rw-r--r--x11-toolkits/kf5-attica/Makefile4
-rw-r--r--x11-toolkits/kf5-kcompletion/Makefile4
-rw-r--r--x11-toolkits/kf5-kconfigwidgets/Makefile4
-rw-r--r--x11-toolkits/kf5-kdesignerplugin/Makefile4
-rw-r--r--x11-toolkits/kf5-kguiaddons/Makefile4
-rw-r--r--x11-toolkits/kf5-kirigami2/Makefile4
-rw-r--r--x11-toolkits/kf5-kitemviews/Makefile4
-rw-r--r--x11-toolkits/kf5-kjobwidgets/Makefile4
-rw-r--r--x11-toolkits/kf5-ktextwidgets/Makefile4
-rw-r--r--x11-toolkits/kf5-kwidgetsaddons/Makefile4
-rw-r--r--x11-toolkits/kf5-kxmlgui/Makefile4
-rw-r--r--x11-toolkits/kproperty/Makefile4
-rw-r--r--x11-toolkits/nucleo/Makefile7
-rw-r--r--x11-toolkits/plasma5-kdeplasma-addons/Makefile4
-rw-r--r--x11-toolkits/py-qt4-gui/Makefile4
-rw-r--r--x11-toolkits/py-qt5-gui/Makefile4
-rw-r--r--x11-toolkits/py-qt5-quick/Makefile4
-rw-r--r--x11-toolkits/py-qt5-widgets/Makefile4
-rw-r--r--x11-toolkits/qml-box2d/Makefile4
-rw-r--r--x11-toolkits/qt4-declarative/Makefile4
-rw-r--r--x11-toolkits/qt4-gui/Makefile5
-rw-r--r--x11-toolkits/qt4pas/Makefile4
-rw-r--r--x11-toolkits/qt5-canvas3d/Makefile5
-rw-r--r--x11-toolkits/qt5-charts/Makefile5
-rw-r--r--x11-toolkits/qt5-datavis3d/Makefile5
-rw-r--r--x11-toolkits/qt5-gamepad/Makefile5
-rw-r--r--x11-toolkits/qt5-gtkplatform/Makefile5
-rw-r--r--x11-toolkits/qt5-gtkplatform/pkg-plist1
-rw-r--r--x11-toolkits/qt5-gui/Makefile9
-rw-r--r--x11-toolkits/qt5-quick/Makefile5
-rw-r--r--x11-toolkits/qt5-quickcontrols/Makefile5
-rw-r--r--x11-toolkits/qt5-quickcontrols2/Makefile4
-rw-r--r--x11-toolkits/qt5-uiplugin/Makefile5
-rw-r--r--x11-toolkits/qt5-virtualkeyboard/Makefile5
-rw-r--r--x11-toolkits/qt5-widgets/Makefile6
-rw-r--r--x11-toolkits/qt5pas/Makefile4
-rw-r--r--x11-toolkits/qtermwidget-l10n/Makefile4
-rw-r--r--x11-toolkits/qtermwidget/Makefile4
-rw-r--r--x11-toolkits/qwt5-designerplugin/Makefile4
-rw-r--r--x11-toolkits/qwt5/Makefile4
-rw-r--r--x11-toolkits/qwt6/Makefile6
-rw-r--r--x11-toolkits/soqt/Makefile5
-rw-r--r--x11-wm/plasma5-kdecoration/Makefile4
-rw-r--r--x11-wm/plasma5-kwin/Makefile4
-rw-r--r--x11-wm/qlwm/Makefile3
-rw-r--r--x11/antimicro/Makefile4
-rw-r--r--x11/cool-retro-term/Makefile4
-rw-r--r--x11/dsbautostart/Makefile4
-rw-r--r--x11/kactivities/Makefile4
-rw-r--r--x11/kactivitymanagerd/Makefile4
-rw-r--r--x11/kde-baseapps-kde4/Makefile4
-rw-r--r--x11/kde-runtime-kde4/Makefile4
-rw-r--r--x11/kde-workspace-kde4/Makefile7
-rw-r--r--x11/kde5/Makefile4
-rw-r--r--x11/kdelibs-kde4/Makefile4
-rw-r--r--x11/kf5-frameworkintegration/Makefile4
-rw-r--r--x11/kf5-frameworks/Makefile4
-rw-r--r--x11/kf5-kactivities-stats/Makefile4
-rw-r--r--x11/kf5-kactivities/Makefile4
-rw-r--r--x11/kf5-kded/Makefile4
-rw-r--r--x11/kf5-kdelibs4support/Makefile4
-rw-r--r--x11/kf5-kglobalaccel/Makefile4
-rw-r--r--x11/kf5-kinit/Makefile4
-rw-r--r--x11/kf5-krunner/Makefile4
-rw-r--r--x11/kf5-kwayland/Makefile4
-rw-r--r--x11/kf5-kwindowsystem/Makefile4
-rw-r--r--x11/kf5-plasma-framework/Makefile4
-rw-r--r--x11/kgamma-kde4/Makefile4
-rw-r--r--x11/konsole-kde4/Makefile4
-rw-r--r--x11/konsole/Makefile4
-rw-r--r--x11/leechcraft/Makefile8
-rw-r--r--x11/libfm-qt/Makefile4
-rw-r--r--x11/libfmqt-l10n/Makefile4
-rw-r--r--x11/libkonq-kde4/Makefile4
-rw-r--r--x11/lumina-core/Makefile8
-rw-r--r--x11/lumina-coreutils/Makefile6
-rw-r--r--x11/lxqt-globalkeys/Makefile4
-rw-r--r--x11/pcdm/Makefile4
-rw-r--r--x11/plasma-scriptengine-python-kde4/Makefile4
-rw-r--r--x11/plasma-scriptengine-ruby-kde4/Makefile4
-rw-r--r--x11/plasma5-kactivitymanagerd/Makefile4
-rw-r--r--x11/plasma5-kgamma5/Makefile4
-rw-r--r--x11/plasma5-kscreen/Makefile4
-rw-r--r--x11/plasma5-kwayland-integration/Makefile4
-rw-r--r--x11/plasma5-libkscreen/Makefile4
-rw-r--r--x11/plasma5-plasma-desktop/Makefile4
-rw-r--r--x11/plasma5-plasma-integration/Makefile4
-rw-r--r--x11/plasma5-plasma-workspace/Makefile4
-rw-r--r--x11/plasma5-plasma/Makefile4
-rw-r--r--x11/py-qt4-opengl/Makefile4
-rw-r--r--x11/py-qt5-opengl/Makefile4
-rw-r--r--x11/qimageblitz/Makefile4
-rw-r--r--x11/qt4-graphicssystems-opengl/Makefile4
-rw-r--r--x11/qt4-inputmethods/Makefile4
-rw-r--r--x11/qt5-qev/Makefile9
-rw-r--r--x11/qt5-x11extras/Makefile5
-rw-r--r--x11/qterminal-l10n/Makefile4
-rw-r--r--x11/qterminal/Makefile4
-rw-r--r--x11/qxkb/Makefile4
-rw-r--r--x11/radare-cutter/Makefile4
-rw-r--r--x11/rsibreak/Makefile4
-rw-r--r--x11/sddm/Makefile4
-rw-r--r--x11/yakuake-kde4/Makefile4
-rw-r--r--x11/yakuake/Makefile4
1416 files changed, 4215 insertions, 3963 deletions
diff --git a/CHANGES b/CHANGES
index 30c3002af062..a385defead3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,27 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20180630:
+AUTHOR: kde@FreeBSD.org
+
+ bsd.qt.mk has been replaced by qt.mk. This changes the way ports have to
+ depend on Qt slightly.
+
+ Previously one would have written
+ USE_QT4=foo bar
+ or
+ USE_QT5=foo bar
+ while now one has to write
+ USES=qt:4
+ USE_QT=foo bar
+ respectively
+ USES=qt:5
+ USE_QT=foo bar
+
+ Further qmake.mk no longer respects QT_NONSTANDARD. Ports that don't want to
+ get the configure environment provided by qmake.mk should add the argument
+ no_env, ports that don't want the configure target should specify no_configure.
+
20180506:
AUTHOR: brnrd@FreeBSD.org
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index e01ed5ee18ae..b5301ded0c93 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -551,12 +551,10 @@ proxydeps_suggest_uses() {
warn "you need USE_XORG+=pixman"
# Qt4
elif expr ${pkg} : '.*/qt4-.*' > /dev/null; then
- warn "you need USE_QT4+=$(echo ${pkg} | sed -E 's|.*/qt4-||')"
- elif expr ${pkg} : '.*/.*-qt4' > /dev/null; then
- warn "you need USE_QT4+=$(echo ${pkg} | sed -E 's|.*/(.*)-qt4|\1|')"
+ warn "you need USES=qt:4 and USE_QT+=$(echo ${pkg} | sed -E 's|.*/qt4-||')"
# Qt5
elif expr ${pkg} : '.*/qt5-.*' > /dev/null; then
- warn "you need USE_QT5+=$(echo ${pkg} | sed -E 's|.*/qt5-||')"
+ warn "you need USES=qt:5 and USE_QT+=$(echo ${pkg} | sed -E 's|.*/qt5-||')"
# MySQL
elif expr ${lib_file} : "${LOCALBASE}/lib/mysql/[^/]*$" > /dev/null; then
warn "you need USES+=mysql"
diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk
index 41b0da9c6d0f..ce9b0ebc4646 100644
--- a/Mk/Uses/qmake.mk
+++ b/Mk/Uses/qmake.mk
@@ -1,5 +1,13 @@
# $FreeBSD$
#
+# There are three Qt related USES files with different access to Qt.
+# - qmake: The port requires Qt's qmake to build -- creates the configure target
+# - auto includes qt.mk
+# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - auto inclues qt.mk
+# - qt.mk - Dependency handling. USE_QT=foo bar
+#
+#
# Provide support for qmake-based projects
#
# Feature: qmake
@@ -9,6 +17,9 @@
# ARGS description:
# norecursive Don't pass -recursive argument to qmake binary
# outsource Perform an out-of-source build
+# no_env Suppress modification of configure and make environment.
+# no_configure Don't add the configure target -- this is implied by
+# HAS_CONFIGURE=yes and GNU_CONFIGURE=yes
#
#
# Variables for ports:
@@ -33,77 +44,97 @@
.if !defined(_INCLUDE_USES_QMAKE_MK)
_INCLUDE_USES_QMAKE_MK= yes
-# _QT_VERSION is defined in bsd.qt.mk, only if a correct Qt version was selected
-# via USE_QT*.
-.if empty(_QT_VERSION)
-IGNORE= 'USES+= qmake' must be accompanied with 'USE_QT[${_QT_SUPPORTED:S/ //g}]= #'
-.endif
+# Suck in qt.mk
+.include "${USESDIR}/qt.mk"
-# _env is a private argument used only by bsd.qt.mk to get variables and custom
-# targets (currently, only qmake-configure), without qmake being added to the
-# configure stage.
-_VALID_ARGS= norecursive outsource _env
+_VALID_ARGS= norecursive outsource no_env no_configure
-.for arg in ${qmake_ARGS}
-. if empty(_VALID_ARGS:M${arg})
-IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized
-. endif
-.endfor
+. for arg in ${qmake_ARGS}
+. if empty(_VALID_ARGS:M${arg})
+IGNORE= Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized
+. endif
+. endfor
-.if ! ${qmake_ARGS:M_env}
-USE_QT${_QT_VERSION:R:R}+= qmake_build
-.endif
+# Check whether we need to add the configure target
+_ADD_CONFIGURE_TARGET= yes
+. if !empty(qmake_ARGS:Mno_configure) || defined(HAS_CONFIGURE) || defined(GNU_CONFIGURE)
+_ADD_CONFIGURE_TARGET= # unset
+. endif
# QMAKESPEC belongs to bsd.qt.mk.
-QMAKE_ENV?= ${CONFIGURE_ENV}
-QMAKE_ARGS+= -spec ${QMAKESPEC} \
- QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \
- QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \
- QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
- QMAKE_CFLAGS="${CFLAGS}" \
- QMAKE_CXXFLAGS="${CXXFLAGS}" \
- QMAKE_LFLAGS="${LDFLAGS}" \
- QMAKE_LIBS="${LIBS}" \
- QMAKE_CFLAGS_DEBUG="" \
- QMAKE_CFLAGS_RELEASE="" \
- QMAKE_CXXFLAGS_DEBUG="" \
- QMAKE_CXXFLAGS_RELEASE="" \
- PREFIX="${PREFIX}"
-
-.if defined(WITH_DEBUG)
-QMAKE_ARGS+= CONFIG+="debug" \
- CONFIG-="release"
-.else
-QMAKE_ARGS+= CONFIG+="release" \
- CONFIG-="debug separate_debug_info"
-.endif # defined(WITH_DEBUG)
+QMAKE_ENV?= ${CONFIGURE_ENV}
+QMAKE_ARGS+= -spec ${QMAKESPEC} \
+ QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \
+ QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \
+ QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
+ QMAKE_CFLAGS="${CFLAGS}" \
+ QMAKE_CXXFLAGS="${CXXFLAGS}" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ QMAKE_LIBS="${LIBS}" \
+ QMAKE_CFLAGS_DEBUG="" \
+ QMAKE_CFLAGS_RELEASE="" \
+ QMAKE_CXXFLAGS_DEBUG="" \
+ QMAKE_CXXFLAGS_RELEASE="" \
+ PREFIX="${PREFIX}"
+
+. if defined(WITH_DEBUG)
+PLIST_SUB+= DEBUG=""
+QMAKE_ARGS+= CONFIG+="debug" \
+ CONFIG-="release"
+. else
+PLIST_SUB+= DEBUG="@comment "
+QMAKE_ARGS+= CONFIG+="release" \
+ CONFIG-="debug separate_debug_info"
+. endif # defined(WITH_DEBUG)
# We set -recursive by default to keep qmake from running in the build stage.
-.if ! ${qmake_ARGS:Mnorecursive}
-QMAKE_ARGS+= -recursive
-.endif
+. if ! ${qmake_ARGS:Mnorecursive}
+QMAKE_ARGS+= -recursive
+. endif
-.if defined(QMAKE_VERBOSE)
-QMAKE_ARGS+= -d
-.endif
+. if defined(QMAKE_VERBOSE)
+QMAKE_ARGS+= -d
+. endif
# _QMAKE_WRKSRC (and _QMAKE, below) are needed to abstract the qmake target and
# use it for both qtbase and USES=qmake ports. They are private, not supposed to
# be used anywhere else.
_QMAKE_WRKSRC?= ${CONFIGURE_WRKSRC}
-.if ${qmake_ARGS:Moutsource}
+. if ${qmake_ARGS:Moutsource}
CONFIGURE_WRKSRC= ${WRKDIR}/.build
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
TEST_WRKSRC= ${BUILD_WRKSRC}
QMAKE_SOURCE_PATH?= ${WRKSRC}
-.else
+. else
QMAKE_SOURCE_PATH?= # empty
-.endif
+. endif
-.if ! ${qmake_ARGS:M_env}
-DESTDIRNAME= INSTALL_ROOT
-.endif
+# Add qmake to USE_QT -- unless it's qmake itself
+. if !${PORTNAME} == qmake
+USE_QT+= qmake_build
+. endif
+
+. if empty(qmake_ARGS:Mno_env)
+DESTDIRNAME= INSTALL_ROOT
+CONFIGURE_ENV+= QTDIR="${QT_ARCHDIR}" QMAKE="${QMAKE}" \
+ MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
+ QMAKESPEC="${QMAKESPEC}"
+CONFIGURE_ARGS+= --with-qt-includes=${QT_INCDIR} \
+ --with-qt-libraries=${QT_LIBDIR} \
+ --with-extra-includes=${LOCALBASE}/include \
+ --with-extra-libs=${LOCALBASE}/lib
+. endif
+
+_USES_POST+= qmake
+.endif # _QMAKE_MK_INCLUDED
+
+# =============================================================================
+#
+# =============================================================================
+
+.if defined(_POSTMKINCLUDED) && !defined(_QMAKE_MK_POST_INCLUDED)
+_QMAKE_MK_POST_INCLUDED= qmake.mk
# Define a custom target to make it usable by bsd.qt.mk for internal Qt
# configuration.
@@ -114,8 +145,8 @@ qmake-configure:
${QMAKE_SOURCE_PATH} \
${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS}
-.if !target(do-configure) && ! ${qmake_ARGS:M_env}
+. if !target(do-configure) && !empty(_ADD_CONFIGURE_TARGET)
_USES_configure+= 450:qmake-configure
-.endif
+. endif
.endif # !defined(_INCLUDE_USES_QMAKE_MK)
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
new file mode 100644
index 000000000000..87575bf3618b
--- /dev/null
+++ b/Mk/Uses/qt-dist.mk
@@ -0,0 +1,377 @@
+# $FreeBSD$
+#
+# There are three Qt related USES files with different access to Qt.
+# - qmake: The port requires Qt's qmake to build -- creates the configure target
+# - auto includes qt.mk
+# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - auto inclues qt.mk
+# - qt.mk - Dependency handling. USE_QT=foo bar
+#
+#
+# Usage
+# qt-dist:<version>[,yes|modulename]
+
+.if !defined(_QT_DIST_MK_INCLUDED)
+_QT_DIST_MK_INCLUDED= qt-dist.mk
+
+# Suck in qt.mk and qmake.mk
+qt_ARGS?= # empty
+.include "${USESDIR}/qt.mk"
+qmake_ARGS?= # empty
+.include "${USESDIR}/qmake.mk"
+
+# Supported distribution arguments
+_QT4_DISTS= yes
+_QT5_DISTS= 3d activeqt androidextras base canvas3d charts connectivity \
+ datavis3d declarative doc gamepad graphicaleffects imageformats \
+ location macextras multimedia networkauth purchasing \
+ quickcontrols2 quickcontrols remoteobjects script scxml sensors \
+ serialbus serialport speech svg tools translations \
+ virtualkeyboard wayland webchannel webengine websockets webview \
+ winextras x11extras xmlpatterns
+_QT_DISTS= ${_QT${_QT_VER}_DISTS}
+
+# We only accept one item as an argument. The fetch target further below works
+# around this.
+_QT_DIST= # empty
+. for dist in ${_QT_DISTS:O:u}
+. if ${qt-dist_ARGS:M${dist}}
+. if empty(_QT_DIST)
+_QT_DIST= ${dist}
+. else
+IGNORE= cannot be installed: different Qt dists specified via qt-dist:[${qt-dist_ARGS:S/ /,/g}]
+. endif
+. endif
+. endfor
+
+# Fall back to sensible defaults for _QT_DIST
+. if empty(_QT_DIST)
+. if ${_QT_VER:M4}
+_QT_DIST= yes # don't force qt-dist to be set for Qt4 ports which all have 'yes'.
+. endif
+. if ${_QT_VER:M5}
+_QT_DIST= ${PORTNAME} # don't force qt-dist to be set for Qt5 ports which 75% of time are ${PORTNAME}
+. endif
+. endif
+
+# Check validitiy
+. if empty(_QT_DISTS:M${_QT_DIST})
+IGNORE= Unsupported qt-dist ${_QT_DIST} for qt:${_QT_VER}
+. endif
+################################################################################
+
+# Set standard bsd.port.mk variables
+MASTER_SITES= ${MASTER_SITE_QT}
+DISTINFO_FILE?= ${PORTSDIR}/devel/${_QT_RELNAME}/distinfo
+
+LICENSE?= LGPL21
+
+. if !exists(${PKGDIR}/pkg-descr)
+DESCR?= ${PORTSDIR}/devel/${_QT_RELNAME}/pkg-descr
+. endif
+
+# Stage support.
+DESTDIRNAME= INSTALL_ROOT
+
+. if ${_QT_VER:M4}
+MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/
+DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION}
+DIST_SUBDIR= KDE
+. else
+MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
+# www/qt5-webengine hackery: The tarballs of 5.9.5 had a different naming scheme.
+. if ${QT5_VERSION} == "5.9.5"
+DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
+. else
+DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
+. endif
+DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
+DIST_SUBDIR= KDE/Qt/${_QT_VERSION}
+
+# Qt (at least when used with qmake) has a tendency to overlink: some libraries
+# have dependencies on others in the mkspec configurations and the latter are
+# always passed to the linker even if they are not actually used. By passing
+# --as-needed to the linker by default when building the Qt ports we do not
+# have to declare a lot of unnecessary dependencies in USE_QT5.
+# This could arguably work for Qt4 too, but since it is maintenance mode it is
+# better not to fix what is not explicitly broken there.
+LDFLAGS+= -Wl,--as-needed
+
+. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
+ defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
+# Ensure that the "makesum" target (with its inner "fetch" one) uses
+# devel/qt*/distinfo for every port.
+. if ${DISTINFO_FILE:H} == ${PORTSDIR}/devel/${_QT_RELNAME}
+_QT_DIST= ${_QT5_DISTS}
+. endif
+. endif
+
+# Qt5's tarballs are xz compressed.
+. if empty(USES:Mtar)
+EXTRACT_SUFX?= .tar.xz
+. endif
+
+. if ${_QT_DIST} == "base" && ${PORTNAME} != "qmake"
+# Qt configure requires pkg-config to detect dependencies.
+.include "${USESDIR}/pkgconfig.mk"
+. endif
+
+# -nomake is only used by qtbase's configure script.
+# Other ports from other Qt modules will automatically build examples and
+# tests if the directories exist because of mkspecs/features/qt_parts.prf.
+EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
+ ${DISTNAME:S,$,/tests,:S,^,--exclude ,}
+. endif # ! ${_QT_VER:M4}
+
+CONFIGURE_ENV+= MAKE="${MAKE:T}"
+
+CONFIGURE_ARGS+= -opensource -confirm-license \
+ -no-pch \
+ -prefix ${PREFIX} \
+ -bindir ${PREFIX}/${QT_BINDIR_REL} \
+ -headerdir ${PREFIX}/${QT_INCDIR_REL} \
+ -libdir ${PREFIX}/${QT_LIBDIR_REL} \
+ -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
+ -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \
+ -datadir ${PREFIX}/${QT_DATADIR_REL} \
+ -docdir ${PREFIX}/${QT_DOCDIR_REL} \
+ -translationdir ${PREFIX}/${QT_L10NDIR_REL} \
+ -sysconfdir ${PREFIX}/${QT_ETCDIR_REL}
+
+. if ${_QT_VER:M4}
+CONFIGURE_ARGS+= -fast \
+ -platform ${QMAKESPEC} \
+ -system-libjpeg -system-libpng \
+ -system-libmng -system-libtiff -system-zlib \
+ -no-phonon-backend \
+ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \
+ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos
+. else
+CONFIGURE_ARGS+= -nomake examples -nomake tests \
+ -platform ${QMAKESPECNAME} \
+ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
+ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
+ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \
+ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
+ -testsdir ${PREFIX}/${QT_TESTDIR_REL}
+
+. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
+CONFIGURE_ARGS+= -no-sse2
+. endif
+
+# Work around a bug in current binutils, where the gold linker creates
+# duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports.
+CONFIGURE_ARGS+= -no-use-gold-linker
+# Pass -recheck-all so that multiple calls to the configure script really
+# re-run all checks.
+CONFIGURE_ARGS+= -recheck-all
+. endif # ${_QT_VER:M4}
+
+. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+WITH_DEBUG= yes
+STRIP= # It's done prior to bsd.qt.mk inclusion.
+CONFIGURE_ARGS+= -debug -separate-debug-info
+# Override configuration in global qconfig.pri.
+QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \
+ QT_CONFIG-="release"
+. else
+CONFIGURE_ARGS+= -release -no-separate-debug-info
+QMAKE_ARGS+= QT_CONFIG+="release" \
+ QT_CONFIG-="debug separate_debug_info"
+. endif # defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+
+. if defined(WANT_QT_VERBOSE_CONFIGURE)
+CONFIGURE_ARGS+= -verbose
+. endif
+
+. if ${_QT_DIST} == "base" || ${_QT_VER:M4}
+. if ${_QT_VER:M4}
+_EXTRA_PATCHES_QT4= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
+ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
+ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
+# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
+_EXTRA_PATCHES_QT4+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-armv6
+_EXTRA_PATCHES_QT4+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-aarch64
+. else
+_EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
+ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
+ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
+. endif
+EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
+ ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
+. endif # ${_QT_DIST} == "base" || ${_QT_VER:M4}
+
+# Override settings installed in qconfig.h and *.pri files. The flags will be
+# installed along with the port, but have to be passed as arguments while
+# building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups")
+# are needed to disable some features.
+. if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
+# Used for both qconfig-*.h and qt_config_*.pri; it can't be empty.
+QT_MODNAME= ${PORTNAME}
+. endif
+QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix).
+QT_CONFIG?= # For *.pri files QT_CONFIG flags.
+. if ${QT_DEFINES}
+QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
+. if ${QT_DEFINES:N-*}
+# Use a script to cleanup qconfig-modules.h (see qt-post-install).
+PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
+. endif
+. endif # ${QT_DEFINES}
+. if ${QT_CONFIG:N-*}
+QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
+. endif
+. if ${QT_CONFIG:M-*}
+QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
+. endif
+
+# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
+# The binaries of both supported Qt versions are installed to
+# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
+# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
+# one depending on the value of QT_SELECT (which we pass to both
+# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
+# RUN_DEPEND on it.
+RUN_DEPENDS+= qtchooser:misc/qtchooser
+
+PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
+ FULLVER=${DISTVERSION:C/-.*//}
+
+# Handle additional PLIST directories, which should only be used for Qt-dist ports.
+. for dir in CMAKE ETC
+# Export QT_CMAKEDIR and QT_ETCDIR.
+PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
+. endfor
+
+
+. if ! ${_QT_VER:M4}
+. if ${_QT_DIST} == "base"
+# qtbase requires some tools to be symlinked to the build directory.
+_QT_TOOLS= # empty
+. if ${PORTNAME} != "qmake"
+_QT_TOOLS+= ${QMAKE}
+. endif
+. if ${PORTNAME} != "buildtools"
+_QT_TOOLS+= ${MOC} ${RCC}
+. endif
+. if ${PORTNAME} != "qdoc"
+_QT_TOOLS+= qdoc
+. endif
+. if ${PORTNAME} != "dbus"
+_QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp
+. endif
+. if ${PORTNAME} != "widgets"
+_QT_TOOLS+= ${UIC}
+. endif
+
+# The list of QtBase components that need to be linked into WRKSRC/lib for
+# other QtBase ports. See below.
+_QT5_BASE= core dbus gui network sql widgets
+
+pre-configure: qtbase-pre-configure
+qtbase-pre-configure:
+. for tool in ${_QT_TOOLS}
+ @${TEST} -e ${QT_BINDIR}/${tool:T} && \
+ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
+ ${TRUE}
+. endfor
+
+# The following is a fix for the inplace upgrade problem we faced (see
+# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
+# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
+# would often gets added by pkgconf for the dependencies, was passed after
+# ${WRKSRC}/lib.
+# * We fix the inplace upgrade problem by moving the Qt5 libraries into
+# ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
+# * However, this means, that the ports belonging to the split up QtBase package
+# now no longer can find their depending QtBase libraries. We fix this by
+# linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
+# on them.
+. if ${_QT_DIST:Mbase}
+. for basedep in ${_QT5_BASE}
+. if ! empty(USE_QT:M${basedep})
+ ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
+. endif
+. endfor
+. endif
+
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
+# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
+# certain paths from pkg-config calls (see the explanation in
+# devel/qt5/files/patch-configure) as well as for setting
+# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for
+# ports/194088.
+post-patch: qtbase-post-patch
+qtbase-post-patch:
+ ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
+ ${WRKSRC}/configure
+
+. if ${PORTNAME} != "qmake"
+_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
+. endif
+. endif
+
+pre-configure: qt5-pre-configure
+qt5-pre-configure:
+# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that
+# requires tests/auto/cmake to be present, otherwise the configure stage will
+# fail.
+# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
+# time, we have to disable the check in a cache file (the only way to get this
+# value through to the configure script in qtbase).
+ ${MKDIR} ${CONFIGURE_WRKSRC}
+ ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
+#
+# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
+#
+# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
+# the linker before -L/usr/local/lib. By default, the opposite happens, which
+# is a problem when a Qt port is being upgraded, since an existing library
+# would end up being picked up instead of those built in ${WRKSRC}/lib. Since
+# qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
+# latter to get the linker path order right. qmake is smart enough to strip
+# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
+# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
+ ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
+
+post-install: qt-post-install
+qt-post-install:
+. if ${QT_DEFINES:N-*}
+# We can't use SUB_FILES with a shared pkg-deinstall.in.
+# We need it to be a script instead of a group of @unexecs, otherwise
+# qconfig-modules.h cleanup will be run in pre-deinstall stage, which is
+# useless. This will probably be replaced by a Keywords/ script in the future.
+ @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \
+ -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \
+ ${PORTSDIR}/devel/${_QT_RELNAME}/${FILESDIR:T}/${PKGDEINSTALL:T}.in > \
+ ${PKGDEINSTALL}
+ @${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
+ @${ECHO_CMD} -n \
+ > ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+. for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
+ @${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
+ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+ ${ECHO_CMD} "# define QT_${def}" \
+ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+ @${ECHO_CMD} "#endif" \
+ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+ @${ECHO_CMD} \
+ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+. endfor
+ @${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
+ >> ${TMPPLIST}
+ @${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
+ >> ${TMPPLIST}
+. endif # ${QT_DEFINES:N-*}
+. if ${QT_CONFIG:N-*}
+ @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
+ ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
+ > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
+ @${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
+ >> ${TMPPLIST}
+. endif # ${QT_CONFIG:N-*}
+. endif # M4
+
+.endif # defined(_QT_DIST_MK_INCLUDED)
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
new file mode 100644
index 000000000000..f22b32d9a177
--- /dev/null
+++ b/Mk/Uses/qt.mk
@@ -0,0 +1,500 @@
+# $FreeBSD$
+#
+# There are three Qt related USES files with different access to Qt.
+# - qmake: The port requires Qt's qmake to build -- creates the configure target
+# - auto includes qt.mk
+# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - auto includes qt.mk and qmake.mk
+# - qt.mk - Dependency handling. USE_QT=foo bar
+#
+# Usage:
+# USES=qt:<version>[,no_env]
+#
+# Versions: 4 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
+# without depending on Qt ports.
+# Global switches (for inclusion into /etc/make.conf):
+# QT4_OPTIONS - A list of (Qt 4-only) global options; can be CUPS, NAS
+# and/or QGTKSTYLE. If set, Qt will be built with support
+# for:
+# * Common UNIX Printing System (CUPS);
+# * Network Audio System (NAS);
+# * GTK+-based Qt theme (QGTKSTYLE).
+
+.if !defined(_QT_MK_INCLUDED)
+_QT_MK_INCLUDED= qt.mk
+
+# Qt versions currently supported by the framework.
+_QT_SUPPORTED?= 4 5
+QT4_VERSION?= 4.8.7
+QT5_VERSION?= 5.10.1
+
+# We accept the Qt version to be passed by either or all of the three mk files.
+. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
+IGNORE= qt needs a version (${_QT_SUPPORTED}) passed via qt, qmake or qt-dist.
+. endif
+
+# Gather all the args together
+_QT_GLOBAL_ARGS= ${qt_ARGS} ${qmake_ARGS} ${qt-dist_ARGS}
+
+# Check fo the Qt version to be used
+_QT_VER= # empty
+. for ver in ${_QT_SUPPORTED:O:u}
+. if ${_QT_GLOBAL_ARGS:M${ver}}
+. if !defined(_QT_VERSION)
+_QT_VER= ${ver}
+. else
+. if ${_QT_VERSION} != ${ver}
+IGNORE?= cannot be installed: different Qt versions specified via qt:[${_QT_SUPPORTED:S/ //g}], qmake:[${_QT_SUPPORTED:S/ //g}] a qt-dist:[${_QT_SUPPORTED:S/ //g}]
+. endif
+. endif
+. endif
+. endfor
+
+. if empty(_QT_VER)
+IGNORE?= cannot decide what Qt version to use: specify one via qt:[${_QT_SUPPORTED:S/ //g}], qmake:[${_QT_SUPPORTED:S/ //g}] or qt-dist:[${_QT_SUPPORTED:S/ //g}]
+. endif
+
+# Set the shortcuts used from now on
+_QT_RELNAME= qt${_QT_VER}
+_QT_VERSION= ${QT${_QT_VER}_VERSION}
+
+# A wrapper (qtchooser) is used to invoke binaries.
+QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin
+QT_INCDIR_REL?= include/${_QT_RELNAME}
+QT_LIBDIR_REL?= lib/${_QT_RELNAME}
+QT_ARCHDIR_REL?= ${QT_LIBDIR_REL}
+QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins
+QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME}
+QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports
+QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml
+QT_DATADIR_REL?= share/${_QT_RELNAME}
+QT_DOCDIR_REL?= share/doc/${_QT_RELNAME}
+QT_L10NDIR_REL?= ${QT_DATADIR_REL}/translations
+QT_ETCDIR_REL?= etc/xdg
+QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME}
+QT_TESTDIR_REL?= ${QT_DATADIR_REL}/tests
+QT_CMAKEDIR_REL?= lib/cmake
+QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser
+
+# Not customizable.
+. if ${_QT_VERSION:M4*}
+QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
+_QT_LIBVER= # empty
+. else
+QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
+_QT_LIBVER= ${_QT_VERSION:R:R}
+. endif
+
+LRELEASE?= ${QT_BINDIR}/lrelease
+LUPDATE?= ${QT_BINDIR}/lupdate
+MOC?= ${QT_BINDIR}/moc
+RCC?= ${QT_BINDIR}/rcc
+UIC?= ${QT_BINDIR}/uic
+QMAKE?= ${QT_BINDIR}/qmake
+# Needed to redefine the qmake target for internal Qt configuration.
+_QMAKE?= ${QMAKE}
+QMAKESPECNAME?= freebsd-${QMAKE_COMPILER}
+QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME}
+
+# The whole Qt distribution should be built with the same compiler, but it's
+# better to support custom settings. Dereferencing the detection allows to
+# avoid forking a shell on each inclusion of this file, and to catch any CXX
+# customization (via USE_GCC, etc.).
+QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)
+
+. for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
+ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
+ CMAKE QTCHOOSER
+QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
+# Export all directories to the plist substituion for QT_DIST ports.
+# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
+. if ${dir:NCMAKE} && ${dir:NETC}
+PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
+. endif
+. endfor
+
+# Pass the chosen Qt version to the environment for qtchooser.
+CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME}
+MAKE_ENV+= QT_SELECT=${_QT_RELNAME}
+
+# Make sure both the installed mkspecs as well as the ones being built are
+# found, with the ones from the port being built having preference.
+CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
+MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
+
+_USES_POST+= qt
+.endif # _QT_MK_INCLUDED
+
+# =============================================================================
+#
+# =============================================================================
+
+.if defined(_POSTMKINCLUDED) && !defined(_QT_MK_POST_INCLUDED)
+_QT_MK_POST_INCLUDED= qt.mk
+
+# The Qt components supported by qt.mk: list of shared, and version specific ones
+_USE_QT_ALL= assistant dbus declarative designer doc gui help \
+ imageformats l10n linguist linguisttools multimedia \
+ network opengl pixeltool qdbusviewer qmake script \
+ scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
+ sql-sqlite2 sql-sqlite3 svg testlib webkit \
+ xml xmlpatterns
+
+_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
+ codecs-kr codecs-tw corelib demo graphicssystems-opengl \
+ help-tools iconengines inputmethods makeqpf moc phonon \
+ phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
+ qtestlib qvfb rcc uic uic3 xmlpatterns-tool
+
+_USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \
+ core datavis3d diag examples gamepad \
+ graphicaleffects location paths phonon4 plugininfo printsupport \
+ qdbus qdoc qdoc-data qev qml quick quickcontrols \
+ quickcontrols2 scxml sensors serialbus serialport speech \
+ sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
+ webengine websockets websockets-qml widgets x11extras
+
+# Dependency tuples: _LIB should be preferred if possible.
+3d_PORT= graphics/${_QT_RELNAME}-3d
+3d_LIB= libQt${_QT_LIBVER}3DCore.so
+
+accessible_PORT= accessibility/${_QT_RELNAME}-accessible
+accessible_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/accessible/libqtaccessiblewidgets.so
+
+assistant_PORT= devel/${_QT_RELNAME}-assistant
+assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant
+
+assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp
+assistant-adp_PATH= assistant_adp
+
+assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient
+assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so
+
+buildtools_PORT= devel/${_QT_RELNAME}-buildtools
+buildtools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
+
+canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
+canvas3d_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtCanvas3D/qmldir
+
+charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
+charts_LIB= libQt${_QT_LIBVER}Charts.so
+
+clucene_PORT= textproc/${_QT_RELNAME}-clucene
+clucene_LIB= libQt${_QT_LIBVER}CLucene.so
+
+codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn
+codecs-cn_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqcncodecs.so
+
+codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp
+codecs-jp_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqjpcodecs.so
+
+codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr
+codecs-kr_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqkrcodecs.so
+
+codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw
+codecs-tw_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqtwcodecs.so
+
+concurrent_PORT= devel/${_QT_RELNAME}-concurrent
+concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so
+
+connectivity_PORT= comms/${_QT_RELNAME}-connectivity
+connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so
+
+core_PORT= devel/${_QT_RELNAME}-core
+core_LIB= libQt${_QT_LIBVER}Core.so
+
+corelib_PORT= devel/${_QT_RELNAME}-corelib
+corelib_LIB= ${core_LIB}
+
+datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d
+datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so
+
+dbus_PORT= devel/${_QT_RELNAME}-dbus
+dbus_LIB= libQt${_QT_LIBVER}DBus.so
+
+declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative
+declarative_LIB= libQt${_QT_LIBVER}Declarative.so
+
+demo_PORT= misc/${_QT_RELNAME}-qtdemo
+demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo
+
+designer_PORT= devel/${_QT_RELNAME}-designer
+designer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/designer
+
+diag_PORT= sysutils/${_QT_RELNAME}-qtdiag
+diag_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdiag
+
+doc_PORT= misc/${_QT_RELNAME}-doc
+doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
+
+examples_PORT= misc/${_QT_RELNAME}-examples
+examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R}
+
+gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad
+gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so
+
+graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects
+graphicaleffects_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir
+
+graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl
+graphicssystems-opengl_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/graphicssystems/libqglgraphicssystem.so
+
+gui_PORT= x11-toolkits/${_QT_RELNAME}-gui
+gui_LIB= libQt${_QT_LIBVER}Gui.so
+
+help_PORT= devel/${_QT_RELNAME}-help
+help_LIB= libQt${_QT_LIBVER}Help.so
+
+help-tools_PORT= devel/${_QT_RELNAME}-help-tools
+help-tools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qhelpgenerator
+
+iconengines_PORT= graphics/${_QT_RELNAME}-iconengines
+iconengines_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/iconengines/libqsvgicon.so
+
+imageformats_PORT= graphics/${_QT_RELNAME}-imageformats
+imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so
+
+inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods
+inputmethods_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/inputmethods/libqimsw-multi.so
+
+linguist_PORT= devel/${_QT_RELNAME}-linguist
+linguist_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/linguist
+
+linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools
+linguisttools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/lrelease
+
+location_PORT= devel/${_QT_RELNAME}-location
+location_LIB= libQt${_QT_LIBVER}Location.so
+
+l10n_PORT= misc/${_QT_RELNAME}-l10n
+l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}
+
+makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf
+makeqpf_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/makeqpf
+
+moc_PORT= devel/${_QT_RELNAME}-moc
+moc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
+
+multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia
+multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so
+
+network_PORT= net/${_QT_RELNAME}-network
+network_LIB= libQt${_QT_LIBVER}Network.so
+
+opengl_PORT= graphics/${_QT_RELNAME}-opengl
+opengl_LIB= libQt${_QT_LIBVER}OpenGL.so
+
+paths_PORT= sysutils/${_QT_RELNAME}-qtpaths
+paths_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths
+
+pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool
+pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool
+
+phonon_PORT= multimedia/phonon@${_QT_RELNAME}
+phonon_LIB= libphonon.so
+
+phonon4_PORT= multimedia/phonon@${_QT_RELNAME}
+phonon4_LIB= libphonon4${_QT_RELNAME}.so
+
+phonon-gst_PORT= multimedia/phonon-gstreamer@${_QT_RELNAME}
+phonon-gst_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/phonon_backend/libphonon_gstreamer.so
+
+plugininfo_PORT= sysutils/${_QT_RELNAME}-qtplugininfo
+plugininfo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtplugininfo
+
+porting_PORT= devel/${_QT_RELNAME}-porting
+porting_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qt3to4
+
+printsupport_PORT= print/${_QT_RELNAME}-printsupport
+printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so
+
+qdbus_PORT= devel/${_QT_RELNAME}-qdbus
+qdbus_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbus
+
+qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer
+qdbusviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbusviewer
+
+qdoc_PORT= devel/${_QT_RELNAME}-qdoc
+qdoc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc
+
+qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data
+qdoc-data_PATH= ${LOCALBASE}/${QT_DOCDIR_REL}/global/config.qdocconf
+
+qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3
+qdoc3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc3
+
+qev_PORT= x11/${_QT_RELNAME}-qev
+qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev
+
+qmake_PORT= devel/${_QT_RELNAME}-qmake
+qmake_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmake
+
+qml_PORT= lang/${_QT_RELNAME}-qml
+qml_LIB= libQt${_QT_LIBVER}Qml.so
+
+qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer
+qmlviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer
+
+qt3support_PORT= devel/${_QT_RELNAME}-qt3support
+qt3support_LIB= libQt${_QT_LIBVER}3Support.so
+
+qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig
+qtconfig_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtconfig
+
+qtestlib_PORT= ${testlib_PORT}
+qtestlib_LIB= ${testlib_LIB}
+
+quick_PORT= x11-toolkits/${_QT_RELNAME}-quick
+quick_LIB= libQt${_QT_LIBVER}Quick.so
+
+quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols
+quickcontrols_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
+
+quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
+quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
+
+qvfb_PORT= devel/${_QT_RELNAME}-qvfb
+qvfb_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qvfb
+
+rcc_PORT= devel/${_QT_RELNAME}-rcc
+rcc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/rcc
+
+sensors_PORT= comms/${_QT_RELNAME}-sensors
+sensors_LIB= libQt${_QT_LIBVER}Sensors.so
+
+script_PORT= devel/${_QT_RELNAME}-script
+script_LIB= libQt${_QT_LIBVER}Script.so
+
+scripttools_PORT= devel/${_QT_RELNAME}-scripttools
+scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so
+
+scxml_PORT= devel/${_QT_RELNAME}-scxml
+scxml_LIB= libQt${_QT_LIBVER}Scxml.so
+
+serialbus_PORT= comms/${_QT_RELNAME}-serialbus
+serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so
+
+serialport_PORT= comms/${_QT_RELNAME}-serialport
+serialport_LIB= libQt${_QT_LIBVER}SerialPort.so
+
+speech_PORT= accessibility/${_QT_RELNAME}-speech
+speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so
+
+sql_PORT= databases/${_QT_RELNAME}-sql
+sql_LIB= libQt${_QT_LIBVER}Sql.so
+
+sql-pgsql_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlpsql.so
+
+. if ${_QT_VERSION:M4*}
+sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin
+. endif
+
+sql-sqlite3_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlite.so
+
+. for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds
+. if ${_QT_VERSION:M4*}
+sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin
+. else
+sql-${db}_PORT?= databases/${_QT_RELNAME}-sqldrivers-${db}
+. endif
+sql-${db}_PATH?= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsql${db:C/^sql//}.so
+. endfor
+
+svg_PORT= graphics/${_QT_RELNAME}-svg
+svg_LIB= libQt${_QT_LIBVER}Svg.so
+
+testlib_PORT= devel/${_QT_RELNAME}-testlib
+testlib_LIB= libQt${_QT_LIBVER}Test.so
+
+uic_PORT= devel/${_QT_RELNAME}-uic
+uic_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/uic
+
+uic3_PORT= devel/${_QT_RELNAME}-uic3
+uic3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/uic3
+
+uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin
+uiplugin_PATH= ${LOCALBASE}/${QT_INCDIR_REL}/QtUiPlugin/QtUiPlugin
+
+uitools_PORT= devel/${_QT_RELNAME}-uitools
+uitools_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt${_QT_LIBVER}UiTools.a
+
+virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
+virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so
+
+webchannel_PORT= www/${_QT_RELNAME}-webchannel
+webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
+
+webengine_PORT= www/${_QT_RELNAME}-webengine
+webengine_LIB= libQt${_QT_LIBVER}WebEngine.so
+
+websockets_PORT= www/${_QT_RELNAME}-websockets
+websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
+
+websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml
+websockets-qml_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtWebSockets/qmldir
+
+webkit_PORT= www/${_QT_RELNAME}-webkit
+webkit_LIB= libQt${_QT_LIBVER}WebKit.so
+
+widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets
+widgets_LIB= libQt${_QT_LIBVER}Widgets.so
+
+x11extras_PORT= x11/${_QT_RELNAME}-x11extras
+x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so
+
+xml_PORT= textproc/${_QT_RELNAME}-xml
+xml_LIB= libQt${_QT_LIBVER}Xml.so
+
+xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns
+xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so
+
+xmlpatterns-tool_PORT= textproc/${_QT_RELNAME}-xmlpatterns-tool
+xmlpatterns-tool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/xmlpatterns
+
+# Actually add the dependencies to the proper lists.
+_USE_QT_ALL+= ${_USE_QT${_QT_VER}_ONLY}
+_USE_QT= ${USE_QT}
+# Iterate through components deprived of suffix.
+. for component in ${_USE_QT:O:u:C/_.+//}
+# Check that the component is valid.
+. if ${_USE_QT_ALL:M${component}} != ""
+# Skip meta-components (currently none).
+. if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB))
+# Check if a dependency type is explicitly requested.
+. if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
+${component}_TYPE= # empty
+. if ${_USE_QT:M${component}_build} != ""
+${component}_TYPE+= build
+. endif
+. if ${_USE_QT:M${component}_run} != ""
+${component}_TYPE+= run
+. endif
+. endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
+# If no dependency type is set, default to full dependency.
+. if !defined(${component}_TYPE)
+${component}_TYPE= build run
+. endif
+# Set real dependencies.
+. if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun}
+LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT}
+. else
+${component}_PATH?= ${QT_LIBDIR}/${${component}_LIB}
+${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT}
+. if ${${component}_TYPE:Mbuild} != ""
+BUILD_DEPENDS+= ${${component}_DEPENDS}
+. endif
+. if ${${component}_TYPE:Mrun} != ""
+RUN_DEPENDS+= ${${component}_DEPENDS}
+. endif
+. endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun}
+. endif # defined(${component}_PORT) && defined(${component}_PATH)
+. else # ! ${_USE_QT_ALL:M${component}} != ""
+IGNORE= cannot be installed: unknown USE_QT component '${component}'
+. endif # ${_USE_QT_ALL:M${component}} != ""
+. endfor
+
+.endif # defined(_QT_MK_POST_INCLUDED)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 1c416d8a1521..4b857c044e2b 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1408,10 +1408,6 @@ USE_APACHE:= ${USE_APACHE:S/common/server,/}
USES+= apache:${USE_APACHE:C/2([0-9])/2.\1/g}
.endif
-.if defined(USE_QT4) || defined(USE_QT5)
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
-.endif
-
.if defined(USE_TEX)
.include "${PORTSDIR}/Mk/bsd.tex.mk"
.endif
@@ -1974,10 +1970,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \
.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
.endif
-.if defined(USE_QT4) || defined(USE_QT5)
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
-.endif
-
.if defined(USE_SDL)
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
.endif
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
deleted file mode 100644
index 36fd95d9b63a..000000000000
--- a/Mk/bsd.qt.mk
+++ /dev/null
@@ -1,810 +0,0 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
-# $FreeBSD$
-#
-# Port variables:
-# 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.
-# QT_DIST - The port belongs to the Qt distribution. Set to 'yes' for
-# Qt 4, or to the distribution name(s) for newer versions.
-# QT_NONSTANDARD - Suppress modification of configure and make environment.
-#
-# Global switches (for inclusion into /etc/make.conf):
-# QT4_OPTIONS - A list of (Qt 4-only) global options; can be CUPS, NAS
-# and/or QGTKSTYLE. If set, Qt will be built with support
-# for:
-# * Common UNIX Printing System (CUPS);
-# * Network Audio System (NAS);
-# * GTK+-based Qt theme (QGTKSTYLE).
-
-.if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
-
-Qt_Include_MAINTAINER= kde@FreeBSD.org
-Qt_Pre_Include= bsd.qt.mk
-
-# Qt versions currently supported by the framework.
-_QT_SUPPORTED?= 4 5
-QT4_VERSION?= 4.8.7
-QT5_VERSION?= 5.10.1
-
-_QT_RELNAME= qt${_QT_VERSION:R:R}
-_QT_VERSION= # empty
-.for ver in ${_QT_SUPPORTED}
-. if defined(USE_QT${ver})
-. if empty(_QT_VERSION)
-_QT_VERSION= ${QT${ver}_VERSION}
-. else
-# Reject different USE_QT*.
-IGNORE?= can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
-. endif
-. endif
-.endfor
-
-.if empty(_QT_VERSION)
-# The file was included without USE_QT*.
-IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
-.endif
-
-.if defined(QT_DIST)
-QT_NONSTANDARD= yes
-
-MASTER_SITES= ${MASTER_SITE_QT}
-DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo
-
-LICENSE?= LGPL21
-
-. if !exists(${PKGDIR}/pkg-descr)
-DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr
-. endif
-
-# Stage support.
-DESTDIRNAME= INSTALL_ROOT
-
-. if ${_QT_VERSION:M4*}
-MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/
-DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION}
-DIST_SUBDIR= KDE
-. else
-MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
-# www/qt5-webengine hackery: The tarballs of 5.9.5 had a different naming scheme.
-. if ${QT5_VERSION} == "5.9.5"
-DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
-. else
-DISTNAME= ${QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
-. endif
-DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
-DIST_SUBDIR= KDE/Qt/${_QT_VERSION}
-
-USES+= tar:xz
-
-# Qt (at least when used with qmake) has a tendency to overlink: some libraries
-# have dependencies on others in the mkspec configurations and the latter are
-# always passed to the linker even if they are not actually used. By passing
-# --as-needed to the linker by default when building the Qt ports we do not
-# have to declare a lot of unnecessary dependencies in USE_QT5.
-# This could arguably work for Qt4 too, but since it is maintenance mode it is
-# better not to fix what is not explicitly broken there.
-LDFLAGS+= -Wl,--as-needed
-
-. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
- defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
-# Ensure that the "makesum" target (with its inner "fetch" one) uses
-# devel/qt*/distinfo for every port.
-. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
-QT_DIST= 3d activeqt androidextras base canvas3d charts connectivity \
- datavis3d declarative doc gamepad graphicaleffects imageformats \
- location macextras multimedia networkauth purchasing \
- quickcontrols2 quickcontrols remoteobjects script scxml sensors \
- serialbus serialport speech svg tools translations \
- virtualkeyboard wayland webchannel websockets webview \
- winextras x11extras xmlpatterns
-. endif
-. endif
-
-. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
-# Qt configure requires pkg-config to detect dependencies.
-USES+= pkgconfig
-. endif
-
-# -nomake is only used by qtbase's configure script.
-# Other ports from other Qt modules will automatically build examples and
-# tests if the directories exist because of mkspecs/features/qt_parts.prf.
-EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
- ${DISTNAME:S,$,/tests,:S,^,--exclude ,} \
- --no-same-owner --no-same-permissions
-. endif # ! ${_QT_VERSION:M4*}
-
-CONFIGURE_ENV+= MAKE="${MAKE:T}"
-
-CONFIGURE_ARGS+=-opensource -confirm-license \
- -no-pch \
- -prefix ${PREFIX} \
- -bindir ${PREFIX}/${QT_BINDIR_REL} \
- -headerdir ${PREFIX}/${QT_INCDIR_REL} \
- -libdir ${PREFIX}/${QT_LIBDIR_REL} \
- -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
- -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \
- -datadir ${PREFIX}/${QT_DATADIR_REL} \
- -docdir ${PREFIX}/${QT_DOCDIR_REL} \
- -translationdir ${PREFIX}/${QT_L10NDIR_REL} \
- -sysconfdir ${PREFIX}/${QT_ETCDIR_REL}
-
-. if ${_QT_VERSION:M4*}
-CONFIGURE_ARGS+=-fast \
- -platform ${QMAKESPEC} \
- -system-libjpeg -system-libpng \
- -system-libmng -system-libtiff -system-zlib \
- -no-phonon-backend \
- -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \
- -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos
-. else
-CONFIGURE_ARGS+=-nomake examples -nomake tests \
- -platform ${QMAKESPECNAME} \
- -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
- -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
- -qmldir ${PREFIX}/${QT_QMLDIR_REL} \
- -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
- -testsdir ${PREFIX}/${QT_TESTDIR_REL}
-. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
-CONFIGURE_ARGS+=-no-sse2
-. endif
-# Work around a bug in current binutils, where the gold linker creates
-# duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports.
-CONFIGURE_ARGS+= -no-use-gold-linker
-# Pass -recheck-all so that multiple calls to the configure script really
-# re-run all checks.
-CONFIGURE_ARGS+= -recheck-all
-. endif
-
-. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
-WITH_DEBUG= yes
-STRIP= # It's done prior to bsd.qt.mk inclusion.
-CONFIGURE_ARGS+=-debug -separate-debug-info
-# Override configuration in global qconfig.pri.
-QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \
- QT_CONFIG-="release"
-PLIST_SUB+= DEBUG=""
-. else
-CONFIGURE_ARGS+=-release -no-separate-debug-info
-QMAKE_ARGS+= QT_CONFIG+="release" \
- QT_CONFIG-="debug separate_debug_info"
-PLIST_SUB+= DEBUG="@comment "
-. endif
-
-. if defined(WANT_QT_VERBOSE_CONFIGURE)
-CONFIGURE_ARGS+=-verbose
-. endif
-
-. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
-. if ${_QT_VERSION:M4*}
-_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test
-# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
-_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6
-_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-aarch64
-. else
-_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
-. endif
-EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
- ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
-. endif
-
-# Override settings installed in qconfig.h and *.pri files. The flags will be
-# installed along with the port, but have to be passed as arguments while
-# building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups")
-# are needed to disable some features.
-. if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
-# Used for both qconfig-*.h and qt_config_*.pri; it can't be empty.
-QT_MODNAME= ${PORTNAME}
-. endif
-QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix).
-QT_CONFIG?= # For *.pri files QT_CONFIG flags.
-. if ${QT_DEFINES}
-QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
-. if ${QT_DEFINES:N-*}
-# Use a script to cleanup qconfig-modules.h (see qt-post-install).
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-. endif
-. endif
-. if ${QT_CONFIG:N-*}
-QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
-. endif
-. if ${QT_CONFIG:M-*}
-QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
-. endif
-
-# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
-# The binaries of both supported Qt versions are installed to
-# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
-# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
-# one depending on the value of QT_SELECT (which we pass to both
-# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
-# RUN_DEPEND on it.
-RUN_DEPENDS+= qtchooser:misc/qtchooser
-
-PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
- FULLVER=${DISTVERSION:C/-.*//}
-.endif # defined(QT_DIST)
-
-# A wrapper (qtchooser) is used to invoke binaries.
-QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin
-QT_INCDIR_REL?= include/${_QT_RELNAME}
-QT_LIBDIR_REL?= lib/${_QT_RELNAME}
-QT_ARCHDIR_REL?=${QT_LIBDIR_REL}
-QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins
-QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME}
-QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports
-QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml
-QT_DATADIR_REL?=share/${_QT_RELNAME}
-QT_DOCDIR_REL?= share/doc/${_QT_RELNAME}
-QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations
-QT_ETCDIR_REL?= etc/xdg
-QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME}
-QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests
-QT_CMAKEDIR_REL?= lib/cmake
-QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser
-
-# Not customizable.
-.if ${_QT_VERSION:M4*}
-QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
-
-_QT_LIBVER= # empty
-.else
-QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
-
-_QT_LIBVER= ${_QT_VERSION:R:R}
-.endif
-
-LRELEASE?= ${QT_BINDIR}/lrelease
-LUPDATE?= ${QT_BINDIR}/lupdate
-MOC?= ${QT_BINDIR}/moc
-RCC?= ${QT_BINDIR}/rcc
-UIC?= ${QT_BINDIR}/uic
-QMAKE?= ${QT_BINDIR}/qmake
-# Needed to redefine the qmake target for internal Qt configuration.
-_QMAKE?= ${QMAKE}
-QMAKESPECNAME?= freebsd-${QMAKE_COMPILER}
-QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME}
-
-# The whole Qt distribution should be built with the same compiler, but it's
-# better to support custom settings. Dereferencing the detection allows to
-# avoid forking a shell on each inclusion of this file, and to catch any CXX
-# customization (via USE_GCC, etc.).
-QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)
-
-# Import QMAKE_ENV and QMAKE_ARGS definitions.
-USES+= qmake:_env
-
-.for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
- QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
- CMAKE QTCHOOSER
-QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
-# Export all directories to the plist substituion for QT_DIST ports.
-# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
-. if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST)
-PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
-. endif
-.endfor
-
-# Pass the chosen Qt version to the environment for qtchooser.
-CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME}
-MAKE_ENV+= QT_SELECT=${_QT_RELNAME}
-
-# Make sure both the installed mkspecs as well as the ones being built are
-# found, with the ones from the port being built having preference.
-CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
-MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules"
-
-.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
-
-.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
-
-Qt_Post_Include= bsd.qt.mk
-
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ENV+= QTDIR="${QT_ARCHDIR}" QMAKE="${QMAKE}" \
- MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
- QMAKESPEC="${QMAKESPEC}"
-CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
- --with-qt-libraries=${QT_LIBDIR} \
- --with-extra-includes=${LOCALBASE}/include \
- --with-extra-libs=${LOCALBASE}/lib
-.endif # !defined(QT_NONSTANDARD)
-
-_USE_QT_ALL= assistant dbus declarative designer doc gui help \
- imageformats l10n linguist linguisttools multimedia \
- network opengl pixeltool qdbusviewer qmake script \
- scripttools sql sql-mysql sql-odbc sql-pgsql \
- sql-sqlite2 sql-sqlite3 svg testlib webkit \
- xml xmlpatterns
-.if ${ARCH} == amd64 || ${ARCH} == i386
-_USE_QT_ALL+= sql-ibase
-.endif
-
-_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
- codecs-kr codecs-tw corelib demo graphicssystems-opengl \
- help-tools iconengines inputmethods makeqpf moc phonon \
- phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
- qtestlib qvfb rcc uic uic3 xmlpatterns-tool
-
-_USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \
- core datavis3d diag examples gamepad \
- graphicaleffects location paths phonon4 plugininfo printsupport \
- qdbus qdoc qdoc-data qev qml quick quickcontrols \
- quickcontrols2 scxml sensors serialbus serialport speech \
- sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
- webengine websockets websockets-qml widgets x11extras
-
-3d_PORT= graphics/${_QT_RELNAME}-3d
-3d_LIB= libQt${_QT_LIBVER}3DCore.so
-
-accessible_PORT= accessibility/${_QT_RELNAME}-accessible
-accessible_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/accessible/libqtaccessiblewidgets.so
-
-assistant_PORT= devel/${_QT_RELNAME}-assistant
-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant
-
-assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp
-assistant-adp_PATH= assistant_adp
-
-assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient
-assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so
-
-buildtools_PORT= devel/${_QT_RELNAME}-buildtools
-buildtools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
-
-canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
-canvas3d_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtCanvas3D/qmldir
-
-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
-charts_LIB= libQt${_QT_LIBVER}Charts.so
-
-clucene_PORT= textproc/${_QT_RELNAME}-clucene
-clucene_LIB= libQt${_QT_LIBVER}CLucene.so
-
-codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn
-codecs-cn_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqcncodecs.so
-
-codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp
-codecs-jp_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqjpcodecs.so
-
-codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr
-codecs-kr_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqkrcodecs.so
-
-codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw
-codecs-tw_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/codecs/libqtwcodecs.so
-
-concurrent_PORT= devel/${_QT_RELNAME}-concurrent
-concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so
-
-connectivity_PORT= comms/${_QT_RELNAME}-connectivity
-connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so
-
-core_PORT= devel/${_QT_RELNAME}-core
-core_LIB= libQt${_QT_LIBVER}Core.so
-
-corelib_PORT= devel/${_QT_RELNAME}-corelib
-corelib_LIB= ${core_LIB}
-
-datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d
-datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so
-
-dbus_PORT= devel/${_QT_RELNAME}-dbus
-dbus_LIB= libQt${_QT_LIBVER}DBus.so
-
-declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative
-declarative_LIB= libQt${_QT_LIBVER}Declarative.so
-
-demo_PORT= misc/${_QT_RELNAME}-qtdemo
-demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo
-
-designer_PORT= devel/${_QT_RELNAME}-designer
-designer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/designer
-
-diag_PORT= sysutils/${_QT_RELNAME}-qtdiag
-diag_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdiag
-
-doc_PORT= misc/${_QT_RELNAME}-doc
-doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
-
-examples_PORT= misc/${_QT_RELNAME}-examples
-examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R}
-
-gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad
-gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so
-
-graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects
-graphicaleffects_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir
-
-graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl
-graphicssystems-opengl_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/graphicssystems/libqglgraphicssystem.so
-
-gui_PORT= x11-toolkits/${_QT_RELNAME}-gui
-gui_LIB= libQt${_QT_LIBVER}Gui.so
-
-help_PORT= devel/${_QT_RELNAME}-help
-help_LIB= libQt${_QT_LIBVER}Help.so
-
-help-tools_PORT= devel/${_QT_RELNAME}-help-tools
-help-tools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qhelpgenerator
-
-iconengines_PORT= graphics/${_QT_RELNAME}-iconengines
-iconengines_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/iconengines/libqsvgicon.so
-
-imageformats_PORT= graphics/${_QT_RELNAME}-imageformats
-imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so
-
-inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods
-inputmethods_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/inputmethods/libqimsw-multi.so
-
-linguist_PORT= devel/${_QT_RELNAME}-linguist
-linguist_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/linguist
-
-linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools
-linguisttools_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/lrelease
-
-location_PORT= devel/${_QT_RELNAME}-location
-location_LIB= libQt${_QT_LIBVER}Location.so
-
-l10n_PORT= misc/${_QT_RELNAME}-l10n
-l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}
-
-makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf
-makeqpf_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/makeqpf
-
-moc_PORT= devel/${_QT_RELNAME}-moc
-moc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/moc
-
-multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia
-multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so
-
-network_PORT= net/${_QT_RELNAME}-network
-network_LIB= libQt${_QT_LIBVER}Network.so
-
-opengl_PORT= graphics/${_QT_RELNAME}-opengl
-opengl_LIB= libQt${_QT_LIBVER}OpenGL.so
-
-paths_PORT= sysutils/${_QT_RELNAME}-qtpaths
-paths_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths
-
-pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool
-pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool
-
-phonon_PORT= multimedia/phonon@${_QT_RELNAME}
-phonon_LIB= libphonon.so
-
-phonon4_PORT= multimedia/phonon@${_QT_RELNAME}
-phonon4_LIB= libphonon4${_QT_RELNAME}.so
-
-phonon-gst_PORT= multimedia/phonon-gstreamer@${_QT_RELNAME}
-phonon-gst_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/phonon_backend/libphonon_gstreamer.so
-
-plugininfo_PORT= sysutils/${_QT_RELNAME}-qtplugininfo
-plugininfo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtplugininfo
-
-porting_PORT= devel/${_QT_RELNAME}-porting
-porting_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qt3to4
-
-printsupport_PORT= print/${_QT_RELNAME}-printsupport
-printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so
-
-qdbus_PORT= devel/${_QT_RELNAME}-qdbus
-qdbus_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbus
-
-qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer
-qdbusviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdbusviewer
-
-qdoc_PORT= devel/${_QT_RELNAME}-qdoc
-qdoc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc
-
-qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data
-qdoc-data_PATH= ${LOCALBASE}/${QT_DOCDIR_REL}/global/config.qdocconf
-
-qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3
-qdoc3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qdoc3
-
-qev_PORT= x11/${_QT_RELNAME}-qev
-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev
-
-qmake_PORT= devel/${_QT_RELNAME}-qmake
-qmake_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmake
-
-qml_PORT= lang/${_QT_RELNAME}-qml
-qml_LIB= libQt${_QT_LIBVER}Qml.so
-
-qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer
-qmlviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer
-
-qt3support_PORT= devel/${_QT_RELNAME}-qt3support
-qt3support_LIB= libQt${_QT_LIBVER}3Support.so
-
-qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig
-qtconfig_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtconfig
-
-qtestlib_PORT= ${testlib_PORT}
-qtestlib_LIB= ${testlib_LIB}
-
-quick_PORT= x11-toolkits/${_QT_RELNAME}-quick
-quick_LIB= libQt${_QT_LIBVER}Quick.so
-
-quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols
-quickcontrols_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
-
-quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
-quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
-
-qvfb_PORT= devel/${_QT_RELNAME}-qvfb
-qvfb_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qvfb
-
-rcc_PORT= devel/${_QT_RELNAME}-rcc
-rcc_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/rcc
-
-sensors_PORT= comms/${_QT_RELNAME}-sensors
-sensors_LIB= libQt${_QT_LIBVER}Sensors.so
-
-script_PORT= devel/${_QT_RELNAME}-script
-script_LIB= libQt${_QT_LIBVER}Script.so
-
-scripttools_PORT= devel/${_QT_RELNAME}-scripttools
-scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so
-
-scxml_PORT= devel/${_QT_RELNAME}-scxml
-scxml_LIB= libQt${_QT_LIBVER}Scxml.so
-
-serialbus_PORT= comms/${_QT_RELNAME}-serialbus
-serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so
-
-serialport_PORT= comms/${_QT_RELNAME}-serialport
-serialport_LIB= libQt${_QT_LIBVER}SerialPort.so
-
-speech_PORT= accessibility/${_QT_RELNAME}-speech
-speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so
-
-sql_PORT= databases/${_QT_RELNAME}-sql
-sql_LIB= libQt${_QT_LIBVER}Sql.so
-
-sql-pgsql_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlpsql.so
-
-. if ${_QT_VERSION:M4*}
-sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin
-. endif
-
-sql-sqlite3_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsqlite.so
-
-. for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds
-. if ${_QT_VERSION:M4*}
-sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin
-. else
-sql-${db}_PORT?= databases/${_QT_RELNAME}-sqldrivers-${db}
-. endif
-sql-${db}_PATH?= ${LOCALBASE}/${QT_PLUGINDIR_REL}/sqldrivers/libqsql${db:C/^sql//}.so
-. endfor
-
-svg_PORT= graphics/${_QT_RELNAME}-svg
-svg_LIB= libQt${_QT_LIBVER}Svg.so
-
-testlib_PORT= devel/${_QT_RELNAME}-testlib
-testlib_LIB= libQt${_QT_LIBVER}Test.so
-
-uic_PORT= devel/${_QT_RELNAME}-uic
-uic_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/uic
-
-uic3_PORT= devel/${_QT_RELNAME}-uic3
-uic3_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/uic3
-
-uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin
-uiplugin_PATH= ${LOCALBASE}/${QT_INCDIR_REL}/QtUiPlugin/QtUiPlugin
-
-uitools_PORT= devel/${_QT_RELNAME}-uitools
-uitools_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt${_QT_LIBVER}UiTools.a
-
-virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
-virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so
-
-webchannel_PORT= www/${_QT_RELNAME}-webchannel
-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
-
-webengine_PORT= www/${_QT_RELNAME}-webengine
-webengine_LIB= libQt${_QT_LIBVER}WebEngine.so
-
-websockets_PORT= www/${_QT_RELNAME}-websockets
-websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
-
-websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml
-websockets-qml_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtWebSockets/qmldir
-
-webkit_PORT= www/${_QT_RELNAME}-webkit
-webkit_LIB= libQt${_QT_LIBVER}WebKit.so
-
-widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets
-widgets_LIB= libQt${_QT_LIBVER}Widgets.so
-
-x11extras_PORT= x11/${_QT_RELNAME}-x11extras
-x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so
-
-xml_PORT= textproc/${_QT_RELNAME}-xml
-xml_LIB= libQt${_QT_LIBVER}Xml.so
-
-xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns
-xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so
-
-xmlpatterns-tool_PORT= textproc/${_QT_RELNAME}-xmlpatterns-tool
-xmlpatterns-tool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/xmlpatterns
-
-_USE_QT= ${USE_QT${_QT_VERSION:R:R}}
-_USE_QT_ALL+= ${_USE_QT${_QT_VERSION:R:R}_ONLY}
-# Iterate through components deprived of suffix.
-. for component in ${_USE_QT:O:u:C/_.+//}
- # Check that the component is valid.
-. if ${_USE_QT_ALL:M${component}} != ""
- # Skip meta-components (currently none).
-. if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB))
- # Check if a dependency type is explicitly requested.
-. if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
-${component}_TYPE= # empty
-. if ${_USE_QT:M${component}_build} != ""
-${component}_TYPE+= build
-. endif
-. if ${_USE_QT:M${component}_run} != ""
-${component}_TYPE+= run
-. endif
-. endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
- # If no dependency type is set, default to full dependency.
-. if !defined(${component}_TYPE)
-${component}_TYPE= build run
-. endif
- # Set real dependencies.
-. if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun}
-LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT}
-. else
-${component}_PATH?= ${QT_LIBDIR}/${${component}_LIB}
-${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT}
-. if ${${component}_TYPE:Mbuild} != ""
-BUILD_DEPENDS+= ${${component}_DEPENDS}
-. endif
-. if ${${component}_TYPE:Mrun} != ""
-RUN_DEPENDS+= ${${component}_DEPENDS}
-. endif
-. endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun}
-. endif # defined(${component}_PORT) && defined(${component}_PATH)
-. else # ! ${_USE_QT_ALL:M${component}} != ""
-IGNORE= cannot be installed: unknown USE_QT component '${component}'
-. endif # ${_USE_QT_ALL:M${component}} != ""
-. endfor
-
-.if defined(QT_DIST) && ! ${_QT_VERSION:M4*}
-. if ${QT_DIST} == "base"
-# qtbase requires some tools to be symlinked to the build directory.
-_QT_TOOLS= # empty
-. if ${PORTNAME} != "qmake"
-_QT_TOOLS+= ${QMAKE}
-. endif
-. if ${PORTNAME} != "buildtools"
-_QT_TOOLS+= ${MOC} ${RCC}
-. endif
-. if ${PORTNAME} != "qdoc"
-_QT_TOOLS+= qdoc
-. endif
-. if ${PORTNAME} != "dbus"
-_QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp
-. endif
-. if ${PORTNAME} != "widgets"
-_QT_TOOLS+= ${UIC}
-. endif
-
-# The list of QtBase components that need to be linked into WRKSRC/lib for
-# other QtBase ports. See below.
-_QT5_BASE= core dbus gui network sql widgets
-
-pre-configure: qtbase-pre-configure
-qtbase-pre-configure:
-. for tool in ${_QT_TOOLS}
- @${TEST} -e ${QT_BINDIR}/${tool:T} && \
- ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
- ${TRUE}
-. endfor
-
-# The following is a fix for the inplace upgrade problem we faced (see
-# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
-# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
-# would often gets added by pkgconf for the dependencies, was passed after
-# ${WRKSRC}/lib.
-# * We fix the inplace upgrade problem by moving the Qt5 libraries into
-# ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
-# * However, this means, that the ports belonging to the split up QtBase package
-# now no longer can find their depending QtBase libraries. We fix this by
-# linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
-# on them.
-. if ${QT_DIST:Mbase}
-. for basedep in ${_QT5_BASE}
-. if ${USE_QT5:M${basedep}}
- ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
-. endif
-. endfor
-. endif
-
-#
-# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
-#
-# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
-# certain paths from pkg-config calls (see the explanation in
-# devel/qt5/files/patch-configure) as well as for setting
-# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for
-# ports/194088.
-post-patch: qtbase-post-patch
-qtbase-post-patch:
- ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
- ${WRKSRC}/configure
-
-. if ${PORTNAME} != "qmake"
-_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
-. endif
-. endif # ${QT_DIST} == "base"
-
-pre-configure: qt5-pre-configure
-qt5-pre-configure:
-# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that
-# requires tests/auto/cmake to be present, otherwise the configure stage will
-# fail.
-# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
-# time, we have to disable the check in a cache file (the only way to get this
-# value through to the configure script in qtbase).
- ${MKDIR} ${CONFIGURE_WRKSRC}
- ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
-#
-# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
-#
-# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
-# the linker before -L/usr/local/lib. By default, the opposite happens, which
-# is a problem when a Qt port is being upgraded, since an existing library
-# would end up being picked up instead of those built in ${WRKSRC}/lib. Since
-# qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
-# latter to get the linker path order right. qmake is smart enough to strip
-# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
-# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
- ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
-
-post-install: qt-post-install
-qt-post-install:
-. if ${QT_DEFINES:N-*}
-# We can't use SUB_FILES with a shared pkg-deinstall.in.
-# We need it to be a script instead of a group of @unexecs, otherwise
-# qconfig-modules.h cleanup will be run in pre-deinstall stage, which is
-# useless. This will probably be replaced by a Keywords/ script in the future.
- @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \
- -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/${FILESDIR:T}/${PKGDEINSTALL:T}.in > \
- ${PKGDEINSTALL}
- @${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
- @${ECHO_CMD} -n \
- > ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
-. for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
- @${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
- >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
- ${ECHO_CMD} "# define QT_${def}" \
- >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
- @${ECHO_CMD} "#endif" \
- >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
- @${ECHO_CMD} \
- >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
-. endfor
- @${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
- >> ${TMPPLIST}
- @${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
- >> ${TMPPLIST}
-. endif # ${QT_DEFINES:N-*}
-. if ${QT_CONFIG:N-*}
- @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
- ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
- > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
- @${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
- >> ${TMPPLIST}
-. endif # ${QT_CONFIG:N-*}
-.endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*}
-
-.endif # defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index aa57face235e..8707b0bb0d74 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -18,7 +18,7 @@ ALL_UNSUPPORTED= WITHOUT_NLS NOPORTDOCS NOPORTEXAMPLES WITH_BDB_VER \
OVERRIDE_LINUX_BASE_PORT WITH_OPENSSL_PORT \
WITH_OPENSSL_BASE PYTHON_DEFAULT_VERSION \
PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION
-ALL_DEPRECATED=
+ALL_DEPRECATED=
ALL_NOTNEEDED= WITH_NEW_XORG WITHOUT_NEW_XORG WITH_KMS WITHOUT_KMS
WITHOUT_NLS_ALT= "OPTIONS_UNSET=NLS, or ${OPTIONS_NAME}_UNSET+=NLS instead"
@@ -169,7 +169,7 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
USE_RCORDER USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL \
INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
- USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL
+ USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD
SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX MLINKS \
USE_MYSQL WANT_MYSQL_VER \
PYDISTUTILS_INSTALLNOSINGLE \
@@ -254,6 +254,9 @@ APACHE_PORT_ALT= DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9)
USE_FPC_RUN_ALT= USES=fpc:run
WANT_FPC_BASE_ALT= USES=fpc:base
WANT_FPC_ALL_ALT= USES=fpc:all
+USE_QT4_ALT= USES=qt:4 and USE_QT=${USE_QT4}
+USE_QT5_ALT= USES=qt:5 and USE_QT=${USE_QT5}
+QT_NONSTANDARD_ALT= USES=qmake:no_env
.for a in ${SANITY_DEPRECATED}
.if defined(${a})
diff --git a/accessibility/jovie-kde4/Makefile b/accessibility/jovie-kde4/Makefile
index a8e1429ccd3a..a6d6c7eb1aec 100644
--- a/accessibility/jovie-kde4/Makefile
+++ b/accessibility/jovie-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT= KDE text-to-speech system
LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= xml qmake_build moc_build uic_build rcc_build
+USE_QT= xml qmake_build moc_build uic_build rcc_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/accessibility/kaccessible-kde4/Makefile b/accessibility/kaccessible-kde4/Makefile
index 197c6f0a9975..2f7eabed3639 100644
--- a/accessibility/kaccessible-kde4/Makefile
+++ b/accessibility/kaccessible-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT= Accessibility services for KDE
LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= corelib dbus gui xml \
+USE_QT= corelib dbus gui xml \
qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/accessibility/kmag-kde4/Makefile b/accessibility/kmag-kde4/Makefile
index a2ac4ba42ac1..6ccdf20c424b 100644
--- a/accessibility/kmag-kde4/Makefile
+++ b/accessibility/kmag-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Screen magnifier
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
# Somebody has to create port for libkdeaccessibilityclient first
CMAKE_ARGS+= -DWITH_QAccessibilityClient=off
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index e2cacf1cc376..3dc669be3dd2 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -10,10 +10,10 @@ COMMENT= KDE Screen magnifier
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm \
i18n kio service widgetsaddons xmlgui
-USE_QT5= core dbus gui printsupport widgets xml \
+USE_QT= core dbus gui printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/accessibility/kmousetool-kde4/Makefile b/accessibility/kmousetool-kde4/Makefile
index 640ddd6ace93..8d5ffb90139d 100644
--- a/accessibility/kmousetool-kde4/Makefile
+++ b/accessibility/kmousetool-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Automatic mouse click tool for KDE
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
USE_XORG= xtst
.include <bsd.port.mk>
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index aee2d552442f..a451b0bb3cb5 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -11,10 +11,10 @@ COMMENT= Automatic mouse click tool for KDE
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
ecm i18n iconthemes notifications widgetsaddons xmlgui
-USE_QT5= core dbus gui phonon4 widgets xml \
+USE_QT= core dbus gui phonon4 widgets xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xtst
diff --git a/accessibility/kmouth-kde4/Makefile b/accessibility/kmouth-kde4/Makefile
index 74bfb286be43..f52b1233ef21 100644
--- a/accessibility/kmouth-kde4/Makefile
+++ b/accessibility/kmouth-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Speech synthesizer frontend for KDE
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index e9fd68e97b4b..dce38eb03a49 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -10,10 +10,10 @@ COMMENT= Speech synthesizer frontend for KDE
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n jobwidgets kio service widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport speech widgets xml \
+USE_QT= core dbus gui network printsupport speech widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index b82e3b04a82e..50d47c092901 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt accessibility widgets
-USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build qt3support corelib gui network sql xml
USE_CXXSTD= gnu++98
HAS_CONFIGURE= yes
diff --git a/accessibility/qt5-speech/Makefile b/accessibility/qt5-speech/Makefile
index a3c1f30444c3..22bf69b4fe70 100644
--- a/accessibility/qt5-speech/Makefile
+++ b/accessibility/qt5-speech/Makefile
@@ -10,8 +10,7 @@ COMMENT= Accessibilty features for Qt5
LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
-USES= pkgconfig qmake:outsource
-USE_QT5= core gui buildtools_build qmake_build
-QT_DIST= ${PORTNAME}
+USES= pkgconfig qmake:outsource qt-dist:5,speech
+USE_QT= core gui buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/archivers/ark-kde4/Makefile b/archivers/ark-kde4/Makefile
index 51c72818d7d3..82f77193c51e 100644
--- a/archivers/ark-kde4/Makefile
+++ b/archivers/ark-kde4/Makefile
@@ -14,10 +14,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson@qt4
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource kde:4 libarchive cpe tar:xz
+USES= cmake:outsource kde:4 libarchive cpe qt:4 tar:xz
USE_KDE= automoc4 kdelibs libkonq
CPE_VENDOR= kde
-USE_QT4= qtestlib qmake_build moc_build rcc_build uic_build
+USE_QT= qtestlib qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= 7ZIP RAR ZIP
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index ce6264361da3..0a42374e49d0 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -10,12 +10,12 @@ COMMENT= Archiving tool for KDE
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource gettext libarchive kde:5 tar:xz
+USES= cmake:outsource gettext libarchive kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n iconthemes \
itemmodels itemviews jobwidgets khtml kio parts pty service \
solid sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network widgets xml \
+USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/archivers/kf5-karchive/Makefile b/archivers/kf5-karchive/Makefile
index 5cba965b7a85..7c8df0a6f389 100644
--- a/archivers/kf5-karchive/Makefile
+++ b/archivers/kf5-karchive/Makefile
@@ -11,8 +11,8 @@ COMMENT= KF5 library that provides classes for handling archive formats
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build core qmake_build
+USE_QT= buildtools_build core qmake_build
.include <bsd.port.mk>
diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
index e104a74238ba..3cb4c3500a8c 100644
--- a/archivers/quazip/Makefile
+++ b/archivers/quazip/Makefile
@@ -16,14 +16,16 @@ LICENSE= LGPL21
FLAVORS= qt4 qt5
FLAVOR?= ${FLAVORS:[1]}
-USES= cmake:outsource
+USES= cmake:outsource
USE_LDCONFIG= yes
. if ${FLAVOR} == qt4
-USE_QT4= corelib moc_build network_build qmake_build rcc_build uic_build
+USES+= qt:4
+USE_QT= corelib moc_build network_build qmake_build rcc_build uic_build
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=TRUE
. else
-USE_QT5= core buildtools_build qmake_build
+USES+= qt:5
+USE_QT= core buildtools_build qmake_build
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE
QTVER_SUFFIX= 5
. endif
diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile
index 3dfbbef3751d..b1bc4060fff0 100644
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@@ -19,17 +19,18 @@ USE_GITHUB= yes
CONFLICTS= gpsbabel14-[0-9]*
-USE_QT5= core qmake_build
+USE_QT= core qmake_build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib=system
-USES= localbase
+USES= localbase qt:5 qt:5
OPTIONS_DEFINE= GUI
OPTIONS_SUB= yes
GUI_ALL_TARGET= gui
-GUI_USE= QT5=gui,xml,network,webkit
-GUI_USE+= QT5=linguisttools_build,moc_build,rcc_build,uic_build
+GUI_USES= qt:5 qt:5
+GUI_USE= QT=gui,xml,network,webkit
+GUI_USE+= QT=linguisttools_build,moc_build,rcc_build,uic_build
GUI_VARS= MAKE_JOBS_UNSAFE=yes
post-patch:
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 77fc5540b368..16d988027fc1 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -131,7 +131,8 @@ TIMING_MAKE_ARGS_OFF= timing=no
# Client-side options
NCURSES_MAKE_ARGS_OFF= ncurses=no
NCURSES_USES= ncurses
-QTBIND_USE= QT4=network,corelib
+QTBIND_USES= qt:4
+QTBIND_USE= QT=network,corelib
QTBIND_MAKE_ARGS= qt=yes
QTBIND_MAKE_ARGS_OFF= qt=no
QTBIND_PLIST_SUB= QTBIND=""
diff --git a/astro/kstars-kde4/Makefile b/astro/kstars-kde4/Makefile
index 3faf23222a81..1201545c712b 100644
--- a/astro/kstars-kde4/Makefile
+++ b/astro/kstars-kde4/Makefile
@@ -13,9 +13,9 @@ LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
BUILD_DEPENDS= xplanet:astro/xplanet
RUN_DEPENDS= xplanet:astro/xplanet
-USES= cmake:outsource compiler:c++11-lib eigen:3 kde:4 tar:xz
+USES= cmake:outsource compiler:c++11-lib eigen:3 kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= opengl qmake_build moc_build rcc_build uic_build
+USE_QT= opengl qmake_build moc_build rcc_build uic_build
OPTIONS_DEFINE= PYKDE
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index e26a8cfb2dda..1c31532b51a5 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -19,13 +19,13 @@ BUILD_DEPENDS= xplanet:astro/xplanet
RUN_DEPENDS= xplanet:astro/xplanet
USES= cmake:outsource compiler:c++11-lib eigen:3 gettext kde:5 \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets\
coreaddons crash dbusaddons doctools ecm guiaddons i18n \
iconthemes init itemviews jobwidgets kio newstuff notifications \
notifyconfig parts plotting service solid texteditor \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui multimedia network opengl printsupport \
+USE_QT= concurrent core dbus gui multimedia network opengl printsupport \
qml quick sql svg testlib widgets xml \
buildtools_build qmake_build
diff --git a/astro/libkgeomap-kde4/Makefile b/astro/libkgeomap-kde4/Makefile
index f92adf9efd84..bbb994c2aad1 100644
--- a/astro/libkgeomap-kde4/Makefile
+++ b/astro/libkgeomap-kde4/Makefile
@@ -16,9 +16,9 @@ LICENSE_COMB= multi
BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
-USES= cmake:outsource kde:4 pathfix tar:xz
+USES= cmake:outsource kde:4 pathfix qt:4 tar:xz
USE_KDE= kdelibs automoc4 marble
USE_LDCONFIG= yes
-USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build
+USE_QT= network phonon xml moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile
index 370f51392c2b..c1171db6ae05 100644
--- a/astro/libkgeomap/Makefile
+++ b/astro/libkgeomap/Makefile
@@ -13,9 +13,9 @@ LICENSE_COMB= multi
BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
LIB_DEPENDS= libopencv_video.so:graphics/opencv
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n kio marble service textwidgets
-USE_QT5= concurrent core gui network webkit widgets xml \
+USE_QT= concurrent core gui network webkit widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/astro/marble-kde4/Makefile b/astro/marble-kde4/Makefile
index 1db954d0ab22..01cc4768278d 100644
--- a/astro/marble-kde4/Makefile
+++ b/astro/marble-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT= Virtual globe and world atlas for KDE
LIB_DEPENDS= libquazip.so:archivers/quazip@qt4
-USES= cmake:outsource kde:4 shared-mime-info tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= corelib dbus declarative designer_build gui network phonon \
+USE_QT= corelib dbus declarative designer_build gui network phonon \
qtestlib script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 91bb53b996eb..bd5a8db28212 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -13,12 +13,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libquazip5.so:archivers/quazip@qt5
-USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n jobwidgets kio newstuff package parts \
plasma-framework runner service sonnet textwidgets wallet \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus designer gui location network opengl \
+USE_QT= concurrent core dbus designer gui location network opengl \
phonon4 printsupport qml quick script sql svg webkit widgets xml \
buildtools_build qmake_build
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 7a1bcbe19183..3b3a1279818c 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -18,11 +18,11 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \
USE_GITHUB= yes
GH_ACCOUNT= openstreetmap
-USES= pkgconfig sqlite:3 qmake
+USES= pkgconfig qt:5 sqlite:3 qmake
USE_LDCONFIG= yes
QMAKE_ARGS= SYSTEM_QUAZIP=1
-USE_QT5= buildtools_build \
+USE_QT= buildtools_build \
concurrent core gui imageformats network printsupport svg \
webkit widgets xml
@@ -45,7 +45,8 @@ ZBAR_BROKEN= Does not build with option ZBAR selected
DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+NLS_USE= QT=linguisttools_build
INSTALLS_ICONS= yes
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index ac0accced757..2bc9f9bbcc6d 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \
libproj.so:graphics/proj \
libgps.so:astro/gpsd
-USES= cmake desktop-file-utils
-USE_QT4= dbus gui opengl network sql xml linguist_build \
+USES= cmake desktop-file-utils qt:4
+USE_QT= dbus gui opengl network sql xml linguist_build \
moc_build uic_build rcc_build qmake_build
USE_GL= glu
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 6fe565cc2f97..51e1d4bcfa0e 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \
libroutino.so:astro/routino
RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
-USES= cmake compiler:c++11-lib desktop-file-utils jpeg
-USE_QT5= buildtools core dbus gui linguisttools network printsupport \
+USES= cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
+USE_QT= buildtools core dbus gui linguisttools network printsupport \
qmake script sql sql-sqlite3 uitools webkit widgets xml
.include <bsd.port.mk>
diff --git a/astro/stellarium-qt4/Makefile b/astro/stellarium-qt4/Makefile
index fe2f21dd7c4f..9a9ae592fa4f 100644
--- a/astro/stellarium-qt4/Makefile
+++ b/astro/stellarium-qt4/Makefile
@@ -18,8 +18,8 @@ LICENSE= GPLv2+
CONFLICTS_INSTALL= ${PORTNAME}-0.17.*
PORTSCOUT= limit:^0\.12\. # track only 0.12.x (legacy)
-USES= cmake gettext iconv
-USE_QT4= moc_build rcc_build uic_build qmake_build \
+USES= cmake gettext iconv qt:4
+USE_QT= moc_build rcc_build uic_build qmake_build \
corelib gui network opengl
PORTDOCS= AUTHORS ChangeLog README
@@ -55,13 +55,13 @@ PLIST_SUB+= TEXTURES="@comment "
.endif
.if ${PORT_OPTIONS:MMULTIMEDIA}
-USE_QT4+= phonon
+USE_QT+= phonon
.else
CMAKE_ARGS+= -DENABLE_SOUND:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MSCRIPTING}
-USE_QT4+= script
+USE_QT+= script
PLIST_SUB+= SCRIPTS=""
.else
CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 83f1f02bba6f..b2b3703d7ed9 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -17,8 +17,8 @@ CONFLICTS_INSTALL= ${PORTNAME}-qt4-0.12.*
USE_GITHUB= yes
GH_ACCOUNT= Stellarium
-USES= cmake gettext
-USE_QT5= qmake_build buildtools_build linguisttools_build \
+USES= cmake gettext qt:5
+USE_QT= qmake_build buildtools_build linguisttools_build \
concurrent core gui network opengl printsupport widgets
CMAKE_ARGS= -DENABLE_GPS:BOOL=OFF # XXX: requires Qt5Positioning
@@ -44,10 +44,12 @@ DOCS_DISTFILES= stellarium_user_guide-${GUIDE_VERSION}-1.pdf:ug
TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx
TEXTURES_DISTFILES= textures-1K.zip:gfx
-MULTIMEDIA_USE= QT5=multimedia
+MULTIMEDIA_USES= qt:5
+MULTIMEDIA_USE= QT=multimedia
MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF
-TELESCOPE_USE= QT5=serialport
+TELESCOPE_USES= qt:5
+TELESCOPE_USE= QT=serialport
TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF
.include <bsd.port.options.mk>
@@ -65,7 +67,7 @@ PLIST_SUB+= MORE_STARS="@comment "
.endif
.if ${PORT_OPTIONS:MSCRIPTING}
-USE_QT5+= script
+USE_QT+= script
PLIST_SUB+= SCRIPTS=""
.else
CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index e1bb47faadf4..7d1b578a77d7 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -13,8 +13,8 @@ COMMENT= Displays a view of the Earth (like xearth) with a rendered photo map
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake
-USE_QT4= corelib gui qt3support moc_build
+USES= gmake qt:4
+USE_QT= corelib gui qt3support moc_build
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/audio/abgate-lv2/Makefile b/audio/abgate-lv2/Makefile
index 88eccd54ebd0..3b0a8585691e 100644
--- a/audio/abgate-lv2/Makefile
+++ b/audio/abgate-lv2/Makefile
@@ -17,11 +17,11 @@ BROKEN_powerpc64= fails to build: cc1plus: unrecognized command line option -std
BUILD_DEPENDS= lv2>0:audio/lv2
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= antanasbruzas
USE_CXXSTD= c++11
-USE_QT5= 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/acoustid-fingerprinter/Makefile b/audio/acoustid-fingerprinter/Makefile
index e8a8214ae0c2..d8b859804cc0 100644
--- a/audio/acoustid-fingerprinter/Makefile
+++ b/audio/acoustid-fingerprinter/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \
BROKEN_armv6= fails to link: fingerprintcalculator.cpp: undefined reference to 'chromaprint_new'
BROKEN_powerpc64= fails to compile: libchromaprint.so: undefined reference to std::__cxx11::basic_string
-USES= cmake desktop-file-utils
-USE_QT4= corelib gui network \
+USES= cmake desktop-file-utils qt:4
+USE_QT= corelib gui network \
qmake_build moc_build rcc_build uic_build
USE_GITHUB= yes
GH_ACCOUNT= acoustid
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 47a93cdad9c6..68285d41577f 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -24,11 +24,11 @@ RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel
${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
USES= cmake:outsource kde:4 mysql:client,embedded pkgconfig \
- shared-mime-info shebangfix ssl tar:bzip2
+ qt:4 shared-mime-info shebangfix ssl tar:bzip2
USE_GL= gl
USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \
nepomuk-core runtime soprano strigi
-USE_QT4= corelib dbus designer gui network opengl \
+USE_QT= corelib dbus designer gui network opengl \
phonon script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= ice sm x11 xau xdmcp xext xft xpm
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index 3323cd9de966..8d9bafaffd0a 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv3
LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia
-USES= tar:xz cmake kde:4
+USES= qt:4 tar:xz cmake kde:4
USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc
-USE_QT4= gui dbus network svg xml \
+USE_QT= gui dbus network svg xml \
qmake_build moc_build rcc_build uic_build
# Too many changes for suffix on literals without a space.
USE_CXXSTD= gnu++98
diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile
index 124abace7036..4d86c049d256 100644
--- a/audio/audiocd-kio/Makefile
+++ b/audio/audiocd-kio/Makefile
@@ -17,13 +17,13 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libKF5Cddb.so:audio/libkcddb \
libKF5CompactDisc.so:audio/libkcompactdisc
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio notifications parts \
service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index 5f77bafcf8f5..f91ec9adeff8 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -14,14 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= CDrummond
-USE_QT5= buildtools_build concurrent core dbus gui network \
+USE_QT= buildtools_build concurrent core dbus gui network \
qmake_build sql sql-sqlite3_run svg widgets xml
CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \
-DENABLE_KDE:BOOL=FALSE \
-DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE
-USES= cmake:outsource cpe pkgconfig shebangfix
+USES= cmake:outsource cpe pkgconfig qt:5 shebangfix
SHEBANG_FILES= playlists/cantata-dynamic cantata-remote.cmake \
devices/mounter/mount.cifs.wrapper
CPE_VENDOR= craig_drummond
@@ -71,7 +71,8 @@ MUSICBRAINZ_IMPLIES= CDPARANOIA
MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+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 \
@@ -79,7 +80,8 @@ NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \
PROXY_CMAKE_BOOL= ENABLE_PROXY_CONFIG
-QT5_USE= QT5=multimedia
+QT5_USES= qt:5
+QT5_USE= QT=multimedia
TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib \
libtag-extras.so:audio/taglib-extras
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index 7529333c9110..f29c63997c76 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -18,12 +18,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
CONFLICTS_BUILD= rtaudio-* rtmidi-*
USES= compiler:c++11-lib desktop-file-utils gmake localbase \
- pkgconfig pyqt:5 python:3.4+ shared-mime-info shebangfix tar:bz2
+ pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix tar:bz2
USE_GITHUB= yes
GH_ACCOUNT= falkTX
USE_PYQT= core_run gui_run sip svg_run widgets_run xml_build # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040
USE_GNOME= gtk20 gtk30
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
USE_XORG= x11
USE_LDCONFIG= ${PREFIX}/lib/carla
SHEBANG_FILES= data/carla-single source/native-plugins/resources/*
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index ca7a9fdbe916..5e1282c162e3 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -36,13 +36,13 @@ USES= cmake \
desktop-file-utils \
gettext-tools \
pkgconfig \
- sqlite
+ qt:4 sqlite
USE_GL= gl glew glu
USE_XORG= x11
CONFLICTS_BUILD= qt-3.*
-USE_QT4= corelib \
+USE_QT= corelib \
dbus \
gui \
imageformats \
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 19bb0f36f60c..162af41e3662 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -18,9 +18,9 @@ USE_GITHUB= yes
GH_ACCOUNT= laudrup
GH_PROJECT= Creox4
-USES= cmake:outsource kde:4
+USES= cmake:outsource kde:4 qt:4
USE_KDE= automoc4 kdelibs
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_XORG= xft xpm
USE_CXXSTD= gnu++98
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index 62f643b5ffd7..f00f38388193 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv3
LIB_DEPENDS= libnotify.so:devel/libnotify
-USES= pkgconfig qmake
-USE_QT4= gui xml uic_build moc_build rcc_build network
+USES= pkgconfig qmake qt:4
+USE_QT= gui xml uic_build moc_build rcc_build network
USE_GSTREAMER= flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack
USE_XORG= x11
diff --git a/audio/dream/Makefile b/audio/dream/Makefile
index 6a398d3382b1..a8eb6a62c673 100644
--- a/audio/dream/Makefile
+++ b/audio/dream/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libhamlib.so:comms/hamlib\
libqwt.so:x11-toolkits/qwt5\
libfftw3.so:math/fftw3
-USES= gmake pkgconfig qmake
-USE_QT4= qmake_build moc_build uic_build corelib gui network rcc webkit
+USES= gmake pkgconfig qmake qt:4
+USE_QT= qmake_build moc_build uic_build corelib gui network rcc webkit
WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_DEFINE= SNDFILE OGG VORBIS FLAC OPUS SPEEX FAAD FAAC
diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile
index 38ce98abcc03..b360f437105c 100644
--- a/audio/drumstick/Makefile
+++ b/audio/drumstick/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont
-USES= cmake:outsource pkgconfig shared-mime-info tar:bz2
-USE_QT5= core gui network svg testlib widgets buildtools_build qmake_build
+USES= cmake:outsource pkgconfig qt:5 shared-mime-info tar:bz2
+USE_QT= core gui network svg testlib widgets buildtools_build qmake_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= PULSEAUDIO MANPAGES
diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile
index a89ae2a92bdf..73e2c307d23e 100644
--- a/audio/dsbmixer/Makefile
+++ b/audio/dsbmixer/Makefile
@@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= dsbwrtsysctl:sysutils/dsbwrtsysctl
-USES= tar:tgz qmake
+USES= qt:5 tar:tgz qmake
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build widgets
+USE_QT= buildtools_build core gui linguisttools_build widgets
QMAKE_ARGS= PORTS=1
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 97c7d710b21a..fff45b621aa7 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -37,8 +37,8 @@ OPTIONS_DEFINE= DOCS EXAMPLES QT4
OPTIONS_DEFAULT=QT4
OPTIONS_SUB= yes
-QT4_USE= QT4=corelib,gui,moc_build
-QT_NONSTANDARD= yes
+QT4_USES= qmake:no_env qt:4
+QT4_USE= QT=corelib,gui,moc_build
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index 95f16748dcbf..9feb3de84826 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS= libxmmsclient++.so:audio/cpp-xmms2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E}
-USE_QT4= gui xml network imageformats_run \
+USE_QT= gui xml network imageformats_run \
qmake_build moc_build rcc_build uic_build
-QT_NONSTANDARD= yes
-USES= gmake pkgconfig tar:bzip2
+USES= gmake pkgconfig qmake:no_env qt:4 tar:bzip2
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --disable-growl
MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}"
diff --git a/audio/flacon/Makefile b/audio/flacon/Makefile
index c1e52bf85722..db7a067449d6 100644
--- a/audio/flacon/Makefile
+++ b/audio/flacon/Makefile
@@ -13,9 +13,9 @@ LICENSE= LGPL21
LIB_DEPENDS= libuchardet.so:textproc/uchardet
-USES= cmake desktop-file-utils pkgconfig
+USES= cmake desktop-file-utils pkgconfig qt:5
USE_GITHUB= yes
-USE_QT5= buildtools_build concurrent_build qmake_build \
+USE_QT= buildtools_build concurrent_build qmake_build \
linguisttools_build core gui network widgets
.include <bsd.port.mk>
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index 8c2f426892b9..cb5fd55b4484 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -16,10 +16,10 @@ LICENSE= GPLv2
LIB_DEPENDS= libfftw3.so:math/fftw3
USE_XORG= xmu
-USE_QT4= corelib gui opengl \
+USE_QT= corelib gui opengl \
linguist_build moc_build qmake_build rcc_build uic_build
USE_GL= glut
-USES= cmake pkgconfig tar:bzip2
+USES= cmake pkgconfig qt:4 tar:bzip2
INSTALLS_ICONS= yes
OPTIONS_DEFINE= ALSA JACK OSS PORTAUDIO
diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile
index a055e61cb710..107ff4fab396 100644
--- a/audio/guidolib/Makefile
+++ b/audio/guidolib/Makefile
@@ -13,10 +13,10 @@ LICENSE= MPL20
BUILD_DEPENDS= cmake:devel/cmake
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= grame-cncm
-USE_QT5= 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/hydrogen/Makefile b/audio/hydrogen/Makefile
index 906724240b53..087be482476b 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \
USE_GITHUB= yes
GH_ACCOUNT= hydrogen-music
-USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
+USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build corelib \
gui network xml xmlpatterns
OPTIONS_SINGLE= EXPORT
diff --git a/audio/jalv/Makefile b/audio/jalv/Makefile
index 2cc940d8408a..6bb9796b9643 100644
--- a/audio/jalv/Makefile
+++ b/audio/jalv/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS= liblilv-0.so:audio/lilv \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= compiler:c++11-lang waf tar:bz2 pkgconfig
+USES= compiler:c++11-lang qmake:no_configure,no_env qt:5 waf tar:bz2 pkgconfig
CONFIGURE_ARGS= --no-qt4
USE_CXXSTD= c++11
-USE_QT5= 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
-QT_NONSTANDARD= yes
post-patch:
@${REINPLACE_CMD} 's|$${MANDIR}|${MAN1PREFIX}/man|' \
diff --git a/audio/juk-kde4/Makefile b/audio/juk-kde4/Makefile
index f25adbc1b12f..0b7488eb3bf6 100644
--- a/audio/juk-kde4/Makefile
+++ b/audio/juk-kde4/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libtag.so:audio/taglib
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 4968e5210641..c2606dc4749d 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -12,12 +12,12 @@ LICENSE= GPLv2
LIB_DEPENDS= libtag.so:audio/taglib
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash globalaccel i18n iconthemes itemviews \
jobwidgets kio notifications service solid sonnet textwidgets \
wallet widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 svg widgets xml \
+USE_QT= core dbus gui network phonon4 svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index e8a6e2539e9b..e9d1302b0656 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -36,24 +36,24 @@ PLIST_SUB+= QT="" KDE="@comment "
. if ${PKGNAMESUFFIX} == "-qt5"
# Qt 5 only
CONFLICTS_INSTALL= kid3-3.* kid3-qt4-3.*
-
-USE_QT5= core dbus gui multimedia network testlib xml widgets \
+USES+= qt:5
+USE_QT= core dbus gui multimedia network testlib xml widgets \
buildtools_build linguisttools_build qmake_build
CMAKE_ARGS+= -DWITH_QT5=true
OPTIONS_EXCLUDE=PHONON
. elif ${PKGNAMESUFFIX} == "-qt4"
# Qt 4 only
CONFLICTS_INSTALL= kid3-3.* kid3-qt5-3.*
-
-USE_QT4= corelib dbus gui network xml \
+USES+= qt:4
+USE_QT= corelib dbus gui network xml \
qmake_build moc_build rcc_build uic_build \
linguisttools_build
. endif
.else
# KDE 4 only
CONFLICTS_INSTALL= kid3-qt4-3.* kid3-qt5-3.*
-
-USE_QT4= corelib dbus gui network svg xml \
+USES+= qt:4
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build \
linguisttools_build
USE_KDE= kdelibs automoc4
@@ -81,7 +81,8 @@ MP3_CMAKE_BOOL= WITH_ID3LIB
MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2
MP4_CMAKE_BOOL= WITH_MP4V2
-PHONON_USE= QT4=phonon
+PHONON_USES= qt:4
+PHONON_USE= QT=phonon
PHONON_CMAKE_BOOL= WITH_PHONON
TAGLIB_DESC= Various audio formats support via Taglib
diff --git a/audio/kio-audiocd-kde4/Makefile b/audio/kio-audiocd-kde4/Makefile
index eef218563d19..707362461eff 100644
--- a/audio/kio-audiocd-kde4/Makefile
+++ b/audio/kio-audiocd-kde4/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs libkcddb libkcompactdisc \
automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= LAME
diff --git a/audio/kmix-kde4/Makefile b/audio/kmix-kde4/Makefile
index c74fc203f8c4..0db57523b2c7 100644
--- a/audio/kmix-kde4/Makefile
+++ b/audio/kmix-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT= Sound mixer for KDE
LICENSE= GPLv2
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= gui phonon xml \
+USE_QT= gui phonon xml \
moc_build qmake_build rcc_build uic_build
OPTIONS_DEFINE= ALSA PULSEAUDIO
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 86f8e68cf253..134cf41f3e09 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -11,12 +11,12 @@ LICENSE= GPLv2
LIB_DEPENDS= libasound.so:audio/alsa-lib
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
emoticons globalaccel i18n iconthemes init itemmodels \
itemviews kcmutils kdelibs4support notifications package \
plasma-framework service solid widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
# we want the KF5 version of kmix
diff --git a/audio/kscd-kde4/Makefile b/audio/kscd-kde4/Makefile
index 2c6ff23b1ca4..6d4b8f558d8c 100644
--- a/audio/kscd-kde4/Makefile
+++ b/audio/kscd-kde4/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libmusicbrainz3.so:audio/libmusicbrainz3
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= phonon moc_build qmake_build rcc_build uic_build
+USE_QT= phonon moc_build qmake_build rcc_build uic_build
OPTIONS_DEFINE= ALSA
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index 91b619a0a70a..f23d40560f01 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -12,9 +12,9 @@ COMMENT= Program for recording streams for KDE4
RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:audio/streamripper
-USES= cmake gettext-tools kde:4 tar:bzip2
+USES= cmake gettext-tools kde:4 qt:4 tar:bzip2
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/kwave/Makefile b/audio/kwave/Makefile
index 64d09addb2ea..62ffe1590262 100644
--- a/audio/kwave/Makefile
+++ b/audio/kwave/Makefile
@@ -19,12 +19,12 @@ LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \
libvorbisenc.so:audio/libvorbis
USES= cmake:outsource desktop-file-utils gettext kde:5 \
- localbase:ldflags pkgconfig tar:xz
+ localbase:ldflags pkgconfig qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemviews \
jobwidgets kio service solid sonnet textwidgets widgetsaddons \
xmlgui
-USE_QT5= concurrent core dbus gui multimedia network widgets xml \
+USE_QT= concurrent core dbus gui multimedia network widgets xml \
buildtools_build qmake_build
OPTIONS_GROUP= AUDIOPLUGIN
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 2e6e4d9bdaa6..0a1101b28943 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= liblastfm.so:audio/liblastfm \
USE_GITHUB= yes
GH_ACCOUNT= lastfm
-USES= gettext pkgconfig qmake gmake
-USE_QT4= corelib dbus gui linguist_build moc_build network phonon \
+USES= gettext pkgconfig qmake gmake qt:4
+USE_QT= corelib dbus gui linguist_build moc_build network phonon \
rcc_build sql uic_build webkit xml
SUB_FILES= lastfm-desktop.sh
@@ -37,7 +37,8 @@ OPTIONS_SINGLE= PHONON
OPTIONS_SINGLE_PHONON= GSTREAMER VLC
OPTIONS_DEFAULT= VLC
GSTREAMER_DESC= Multimedia via Phonon-GStreamer
-GSTREAMER_USE= QT4=phonon-gst_run
+GSTREAMER_USES= qt:4
+GSTREAMER_USE= QT=phonon-gst_run
VLC_DESC= Multimedia via Phonon-VLC
VLC_RUN_DEPENDS= phonon-vlc-qt4>=0.6.1:multimedia/phonon-vlc@qt4
diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index 6e273067c230..56cf0f90fca4 100644
--- a/audio/libechonest/Makefile
+++ b/audio/libechonest/Makefile
@@ -21,11 +21,11 @@ OPTIONS_DEFINE= TEST
PLIST_SUB= PORTVERSION=${PORTVERSION}
TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
-TEST_USE= qt4=qtestlib_build,xml_build
+TEST_USE= qt=qtestlib_build,xml_build
-USES= cmake pkgconfig
+USES= cmake pkgconfig qt:4
USE_GITHUB= yes
USE_LDCONFIG= yes
-USE_QT4= corelib qmake_build moc_build network rcc_build
+USE_QT= corelib qmake_build moc_build network rcc_build
.include <bsd.port.mk>
diff --git a/audio/libkcddb-kde4/Makefile b/audio/libkcddb-kde4/Makefile
index 8426afb53ff5..4bdf62d8efcc 100644
--- a/audio/libkcddb-kde4/Makefile
+++ b/audio/libkcddb-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT= KDE CDDB library
LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= qtestlib moc_build qmake_build rcc_build uic_build
+USE_QT= qtestlib moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index 7ffbefa59910..74fe6170b8be 100644
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@@ -9,11 +9,11 @@ COMMENT= KDE CDDB library
LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets \
coreaddons ecm i18n jobwidgets kio service \
widgetsaddons
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/audio/libkcompactdisc-kde4/Makefile b/audio/libkcompactdisc-kde4/Makefile
index aa89b940dd2e..6d11261fe338 100644
--- a/audio/libkcompactdisc-kde4/Makefile
+++ b/audio/libkcompactdisc-kde4/Makefile
@@ -9,9 +9,9 @@ CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE library for interfacing with audio CDs
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= phonon moc_build qmake_build rcc_build uic_build
+USE_QT= phonon moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= ALSA
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 409f30e6296d..1be3b0810482 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= audio kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE library for interfacing with audio CDs
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= coreaddons ecm emoticons i18n itemmodels itemviews \
kdelibs4support solid
-USE_QT5= core dbus phonon4\
+USE_QT= core dbus phonon4\
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 84df07c7c9a3..f63c2ac9f6bf 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -13,18 +13,20 @@ COMMENT= Qt C++ library for the Last.fm webservices
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake pkgconfig
+USES= cmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= lastfm
USE_LDCONFIG= yes
SLAVE?= qt4
.if ${SLAVE} == qt4
-USE_QT4= corelib dbus network sql xml \
+USES+= qt:4
+USE_QT= corelib dbus network sql xml \
moc_build qmake_build rcc_build
CMAKE_ON+= BUILD_WITH_QT4
.else
-USE_QT5= core dbus network sql xml \
+USES+= qt:5
+USE_QT= core dbus network sql xml \
buildtools_build qmake_build
CMAKE_OFF+= BUILD_WITH_QT4
QTVER_SUFFIX= 5
@@ -45,9 +47,10 @@ FINGERPRINT_BUILD_DEPENDS= ${NONEXISTENT}:math/fftw3:patch
FINGERPRINT_CMAKE_ON= -DLIBFFTW3_INCLUDE_DIR:PATH=`${MAKE} -C ${PORTSDIR}/math/fftw3 -VWRKSRC`/api
.if ${SLAVE} == qt4
-TEST_USE= QT4=qtestlib_build
+TEST_USES= qt:4 qt:5
+TEST_USE= QT=qtestlib_build
.else
-TEST_USE= QT5=testlib_build
+TEST_USE= QT=testlib_build
.endif
TEST_CMAKE_BOOL= BUILD_TESTS
TEST_TEST_TARGET= test
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 94fec5233196..f5107a61cb8d 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -34,11 +34,11 @@ OPTIONS_DEFAULT=OSS
USE_LDCONFIG= yes
USE_XORG= x11 xext xft ice sm
-USE_QT4= corelib gui xml moc_build uic_build rcc_build \
+USE_QT= corelib gui xml moc_build uic_build rcc_build \
qmake_build
USE_GITHUB= yes
GH_ACCOUNT= LMMS
-USES= cmake desktop-file-utils dos2unix pkgconfig shared-mime-info
+USES= cmake desktop-file-utils dos2unix pkgconfig qt:4 shared-mime-info
CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \
-DWANT_CALF:BOOL=OFF \
-DWANT_CAPS:BOOL=OFF \
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index 46ecf7d28858..0b24bf05523b 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -25,7 +25,9 @@ OPTIONS_SINGLE_TOOLKIT= QT4 QT5
OPTIONS_DEFAULT= QT5
TOOLKIT_DESC= Qt toolkit
-QT4_USE= ${_USE_QT4:S/^/QT4=/}
-QT5_USE= ${_USE_QT5:S/^/QT5=/} GL=gl
+QT4_USES= qt:4
+QT4_USE= ${_USE_QT4:S/^/QT=/}
+QT5_USES= qt:5
+QT5_USE= ${_USE_QT5:S/^/QT=/} GL=gl
.include <bsd.port.mk>
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index f105f10a0e27..b482f74eab40 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -12,8 +12,8 @@ COMMENT= Just another music player
LIB_DEPENDS= libtag.so:audio/taglib
-USES= qmake
-USE_QT4= dbus gui moc_build network phonon rcc_build \
+USES= qmake qt:4
+USE_QT= dbus gui moc_build network phonon rcc_build \
sql uic_build xml
INSTALLS_ICONS= yes
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index b2320b565f6e..e4d387d60a5d 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -33,8 +33,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BROKEN_aarch64= fails to compile: Exception("invalid machine type")
BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack
-USES= scons iconv pkgconfig
-USE_QT4= corelib gui network opengl script scripttools sql sql-sqlite3 \
+USES= qt:4 scons iconv pkgconfig
+USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
diff --git a/audio/mixxx20/Makefile b/audio/mixxx20/Makefile
index c4a16b3fddab..4fc638236721 100644
--- a/audio/mixxx20/Makefile
+++ b/audio/mixxx20/Makefile
@@ -31,8 +31,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BROKEN_aarch64= fails to compile: Exception("invalid machine type")
BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack
-USES= scons iconv pkgconfig
-USE_QT4= corelib gui network opengl script scripttools sql sql-sqlite3 \
+USES= qt:4 scons iconv pkgconfig
+USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 361c6180c708..f799a59eb64d 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -72,7 +72,8 @@ NCURSES_USE= ncurses
OSS_CMAKE_BOOL= WITH_PLUGIN_OSS
QT5_CMAKE_BOOL= WITH_APP_QT5
-QT5_USE= qt5=buildtools,core,gui,widgets,qmake_build
+QT5_USES= qt:5
+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/mumble/Makefile b/audio/mumble/Makefile
index 7b6621dfaa77..2e787e482351 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS+= libspeex.so:audio/speex \
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-USES= compiler cpe desktop-file-utils gmake pkgconfig qmake ssl
+USES= compiler cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl
USE_GITHUB= yes
GH_ACCOUNT= mumble-voip
GH_PROJECT= mumble celt-0.7.0:mumble_celt_0_7 celt-0.11.0:mumble_celt_0_11
GH_TAGNAME= 5a16cda:mumble_celt_0_7 e18de77:mumble_celt_0_11
GH_SUBDIR= celt-0.7.0-src:mumble_celt_0_7 celt-0.11.0-src:mumble_celt_0_11
-USE_QT4= gui svg iconengines_run xml sql network l10n \
+USE_QT= gui svg iconengines_run xml sql network l10n \
linguist_build moc_build rcc_build uic_build \
opengl sql-sqlite3_run corelib
USE_LDCONFIG= yes
@@ -45,7 +45,8 @@ OPTIONS_DEFINE= DBUS BONJOUR PORTAUDIO
OPTIONS_DEFAULT= DBUS
DBUS_VARS_OFF= CONFIG+=no-dbus
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
BONJOUR_DESC= Bonjour support
BONJOUR_VARS_OFF= CONFIG+=no-bonjour
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index b9fffba99c8f..85f4dab24b1f 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf
USERS= murmur
GROUPS= murmur
-USES= compiler:c++11-lang qmake pkgconfig ssl
-USE_QT4= moc_build corelib network sql xml
+USES= compiler:c++11-lang qmake pkgconfig qt:4 ssl
+USE_QT= moc_build corelib network sql xml
USE_GITHUB= YES
GH_ACCOUNT= mumble-voip
@@ -46,7 +46,7 @@ CONFIG+= no-ice
.endif
.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+= dbus
+USE_QT+= dbus
.else
CONFIG+= no-dbus
.endif
@@ -58,13 +58,13 @@ CONFIG+= no-bonjour
.endif
.if ${PORT_OPTIONS:MMYSQL}
-USE_QT4+= sql-mysql
+USE_QT+= sql-mysql
.else
CONFIG+= no-sql-mysql
.endif
.if ${PORT_OPTIONS:MSQLITE}
-USE_QT4+= sql-sqlite3_run
+USE_QT+= sql-sqlite3_run
.else
CONFIG+= no-sqlite3_run
.endif
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 4998c3304295..67e609d1fd20 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \
libfreetype.so:print/freetype2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig shared-mime-info zip
-USE_QT5= core gui widgets opengl concurrent designer help network \
+ pkgconfig qt:5 shared-mime-info zip
+USE_QT= core gui widgets opengl concurrent designer help network \
scripttools qml quick svg sql printsupport testlib webkit \
xml xmlpatterns \
buildtools_build linguisttools_build qmake_build uitools_build
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 8c40ab0b0875..ed428ce8667d 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -20,11 +20,12 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libvorbis.so:audio/libvorbis \
libmyth-29.so:multimedia/mythtv
+USES= qt:5
USE_GITHUB= yes
GH_ACCOUNT= MythTV
GH_PROJECT= mythtv
USE_LDCONFIG= yes
-USE_QT5= 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}" --disable-all \
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index df1a5bab165b..44003f5f715a 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -35,7 +35,8 @@ CONFIG_DESC= Install configuration utility (needs Qt 4.x)
CONFIG_CMAKE_BOOL_OFF= ALSOFT_NO_CONFIG_UTIL
CONFIG_CMAKE_ON= -DALSOFT_NO_QT5:BOOL=ON
-CONFIG_USE= QT4=corelib,gui,qmake_build,moc_build,rcc_build,uic_build
+CONFIG_USES= qt:4
+CONFIG_USE= QT=corelib,gui,qmake_build,moc_build,rcc_build,uic_build
JACK_CMAKE_BOOL= ALSOFT_REQUIRE_JACK ALSOFT_BACKEND_JACK
JACK_LIB_DEPENDS= libjack.so:audio/jack
diff --git a/audio/padthv1-lv2/Makefile b/audio/padthv1-lv2/Makefile
index 2902b29509f9..46bcaac3b96e 100644
--- a/audio/padthv1-lv2/Makefile
+++ b/audio/padthv1-lv2/Makefile
@@ -17,12 +17,12 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libjack.so:audio/jack \
liblo.so:audio/liblo
-USES= autoreconf gmake pkgconfig shared-mime-info
+USES= autoreconf gmake pkgconfig qt:5 shared-mime-info
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= rncbc
USE_GL= gl
-USE_QT5= core gui widgets xml buildtools_build qmake_build
+USE_QT= core gui widgets xml buildtools_build qmake_build
PLIST_SUB= SHL3=${PORTVERSION} SHL2=${PORTVERSION:R} SHL1=${PORTVERSION:R:R}
diff --git a/audio/pc-mixer/Makefile b/audio/pc-mixer/Makefile
index e4ce0f18a509..905034dfb7eb 100644
--- a/audio/pc-mixer/Makefile
+++ b/audio/pc-mixer/Makefile
@@ -13,9 +13,9 @@ WRKSRC_SUBDIR= src-qt5
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
MAKE_JOBS_UNSAFE=yes
-USES= qmake shebangfix tar:xz
+USES= qmake qt:5 shebangfix tar:xz
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
buildtools x11extras widgets multimedia
USE_GL+= gl
diff --git a/audio/plasma5-plasma-pa/Makefile b/audio/plasma5-plasma-pa/Makefile
index d2dcac4f46c9..2e5a58821370 100644
--- a/audio/plasma5-plasma-pa/Makefile
+++ b/audio/plasma5-plasma-pa/Makefile
@@ -11,11 +11,11 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libpulse.so:audio/pulseaudio
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 \
- pkgconfig shebangfix tar:xz
+ pkgconfig qt:5 shebangfix tar:xz
USE_GNOME= gconf2
USE_KDE= config configwidgets coreaddons ecm globalaccel i18n \
kdeclarative package plasma-framework
-USE_QT5= core dbus gui network qml quick widgets \
+USE_QT= core dbus gui network qml quick widgets \
buildtools_build qmake_build
SHEBANG_FILES= data/plasmaVolumeDisableKMixAutostart.pl
diff --git a/audio/polyphone/Makefile b/audio/polyphone/Makefile
index 5b0bc6a3c7c2..1d3cdad48fe7 100644
--- a/audio/polyphone/Makefile
+++ b/audio/polyphone/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS= libjack.so:audio/jack \
libstk-4.6.0.so:audio/stk \
libvorbisfile.so:audio/libvorbis
-USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource shared-mime-info zip
+USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource qt:5 shared-mime-info zip
USE_GL= gl
-USE_QT5= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
+USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
USE_CXXSTD= c++11
QMAKE_ARGS= DEFINES=USE_LOCAL_QCUSTOMPLOT
CXXFLAGS+= -D__UNIX_JACK__
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 341c0d2e9b82..676182ec0a36 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libjack.so:audio/jack
-USES= autoreconf compiler:c++11-lib gmake localbase pkgconfig
+USES= autoreconf compiler:c++11-lib gmake localbase pkgconfig qt:5
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= rncbc
-USE_QT5= 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_GL= gl
USE_CXXSTD= c++11
@@ -36,7 +36,7 @@ ALSA_CONFIGURE_ENABLE= alsa_seq
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
DBUS_CONFIGURE_ENABLE= dbus
-DBUS_USE= QT5=dbus
+DBUS_USE= QT=dbus
PORTAUDIO_CONFIGURE_ENABLE= portaudio
PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
diff --git a/audio/qmidiarp/Makefile b/audio/qmidiarp/Makefile
index 5f698346ed0e..9ad98a4f3c38 100644
--- a/audio/qmidiarp/Makefile
+++ b/audio/qmidiarp/Makefile
@@ -22,10 +22,10 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
PORTSCOUT= limit:^qmidiarp
USES= autoreconf compiler:c++11-lib desktop-file-utils \
- gmake localbase libtool pkgconfig
+ gmake localbase libtool pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= emuse
-USE_QT5= core gui network widgets buildtools_build \
+USE_QT= core gui network widgets buildtools_build \
linguisttools_build
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 546f64a246b8..98dcaff2bcd3 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -13,8 +13,8 @@ COMMENT= Easy to use musicpd client written in Qt4
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
-USE_QT4= moc_build rcc_build uic_build \
+USES= qmake qt:4 tar:bzip2
+USE_QT= moc_build rcc_build uic_build \
corelib gui network xml xmlpatterns
INSTALLS_ICONS= yes
@@ -25,10 +25,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_SUB= yes
-NLS_USE= QT4=linguisttools_build
+NLS_USES= qt:4
+NLS_USE= QT=linguisttools_build
DBUS_QMAKE_ON= CONFIG+=qdbus
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
DEBUG_QMAKE_ON= CONFIG+=debug
diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index 740765c8273f..b3b0109e7740 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= linuxsampler:audio/linuxsampler
LDFLAGS+= -L${LOCALBASE}/lib
USES= autoreconf gmake pkgconfig shared-mime-info
-QT_NONSTANDARD= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_ac_cv_qmake=${QMAKE} \
ac_cv_path_ac_moc=${MOC} \
@@ -38,13 +37,15 @@ OPTIONS_DEFAULT= QT5
TOOLKIT_DESC= Qt toolkit
-QT4_USE= qt4=corelib,gui \
- qt4=linguisttools_build \
- qt4=moc_build,qmake_build,rcc_build,uic_build
+QT4_USES= qmake:no_env qt:4
+QT4_USE= qt=corelib,gui \
+ qt=linguisttools_build \
+ qt=moc_build,qmake_build,rcc_build,uic_build
QT4_CONFIGURE_ENABLE= qt4
-QT5_USE= qt5=core,gui,widgets,x11extras \
- qt5=buildtools_build,linguisttools_build,qmake_build
+QT5_USES= qmake:no_env qt:5
+QT5_USE= qt=core,gui,widgets,x11extras \
+ qt=buildtools_build,linguisttools_build,qmake_build
QT5_CONFIGURE_ENABLE= qt5
post-configure:
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 28c1f112d2ce..eff22916bdac 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_CXXSTD= c++11
-USE_QT5= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
+USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
USE_GL= gl
GNU_CONFIGURE= yes
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index cb7b40fc073b..bbdf81c02b0f 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \
WRKSRC= ${WRKDIR}/Quimup_${PORTVERSION}
-USES= pkgconfig qmake compiler:c++11-lang
-USE_QT5= core gui network widgets buildtools_build
+USES= pkgconfig qmake compiler:c++11-lang qt:5
+USE_QT= core gui network widgets buildtools_build
USE_GL= gl
CXXFLAGS+= -std=c++11
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index f42b5f706bf5..cae9802b4cc7 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -34,13 +34,14 @@ OPTIONS_DEFAULT= QT4
LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
LIRC_CMAKE_ON= -DENABLE_LIRC:BOOL=ON
-QT4_USE= qt4=gui,network,testlib,xml \
- qt4=linguisttools_build,moc_build,qmake_build \
- qt4=rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= qt=gui,network,testlib,xml \
+ qt=linguisttools_build,moc_build,qmake_build \
+ qt=rcc_build,uic_build
QT4_CMAKE_ON= -DUSE_QT4:BOOL=ON
-QT5_USES= compiler:c++11-lib
-QT5_USE= qt5=network,printsupport,testlib,widgets,xml \
- qt5=buildtools_build,linguisttools_build,qmake_build
+QT5_USES= compiler:c++11-lib qt:5
+QT5_USE= qt=network,printsupport,testlib,widgets,xml \
+ qt=buildtools_build,linguisttools_build,qmake_build
QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON
TOOLKIT_DESC= Qt toolkit
diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile
index d7e3d7a842ad..1be73df0f82d 100644
--- a/audio/sayonara/Makefile
+++ b/audio/sayonara/Makefile
@@ -18,10 +18,10 @@ LIB_DEPENDS= libtag.so:audio/taglib \
libmtp.so:multimedia/libmtp
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig
+ pkgconfig qt:5
USE_GNOME= glib20
USE_GSTREAMER1= flac libav mpg123 ogg opus vorbis
-USE_QT5= dbus core gui network sql sql-sqlite3_run widgets xml \
+USE_QT= dbus core gui network sql sql-sqlite3_run widgets xml \
buildtools_build qmake_build linguisttools_build
WRKSRC= ${WRKDIR}/${PORTNAME}-player
diff --git a/audio/simon/Makefile b/audio/simon/Makefile
index 49faf22cc72f..b45bbb390d0c 100644
--- a/audio/simon/Makefile
+++ b/audio/simon/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libsphinxad.so:audio/sphinxbase \
libqwt6.so:x11-toolkits/qwt6@qt4
-USES= cmake:outsource gettext kde:4 tar:bz2
+USES= cmake:outsource gettext kde:4 qt:4 tar:bz2
USE_KDE= kdelibs automoc4 pimlibs
-USE_QT4= accessible corelib dbus gui network script sql svg testlib xml \
+USE_QT= accessible corelib dbus gui network script sql svg testlib xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xtst
diff --git a/audio/skype-call-recorder/Makefile b/audio/skype-call-recorder/Makefile
index 18a21f40c9c0..bbb40a3cc237 100644
--- a/audio/skype-call-recorder/Makefile
+++ b/audio/skype-call-recorder/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \
libid3.so:audio/id3lib \
libvorbisenc.so:audio/libvorbis
-USES= cmake
-USE_QT4= corelib dbus gui network \
+USES= cmake qt:4
+USE_QT= corelib dbus gui network \
qmake_build moc_build rcc_build uic_build
PLIST_FILES= bin/skype-call-recorder \
diff --git a/audio/sonic-visualiser/Makefile b/audio/sonic-visualiser/Makefile
index 1c77d0efa6ab..15e74c72a039 100644
--- a/audio/sonic-visualiser/Makefile
+++ b/audio/sonic-visualiser/Makefile
@@ -21,10 +21,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libsord-0.so:devel/sord \
libvamp-hostsdk.so:audio/vamp-plugin-sdk
-USES= autoreconf desktop-file-utils pkgconfig
+USES= autoreconf desktop-file-utils pkgconfig qt:5
GNU_CONFIGURE= yes
-USE_QT5= buildtools_build core gui network qmake_build testlib widgets xml
+USE_QT= buildtools_build core gui network qmake_build testlib widgets xml
USE_XORG= x11
USE_GL= gl
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 4375eb9abf80..2f2444a5a24f 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS= libtag.so:audio/taglib \
libphonon.so:multimedia/phonon@qt4
GH_ACCOUNT= HessiJames
-USES= cmake compiler:c++11-lang kde:4
+USES= cmake compiler:c++11-lang kde:4 qt:4
USE_GITHUB= yes
-USE_QT4= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
+USE_QT= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
USE_KDE= automoc4 kdelibs libkcddb
WRKSRC_SUBDIR= src
diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
index f9921c0dfdfc..e5e7160999b2 100644
--- a/audio/supercollider/Makefile
+++ b/audio/supercollider/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libsndfile.so:audio/libsndfile \
libfftw3f.so:math/fftw3-float
-USES= cmake:outsource iconv localbase pkgconfig readline \
+USES= cmake:outsource iconv localbase pkgconfig qt:5 readline \
shared-mime-info tar:bzip2
-USE_QT5= buildtools_build concurrent core gui linguisttools location \
+USE_QT= buildtools_build concurrent core gui linguisttools location \
network opengl printsupport qmake_build qml quick sensors \
sql webkit widgets
USE_LDCONFIG= yes
diff --git a/audio/synthpod-lv2/Makefile b/audio/synthpod-lv2/Makefile
index fab69536d737..e4dad90e08ed 100644
--- a/audio/synthpod-lv2/Makefile
+++ b/audio/synthpod-lv2/Makefile
@@ -58,11 +58,13 @@ JACK_LIB_DEPENDS= libjack.so:audio/jack \
JACK_CMAKE_OFF= -DBUILD_JACK="OFF"
KX_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_KX="ON"
KX_USE= XORG=x11,xcb,xext GL=glu
+QT4_USES= qt:4
QT4_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_QT4="ON"
-QT4_USE= XORG=x11,xcb,xext GL=glu QT4=corelib,gui
+QT4_USE= XORG=x11,xcb,xext GL=glu QT=corelib,gui
+QT5_USES= qt:5
QT5_BROKEN= Build fails: https://github.com/OpenMusicKontrollers/synthpod/issues/10
QT5_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_QT5="ON"
-QT5_USE= XORG=x11,xcb,xext GL=glu QT5=core,gui
+QT5_USE= XORG=x11,xcb,xext GL=glu QT=core,gui
SHOW_USE= XORG=x11,xcb,xext GL=glu
SHOW_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_SHOW="ON"
X11_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_X11="ON"
diff --git a/audio/virtual_oss_ctl/Makefile b/audio/virtual_oss_ctl/Makefile
index d49d5879bfde..c70d27067d1f 100644
--- a/audio/virtual_oss_ctl/Makefile
+++ b/audio/virtual_oss_ctl/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= virtual_oss:audio/virtual_oss
-USES= qmake tar:bzip2
-USE_QT4= corelib gui qmake_build moc_build rcc_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= corelib gui qmake_build moc_build rcc_build
.include <bsd.port.mk>
diff --git a/audio/vmpk/Makefile b/audio/vmpk/Makefile
index 301e01bf39b1..f0d3bcb92412 100644
--- a/audio/vmpk/Makefile
+++ b/audio/vmpk/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdrumstick-rt.so:audio/drumstick
-USES= cmake:outsource pkgconfig tar:bz2
-USE_QT5= core gui network svg widgets x11extras \
+USES= cmake:outsource pkgconfig qt:5 tar:bz2
+USE_QT= core gui network svg widgets x11extras \
buildtools_build linguisttools_build qmake_build
USE_XORG= xcb
@@ -26,6 +26,6 @@ OPTIONS_DEFINE= DBUS
OPTIONS_SUB= yes
DBUS_CMAKE_BOOL= ENABLE_DBUS
-DBUS_USE= qt5=dbus
+DBUS_USE= qt=dbus
.include <bsd.port.mk>
diff --git a/biology/clustalx/Makefile b/biology/clustalx/Makefile
index 2b157a7d5287..8aa1841b5e39 100644
--- a/biology/clustalx/Makefile
+++ b/biology/clustalx/Makefile
@@ -12,8 +12,8 @@ COMMENT= Multiple alignment of nucleic acid and protein sequences with GUI
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake
-USE_QT4= corelib gui moc qmake_build xml
+USES= qmake qt:4
+USE_QT= corelib gui moc qmake_build xml
PLIST_FILES= bin/clustalx \
${DATADIR}/colprot.xml \
diff --git a/biology/ugene/Makefile b/biology/ugene/Makefile
index 5874cf044173..66460d5de368 100644
--- a/biology/ugene/Makefile
+++ b/biology/ugene/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS= bash:shells/bash
BROKEN_aarch64= Fails to build: invokes x86 asm
-USES= desktop-file-utils qmake
+USES= desktop-file-utils qmake qt:5
USE_GL= glu
-USE_QT5= buildtools_build linguisttools_build scripttools_build \
+USE_QT= buildtools_build linguisttools_build scripttools_build \
gui network printsupport script sql svg webkit widgets xml \
imageformats_run
diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 0eed636efce7..c15ffcee4156 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -31,10 +31,10 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
RUN_DEPENDS= pivy>0:graphics/py-pivy@${PY_FLAVOR}
USES= dos2unix compiler:c++11-lib cmake:outsource eigen:3 fortran jpeg \
- python:2.7 localbase
+ python:2.7 localbase qt:4
USE_XORG= ice sm x11 xext xt
USE_GL= gl glu
-USE_QT4= qmake_build corelib gui moc_build network opengl rcc_build \
+USE_QT= qmake_build corelib gui moc_build network opengl rcc_build \
uic_build svg xml webkit
USE_LDCONFIG= yes
DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile
index 5b56437b1781..f6d35f48807b 100644
--- a/cad/fritzing/Makefile
+++ b/cad/fritzing/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2+
SUB_FILES+= pkg-install
-USES= dos2unix gmake python qmake tar:bzip2
-USE_QT5= buildtools concurrent core dbus gui imageformats network printsupport qmake serialport sql-sqlite3 svg xml
+USES= dos2unix gmake python qmake qt:5 tar:bzip2
+USE_QT= buildtools concurrent core dbus gui imageformats network printsupport qmake serialport sql-sqlite3 svg xml
DOS2UNIX_REGEX= .*pro
INSTALLS_ICONS= yes
USE_GITHUB= yes
diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index 4405d39d0da4..726a76837ebe 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -11,9 +11,9 @@ COMMENT= Qt-based GDS2 Viewer
LICENSE= GPLv2
-USES= compiler:c++0x gmake python
+USES= compiler:c++0x gmake python qt:4
USE_RUBY= yes
-USE_QT4= corelib designer gui network moc_build sql uic_build \
+USE_QT= corelib designer gui network moc_build sql uic_build \
rcc_build qt3support xml
USE_LDCONFIG= yes
PLIST_FILES= bin/klayout \
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index 5bea2f88f69e..c74c78af735f 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libttf.so:print/freetype
BROKEN_armv6= fails to compile: no matching member function for call to 'map'
BROKEN_armv7= fails to compile: no matching member function for call to 'map'
-USES= qmake zip
-USE_QT4= corelib gui network moc_build sql uic_build \
+USES= qmake qt:4 zip
+USE_QT= corelib gui network moc_build sql uic_build \
rcc_build qt3support xml
WRKSRC= ${WRKDIR}/layout
PLIST_FILES= bin/layout
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 723906a3a93d..2cc7a695ba0b 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libpng.so:graphics/png
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= desktop-file-utils gmake jpeg pkgconfig qmake shared-mime-info
-USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \
+USES= desktop-file-utils gmake jpeg pkgconfig qmake qt:4 shared-mime-info
+USE_QT= moc_build rcc_build uic_build iconengines_run imageformats_run \
corelib gui network opengl
USE_GL= glut
USE_GNOME= gtk20
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index e9d55b3ac548..33e60c73fa12 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -15,12 +15,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
LIB_DEPENDS= libmuparser.so:math/muparser \
libfreetype.so:print/freetype2
-USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake
+USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= LibreCAD
GH_PROJECT= LibreCAD
USE_GL= gl
-USE_QT5= core gui printsupport svg widgets \
+USE_QT= core gui printsupport svg widgets \
buildtools_build linguisttools_build
QMAKE_ARGS+= BOOST_DIR="${LOCALBASE}"
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 6f859088c4f4..09895e20fc48 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -22,10 +22,10 @@ EXTRACT_DEPENDS=gtar:archivers/gtar
LIB_DEPENDS= libQtSolutions_SOAP-head.so:devel/qt4-qtsolutions-soap \
libmpir.so:math/mpir
-USES= compiler:c++11-lib dos2unix qmake tar:tgz
+USES= compiler:c++11-lib dos2unix qmake qt:4 tar:tgz
USE_CXXSTD= c++11
USE_GL= glew glu
-USE_QT4= moc_build rcc_build uic_build corelib gui xml \
+USE_QT= moc_build rcc_build uic_build corelib gui xml \
xmlpatterns opengl network script
USE_LDCONFIG= yes
DOS2UNIX_FILES= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index ddafa05daf94..578119793fa3 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= libgmp.so:math/gmp \
CONFLICTS= openscad
USES= bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
- pkgconfig python:run qmake shebangfix
+ pkgconfig python:run qmake qt:4 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= openscad
GH_PROJECT= openscad
@@ -35,7 +35,7 @@ GH_TAGNAME= 179074dff8c23cbc0e651ce8463737df0006f4ca
#SHEBANG_FILES= libraries/MCAD/get_submodules.py
USE_GL= glu glew
-USE_QT4= corelib gui opengl moc_build uic_build rcc_build
+USE_QT= corelib gui opengl moc_build uic_build rcc_build
PLIST_SUB= PORTVERSION=${PORTVERSION}
QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3
QMAKE_ARGS+= VERSION=${PORTVERSION} \
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index a91c37490a5c..50ac0c96ceac 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -26,10 +26,10 @@ LIB_DEPENDS= libgmp.so:math/gmp \
CONFLICTS= openscad-devel
USES= bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
- pkgconfig python:run qmake shebangfix
+ pkgconfig python:run qmake qt:4 shebangfix
SHEBANG_FILES= libraries/MCAD/get_submodules.py
USE_GL= glu glew
-USE_QT4= corelib gui opengl moc_build uic_build rcc_build
+USE_QT= corelib gui opengl moc_build uic_build rcc_build
PLIST_SUB= PORTVERSION=${PORTVERSION}
QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3
QMAKE_ARGS+= VERSION=${PORTVERSION} \
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index cb257483c68a..8c630ae644da 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -19,10 +19,10 @@ LIB_DEPENDS= libquazip.so:archivers/quazip@qt4
MAKE_JOBS_UNSAFE=yes
-USES= gmake qmake
+USES= gmake qmake qt:5
USE_GITHUB= yes
USE_LDCONFIG= yes
-USE_QT5= buildtools qmake_build \
+USE_QT= buildtools qmake_build \
designer gui help imageformats network opengl script \
scripttools sql svg xml xmlpatterns webkit widgets uitools
USE_GL= glu
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index 42d0e1822f27..be47c3ccbfdd 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -15,8 +15,8 @@ COMMENT= QElectroTech is application to design electric diagrams
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++11-lib desktop-file-utils qmake shared-mime-info
-USE_QT5= buildtools_build gui network printsupport \
+USES= compiler:c++11-lib desktop-file-utils qmake qt:5 shared-mime-info
+USE_QT= buildtools_build gui network printsupport \
sql-sqlite3 svg xml
OPTIONS_DEFINE= DEBUG
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 5ebb21f46faf..2978b987ec61 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -14,9 +14,9 @@ LICENSE= GPLv3+
OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES
-USES= tar:bzip2 cmake desktop-file-utils
+USES= qt:4 tar:bzip2 cmake desktop-file-utils
USE_XORG= xi
-USE_QT4= corelib gui qt3support svg xml \
+USE_QT= corelib gui qt3support svg xml \
moc_build qmake_build rcc_build uic_build
INSTALLS_ICONS= yes
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index 3a248431b404..610872ba3f1a 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/qucs/COPYING
BUILD_DEPENDS= gperf:devel/gperf \
admsXml:cad/adms
-USE_QT4= moc_build uic_build rcc_build linguisttools_build \
+USE_QT= moc_build uic_build rcc_build linguisttools_build \
corelib gui xml svg script qt3support
-USES= autoreconf compiler:c++11-lib bison gmake libtool shebangfix
+USES= autoreconf compiler:c++11-lib bison gmake libtool qt:4 shebangfix
SHEBANG_FILES= qucs/contrib/ps2sp
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-doc
diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
index a5ec9d328094..c2f5da28676c 100644
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@@ -31,7 +31,8 @@ QT4_DESC= Enable Qt4 for dictmanager
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT4}
-USE_QT4= qmake_build moc_build rcc_build uic_build gui webkit
+USES+= qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build gui webkit
USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt
PLIST_SUB+= QT4=""
.else
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 472450958e2e..17e966a8d1c2 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -39,7 +39,7 @@ USE_GNOME= pango intltool libxml2 introspection
USE_KDE= ecm
USE_XORG= x11 xext xkbfile sm ice
USE_LDCONFIG= yes
-USES= tar:xz cmake:noninja desktop-file-utils \
+USES= qt:4 tar:xz cmake:noninja desktop-file-utils \
gettext-tools:build,run gettext-runtime iconv:wchar_t \
kde:5 pkgconfig shared-mime-info
INSTALLS_ICONS= yes
@@ -87,7 +87,8 @@ SUB_LIST+= GTK3_IM=xim
.endif
.if ${PORT_OPTIONS:MQT4}
-USE_QT4+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods corelib
+USES+= qt:4
+USE_QT+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods corelib
USE_LDCONFIG+= ${PREFIX}/lib/fcitx/qt
PLIST_SUB+= QT4=""
.else
diff --git a/chinese/gcin-qt4/Makefile b/chinese/gcin-qt4/Makefile
index 98d6f3e314a5..f7abf42e8c17 100644
--- a/chinese/gcin-qt4/Makefile
+++ b/chinese/gcin-qt4/Makefile
@@ -16,8 +16,8 @@ LICENSE= LGPL21
LIB_DEPENDS= libgcin-im-client.so:chinese/gcin
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/qt4-im
-USES= gmake pkgconfig tar:xz
-USE_QT4= inputmethods qmake_build moc_build corelib gui
+USES= gmake pkgconfig qt:4 tar:xz
+USE_QT= inputmethods qmake_build moc_build corelib gui
MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
MKDIR="${MKDIR}"
diff --git a/chinese/gcin-qt5/Makefile b/chinese/gcin-qt5/Makefile
index 3f1bc70e6497..e076c1352771 100644
--- a/chinese/gcin-qt5/Makefile
+++ b/chinese/gcin-qt5/Makefile
@@ -17,8 +17,8 @@ LICENSE= LGPL21
LIB_DEPENDS= libgcin-im-client.so:chinese/gcin
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/qt5-im
-USES= compiler:c++11-lang gmake pkgconfig tar:xz
-USE_QT5= qdbus qmake_build buildtools_build core gui
+USES= compiler:c++11-lang gmake pkgconfig qt:5 tar:xz
+USE_QT= qdbus qmake_build buildtools_build core gui
USE_CXXSTD= c++11
MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
MKDIR="${MKDIR}"
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile
index 36129ec9cfc0..5b7f0382d944 100644
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX= -cn
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt GB 18030 codec plugin
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
HAS_CONFIGURE= yes
diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile
index 7deebcfbc62b..2447c8b3bdba 100644
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX= -tw
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Big-5 codec plugin
-USE_QT4= qmake_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= corelib
HAS_CONFIGURE= yes
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index b227fca586f4..836e4cc591e1 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= SF/qterm/qterm/${PORTVERSION}
MAINTAINER= kaiwang27@gmail.com
COMMENT= BBS client for BSD/Linux
-USES= tar:bzip2 cmake perl5
+USES= qt:4 tar:bzip2 cmake perl5
USE_PERL5= build
-USE_QT4= codecs-cn_run codecs-tw_run gui help-tools_build \
+USE_QT= codecs-cn_run codecs-tw_run gui help-tools_build \
linguist_build moc_build network qt3support_build \
qmake_build rcc_build uic_build xml
USE_XORG= x11 ice
@@ -31,15 +31,18 @@ OPENSSL_USES= ssl
OPENSSL_CMAKE_ON= -DQTERM_ENABLE_SSH:BOOL=TRUE
OPENSSL_CMAKE_OFF= -DQTERM_ENABLE_SSH:BOOL=FALSE
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
DBUS_CMAKE_ON= -DQTERM_ENABLE_DBUS:BOOL=TRUE
DBUS_CMAKE_OFF= -DQTERM_ENABLE_DBUS:BOOL=FALSE
-PHONON_USE= QT4=phonon
+PHONON_USES= qt:4
+PHONON_USE= QT=phonon
PHONON_CMAKE_ON= -DQTERM_ENABLE_PHONON:BOOL=TRUE
PHONON_CMAKE_OFF= -DQTERM_ENABLE_PHONON:BOOL=FALSE
-QTSCRIPT_USE= QT4=script
+QTSCRIPT_USES= qt:4
+QTSCRIPT_USE= QT=script
QTSCRIPT_RUN_DEPENDS= ${QT_PLUGINDIR}/script/libqtscript_core.so:devel/qtscriptgenerator
QTSCRIPT_CMAKE_ON= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE
QTSCRIPT_CMAKE_OFF= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
index 15bf6964fcc8..0355408ee8eb 100644
--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -14,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= lsz:comms/lrzsz
-USES= cmake
-USE_QT5= buildtools_build core gui qmake_build serialport widgets
+USE_QT= qt3support qmake_build moc_build rcc_build uic_build
+USES= cmake qt:5
+USE_QT= buildtools_build core gui qmake_build serialport widgets
USE_GITHUB= yes
GH_ACCOUNT= neundorf
GH_PROJECT= CuteCom
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index 537fff380976..6e5503578586 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS+= librtlsdr.so:comms/rtl-sdr \
libfftw3.so:math/fftw3 \
libfaad.so:audio/faad
-USES= tar:tgz
-USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build
+USES= qt:4 tar:tgz
+USE_QT= gui qt3support qmake_build moc_build rcc_build uic_build
PORTDOCS= *
PLIST_FILES+= bin/dabreceiver bin/fmreceiver bin/spectrum-viewer
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 53583e2ad351..67e97329a43e 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -48,7 +48,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
# volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
# volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
# volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
-USES= cmake:outsource compiler:c11 fortran iconv perl5 pkgconfig pyqt:4 python:2.7 shebangfix
+USES= cmake:outsource compiler:c11 fortran iconv perl5 pkgconfig pyqt:4 python:2.7 qt:4 shebangfix
SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in \
gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
@@ -67,7 +67,7 @@ DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION}
USE_GNOME= pygtk2
USE_PYQT= core gui opengl
USE_WX= 3.0+
-USE_QT4= corelib gui xml qmake moc_build rcc_build uic_build
+USE_QT= corelib gui xml qmake moc_build rcc_build uic_build
WX_COMPS= wx wx:build wx:run python:build python:run
USE_LDCONFIG= yes
PLIST_SUB+= MAJOR_VERSION="3"
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 72d62ffdd105..74a49cf2c223 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -26,11 +26,12 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \
libboost_program_options.so:devel/boost-libs \
liblog4cpp.so:devel/log4cpp
-USES= pkgconfig qmake
+USES= pkgconfig qmake qt:5
+
USE_GITHUB= yes
GH_ACCOUNT= csete
USE_GL= gl
-USE_QT5= buildtools_build core gui svg network widgets
+USE_QT= buildtools_build core gui svg network widgets
OPTIONS_RADIO= AUDIO
AUDIO_DESC= Audio backend
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 7c7589f4db65..3db5a1afb95e 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -12,10 +12,10 @@ COMMENT= QT application for sending and receiving facsimiles over radio
LIB_DEPENDS= libaudiofile.so:audio/libaudiofile
-USE_QT4= gui moc_build
+USE_QT= gui moc_build
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USES= gmake pkgconfig tar:bzip2
+USES= gmake pkgconfig qt:4 tar:bzip2
.include <bsd.port.mk>
diff --git a/comms/inspectrum/Makefile b/comms/inspectrum/Makefile
index 29cd46de3175..0fba1cc0ed41 100644
--- a/comms/inspectrum/Makefile
+++ b/comms/inspectrum/Makefile
@@ -22,8 +22,8 @@ USE_GITHUB= yes
GH_ACCOUNT= miek
GH_TAGNAME= 11853b64062bda4f81926613f15d1d9654c227c8
-USE_QT5= core buildtools_build concurrent widgets
-USES= cmake pkgconfig qmake
+USE_QT= core buildtools_build concurrent widgets
+USES= cmake pkgconfig qmake qt:5
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 9d95f51bf0ba..a03c1acff53d 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -11,8 +11,8 @@ COMMENT= Simple Qt-based amateur radio logger
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake
-USE_QT5= buildtools_build core gui linguisttools_build multimedia network \
+USES= qmake qt:5
+USE_QT= buildtools_build core gui linguisttools_build multimedia network \
printsupport sql sql-sqlite3_run widgets
DESKTOP_ENTRIES= "KLog" "Simple Amateur Radio Logging Program" \
"" "klog" "Network;HamRadio;" \
diff --git a/comms/kremotecontrol-kde4/Makefile b/comms/kremotecontrol-kde4/Makefile
index 0e5066f8edb5..b7d340d123ba 100644
--- a/comms/kremotecontrol-kde4/Makefile
+++ b/comms/kremotecontrol-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT= KDE frontend for your remote controls
RUN_DEPENDS= lircd:comms/lirc
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= corelib script xmlpatterns \
+USE_QT= corelib script xmlpatterns \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/comms/libsdr-gui/Makefile b/comms/libsdr-gui/Makefile
index eae58c112759..8302a50cdac4 100644
--- a/comms/libsdr-gui/Makefile
+++ b/comms/libsdr-gui/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
USE_GITHUB= yes
GH_ACCOUNT= hmatuschek
-USE_QT5= core buildtools_build qmake widgets
-USES= cmake pkgconfig
+USE_QT= core buildtools_build qmake widgets
+USES= cmake pkgconfig qt:5
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 09d58e2b9a16..ad9a57ff479d 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -12,8 +12,8 @@ COMMENT= Simple Qt PSK31, RTTY, and MSK31 client
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libasound.so:audio/alsa-lib
-USES= qmake tar:tgz
-USE_QT4= gui network corelib moc_build uic_build rcc_build qmake_build
+USES= qmake qt:4 tar:tgz
+USE_QT= gui network corelib moc_build uic_build rcc_build qmake_build
DESKTOP_ENTRIES="LinPsk" "${COMMENT}" \
"${DATADIR}/linpsk.png" "linpsk" "Audio;HamRadio;" \
false
diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index af46f9911f15..8452318138ac 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtSerialPort module
CONFIGURE_ARGS= --enable QtSerialPort
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run
USE_PYTHON= flavors
-USE_QT5= core gui serialport qmake_build
+USE_QT= core gui serialport qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index eeac7cc66b5f..977e78f5fa36 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libv4l2.so:multimedia/libv4l
BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat
-USES= qmake pkgconfig
-USE_QT5= buildtools core gui network widgets xml
+USES= pkgconfig qmake qt:5
+USE_QT= buildtools core gui network widgets xml
USE_GL+= gl
OPTIONS_DEFINE= DOCS
diff --git a/comms/qt5-connectivity/Makefile b/comms/qt5-connectivity/Makefile
index 7248ec7112b9..42c2a88c5e4a 100644
--- a/comms/qt5-connectivity/Makefile
+++ b/comms/qt5-connectivity/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt connectivity (Bluetooth/NFC) module
-USE_QT5= concurrent core qml quick buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= concurrent core qml quick buildtools_build
+USES= qmake qt-dist:5,connectivity
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile
index 9b253262a828..28616607e7ae 100644
--- a/comms/qt5-sensors/Makefile
+++ b/comms/qt5-sensors/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt sensors module
-USE_QT5= core qml quick buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake:norecursive
+USE_QT= core qml quick buildtools_build
+USES= qmake:norecursive qt-dist:5,sensors
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile
index 7fc107800cc4..4d9f4f0b7cf5 100644
--- a/comms/qt5-serialbus/Makefile
+++ b/comms/qt5-serialbus/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt functions to access industrial bus systems
-USE_QT5= core network serialport buildtools_build
-QT_DIST= serialbus
-USES= compiler:c++11-lib qmake
+USE_QT= core network serialport buildtools_build
+USES= compiler:c++11-lib qmake qt-dist:5,serialbus
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
diff --git a/comms/qt5-serialport/Makefile b/comms/qt5-serialport/Makefile
index 55ba42ccafbd..54fdd7e8dfd3 100644
--- a/comms/qt5-serialport/Makefile
+++ b/comms/qt5-serialport/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt functions to access serial ports
-USE_QT5= core buildtools_build
-QT_DIST= serialport
-USES= qmake
+USE_QT= core buildtools_build
+USES= qmake qt-dist:5,serialport
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile
index d6ff9a949024..8847cd7465d5 100644
--- a/comms/qtel/Makefile
+++ b/comms/qtel/Makefile
@@ -14,7 +14,8 @@ LIB_DEPENDS= libecholib.so:comms/svxlink \
libgsm.so:audio/gsm
MASTERDIR= ${.CURDIR}/../svxlink
-USE_QT4= corelib gui network qmake_build linguist_build moc_build rcc_build uic_build
+USES= qt:4
+USE_QT= corelib gui network qmake_build linguist_build moc_build rcc_build uic_build
PKGDIR= ${.CURDIR}
CMAKE_ARGS+= -DUSE_QT:BOOL=YES \
-DQT_ONLY:BOOL=YES
diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile
index dc2bf9770c78..08b71e4e4733 100644
--- a/comms/sdr-wspr/Makefile
+++ b/comms/sdr-wspr/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libsdr-gui.so:comms/libsdr-gui
USE_GITHUB= yes
GH_ACCOUNT= hmatuschek
-USE_QT5= core buildtools_build qmake webkit widgets
-USES= cmake:outsource compiler:gcc-c++11-lib fortran pkgconfig
+USE_QT= core buildtools_build qmake webkit widgets
+USES= cmake:outsource compiler:gcc-c++11-lib fortran pkgconfig qt:5
PLIST_FILES= bin/sdr-wspr share/applications/sdr-wspr.desktop \
share/icons/sdr-wspr.svg
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index dbbb7cca32c5..772a4b0697a0 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS?= libgsm.so:audio/gsm \
BUILD_DEPENDS= pkg-config:devel/pkgconf \
${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
-USES= cmake compiler:c++11-lang tcl groff
+USES+= cmake compiler:c++11-lang tcl groff
USE_GITHUB= yes
GH_ACCOUNT= sm0svx
GH_PROJECT= svxlink
diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index e8f0784d575b..054d80559f10 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -21,10 +21,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
MAKE_JOBS_UNSAFE= yes
USES= cmake compiler:c++11-lib dos2unix fortran pkgconfig \
- readline tar:tgz
+ qt:5 readline tar:tgz
USE_GL= yes
-USE_QT5= core gui buildtools network qmake_build widgets \
- multimedia concurrent printsupport serialport
+USE_QT= core gui buildtools network qmake_build widgets \
+ multimedia concurrent printsupport serialport
CMAKE_ARGS+= -DPORT_BUILDING::STRING="ON" \
-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
-DLOCALBASE::STRING="${LOCALBASE}"
diff --git a/comms/xcwcp/Makefile b/comms/xcwcp/Makefile
index d502cd554279..c80dbb713994 100644
--- a/comms/xcwcp/Makefile
+++ b/comms/xcwcp/Makefile
@@ -12,8 +12,8 @@ LIB_DEPENDS= libcw.so:comms/unixcw
MASTERDIR= ${.CURDIR}/../unixcw
PLIST= ${.CURDIR}/pkg-plist
-USE_QT5= buildtools gui widgets qmake_build
-USES= gettext
+USE_QT= buildtools gui widgets qmake_build
+USES= gettext qt:5
# Qt from 5.7.0 on requires c++11.
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
diff --git a/databases/akonadi-kde4/Makefile b/databases/akonadi-kde4/Makefile
index 5a0823b0195c..3faa2339186f 100644
--- a/databases/akonadi-kde4/Makefile
+++ b/databases/akonadi-kde4/Makefile
@@ -18,10 +18,10 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs
# Let process generate meaningful backtrace on core dump.
BUILD_DEPENDS= xsltproc:textproc/libxslt
-USES= cmake:outsource kde:4 shared-mime-info \
+USES= cmake:outsource kde:4 qt:4 shared-mime-info \
compiler:c++11-lang pathfix tar:bzip2
USE_KDE= automoc4 soprano
-USE_QT4= corelib dbus gui network qtestlib_build sql xml \
+USE_QT= corelib dbus gui network qtestlib_build sql xml \
moc_build qmake_build rcc_build uic_build
CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL=FALSE \
-DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \
@@ -33,15 +33,16 @@ OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
OPTIONS_SUB= yes # SQLITE
MYSQL_DESC= Install MySQL Qt plugin and server
-MYSQL_USE= QT4=sql-mysql_run
-MYSQL_USES= mysql:server
+MYSQL_USE= QT=sql-mysql_run
+MYSQL_USES= mysql:server qt:4
PGSQL_DESC= Install PostgreSQL Qt plugin
# Do not add a dependency on PostgreSQL server as someone preferring
# it over MySQL might like to use some advanced configuration, like a
# remote server.
#PGSQL_USE= PGSQL=server
-PGSQL_USE= QT4=sql-pgsql_run
+PGSQL_USES= qt:4
+PGSQL_USE= QT=sql-pgsql_run
SQLITE_DESC= Enable SQLite backend
SQLITE_USES= sqlite:3
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 60db5f5bd517..995d0bf18a6b 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -16,13 +16,13 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt
CONFLICTS= akonadi-[0-9]* akonadi-kf5-git-[0-9]*
USES= cmake:outsource compiler:c++11-lib gettext kde:5 \
- shared-mime-info tar:xz
+ qt:5 shared-mime-info tar:xz
USE_GNOME= libxml2
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemmodels itemviews \
kio service windowsystem widgetsaddons xmlgui \
designerplugin_build designerplugin_run
-USE_QT5= core dbus designer gui network sql testlib widgets xml \
+USE_QT= core dbus designer gui network sql testlib widgets xml \
buildtools_build qmake_build
CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
@@ -33,18 +33,20 @@ OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
OPTIONS_SUB= yes
MYSQL_DESC= Install MySQL Qt plugin and server
-MYSQL_USE= MYSQL=server QT5=sql-mysql_run
+MYSQL_USES= qt:5
+MYSQL_USE= MYSQL=server QT=sql-mysql_run
PGSQL_DESC= Install PostgreSQL Qt plugin
# Do not add a dependency on PostgreSQL server as someone preferring
# it over MySQL might like to use some advanced configuration, like a
# remote server.
#PGSQL_USE= PGSQL=server
-PGSQL_USE= QT5=sql-pgsql_run
+PGSQL_USES= qt:5
+PGSQL_USE= QT=sql-pgsql_run
SQLITE_DESC= Enable SQLite backend
-SQLITE_USES= sqlite:3
-SQLITE_USE= QT5=sql-sqlite3_run
+SQLITE_USES= qt:5 sqlite:3
+SQLITE_USE= QT=sql-sqlite3_run
SQLITE_CMAKE_ON= -DAKONADI_BUILD_QSQLITE:BOOL=ON
SQLITE_CMAKE_OFF= -DAKONADI_BUILD_QSQLITE:BOOL=OFF
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 96f725d66d8b..cb511a0e5490 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -14,10 +14,10 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \
libqca.so:devel/qca@qt4 \
libqoauth.so:net/qoauth
-USES= cmake gettext iconv kde:4 shared-mime-info tar:xz
+USES= cmake gettext iconv kde:4 qt:4 shared-mime-info tar:xz
USE_GNOME= libxml2 libxslt
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build uic_build rcc_build \
+USE_QT= qmake_build moc_build uic_build rcc_build \
webkit
USE_LDCONFIG= yes
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index f4edce795b06..3386532c9731 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -11,9 +11,9 @@ COMMENT= Database connectivity and creation framework
LIB_DEPENDS= libicuuc.so:devel/icu
-USES= cmake:outsource gettext kde:5 python:2.7 tar:xz
+USES= cmake:outsource gettext kde:5 python:2.7 qt:5 tar:xz
USE_KDE= coreaddons ecm i18n
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
# In the future, these options will be moved into slave ports
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index fd5f8c2d4979..bca6466947f6 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -14,14 +14,14 @@ LIB_DEPENDS= libKDb3.so:databases/kdb \
libKReport3.so:textproc/kreport
USES= cmake:outsource desktop-file-utils gettext iconv \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= glib20
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
-USE_QT5= core dbus gui network printsupport webkit widgets xml \
+USE_QT= core dbus gui network printsupport webkit widgets xml \
buildtools_build qmake_build qml
CONFLICTS_INSTALL= calligra-2*
diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
index 93885bfac328..e1d649169154 100644
--- a/databases/pgmodeler/Makefile
+++ b/databases/pgmodeler/Makefile
@@ -12,11 +12,11 @@ COMMENT= PostgreSQL Database Modeler
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++11-lib pgsql qmake pkgconfig gmake
+USES= compiler:c++11-lib pgsql qmake pkgconfig gmake qt:5
USE_GITHUB= yes
USE_GNOME= libxml2
-USE_QT5= gui network sql svg printsupport widgets core buildtools_build uitools testlib
+USE_QT= gui network sql svg printsupport widgets core buildtools_build uitools testlib
USE_GL= gl
USE_XORG= x11 xext
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index fc6a7c08d83a..8f505ba89691 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtSql module
CONFIGURE_ARGS= --enable QtSql
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run gui_run
USE_PYTHON= flavors
-USE_QT4= corelib gui sql \
+USE_QT= corelib gui sql \
moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index 104dfa25d94e..85325f511993 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtSql module
CONFIGURE_ARGS= --enable QtSql
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= flavors
-USE_QT5= core gui sql widgets buildtools_build qmake_build
+USE_QT= core gui sql widgets buildtools_build qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index 1b74747a01f3..de14496b4cb3 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL database integration module
-USE_QT4= qmake_build moc_build corelib
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile
index cb336ee6270c..fc004a64b94a 100644
--- a/databases/qt5-sql/Makefile
+++ b/databases/qt5-sql/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL database integration module
-USE_QT5= core qmake_build buildtools_build
-QT_DIST= base
+USES= qmake:no_env qt-dist:5,base
+USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
index b7af8550301b..93bb63ff8c8b 100644
--- a/databases/redisdesktopmanager/Makefile
+++ b/databases/redisdesktopmanager/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libssh2.so:security/libssh2
-USES= dos2unix kde:5 qmake ssl
+USES= dos2unix kde:5 qmake qt:5 ssl
DOS2UNIX_FILES= 3rdparty/3rdparty.pri
USE_GL= gl
USE_GITHUB= yes
@@ -30,7 +30,7 @@ GH_TUPLE= \
uglide:qredisclient:34f1c5a:qredisclient/3rdparty/qredisclient \
sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis
-USE_QT5= buildtools_build charts concurrent core gui network qmake_build qml quick widgets
+USE_QT= buildtools_build charts concurrent core gui network qmake_build qml quick widgets
post-patch:
@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index d6d997d08f54..99ac5cd28f98 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -17,9 +17,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:devel/antlr
LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
-USES= cmake desktop-file-utils sqlite
+USES= cmake desktop-file-utils qt:5 sqlite
CMAKE_ARGS+= -DQT_INCLUDE_DIR=${QT_INCDIR} -DQT_LIBRARY_DIR=${QT_LIBDIR}
-USE_QT5= core gui network printsupport testlib widgets \
+USE_QT= core gui network printsupport testlib widgets \
buildtools_build linguisttools_build qmake_build
USE_GITHUB= yes
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 4cd5eebef353..2a9ae0713e67 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -12,8 +12,8 @@ COMMENT= Admin's GUI tool for Sqlite3
LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
-USES= cmake sqlite
-USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql
+USES= cmake qt:4 sqlite
+USE_QT= qmake_build gui moc_build rcc_build uic_build xml sql
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index 28b99178a65b..cd4ec0adefa5 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -38,9 +38,9 @@ OPTIONS_SUB= yes
WRKSRC= ${WRKDIR}/SQLiteStudio3
-USES= compiler:c++11-lib gmake ncurses qmake readline sqlite
+USES= compiler:c++11-lib gmake ncurses qmake qt:5 readline sqlite
USE_CXXSTD= c++11
-USE_QT5= core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
+USE_QT= core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
uitools buildtools_build linguisttools_build
USE_GL= gl
USE_LDCONFIG= yes
@@ -64,7 +64,7 @@ PLUGIN_DB_SQLITE_CIPHER_VARS= PLUGIN_DIRS+=DbSqliteCipher
PLUGIN_HTML_EXPORT_VARS= PLUGIN_DIRS+=HtmlExport
PLUGIN_JSON_EXPORT_VARS= PLUGIN_DIRS+=JsonExport
PLUGIN_PDF_EXPORT_VARS= PLUGIN_DIRS+=PdfExport
-PLUGIN_PRINTING_VARS= PLUGIN_DIRS+=Printing USE_QT5+=printsupport
+PLUGIN_PRINTING_VARS= PLUGIN_DIRS+=Printing USE_QT+=printsupport
PLUGIN_REGEXP_IMPORT_VARS= PLUGIN_DIRS+=RegExpImport
PLUGIN_SQL_ENTERPRISE_FORMATTER_VARS= PLUGIN_DIRS+=SqlEnterpriseFormatter
PLUGIN_SQL_EXPORT_VARS= PLUGIN_DIRS+=SqlExport
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index f0cde018dcd0..243e8a1a726e 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -20,11 +20,15 @@ LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \
OPTIONS_DEFINE= PGSQL MYSQL DOCS
OPTIONS_DEFAULT= PGSQL MYSQL
-USE_QT4= corelib gui sql xml network moc_build uic_build rcc_build
-USES= autoreconf gmake libtool makeinfo
+USE_QT= corelib gui sql xml network moc_build qmake_build rcc_build uic_build
+USES= autoreconf gmake libtool localbase:ldflags makeinfo qmake:no_env qt:4
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-pcre=${LOCALBASE}
-LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS= --with-pcre=${LOCALBASE} \
+ --with-qt-includes=${QT_INCDIR} \
+ --with-qt-libraries=${QT_LIBDIR} \
+ --with-extra-includes=${LOCALBASE}/include \
+ --with-extra-libs=${LOCALBASE}/lib
+
INSTALL_TARGET= install-strip
PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html
@@ -32,8 +36,8 @@ PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html
DOCS_USES= makeinfo
DOCS_INFO= tora
-MYSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:databases/qt4-mysql-plugin
-PGSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:databases/qt4-pgsql-plugin
+MYSQL_USE= QT=sql-mysql_run
+PGSQL_USE= QT=sql-pgsql_run
post-patch-DOCS-on:
@${REINPLACE_CMD} 's|/etc/torarc|${PREFIX}/etc/torarc|' \
diff --git a/deskutils/akonadi-calendar-tools/Makefile b/deskutils/akonadi-calendar-tools/Makefile
index 737e11b4ca1a..32072c6ae9f2 100644
--- a/deskutils/akonadi-calendar-tools/Makefile
+++ b/deskutils/akonadi-calendar-tools/Makefile
@@ -9,7 +9,7 @@ COMMENT= CLI tools to manage akonadi calendars
LIB_DEPENDS= libical.so:devel/libical
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n iconthemes itemmodels \
itemviews jobwidgets kdelibs4support kio notifications parts \
@@ -18,7 +18,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
# pim components
USE_KDE+= akonadi akonadicalendar calendarsupport calendarcore calendarutils \
identitymanagement libkdepim mime pimtextedit
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/akonadi-import-wizard/Makefile b/deskutils/akonadi-import-wizard/Makefile
index 91794e5e2546..75d4ae6d712c 100644
--- a/deskutils/akonadi-import-wizard/Makefile
+++ b/deskutils/akonadi-import-wizard/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm i18n itemmodels kio service wallet \
widgetsaddons xmlgui
@@ -21,7 +21,7 @@ USE_KDE= archive auth codecs completion config configwidgets coreaddons \
USE_KDE+= akonadi akonadicontacts akonadimime contacts identitymanagement \
libkdepim libkleo mailcommon mailimporter mailtransport \
messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/akonadiconsole/Makefile b/deskutils/akonadiconsole/Makefile
index c2112e7c69b6..3ffade32e679 100644
--- a/deskutils/akonadiconsole/Makefile
+++ b/deskutils/akonadiconsole/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libical.so:devel/libical \
libxapian.so:databases/xapian-core
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kdelibs4support kio \
@@ -28,7 +28,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \
akonadisearch calendarcore calendarsupport contacts \
identitymanagement libkdepim libkleo messagelib mime \
pimcommon pimtextedit
-USE_QT5= core dbus gui network printsupport sql widgets xml \
+USE_QT= core dbus gui network printsupport sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile
index 135a51d57757..5033496b74ee 100644
--- a/deskutils/akregator/Makefile
+++ b/deskutils/akregator/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n iconthemes itemmodels jobwidgets kcmutils kio \
notifications notifyconfig parts service sonnet texteditor\
@@ -23,7 +23,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \
# pim components
USE_KDE+= akonadi akonadimime contacts grantleetheme kontactinterface \
libkdepim libkleo messagelib mime pimcommon pimtextedit syndication
-USE_QT5= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus gui location network printsupport qml quick \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index a6f3aa0145be..900e4222bc4e 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -14,10 +14,10 @@ LICENSE= GPLv2
LIB_DEPENDS= libgpgme.so:security/gpgme
-USES= cmake gettext-tools kde:4 tar:bzip2
+USES= cmake gettext-tools kde:4 qt:4 tar:bzip2
USE_XORG= xft xpm
USE_KDE= automoc4 kdelibs qimageblitz
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
USE_CXXSTD= gnu++98
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 2964ee47d391..81630e1cb679 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -87,8 +87,8 @@ IMPULSE_LIB_DEPENDS= libpulse.so:audio/pulseaudio
IMPULSE_CMAKE_BOOL= enable-impulse
#KDE_INTEGRATION_LIB_DEPENDS=
-KDE_INTEGRATION_USE_QT4= corelib
-KDE_INTEGRATION_USES= kde:4
+KDE_INTEGRATION_USE_QT= corelib
+KDE_INTEGRATION_USES= kde:4 qt:4
KDE_INTEGRATION_USE= KDE=kdelibs
KDE_INTEGRATION_CMAKE_BOOL= enable-kde-integration
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 1abcd63f84e9..a57a655b37aa 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -48,13 +48,13 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \
pdftohtml:graphics/poppler-utils
USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \
- python:2.7 pyqt:5 shared-mime-info shebangfix ssl tar:xz
+ python:2.7 pyqt:5 qt:5 shared-mime-info shebangfix ssl tar:xz
USE_RC_SUBR= calibre
EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f
SHEBANG_GLOB= *.sh *.py
python_OLD_CMD= "/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2
USE_PYQT= core gui network sip svg webkit widgets webkitwidgets xmlpatterns
-USE_QT5= 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/cdcat/Makefile b/deskutils/cdcat/Makefile
index fb5ca60ac889..341ff3b5776e 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= libtar.so:devel/libtar \
CONFIGURE_WRKSRC= ${WRKSRC}/src
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
-USES= libtool qmake:norecursive tar:bzip2
-USE_QT4= corelib gui xml linguisttools_build moc_build uic_build
+USES= libtool qmake:norecursive qt:4 tar:bzip2
+USE_QT= corelib gui xml linguisttools_build moc_build uic_build
QMAKE_ARGS= LIBS+="${LOCALBASE}/lib/libcryptopp.a" \
LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \
DEFINES+="MEDIAINFO_STATIC" \
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index 4aa063343531..c65db3cc69c9 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -14,7 +14,7 @@ COMMENT= Time tracker
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource compiler:c++11-lib
+USES= cmake:outsource compiler:c++11-lib qt:5
# Use bundled keychain; the keychain is only used for KDAB-internal
# features not available or configurable in the port.
CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION} \
@@ -24,7 +24,7 @@ USE_GITHUB= yes
GH_ACCOUNT= KDAB
GH_PROJECT= Charm
-USE_QT5= core dbus gui \
+USE_QT= core dbus gui \
network printsupport script sql sql-sqlite3 \
testlib widgets xml \
buildtools_build qmake_build
diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile
index 7e4f52d5e912..4614ae200178 100644
--- a/deskutils/copyq/Makefile
+++ b/deskutils/copyq/Makefile
@@ -11,9 +11,9 @@ COMMENT= Qt5 based clipboard manager
LICENSE= GPLv3
-USES= qmake
+USES= qmake qt:5
USE_XORG= x11 xfixes xtst
-USE_QT5= core gui network svg multimedia imageformats \
+USE_QT= core gui network svg multimedia imageformats \
buildtools_build x11extras concurrent widgets xml \
script
USE_GL= gl
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index dce5a4a6a87f..3659a90d6312 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -45,7 +45,8 @@ OPTIONS_SUB= yes
GTK2_USE= gnome=gtk20
GTK2_MAKE_ENV= UI_TYPE=gtk
-QT4_USE= qt4=gui,corelib,imageformats,network,moc_build
+QT4_USES= qt:4
+QT4_USE= qt=gui,corelib,imageformats,network,moc_build
QT4_LIBS= -L${QT_LIBDIR}
QT4_MAKE_ENV= UI_TYPE=qt4
diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index d23158e3a260..107419b199b9 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -15,7 +15,7 @@ COMMENT= Free timetabling software
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
+USES= qmake qt:4 tar:bzip2
PORTEXAMPLES= *
@@ -34,8 +34,10 @@ ONLYCL_DESC= Build only command line version (without Qt GUI)
OPTIONS_SUB= yes
-QT4_USE= QT4=corelib,moc_build,rcc_build,uic_build,xml
-QT5_USE= QT5=buildtools_build,core,xml GL=gl
+QT4_USES= qt:4
+QT4_USE= QT=corelib,moc_build,rcc_build,uic_build,xml
+QT5_USES= qt:5
+QT5_USE= QT=buildtools_build,core,xml GL=gl
.include <bsd.port.options.mk>
@@ -45,9 +47,9 @@ QMAKE_SOURCE_PATH= ${WRKSRC}/src/src-cl.pro
.else
INSTALL_TARGET+= ${WRKSRC}/fet
.if ${PORT_OPTIONS:MQT4}
-USE_QT4+=gui network
+USE_QT+= gui network
.else
-USE_QT5+=gui network printsupport widgets
+USE_QT+= gui network printsupport widgets
.endif
.endif
diff --git a/deskutils/flameshot/Makefile b/deskutils/flameshot/Makefile
index ab7e7016b21b..0d5892be8736 100644
--- a/deskutils/flameshot/Makefile
+++ b/deskutils/flameshot/Makefile
@@ -17,10 +17,10 @@ GH_ACCOUNT= lupoDharkael
INSTALL_ICONS= yes
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
USE_GL= gl
-USE_QT5= core dbus gui linguist network widgets \
+USE_QT= core dbus gui linguist network widgets \
buildtools_build
post-patch:
diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile
index 13bfaf80c7bc..c5fbb811e476 100644
--- a/deskutils/grantlee-editor/Makefile
+++ b/deskutils/grantlee-editor/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libqgpgme.so:security/gpgme-qt5
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 \
- kde:5 tar:xz
+ kde:5 qt:5 tar:xz
USE_KDE= archive attica auth codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n itemmodels jobwidgets \
kio newstuff service syntaxhighlighting texteditor \
@@ -24,7 +24,7 @@ USE_KDE= archive attica auth codecs completion config configwidgets \
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \
kdepim-apps-libs libkleo messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus gui location network qml quick webchannel webengine \
+USE_QT= core dbus gui location network qml quick webchannel webengine \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/grantleetheme/Makefile b/deskutils/grantleetheme/Makefile
index 70a524efc740..c935098f27c8 100644
--- a/deskutils/grantleetheme/Makefile
+++ b/deskutils/grantleetheme/Makefile
@@ -10,10 +10,10 @@ COMMENT= KDE PIM grantleetheme
LICENSE= LGPL21
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons ecm i18n \
iconthemes newstuff service widgetsaddons xmlgui
-USE_QT5= core dbus gui network testlib widgets xml \
+USE_QT= core dbus gui network testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/homerun/Makefile b/deskutils/homerun/Makefile
index 5c2b169a10ba..1d1410b7dd99 100644
--- a/deskutils/homerun/Makefile
+++ b/deskutils/homerun/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES= KDE/unstable/${PORTNAME}/src/
MAINTAINER= yurkis@gmail.com
COMMENT= Fullscreen launcher with content organized in tabs
-USES= cmake:outsource compiler:c++0x gettext kde:4 tar:bzip2
+USES= cmake:outsource compiler:c++0x gettext kde:4 qt:4 tar:bzip2
USE_KDE= kdelibs automoc4 workspace
-USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui
+USE_QT= moc_build qmake_build rcc_build uic_build corelib gui
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/deskutils/kaddressbook/Makefile b/deskutils/kaddressbook/Makefile
index 8a5cf52ec63f..0a0275eecf80 100644
--- a/deskutils/kaddressbook/Makefile
+++ b/deskutils/kaddressbook/Makefile
@@ -14,14 +14,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libqgpgme.so:security/gpgme-qt5
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- tar:xz
+ qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n iconthemes itemmodels jobwidgets kcmutils kio parts \
prison service sonnet textwidgets widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi akonadicontacts akonadisearch contacts grantleetheme \
kdepim-apps-libs kontactinterface libkdepim pimcommon
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kalarm/Makefile b/deskutils/kalarm/Makefile
index bc4d36d9dbd5..226e824dcadd 100644
--- a/deskutils/kalarm/Makefile
+++ b/deskutils/kalarm/Makefile
@@ -10,7 +10,7 @@ COMMENT= Personal alarm scheduler
LIB_DEPENDS= libical.so:devel/libical
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 shebangfix tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -21,7 +21,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime alarmcalendar calendarcore \
calendarutils contacts holidays identitymanagement \
kdepim-apps-libs libkdepim mailcommon mailtransport mime \
pimcommon pimtextedit imap
-USE_QT5= core dbus gui network phonon4 printsupport widgets x11extras xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kcharselect-kde4/Makefile b/deskutils/kcharselect-kde4/Makefile
index e8e7755f1ea1..33e6c38227aa 100644
--- a/deskutils/kcharselect-kde4/Makefile
+++ b/deskutils/kcharselect-kde4/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Character selector for KDE
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index ccb73695726e..89e13658c5ab 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -10,8 +10,8 @@ COMMENT= Character selector for KDE
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= ecm bookmarks doctools i18n widgetsaddons xmlgui
-USE_QT5= buildtools_build qmake_build widgets
+USE_QT= buildtools_build qmake_build widgets
.include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index 32ae5521ab40..447e661ea2e9 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -13,8 +13,8 @@ COMMENT= KDE viewer for CHM files
LIB_DEPENDS= libchm.so:misc/chmlib \
libzip.so:archivers/libzip
-USES= dos2unix qmake:outsource
-USE_QT5= core dbus gui network printsupport webkit widgets xml \
+USES= dos2unix qmake:outsource qt:5
+USE_QT= core dbus gui network printsupport webkit widgets xml \
buildtools_build qmake_build
USE_XORG= x11
diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile
index 7b22833422fa..8177fba57e7d 100644
--- a/deskutils/kdeconnect/Makefile
+++ b/deskutils/kdeconnect/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES= KDE/unstable/kdeconnect/${PORTVERSION}/src/
MAINTAINER= yurkis@gmail.com
COMMENT= Support for KDE to interface between your phone and your computer
-USES= cmake:noninja compiler:c++0x gettext kde:4 tar:xz
+USES= cmake:noninja compiler:c++0x gettext kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 workspace runtime
-USE_QT4= corelib gui moc_build qmake_build uic_build rcc_build
+USE_QT= corelib gui moc_build qmake_build uic_build rcc_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile
index e7c1d907cf87..e0b0bfa3f38d 100644
--- a/deskutils/kdepim-addons/Makefile
+++ b/deskutils/kdepim-addons/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libqgpgme.so:security/gpgme-qt5
USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemmodels itemviews jobwidgets \
kdeclarative khtml kio prison service sonnet syntaxhighlighting \
@@ -29,7 +29,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadiimportwizard \
kdepim-apps-libs libkdepim libkleo libksieve mailcommon \
mailimporter mailtransport messagelib mime pimcommon \
pimtextedit tnef
-USE_QT5= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus gui location network printsupport qml quick testlib \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdepim-apps-libs/Makefile b/deskutils/kdepim-apps-libs/Makefile
index cddb1176ce6e..6da57b355b22 100644
--- a/deskutils/kdepim-apps-libs/Makefile
+++ b/deskutils/kdepim-apps-libs/Makefile
@@ -15,14 +15,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemmodels jobwidgets \
kdewebkit kio service sonnet widgetsaddons xmlgui
# pim components
USE_KDE+= akonadi akonadicontacts contacts grantleetheme libkleo mime \
pimcommon pimtextedit
-USE_QT5= core dbus gui network testlib uitools webkit widgets xml \
+USE_QT= core dbus gui network testlib uitools webkit widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdepim-kde4/Makefile b/deskutils/kdepim-kde4/Makefile
index d9f73189a32b..ffca4192842c 100644
--- a/deskutils/kdepim-kde4/Makefile
+++ b/deskutils/kdepim-kde4/Makefile
@@ -25,12 +25,12 @@ CONFLICTS_INSTALL= kdepim44-4.*
USE_GNOME= libxml2 libxslt:build
USE_KDE= kdelibs pimlibs kactivities \
akonadi automoc4 soprano nepomuk-widgets baloo
-USES= cmake:outsource grantlee:4 iconv kde:4 shebangfix tar:xz
+USES= cmake:outsource grantlee:4 iconv kde:4 qt:4 shebangfix tar:xz
SHEBANG_FILES= agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
kalarm/*.pl kmail/kconf_update/*.pl \
libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
USE_OPENLDAP= yes
-USE_QT4= corelib dbus declarative designer_build gui network opengl \
+USE_QT= corelib dbus declarative designer_build gui network opengl \
qt3support script sql webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xscrnsaver
diff --git a/deskutils/kdepim-runtime-kde4/Makefile b/deskutils/kdepim-runtime-kde4/Makefile
index 01d5b6f4c550..aa5b2715da61 100644
--- a/deskutils/kdepim-runtime-kde4/Makefile
+++ b/deskutils/kdepim-runtime-kde4/Makefile
@@ -21,11 +21,11 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
CONFLICTS_INSTALL= kdepim-runtime44-4.*
-USES= cmake:outsource kde:4 shared-mime-info tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info tar:xz
USE_GNOME= libxml2 libxslt:build
USE_KDE= kdelibs pimlibs \
akonadi automoc4
-USE_QT4= corelib dbus declarative designer_build gui network qtestlib \
+USE_QT= corelib dbus declarative designer_build gui network qtestlib \
script xml xmlpatterns \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile
index b3b2dae7f299..5b7007eaef81 100644
--- a/deskutils/kdepim-runtime/Makefile
+++ b/deskutils/kdepim-runtime/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
libsasl2.so:security/cyrus-sasl2 \
libxerces-c-3.2.so:textproc/xerces-c3
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons holidays i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -28,7 +28,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadinotes \
calendarutils contacts gapi identitymanagement imap \
kontactinterface kpimdav mailtransport mbox mime pimcommon \
pimtextedit syndication
-USE_QT5= core dbus gui location network printsupport qml quick speech \
+USE_QT= core dbus gui location network printsupport qml quick speech \
script webchannel webengine widgets xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdepimlibs-kde4/Makefile b/deskutils/kdepimlibs-kde4/Makefile
index 2ceb79126576..ff34b47d893a 100644
--- a/deskutils/kdepimlibs-kde4/Makefile
+++ b/deskutils/kdepimlibs-kde4/Makefile
@@ -21,12 +21,12 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \
libprison.so:graphics/prison \
libqjson.so:devel/qjson@qt4
-USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz
+USES= cmake:outsource kde:4 qt:4 shared-mime-info shebangfix tar:xz
USE_KDE= kdelibs akonadi \
automoc4 ontologies soprano
SHEBANG_FILES= mailtransport/kconf_update/migrate-transports.pl
USE_OPENLDAP= yes
-USE_QT4= corelib dbus declarative designer_build gui network sql xml \
+USE_QT= corelib dbus declarative designer_build gui network sql xml \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdeplasma-addons-kde4/Makefile b/deskutils/kdeplasma-addons-kde4/Makefile
index 2131397a923d..d61dc47309b4 100644
--- a/deskutils/kdeplasma-addons-kde4/Makefile
+++ b/deskutils/kdeplasma-addons-kde4/Makefile
@@ -15,10 +15,10 @@ LIB_DEPENDS= libqalculate.so:math/libqalculate \
libqjson.so:devel/qjson@qt4
CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].*
-USES= cmake:outsource eigen:2 kde:4 pkgconfig shared-mime-info tar:xz
+USES= cmake:outsource eigen:2 kde:4 pkgconfig qt:4 shared-mime-info tar:xz
USE_KDE= kdelibs libkexiv2 pimlibs workspace \
akonadi attica automoc4 qimageblitz soprano
-USE_QT4= corelib dbus declarative gui network script sql webkit \
+USE_QT= corelib dbus declarative gui network script sql webkit \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xrender xtst
USE_LDCONFIG= yes
diff --git a/deskutils/keditbookmarks/Makefile b/deskutils/keditbookmarks/Makefile
index 8ad251d74158..f2b058004f7b 100644
--- a/deskutils/keditbookmarks/Makefile
+++ b/deskutils/keditbookmarks/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Bookmark Organizer and Editor
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n iconthemes jobwidgets kio parts service \
sonnet textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/deskutils/kfind/Makefile b/deskutils/kfind/Makefile
index e4827855cc4d..af4a60655f3f 100644
--- a/deskutils/kfind/Makefile
+++ b/deskutils/kfind/Makefile
@@ -7,13 +7,13 @@ CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Find files and folders
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio notifications parts service \
solid sonnet textwidgets unitconversion widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/deskutils/kmail-account-wizard/Makefile b/deskutils/kmail-account-wizard/Makefile
index ada68bb3bbfc..70e2e4e69c3f 100644
--- a/deskutils/kmail-account-wizard/Makefile
+++ b/deskutils/kmail-account-wizard/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
dbusaddons ecm i18n itemmodels itemviews kcmutils kio kross \
newstuff notifications notifyconfig service texteditor wallet \
@@ -21,7 +21,7 @@ USE_KDE= attica auth codecs config configwidgets coreaddons crash \
# pim components
USE_KDE+= akonadi akonadimime identitymanagement ldap libkdepim libkleo \
mailtransport mime pimcommon pimtextedit
-USE_QT5= core dbus gui network script widgets xml \
+USE_QT= core dbus gui network script widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile
index 9724911c5391..b4d23b069fb7 100644
--- a/deskutils/kmail/Makefile
+++ b/deskutils/kmail/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= accountwizard:deskutils/kmail-account-wizard \
mboximporter:deskutils/mbox-importer \
sieveeditor:deskutils/pim-sieve-editor
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -33,7 +33,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \
identitymanagement libkdepim libkleo libksieve \
kontactinterface ldap mailcommon mailtransport messagelib \
mime pimcommon pimtextedit tnef
-USE_QT5= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus gui location network printsupport qml quick \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/knotes/Makefile b/deskutils/knotes/Makefile
index dbcd42c2d82a..a61dfcbd121d 100644
--- a/deskutils/knotes/Makefile
+++ b/deskutils/knotes/Makefile
@@ -11,7 +11,7 @@ LICENSE= LGPL21
LIB_DEPENDS= libical.so:devel/libical
-USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons dnssd globalaccel guiaddons i18n \
iconthemes itemmodels itemviews jobwidgets kcmutils \
@@ -22,7 +22,7 @@ USE_KDE= attica auth bookmarks codecs completion config configwidgets \
USE_KDE+= akonadi akonadicontacts akonadinotes akonadisearch \
calendarcore calendarutils contacts kontactinterface libkdepim \
mime pimcommon pimtextedit
-USE_QT5= core dbus gui network printsupport widgets x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
USE_LDCONFIG= yes
diff --git a/deskutils/kontact/Makefile b/deskutils/kontact/Makefile
index f59742493508..7f668e1dd950 100644
--- a/deskutils/kontact/Makefile
+++ b/deskutils/kontact/Makefile
@@ -9,13 +9,13 @@ COMMENT= KDE Personal Information Manager
LICENSE= LGPL21
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n iconthemes itemmodels jobwidgets kcmutils kio parts \
service sonnet textwidgets widgetsaddons windowsystem xmlgui
# pim components
USE_KDE+= akonadi grantleetheme kdepim-apps-libs kontactinterface libkdepim
-USE_QT5= core dbus gui location network qml quick webchannel webengine \
+USE_QT= core dbus gui location network qml quick webchannel webengine \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile
index 2135db53f0e6..37645acba6d3 100644
--- a/deskutils/korganizer/Makefile
+++ b/deskutils/korganizer/Makefile
@@ -10,7 +10,7 @@ COMMENT= Calendar and scheduling Program
LIB_DEPENDS= libical.so:devel/libical
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
@@ -22,7 +22,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \
calendarutils contacts eventviews holidays identitymanagement \
incidenceeditor kdepim-apps-libs kontactinterface ldap \
libkdepim mailtransport mime pimcommon pimtextedit
-USE_QT5= core dbus gui network phonon4 printsupport widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kruler-kde4/Makefile b/deskutils/kruler-kde4/Makefile
index 33e0588ddd6f..df6f5d644e0f 100644
--- a/deskutils/kruler-kde4/Makefile
+++ b/deskutils/kruler-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 screen ruler
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_XORG= x11
.include <bsd.port.mk>
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index 49d2e2076fb6..b0efa16f03fb 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE screen ruler
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm doctools i18n \
notifications widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui widgets x11extras xml \
+USE_QT= core dbus gui widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xcb
diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile
index ff5807da5a2f..0bc3dc4dcf65 100644
--- a/deskutils/ksshaskpass/Makefile
+++ b/deskutils/ksshaskpass/Makefile
@@ -12,9 +12,9 @@ MAINTAINER= swills@FreeBSD.org
COMMENT= KDE 4 version of ssh-askpass with KWallet support
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= cmake kde:4
+USES= cmake kde:4 qt:4
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build uic_build qmake_build rcc_build
+USE_QT= moc_build uic_build qmake_build rcc_build
SUB_FILES= pkg-message
diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile
index a0dfc4c8659e..0a4c8ecabefd 100644
--- a/deskutils/latte-dock/Makefile
+++ b/deskutils/latte-dock/Makefile
@@ -13,13 +13,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= activities archive auth codecs config configwidgets \
coreaddons crash dbusaddons globalaccel i18n iconthemes \
kdeclarative notifications package plasma-framework service \
wayland widgetsaddons windowsystem xmlgui \
ecm_build
-USE_QT5= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus gui network qml quick widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xext
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 3a72b9843431..521142782139 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:devel/xdg-utils
-USES= dos2unix qmake
+USES= dos2unix qmake qt:4
DOS2UNIX_FILES= readme.lyx readme.txt
-USE_QT4= moc_build rcc_build uic_build gui network
+USE_QT= moc_build rcc_build uic_build gui network
LDFLAGS+= -lX11
PORTDOCS= *
diff --git a/deskutils/libkdepim/Makefile b/deskutils/libkdepim/Makefile
index 21747b5c5588..494dc902e721 100644
--- a/deskutils/libkdepim/Makefile
+++ b/deskutils/libkdepim/Makefile
@@ -11,13 +11,13 @@ LICENSE= LGPL21
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= cmake:outsource gettext compiler:c++11-lib kde:5 tar:xz
+USES= cmake:outsource gettext compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons ecm \
i18n iconthemes itemmodels itemviews jobwidgets kcmutils \
kio service wallet widgetsaddons
# pim components
USE_KDE+= akonadi akonadicontacts akonadisearch contacts ldap mime
-USE_QT5= core dbus designer gui network testlib uiplugin uitools \
+USE_QT= core dbus designer gui network testlib uiplugin uitools \
widgets xml \
buildtools_build qmake_build
diff --git a/deskutils/lumina-archiver/Makefile b/deskutils/lumina-archiver/Makefile
index 3a58ed48cf31..86f88d05eb45 100644
--- a/deskutils/lumina-archiver/Makefile
+++ b/deskutils/lumina-archiver/Makefile
@@ -22,8 +22,8 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-calculator/Makefile b/deskutils/lumina-calculator/Makefile
index 9bfffbc47267..abfe88cea427 100644
--- a/deskutils/lumina-calculator/Makefile
+++ b/deskutils/lumina-calculator/Makefile
@@ -27,10 +27,10 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
USE_XORG= x11 xdamage xcb
-USE_QT5= core gui widgets network svg \
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -39,7 +39,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-fileinfo/Makefile b/deskutils/lumina-fileinfo/Makefile
index eb07c3de5069..3b3fef629ee7 100644
--- a/deskutils/lumina-fileinfo/Makefile
+++ b/deskutils/lumina-fileinfo/Makefile
@@ -22,8 +22,8 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-fm/Makefile b/deskutils/lumina-fm/Makefile
index feb10c4f732b..191fd1e1d365 100644
--- a/deskutils/lumina-fm/Makefile
+++ b/deskutils/lumina-fm/Makefile
@@ -22,9 +22,9 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg imageformats \
+USE_QT= core gui widgets network svg imageformats \
buildtools_build x11extras multimedia concurrent
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguisttools_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-mediaplayer/Makefile b/deskutils/lumina-mediaplayer/Makefile
index bd63b79cd123..efe6efe7a0a8 100644
--- a/deskutils/lumina-mediaplayer/Makefile
+++ b/deskutils/lumina-mediaplayer/Makefile
@@ -24,8 +24,8 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras multimedia concurrent
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -34,7 +34,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-notify/Makefile b/deskutils/lumina-notify/Makefile
index 0d8dcfc394f7..47c152c6c7f6 100644
--- a/deskutils/lumina-notify/Makefile
+++ b/deskutils/lumina-notify/Makefile
@@ -18,8 +18,8 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USES= qmake
-USE_QT5= core gui widgets network svg \
+USES= qmake qt:5
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -28,7 +28,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile
index 504e48b1c055..87e42df7fb4c 100644
--- a/deskutils/lumina-pdf/Makefile
+++ b/deskutils/lumina-pdf/Makefile
@@ -23,9 +23,9 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg multimedia \
+USE_QT= core gui widgets network svg multimedia \
buildtools_build x11extras concurrent printsupport
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -33,7 +33,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-screenshot/Makefile b/deskutils/lumina-screenshot/Makefile
index 5b7f1f304a82..ba3c74b015d6 100644
--- a/deskutils/lumina-screenshot/Makefile
+++ b/deskutils/lumina-screenshot/Makefile
@@ -22,9 +22,9 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg \
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-textedit/Makefile b/deskutils/lumina-textedit/Makefile
index 795aaa7cbe18..6e4fb37965a2 100644
--- a/deskutils/lumina-textedit/Makefile
+++ b/deskutils/lumina-textedit/Makefile
@@ -23,9 +23,9 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg printsupport \
+USE_QT= core gui widgets network svg printsupport \
buildtools_build x11extras concurrent multimedia
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
@@ -33,7 +33,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/lumina-xdg-entry/Makefile b/deskutils/lumina-xdg-entry/Makefile
index ad6ec727d7bb..1e8d5f236a38 100644
--- a/deskutils/lumina-xdg-entry/Makefile
+++ b/deskutils/lumina-xdg-entry/Makefile
@@ -20,16 +20,16 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USE_QT5= core gui widgets network svg \
+USE_QT= core gui widgets network svg \
buildtools_build x11extras concurrent multimedia
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_PROJECT= lumina
WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME}
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+= CONFIG+=WITH_I18N
.endif
diff --git a/deskutils/mbox-importer/Makefile b/deskutils/mbox-importer/Makefile
index a389e3f8b012..da51e285573a 100644
--- a/deskutils/mbox-importer/Makefile
+++ b/deskutils/mbox-importer/Makefile
@@ -13,14 +13,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
crash ecm i18n itemmodels kio service widgetsaddons
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime contacts \
identitymanagement libkleo mailcommon mailimporter messagelib \
mime pimcommon pimtextedit
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
index 41e49189617c..a4c213fed90d 100644
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libinotify.so:devel/libinotify \
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:outsource,noninja compiler:c++11-lib gmake iconv \
- localbase:ldflags pkgconfig sqlite ssl
-USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \
+ localbase:ldflags pkgconfig qt:5 sqlite ssl
+USE_QT= buildtools_build concurrent core dbus gui linguist_build network \
qmake_build sql webkit widgets xml
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \
-DCMAKE_INSTALL_MANDIR:STRING=man \
diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
index c1cfd7afc0a2..8c12db6fd07f 100644
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libinotify.so:devel/libinotify \
libqt5keychain.so:security/qtkeychain@qt5
USES= cmake:outsource,noninja compiler:c++11-lib gmake iconv kde:5 \
- localbase:ldflags pkgconfig sqlite
-USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \
+ localbase:ldflags pkgconfig qt:5 sqlite
+USE_QT= buildtools_build concurrent core dbus gui linguist_build network \
qmake_build sql webkit widgets xml
USE_KDE= completion config coreaddons jobwidgets kio service widgetsaddons
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \
diff --git a/deskutils/pim-data-exporter/Makefile b/deskutils/pim-data-exporter/Makefile
index 7c2b4d14d6ba..8c2a9326574e 100644
--- a/deskutils/pim-data-exporter/Makefile
+++ b/deskutils/pim-data-exporter/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libgpgmepp.so:security/gpgme-cpp \
libqgpgme.so:security/gpgme-qt5
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n itemmodels itemviews \
jobwidgets kio notifications service solid wallet \
@@ -22,7 +22,7 @@ USE_KDE= archive auth bookmarks codecs completion config configwidgets \
USE_KDE+= akonadi akonadicontacts akonadimime contacts \
identitymanagement libkdepim libkleo mailcommon mailtransport \
messagelib mime pimcommon pimtextedit
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/pim-sieve-editor/Makefile b/deskutils/pim-sieve-editor/Makefile
index 6344a91db91b..dff38cad3fb0 100644
--- a/deskutils/pim-sieve-editor/Makefile
+++ b/deskutils/pim-sieve-editor/Makefile
@@ -7,14 +7,13 @@ CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Mail sieve editor
-
- USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs config configwidgets coreaddons crash \
dbusaddons ecm i18n iconthemes kio service wallet \
widgetsaddons xmlgui
# pim components
USE_KDE+= libksieve mailtransport pimcommon
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile
index 051a40c0f75b..c2c0f169af9b 100644
--- a/deskutils/plasma-applet-cwp/Makefile
+++ b/deskutils/plasma-applet-cwp/Makefile
@@ -14,9 +14,9 @@ COMMENT= Weather plasma applet for KDE4
LICENSE= GPLv3
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_KDE= automoc4 kdelibs
-USE_QT4= gui dbus network opengl svg phonon webkit xml \
+USE_QT= gui dbus network opengl svg phonon webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-daisy/Makefile b/deskutils/plasma-applet-daisy/Makefile
index 39b8e1a3d479..059df80f53b9 100644
--- a/deskutils/plasma-applet-daisy/Makefile
+++ b/deskutils/plasma-applet-daisy/Makefile
@@ -14,9 +14,9 @@ COMMENT= Simple launcher plasma applet for KDE4
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake gettext kde:4
+USES= cmake gettext kde:4 qt:4
USE_KDE= automoc4 kdelibs workspace
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile
index f07c145e7aef..ac577f463ec6 100644
--- a/deskutils/plasma-applet-fancytasks/Makefile
+++ b/deskutils/plasma-applet-fancytasks/Makefile
@@ -14,9 +14,9 @@ COMMENT= Plasmoid fancy representation of your tasks and launchers
LICENSE= GPLv2
-USES= cmake kde:4 tar:bzip2
+USES= cmake kde:4 qt:4 tar:bzip2
USE_KDE= automoc4 kdelibs workspace qimageblitz
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile
index c6bf6d54661c..0ccefad29aab 100644
--- a/deskutils/plasma-applet-panelspacer/Makefile
+++ b/deskutils/plasma-applet-panelspacer/Makefile
@@ -13,9 +13,9 @@ COMMENT= Panel spacer plasma applet for KDE4
LICENSE= GPLv2
-USES= cmake kde:4
+USES= cmake kde:4 qt:4
USE_KDE= automoc4 workspace
-USE_QT4= gui dbus network opengl svg webkit xml \
+USE_QT= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/Panelspacer_from_svn_pour_kdelook-tmp
diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile
index e2acdb6a0c74..a6e4e26d6d5d 100644
--- a/deskutils/plasma-applet-qstardict/Makefile
+++ b/deskutils/plasma-applet-qstardict/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${QSTARDICT_PLUGIN_PATH}/libstardict.so:textproc/qstardict
-USES= cmake kde:4 tar:bzip2
-USE_QT4= qmake_build uic_build moc_build rcc_build
+USES= cmake kde:4 qt:4 tar:bzip2
+USE_QT= qmake_build uic_build moc_build rcc_build
USE_KDE= automoc4 kdelibs
CMAKE_SOURCE_PATH= ${WRKSRC}/kdeplasma
diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile
index 06e4a5759a51..69850a56ae99 100644
--- a/deskutils/plasma-applet-serverstatuswidget/Makefile
+++ b/deskutils/plasma-applet-serverstatuswidget/Makefile
@@ -13,9 +13,9 @@ COMMENT= KDE4 server monitoring plasma applet
LICENSE= GPLv2
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_KDE= automoc4 workspace
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index c24e8cd675a6..6d622545d1e6 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -14,9 +14,9 @@ COMMENT= Weather plasma applet for KDE4
RUN_DEPENDS= wget:ftp/wget
-USES= cmake kde:4
+USES= cmake kde:4 qt:4
USE_KDE= automoc4 kdelibs
-USE_QT4= gui dbus network opengl svg webkit xml \
+USE_QT= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/plasma-${PORTNAME}-${PORTVERSION}-kde-4.3.80
diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile
index 3670155c7995..8410f00d7251 100644
--- a/deskutils/plasma-applet-teacooker/Makefile
+++ b/deskutils/plasma-applet-teacooker/Makefile
@@ -13,9 +13,9 @@ COMMENT= KDE4 tea cooker plasma applet
LICENSE= GPLv3
-USES= cmake kde:4
+USES= cmake kde:4 qt:4
USE_KDE= automoc4 kdelibs
-USE_QT4= gui dbus network opengl svg webkit xml \
+USE_QT= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/TeaCooker
diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile
index a729b6813e6c..16533ad75f5b 100644
--- a/deskutils/plasma-applet-yawp/Makefile
+++ b/deskutils/plasma-applet-yawp/Makefile
@@ -13,9 +13,9 @@ COMMENT= KDE4 weather plasma applet
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE-GPL2
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_KDE= automoc4 kdelibs workspace
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/deskutils/plasma5-milou/Makefile b/deskutils/plasma5-milou/Makefile
index 1a8ba984d9fe..4b6bb9ed1093 100644
--- a/deskutils/plasma5-milou/Makefile
+++ b/deskutils/plasma5-milou/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= deskutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 Plasmoid for search
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config coreaddons i18n kdeclarative package \
plasma-framework runner service
-USE_QT5= core gui network qml quick script testlib widgets \
+USE_QT= core gui network qml quick script testlib widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/deskutils/plasma5-sddm-kcm/Makefile b/deskutils/plasma5-sddm-kcm/Makefile
index e33bb8286650..8b23c9e80fc4 100644
--- a/deskutils/plasma5-sddm-kcm/Makefile
+++ b/deskutils/plasma5-sddm-kcm/Makefile
@@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 config module for SDDM
USES= cmake:outsource compiler:c++11-lib gettext kde:5 cpe pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= auth archive attica codecs completion config configwidgets \
coreaddons ecm i18n jobwidgets kio newstuff service \
widgetsaddons xmlgui
-USE_QT5= concurrent core dbus designer gui network qml quick uiplugin widgets \
+USE_QT= concurrent core dbus designer gui network qml quick uiplugin widgets \
x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xfixes
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index 0ebdb512d08e..0994a89ae920 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -14,8 +14,8 @@ COMMENT= General organizer that includes calendar with jurnal and schedule
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/../COPYING
-USES= qmake
-USE_QT4= corelib gui network moc_build rcc_build sql
+USES= qmake qt:4
+USE_QT= corelib gui network moc_build rcc_build sql
WRKSRC= ${WRKDIR}/qOrganizer/src
PLIST_FILES= bin/qOrganizer share/pixmaps/qOrganizer.png
diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile
index 1febafc1c89d..4bd65b79b9e4 100644
--- a/deskutils/qrfcview/Makefile
+++ b/deskutils/qrfcview/Makefile
@@ -13,8 +13,8 @@ COMMENT= Graphical RFC viewer
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= qmake tar:tgz
-USE_QT4= gui network corelib uic_build moc_build rcc_build
+USES= qmake qt:4 tar:tgz
+USE_QT= gui network corelib uic_build moc_build rcc_build
SUB_FILES= qRFCView
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index 3eb014623091..1b434af6a6da 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -12,8 +12,8 @@ COMMENT= Blog management application based on Qt 4
LICENSE= GPLv2 # only
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake tar:bzip2 ssl
-USE_QT4= corelib dbus gui network xml \
+USES= cmake qt:4 tar:bzip2 ssl
+USE_QT= corelib dbus gui network xml \
moc_build qmake_build rcc_build uic_build
CMAKE_ARGS= -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
-DMANPAGE_DIRECTORY:STRING="${MANPREFIX}/man/man1" \
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 5417f0d2416f..06937b1957eb 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -55,13 +55,13 @@ KONQUEROR_RUN_DEPENDS= kwebkitpart>0:www/kwebkitpart
LATEX_USE= tex=dvipsk:run,latex:run
PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils
PS_RUN_DEPENDS= pstotext:print/pstotext
-QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \
- qt4=iconengines_run,imageformats_run \
- qt4=corelib,gui,xml,webkit
+QT4_USES= qmake:no_env qt:4
+QT4_USE= qt=moc_build,qmake_build,rcc_build,uic_build \
+ qt=iconengines_run,imageformats_run \
+ qt=corelib,gui,xml,webkit
QT4_CONFIGURE_ENABLE= qtgui
QT4_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
QTDIR="${PREFIX}"
-QT4_VARS= QT_NONSTANDARD=yes
SOUND_RUN_DEPENDS= mutagen-pony:audio/py-mutagen@${PY_FLAVOR} \
pykaraoke:audio/py-karaoke@${PY_FLAVOR}
X11MON_DESC= X11 session monitoring support
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 02123a5046e6..3f59441e9cdd 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -12,14 +12,13 @@ COMMENT= KDE mind mapping tool
LICENSE= GPLv3
-USES= kde:4 pkgconfig python:2.7 shebangfix tar:bzip2 waf \
+USES= kde:4 pkgconfig python:2.7 qmake:no_env,no_configure qt:4 shebangfix tar:bzip2 waf \
gettext shared-mime-info
USE_KDE= kdelibs
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_QT4= corelib gui linguist_build svg webkit xml \
+USE_QT= corelib gui linguist_build svg webkit xml \
moc_build qmake_build uic_build
-QT_NONSTANDARD= yes
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" \
PATH="${KDE_PREFIX}/bin:$$PATH" \
WAF_HOME="${WRKSRC}"
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index a938b072bf08..56429f35ef86 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate-kde4
-USES= cmake kde:4
+USES= cmake kde:4 qt:4
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build rcc_build uic_build linguisttools_build
+USE_QT= qmake_build moc_build rcc_build uic_build linguisttools_build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/deskutils/strigiclient/Makefile b/deskutils/strigiclient/Makefile
index 04f818a9ab2e..257ae5de8e8a 100644
--- a/deskutils/strigiclient/Makefile
+++ b/deskutils/strigiclient/Makefile
@@ -13,7 +13,8 @@ LIB_DEPENDS= libstreams.so:deskutils/libstreams \
libstreamanalyzer.so:deskutils/libstreamanalyzer \
libsearchclient.so:deskutils/strigidaemon
-USE_QT4= corelib gui dbus moc_build uic_build qmake_build rcc_build
+USES= qt:4
+USE_QT= corelib gui dbus moc_build uic_build qmake_build rcc_build
USE_LDCONFIG= yes
.include <${.CURDIR}/../strigi/Makefile.common>
diff --git a/deskutils/superkaramba-kde4/Makefile b/deskutils/superkaramba-kde4/Makefile
index 76d62734daa2..eaf8b41d2203 100644
--- a/deskutils/superkaramba-kde4/Makefile
+++ b/deskutils/superkaramba-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Widget framework for KDE
-USES= cmake:outsource kde:4 python:2.7 tar:xz
+USES= cmake:outsource kde:4 python:2.7 qt:4 tar:xz
USE_KDE= kdelibs automoc4 qimageblitz
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
USE_CXXSTD= gnu++98
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index fb24bec88f9d..0c66985aa066 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -11,8 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for managing notes within a hierarchical tree
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= qmake
-USE_QT4= gui xml moc_build uic_build rcc_build
+USES= qmake qt:4
+USE_QT= gui xml moc_build uic_build rcc_build
PLIST_FILES= bin/tuxcards
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 84ac5b2a02cf..16e6e93e5e5f 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= SF/vym/Archive/${PORTVERSION}
MAINTAINER= lichray@gmail.com
COMMENT= VYM is a tool to generate and manipulate mind maps
-USES= qmake shebangfix tar:bzip2
+USES= qmake qt:4 shebangfix tar:bzip2
SHEBANG_FILES= scripts/makedist-vym scripts/vivym
-USE_QT4= uic_build moc_build qt3support_build \
+USE_QT= uic_build moc_build qt3support_build \
network xml dbus svg
QMAKE_ARGS= DATADIR=${DATADIR:C,/vym$,,} \
DOCDIR=${DOCSDIR}
@@ -28,7 +28,8 @@ DESKTOP_ENTRIES= "VYM" \
OPTIONS_DEFINE= NLS DOCS
OPTIONS_SUB= yes
-NLS_USE= QT4=linguist_build
+NLS_USES= qt:4
+NLS_USE= QT=linguist_build
.include <bsd.port.options.mk>
diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
index 4315079a7980..ba0492191d6a 100644
--- a/deskutils/znotes/Makefile
+++ b/deskutils/znotes/Makefile
@@ -24,9 +24,11 @@ GH_PROJECT= zNotes
GH_TAGNAME= 6423c5e
. if ${FLAVOR} == qt4
-USE_QT4= uic_build moc_build rcc_build linguisttools_build corelib gui network xml
+USES+= qt:4
+USE_QT= uic_build moc_build rcc_build linguisttools_build corelib gui network xml
. else
-USE_QT5= buildtools_build linguisttools_build core gui network printsupport widgets xml
+USES+= qt:5
+USE_QT= buildtools_build linguisttools_build core gui network printsupport widgets xml
. endif
DESKTOP_ENTRIES="zNotes" "Notes managment" \
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index 0bd285b912d2..e54a35222f4f 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -28,8 +28,8 @@ LIB_DEPENDS= libR.so:math/R \
libinotify.so:devel/libinotify \
libuuid.so:misc/e2fsprogs-libuuid
-USES= cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info ssl
-USE_QT5= core dbus gui location network opengl printsupport qml quick sensors \
+USES= cmake:outsource desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl
+USE_QT= core dbus gui location network opengl printsupport qml quick sensors \
sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
USE_JAVA= yes
JAVA_BUILD= yes
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index 89f6f9681b01..aed55fc03569 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -46,7 +46,8 @@ OPTIONS_SUB= yes
FLTK_DESC= FLTK GUI toolkit
FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
FLTK_MAKE_ENV= fl=1
-QT4_USE= QT4=corelib,gui,moc_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,moc_build
QT4_MAKE_ENV= qt=1 qt4=1 QTDIR="${PREFIX}"
QT4_CPPFLAGS= -I${QT_INCDIR}
QT4_LDFLAGS= -L${QT_LIBDIR}
diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile
index 6ee5f97c7ee2..136140ea247e 100644
--- a/devel/apiextractor/Makefile
+++ b/devel/apiextractor/Makefile
@@ -17,9 +17,9 @@ USE_GITHUB= yes
GH_ACCOUNT= PySide
GH_PROJECT= Apiextractor
-USES= cmake
+USES= cmake qt:4
USE_GNOME= libxml2 libxslt
-USE_QT4= gui moc_build qmake_build qtestlib_build \
+USE_QT= gui moc_build qmake_build qtestlib_build \
rcc_build uic_build xml xmlpatterns
USE_LDCONFIG= yes
diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile
index a2f3883c35bc..2ebf4919d40c 100644
--- a/devel/apitrace/Makefile
+++ b/devel/apitrace/Makefile
@@ -24,7 +24,8 @@ OPTIONS_DEFAULT= QT5
OPTIONS_SUB= yes
QT5_CMAKE_BOOL= ENABLE_GUI
-QT5_USE= qt5=core,gui,network,widgets,buildtools_build,qmake_build
+QT5_USES= qt:5
+QT5_USE= qt=core,gui,network,widgets,buildtools_build,qmake_build
post-install:
${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
diff --git a/devel/automoc4/Makefile b/devel/automoc4/Makefile
index 15d3f8a0ce2a..e30f42f3a5fb 100644
--- a/devel/automoc4/Makefile
+++ b/devel/automoc4/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Automatic moc for Qt 4 packages
-USE_QT4= corelib moc qmake_build rcc_build uic_build
-USES= cmake tar:bzip2
+USE_QT= corelib moc qmake_build rcc_build uic_build
+USES= cmake qt:4 tar:bzip2
.include <bsd.port.mk>
diff --git a/devel/cervisia-kde4/Makefile b/devel/cervisia-kde4/Makefile
index 93f379e7b375..816a7cc6d8da 100644
--- a/devel/cervisia-kde4/Makefile
+++ b/devel/cervisia-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= CVS Frontend for KDE
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 513720982ffb..5691a815de28 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= devel kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= CVS Frontend for KDE
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= dbusaddons doctools ecm iconthemes init itemviews kdesu \
notifications parts widgetsaddons
-USE_QT5= core dbus gui widgets \
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index b5f89c7d4b2f..af5c2c65422f 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -17,8 +17,8 @@ BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo
NO_ARCH= yes
-USES= cmake:outsource
-USE_QT5= help_build
+USES= cmake:outsource qt:5
+USE_QT= help_build
CMAKE_OFF= SPHINX_MAN
CMAKE_ON= SPHINX_HTML SPHINX_QTHELP
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 942fb15197dc..35473fdc5f05 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libuv.so:devel/libuv \
librhash.so:security/rhash
-USE_QT5= core gui widgets buildtools_build qmake_build
+USE_QT= core gui widgets buildtools_build qmake_build
USES= cmake:run desktop-file-utils libarchive \
- shared-mime-info
+ qt:5 shared-mime-info
CMAKE_OFF= BUILD_CursesDialog \
CMake_SPHINX_DEPEND_ON_EXECUTABLES
CMAKE_ON= BUILD_QtDialog \
diff --git a/devel/codequery/Makefile b/devel/codequery/Makefile
index ffefda493b19..93a8e65cfe99 100644
--- a/devel/codequery/Makefile
+++ b/devel/codequery/Makefile
@@ -14,12 +14,12 @@ LICENSE_COMB= multi
LICENSE_FILE_MPL20= ${WRKSRC}/LICENSE.md
LICENSE_FILE_MIT= ${WRKSRC}/querylib/README.txt
-USES= cmake compiler:c++11-lang ninja sqlite
+USES= cmake compiler:c++11-lang ninja qt:4 sqlite
USE_GITHUB= yes
GH_ACCOUNT= ruben2020
-USE_QT4= linguisttools_build moc_build rcc_build uic_build \
+USE_QT= linguisttools_build moc_build rcc_build uic_build \
corelib gui qmake xml
PLIST_FILES= bin/codequery \
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 7835ff6dbfce..ffb076ad49c9 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -21,7 +21,8 @@ COMMENT= Static analysis of C/C++ code (GUI)
RUN_DEPENDS= cppcheck:devel/cppcheck
CMAKE_ARGS= -DBUILD_GUI=TRUE
-USE_QT5= core gui widgets printsupport qmake_build buildtools_build linguisttools_build
+USES+= qt:5
+USE_QT= core gui widgets printsupport qmake_build buildtools_build linguisttools_build
BUILD_WRKSRC= ${WRKSRC}/gui
INSTALL_WRKSRC= ${WRKSRC}/gui
diff --git a/devel/dolphin-plugins-kde4/Makefile b/devel/dolphin-plugins-kde4/Makefile
index 495e3f382b48..4e89eeef2de2 100644
--- a/devel/dolphin-plugins-kde4/Makefile
+++ b/devel/dolphin-plugins-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Plugins for Dolphin file manager
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs libkonq automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins/Makefile
index 8c9f1ab6b08c..420c57209111 100644
--- a/devel/dolphin-plugins/Makefile
+++ b/devel/dolphin-plugins/Makefile
@@ -10,13 +10,13 @@ COMMENT= Plugins for Dolphin file manager
BUILD_DEPENDS= dolphin:x11-fm/dolphin
RUN_DEPENDS= dolphin:x11-fm/dolphin
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews jobwidgets \
kdelibs4support kio notifications parts service solid sonnet \
texteditor textwidgets unitconversion widgetsaddons \
windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml \
+USE_QT= core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index de198bdcb1be..28340d3bd462 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -50,11 +50,13 @@ GRAPHVIZ_RUN_DEPENDS= dot:graphics/graphviz
LATEX_USE= TEX=base,dvipsk,pdftex
-QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build
QT4_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true -Dforce_qt4:BOOLEAN=true
QT4_PLIST_FILES= bin/doxywizard
-QT5_USE= QT5=core,widgets,gui,xml,qmake_build,buildtools_build
+QT5_USES= qt:5
+QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build
QT5_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true
QT5_PLIST_FILES= bin/doxywizard
diff --git a/devel/edb/Makefile b/devel/edb/Makefile
index 79736b328d2d..459845b88484 100644
--- a/devel/edb/Makefile
+++ b/devel/edb/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= qmake tar:tgz
-USE_QT4= gui network xml moc_build rcc_build uic_build
+USES= qmake qt:4 tar:tgz
+USE_QT= gui network xml moc_build rcc_build uic_build
QMAKE_ARGS= DEFAULT_PLUGIN_PATH="${PREFIX}/libexec/${PORTNAME}"
WRKSRC= ${WRKDIR}/debugger
diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile
index 307f60912e22..196e62adae8e 100644
--- a/devel/fuel/Makefile
+++ b/devel/fuel/Makefile
@@ -19,8 +19,10 @@ OPTIONS_SINGLE_GUI= QT4 QT5
OPTIONS_DEFAULT= QT5
USES= qmake shebangfix
-QT4_USE= QT4=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build
-QT5_USE= QT5=core,gui,network,webkit,widgets,buildtools_build,linguisttools_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build
+QT5_USES= qt:5
+QT5_USE= QT=core,gui,network,webkit,widgets,buildtools_build,linguisttools_build
SHEBANG_FILES= intl/convert.sh
PLIST_FILES= bin/fuel share/applications/fuel.desktop \
diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index 904cf7077739..9cb737dcd310 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -46,7 +46,8 @@ OPTIONS_DEFINE= GIST
OPTIONS_SUB= yes
GIST_DESC= Interactive Search Tool (requires Qt)
-GIST_USE= QT4=corelib,gui,moc_build,qmake_build
+GIST_USES= qt:4
+GIST_USE= QT=corelib,gui,moc_build,qmake_build
GIST_CONFIGURE_ON= --enable-gist --enable-qt
GIST_CONFIGURE_OFF= --disable-gist --disable-qt
diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile
index 62fd691679c8..c9b25798a806 100644
--- a/devel/generatorrunner/Makefile
+++ b/devel/generatorrunner/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS= libapiextractor.so:devel/apiextractor
PLIST_SUB= PORTVERSION=${PORTVERSION}
-USE_QT4= gui qmake_build qtestlib moc_build rcc_build uic_build xml
+USE_QT= gui qmake_build qtestlib moc_build rcc_build uic_build xml
-USES= cmake
+USES= cmake qt:4
USE_GITHUB= yes
USE_LDCONFIG= yes
diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index e85161967560..39037ecb5d0c 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -15,9 +15,9 @@ LICENSE= LGPL21
PORTSCOUT= limit:^0\.
-USE_QT4= corelib gui qtestlib_build script \
+USE_QT= corelib gui qtestlib_build script \
qmake_build moc_build rcc_build uic_build
-USES= cmake:outsource grantlee:4,selfbuild
+USES= cmake:outsource grantlee:4,selfbuild qt:4
CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE
USE_LDCONFIG= yes
diff --git a/devel/grantlee5/Makefile b/devel/grantlee5/Makefile
index 38bca3da48e9..2bfd1c0ba151 100644
--- a/devel/grantlee5/Makefile
+++ b/devel/grantlee5/Makefile
@@ -15,8 +15,8 @@ LICENSE= LGPL21
PORTSCOUT= limit:^5\.
-USE_QT5= buildtools_build core gui qmake_build script
-USES= cmake:outsource compiler:c++11-lib grantlee:5,selfbuild
+USE_QT= buildtools_build core gui qmake_build script
+USES= cmake:outsource compiler:c++11-lib grantlee:5,selfbuild qt:5
CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE
USE_LDCONFIG= yes
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 6c6175e4d43b..d471a3e04614 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -59,17 +59,17 @@ USE_GNOME+= cairo gdkpixbuf2 gtk20
. elif ${SLAVEPORT}=="gtk3"
USE_GNOME+= cairo gdkpixbuf2 gtk30
. elif ${SLAVEPORT}=="qt4"
-USE_QT4= corelib gui moc_build uic_build
-QT_NONSTANDARD= yes
+USES+= qmake:no_env qt:4
+USE_QT= corelib gui moc_build uic_build
CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \
--with-qt4-libs=${QT_LIBDIR} \
--with-qt4-moc=${MOC} \
--with-qt4-uic=${UIC}
. elif ${SLAVEPORT}=="qt5"
+USES+= qmake:no_env qt:5
USE_GL= gl
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
-QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \
--with-qt5-moc=${MOC} \
--with-qt5-uic=${UIC}
diff --git a/devel/heimdall/Makefile b/devel/heimdall/Makefile
index 4631b84cefe1..daddf86273fa 100644
--- a/devel/heimdall/Makefile
+++ b/devel/heimdall/Makefile
@@ -19,7 +19,8 @@ OPTIONS_DEFINE= DOCS GUI
OPTIONS_DEFAULT=GUI
OPTIONS_SUB= yes
-GUI_USE= QT5=buildtools_build,core,gui,qmake_build,widgets
+GUI_USES= qt:5
+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 453536027192..2645c2d102c8 100644
--- a/devel/injeqt/Makefile
+++ b/devel/injeqt/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= vogel
-USES= cmake compiler:c++11-lib pathfix
-USE_QT5= core buildtools_build qmake_build testlib_build
+USES= cmake compiler:c++11-lib pathfix qt:5
+USE_QT= core buildtools_build qmake_build testlib_build
USE_LDCONFIG= yes
CMAKE_ARGS= -DDISABLE_EXAMPLES:BOOL=ON \
diff --git a/devel/kapptemplate-kde4/Makefile b/devel/kapptemplate-kde4/Makefile
index 77b8e0eaf96f..06839e1dd2bc 100644
--- a/devel/kapptemplate-kde4/Makefile
+++ b/devel/kapptemplate-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE template generator
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build \
+USE_QT= moc_build qmake_build rcc_build uic_build \
corelib dbus declarative
.include <bsd.port.mk>
diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile
index 588771687567..c5504a4f2ca0 100644
--- a/devel/kapptemplate/Makefile
+++ b/devel/kapptemplate/Makefile
@@ -10,10 +10,10 @@ COMMENT= KDE template generator
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth archive codecs completion config configwidgets coreaddons \
doctools ecm i18n jobwidgets kio newstuff service widgetsaddons
-USE_QT5= core gui network testlib widgets xml \
+USE_QT= core gui network testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 09ba35669fa5..1325edbfce4a 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -12,8 +12,8 @@ COMMENT= Tool for building/running Qt GUIs for command line programs
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:tgz
-USE_QT4= qt3support moc_build
+USES= qmake qt:4 tar:tgz
+USE_QT= qt3support moc_build
INFO= kaptain
PORTDOCS= *
diff --git a/devel/kcachegrind-kde4/Makefile b/devel/kcachegrind-kde4/Makefile
index 14d291c82494..47d380042488 100644
--- a/devel/kcachegrind-kde4/Makefile
+++ b/devel/kcachegrind-kde4/Makefile
@@ -9,9 +9,9 @@ CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Profiler frontend for KDE
-USES= cmake:outsource kde:4 python:run tar:xz shebangfix
+USES= cmake:outsource kde:4 python:run qt:4 tar:xz shebangfix
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build \
+USE_QT= moc_build qmake_build rcc_build uic_build \
corelib dbus gui
SHEBANG_FILES= converters/op2calltree converters/dprof2calltree \
converters/memprof2calltree \
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index dd48e795b30e..d3ccc6416c65 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= devel kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Profiler frontend for KDE
-USES= cmake:outsource kde:5 python:run shebangfix tar:xz
+USES= cmake:outsource kde:5 python:run qt:5 shebangfix tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio service solid \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network widgets xml \
+USE_QT= core dbus gui network widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= converters/hotshot2calltree.cmake \
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index d4eab7ff834f..38af022ec439 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -12,9 +12,9 @@ COMMENT= Graphical user interface around gdb using KDE
LICENSE= GPLv2
-USES= cmake kde:4
+USES= cmake kde:4 qt:4
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build network xml dbus corelib gui svg
+USE_QT= moc_build qmake_build rcc_build uic_build network xml dbus corelib gui svg
INSTALLS_ICONS= yes
OPTIONS_DEFINE= NLS
diff --git a/devel/kde-dev-scripts-kde4/Makefile b/devel/kde-dev-scripts-kde4/Makefile
index bf88ecf561ba..883209a1ff3b 100644
--- a/devel/kde-dev-scripts-kde4/Makefile
+++ b/devel/kde-dev-scripts-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development scripts
-USES= cmake:outsource kde:4 python:run shebangfix tar:xz
+USES= cmake:outsource kde:4 python:run qt:4 shebangfix tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
SHEBANG_FILES= cxxmetric \
draw_lib_dependencies \
diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts/Makefile
index 78e12fa1de9a..3199d8b1567e 100644
--- a/devel/kde-dev-scripts/Makefile
+++ b/devel/kde-dev-scripts/Makefile
@@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development scripts
-USES= cmake:outsource kde:5 perl5 python:run shebangfix tar:xz
+USES= cmake:outsource kde:5 perl5 python:run qt:5 shebangfix tar:xz
USE_KDE= doctools ecm
-USE_QT5= buildtools_build qmake_build
+USE_QT= buildtools_build qmake_build
SHEBANG_FILES= cxxmetric \
draw_lib_dependencies \
diff --git a/devel/kde-dev-utils-kde4/Makefile b/devel/kde-dev-utils-kde4/Makefile
index 3e8db9097bb0..d36a7dd2843b 100644
--- a/devel/kde-dev-utils-kde4/Makefile
+++ b/devel/kde-dev-utils-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development utilities
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build \
+USE_QT= moc_build qmake_build rcc_build uic_build \
corelib designer gui qt3support xml
.include <bsd.port.mk>
diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils/Makefile
index cf213fcf1096..387135580419 100644
--- a/devel/kde-dev-utils/Makefile
+++ b/devel/kde-dev-utils/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= devel kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development utilities
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio parts service \
solid sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus designer gui network widgets xml \
+USE_QT= core dbus designer gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/devel/kdesdk-kioslaves-kde4/Makefile b/devel/kdesdk-kioslaves-kde4/Makefile
index 4ca111d6d86b..262b98f9fbe9 100644
--- a/devel/kdesdk-kioslaves-kde4/Makefile
+++ b/devel/kdesdk-kioslaves-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT= SDK related KIO slaves
LIB_DEPENDS= libsvn_client-1.so:devel/subversion
-USES= cmake:outsource kde:4 perl5 shebangfix tar:xz
+USES= cmake:outsource kde:4 perl5 qt:4 shebangfix tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
SHEBANG_FILES= perldoc/pod2html.pl
diff --git a/devel/kdesdk-strigi-analyzers-kde4/Makefile b/devel/kdesdk-strigi-analyzers-kde4/Makefile
index c1d25cf68a36..7ca4f9dbff4b 100644
--- a/devel/kdesdk-strigi-analyzers-kde4/Makefile
+++ b/devel/kdesdk-strigi-analyzers-kde4/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX= -kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Strigi analyzers for SDK related file formats
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 strigi
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/devel/kdesdk-thumbnailers-kde4/Makefile b/devel/kdesdk-thumbnailers-kde4/Makefile
index cd7bcf798deb..9a1a29b0cfca 100644
--- a/devel/kdesdk-thumbnailers-kde4/Makefile
+++ b/devel/kdesdk-thumbnailers-kde4/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX= -kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE thumbnail generator for gettext po files
-USES= cmake:outsource gettext kde:4 tar:xz
+USES= cmake:outsource gettext kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/devel/kdesdk-thumbnailers/Makefile b/devel/kdesdk-thumbnailers/Makefile
index 1cf1c76650aa..403cfebe21c6 100644
--- a/devel/kdesdk-thumbnailers/Makefile
+++ b/devel/kdesdk-thumbnailers/Makefile
@@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE thumbnail generator for gettext po files
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config ecm i18n kio
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile
index d91ad6584e75..dea801ab2eea 100644
--- a/devel/kdesdk/Makefile
+++ b/devel/kdesdk/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel kde
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Software Development Kit
-USES= kde:5 metaport
-USE_QT5= #
+USES= kde:5 metaport qt:5
+USE_QT= #
OPTIONS_DEFINE= CERVISIA \
DEVUTILS \
@@ -24,7 +24,7 @@ OPTIONS_DEFINE= CERVISIA \
THUMBNAILER \
UMBRELLO
-# Remove dolphin from the default list, as it conflicts with the metaport x11/kde4
+# Remove dolphin from the default list, as it conflicts with the metaport qt:5 x11/kde4
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NDOLPHIN}
CERVISIA_DESC= CVS frontend
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 5f65a2ba5af4..af9654b66424 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -25,10 +25,10 @@ CONFLICTS= kdesvn-2.* \
CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
-DMAN_INSTALL_DIR=${MANPREFIX}/man
-USES= cmake:outsource compiler:c11 bdb kde:4 tar:xz
+USES= cmake:outsource compiler:c11 bdb kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs soprano baseapps_run
USE_LDCONFIG= yes
-USE_QT4= corelib gui xml network dbus svg sql \
+USE_QT= corelib gui xml network dbus svg sql \
qmake_build moc_build rcc_build uic_build linguist_build
OPTIONS_DEFINE= DOCS NLS
diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
index 19b90d6190e3..eed4668c48bb 100644
--- a/