aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2018-06-28 17:39:53 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2018-06-28 17:39:53 +0000
commitb1a1d38bf9ef78334b640d30046388a9c055c3a9 (patch)
tree7b9785f1f0c244da1f5b69a2a610e3f37eb786a8 /sysutils
parentbc77780d41178cf3d0327c79ac10737af704f236 (diff)
downloadports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.tar.gz
ports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.zip
Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk
From now on, ports that depend on Qt4 will have to set USES= qt:4 USE_QT= foo bar ports depending on Qt5 will use USES= qt:5 USE_QT= foo bar PR: 229225 Exp-run by: antoine Reviewed by: mat Approved by: portmgr (antoine) Differential Revision: →https://reviews.freebsd.org/D15540
Notes
Notes: svn path=/head/; revision=473503
Diffstat (limited to 'sysutils')
-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
82 files changed, 174 insertions, 171 deletions
diff --git a/sysutils/UEFITool/Makefile b/sysutils/UEFITool/Makefile
index 62f02349f4c4..b33441fea32c 100644
--- a/sysutils/UEFITool/Makefile
+++ b/sysutils/UEFITool/Makefile
@@ -12,11 +12,11 @@ COMMENT= UEFI images parser
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/../LICENSE.md
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_GITHUB= yes
GH_ACCOUNT= LongSoft
USE_GL= gl
-USE_QT5= core gui widgets buildtools_build qmake_build
+USE_QT= core gui widgets buildtools_build qmake_build
WRKSRC_SUBDIR= ${PORTNAME}
diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
index c5da45c02da1..36d7db0f48b8 100644
--- a/sysutils/android-file-transfer/Makefile
+++ b/sysutils/android-file-transfer/Makefile
@@ -45,11 +45,13 @@ QT_PLIST_FILES= bin/android-file-transfer \
share/icons/hicolor/512x512/apps/android-file-transfer.png \
share/metainfo/android-file-transfer.appdata.xml
-QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,corelib,gui
+QT4_USES= qt:4
+QT4_USE= QT=qmake_build,moc_build,rcc_build,uic_build,corelib,gui
QT4_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=4
QT4_IMPLIES= QT
-QT5_USE= QT5=qmake_build,buildtools_build,core,gui,widgets
+QT5_USES= qt:5
+QT5_USE= QT=qmake_build,buildtools_build,core,gui,widgets
QT5_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=5
QT5_IMPLIES= QT
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index daf04f36a6bb..493f92bc2595 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -9,8 +9,8 @@ COMMENT= Network backup solution (GUI)
LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
libbac.so:sysutils/bacula-client
-USES= pkgconfig
-USE_QT4= qmake_build uic_build moc_build rcc_build
+USES= pkgconfig qt:4
+USE_QT= qmake_build uic_build moc_build rcc_build
WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/sysutils/bacula9-bat/Makefile b/sysutils/bacula9-bat/Makefile
index c6da4c4f4f5e..7ee3e1f4e800 100644
--- a/sysutils/bacula9-bat/Makefile
+++ b/sysutils/bacula9-bat/Makefile
@@ -9,8 +9,8 @@ COMMENT= Network backup solution (GUI)
LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
libbac.so:sysutils/bacula9-client
-USES= pkgconfig
-USE_QT4= qmake_build uic_build moc_build rcc_build
+USES= pkgconfig qt:4
+USE_QT= qmake_build uic_build moc_build rcc_build
WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/sysutils/baloo-kde4/Makefile b/sysutils/baloo-kde4/Makefile
index 51a15e067eb9..eb402fd99b1f 100644
--- a/sysutils/baloo-kde4/Makefile
+++ b/sysutils/baloo-kde4/Makefile
@@ -14,10 +14,10 @@ CONFLICTS_INSTALL= kde-runtime-4.12.* \
LIB_DEPENDS= libxapian.so:databases/xapian-core \
libqjson.so:devel/qjson@qt4
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= akonadi automoc4 kdelibs kfilemetadata \
pimlibs
-USE_QT4= corelib qmake_build moc_build rcc_build uic_build
+USE_QT= corelib qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/sysutils/baloo-widgets-kde4/Makefile b/sysutils/baloo-widgets-kde4/Makefile
index 7b0383190845..f67592ce09fc 100644
--- a/sysutils/baloo-widgets-kde4/Makefile
+++ b/sysutils/baloo-widgets-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= The BalooWidgets library
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 baloo kfilemetadata
-USE_QT4= corelib qmake_build moc_build rcc_build uic_build
+USE_QT= corelib qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
index 112e0ebb025e..bc9a3e3b73c6 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= BalooWidgets library
-USES= cmake:outsource compiler:c++11-lang gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= baloo completion config coreaddons ecm emoticons filemetadata \
i18n init itemmodels jobwidgets kdelibs4support kio service \
widgetsaddons
-USE_QT5= core gui network testlib widgets xml \
+USE_QT= core gui network testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile
index 97c9fc5688a2..c8bd2369acee 100644
--- a/sysutils/bareos-traymonitor/Makefile
+++ b/sysutils/bareos-traymonitor/Makefile
@@ -12,8 +12,8 @@ LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
CONFLICTS= bacula*-bat-* bareos16-traymonitor-*
-USES= pkgconfig gettext-runtime desktop-file-utils
-USE_QT4= qmake_build uic_build moc_build rcc_build gui corelib
+USES= pkgconfig gettext-runtime desktop-file-utils qt:4
+USE_QT= qmake_build uic_build moc_build rcc_build gui corelib
WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/sysutils/bareos16-bat/Makefile b/sysutils/bareos16-bat/Makefile
index 0045294a31bf..be5b4df4b795 100644
--- a/sysutils/bareos16-bat/Makefile
+++ b/sysutils/bareos16-bat/Makefile
@@ -11,8 +11,8 @@ LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
CONFLICTS= bacula*-bat-*
-USES= pkgconfig desktop-file-utils
-USE_QT4= qmake_build uic_build moc_build rcc_build
+USES= pkgconfig desktop-file-utils qt:4
+USE_QT= qmake_build uic_build moc_build rcc_build
WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/sysutils/bareos16-traymonitor/Makefile b/sysutils/bareos16-traymonitor/Makefile
index f0356159ef31..5fa013d555e0 100644
--- a/sysutils/bareos16-traymonitor/Makefile
+++ b/sysutils/bareos16-traymonitor/Makefile
@@ -12,8 +12,8 @@ LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
CONFLICTS= bacula*-bat-* bareos-traymonitor-*
-USES= pkgconfig gettext-runtime desktop-file-utils
-USE_QT4= qmake_build uic_build moc_build rcc_build gui corelib
+USES= pkgconfig gettext-runtime desktop-file-utils qt:4
+USE_QT= qmake_build uic_build moc_build rcc_build gui corelib
WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile
index cea2d57a493a..6a986af2fce4 100644
--- a/sysutils/bsdisks/Makefile
+++ b/sysutils/bsdisks/Makefile
@@ -11,8 +11,8 @@ COMMENT= UDisks2 service implementation for FreeBSD
LICENSE= BSD3CLAUSE
-USES= cmake compiler:c++11-lang
+USES= cmake compiler:c++11-lang qt:5
-USE_QT5= qmake_build buildtools_build core dbus
+USE_QT= qmake_build buildtools_build core dbus
.include <bsd.port.mk>
diff --git a/sysutils/dsbbatmon/Makefile b/sysutils/dsbbatmon/Makefile
index 921d2adea1ad..d414090a544a 100644
--- a/sysutils/dsbbatmon/Makefile
+++ b/sysutils/dsbbatmon/Makefile
@@ -11,9 +11,9 @@ COMMENT= Qt battery monitor
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
.include <bsd.port.mk>
diff --git a/sysutils/dsblogoutmgr/Makefile b/sysutils/dsblogoutmgr/Makefile
index ca355c3a06cb..5b9391b330cc 100644
--- a/sysutils/dsblogoutmgr/Makefile
+++ b/sysutils/dsblogoutmgr/Makefile
@@ -11,9 +11,9 @@ COMMENT= Graphical logout manager
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
.include <bsd.port.mk>
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 6d2756479514..019d21dcc53c 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -12,8 +12,8 @@ COMMENT= Map of concentric segmented-rings representing file system
CONFLICTS_INSTALL= ${PORTNAME}
-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/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 7e7118ecacab..1bc3d26ac58c 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -12,11 +12,11 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-
CONFLICTS_INSTALL= ${PORTNAME}-kde4*
-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= auth codecs completion config configwidgets coreaddons doctools \
ecm i18n jobwidgets kio parts service solid sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network script widgets xml \
+USE_QT= core dbus gui network script widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/glogg/Makefile b/sysutils/glogg/Makefile
index 766b0ce19ef6..c31d3b52116b 100644
--- a/sysutils/glogg/Makefile
+++ b/sysutils/glogg/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_program_options.so:devel/boost-libs
-USES= qmake desktop-file-utils
-USE_QT5= core gui widgets dbus buildtools_build
+USES= qmake desktop-file-utils qt:5
+USE_QT= core gui widgets dbus buildtools_build
LDFLAGS+= -Wl,--as-needed # prevents stray USE_GL=gl, see bug#224488
PLIST_FILES= bin/glogg \
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 4f7d311a91fc..a967d73e23e4 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -17,11 +17,11 @@ LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia \
RUN_DEPENDS= cdrecord:sysutils/cdrtools
BUILD_DEPENDS= cdrecord:sysutils/cdrtools
-USES= cmake gettext kde:4 pkgconfig shared-mime-info tar:xz
+USES= cmake gettext kde:4 pkgconfig qt:4 shared-mime-info tar:xz
CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \
-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
USE_KDE= automoc4 kdelibs libkcddb
-USE_QT4= gui phonon qt3support webkit \
+USE_QT= gui phonon qt3support webkit \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 250c84d0a019..0ce6732cce77 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -23,13 +23,13 @@ RUN_DEPENDS= cdrecord:sysutils/cdrtools
BUILD_DEPENDS= cdrecord:sysutils/cdrtools
USES= cmake:outsource desktop-file-utils gettext iconv kde:5 pkgconfig \
- shared-mime-info tar:xz
+ qt:5 shared-mime-info tar:xz
USE_KDE= archive attica auth bookmarks codecs completion config \
configwidgets coreaddons ecm filemetadata i18n iconthemes \
itemviews jobwidgets kcmutils kio newstuff notifications \
notifyconfig service solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network webkit widgets xml \
+USE_QT= core dbus gui network webkit widgets xml \
buildtools_build qmake_build
# The ffmpeg-plugin needs patching
diff --git a/sysutils/kbackup/Makefile b/sysutils/kbackup/Makefile
index ae3761a94ac0..5a26f720ba51 100644
--- a/sysutils/kbackup/Makefile
+++ b/sysutils/kbackup/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Backup program with an easy to use user interface
-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 ecm i18n iconthemes itemviews jobwidgets kio \
notifications service solid widgetsaddons 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/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile
index 1c9ee5308388..5ac2a80bb5a6 100644
--- a/sysutils/kcm-polkit-kde/Makefile
+++ b/sysutils/kcm-polkit-kde/Makefile
@@ -14,9 +14,9 @@ COMMENT= Polkit-KDE configuration module
LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt@qt4
RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde
-USES= cmake kde:4 pkgconfig tar:bzip2
+USES= cmake kde:4 pkgconfig qt:4 tar:bzip2
USE_KDE= kdelibs automoc4
-USE_QT4= dbus xml moc_build qmake_build rcc_build uic_build
+USE_QT= dbus xml moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-kcmodules-1
diff --git a/sysutils/kcron-kde4/Makefile b/sysutils/kcron-kde4/Makefile
index 7de3e5fc2858..4fce574ed14b 100644
--- a/sysutils/kcron-kde4/Makefile
+++ b/sysutils/kcron-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE task scheduler
-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/sysutils/kcron/Makefile b/sysutils/kcron/Makefile
index df6650e9188c..e2e9fe61a75b 100644
--- a/sysutils/kcron/Makefile
+++ b/sysutils/kcron/Makefile
@@ -10,11 +10,11 @@ COMMENT= KDE task scheduler
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 codecs completion config configwidgets coreaddons ecm \
doctools i18n iconthemes jobwidgets kio service widgetsaddons \
xmlgui
-USE_QT5= core gui network printsupport widgets xml \
+USE_QT= core gui network printsupport widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/kdebugsettings/Makefile b/sysutils/kdebugsettings/Makefile
index 03fe79152dde..7c034fdf1333 100644
--- a/sysutils/kdebugsettings/Makefile
+++ b/sysutils/kdebugsettings/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE application to enable/disable qCDebug
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= completion config configwidgets coreaddons dbusaddons \
ecm guiaddons i18n iconthemes itemviews kio widgetsaddons
-USE_QT5= core dbus gui testlib widgets \
+USE_QT= core dbus gui testlib widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/kdf-kde4/Makefile b/sysutils/kdf-kde4/Makefile
index b97a13f26735..6ac450e38271 100644
--- a/sysutils/kdf-kde4/Makefile
+++ b/sysutils/kdf-kde4/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Shows free space of devices 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/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 9cdc39196a6c..b0c743d4e637 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Shows free space of devices for KDE
-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 doctools \
i18n iconthemes jobwidgets kcmutils kio notifications service \
widgetsaddons 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/sysutils/kdialog/Makefile b/sysutils/kdialog/Makefile
index 59886904834d..d1d8c90a5255 100644
--- a/sysutils/kdialog/Makefile
+++ b/sysutils/kdialog/Makefile
@@ -7,13 +7,13 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Show nice dialog boxes from shell scripts
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons 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
USE_XORG= x11
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index aa1b08409000..c6c99aba2637 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -16,10 +16,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/jeromerobert-k4dirstat-3a4663ee20e7
-USES= cmake cpe gettext-tools kde:4 tar:bzip2
+USES= cmake cpe gettext-tools kde:4 qt:4 tar:bzip2
CPE_VENDOR= kdirstat_project
USE_KDE= automoc4 kdelibs libkonq
-USE_QT4= corelib dbus gui network qt3support svg xml \
+USE_QT= corelib dbus gui network qt3support svg xml \
moc_build qmake_build rcc_build uic_build
post-patch:
diff --git a/sysutils/kf5-baloo/Makefile b/sysutils/kf5-baloo/Makefile
index 26098cf8b51a..156a8bcd3a03 100644
--- a/sysutils/kf5-baloo/Makefile
+++ b/sysutils/kf5-baloo/Makefile
@@ -10,11 +10,11 @@ COMMENT= KF5 Framework for searching and managing user metadata
LIB_DEPENDS= liblmdb.so:databases/lmdb \
libinotify.so:devel/libinotify
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz
USE_KDE= auth completion config coreaddons crash dbusaddons \
filemetadata i18n idletime jobwidgets kio service \
solid widgetsaddons
-USE_QT5= buildtools_build core dbus gui network qmake_build \
+USE_QT= buildtools_build core dbus gui network qmake_build \
qml quick testlib widgets
# Frameworks ports install localization files that conflict with some
diff --git a/sysutils/kf5-kwallet/Makefile b/sysutils/kf5-kwallet/Makefile
index 3dac43894ed4..148e1548d0bf 100644
--- a/sysutils/kf5-kwallet/Makefile
+++ b/sysutils/kf5-kwallet/Makefile
@@ -15,10 +15,10 @@ LIB_DEPENDS= libassuan.so:security/libassuan \
libqgpgme.so:security/gpgme-qt5 \
libgpgmepp.so:security/gpgme-cpp
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
doctools ecm i18n iconthemes notifications service \
widgetsaddons windowsystem
-USE_QT5= buildtools_build core dbus gui qmake_build widgets xml
+USE_QT= buildtools_build core dbus gui qmake_build widgets xml
.include <bsd.port.mk>
diff --git a/sysutils/kfilemetadata-kde4/Makefile b/sysutils/kfilemetadata-kde4/Makefile
index 77b1af95b63e..93dc1146e5b1 100644
--- a/sysutils/kfilemetadata-kde4/Makefile
+++ b/sysutils/kfilemetadata-kde4/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \
libepub.so:textproc/ebook-tools \
libqmobipocket.so:graphics/kdegraphics-mobipocket-kde4
-USES= cmake:outsource kde:4 pkgconfig tar:xz
+USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= corelib qmake_build moc_build rcc_build uic_build
+USE_QT= corelib qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/sysutils/kfloppy-kde4/Makefile b/sysutils/kfloppy-kde4/Makefile
index 3748a8d837c8..91683fd0c94d 100644
--- a/sysutils/kfloppy-kde4/Makefile
+++ b/sysutils/kfloppy-kde4/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Floppy disk formatter 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/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index a9f2c7e2f6c3..391cf8321ea8 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Floppy disk formatter for KDE
-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 \
doctools ecm emoticons i18n init itemmodels kdelibs4support \
kio widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index 4dc93ca3a464..e62eb4712972 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -10,14 +10,14 @@ COMMENT= Plasma5 application to show KDE application documentation
LIB_DEPENDS= libxapian.so:databases/xapian-core
USES= cmake:outsource compiler:c++11-lib cpe gettext grantlee:5 \
- kde:5 shebangfix tar:xz
+ kde:5 qt:5 shebangfix tar:xz
USE_GNOME= libxml2
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons dbusaddons doctools ecm emoticons i18n init \
itemmodels itemviews jobwidgets js kcmutils kdelibs4support \
kio khtml 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
SHEBANG_FILES= searchhandlers/khc_mansearch.pl
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 99caa7eaa4ac..7be926ad24f8 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libqimageblitz.so:x11/qimageblitz
CONFLICTS= knutclient-0.*
-USES= cmake gettext kde:4
+USES= cmake gettext kde:4 qt:4
USE_KDE= kdelibs automoc4
-USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT= corelib gui qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index 8c4c06bdfe4c..08074a0076a4 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -17,11 +17,11 @@ LIB_DEPENDS= libtag.so:audio/taglib \
libpodofo.so:graphics/podofo \
libfreetype.so:print/freetype2
-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 i18n iconthemes itemviews jobwidgets \
js kio service solid widgetsaddons xmlgui
-USE_QT5= core dbus gui network xml widgets \
+USE_QT= core dbus gui network xml widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index f33b2aa2ead1..e0ac9c619b62 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -12,8 +12,8 @@ COMMENT= Advanced shutdown utility for KDE
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= alias cmake:outsource compiler:c++0x gettext kde:4 zip
-USE_QT4= corelib dbus gui moc_build qmake_build rcc_build svg uic_build
+USES= alias cmake:outsource compiler:c++0x gettext kde:4 qt:4 zip
+USE_QT= corelib dbus gui moc_build qmake_build rcc_build svg uic_build
USE_KDE= automoc4 kdelibs workspace
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/sysutils/ksystemlog-kde4/Makefile b/sysutils/ksystemlog-kde4/Makefile
index 2c64efa494e1..8693430d7be1 100644
--- a/sysutils/ksystemlog-kde4/Makefile
+++ b/sysutils/ksystemlog-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE system log application
-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/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile
index 3aa4204dcf8c..7c0287f757d9 100644
--- a/sysutils/ksystemlog/Makefile
+++ b/sysutils/ksystemlog/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE system log application
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= archive auth codecs completion config configwidgets coreaddons \
doctools ecm i18n iconthemes itemviews jobwidgets kio \
service sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network printsupport testlib widgets xml \
+USE_QT= core dbus gui network printsupport testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/kuser-kde4/Makefile b/sysutils/kuser-kde4/Makefile
index 4b8980bc0368..7f9df48372b6 100644
--- a/sysutils/kuser-kde4/Makefile
+++ b/sysutils/kuser-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE user manager
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs pimlibs 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/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
index c2dfaababc68..f712784bef28 100644
--- a/sysutils/luckybackup/Makefile
+++ b/sysutils/luckybackup/Makefile
@@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/license/gpl.txt
RUN_DEPENDS= rsync:net/rsync
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
-USE_QT5= core gui network widgets buildtools_build
+USE_QT= core gui network widgets buildtools_build
post-patch:
${REINPLACE_CMD} -e 's|/usr|$$$${PREFIX}|g' -e '/INSTALLS/s|debianmenu ||' \
diff --git a/sysutils/nepomuk-core-kde4/Makefile b/sysutils/nepomuk-core-kde4/Makefile
index 70eab28ac627..5df3f06a8658 100644
--- a/sysutils/nepomuk-core-kde4/Makefile
+++ b/sysutils/nepomuk-core-kde4/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \
libepub.so:textproc/ebook-tools \
libqmobipocket.so:graphics/kdegraphics-mobipocket-kde4
-USES= cmake:outsource kde:4 python:run shebangfix tar:xz
+USES= cmake:outsource kde:4 python:run qt:4 shebangfix tar:xz
USE_KDE= automoc4 baloo kdelibs kfilemetadata \
ontologies soprano
-USE_QT4= corelib dbus gui qmake_build moc_build rcc_build uic_build
+USE_QT= corelib dbus gui qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
diff --git a/sysutils/nepomuk-widgets-kde4/Makefile b/sysutils/nepomuk-widgets-kde4/Makefile
index 2e4fa5382df6..de1cfa3f4a3d 100644
--- a/sysutils/nepomuk-widgets-kde4/Makefile
+++ b/sysutils/nepomuk-widgets-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= The NepomukWidget libraries
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 soprano nepomuk-core
-USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build
+USE_QT= corelib dbus gui moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/sysutils/pc-networkmanager/Makefile b/sysutils/pc-networkmanager/Makefile
index 0298ec63fa94..d273afab51a7 100644
--- a/sysutils/pc-networkmanager/Makefile
+++ b/sysutils/pc-networkmanager/Makefile
@@ -19,10 +19,10 @@ MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
CONFLICTS= pcbsd-utils*
MAKE_JOBS_UNSAFE= yes
-USES= qmake shebangfix tar:xz
+USES= qmake qt:5 shebangfix tar:xz
SHEBANG_FILES= src/NetworkManager/resources/umts_stick
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
buildtools x11extras widgets
USE_GL+= gl
diff --git a/sysutils/pcbsd-syscache/Makefile b/sysutils/pcbsd-syscache/Makefile
index adfb9a619640..616950fc301f 100644
--- a/sysutils/pcbsd-syscache/Makefile
+++ b/sysutils/pcbsd-syscache/Makefile
@@ -11,8 +11,8 @@ COMMENT= PC-BSD SysCache Utility
LICENSE= BSD3CLAUSE
WRKSRC_SUBDIR= src-sh/syscache
-USE_QT5= core network buildtools qmake
-USES= pkgconfig
+USE_QT= core network buildtools qmake
+USES= pkgconfig qt:5
NO_BUILD= yes
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
diff --git a/sysutils/pcbsd-utils-qt5/Makefile b/sysutils/pcbsd-utils-qt5/Makefile
index 2ab23901bdbb..9a0cf1f0be41 100644
--- a/sysutils/pcbsd-utils-qt5/Makefile
+++ b/sysutils/pcbsd-utils-qt5/Makefile
@@ -29,9 +29,9 @@ CONFLICTS?= pcbsd-utils-qt4-[0-9]*
MAKE_JOBS_UNSAFE=yes
ONLY_FOR_ARCHS= amd64
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
webkit buildtools x11extras
-USES= desktop-file-utils python qmake shebangfix
+USES= desktop-file-utils python qmake qt:5 shebangfix
SHEBANG_FILES= pc-netmanager/src/NetworkManager/resources/umts_stick \
pc-sysmanager/scripts/fastest_cvsup
diff --git a/sysutils/pcbsd-utils/Makefile b/sysutils/pcbsd-utils/Makefile
index d673d42877bc..37e9242fd214 100644
--- a/sysutils/pcbsd-utils/Makefile
+++ b/sysutils/pcbsd-utils/Makefile
@@ -14,8 +14,8 @@ RUN_DEPENDS= sipcalc:net-mgmt/sipcalc \
eject:sysutils/eject
WRKSRC_SUBDIR= src-sh/pcbsd-utils
-USE_QT5= core network buildtools qmake
-USES= pkgconfig
+USE_QT= core network buildtools qmake
+USES= pkgconfig qt:5
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
USE_GITHUB= yes
diff --git a/sysutils/plasma5-discover/Makefile b/sysutils/plasma5-discover/Makefile
index daa094c15243..b500b1dcd19d 100644
--- a/sysutils/plasma5-discover/Makefile
+++ b/sysutils/plasma5-discover/Makefile
@@ -11,13 +11,13 @@ COMMENT= Plasma5 package management tools
#LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt5
USES= cmake:outsource compiler:c++11-lib cpe desktop-file-utils \
- gettext kde:5 pkgconfig tar:xz
+ gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= archive attica auth codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemmodels \
itemviews jobwidgets kdeclarative kio kirigami2 newstuff \
notifications package plasma-framework service solid \
textwidgets wallet widgetsaddons xmlgui
-USE_QT5= concurrent core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= concurrent core dbus gui network qml quick svg testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/plasma5-drkonqi/Makefile b/sysutils/plasma5-drkonqi/Makefile
index 66f06bdc14e9..84927937c236 100644
--- a/sysutils/plasma5-drkonqi/Makefile
+++ b/sysutils/plasma5-drkonqi/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 crash handler
-USES= cmake:outsource kde:5 pkgconfig tar:xz
+USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash i18n idletime jobwidgets kio notifications \
service wallet widgetsaddons xmlrpcclient
-USE_QT5= concurrent core dbus gui network widgets x11extras xml \
+USE_QT= concurrent core dbus gui network widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/plasma5-kde-cli-tools/Makefile b/sysutils/plasma5-kde-cli-tools/Makefile
index 88128e336ce6..47eeb16e154a 100644
--- a/sysutils/plasma5-kde-cli-tools/Makefile
+++ b/sysutils/plasma5-kde-cli-tools/Makefile
@@ -9,13 +9,13 @@ COMMENT= Plasma5 non-interactive system tools
CONFLICTS_INSTALL= kde-runtime-kde4
-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= activities auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm emoticons guiaddons i18n iconthemes init \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kdesu \
kio notifications parts pty service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport svg testlib widgets x11extras xml \
+USE_QT= concurrent core dbus gui network printsupport svg testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11
diff --git a/sysutils/plasma5-kinfocenter/Makefile b/sysutils/plasma5-kinfocenter/Makefile
index 8f2fcd21de2c..5ff0da57e6d7 100644
--- a/sysutils/plasma5-kinfocenter/Makefile
+++ b/sysutils/plasma5-kinfocenter/Makefile
@@ -10,7 +10,7 @@ COMMENT= Plasma5 utility providing system information
LIB_DEPENDS= libpci.so:devel/libpci
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_GL= egl gl glu
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm emoticons guiaddons \
@@ -18,7 +18,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
kdelibs4support kio notifications package parts init \
itemmodels itemviews service solid sonnet textwidgets \
unitconversion wayland wayland widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport widgets xml \
+USE_QT= concurrent core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
diff --git a/sysutils/plasma5-kmenuedit/Makefile b/sysutils/plasma5-kmenuedit/Makefile
index 6d7d4a72d6ad..ed5dc6b957cc 100644
--- a/sysutils/plasma5-kmenuedit/Makefile
+++ b/sysutils/plasma5-kmenuedit/Makefile
@@ -7,13 +7,13 @@ CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 menu editor
-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 bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons ecm emoticons hotkeys \
i18n iconthemes init itemmodels 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/sysutils/plasma5-ksysguard/Makefile b/sysutils/plasma5-ksysguard/Makefile
index b72a807c9956..753414e4b88c 100644
--- a/sysutils/plasma5-ksysguard/Makefile
+++ b/sysutils/plasma5-ksysguard/Makefile
@@ -8,13 +8,13 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 utility to track and control the running processes
USES= cmake:outsource compiler:c++11-lib cpe desktop-file-utils \
- gettext kde:5 tar:xz
+ gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
dbusaddons emoticons i18n iconthemes init itemmodels \
itemviews jobwidgets kdelibs4support kio libksysguard \
newstuff notifications service widgetsaddons windowsystem \
xmlgui
-USE_QT5= concurrent core dbus gui network widgets xml \
+USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= INOTIFY
diff --git a/sysutils/plasma5-libksysguard/Makefile b/sysutils/plasma5-libksysguard/Makefile
index f4223f4fc315..426d33a116c4 100644
--- a/sysutils/plasma5-libksysguard/Makefile
+++ b/sysutils/plasma5-libksysguard/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 library to track and control running processes
-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 completion config configwidgets coreaddons i18n \
iconthemes package plasma-framework service widgetsaddons \
windowsystem
-USE_QT5= core dbus gui network script webkit widgets x11extras xml \
+USE_QT= core dbus gui network script webkit widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/plasma5-polkit-kde-agent-1/Makefile b/sysutils/plasma5-polkit-kde-agent-1/Makefile
index 675041bf2f27..dcf0764d131f 100644
--- a/sysutils/plasma5-polkit-kde-agent-1/Makefile
+++ b/sysutils/plasma5-polkit-kde-agent-1/Makefile
@@ -9,10 +9,10 @@ COMMENT= Plasma5 daemon providing a polkit authentication UI
LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@qt5
-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= config coreaddons crash dbusaddons ecm i18n iconthemes \
notifications widgetsaddons windowsystem
-USE_QT5= core dbus gui widgets \
+USE_QT= core dbus gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/plasma5-powerdevil/Makefile b/sysutils/plasma5-powerdevil/Makefile
index beef6bff975c..4b13361be18c 100644
--- a/sysutils/plasma5-powerdevil/Makefile
+++ b/sysutils/plasma5-powerdevil/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 tool to manage the power consumption settings
-USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= activities auth bookmarks codecs completion configwidgets \
coreaddons crash config dbusaddons ecm emoticons globalaccel \
guiaddons i18n idletime iconthemes init itemmodels itemviews \
@@ -15,7 +15,7 @@ USE_KDE= activities auth bookmarks codecs completion configwidgets \
notifyconfig parts plasma-workspace service solid sonnet \
textwidgets unitconversion wayland widgetsaddons windowsystem \
xmlgui
-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= xcb
diff --git a/sysutils/plasma5-systemsettings/Makefile b/sysutils/plasma5-systemsettings/Makefile
index a4a1f753edc8..01af22f365e3 100644
--- a/sysutils/plasma5-systemsettings/Makefile
+++ b/sysutils/plasma5-systemsettings/Makefile
@@ -7,13 +7,13 @@ CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 system settings
-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= activities activities-stats auth codecs completion config \
configwidgets coreaddons crash dbusaddons doctools ecm i18n \
iconthemes itemviews jobwidgets js kcmutils kdeclarative khtml \
kio kirigami2 package parts service sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network qml quick widgets xml \
+USE_QT= concurrent core dbus gui network qml quick widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/plasma5-user-manager/Makefile b/sysutils/plasma5-user-manager/Makefile
index fdb95c00a4fc..fe7698c3f8ea 100644
--- a/sysutils/plasma5-user-manager/Makefile
+++ b/sysutils/plasma5-user-manager/Makefile
@@ -12,13 +12,13 @@ LIB_DEPENDS= libpwquality.so:security/libpwquality
RUN_DEPENDS= accountsservice>=0:sysutils/accountsservice
USES= cmake:outsource compiler:c++11-lib cpe gettext \
- kde:5 pkgconfig tar:xz
+ kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm emoticons guiaddons i18n iconthemes \
init itemmodels itemviews jobwidgets kcmutils kdelibs4support \
kio notifications parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network printsupport widgets xml \
+USE_QT= concurrent core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= ${QT_PLUGINDIR}
diff --git a/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile
index 871d0502245c..20bf49664463 100644
--- a/sysutils/policykit-qt/Makefile
+++ b/sysutils/policykit-qt/Makefile
@@ -14,9 +14,9 @@ COMMENT= PolicyKit manager for Qt
LIB_DEPENDS= libpolkit.so:sysutils/policykit
USE_LDCONFIG= yes
-USES= cmake gettext kde:4 pkgconfig tar:bzip2
+USES= cmake gettext kde:4 pkgconfig qt:4 tar:bzip2
USE_KDE= automoc4
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build
PORTSCOUT= limit:^0
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index 1ef41e463cc6..c9cc130f069b 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -15,9 +15,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt@qt4
-USES= cmake kde:4 tar:bzip2
+USES= cmake kde:4 qt:4 tar:bzip2
USE_KDE= kdelibs automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index bd0fa1e99cd0..0510e60239ec 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -26,15 +26,16 @@ CMAKE_OFF= BUILD_EXAMPLES \
BUILD_TEST
. if ${FLAVOR} == qt4
-USES+= kde:4
+USES+= kde:4 qt:4
USE_KDE= automoc4
-USE_QT4= corelib dbus gui \
+USE_QT= corelib dbus gui \
qmake_build moc_build rcc_build uic_build
CMAKE_ON+= USE_QT4
CMAKE_OFF+= USE_QT5
QTVER_SUFFIX= # empty
. else
-USE_QT5= core dbus gui widgets buildtools_build qmake_build
+USES+= qt:5
+USE_QT= core dbus gui widgets buildtools_build qmake_build
CMAKE_ON+= USE_QT5
CMAKE_OFF+= USE_QT4
QTVER_SUFFIX= 5
diff --git a/sysutils/qdirstat/Makefile b/sysutils/qdirstat/Makefile
index 580c51d358fc..feb71726ff3d 100644
--- a/sysutils/qdirstat/Makefile
+++ b/sysutils/qdirstat/Makefile
@@ -13,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= shundhammer
-USES= desktop-file-utils qmake shebangfix
+USES= desktop-file-utils qmake qt:5 shebangfix
USE_GL= gl
-USE_QT5= buildtools_build core gui widgets
+USE_QT= buildtools_build core gui widgets
SHEBANG_FILES= scripts/qdirstat-cache-writer
pre-configure:
diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index 033e0ab5528d..9218962cd746 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -19,10 +19,9 @@ BROKEN_armv7= fails to compile: qpx_mmc_defs.h:608:4: constant expression evalu
LIB_DEPENDS= libpng.so:graphics/png
-USES= gmake tar:bzip2
-USE_QT4= qmake_build moc_build rcc_build linguisttools_build \
+USES= gmake qmake:no_env qt:4 tar:bzip2
+USE_QT= qmake_build moc_build rcc_build linguisttools_build \
corelib gui network sql
-QT_NONSTANDARD= yes
HAS_CONFIGURE= yes
CONFIGURE_ENV= PREFIX=${PREFIX}
USE_LDCONFIG= yes
@@ -31,9 +30,12 @@ OPTIONS_GROUP= DB
OPTIONS_GROUP_DB= SQLITE MYSQL PGSQL
OPTIONS_DEFAULT= SQLITE
-SQLITE_USE= QT4=sql-sqlite3_run
-MYSQL_USE= QT4=sql-mysql_run
-PGSQL_USE= QT4=sql-pgsql_run
+SQLITE_USES= qt:4
+SQLITE_USE= QT=sql-sqlite3_run
+MYSQL_USES= qt:4
+MYSQL_USE= QT=sql-mysql_run
+PGSQL_USES= qt:4
+PGSQL_USE= QT=sql-pgsql_run
post-configure:
@${REINPLACE_CMD} -e 's|$$(QMAKE4)|& ${QMAKE_AGRS}|' \
diff --git a/sysutils/qsudo/Makefile b/sysutils/qsudo/Makefile
index 788f6d3ffc5a..904a82b0a7e2 100644
--- a/sysutils/qsudo/Makefile
+++ b/sysutils/qsudo/Makefile
@@ -12,11 +12,11 @@ LICENSE_FILE= ${WRKSRC}/../LICENSE
RUN_DEPENDS= sudo:security/sudo
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= trueos
GH_TAGNAME= 815e31c
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
WRKSRC_SUBDIR= src-qt5
LDFLAGS+= -Wl,--as-needed # prevents unnecessary USE_GL=gl, see bug#224488
diff --git a/sysutils/qsynergy/Makefile b/sysutils/qsynergy/Makefile
index 0d2c905d1c5c..35b6ade140cd 100644
--- a/sysutils/qsynergy/Makefile
+++ b/sysutils/qsynergy/Makefile
@@ -12,8 +12,8 @@ COMMENT= Comprehensive and easy to use graphical front end for Synergy
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake
-USE_QT4= moc_build rcc_build uic_build corelib gui network
+USES= qmake qt:4
+USE_QT= moc_build rcc_build uic_build corelib gui network
PLIST_FILES= bin/qsynergy \
share/pixmaps/qsynergy.xpm
diff --git a/sysutils/qt5-qtdiag/Makefile b/sysutils/qt5-qtdiag/Makefile
index a43ed488648c..1ec39c7af8fb 100644
--- a/sysutils/qt5-qtdiag/Makefile
+++ b/sysutils/qt5-qtdiag/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Tool for reporting diagnostic information about Qt and its environment
-USES= qmake:outsource
-USE_QT5= core gui
-QT_DIST= tools
+USES= qmake:outsource qt-dist:5,tools
+USE_QT= core gui
PLIST_FILES= ${QT_BINDIR}/qtdiag
diff --git a/sysutils/qt5-qtpaths/Makefile b/sysutils/qt5-qtpaths/Makefile
index 8f2c3cac3f5e..ae7d35bd8176 100644
--- a/sysutils/qt5-qtpaths/Makefile
+++ b/sysutils/qt5-qtpaths/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Command line client to QStandardPaths
-USES= qmake:outsource
-USE_QT5= core
-QT_DIST= tools
+USES= qmake:outsource qt-dist:5,tools
+USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtpaths
diff --git a/sysutils/qt5-qtplugininfo/Makefile b/sysutils/qt5-qtplugininfo/Makefile
index fc0dece6c193..a831e365d269 100644
--- a/sysutils/qt5-qtplugininfo/Makefile
+++ b/sysutils/qt5-qtplugininfo/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt5 plugin metadata dumper
-USES= qmake:outsource
-USE_QT5= core
-QT_DIST= tools
+USES= qmake:outsource qt-dist:5,tools
+USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtplugininfo
diff --git a/sysutils/qtpass/Makefile b/sysutils/qtpass/Makefile
index ccb67c3e045e..e5d0cbd9a0d9 100644
--- a/sysutils/qtpass/Makefile
+++ b/sysutils/qtpass/Makefile
@@ -13,11 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= pass:sysutils/password-store
-USES= qmake:outsource
+USES= qmake:outsource qt:5
USE_GITHUB= yes
GH_ACCOUNT= IJhack
GH_PROJECT= QtPass
-USE_QT5= core gui network testlib widgets buildtools_build linguisttools_build
+USE_QT= core gui network testlib widgets buildtools_build linguisttools_build
USE_GL= gl
PLIST_FILES= bin/qtpass \
diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile
index 5e5fa375b92e..9210a444164a 100644
--- a/sysutils/qzeitgeist/Makefile
+++ b/sysutils/qzeitgeist/Makefile
@@ -20,9 +20,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= rapper:textproc/raptor2 \
${PYTHON_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR}
-USES= cmake kde:4 python:2.7,build tar:bzip2
+USES= cmake kde:4 python:2.7,build qt:4 tar:bzip2
USE_KDE= automoc4
-USE_QT4= corelib dbus declarative qtestlib \
+USE_QT= corelib dbus declarative qtestlib \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index 03280e297f96..84f2eaa6b37f 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -13,9 +13,9 @@ COMMENT= Search using regexes for file names and text
LICENSE= GPLv3+
-USES= qmake dos2unix zip
+USES= qmake dos2unix qt:4 zip
DOS2UNIX_GLOB= *.cpp *.h
-USE_QT4= corelib gui moc_build rcc_build uic_build
+USE_QT= corelib gui moc_build rcc_build uic_build
PLIST_FILES= bin/${PORTNAME}
diff --git a/sysutils/signon-kwallet-extension/Makefile b/sysutils/signon-kwallet-extension/Makefile
index d8b933f928d5..76c5a7dc3c36 100644
--- a/sysutils/signon-kwallet-extension/Makefile
+++ b/sysutils/signon-kwallet-extension/Makefile
@@ -9,9 +9,9 @@ COMMENT= KWallet integration for signon framework
LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5
-USES= cmake:outsource kde:5 pkgconfig tar:xz
+USES= cmake:outsource kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm wallet
-USE_QT5= core dbus gui \
+USE_QT= core dbus gui \
buildtools_build qmake_build
USE_LDCONFIG= ${KDE_PREFIX}/${SE_DIR}
PLIST_FILES= ${SE_DIR}/libkeyring-kwallet.so
diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile
index 0169b3617c10..b15ff867fb62 100644
--- a/sysutils/signon-plugin-oauth2/Makefile
+++ b/sysutils/signon-plugin-oauth2/Makefile
@@ -11,8 +11,8 @@ COMMENT= Signon OAuth 1.0 and 2.0 plugin for accounts-sso
LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5
-USES= pkgconfig python qmake
-USE_QT5= core network testlib \
+USES= pkgconfig python qmake qt:5
+USE_QT= core network testlib \
buildtools_build qmake_build
USE_LDCONFIG= ${PREFIX}/lib/signon
diff --git a/sysutils/signon-qt5/Makefile b/sysutils/signon-qt5/Makefile
index 3cb4843e3fc2..1a979e70610a 100644
--- a/sysutils/signon-qt5/Makefile
+++ b/sysutils/signon-qt5/Makefile
@@ -12,8 +12,8 @@ COMMENT= D-Bus service performing user authentication
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext pathfix pkgconfig python qmake tar:bz2
-USE_QT5= core dbus gui network sql testlib xml \
+USES= gettext pathfix pkgconfig python qmake qt:5 tar:bz2
+USE_QT= core dbus gui network sql testlib xml \
buildtools_build qmake_build
# gitlab variables
diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile
index 886923cccdce..85ae5ec9e3df 100644
--- a/sysutils/signon-ui/Makefile
+++ b/sysutils/signon-ui/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \
libsignon-qt5.so:sysutils/signon-qt5 \
libproxy.so:net/libproxy
-USES= pkgconfig python qmake tar:bz2
-USE_QT5= buildtools_build qmake_build webkit widgets
+USES= pkgconfig python qmake qt:5 tar:bz2
+USE_QT= buildtools_build qmake_build webkit widgets
# gitlab variables
USE_GITLAB= yes
diff --git a/sysutils/sweeper-kde4/Makefile b/sysutils/sweeper-kde4/Makefile
index 7001f9f23f4e..82357fbbe6ad 100644
--- a/sysutils/sweeper-kde4/Makefile
+++ b/sysutils/sweeper-kde4/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Cleans temporal files 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/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index c8fee7c9b3bf..7b0b7d83550a 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -7,11 +7,11 @@ CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Cleans temporal files for KDE
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= activities-stats auth bookmarks codecs config configwidgets \
coreaddons crash i18n kio service sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/sysadm-client/Makefile b/sysutils/sysadm-client/Makefile
index c1810dc8a1b5..ccba37819a26 100644
--- a/sysutils/sysadm-client/Makefile
+++ b/sysutils/sysadm-client/Makefile
@@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/../LICENSE
WRKSRC_SUBDIR= src-qt5
-USE_QT5= core buildtools_build gui network qmake websockets widgets svg concurrent
-USES= pkgconfig tar:xz qmake ssl
+USE_QT= core buildtools_build gui network qmake websockets widgets svg concurrent
+USES= pkgconfig qt:5 tar:xz qmake ssl
USE_GL+= gl
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
diff --git a/sysutils/sysadm/Makefile b/sysutils/sysadm/Makefile
index b7fa13aef79d..7965737e9444 100644
--- a/sysutils/sysadm/Makefile
+++ b/sysutils/sysadm/Makefile
@@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/../LICENSE
WRKSRC_SUBDIR= src
-USE_QT5= concurrent core network buildtools qmake gui websockets sql
-USES= pkgconfig tar:xz qmake ssl
+USE_QT= concurrent core network buildtools qmake gui websockets sql
+USES= pkgconfig qt:5 tar:xz qmake ssl
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
USE_GITHUB= yes
diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile
index b582962c5b2f..e07b6f67ebe3 100644
--- a/sysutils/tarsnap-gui/Makefile
+++ b/sysutils/tarsnap-gui/Makefile
@@ -11,8 +11,8 @@ COMMENT= Cross platform GUI for the Tarsnap command line client
USE_GITHUB= yes
GH_ACCOUNT= Tarsnap
-USES= compiler:c++11-lib qmake
-USE_QT5= buildtools_build core gui network qmake_build sql sql-sqlite3 widgets
+USES= compiler:c++11-lib qmake qt:5
+USE_QT= buildtools_build core gui network qmake_build sql sql-sqlite3 widgets
USE_GL= gl
PLIST_FILES= bin/tarsnap-gui
diff --git a/sysutils/trueos-libqt5/Makefile b/sysutils/trueos-libqt5/Makefile
index 38e01663fc00..b8b74277e9cf 100644
--- a/sysutils/trueos-libqt5/Makefile
+++ b/sysutils/trueos-libqt5/Makefile
@@ -16,9 +16,9 @@ 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
USE_GL+= gl
diff --git a/sysutils/twmn/Makefile b/sysutils/twmn/Makefile
index d69537a7a88b..6806092f4b8d 100644
--- a/sysutils/twmn/Makefile
+++ b/sysutils/twmn/Makefile
@@ -13,11 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-USES= qmake
+USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= sboli
GH_TAGNAME= 5b92ac5
-USE_QT5= core dbus gui network widgets x11extras buildtools_build
+USE_QT= core dbus gui network widgets x11extras buildtools_build
LDFLAGS+= -Wl,--as-needed # see bug#224488
PORTDOCS= README.md
diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile
index fb5b6d34b047..fcb79aa1ebe6 100644
--- a/sysutils/unetbootin/Makefile
+++ b/sysutils/unetbootin/Makefile
@@ -16,7 +16,8 @@ RUN_DEPENDS= 7z:archivers/p7zip \
syslinux:sysutils/syslinux \
mke2fs:sysutils/e2fsprogs
-USE_QT4= linguisttools_build moc_build qmake_build uic_build \
+USES= qt:4
+USE_QT= linguisttools_build moc_build qmake_build uic_build \
corelib gui network
QMAKE_ARGS= DEFINES+=LOCALBASE=\\\\\\\"${LOCALBASE}\\\\\\\"