aboutsummaryrefslogtreecommitdiff
path: root/x11
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 /x11
parentbc77780d41178cf3d0327c79ac10737af704f236 (diff)
downloadports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.tar.gz
ports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.zip
Notes
Diffstat (limited to 'x11')
-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
59 files changed, 127 insertions, 128 deletions
diff --git a/x11/antimicro/Makefile b/x11/antimicro/Makefile
index bf88421aeb77..b6592b47badc 100644
--- a/x11/antimicro/Makefile
+++ b/x11/antimicro/Makefile
@@ -20,8 +20,8 @@ GH_ACCOUNT= antimicro #Ryochan7
LDFLAGS+= -L${LOCALBASE}/lib
USE_XORG= x11 xi xtst
-USE_QT5= core gui linguisttools_build qmake_build buildtools_build widgets network
+USE_QT= core gui linguisttools_build qmake_build buildtools_build widgets network
USE_SDL= sdl2
-USES= cmake:outsource pkgconfig desktop-file-utils shared-mime-info
+USES= cmake:outsource pkgconfig desktop-file-utils qt:5 shared-mime-info
.include <bsd.port.mk>
diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index 286c407a5fd7..1abc93dced40 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -17,8 +17,8 @@ GH_ACCOUNT= Swordfish90
GH_PROJECT= qmltermwidget:qtw
GH_TAGNAME= v0.1.0:qtw
-USES= desktop-file-utils qmake
-USE_QT5= qmake_build buildtools_build core gui qml quick widgets \
+USES= desktop-file-utils qmake qt:5
+USE_QT= qmake_build buildtools_build core gui qml quick widgets \
graphicaleffects_run quickcontrols_run
.include <bsd.port.pre.mk>
diff --git a/x11/dsbautostart/Makefile b/x11/dsbautostart/Makefile
index eae549152399..a3c9739fb65d 100644
--- a/x11/dsbautostart/Makefile
+++ b/x11/dsbautostart/Makefile
@@ -11,9 +11,9 @@ COMMENT= Manage commands to be executed at X session start
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/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 5a8d73303cdb..afa1961a9380 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Kactivities library
-USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs soprano nepomuk-core
-USE_QT4= declarative moc_build qmake_build rcc_build uic_build
+USE_QT= declarative moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
post-patch:
diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile
index d15fe3c684b9..bb9a130b281a 100644
--- a/x11/kactivitymanagerd/Makefile
+++ b/x11/kactivitymanagerd/Makefile
@@ -11,10 +11,10 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Activity Manager daemon
-USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs soprano nepomuk-core \
kactivities
-USE_QT4= declarative opengl script sql \
+USE_QT= declarative opengl script sql \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
DISTINFO_FILE= ${.CURDIR}/../kactivities/distinfo
diff --git a/x11/kde-baseapps-kde4/Makefile b/x11/kde-baseapps-kde4/Makefile
index c7774e714cbe..f50536b4cb46 100644
--- a/x11/kde-baseapps-kde4/Makefile
+++ b/x11/kde-baseapps-kde4/Makefile
@@ -11,11 +11,11 @@ COMMENT= Basic applications for KDE
LIB_DEPENDS= libtidy.so:www/tidy-lib
-USES= cmake:outsource gettext kde:4 tar:xz
+USES= cmake:outsource gettext kde:4 qt:4 tar:xz
USE_GNOME= glib20
USE_KDE= kdelibs baloo baloo-widgets libkonq \
automoc4 kactivities
-USE_QT4= corelib dbus gui script xml \
+USE_QT= corelib dbus gui script xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xt
USE_LDCONFIG= yes
diff --git a/x11/kde-runtime-kde4/Makefile b/x11/kde-runtime-kde4/Makefile
index f87f4f795fbf..42e35e84d96d 100644
--- a/x11/kde-runtime-kde4/Makefile
+++ b/x11/kde-runtime-kde4/Makefile
@@ -26,11 +26,11 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh
RUN_DEPENDS= cagibid:net/cagibi
-USES= cmake:outsource gettext jpeg kde:4 samba:lib shared-mime-info \
+USES= cmake:outsource gettext jpeg kde:4 qt:4 samba:lib shared-mime-info \
shebangfix tar:xz
USE_KDE= kactivities kdelibs oxygen-icons5 \
attica automoc4 pimlibs soprano strigi nepomuk-core
-USE_QT4= corelib dbus declarative designer_build gui phonon \
+USE_QT= corelib dbus declarative designer_build gui phonon \
network qtestlib script svg webkit xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= ice sm x11 xau xcursor xext xft xdmcp xpm
diff --git a/x11/kde-workspace-kde4/Makefile b/x11/kde-workspace-kde4/Makefile
index 42891d21ed77..cb4789edb548 100644
--- a/x11/kde-workspace-kde4/Makefile
+++ b/x11/kde-workspace-kde4/Makefile
@@ -42,12 +42,12 @@ RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \
${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde-base-artwork-kde4
USES= cmake:outsource,noninja compiler:c++11-lib gettext gmake jpeg kde:4 \
- pkgconfig shebangfix tar:xz
+ pkgconfig qt:4 shebangfix tar:xz
USE_GL= gl glu
USE_GNOME= glib20 libxml2
USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons5 \
pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi
-USE_QT4= corelib dbus declarative designer_build gui network \
+USE_QT= corelib dbus declarative designer_build gui network \
opengl phonon qtestlib script sql svg webkit xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= ice sm kbproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
@@ -90,7 +90,8 @@ GPS_CMAKE_ON= -DWITH_libgps:BOOL=ON
GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF
GSTREAMER_DESC= Multimedia via Phonon-GStreamer
-GSTREAMER_USE= QT4=phonon-gst_run
+GSTREAMER_USES= qt:4
+GSTREAMER_USE= QT=phonon-gst_run
KACTIVITY_DESC= Activity Manager daemon
KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd
diff --git a/x11/kde5/Makefile b/x11/kde5/Makefile
index bf93841a75f2..47c59cc9d5a5 100644
--- a/x11/kde5/Makefile
+++ b/x11/kde5/Makefile
@@ -12,9 +12,9 @@ LICENSE= LGPL20
RUN_DEPENDS= kde-baseapps>=0:x11/kde-baseapps \
kwalletmanager5:security/kwalletmanager
-USES= kde:5 metaport
+USES= kde:5 metaport qt:5
USE_KDE= plasma-desktop_run
-USE_QT5= # empty
+USE_QT= # empty
OPTIONS_DEFINE= KDEADMIN KDEEDU \
KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK \
diff --git a/x11/kdelibs-kde4/Makefile b/x11/kdelibs-kde4/Makefile
index 08411281caa3..ea05e49ab677 100644
--- a/x11/kdelibs-kde4/Makefile
+++ b/x11/kdelibs-kde4/Makefile
@@ -34,11 +34,11 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-them
KDE_APPLICATIONS_VERSION= 17.08.3
USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \
- shared-mime-info shebangfix tar:xz ssl
+ qt:4 shared-mime-info shebangfix tar:xz ssl
USE_GNOME= libxml2 libxslt
USE_KDE= oxygen-icons5 \
attica automoc4 ontologies soprano strigi
-USE_QT4= corelib dbus declarative designer_build gui \
+USE_QT= corelib dbus declarative designer_build gui \
network opengl phonon qt3support \
qtestlib script sql svg webkit xml \
moc_build qmake_build rcc_build uic_build \
diff --git a/x11/kf5-frameworkintegration/Makefile b/x11/kf5-frameworkintegration/Makefile
index 3ab54f7b27d6..ea9559666a46 100644
--- a/x11/kf5-frameworkintegration/Makefile
+++ b/x11/kf5-frameworkintegration/Makefile
@@ -8,10 +8,10 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 workspace and cross-framework integration plugins
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
iconthemes kio newstuff notifications package widgetsaddons
-USE_QT5= buildtools_build core dbus gui qmake_build widgets \
+USE_QT= buildtools_build core dbus gui qmake_build widgets \
x11extras xml
USE_XORG= xcb xcursor
diff --git a/x11/kf5-frameworks/Makefile b/x11/kf5-frameworks/Makefile
index 7b9d0557e9ff..988139d0d6a7 100644
--- a/x11/kf5-frameworks/Makefile
+++ b/x11/kf5-frameworks/Makefile
@@ -9,11 +9,11 @@ PKGNAMEPREFIX= kf5-
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 frameworks meta port
-USES= metaport kde:5
+USES= metaport kde:5 qt:5
# remove:
# * bluez-qt as we do have bluez
USE_KDE= ${_USE_FRAMEWORKS_ALL:Nbluez-qt}
# pull bsd.qt.mk for QT_PLUGINDIR in the kf5-dependencies
-USE_QT5= #
+USE_QT= #
.include <bsd.port.mk>
diff --git a/x11/kf5-kactivities-stats/Makefile b/x11/kf5-kactivities-stats/Makefile
index a5879dca1800..f3b458a6af28 100644
--- a/x11/kf5-kactivities-stats/Makefile
+++ b/x11/kf5-kactivities-stats/Makefile
@@ -10,8 +10,8 @@ COMMENT= KF5 statistics for activities
LIB_DEPENDS= libboost_system.so:devel/boost-libs
RUN_DEPENDS= kactivitymanagerd:x11/plasma5-kactivitymanagerd
-USES= cmake:outsource compiler:c++11-lib kde:5 pathfix tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 pathfix qt:5 tar:xz
USE_KDE= activities config ecm
-USE_QT5= buildtools_build core dbus qmake_build sql
+USE_QT= buildtools_build core dbus qmake_build sql
.include <bsd.port.mk>
diff --git a/x11/kf5-kactivities/Makefile b/x11/kf5-kactivities/Makefile
index 3a0d85c4f9ca..7b984c9f7889 100644
--- a/x11/kf5-kactivities/Makefile
+++ b/x11/kf5-kactivities/Makefile
@@ -9,11 +9,11 @@ COMMENT= KF5 runtime and library to organize work in separate activities
LIB_DEPENDS= libboost_system.so:devel/boost-libs
-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= bookmarks config configwidgets coreaddons dbusaddons ecm \
globalaccel i18n kcmutils kdeclarative kio package \
service widgetsaddons windowsystem xmlgui
-USE_QT5= buildtools_build core dbus gui network qmake_build qml \
+USE_QT= buildtools_build core dbus gui network qmake_build qml \
quick sql widgets
.include <bsd.port.mk>
diff --git a/x11/kf5-kded/Makefile b/x11/kf5-kded/Makefile
index 3fe5459c74b2..f94f6d820018 100644
--- a/x11/kf5-kded/Makefile
+++ b/x11/kf5-kded/Makefile
@@ -7,9 +7,9 @@ CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 extensible deamon for providing system level services
-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= config coreaddons crash dbusaddons doctools ecm \
init service
-USE_QT5= buildtools_build core dbus gui qmake_build widgets
+USE_QT= buildtools_build core dbus gui qmake_build widgets
.include <bsd.port.mk>
diff --git a/x11/kf5-kdelibs4support/Makefile b/x11/kf5-kdelibs4support/Makefile
index 67ffdb3e274a..ef265da64148 100644
--- a/x11/kf5-kdelibs4support/Makefile
+++ b/x11/kf5-kdelibs4support/Makefile
@@ -9,7 +9,7 @@ COMMENT= KF5 porting aid from KDELibs4
BUILD_DEPENDS= p5-URI>=0:net/p5-URI
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix \
+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 doctools emoticons globalaccel guiaddons \
@@ -18,7 +18,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
widgetsaddons windowsystem xmlgui \
designerplugin_build designerplugin_run \
itemmodels_run
-USE_QT5= buildtools_build core dbus designer gui network \
+USE_QT= buildtools_build core dbus designer gui network \
printsupport qmake_build svg testlib widgets \
x11extras xml
USE_XORG= ice sm x11 xext
diff --git a/x11/kf5-kglobalaccel/Makefile b/x11/kf5-kglobalaccel/Makefile
index c98a29090ab7..eb1fe18f2409 100644
--- a/x11/kf5-kglobalaccel/Makefile
+++ b/x11/kf5-kglobalaccel/Makefile
@@ -9,10 +9,10 @@ COMMENT= KF5 library to add support for global workspace shortcuts
LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms
-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 config coreaddons crash dbusaddons i18n service \
windowsystem
-USE_QT5= buildtools_build core dbus gui linguisttools qmake_build \
+USE_QT= buildtools_build core dbus gui linguisttools qmake_build \
testlib widgets x11extras
USE_XORG= xcb
diff --git a/x11/kf5-kinit/Makefile b/x11/kf5-kinit/Makefile
index e88f8a56a75a..0cd9b32ec94e 100644
--- a/x11/kf5-kinit/Makefile
+++ b/x11/kf5-kinit/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 process launcher to speed up launching KDE applications
-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= completion config coreaddons crash doctools ecm i18n \
jobwidgets kio service widgetsaddons windowsystem
-USE_QT5= buildtools_build core dbus gui network qmake_build widgets
+USE_QT= buildtools_build core dbus gui network qmake_build widgets
USE_XORG= x11 xcb
.include <bsd.port.mk>
diff --git a/x11/kf5-krunner/Makefile b/x11/kf5-krunner/Makefile
index 0c10e52f7136..22112e5dff27 100644
--- a/x11/kf5-krunner/Makefile
+++ b/x11/kf5-krunner/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 parallelized query system
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n kio package plasma-framework \
service solid threadweaver
-USE_QT5= buildtools_build core gui network qmake_build qml \
+USE_QT= buildtools_build core gui network qmake_build qml \
quick widgets
.include <bsd.port.mk>
diff --git a/x11/kf5-kwayland/Makefile b/x11/kf5-kwayland/Makefile
index 9bc4cfc99b56..566e42288206 100644
--- a/x11/kf5-kwayland/Makefile
+++ b/x11/kf5-kwayland/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB= dual
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_GL= egl
USE_KDE= ecm
-USE_QT5= buildtools_build concurrent core gui qmake_build testlib
+USE_QT= buildtools_build concurrent core gui qmake_build testlib
.include <bsd.port.mk>
diff --git a/x11/kf5-kwindowsystem/Makefile b/x11/kf5-kwindowsystem/Makefile
index 46943c4463ad..903d5596bd2f 100644
--- a/x11/kf5-kwindowsystem/Makefile
+++ b/x11/kf5-kwindowsystem/Makefile
@@ -9,9 +9,9 @@ COMMENT= KF5 library for access to the windowing system
LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms
-USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build core gui linguisttools qmake_build \
+USE_QT= buildtools_build core gui linguisttools qmake_build \
testlib widgets x11extras
USE_XORG= ice sm x11 xcb xext xfixes xrender
diff --git a/x11/kf5-plasma-framework/Makefile b/x11/kf5-plasma-framework/Makefile
index 2e87b1586559..81fd012dc088 100644
--- a/x11/kf5-plasma-framework/Makefile
+++ b/x11/kf5-plasma-framework/Makefile
@@ -7,14 +7,14 @@ CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 plugin based UI runtime used to write user interfaces
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
USE_GL= egl gl
USE_KDE= activities archive auth codecs completion config \
configwidgets coreaddons dbusaddons doctools globalaccel \
guiaddons i18n iconthemes jobwidgets kirigami2 kio package \
notifications service wayland windowsystem xmlgui kdeclarative \
widgetsaddons
-USE_QT5= buildtools_build core dbus gui network qmake_build qml \
+USE_QT= buildtools_build core dbus gui network qmake_build qml \
quick script sql svg widgets x11extras xml
USE_XORG= ice sm x11 xcb xext xrandr
diff --git a/x11/kgamma-kde4/Makefile b/x11/kgamma-kde4/Makefile
index 8001281dfebf..64e1ac1493f9 100644
--- a/x11/kgamma-kde4/Makefile
+++ b/x11/kgamma-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 monitor calibration tool
-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 xxf86vm
.include <bsd.port.mk>
diff --git a/x11/konsole-kde4/Makefile b/x11/konsole-kde4/Makefile
index db29ce6a90ca..9786b11011ef 100644
--- a/x11/konsole-kde4/Makefile
+++ b/x11/konsole-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE terminal emulator
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 libkonq
-USE_QT4= xml moc_build qmake_build rcc_build uic_build
+USE_QT= xml moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xrender
CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index eac4835cec04..1eded20cc54b 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -11,13 +11,13 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-
docbook-xml>0:textproc/docbook-xml
RUN_DEPENDS= keditbookmarks:deskutils/keditbookmarks
-USES= cmake:outsource gettext pkgconfig kde:5 tar:xz
+USES= cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
USE_KDE= auth attica bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm emoticons globalaccel guiaddons i18n \
iconthemes init itemmodels jobwidgets kdelibs4support kio \
newstuff notifications notifyconfig parts pty service sonnet \
textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport script scripttools sql \
+USE_QT= core dbus gui network printsupport script scripttools sql \
widgets xml \
buildtools_build qmake_build
diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile
index 079b7440981e..5285af44345d 100644
--- a/x11/leechcraft/Makefile
+++ b/x11/leechcraft/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6@qt4 \
#LC_REV= 1526-g7fdb92a
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USES= cmake pkgconfig tar:xz
-USE_QT4= corelib declarative gui network script sql sql-sqlite3_run \
+USES= cmake pkgconfig qt:4 tar:xz
+USE_QT= corelib declarative gui network script sql sql-sqlite3_run \
webkit xml qmake_build moc_build rcc_build uic_build \
linguisttools_build
USE_XORG= x11
@@ -370,12 +370,12 @@ OPTIONS_DEFAULT=AGGREGATOR ANHERO ANOTIFI AUSCRIE AZOTH BLASQ BLOGIQUE CERTMGR \
${PORT_OPTIONS:MLAUGHTY} || ${PORT_OPTIONS:MLIZNOO} || \
${PORT_OPTIONS:MLMP} || ${PORT_OPTIONS:MSYSNOTIFY} || \
${PORT_OPTIONS:MVROOBY} || ${PORT_OPTIONS:MXTAZY}
-USE_QT4+= dbus
+USE_QT+= dbus
.endif
.if ${PORT_OPTIONS:MBLASQ} || ${PORT_OPTIONS:MBLOGIQUE} || \
${PORT_OPTIONS:MLACKMAN}
-USE_QT4+= xmlpatterns
+USE_QT+= xmlpatterns
.endif
.if ${PORT_OPTIONS:MAZOTH} || ${PORT_OPTIONS:MBLASQ} || \
diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile
index e14219f52e13..227355395076 100644
--- a/x11/libfm-qt/Makefile
+++ b/x11/libfm-qt/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libfm.so:x11/libfm \
libexif.so:graphics/libexif
USES= cmake:outsource compiler:c++11-lib gettext-runtime lxqt pkgconfig \
- shared-mime-info tar:xz
-USE_QT5= buildtools_build qmake_build core gui linguisttools widgets \
+ qt:5 shared-mime-info tar:xz
+USE_QT= buildtools_build qmake_build core gui linguisttools widgets \
x11extras
USE_GNOME= glib20
USE_XORG= xcb
diff --git a/x11/libfmqt-l10n/Makefile b/x11/libfmqt-l10n/Makefile
index f755f2d7008c..a1339761bbed 100644
--- a/x11/libfmqt-l10n/Makefile
+++ b/x11/libfmqt-l10n/Makefile
@@ -17,8 +17,8 @@ DISTINFO_FILE= ${MASTERDIR}/distinfo
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \
diff --git a/x11/libkonq-kde4/Makefile b/x11/libkonq-kde4/Makefile
index 01cce3a93cd3..72fa527f3476 100644
--- a/x11/libkonq-kde4/Makefile
+++ b/x11/libkonq-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT= Core library for Konqueror
LIB_DEPENDS= libphonon.so:multimedia/phonon@qt4
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 soprano
-USE_QT4= corelib dbus gui network svg xml \
+USE_QT= corelib dbus gui network svg xml \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
USE_XORG= x11
diff --git a/x11/lumina-core/Makefile b/x11/lumina-core/Makefile
index b57a924e2165..c72870c3fca7 100644
--- a/x11/lumina-core/Makefile
+++ b/x11/lumina-core/Makefile
@@ -39,11 +39,11 @@ RUN_DEPENDS+= gstreamer1-plugins-core>=0:multimedia/gstreamer1-plugins-core
MAKE_JOBS_UNSAFE=yes
-USES= qmake
+USES= qmake qt:5
USE_GL= gl
USE_XORG= x11 xdamage xcb
USE_LDCONFIG= yes
-USE_QT5= core gui widgets network svg multimedia imageformats \
+USE_QT= core gui widgets network svg multimedia imageformats \
buildtools_build x11extras concurrent
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -51,13 +51,13 @@ GH_PROJECT= lumina
GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/core
-#Setup the qmake configuration options
+#Setup the qmake qt:5 configuration options
.if ${PORT_OPTIONS:MTRUEOS}
QMAKE_ARGS= DEFAULT_SETTINGS=TrueOS
.endif
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/x11/lumina-coreutils/Makefile b/x11/lumina-coreutils/Makefile
index 8f5e30471868..99919da7bcfc 100644
--- a/x11/lumina-coreutils/Makefile
+++ b/x11/lumina-coreutils/Makefile
@@ -24,9 +24,9 @@ I18N_DESC= Install localization files
MAKE_JOBS_UNSAFE=yes
-USES= qmake
+USES= qmake qt:5
USE_LDCONFIG= yes
-USE_QT5= core gui widgets network svg imageformats \
+USE_QT= core gui widgets network svg imageformats \
buildtools_build x11extras concurrent multimedia
USE_GITHUB= yes
GH_ACCOUNT= trueos
@@ -35,7 +35,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7
WRKSRC_SUBDIR= src-qt5/core-utils
.if${PORT_OPTIONS:MI18N}
-USE_QT5+= linguist_build
+USE_QT+= linguist_build
QMAKE_ARGS+=CONFIG+=WITH_I18N
.endif
diff --git a/x11/lxqt-globalkeys/Makefile b/x11/lxqt-globalkeys/Makefile
index 566ecc13b257..97dbdd675f53 100644
--- a/x11/lxqt-globalkeys/Makefile
+++ b/x11/lxqt-globalkeys/Makefile
@@ -10,8 +10,8 @@ COMMENT= Global keyboard shortcuts registration
LICENSE= LGPL21+
-USES= cmake:outsource compiler:c++11-lib kde:5 lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build core dbus gui linguisttools \
+USES= cmake:outsource compiler:c++11-lib kde:5 lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
svg widgets x11extras xml
USE_KDE= windowsystem
USE_LXQT= buildtools lxqt
diff --git a/x11/pcdm/Makefile b/x11/pcdm/Makefile
index 2b8e031a108d..e5daf103fd3b 100644
--- a/x11/pcdm/Makefile
+++ b/x11/pcdm/Makefile
@@ -19,8 +19,8 @@ MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
CONFLICTS= pcbsd-utils-qt*
-USES= qmake
-USE_QT5= core gui network svg multimedia imageformats \
+USES= qmake qt:5
+USE_QT= core gui network svg multimedia imageformats \
buildtools_build x11extras concurrent linguisttools_build
USE_OPENRC_SUBR=pcdm
diff --git a/x11/plasma-scriptengine-python-kde4/Makefile b/x11/plasma-scriptengine-python-kde4/Makefile
index aae0a332f80f..980652004ae1 100644
--- a/x11/plasma-scriptengine-python-kde4/Makefile
+++ b/x11/plasma-scriptengine-python-kde4/Makefile
@@ -11,9 +11,9 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma scriptengine for Python
NO_ARCH= yes
-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 pykde4 automoc4
-USE_QT4= qmake_build moc_build uic_build rcc_build
+USE_QT= qmake_build moc_build uic_build rcc_build
DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde-workspace-kde4/distinfo
KDE_APPLICATIONS_VERSION= 15.08.0
diff --git a/x11/plasma-scriptengine-ruby-kde4/Makefile b/x11/plasma-scriptengine-ruby-kde4/Makefile
index 5820f6ac0a7d..366aba1b67d7 100644
--- a/x11/plasma-scriptengine-ruby-kde4/Makefile
+++ b/x11/plasma-scriptengine-ruby-kde4/Makefile
@@ -11,9 +11,9 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma scriptengine for Ruby
NO_ARCH= yes
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs korundum automoc4
-USE_QT4= qmake_build moc_build uic_build rcc_build
+USE_QT= qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde-workspace-kde4/distinfo
diff --git a/x11/plasma5-kactivitymanagerd/Makefile b/x11/plasma5-kactivitymanagerd/Makefile
index 70809492aca8..d31a7cb05bc6 100644
--- a/x11/plasma5-kactivitymanagerd/Makefile
+++ b/x11/plasma5-kactivitymanagerd/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= System service to manage user's activities, track the usage patterns
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
globalaccel i18n kio service widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network sql widgets xml \
+USE_QT= concurrent core dbus gui network sql widgets xml \
buildtools_build qmake_build
# https://bugs.kde.org/show_bug.cgi?id=305529#c10
diff --git a/x11/plasma5-kgamma5/Makefile b/x11/plasma5-kgamma5/Makefile
index 4ef10f62acc2..a116bf56125c 100644
--- a/x11/plasma5-kgamma5/Makefile
+++ b/x11/plasma5-kgamma5/Makefile
@@ -7,13 +7,13 @@ CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 monitor's gamma settings
-USES= cmake:outsource cpe gettext kde:5 tar:xz
+USES= cmake:outsource cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash doctools ecm emoticons guiaddons 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 x11extras xml \
+USE_QT= core dbus gui network printsupport widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xxf86vm
diff --git a/x11/plasma5-kscreen/Makefile b/x11/plasma5-kscreen/Makefile
index 4a6637a9642c..37217c01abc8 100644
--- a/x11/plasma5-kscreen/Makefile
+++ b/x11/plasma5-kscreen/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 screen management library
-USES= cmake:outsource cpe gettext kde:5 tar:xz
+USES= cmake:outsource cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
globalaccel i18n libkscreen widgetsaddons xmlgui
-USE_QT5= core dbus gui network qml quick testlib widgets xml \
+USE_QT= core dbus gui network qml quick testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11/plasma5-kwayland-integration/Makefile b/x11/plasma5-kwayland-integration/Makefile
index 757cf9aabba3..b626a7c09170 100644
--- a/x11/plasma5-kwayland-integration/Makefile
+++ b/x11/plasma5-kwayland-integration/Makefile
@@ -11,9 +11,9 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
libwayland-client.so:graphics/wayland
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
-USES= cmake:outsource compiler:c++11-lib cpe kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib cpe kde:5 qt:5 tar:xz
USE_KDE= ecm idletime wayland windowsystem
-USE_QT5= core gui widgets \
+USE_QT= core gui widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11/plasma5-libkscreen/Makefile b/x11/plasma5-libkscreen/Makefile
index b91a8531dbc6..e3ab6e23793f 100644
--- a/x11/plasma5-libkscreen/Makefile
+++ b/x11/plasma5-libkscreen/Makefile
@@ -8,9 +8,9 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 screen management library
USES= cmake:outsource compiler:c++11-lib cpe kde:5 pathfix \
- pkgconfig tar:xz
+ pkgconfig qt:5 tar:xz
USE_KDE= ecm wayland
-USE_QT5= core dbus gui testlib x11extras \
+USE_QT= core dbus gui testlib x11extras \
buildtools_build qmake_build
USE_XORG= x11 xcb xrandr
diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
index 57d232f04e62..8a4e7367ea60 100644
--- a/x11/plasma5-plasma-desktop/Makefile
+++ b/x11/plasma5-plasma-desktop/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
xf86-input-libinput>0:x11-drivers/xf86-input-libinput
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_GNOME= glib20
USE_KDE= activities activities-stats archive attica auth baloo \
bookmarks codecs completion config configwidgets coreaddons \
@@ -37,7 +37,7 @@ USE_KDE= activities activities-stats archive attica auth baloo \
widgetsaddons windowsystem xmlgui
USE_KDE+= drkonqi_run infocenter_run kmenuedit_run ksysguard_run \
polkit-kde-agent-1_run systemsettings_run
-USE_QT5= concurrent core dbus gui network phonon4 printsupport qml \
+USE_QT= concurrent core dbus gui network phonon4 printsupport qml \
quick sql svg widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xfixes xft xi xrender
diff --git a/x11/plasma5-plasma-integration/Makefile b/x11/plasma5-plasma-integration/Makefile
index 7a690c6a4e38..0c3b0451cc79 100644
--- a/x11/plasma5-plasma-integration/Makefile
+++ b/x11/plasma5-plasma-integration/Makefile
@@ -10,12 +10,12 @@ COMMENT= Qt Platform Theme integration plugins for the Plasma workspaces
RUN_DEPENDS= hack-font>=0:x11-fonts/hack-font
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- shebangfix tar:xz
+ qt:5 shebangfix tar:xz
USE_KDE= auth bookmarks breeze codecs completion config configwidgets \
coreaddons ecm i18n iconthemes itemviews jobwidgets kio \
notifications service solid wayland \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network qml quick quickcontrols2 widgets \
+USE_QT= concurrent core dbus gui network qml quick quickcontrols2 widgets \
x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb xcursor
diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
index 9dc7f16e8d34..d893524fdcf3 100644
--- a/x11/plasma5-plasma-workspace/Makefile
+++ b/x11/plasma5-plasma-workspace/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ck-launch-session:sysutils/consolekit2\
iso-codes>=0:misc/iso-codes
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= activities activitymanagerd attica auth baloo bookmarks \
codecs completion config configwidgets coreaddons crash \
dbusaddons doctools emoticons filemetadata globalaccel \
@@ -36,7 +36,7 @@ USE_KDE= activities activitymanagerd attica auth baloo bookmarks \
widgetsaddons windowsystem xmlgui xmlrpcclient \
breeze_run breeze-icons_run oxygen-icons5_run \
kde-cli-tools_run kded_run milou_run
-USE_QT5= concurrent core dbus graphicaleffects gui network phonon4 \
+USE_QT= concurrent core dbus graphicaleffects gui network phonon4 \
printsupport qdbus qml quick quickcontrols_run script sql \
testlib webkit widgets x11extras xml \
paths_run \
diff --git a/x11/plasma5-plasma/Makefile b/x11/plasma5-plasma/Makefile
index df4e671b2202..dcc69916c28d 100644
--- a/x11/plasma5-plasma/Makefile
+++ b/x11/plasma5-plasma/Makefile
@@ -10,13 +10,13 @@ COMMENT= KDE5 plasma meta port
LICENSE= LGPL20
-USES= kde:5 metaport
+USES= kde:5 metaport qt:5
# remove:
# * bluedevil as we do have bluez
# * plasma-pa don't depend on plamsa-pa by default
# * breeze-kde4 don't pull in qt4 bits
USE_KDE= ${_USE_PLASMA_ALL:Nplasma-pa:Nbreeze-kde4}
# pull bsd.qt.mk for QT_PLUGINDIR in the kf5-dependencies
-USE_QT5= #
+USE_QT= #
.include <bsd.port.mk>
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 373e33c0e7c6..cba0d335ecfd 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -12,11 +12,11 @@ COMMENT= Python bindings for the Qt4 toolkit, QtOpenGL module
CONFIGURE_ARGS= --enable QtOpenGL
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_GL= gl
USE_PYQT= sip_build core_run gui_run
USE_PYTHON= flavors
-USE_QT4= corelib gui opengl moc_build qmake_build
+USE_QT= corelib gui opengl moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index b853e3e07ae7..f6bfde6ed4a1 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtOpenGL module
CONFIGURE_ARGS= --enable QtOpenGL
PYQT_DIST= yes
-USES= python pyqt:5
+USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run widgets_run
USE_PYTHON= flavors
-USE_QT5= core gui opengl widgets qmake_build
+USE_QT= core gui opengl widgets qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 6d631143b865..cab8ed570e18 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -11,8 +11,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Graphical effects and filters library for KDE4
USE_LDCONFIG= yes
-USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build
-USES= cmake tar:bzip2
+USE_QT= corelib gui qmake_build moc_build uic_build rcc_build
+USES= cmake qt:4 tar:bzip2
USE_CXXSTD= gnu++98
post-patch:
diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile
index 893928f5bc78..0cfc3208a17a 100644
--- a/x11/qt4-graphicssystems-opengl/Makefile
+++ b/x11/qt4-graphicssystems-opengl/Makefile
@@ -10,8 +10,8 @@ PKGNAMESUFFIX= -opengl
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt OpenGL rendering engine (experimental)
-USE_QT4= qmake_build opengl
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= opengl
HAS_CONFIGURE= yes
USE_GL= glu
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index a8704ab20d33..6b811cf1cb5c 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt input methods
-USE_QT4= qmake_build moc_build corelib gui
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui
HAS_CONFIGURE= yes
diff --git a/x11/qt5-qev/Makefile b/x11/qt5-qev/Makefile
index c769bf53e5a9..dafa723f3ed7 100644
--- a/x11/qt5-qev/Makefile
+++ b/x11/qt5-qev/Makefile
@@ -8,15 +8,14 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt QWidget events introspection tool
-USE_QT5= core widgets
-QT_DIST= tools
-USES= qmake
+USE_QT= core widgets
+USES= qmake qt-dist:5,tools
WRKSRC_SUBDIR= src/${PORTNAME}
-# qev is not connected to qttool's build system, so we cannot just run qmake
+# qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools
# and set {BUILD,INSTALL}_WRKSRC.
-# Instead, we run qmake from src/${PORTNAME} but need to copy .qmake.conf to
+# Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to
# it for all required variables to be set (MODULE_VERSION etc).
post-patch:
${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
diff --git a/x11/qt5-x11extras/Makefile b/x11/qt5-x11extras/Makefile
index e8b29fadb3df..c84cc938dc4e 100644
--- a/x11/qt5-x11extras/Makefile
+++ b/x11/qt5-x11extras/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt platform-specific features for X11-based systems
-USE_QT5= core gui
-QT_DIST= x11extras
-USES= qmake
+USE_QT= core gui
+USES= qmake qt-dist:5,x11extras
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
diff --git a/x11/qterminal-l10n/Makefile b/x11/qterminal-l10n/Makefile
index a02fa813d63a..7c2f20fcda5d 100644
--- a/x11/qterminal-l10n/Makefile
+++ b/x11/qterminal-l10n/Makefile
@@ -17,8 +17,8 @@ DISTINFO_FILE= ${MASTERDIR}/distinfo
DESCR= ${MASTERDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= cmake:outsource lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build qmake_build linguisttools
+USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build qmake_build linguisttools
USE_LXQT= buildtools
CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \
diff --git a/x11/qterminal/Makefile b/x11/qterminal/Makefile
index 4c7e0a50248c..21ac6d9c1f16 100644
--- a/x11/qterminal/Makefile
+++ b/x11/qterminal/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS= liberation-fonts-ttf>=2.00:x11-fonts/liberation-fonts-ttf \
qterminal-l10n>0:x11/qterminal-l10n
USES= cmake:outsource compiler:c++11-lang gettext-runtime \
- localbase:ldflags lxqt pkgconfig tar:xz
-USE_QT5= buildtools_build core gui qmake_build dbus linguisttools \
+ localbase:ldflags lxqt pkgconfig qt:5 tar:xz
+USE_QT= buildtools_build core gui qmake_build dbus linguisttools \
widgets x11extras
USE_XORG= x11
USE_LXQT= buildtools lxqt
diff --git a/x11/qxkb/Makefile b/x11/qxkb/Makefile
index 2730fdd1eb3a..9b0810a4432a 100644
--- a/x11/qxkb/Makefile
+++ b/x11/qxkb/Makefile
@@ -13,8 +13,8 @@ LICENSE= GPLv2+
LIB_DEPENDS= libxkbfile.so:x11/libxkbfile
-USES= cmake
-USE_QT4= linguisttools_build moc_build qmake_build rcc_build uic_build \
+USES= cmake qt:4
+USE_QT= linguisttools_build moc_build qmake_build rcc_build uic_build \
corelib gui svg
USE_GITHUB= yes
diff --git a/x11/radare-cutter/Makefile b/x11/radare-cutter/Makefile
index 85cd35b7373a..745875cecafa 100644
--- a/x11/radare-cutter/Makefile
+++ b/x11/radare-cutter/Makefile
@@ -16,12 +16,12 @@ RUN_DEPENDS= python3:lang/python3
LIB_DEPENDS= libr2.so:devel/radare2
-USES= pkgconfig python:3.4+ qmake
+USES= pkgconfig python:3.4+ qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= radareorg
GH_PROJECT= cutter
-USE_QT5= buildtools_build core gui svg webengine widgets
+USE_QT= buildtools_build core gui svg webengine widgets
WRKSRC_SUBDIR= src
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index cae03fd3b40a..099948696140 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -12,10 +12,10 @@ COMMENT= KDE RSI prevention tool
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 crash dbusaddons doctools ecm \
iconthemes i18n idletime notifications notifyconfig \
sonnet textwidgets xmlgui widgetsaddons windowsystem
-USE_QT5= core dbus gui widgets xml buildtools_build qmake_build
+USE_QT= core dbus gui widgets xml buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
index f99aa29e2bd8..bff1b21d31f6 100644
--- a/x11/sddm/Makefile
+++ b/x11/sddm/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= x11
MAINTAINER= kde@FreeBSD.org
COMMENT= QML based login manager
-USES= cmake:outsource desktop-file-utils kde:5
+USES= cmake:outsource desktop-file-utils kde:5 qt:5
USE_KDE= ecm
-USE_QT5= concurrent core dbus gui linguisttools multimedia network \
+USE_QT= concurrent core dbus gui linguisttools multimedia network \
printsupport qml quick script sql webkit widgets \
buildtools_build qmake_build
USE_XORG= xcb
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index 0cf8ca57b8ce..3d4919293a3e 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -16,10 +16,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= konsole:x11/konsole-kde4
-USES= cmake gettext kde:4 shebangfix tar:xz
+USES= cmake gettext kde:4 qt:4 shebangfix tar:xz
SHEBANG_FILES= data/updaters/yakuake-${PORTVERSION}-startupnotification.pl
USE_KDE= automoc4 kdelibs
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 5218205d6632..979dd69557d5 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -14,12 +14,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= konsole:x11/konsole
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth archive codecs completion config configwidgets \
coreaddons crash dbusaddons ecm globalaccel i18n iconthemes \
jobwidgets kio newstuff notifications notifyconfig parts \
service sonnet textwidgets widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network widgets x11extras xml \
+USE_QT= core dbus gui network widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11