aboutsummaryrefslogtreecommitdiff
path: root/audio
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 /audio
parentbc77780d41178cf3d0327c79ac10737af704f236 (diff)
downloadports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.tar.gz
ports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.zip
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/abgate-lv2/Makefile4
-rw-r--r--audio/acoustid-fingerprinter/Makefile4
-rw-r--r--audio/amarok-kde4/Makefile4
-rw-r--r--audio/audex/Makefile4
-rw-r--r--audio/audiocd-kio/Makefile4
-rw-r--r--audio/cantata/Makefile10
-rw-r--r--audio/carla/Makefile4
-rw-r--r--audio/clementine-player/Makefile4
-rw-r--r--audio/creox/Makefile4
-rw-r--r--audio/cueplayer/Makefile4
-rw-r--r--audio/dream/Makefile4
-rw-r--r--audio/drumstick/Makefile4
-rw-r--r--audio/dsbmixer/Makefile4
-rw-r--r--audio/dssi/Makefile4
-rw-r--r--audio/esperanza/Makefile5
-rw-r--r--audio/flacon/Makefile4
-rw-r--r--audio/fmit/Makefile4
-rw-r--r--audio/guidolib/Makefile4
-rw-r--r--audio/hydrogen/Makefile4
-rw-r--r--audio/jalv/Makefile5
-rw-r--r--audio/juk-kde4/Makefile4
-rw-r--r--audio/juk/Makefile4
-rw-r--r--audio/kid3-kde4/Makefile15
-rw-r--r--audio/kio-audiocd-kde4/Makefile4
-rw-r--r--audio/kmix-kde4/Makefile4
-rw-r--r--audio/kmix/Makefile4
-rw-r--r--audio/kscd-kde4/Makefile4
-rw-r--r--audio/kstreamripper/Makefile4
-rw-r--r--audio/kwave/Makefile4
-rw-r--r--audio/lastfm-desktop/Makefile7
-rw-r--r--audio/libechonest/Makefile6
-rw-r--r--audio/libkcddb-kde4/Makefile4
-rw-r--r--audio/libkcddb/Makefile4
-rw-r--r--audio/libkcompactdisc-kde4/Makefile4
-rw-r--r--audio/libkcompactdisc/Makefile4
-rw-r--r--audio/liblastfm/Makefile13
-rw-r--r--audio/lmms/Makefile4
-rw-r--r--audio/midipp/Makefile6
-rw-r--r--audio/minitunes/Makefile4
-rw-r--r--audio/mixxx/Makefile4
-rw-r--r--audio/mixxx20/Makefile4
-rw-r--r--audio/mous/Makefile3
-rw-r--r--audio/mumble/Makefile7
-rw-r--r--audio/murmur/Makefile10
-rw-r--r--audio/musescore/Makefile4
-rw-r--r--audio/mythplugin-mythmusic/Makefile3
-rw-r--r--audio/openal-soft/Makefile3
-rw-r--r--audio/padthv1-lv2/Makefile4
-rw-r--r--audio/pc-mixer/Makefile4
-rw-r--r--audio/plasma5-plasma-pa/Makefile4
-rw-r--r--audio/polyphone/Makefile4
-rw-r--r--audio/qjackctl/Makefile6
-rw-r--r--audio/qmidiarp/Makefile4
-rw-r--r--audio/qmpdclient/Makefile10
-rw-r--r--audio/qsampler/Makefile13
-rw-r--r--audio/qsynth/Makefile4
-rw-r--r--audio/quimup/Makefile4
-rw-r--r--audio/rosegarden/Makefile13
-rw-r--r--audio/sayonara/Makefile4
-rw-r--r--audio/simon/Makefile4
-rw-r--r--audio/skype-call-recorder/Makefile4
-rw-r--r--audio/sonic-visualiser/Makefile4
-rw-r--r--audio/soundkonverter/Makefile4
-rw-r--r--audio/supercollider/Makefile4
-rw-r--r--audio/synthpod-lv2/Makefile6
-rw-r--r--audio/virtual_oss_ctl/Makefile4
-rw-r--r--audio/vmpk/Makefile6
67 files changed, 178 insertions, 161 deletions
diff --git a/audio/abgate-lv2/Makefile b/audio/abgate-lv2/Makefile
index 88eccd54ebd0..3b0a8585691e 100644
--- a/audio/abgate-lv2/Makefile
+++ b/audio/abgate-lv2/Makefile
@@ -17,11 +17,11 @@ BROKEN_powerpc64= fails to build: cc1plus: unrecognized command line option -std
BUILD_DEPENDS= lv2>0:audio/lv2
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= antanasbruzas
USE_CXXSTD= c++11
-USE_QT5= core gui widgets buildtools_build qmake_build
+USE_QT= core gui widgets buildtools_build qmake_build
USE_GL= gl
USE_GNOME= atkmm gtk20 gtkmm24 libsigc++20
USE_LDCONFIG= yes
diff --git a/audio/acoustid-fingerprinter/Makefile b/audio/acoustid-fingerprinter/Makefile
index e8a8214ae0c2..d8b859804cc0 100644
--- a/audio/acoustid-fingerprinter/Makefile
+++ b/audio/acoustid-fingerprinter/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \
BROKEN_armv6= fails to link: fingerprintcalculator.cpp: undefined reference to 'chromaprint_new'
BROKEN_powerpc64= fails to compile: libchromaprint.so: undefined reference to std::__cxx11::basic_string
-USES= cmake desktop-file-utils
-USE_QT4= corelib gui network \
+USES= cmake desktop-file-utils qt:4
+USE_QT= corelib gui network \
qmake_build moc_build rcc_build uic_build
USE_GITHUB= yes
GH_ACCOUNT= acoustid
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 47a93cdad9c6..68285d41577f 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -24,11 +24,11 @@ RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel
${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
USES= cmake:outsource kde:4 mysql:client,embedded pkgconfig \
- shared-mime-info shebangfix ssl tar:bzip2
+ qt:4 shared-mime-info shebangfix ssl tar:bzip2
USE_GL= gl
USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \
nepomuk-core runtime soprano strigi
-USE_QT4= corelib dbus designer gui network opengl \
+USE_QT= corelib dbus designer gui network opengl \
phonon script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= ice sm x11 xau xdmcp xext xft xpm
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index 3323cd9de966..8d9bafaffd0a 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv3
LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia
-USES= tar:xz cmake kde:4
+USES= qt:4 tar:xz cmake kde:4
USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc
-USE_QT4= gui dbus network svg xml \
+USE_QT= gui dbus network svg xml \
qmake_build moc_build rcc_build uic_build
# Too many changes for suffix on literals without a space.
USE_CXXSTD= gnu++98
diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile
index 124abace7036..4d86c049d256 100644
--- a/audio/audiocd-kio/Makefile
+++ b/audio/audiocd-kio/Makefile
@@ -17,13 +17,13 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libKF5Cddb.so:audio/libkcddb \
libKF5CompactDisc.so:audio/libkcompactdisc
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews \
jobwidgets kdelibs4support kio notifications parts \
service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport widgets xml \
+USE_QT= core dbus gui network phonon4 printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index 5f77bafcf8f5..f91ec9adeff8 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -14,14 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= CDrummond
-USE_QT5= buildtools_build concurrent core dbus gui network \
+USE_QT= buildtools_build concurrent core dbus gui network \
qmake_build sql sql-sqlite3_run svg widgets xml
CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \
-DENABLE_KDE:BOOL=FALSE \
-DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE
-USES= cmake:outsource cpe pkgconfig shebangfix
+USES= cmake:outsource cpe pkgconfig qt:5 shebangfix
SHEBANG_FILES= playlists/cantata-dynamic cantata-remote.cmake \
devices/mounter/mount.cifs.wrapper
CPE_VENDOR= craig_drummond
@@ -71,7 +71,8 @@ MUSICBRAINZ_IMPLIES= CDPARANOIA
MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ
-NLS_USE= QT5=linguisttools_build
+NLS_USES= qt:5
+NLS_USE= QT=linguisttools_build
NLS_CMAKE_ON= -DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \
@@ -79,7 +80,8 @@ NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \
PROXY_CMAKE_BOOL= ENABLE_PROXY_CONFIG
-QT5_USE= QT5=multimedia
+QT5_USES= qt:5
+QT5_USE= QT=multimedia
TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib \
libtag-extras.so:audio/taglib-extras
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index 7529333c9110..f29c63997c76 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -18,12 +18,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
CONFLICTS_BUILD= rtaudio-* rtmidi-*
USES= compiler:c++11-lib desktop-file-utils gmake localbase \
- pkgconfig pyqt:5 python:3.4+ shared-mime-info shebangfix tar:bz2
+ pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix tar:bz2
USE_GITHUB= yes
GH_ACCOUNT= falkTX
USE_PYQT= core_run gui_run sip svg_run widgets_run xml_build # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040
USE_GNOME= gtk20 gtk30
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
USE_XORG= x11
USE_LDCONFIG= ${PREFIX}/lib/carla
SHEBANG_FILES= data/carla-single source/native-plugins/resources/*
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index ca7a9fdbe916..5e1282c162e3 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -36,13 +36,13 @@ USES= cmake \
desktop-file-utils \
gettext-tools \
pkgconfig \
- sqlite
+ qt:4 sqlite
USE_GL= gl glew glu
USE_XORG= x11
CONFLICTS_BUILD= qt-3.*
-USE_QT4= corelib \
+USE_QT= corelib \
dbus \
gui \
imageformats \
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 19bb0f36f60c..162af41e3662 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -18,9 +18,9 @@ USE_GITHUB= yes
GH_ACCOUNT= laudrup
GH_PROJECT= Creox4
-USES= cmake:outsource kde:4
+USES= cmake:outsource kde:4 qt:4
USE_KDE= automoc4 kdelibs
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_XORG= xft xpm
USE_CXXSTD= gnu++98
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index 62f643b5ffd7..f00f38388193 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv3
LIB_DEPENDS= libnotify.so:devel/libnotify
-USES= pkgconfig qmake
-USE_QT4= gui xml uic_build moc_build rcc_build network
+USES= pkgconfig qmake qt:4
+USE_QT= gui xml uic_build moc_build rcc_build network
USE_GSTREAMER= flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack
USE_XORG= x11
diff --git a/audio/dream/Makefile b/audio/dream/Makefile
index 6a398d3382b1..a8eb6a62c673 100644
--- a/audio/dream/Makefile
+++ b/audio/dream/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libhamlib.so:comms/hamlib\
libqwt.so:x11-toolkits/qwt5\
libfftw3.so:math/fftw3
-USES= gmake pkgconfig qmake
-USE_QT4= qmake_build moc_build uic_build corelib gui network rcc webkit
+USES= gmake pkgconfig qmake qt:4
+USE_QT= qmake_build moc_build uic_build corelib gui network rcc webkit
WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_DEFINE= SNDFILE OGG VORBIS FLAC OPUS SPEEX FAAD FAAC
diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile
index 38ce98abcc03..b360f437105c 100644
--- a/audio/drumstick/Makefile
+++ b/audio/drumstick/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont
-USES= cmake:outsource pkgconfig shared-mime-info tar:bz2
-USE_QT5= core gui network svg testlib widgets buildtools_build qmake_build
+USES= cmake:outsource pkgconfig qt:5 shared-mime-info tar:bz2
+USE_QT= core gui network svg testlib widgets buildtools_build qmake_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= PULSEAUDIO MANPAGES
diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile
index a89ae2a92bdf..73e2c307d23e 100644
--- a/audio/dsbmixer/Makefile
+++ b/audio/dsbmixer/Makefile
@@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= dsbwrtsysctl:sysutils/dsbwrtsysctl
-USES= tar:tgz qmake
+USES= qt:5 tar:tgz qmake
USE_GL= gl
-USE_QT5= buildtools_build core gui linguisttools_build widgets
+USE_QT= buildtools_build core gui linguisttools_build widgets
QMAKE_ARGS= PORTS=1
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 97c7d710b21a..fff45b621aa7 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -37,8 +37,8 @@ OPTIONS_DEFINE= DOCS EXAMPLES QT4
OPTIONS_DEFAULT=QT4
OPTIONS_SUB= yes
-QT4_USE= QT4=corelib,gui,moc_build
-QT_NONSTANDARD= yes
+QT4_USES= qmake:no_env qt:4
+QT4_USE= QT=corelib,gui,moc_build
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index 95f16748dcbf..9feb3de84826 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS= libxmmsclient++.so:audio/cpp-xmms2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E}
-USE_QT4= gui xml network imageformats_run \
+USE_QT= gui xml network imageformats_run \
qmake_build moc_build rcc_build uic_build
-QT_NONSTANDARD= yes
-USES= gmake pkgconfig tar:bzip2
+USES= gmake pkgconfig qmake:no_env qt:4 tar:bzip2
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --disable-growl
MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}"
diff --git a/audio/flacon/Makefile b/audio/flacon/Makefile
index c1e52bf85722..db7a067449d6 100644
--- a/audio/flacon/Makefile
+++ b/audio/flacon/Makefile
@@ -13,9 +13,9 @@ LICENSE= LGPL21
LIB_DEPENDS= libuchardet.so:textproc/uchardet
-USES= cmake desktop-file-utils pkgconfig
+USES= cmake desktop-file-utils pkgconfig qt:5
USE_GITHUB= yes
-USE_QT5= buildtools_build concurrent_build qmake_build \
+USE_QT= buildtools_build concurrent_build qmake_build \
linguisttools_build core gui network widgets
.include <bsd.port.mk>
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index 8c2f426892b9..cb5fd55b4484 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -16,10 +16,10 @@ LICENSE= GPLv2
LIB_DEPENDS= libfftw3.so:math/fftw3
USE_XORG= xmu
-USE_QT4= corelib gui opengl \
+USE_QT= corelib gui opengl \
linguist_build moc_build qmake_build rcc_build uic_build
USE_GL= glut
-USES= cmake pkgconfig tar:bzip2
+USES= cmake pkgconfig qt:4 tar:bzip2
INSTALLS_ICONS= yes
OPTIONS_DEFINE= ALSA JACK OSS PORTAUDIO
diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile
index a055e61cb710..107ff4fab396 100644
--- a/audio/guidolib/Makefile
+++ b/audio/guidolib/Makefile
@@ -13,10 +13,10 @@ LICENSE= MPL20
BUILD_DEPENDS= cmake:devel/cmake
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= grame-cncm
-USE_QT5= core gui widgets printsupport xml buildtools_build qmake_build
+USE_QT= core gui widgets printsupport xml buildtools_build qmake_build
USE_GL= gl
USE_GNOME= cairo
USE_LDCONFIG= yes
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 906724240b53..087be482476b 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \
USE_GITHUB= yes
GH_ACCOUNT= hydrogen-music
-USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig
-USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
+USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build corelib \
gui network xml xmlpatterns
OPTIONS_SINGLE= EXPORT
diff --git a/audio/jalv/Makefile b/audio/jalv/Makefile
index 2cc940d8408a..6bb9796b9643 100644
--- a/audio/jalv/Makefile
+++ b/audio/jalv/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS= liblilv-0.so:audio/lilv \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= compiler:c++11-lang waf tar:bz2 pkgconfig
+USES= compiler:c++11-lang qmake:no_configure,no_env qt:5 waf tar:bz2 pkgconfig
CONFIGURE_ARGS= --no-qt4
USE_CXXSTD= c++11
-USE_QT5= core gui widgets buildtools_build
+USE_QT= core gui widgets buildtools_build
USE_GNOME= atk atkmm cairo cairomm pango pangomm libsigc++20 \
gdkpixbuf2 glib20 glibmm gtk20 gtk30 gtkmm24
-QT_NONSTANDARD= yes
post-patch:
@${REINPLACE_CMD} 's|$${MANDIR}|${MAN1PREFIX}/man|' \
diff --git a/audio/juk-kde4/Makefile b/audio/juk-kde4/Makefile
index f25adbc1b12f..0b7488eb3bf6 100644
--- a/audio/juk-kde4/Makefile
+++ b/audio/juk-kde4/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libtag.so:audio/taglib
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 4968e5210641..c2606dc4749d 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -12,12 +12,12 @@ LICENSE= GPLv2
LIB_DEPENDS= libtag.so:audio/taglib
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash globalaccel i18n iconthemes itemviews \
jobwidgets kio notifications service solid sonnet textwidgets \
wallet widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 svg widgets xml \
+USE_QT= core dbus gui network phonon4 svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index e8a6e2539e9b..e9d1302b0656 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -36,24 +36,24 @@ PLIST_SUB+= QT="" KDE="@comment "
. if ${PKGNAMESUFFIX} == "-qt5"
# Qt 5 only
CONFLICTS_INSTALL= kid3-3.* kid3-qt4-3.*
-
-USE_QT5= core dbus gui multimedia network testlib xml widgets \
+USES+= qt:5
+USE_QT= core dbus gui multimedia network testlib xml widgets \
buildtools_build linguisttools_build qmake_build
CMAKE_ARGS+= -DWITH_QT5=true
OPTIONS_EXCLUDE=PHONON
. elif ${PKGNAMESUFFIX} == "-qt4"
# Qt 4 only
CONFLICTS_INSTALL= kid3-3.* kid3-qt5-3.*
-
-USE_QT4= corelib dbus gui network xml \
+USES+= qt:4
+USE_QT= corelib dbus gui network xml \
qmake_build moc_build rcc_build uic_build \
linguisttools_build
. endif
.else
# KDE 4 only
CONFLICTS_INSTALL= kid3-qt4-3.* kid3-qt5-3.*
-
-USE_QT4= corelib dbus gui network svg xml \
+USES+= qt:4
+USE_QT= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build \
linguisttools_build
USE_KDE= kdelibs automoc4
@@ -81,7 +81,8 @@ MP3_CMAKE_BOOL= WITH_ID3LIB
MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2
MP4_CMAKE_BOOL= WITH_MP4V2
-PHONON_USE= QT4=phonon
+PHONON_USES= qt:4
+PHONON_USE= QT=phonon
PHONON_CMAKE_BOOL= WITH_PHONON
TAGLIB_DESC= Various audio formats support via Taglib
diff --git a/audio/kio-audiocd-kde4/Makefile b/audio/kio-audiocd-kde4/Makefile
index eef218563d19..707362461eff 100644
--- a/audio/kio-audiocd-kde4/Makefile
+++ b/audio/kio-audiocd-kde4/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs libkcddb libkcompactdisc \
automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= LAME
diff --git a/audio/kmix-kde4/Makefile b/audio/kmix-kde4/Makefile
index c74fc203f8c4..0db57523b2c7 100644
--- a/audio/kmix-kde4/Makefile
+++ b/audio/kmix-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT= Sound mixer for KDE
LICENSE= GPLv2
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= gui phonon xml \
+USE_QT= gui phonon xml \
moc_build qmake_build rcc_build uic_build
OPTIONS_DEFINE= ALSA PULSEAUDIO
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 86f8e68cf253..134cf41f3e09 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -11,12 +11,12 @@ LICENSE= GPLv2
LIB_DEPENDS= libasound.so:audio/alsa-lib
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
emoticons globalaccel i18n iconthemes init itemmodels \
itemviews kcmutils kdelibs4support notifications package \
plasma-framework service solid widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
# we want the KF5 version of kmix
diff --git a/audio/kscd-kde4/Makefile b/audio/kscd-kde4/Makefile
index 2c6ff23b1ca4..6d4b8f558d8c 100644
--- a/audio/kscd-kde4/Makefile
+++ b/audio/kscd-kde4/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libmusicbrainz3.so:audio/libmusicbrainz3
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= phonon moc_build qmake_build rcc_build uic_build
+USE_QT= phonon moc_build qmake_build rcc_build uic_build
OPTIONS_DEFINE= ALSA
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index 91b619a0a70a..f23d40560f01 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -12,9 +12,9 @@ COMMENT= Program for recording streams for KDE4
RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:audio/streamripper
-USES= cmake gettext-tools kde:4 tar:bzip2
+USES= cmake gettext-tools kde:4 qt:4 tar:bzip2
USE_KDE= kdelibs automoc4
-USE_QT4= qmake_build moc_build rcc_build uic_build
+USE_QT= qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/kwave/Makefile b/audio/kwave/Makefile
index 64d09addb2ea..62ffe1590262 100644
--- a/audio/kwave/Makefile
+++ b/audio/kwave/Makefile
@@ -19,12 +19,12 @@ LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \
libvorbisenc.so:audio/libvorbis
USES= cmake:outsource desktop-file-utils gettext kde:5 \
- localbase:ldflags pkgconfig tar:xz
+ localbase:ldflags pkgconfig qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemviews \
jobwidgets kio service solid sonnet textwidgets widgetsaddons \
xmlgui
-USE_QT5= concurrent core dbus gui multimedia network widgets xml \
+USE_QT= concurrent core dbus gui multimedia network widgets xml \
buildtools_build qmake_build
OPTIONS_GROUP= AUDIOPLUGIN
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 2e6e4d9bdaa6..0a1101b28943 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= liblastfm.so:audio/liblastfm \
USE_GITHUB= yes
GH_ACCOUNT= lastfm
-USES= gettext pkgconfig qmake gmake
-USE_QT4= corelib dbus gui linguist_build moc_build network phonon \
+USES= gettext pkgconfig qmake gmake qt:4
+USE_QT= corelib dbus gui linguist_build moc_build network phonon \
rcc_build sql uic_build webkit xml
SUB_FILES= lastfm-desktop.sh
@@ -37,7 +37,8 @@ OPTIONS_SINGLE= PHONON
OPTIONS_SINGLE_PHONON= GSTREAMER VLC
OPTIONS_DEFAULT= VLC
GSTREAMER_DESC= Multimedia via Phonon-GStreamer
-GSTREAMER_USE= QT4=phonon-gst_run
+GSTREAMER_USES= qt:4
+GSTREAMER_USE= QT=phonon-gst_run
VLC_DESC= Multimedia via Phonon-VLC
VLC_RUN_DEPENDS= phonon-vlc-qt4>=0.6.1:multimedia/phonon-vlc@qt4
diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index 6e273067c230..56cf0f90fca4 100644
--- a/audio/libechonest/Makefile
+++ b/audio/libechonest/Makefile
@@ -21,11 +21,11 @@ OPTIONS_DEFINE= TEST
PLIST_SUB= PORTVERSION=${PORTVERSION}
TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
-TEST_USE= qt4=qtestlib_build,xml_build
+TEST_USE= qt=qtestlib_build,xml_build
-USES= cmake pkgconfig
+USES= cmake pkgconfig qt:4
USE_GITHUB= yes
USE_LDCONFIG= yes
-USE_QT4= corelib qmake_build moc_build network rcc_build
+USE_QT= corelib qmake_build moc_build network rcc_build
.include <bsd.port.mk>
diff --git a/audio/libkcddb-kde4/Makefile b/audio/libkcddb-kde4/Makefile
index 8426afb53ff5..4bdf62d8efcc 100644
--- a/audio/libkcddb-kde4/Makefile
+++ b/audio/libkcddb-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT= KDE CDDB library
LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= qtestlib moc_build qmake_build rcc_build uic_build
+USE_QT= qtestlib moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index 7ffbefa59910..74fe6170b8be 100644
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@@ -9,11 +9,11 @@ COMMENT= KDE CDDB library
LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets \
coreaddons ecm i18n jobwidgets kio service \
widgetsaddons
-USE_QT5= core gui network widgets xml \
+USE_QT= core gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/audio/libkcompactdisc-kde4/Makefile b/audio/libkcompactdisc-kde4/Makefile
index aa89b940dd2e..6d11261fe338 100644
--- a/audio/libkcompactdisc-kde4/Makefile
+++ b/audio/libkcompactdisc-kde4/Makefile
@@ -9,9 +9,9 @@ CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE library for interfacing with audio CDs
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= phonon moc_build qmake_build rcc_build uic_build
+USE_QT= phonon moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= ALSA
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 409f30e6296d..1be3b0810482 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= audio kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE library for interfacing with audio CDs
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= coreaddons ecm emoticons i18n itemmodels itemviews \
kdelibs4support solid
-USE_QT5= core dbus phonon4\
+USE_QT= core dbus phonon4\
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 84df07c7c9a3..f63c2ac9f6bf 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -13,18 +13,20 @@ COMMENT= Qt C++ library for the Last.fm webservices
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake pkgconfig
+USES= cmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= lastfm
USE_LDCONFIG= yes
SLAVE?= qt4
.if ${SLAVE} == qt4
-USE_QT4= corelib dbus network sql xml \
+USES+= qt:4
+USE_QT= corelib dbus network sql xml \
moc_build qmake_build rcc_build
CMAKE_ON+= BUILD_WITH_QT4
.else
-USE_QT5= core dbus network sql xml \
+USES+= qt:5
+USE_QT= core dbus network sql xml \
buildtools_build qmake_build
CMAKE_OFF+= BUILD_WITH_QT4
QTVER_SUFFIX= 5
@@ -45,9 +47,10 @@ FINGERPRINT_BUILD_DEPENDS= ${NONEXISTENT}:math/fftw3:patch
FINGERPRINT_CMAKE_ON= -DLIBFFTW3_INCLUDE_DIR:PATH=`${MAKE} -C ${PORTSDIR}/math/fftw3 -VWRKSRC`/api
.if ${SLAVE} == qt4
-TEST_USE= QT4=qtestlib_build
+TEST_USES= qt:4 qt:5
+TEST_USE= QT=qtestlib_build
.else
-TEST_USE= QT5=testlib_build
+TEST_USE= QT=testlib_build
.endif
TEST_CMAKE_BOOL= BUILD_TESTS
TEST_TEST_TARGET= test
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 94fec5233196..f5107a61cb8d 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -34,11 +34,11 @@ OPTIONS_DEFAULT=OSS
USE_LDCONFIG= yes
USE_XORG= x11 xext xft ice sm
-USE_QT4= corelib gui xml moc_build uic_build rcc_build \
+USE_QT= corelib gui xml moc_build uic_build rcc_build \
qmake_build
USE_GITHUB= yes
GH_ACCOUNT= LMMS
-USES= cmake desktop-file-utils dos2unix pkgconfig shared-mime-info
+USES= cmake desktop-file-utils dos2unix pkgconfig qt:4 shared-mime-info
CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \
-DWANT_CALF:BOOL=OFF \
-DWANT_CAPS:BOOL=OFF \
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index 46ecf7d28858..0b24bf05523b 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -25,7 +25,9 @@ OPTIONS_SINGLE_TOOLKIT= QT4 QT5
OPTIONS_DEFAULT= QT5
TOOLKIT_DESC= Qt toolkit
-QT4_USE= ${_USE_QT4:S/^/QT4=/}
-QT5_USE= ${_USE_QT5:S/^/QT5=/} GL=gl
+QT4_USES= qt:4
+QT4_USE= ${_USE_QT4:S/^/QT=/}
+QT5_USES= qt:5
+QT5_USE= ${_USE_QT5:S/^/QT=/} GL=gl
.include <bsd.port.mk>
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index f105f10a0e27..b482f74eab40 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -12,8 +12,8 @@ COMMENT= Just another music player
LIB_DEPENDS= libtag.so:audio/taglib
-USES= qmake
-USE_QT4= dbus gui moc_build network phonon rcc_build \
+USES= qmake qt:4
+USE_QT= dbus gui moc_build network phonon rcc_build \
sql uic_build xml
INSTALLS_ICONS= yes
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index b2320b565f6e..e4d387d60a5d 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -33,8 +33,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BROKEN_aarch64= fails to compile: Exception("invalid machine type")
BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack
-USES= scons iconv pkgconfig
-USE_QT4= corelib gui network opengl script scripttools sql sql-sqlite3 \
+USES= qt:4 scons iconv pkgconfig
+USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
diff --git a/audio/mixxx20/Makefile b/audio/mixxx20/Makefile
index c4a16b3fddab..4fc638236721 100644
--- a/audio/mixxx20/Makefile
+++ b/audio/mixxx20/Makefile
@@ -31,8 +31,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BROKEN_aarch64= fails to compile: Exception("invalid machine type")
BROKEN_powerpc64= fails to configure: unmet dependencies: Could not find libprotobuf, libchromaprint, libmp4, and libwavpack
-USES= scons iconv pkgconfig
-USE_QT4= corelib gui network opengl script scripttools sql sql-sqlite3 \
+USES= qt:4 scons iconv pkgconfig
+USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 361c6180c708..f799a59eb64d 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -72,7 +72,8 @@ NCURSES_USE= ncurses
OSS_CMAKE_BOOL= WITH_PLUGIN_OSS
QT5_CMAKE_BOOL= WITH_APP_QT5
-QT5_USE= qt5=buildtools,core,gui,widgets,qmake_build
+QT5_USES= qt:5
+QT5_USE= qt=buildtools,core,gui,widgets,qmake_build
SNDIO_CMAKE_BOOL= WITH_PLUGIN_SNDIO
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 7b6621dfaa77..2e787e482351 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS+= libspeex.so:audio/speex \
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-USES= compiler cpe desktop-file-utils gmake pkgconfig qmake ssl
+USES= compiler cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl
USE_GITHUB= yes
GH_ACCOUNT= mumble-voip
GH_PROJECT= mumble celt-0.7.0:mumble_celt_0_7 celt-0.11.0:mumble_celt_0_11
GH_TAGNAME= 5a16cda:mumble_celt_0_7 e18de77:mumble_celt_0_11
GH_SUBDIR= celt-0.7.0-src:mumble_celt_0_7 celt-0.11.0-src:mumble_celt_0_11
-USE_QT4= gui svg iconengines_run xml sql network l10n \
+USE_QT= gui svg iconengines_run xml sql network l10n \
linguist_build moc_build rcc_build uic_build \
opengl sql-sqlite3_run corelib
USE_LDCONFIG= yes
@@ -45,7 +45,8 @@ OPTIONS_DEFINE= DBUS BONJOUR PORTAUDIO
OPTIONS_DEFAULT= DBUS
DBUS_VARS_OFF= CONFIG+=no-dbus
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
BONJOUR_DESC= Bonjour support
BONJOUR_VARS_OFF= CONFIG+=no-bonjour
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index b9fffba99c8f..85f4dab24b1f 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf
USERS= murmur
GROUPS= murmur
-USES= compiler:c++11-lang qmake pkgconfig ssl
-USE_QT4= moc_build corelib network sql xml
+USES= compiler:c++11-lang qmake pkgconfig qt:4 ssl
+USE_QT= moc_build corelib network sql xml
USE_GITHUB= YES
GH_ACCOUNT= mumble-voip
@@ -46,7 +46,7 @@ CONFIG+= no-ice
.endif
.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+= dbus
+USE_QT+= dbus
.else
CONFIG+= no-dbus
.endif
@@ -58,13 +58,13 @@ CONFIG+= no-bonjour
.endif
.if ${PORT_OPTIONS:MMYSQL}
-USE_QT4+= sql-mysql
+USE_QT+= sql-mysql
.else
CONFIG+= no-sql-mysql
.endif
.if ${PORT_OPTIONS:MSQLITE}
-USE_QT4+= sql-sqlite3_run
+USE_QT+= sql-sqlite3_run
.else
CONFIG+= no-sqlite3_run
.endif
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 4998c3304295..67e609d1fd20 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \
libfreetype.so:print/freetype2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig shared-mime-info zip
-USE_QT5= core gui widgets opengl concurrent designer help network \
+ pkgconfig qt:5 shared-mime-info zip
+USE_QT= core gui widgets opengl concurrent designer help network \
scripttools qml quick svg sql printsupport testlib webkit \
xml xmlpatterns \
buildtools_build linguisttools_build qmake_build uitools_build
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 8c40ab0b0875..ed428ce8667d 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -20,11 +20,12 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libvorbis.so:audio/libvorbis \
libmyth-29.so:multimedia/mythtv
+USES= qt:5
USE_GITHUB= yes
GH_ACCOUNT= MythTV
GH_PROJECT= mythtv
USE_LDCONFIG= yes
-USE_QT5= buildtools_build core gui qmake_build sql xml
+USE_QT= buildtools_build core gui qmake_build sql xml
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-all \
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index df1a5bab165b..44003f5f715a 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -35,7 +35,8 @@ CONFIG_DESC= Install configuration utility (needs Qt 4.x)
CONFIG_CMAKE_BOOL_OFF= ALSOFT_NO_CONFIG_UTIL
CONFIG_CMAKE_ON= -DALSOFT_NO_QT5:BOOL=ON
-CONFIG_USE= QT4=corelib,gui,qmake_build,moc_build,rcc_build,uic_build
+CONFIG_USES= qt:4
+CONFIG_USE= QT=corelib,gui,qmake_build,moc_build,rcc_build,uic_build
JACK_CMAKE_BOOL= ALSOFT_REQUIRE_JACK ALSOFT_BACKEND_JACK
JACK_LIB_DEPENDS= libjack.so:audio/jack
diff --git a/audio/padthv1-lv2/Makefile b/audio/padthv1-lv2/Makefile
index 2902b29509f9..46bcaac3b96e 100644
--- a/audio/padthv1-lv2/Makefile
+++ b/audio/padthv1-lv2/Makefile
@@ -17,12 +17,12 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libjack.so:audio/jack \
liblo.so:audio/liblo
-USES= autoreconf gmake pkgconfig shared-mime-info
+USES= autoreconf gmake pkgconfig qt:5 shared-mime-info
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= rncbc
USE_GL= gl
-USE_QT5= core gui widgets xml buildtools_build qmake_build
+USE_QT= core gui widgets xml buildtools_build qmake_build
PLIST_SUB= SHL3=${PORTVERSION} SHL2=${PORTVERSION:R} SHL1=${PORTVERSION:R:R}
diff --git a/audio/pc-mixer/Makefile b/audio/pc-mixer/Makefile
index e4ce0f18a509..905034dfb7eb 100644
--- a/audio/pc-mixer/Makefile
+++ b/audio/pc-mixer/Makefile
@@ -13,9 +13,9 @@ WRKSRC_SUBDIR= src-qt5
MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}
MAKE_JOBS_UNSAFE=yes
-USES= qmake shebangfix tar:xz
+USES= qmake qt:5 shebangfix tar:xz
USE_LDCONFIG= yes
-USE_QT5= core gui network svg linguist \
+USE_QT= core gui network svg linguist \
buildtools x11extras widgets multimedia
USE_GL+= gl
diff --git a/audio/plasma5-plasma-pa/Makefile b/audio/plasma5-plasma-pa/Makefile
index d2dcac4f46c9..2e5a58821370 100644
--- a/audio/plasma5-plasma-pa/Makefile
+++ b/audio/plasma5-plasma-pa/Makefile
@@ -11,11 +11,11 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libpulse.so:audio/pulseaudio
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 \
- pkgconfig shebangfix tar:xz
+ pkgconfig qt:5 shebangfix tar:xz
USE_GNOME= gconf2
USE_KDE= config configwidgets coreaddons ecm globalaccel i18n \
kdeclarative package plasma-framework
-USE_QT5= core dbus gui network qml quick widgets \
+USE_QT= core dbus gui network qml quick widgets \
buildtools_build qmake_build
SHEBANG_FILES= data/plasmaVolumeDisableKMixAutostart.pl
diff --git a/audio/polyphone/Makefile b/audio/polyphone/Makefile
index 5b0bc6a3c7c2..1d3cdad48fe7 100644
--- a/audio/polyphone/Makefile
+++ b/audio/polyphone/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS= libjack.so:audio/jack \
libstk-4.6.0.so:audio/stk \
libvorbisfile.so:audio/libvorbis
-USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource shared-mime-info zip
+USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource qt:5 shared-mime-info zip
USE_GL= gl
-USE_QT5= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
+USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
USE_CXXSTD= c++11
QMAKE_ARGS= DEFINES=USE_LOCAL_QCUSTOMPLOT
CXXFLAGS+= -D__UNIX_JACK__
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 341c0d2e9b82..676182ec0a36 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libjack.so:audio/jack
-USES= autoreconf compiler:c++11-lib gmake localbase pkgconfig
+USES= autoreconf compiler:c++11-lib gmake localbase pkgconfig qt:5
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= rncbc
-USE_QT5= core gui widgets x11extras xml buildtools_build linguisttools_build qmake_build
+USE_QT= core gui widgets x11extras xml buildtools_build linguisttools_build qmake_build
USE_GL= gl
USE_CXXSTD= c++11
@@ -36,7 +36,7 @@ ALSA_CONFIGURE_ENABLE= alsa_seq
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
DBUS_CONFIGURE_ENABLE= dbus
-DBUS_USE= QT5=dbus
+DBUS_USE= QT=dbus
PORTAUDIO_CONFIGURE_ENABLE= portaudio
PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
diff --git a/audio/qmidiarp/Makefile b/audio/qmidiarp/Makefile
index 5f698346ed0e..9ad98a4f3c38 100644
--- a/audio/qmidiarp/Makefile
+++ b/audio/qmidiarp/Makefile
@@ -22,10 +22,10 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
PORTSCOUT= limit:^qmidiarp
USES= autoreconf compiler:c++11-lib desktop-file-utils \
- gmake localbase libtool pkgconfig
+ gmake localbase libtool pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= emuse
-USE_QT5= core gui network widgets buildtools_build \
+USE_QT= core gui network widgets buildtools_build \
linguisttools_build
USE_CXXSTD= c++11
GNU_CONFIGURE= yes
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 546f64a246b8..98dcaff2bcd3 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -13,8 +13,8 @@ COMMENT= Easy to use musicpd client written in Qt4
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
-USE_QT4= moc_build rcc_build uic_build \
+USES= qmake qt:4 tar:bzip2
+USE_QT= moc_build rcc_build uic_build \
corelib gui network xml xmlpatterns
INSTALLS_ICONS= yes
@@ -25,10 +25,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_SUB= yes
-NLS_USE= QT4=linguisttools_build
+NLS_USES= qt:4
+NLS_USE= QT=linguisttools_build
DBUS_QMAKE_ON= CONFIG+=qdbus
-DBUS_USE= QT4=dbus
+DBUS_USES= qt:4
+DBUS_USE= QT=dbus
DEBUG_QMAKE_ON= CONFIG+=debug
diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index 740765c8273f..b3b0109e7740 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= linuxsampler:audio/linuxsampler
LDFLAGS+= -L${LOCALBASE}/lib
USES= autoreconf gmake pkgconfig shared-mime-info
-QT_NONSTANDARD= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_ac_cv_qmake=${QMAKE} \
ac_cv_path_ac_moc=${MOC} \
@@ -38,13 +37,15 @@ OPTIONS_DEFAULT= QT5
TOOLKIT_DESC= Qt toolkit
-QT4_USE= qt4=corelib,gui \
- qt4=linguisttools_build \
- qt4=moc_build,qmake_build,rcc_build,uic_build
+QT4_USES= qmake:no_env qt:4
+QT4_USE= qt=corelib,gui \
+ qt=linguisttools_build \
+ qt=moc_build,qmake_build,rcc_build,uic_build
QT4_CONFIGURE_ENABLE= qt4
-QT5_USE= qt5=core,gui,widgets,x11extras \
- qt5=buildtools_build,linguisttools_build,qmake_build
+QT5_USES= qmake:no_env qt:5
+QT5_USE= qt=core,gui,widgets,x11extras \
+ qt=buildtools_build,linguisttools_build,qmake_build
QT5_CONFIGURE_ENABLE= qt5
post-configure:
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 28c1f112d2ce..eff22916bdac 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:5
USE_CXXSTD= c++11
-USE_QT5= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
+USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build
USE_GL= gl
GNU_CONFIGURE= yes
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index cb7b40fc073b..bbdf81c02b0f 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \
WRKSRC= ${WRKDIR}/Quimup_${PORTVERSION}
-USES= pkgconfig qmake compiler:c++11-lang
-USE_QT5= core gui network widgets buildtools_build
+USES= pkgconfig qmake compiler:c++11-lang qt:5
+USE_QT= core gui network widgets buildtools_build
USE_GL= gl
CXXFLAGS+= -std=c++11
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index f42b5f706bf5..cae9802b4cc7 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -34,13 +34,14 @@ OPTIONS_DEFAULT= QT4
LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
LIRC_CMAKE_ON= -DENABLE_LIRC:BOOL=ON
-QT4_USE= qt4=gui,network,testlib,xml \
- qt4=linguisttools_build,moc_build,qmake_build \
- qt4=rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= qt=gui,network,testlib,xml \
+ qt=linguisttools_build,moc_build,qmake_build \
+ qt=rcc_build,uic_build
QT4_CMAKE_ON= -DUSE_QT4:BOOL=ON
-QT5_USES= compiler:c++11-lib
-QT5_USE= qt5=network,printsupport,testlib,widgets,xml \
- qt5=buildtools_build,linguisttools_build,qmake_build
+QT5_USES= compiler:c++11-lib qt:5
+QT5_USE= qt=network,printsupport,testlib,widgets,xml \
+ qt=buildtools_build,linguisttools_build,qmake_build
QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON
TOOLKIT_DESC= Qt toolkit
diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile
index d7e3d7a842ad..1be73df0f82d 100644
--- a/audio/sayonara/Makefile
+++ b/audio/sayonara/Makefile
@@ -18,10 +18,10 @@ LIB_DEPENDS= libtag.so:audio/taglib \
libmtp.so:multimedia/libmtp
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig
+ pkgconfig qt:5
USE_GNOME= glib20
USE_GSTREAMER1= flac libav mpg123 ogg opus vorbis
-USE_QT5= dbus core gui network sql sql-sqlite3_run widgets xml \
+USE_QT= dbus core gui network sql sql-sqlite3_run widgets xml \
buildtools_build qmake_build linguisttools_build
WRKSRC= ${WRKDIR}/${PORTNAME}-player
diff --git a/audio/simon/Makefile b/audio/simon/Makefile
index 49faf22cc72f..b45bbb390d0c 100644
--- a/audio/simon/Makefile
+++ b/audio/simon/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libsphinxad.so:audio/sphinxbase \
libqwt6.so:x11-toolkits/qwt6@qt4
-USES= cmake:outsource gettext kde:4 tar:bz2
+USES= cmake:outsource gettext kde:4 qt:4 tar:bz2
USE_KDE= kdelibs automoc4 pimlibs
-USE_QT4= accessible corelib dbus gui network script sql svg testlib xml \
+USE_QT= accessible corelib dbus gui network script sql svg testlib xml \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xtst
diff --git a/audio/skype-call-recorder/Makefile b/audio/skype-call-recorder/Makefile
index 18a21f40c9c0..bbb40a3cc237 100644
--- a/audio/skype-call-recorder/Makefile
+++ b/audio/skype-call-recorder/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \
libid3.so:audio/id3lib \
libvorbisenc.so:audio/libvorbis
-USES= cmake
-USE_QT4= corelib dbus gui network \
+USES= cmake qt:4
+USE_QT= corelib dbus gui network \
qmake_build moc_build rcc_build uic_build
PLIST_FILES= bin/skype-call-recorder \
diff --git a/audio/sonic-visualiser/Makefile b/audio/sonic-visualiser/Makefile
index 1c77d0efa6ab..15e74c72a039 100644
--- a/audio/sonic-visualiser/Makefile
+++ b/audio/sonic-visualiser/Makefile
@@ -21,10 +21,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libsord-0.so:devel/sord \
libvamp-hostsdk.so:audio/vamp-plugin-sdk
-USES= autoreconf desktop-file-utils pkgconfig
+USES= autoreconf desktop-file-utils pkgconfig qt:5
GNU_CONFIGURE= yes
-USE_QT5= buildtools_build core gui network qmake_build testlib widgets xml
+USE_QT= buildtools_build core gui network qmake_build testlib widgets xml
USE_XORG= x11
USE_GL= gl
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 4375eb9abf80..2f2444a5a24f 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS= libtag.so:audio/taglib \
libphonon.so:multimedia/phonon@qt4
GH_ACCOUNT= HessiJames
-USES= cmake compiler:c++11-lang kde:4
+USES= cmake compiler:c++11-lang kde:4 qt:4
USE_GITHUB= yes
-USE_QT4= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
+USE_QT= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
USE_KDE= automoc4 kdelibs libkcddb
WRKSRC_SUBDIR= src
diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
index f9921c0dfdfc..e5e7160999b2 100644
--- a/audio/supercollider/Makefile
+++ b/audio/supercollider/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libsndfile.so:audio/libsndfile \
libfftw3f.so:math/fftw3-float
-USES= cmake:outsource iconv localbase pkgconfig readline \
+USES= cmake:outsource iconv localbase pkgconfig qt:5 readline \
shared-mime-info tar:bzip2
-USE_QT5= buildtools_build concurrent core gui linguisttools location \
+USE_QT= buildtools_build concurrent core gui linguisttools location \
network opengl printsupport qmake_build qml quick sensors \
sql webkit widgets
USE_LDCONFIG= yes
diff --git a/audio/synthpod-lv2/Makefile b/audio/synthpod-lv2/Makefile
index fab69536d737..e4dad90e08ed 100644
--- a/audio/synthpod-lv2/Makefile
+++ b/audio/synthpod-lv2/Makefile
@@ -58,11 +58,13 @@ JACK_LIB_DEPENDS= libjack.so:audio/jack \
JACK_CMAKE_OFF= -DBUILD_JACK="OFF"
KX_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_KX="ON"
KX_USE= XORG=x11,xcb,xext GL=glu
+QT4_USES= qt:4
QT4_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_QT4="ON"
-QT4_USE= XORG=x11,xcb,xext GL=glu QT4=corelib,gui
+QT4_USE= XORG=x11,xcb,xext GL=glu QT=corelib,gui
+QT5_USES= qt:5
QT5_BROKEN= Build fails: https://github.com/OpenMusicKontrollers/synthpod/issues/10
QT5_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_QT5="ON"
-QT5_USE= XORG=x11,xcb,xext GL=glu QT5=core,gui
+QT5_USE= XORG=x11,xcb,xext GL=glu QT=core,gui
SHOW_USE= XORG=x11,xcb,xext GL=glu
SHOW_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_SHOW="ON"
X11_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_X11="ON"
diff --git a/audio/virtual_oss_ctl/Makefile b/audio/virtual_oss_ctl/Makefile
index d49d5879bfde..c70d27067d1f 100644
--- a/audio/virtual_oss_ctl/Makefile
+++ b/audio/virtual_oss_ctl/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= virtual_oss:audio/virtual_oss
-USES= qmake tar:bzip2
-USE_QT4= corelib gui qmake_build moc_build rcc_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= corelib gui qmake_build moc_build rcc_build
.include <bsd.port.mk>
diff --git a/audio/vmpk/Makefile b/audio/vmpk/Makefile
index 301e01bf39b1..f0d3bcb92412 100644
--- a/audio/vmpk/Makefile
+++ b/audio/vmpk/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdrumstick-rt.so:audio/drumstick
-USES= cmake:outsource pkgconfig tar:bz2
-USE_QT5= core gui network svg widgets x11extras \
+USES= cmake:outsource pkgconfig qt:5 tar:bz2
+USE_QT= core gui network svg widgets x11extras \
buildtools_build linguisttools_build qmake_build
USE_XORG= xcb
@@ -26,6 +26,6 @@ OPTIONS_DEFINE= DBUS
OPTIONS_SUB= yes
DBUS_CMAKE_BOOL= ENABLE_DBUS
-DBUS_USE= qt5=dbus
+DBUS_USE= qt=dbus
.include <bsd.port.mk>