aboutsummaryrefslogtreecommitdiff
path: root/graphics
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 /graphics
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 'graphics')
-rw-r--r--graphics/appleseed/Makefile3
-rw-r--r--graphics/aqsis/Makefile4
-rw-r--r--graphics/autoq3d/Makefile4
-rw-r--r--graphics/burplex/Makefile4
-rw-r--r--graphics/cloudcompare/Makefile7
-rw-r--r--graphics/colmap/Makefile4
-rw-r--r--graphics/converseen/Makefile4
-rw-r--r--graphics/darknock/Makefile4
-rw-r--r--graphics/diffpdf/Makefile4
-rw-r--r--graphics/digikam-kde4/Makefile7
-rw-r--r--graphics/digikam-kde4/Makefile.common4
-rw-r--r--graphics/digikam/Makefile7
-rw-r--r--graphics/dilay/Makefile4
-rw-r--r--graphics/djview4/Makefile6
-rw-r--r--graphics/drawpile/Makefile4
-rw-r--r--graphics/dspdfviewer/Makefile4
-rw-r--r--graphics/easypaint/Makefile4
-rw-r--r--graphics/engauge-digitizer/Makefile6
-rw-r--r--graphics/eos-movrec/Makefile4
-rw-r--r--graphics/evolvotron/Makefile4
-rw-r--r--graphics/fracplanet/Makefile5
-rw-r--r--graphics/fraqtive/Makefile4
-rw-r--r--graphics/gle-graphics/Makefile4
-rw-r--r--graphics/gmic-qt/Makefile4
-rw-r--r--graphics/gnash/Makefile5
-rw-r--r--graphics/gpxsee/Makefile11
-rw-r--r--graphics/graphviz/Makefile5
-rw-r--r--graphics/gwenview-kde4/Makefile4
-rw-r--r--graphics/gwenview/Makefile4
-rw-r--r--graphics/ipe/Makefile4
-rw-r--r--graphics/kamera-kde4/Makefile4
-rw-r--r--graphics/kamera/Makefile4
-rw-r--r--graphics/kcolorchooser-kde4/Makefile4
-rw-r--r--graphics/kcolorchooser/Makefile4
-rw-r--r--graphics/kcoloredit/Makefile4
-rw-r--r--graphics/kdegraphics-mobipocket-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-mobipocket/Makefile4
-rw-r--r--graphics/kdegraphics-strigi-analyzer-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-svgpart-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-svgpart/Makefile4
-rw-r--r--graphics/kdegraphics-thumbnailers-kde4/Makefile4
-rw-r--r--graphics/kdegraphics-thumbnailers/Makefile4
-rw-r--r--graphics/kdegraphics/Makefile4
-rw-r--r--graphics/kdiagram/Makefile4
-rw-r--r--graphics/kf5-kimageformats/Makefile4
-rw-r--r--graphics/kf5-kplotting/Makefile4
-rw-r--r--graphics/kf5-prison/Makefile4
-rw-r--r--graphics/kgraphviewer/Makefile4
-rw-r--r--graphics/kiconedit/Makefile4
-rw-r--r--graphics/kimagemapeditor/Makefile4
-rw-r--r--graphics/kipiplugins/Makefile4
-rw-r--r--graphics/klatexformula/Makefile4
-rw-r--r--graphics/kolourpaint-kde4/Makefile4
-rw-r--r--graphics/kolourpaint/Makefile4
-rw-r--r--graphics/kphotoalbum-kde4/Makefile4
-rw-r--r--graphics/kphotoalbum/Makefile4
-rw-r--r--graphics/kpovmodeler/Makefile4
-rw-r--r--graphics/kqtquickcharts-kde4/Makefile4
-rw-r--r--graphics/krita/Makefile5
-rw-r--r--graphics/ksaneplugin-kde4/Makefile4
-rw-r--r--graphics/ksnapshot-kde4/Makefile4
-rw-r--r--graphics/libQGLViewer/Makefile4
-rw-r--r--graphics/libkdcraw-kde4/Makefile4
-rw-r--r--graphics/libkdcraw/Makefile4
-rw-r--r--graphics/libkexiv2-kde4/Makefile4
-rw-r--r--graphics/libkexiv2/Makefile4
-rw-r--r--graphics/libkipi-kde4/Makefile4
-rw-r--r--graphics/libkipi/Makefile4
-rw-r--r--graphics/libksane-kde4/Makefile4
-rw-r--r--graphics/libksane/Makefile4
-rw-r--r--graphics/libkscreen/Makefile4
-rw-r--r--graphics/lprof-devel/Makefile4
-rw-r--r--graphics/luminance-qt5/Makefile4
-rw-r--r--graphics/luminance/Makefile4
-rw-r--r--graphics/luxrender/Makefile3
-rw-r--r--graphics/lximage-qt/Makefile4
-rw-r--r--graphics/lximageqt-l10n/Makefile4
-rw-r--r--graphics/meshviewer/Makefile4
-rw-r--r--graphics/mitsuba/Makefile4
-rw-r--r--graphics/natron/Makefile4
-rw-r--r--graphics/nomacs/Makefile4
-rw-r--r--graphics/nvidia-texture-tools/Makefile3
-rw-r--r--graphics/okular-kde4/Makefile4
-rw-r--r--graphics/okular/Makefile4
-rw-r--r--graphics/opencsg/Makefile4
-rw-r--r--graphics/opencv/Makefile3
-rw-r--r--graphics/openimageio/Makefile3
-rw-r--r--graphics/openorienteering-mapper/Makefile17
-rw-r--r--graphics/osg-devel/Makefile6
-rw-r--r--graphics/osg/Makefile6
-rw-r--r--graphics/oyranos/Makefile4
-rw-r--r--graphics/pencil/Makefile4
-rw-r--r--graphics/pfstools/Makefile5
-rw-r--r--graphics/photivo/Makefile6
-rw-r--r--graphics/photoqt/Makefile4
-rw-r--r--graphics/phototonic/Makefile4
-rw-r--r--graphics/poppler/Makefile6
-rw-r--r--graphics/prison/Makefile4
-rw-r--r--graphics/py-qt4-svg/Makefile4
-rw-r--r--graphics/py-qt5-svg/Makefile4
-rw-r--r--graphics/qcomicbook/Makefile4
-rw-r--r--graphics/qgis/Makefile4
-rw-r--r--graphics/qt4-iconengines/Makefile5
-rw-r--r--graphics/qt4-imageformats/Makefile5
-rw-r--r--graphics/qt4-opengl/Makefile4
-rw-r--r--graphics/qt4-pixeltool/Makefile4
-rw-r--r--graphics/qt4-svg/Makefile4
-rw-r--r--graphics/qt5-3d/Makefile5
-rw-r--r--graphics/qt5-graphicaleffects/Makefile5
-rw-r--r--graphics/qt5-imageformats/Makefile5
-rw-r--r--graphics/qt5-opengl/Makefile4
-rw-r--r--graphics/qt5-pixeltool/Makefile5
-rw-r--r--graphics/qt5-svg/Makefile5
-rw-r--r--graphics/qt5-wayland/Makefile5
-rw-r--r--graphics/qtawesome/Makefile6
-rw-r--r--graphics/qxv/Makefile4
-rw-r--r--graphics/scantailor/Makefile4
-rw-r--r--graphics/seexpr/Makefile4
-rw-r--r--graphics/showimage/Makefile4
-rw-r--r--graphics/skanlite-kde4/Makefile4
-rw-r--r--graphics/skanlite/Makefile4
-rw-r--r--graphics/smillaenlarger/Makefile4
-rw-r--r--graphics/spectacle/Makefile4
-rw-r--r--graphics/structuresynth/Makefile4
-rw-r--r--graphics/tiled/Makefile4
-rw-r--r--graphics/tulip/Makefile14
-rw-r--r--graphics/xpdf4/Makefile4
-rw-r--r--graphics/yagf/Makefile4
-rw-r--r--graphics/zbar/Makefile3
-rw-r--r--graphics/zint/Makefile4
130 files changed, 300 insertions, 280 deletions
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index a8c0021e56b1..f0fadcb5892a 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -57,7 +57,8 @@ EXAMPLES_CMAKE_OFF= -DWITH_SAMPLES:BOOL=OFF
DISNEY_LIB_DEPENDS= libSeExpr.so:graphics/seexpr
DISNEY_CMAKE_ON= -DWITH_DISNEY_MATERIAL:BOOL=ON
-STUDIO_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,opengl
+STUDIO_USES= qt:4
+STUDIO_USE= QT=moc_build,qmake_build,rcc_build,uic_build,opengl
STUDIO_CMAKE_OFF= -DWITH_STUDIO:BOOL=OFF
.include <bsd.port.pre.mk>
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 7e27fbba4f33..d5997d536fe5 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -27,12 +27,12 @@ LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- shared-mime-info shebangfix
+ qt:4 shared-mime-info shebangfix
USE_CXXSTD= gnu++11
SHEBANG_FILES= examples/*/*/*.sh \
tools/neqsus/houdini/post.sh \
distribution/linux/*.sh
-USE_QT4= opengl qmake_build moc_build rcc_build uic_build
+USE_QT= opengl qmake_build moc_build rcc_build uic_build
PLIST_SUB+= LIBVERS=${PORTVERSION:R}
INSTALLS_ICONS= yes
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index 4ac93c4aa828..249b45351c31 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -14,11 +14,11 @@ COMMENT= Qt 4 quick 3D model editor
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/docs/license.txt
-USES= dos2unix qmake zip
+USES= dos2unix qmake qt:4 zip
DOS2UNIX_FILES= *.pro src/cmds/*.cpp src/fgui/*.cpp docs/*.txt
DOS2UNIX_REGEX= .*.[^p][^n][^g]$
USE_GL= glu
-USE_QT4= corelib gui opengl moc_build
+USE_QT= corelib gui opengl moc_build
PORTDOCS= 3DQformat.txt ChangeLog.txt
diff --git a/graphics/burplex/Makefile b/graphics/burplex/Makefile
index 369238ebfd3c..adcef1398286 100644
--- a/graphics/burplex/Makefile
+++ b/graphics/burplex/Makefile
@@ -14,8 +14,8 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${LOCALBASE}/bin/dcraw:graphics/dcraw
-USES= qmake
-USE_QT4= gui uic_build moc_build rcc_build \
+USES= qmake qt:4
+USE_QT= gui uic_build moc_build rcc_build \
imageformats_run
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
index 701a3a032604..5723058d6345 100644
--- a/graphics/cloudcompare/Makefile
+++ b/graphics/cloudcompare/Makefile
@@ -16,12 +16,12 @@ LICENSE_COMB= multi
BROKEN_FreeBSD_10= error: "SSE instruction set not enabled"
BROKEN_aarch64= fails to compile: mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
-USES= cmake:outsource localbase:ldflags
+USES= cmake:outsource localbase:ldflags qt:5
USE_GITHUB= yes
GH_ACCOUNT= CloudCompare
GH_PROJECT= ${GH_ACCOUNT}
GH_TAGNAME= 5d41227deb30c445ccbaa2d789a4363b57948a5d
-USE_QT5= concurrent core gui opengl printsupport widgets buildtools_build qmake_build
+USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build
USE_LDCONFIG= yes
OPTIONS_DEFINE= DXFLIB GAMEPAD GDAL PDAL SHAPELIB PLUGINS
@@ -36,7 +36,8 @@ SHAPELIB_DESC= Enable shape file support
DXFLIB_CMAKE_BOOL= OPTION_USE_DXF_LIB
-GAMEPAD_USE= QT5=gamepad
+GAMEPAD_USES= qt:5
+GAMEPAD_USE= QT=gamepad
GAMEPAD_CMAKE_BOOL= OPTION_SUPPORT_GAMEPADS
GDAL_CMAKE_BOOL= OPTION_USE_GDAL
diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index 8899b0e21041..72f2825478d2 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -24,10 +24,10 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
libfreeimage.so:graphics/freeimage \
libceres.so:math/ceres-solver
-USES= cmake compiler:${OPENMP}c++11-lib eigen:3 fortran localbase sqlite
+USES= cmake compiler:${OPENMP}c++11-lib eigen:3 fortran localbase qt:5 sqlite
USE_GITHUB= yes
USE_GL= gl glew
-USE_QT5= qmake_build buildtools_build core gui opengl_build widgets
+USE_QT= qmake_build buildtools_build core gui opengl_build widgets
EXCLUDE= SQLite
EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude src/ext/,}
CMAKE_OFF= BOOST_STATIC CUDA_ENABLED
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index ba1ac0bcadc7..acee5c0702f5 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick
-USES= cmake tar:bzip2 compiler:c++11-lang
-USE_QT5= core network gui linguisttools_build qmake_build \
+USES= cmake qt:5 tar:bzip2 compiler:c++11-lang
+USE_QT= core network gui linguisttools_build qmake_build \
buildtools_build widgets
post-patch:
@${REINPLACE_CMD} -e '/^ appdata.path =/s|/usr/share|$$$${SHARE_DIR}|' \
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 40c69bada9f2..d187335f4acd 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= qmake
-USE_QT4= gui linguisttools_build moc_build rcc_build uic_build
+USES= qmake qt:4
+USE_QT= gui linguisttools_build moc_build rcc_build uic_build
PORTDOCS= changelog
PLIST_FILES= bin/darknock share/pixmaps/darknock.png
diff --git a/graphics/diffpdf/Makefile b/graphics/diffpdf/Makefile
index f19052e0c161..b520289af075 100644
--- a/graphics/diffpdf/Makefile
+++ b/graphics/diffpdf/Makefile
@@ -13,8 +13,8 @@ LICENSE= GPLv2+
LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-USES= compiler:c++11-lang qmake
-USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build
+USES= compiler:c++11-lang qmake qt:4
+USE_QT= qmake_build moc_build rcc_build uic_build linguist_build
PLIST_FILES= bin/diffpdf
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 6d8c1bef2f0d..0bff1501fc9e 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -24,9 +24,9 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \
libkgeomap.so:astro/libkgeomap-kde4 \
libboost_graph.so:devel/boost-libs
-USES+= eigen:3 pkgconfig shebangfix
+USES+= eigen:3 pkgconfig qt:4 shebangfix
USE_KDE+= libkdcraw libkexiv2 libkipi runtime_run
-USE_QT4+= sql-sqlite3_run
+USE_QT+= sql-sqlite3_run
USE_LDCONFIG= yes
CMAKE_ARGS+= -DWITH_Sqlite2:BOOL=OFF -DENABLE_OPENCV3:BOOL=true
@@ -52,7 +52,8 @@ PIMLIBS_USE= KDE=pimlibs baloo
PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
-MYSQL_USE= MYSQL=server QT4=sql-mysql_run
+MYSQL_USES= qt:4
+MYSQL_USE= MYSQL=server QT=sql-mysql_run
MYSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
-DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin \
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index 874c4b702d8a..62366d251928 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -114,12 +114,12 @@ DISTINFO_FILE= ${.CURDIR:H:H}/graphics/digikam-kde4/distinfo
LICENSE?= GPLv2
-USES+= tar:bzip2
+USES+= qt:4 tar:bzip2
.if !defined(NO_BUILD)
USES+= cmake:noninja kde:4
USE_KDE+= automoc4 kdelibs
-USE_QT4+= qmake_build moc_build rcc_build uic_build
+USE_QT+= qmake_build moc_build rcc_build uic_build
WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 68c1a12a8283..f893c5b9c1a1 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS= libKF5KGeoMap.so:astro/libkgeomap \
libtiff.so:graphics/tiff
USES= cmake:outsource compiler:c++11-lib eigen:3 jpeg kde:5 pkgconfig \
- shebangfix tar:xz
+ qt:5 shebangfix tar:xz
USE_GNOME= glib20 libxml2 libxslt
USE_KDE= archive auth bookmarks calendarcore codecs completion config \
configwidgets coreaddons crash doctools ecm filemetadata \
@@ -39,7 +39,7 @@ USE_KDE= archive auth bookmarks calendarcore codecs completion config \
kio marble libkipi notifications notifyconfig parts service \
solid sonnet textwidgets threadweaver unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network opengl printsupport sql \
+USE_QT= concurrent core dbus gui network opengl printsupport sql \
webkit widgets x11extras xml \
sql-sqlite3_run \
buildtools_build qmake_build
@@ -66,7 +66,8 @@ MULTIMEDIA_DESC= Multimedia support
MULTIMEDIA_CMAKE_BOOL= ENABLE_MEDIAPLAYER
MULTIMEDIA_LIB_DEPENDS= libQtAV.so:multimedia/QtAV
-MYSQL_USE= MYSQL=server QT5=sql-mysql_run
+MYSQL_USES= qt:5
+MYSQL_USE= MYSQL=server QT=sql-mysql_run
MYSQL_CMAKE_BOOL= ENABLE_INTERNALMYSQL \
ENABLE_MYSQLSUPPORT
MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
diff --git a/graphics/dilay/Makefile b/graphics/dilay/Makefile
index 5cb0f1c526dc..ae791ec7fc0a 100644
--- a/graphics/dilay/Makefile
+++ b/graphics/dilay/Makefile
@@ -16,12 +16,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm
-USES= compiler:c++14-lang gmake qmake
+USES= compiler:c++14-lang gmake qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= abau
USE_CXXSTD= c++14
USE_GL= gl
-USE_QT5= core gui opengl widgets xml buildtools_build
+USE_QT= core gui opengl widgets xml buildtools_build
MAKE_JOBS_UNSAFE= yes # Workaround for: https://github.com/abau/dilay/issues/19 parallel build fails (still a problem despite having been closed)
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 068954c7991a..a94d4c376960 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -33,9 +33,11 @@ OPTIONS_SINGLE_QT= QT4 QT5
OPTIONS_DEFAULT= QT5
QT_DESC= Qt toolkit
-QT4_USE= QT4=corelib,gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build
QT4_USE+= XORG=x11
-QT5_USE= QT5=core,gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build
+QT5_USES= qt:5
+QT5_USE= QT=core,gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build
post-patch:
# Use prebuilt icons, without using conversion tool
diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index 000c2290d23d..ba1ceabeaa8b 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS= libgif.so:graphics/giflib \
libminiupnpc.so:net/miniupnpc \
libsodium.so:security/libsodium
-USES= cmake:outsource desktop-file-utils kde:5 pkgconfig shared-mime-info
+USES= cmake:outsource desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME:tl}
-USE_QT5= core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
+USE_QT= core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
USE_KDE= archive
OPTIONS_DEFINE= DOCS
diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile
index e8355fb0bb16..ca37a02ed30d 100644
--- a/graphics/dspdfviewer/Makefile
+++ b/graphics/dspdfviewer/Makefile
@@ -19,8 +19,8 @@ BUILD_WRKSRC= ${WRKSRC}/build
CONFIGURE_WRKSRC= ${WRKSRC}/build
INSTALL_WRKSRC= ${WRKSRC}/build
-USES= cmake pkgconfig
-USE_QT5= buildtools_build core gui qmake_build linguisttools widgets xml
+USES= cmake pkgconfig qt:5
+USE_QT= buildtools_build core gui qmake_build linguisttools widgets xml
CMAKE_ARGS= -DPOPPLER_LIBRARIES=${LOCALBASE}/lib/libpoppler-qt5.so -DBuildTests=OFF
USE_LDCONFIG= yes
diff --git a/graphics/easypaint/Makefile b/graphics/easypaint/Makefile
index 88808c6e45c1..97f3b4121f3a 100644
--- a/graphics/easypaint/Makefile
+++ b/graphics/easypaint/Makefile
@@ -13,8 +13,8 @@ COMMENT= Easy graphic editing program
LICENSE= GPLv3
-USES= qmake
-USE_QT4= gui xml uic_build moc_build rcc_build
+USES= qmake qt:4
+USE_QT= gui xml uic_build moc_build rcc_build
QPROFILE= easyPaint
WRKSRC= ${WRKDIR}/${QPROFILE}
diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile
index 1edf8d9411f4..efda8ed9b847 100644
--- a/graphics/engauge-digitizer/Makefile
+++ b/graphics/engauge-digitizer/Makefile
@@ -18,10 +18,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libopenjp2.so:graphics/openjpeg \
libpoppler-qt5.so:graphics/poppler-qt5
-USES= desktop-file-utils qmake
+USES= desktop-file-utils qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= markummitchell
-USE_QT5= core gui printsupport sql xml widgets buildtools_build
+USE_QT= core gui printsupport sql xml widgets buildtools_build
USE_GL= gl
CONFIGURE_ENV= OPENJPEG_INCLUDE=${PREFIX}/include/openjpeg-2.3 OPENJPEG_LIB=${PREFIX}/lib \
POPPLER_INCLUDE=${PREFIX}/include/poppler/qt5 POPPLER_LIB=${PREFIX}/lib
@@ -30,7 +30,7 @@ QMAKE_ARGS= "CONFIG+=jpeg2000 pdf"
OPTIONS_DEFINE= NLS DOCS
OPTIONS_SUB= yes
-DOCS_USE= QT5=help,linguist_build
+DOCS_USE= QT=help,linguist_build
do-patch-NLS-on:
@${REINPLACE_CMD} -e 's|QCoreApplication::applicationDirPath () + "/translations",|"${DATADIR}/translations",|' ${WRKSRC}/src/Translator/TranslatorContainer.cpp
diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
index acc7cfc084de..83181a133b65 100644
--- a/graphics/eos-movrec/Makefile
+++ b/graphics/eos-movrec/Makefile
@@ -14,9 +14,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
-USES= cmake dos2unix pkgconfig tar:bzip2
+USES= cmake dos2unix pkgconfig qt:4 tar:bzip2
DOS2UNIX_GLOB= *.pro *.cpp *.h
-USE_QT4= qmake_build moc_build rcc_build uic_build gui
+USE_QT= qmake_build moc_build rcc_build uic_build gui
INSTALLS_ICONS= yes
ICON_SIZES= 16x16 32x32 128x128 256x256 512x512
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index f6a6a70697c3..2ae019ea07f5 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= python qmake
-USE_QT4= corelib gui xml moc_build
+USES= python qmake qt:4
+USE_QT= corelib gui xml moc_build
QMAKE_ARGS= VERSION_NUMBER="${PORTVERSION}"
QMAKE_SOURCE_PATH= ${WRKSRC}/main.pro
MAKE_JOBS_UNSAFE= yes
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 7f3d2a37cb34..4bb6427b5d0e 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS= libboost_program_options.so:devel/boost-libs
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= gmake
+USES= gmake qmake:no_env qt:4
USE_GL= glu
-USE_QT4= corelib moc_build qmake_build gui opengl
-QT_NONSTANDARD= yes
+USE_QT= corelib moc_build qmake_build gui opengl
HAS_CONFIGURE= yes
CONFIGURE_ENV= QTDIR="${PREFIX}"
CONFIGURE_ARGS= -spec ${QMAKESPEC}
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
index ba3047708c3c..75ba27a572b6 100644
--- a/graphics/fraqtive/Makefile
+++ b/graphics/fraqtive/Makefile
@@ -13,8 +13,8 @@ COMMENT= Draws Mandelbrot and Julia fractals
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
-USE_QT4= corelib gui opengl xml uic_build moc_build rcc_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= corelib gui opengl xml uic_build moc_build rcc_build
USE_GL= gl glu
OPTIONS_DEFINE= SSE2
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 17189e9f2bc7..81f4b7d69b59 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -44,8 +44,8 @@ REINPLACE_FILES= configure
USE_GL= yes
USE_LDCONFIG= yes
-USE_QT4= corelib gui moc network opengl rcc qmake_build
-USES= gmake ncurses pathfix
+USE_QT= corelib gui moc network opengl rcc qmake_build
+USES= gmake ncurses pathfix qt:4
CPPFLAGS+= -I${NCURSESINC}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/graphics/gmic-qt/Makefile b/graphics/gmic-qt/Makefile
index 6df3aa3d41c2..4590d7e08ef4 100644
--- a/graphics/gmic-qt/Makefile
+++ b/graphics/gmic-qt/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libfftw3.so:math/fftw3 \
libpng.so:graphics/png
-USES= cmake:outsource compiler:c++14-lang pkgconfig
-USE_QT5= core gui network widgets \
+USES= cmake:outsource compiler:c++14-lang pkgconfig qt:5
+USE_QT= core gui network widgets \
buildtools_build linguisttools_build qmake_build
USE_XORG= ice sm x11 xext
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 47ba1721d7c6..0ae5a12d9b99 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -73,7 +73,7 @@ FFMPEG_DESC= ffmpeg media handler
GSTREAMER_DESC= GStreamer media handler
VAAPI_DESC= VAAPI support (requires FFMPEG)
-KDE4_USES= kde:4
+KDE4_USES= kde:4 qmake:no_env qt:4
CYGNAL_CONFIGURE_ENABLE= cygnal
.include <bsd.port.options.mk>
@@ -108,8 +108,7 @@ GNASH_GUIS+= gtk
.if ${PORT_OPTIONS:MKDE4}
GNASH_GUIS+= kde4
-USE_QT4= moc_build
-QT_NONSTANDARD= yes
+USE_QT= moc_build
USE_KDE= kdelibs
CONFIGURE_ARGS+= --without-gconf
CONFIGURE_ENV+= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config"
diff --git a/graphics/gpxsee/Makefile b/graphics/gpxsee/Makefile
index 4ed4b38b94b2..1e839ce36728 100644
--- a/graphics/gpxsee/Makefile
+++ b/graphics/gpxsee/Makefile
@@ -12,8 +12,8 @@ COMMENT= GPS log file viewer and analyzer
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/licence.txt
-USES= qmake:outsource desktop-file-utils shared-mime-info
-USE_QT5= buildtools_build core gui network opengl printsupport widgets
+USES= qmake:outsource desktop-file-utils qt:5 shared-mime-info
+USE_QT= buildtools_build core gui network opengl printsupport widgets
USE_GL= gl
USE_GITHUB= yes
@@ -23,10 +23,11 @@ GH_PROJECT= GPXSee
OPTIONS_DEFINE= NLS TIFF
OPTIONS_DEFAULT= TIFF
OPTIONS_SUB= yes
-NLS_USE= QT5=linguisttools_build
-NLS_USES= gettext-runtime
+NLS_USE= QT=linguisttools_build
+NLS_USES= gettext-runtime qt:5
TIFF_DESC= Support for TIFF
-TIFF_USE= QT5=imageformats_run
+TIFF_USES= qt:5
+TIFF_USE= QT=imageformats_run
do-patch:
@${REINPLACE_CMD} -e "s|/usr/share/gpxsee|${DATADIR}|" ${WRKSRC}/src/config.h
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 22056977f234..48d8278f5045 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -92,8 +92,9 @@ LIBRSVG2_USE= GNOME=librsvg2 GL=gl,glu,glut
GTK2_USE= XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
GNOMEUI_USE= GNOME=libgnomeui
SMYRNA_USE= GNOME=libglade2,pangox-compat GL=glut
-GVEDIT_USE= qt4=qmake_build,moc_build,rcc_build,uic_build \
- qt4=linguist_build,corelib,gui
+GVEDIT_USES= qt:4
+GVEDIT_USE= qt=qmake_build,moc_build,rcc_build,uic_build \
+ qt=linguist_build,corelib,gui
GHOSTSCRIPT_USES=ghostscript
PERL_USES= perl5
PHP_USES= php:build
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 68a2161c77d5..ee6167e39306 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -11,10 +11,10 @@ COMMENT= Image viewer and browser for KDE 4
LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libpng.so:graphics/png
-USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz
+USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 tar:xz
USE_KDE= kactivities kdelibs baloo kfilemetadata \
libkdcraw libkipi libkonq automoc4 soprano
-USE_QT4= corelib gui opengl qmake_build moc_build uic_build rcc_build
+USE_QT= corelib gui opengl qmake_build moc_build uic_build rcc_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 7567d202b61f..f7731c1bf224 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -14,14 +14,14 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
liblcms2.so:graphics/lcms2 \
libpng.so:graphics/png
-USES= cmake:outsource gettext jpeg pkgconfig kde:5 tar:xz
+USES= cmake:outsource gettext jpeg pkgconfig kde:5 qt:5 tar:xz
USE_KDE= activities auth baloo bookmarks codecs completion config \
configwidgets coreaddons ecm emoticons filemetadata i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kimageformats kio libkdcraw libkipi \
notifications parts service solid sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT5= concurrent core dbus gui network opengl phonon4 printsupport \
+USE_QT= concurrent core dbus gui network opengl phonon4 printsupport \
svg widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 8ad01f9a9b15..14fe5d6c603d 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS= libpng.so:graphics/png \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-USES= compiler:c++11-lib gmake jpeg lua:52 pkgconfig
+USES= compiler:c++11-lib gmake jpeg lua:52 pkgconfig qt:5
USE_GNOME= cairo
-USE_QT5= buildtools_build core gui qmake_build widgets
+USE_QT= buildtools_build core gui qmake_build widgets
USE_TEX= pdftex
MAKE_ENV= DL_LIBS="" \
INSTALL_DIR="${MKDIR}" \
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 191805beeb7b..89f2a58a8fa6 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -10,8 +10,8 @@ COMMENT= Digital camera manager for KDE 4
LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
-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/graphics/kamera/Makefile b/graphics/kamera/Makefile
index c2e9ee75492e..80d8c488f765 100644
--- a/graphics/kamera/Makefile
+++ b/graphics/kamera/Makefile
@@ -9,10 +9,10 @@ COMMENT= Digital camera manager for KDE
LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
-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 doctools ecm i18n \
kio service 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/graphics/kcolorchooser-kde4/Makefile b/graphics/kcolorchooser-kde4/Makefile
index 59775eb7334d..88257cdcadfb 100644
--- a/graphics/kcolorchooser-kde4/Makefile
+++ b/graphics/kcolorchooser-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 application to select colors from the screen or from a palette
-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/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index 3ae1dd954f19..f1d40b042a92 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE application to select colors from the screen or from a palette
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
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/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile
index 596972c00692..a2c42eaf3770 100644
--- a/graphics/kcoloredit/Makefile
+++ b/graphics/kcoloredit/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR= KDE/extragear
MAINTAINER= kde@FreeBSD.org
COMMENT= Palette files editor for KDE
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_KDE= kdelibs automoc4
-USE_QT4= corelib qmake_build moc_build rcc_build uic_build
+USE_QT= corelib qmake_build moc_build rcc_build uic_build
APP_VER= 2.0.0
EXTRA_VER= 4.4.0
diff --git a/graphics/kdegraphics-mobipocket-kde4/Makefile b/graphics/kdegraphics-mobipocket-kde4/Makefile
index 8b48078740bc..f65ed536db32 100644
--- a/graphics/kdegraphics-mobipocket-kde4/Makefile
+++ b/graphics/kdegraphics-mobipocket-kde4/Makefile
@@ -9,9 +9,9 @@ PKGNAMESUFFIX= -kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Mobipocket plugins for Strigi indexing and thumbnails
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 strigi
-USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build
+USE_QT= corelib gui qmake_build moc_build uic_build rcc_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics-mobipocket/Makefile b/graphics/kdegraphics-mobipocket/Makefile
index af9f98b702bc..c70b275f9899 100644
--- a/graphics/kdegraphics-mobipocket/Makefile
+++ b/graphics/kdegraphics-mobipocket/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Mobipocket plugins for Strigi indexing and thumbnails
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons ecm jobwidgets kio service \
widgetsaddons
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/graphics/kdegraphics-strigi-analyzer-kde4/Makefile b/graphics/kdegraphics-strigi-analyzer-kde4/Makefile
index 9e0aeb697754..3694498e97cf 100644
--- a/graphics/kdegraphics-strigi-analyzer-kde4/Makefile
+++ b/graphics/kdegraphics-strigi-analyzer-kde4/Makefile
@@ -11,8 +11,8 @@ COMMENT= Strigi analyzers for various graphics file formats
LIB_DEPENDS= libtiff.so:graphics/tiff
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 strigi
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics-svgpart-kde4/Makefile b/graphics/kdegraphics-svgpart-kde4/Makefile
index 900f3e315da1..f12dc11f88e8 100644
--- a/graphics/kdegraphics-svgpart-kde4/Makefile
+++ b/graphics/kdegraphics-svgpart-kde4/Makefile
@@ -10,8 +10,8 @@ PKGNAMESUFFIX= -kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SVG KPart
-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/graphics/kdegraphics-svgpart/Makefile b/graphics/kdegraphics-svgpart/Makefile
index 83f6f81a32f1..55fce785bf1f 100644
--- a/graphics/kdegraphics-svgpart/Makefile
+++ b/graphics/kdegraphics-svgpart/Makefile
@@ -8,11 +8,11 @@ PKGNAMEPREFIX= kdegraphics-
MAINTAINER= kde@FreeBSD.org
COMMENT= SVG KPart
-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 parts service sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT5= core dbus gui network svg widgets xml \
+USE_QT= core dbus gui network svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics-thumbnailers-kde4/Makefile b/graphics/kdegraphics-thumbnailers-kde4/Makefile
index 3d8c0335a12a..22530ac51706 100644
--- a/graphics/kdegraphics-thumbnailers-kde4/Makefile
+++ b/graphics/kdegraphics-thumbnailers-kde4/Makefile
@@ -9,8 +9,8 @@ PKGNAMESUFFIX= -kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Thumbnailers for various graphics file formats
-USES= cmake:outsource kde:4 pkgconfig tar:xz
+USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz
USE_KDE= kdelibs libkdcraw libkexiv2 automoc4
-USE_QT4= gui qmake_build moc_build uic_build rcc_build
+USE_QT= gui qmake_build moc_build uic_build rcc_build
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics-thumbnailers/Makefile b/graphics/kdegraphics-thumbnailers/Makefile
index 0b256da6628e..5623ff37c65d 100644
--- a/graphics/kdegraphics-thumbnailers/Makefile
+++ b/graphics/kdegraphics-thumbnailers/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Thumbnailers for various graphics file formats
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons ecm jobwidgets libkdcraw \
libkexiv2 kio service widgetsaddons
-USE_QT5= core gui network widgets \
+USE_QT= core gui network widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index adebf78db232..ef46eb74fdb6 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Graphics utilities for KDE (meta port)
-USES= kde:5 metaport
-USE_QT5= #
+USES= kde:5 metaport qt:5
+USE_QT= #
OPTIONS_DEFINE= GPHOTO \
GWENVIEW \
diff --git a/graphics/kdiagram/Makefile b/graphics/kdiagram/Makefile
index 0d91f56e42b4..519d79e9c2eb 100644
--- a/graphics/kdiagram/Makefile
+++ b/graphics/kdiagram/Makefile
@@ -12,9 +12,9 @@ COMMENT= Library to create business diagrams
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL.txt
-USES= cmake:outsource kde:5 tar:xz
+USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= core gui linguisttools printsupport sql svg widgets \
+USE_QT= core gui linguisttools printsupport sql svg widgets \
buildtools_build qmake_build
PLIST_SUB= SHLIB_VER="${PORTVERSION}" \
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
index 4ccb69c7c6f2..e5bd4abbc5b0 100644
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -9,9 +9,9 @@ COMMENT= KF5 library providing support for additional image formats
LIB_DEPENDS= libHalf.so:graphics/ilmbase
-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= archive ecm
-USE_QT5= buildtools_build core gui printsupport qmake_build widgets
+USE_QT= buildtools_build core gui printsupport qmake_build widgets
OPTIONS_DEFINE= OPENEXR
OPTIONS_DEFAULT= OPENEXR
diff --git a/graphics/kf5-kplotting/Makefile b/graphics/kf5-kplotting/Makefile
index 937b82f95ad3..b190ecb4b87c 100644
--- a/graphics/kf5-kplotting/Makefile
+++ b/graphics/kf5-kplotting/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= graphics kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 lightweight plotting framework
-USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build core gui qmake_build testlib widgets
+USE_QT= buildtools_build core gui qmake_build testlib widgets
.include <bsd.port.mk>
diff --git a/graphics/kf5-prison/Makefile b/graphics/kf5-prison/Makefile
index 100ecd08bcc3..e03cfce0b738 100644
--- a/graphics/kf5-prison/Makefile
+++ b/graphics/kf5-prison/Makefile
@@ -10,8 +10,8 @@ COMMENT= API to produce barcodes
LIB_DEPENDS= libdmtx.so:graphics/libdmtx \
libqrencode.so:graphics/libqrencode
-USES= cmake:outsource compiler:c++11-lang kde:5 tar:xz
+USES= cmake:outsource compiler:c++11-lang kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= buildtools_build core gui qmake_build testlib widgets
+USE_QT= buildtools_build core gui qmake_build testlib widgets
.include <bsd.port.mk>
diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile
index d26bd2a50bfb..6e748a97b538 100644
--- a/graphics/kgraphviewer/Makefile
+++ b/graphics/kgraphviewer/Makefile
@@ -14,12 +14,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgvc.so:graphics/graphviz
-USES= cmake:outsource desktop-file-utils kde:5 tar:xz pkgconfig
+USES= cmake:outsource desktop-file-utils kde:5 qt:5 tar:xz pkgconfig
USE_KDE= auth codecs completion config configwidgets \
coreaddons i18n iconthemes jobwidgets kio parts service \
sonnet textwidgets widgetsaddons xmlgui \
ecm_build
-USE_QT5= core dbus gui network printsupport svg widgets xml \
+USE_QT= core dbus gui network printsupport svg widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile
index 9c319e5a5327..0e1559512cf0 100644
--- a/graphics/kiconedit/Makefile
+++ b/graphics/kiconedit/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR= KDE/extragear
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE icon editor
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_KDE= kdelibs automoc4
-USE_QT4= corelib qmake_build moc_build rcc_build uic_build
+USE_QT= corelib qmake_build moc_build rcc_build uic_build
EXTRA_VER= 4.4.0
diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile
index 0eefa6a22b26..d7253818125d 100644
--- a/graphics/kimagemapeditor/Makefile
+++ b/graphics/kimagemapeditor/Makefile
@@ -8,13 +8,13 @@ PKGNAMESUFFIX= # hack: uses kde:4 but we don't want the pkgname suffix
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE generator of HTML image maps
-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 guiaddons i18n iconthemes itemviews \
jobwidgets js kdelibs4support khtml 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/graphics/kipiplugins/Makefile b/graphics/kipiplugins/Makefile
index 4f00029be292..fe69797a9b87 100644
--- a/graphics/kipiplugins/Makefile
+++ b/graphics/kipiplugins/Makefile
@@ -12,11 +12,11 @@ COMMENT= Plugins for digikam
LIB_DEPENDS= libdigikamcore.so:graphics/digikam
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \
- tar:xz
+ qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio libkipi service \
solid widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network printsupport widgets xml xmlpatterns \
+USE_QT= core dbus gui network printsupport widgets xml xmlpatterns \
buildtools_build qmake_build
CMAKE_ON= DIGIKAMSC_COMPILE_KIPIPLUGINS
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index 345e02cb6742..8e0c72695f6b 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2
BUILD_DEPENDS= help2man:misc/help2man
USES= cmake:outsource desktop-file-utils ghostscript:run \
- shared-mime-info localbase
-USE_QT4= gui xml dbus designer_build linguisttools_build \
+ qt:4 shared-mime-info localbase
+USE_QT= gui xml dbus designer_build linguisttools_build \
qmake_build moc_build rcc_build uic_build
USE_TEX= latex dvipsk
CMAKE_ARGS= -DQT_QMAKE_EXECUTABLE_FINDQT=${QMAKE} \
diff --git a/graphics/kolourpaint-kde4/Makefile b/graphics/kolourpaint-kde4/Makefile
index a0bdf87305df..6bd8994e534f 100644
--- a/graphics/kolourpaint-kde4/Makefile
+++ b/graphics/kolourpaint-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 paint program
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4 qimageblitz
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index 6761e4ade207..2a0bd91bb96a 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -7,13 +7,13 @@ CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE paint program
-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 ecm emoticons guiaddons i18n iconthemes init \
itemmodels itemviews jobwidgets kdelibs4support kio libkexiv2 \
libksane notifications parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT5= dbus core gui network printsupport widgets xml \
+USE_QT= dbus core gui network printsupport widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index e4284d5d6618..f92cdc65c72e 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2
SHEBANG_FILES= script/open-raw.pl script/kpa-backup.sh
-USES= cmake:outsource jpeg kde:4 pkgconfig shebangfix tar:bzip2
+USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 shebangfix tar:bzip2
USE_KDE= kdelibs libkdcraw libkipi automoc4
-USE_QT4= phonon sql \
+USE_QT= phonon sql \
qmake_build moc_build rcc_build uic_build
OPTIONS_DEFINE= MARBLE NLS
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 6c9deecd49af..0006749a5a48 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -14,12 +14,12 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libKF5KGeoMap.so:astro/libkgeomap \
libKF5Kipi.so:graphics/libkipi
-USES= cmake:outsource jpeg kde:5 pkgconfig shebangfix tar:xz
+USES= cmake:outsource jpeg kde:5 pkgconfig qt:5 shebangfix tar:xz
USE_KDE= archive auth codecs completion config \
configwidgets coreaddons ecm i18n \
iconthemes jobwidgets kio marble service \
sonnet textwidgets widgetsaddons xmlgui
-USE_QT5= core dbus gui network phonon4 sql webkit \
+USE_QT= core dbus gui network phonon4 sql webkit \
widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= scripts/open-raw.pl scripts/kpa-backup.sh
diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile
index b8e65f39ec4b..7208a1ca64ee 100644
--- a/graphics/kpovmodeler/Makefile
+++ b/graphics/kpovmodeler/Makefile
@@ -13,10 +13,10 @@ COMMENT= KDE editor/frontend for Povray
RUN_DEPENDS= povray:graphics/povray-meta
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 qt:4 tar:bzip2
USE_GL= glu
USE_KDE= kdelibs automoc4
-USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build
+USE_QT= corelib opengl qmake_build moc_build rcc_build uic_build
APP_VER= 1.1.3
EXTRA_VER= 4.3.1
diff --git a/graphics/kqtquickcharts-kde4/Makefile b/graphics/kqtquickcharts-kde4/Makefile
index 53bc75a35621..6dc695b6052b 100644
--- a/graphics/kqtquickcharts-kde4/Makefile
+++ b/graphics/kqtquickcharts-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= QtQuick plugin to render interactive charts
-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/graphics/krita/Makefile b/graphics/krita/Makefile
index be897bfbece5..73a3d6be8a5d 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -32,10 +32,11 @@ LIB_DEPENDS= libImath.so:graphics/ilmbase \
libxcb-util.so:x11/xcb-util
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- eigen:3 gettext jpeg kde:5 pkgconfig python:3.4+ shared-mime-info
+ eigen:3 gettext jpeg kde:5 pkgconfig python:3.4+ qt:5 \
+ shared-mime-info
USE_KDE= archive completion config coreaddons crash guiaddons i18n \
itemmodels itemviews kio service widgetsaddons windowsystem
-USE_QT5= concurrent core dbus gui multimedia network printsupport \
+USE_QT= concurrent core dbus gui multimedia network printsupport \
qml quick svg testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm xcb xext xi
diff --git a/graphics/ksaneplugin-kde4/Makefile b/graphics/ksaneplugin-kde4/Makefile
index f11b95265946..ee1a6cbdc4ec 100644
--- a/graphics/ksaneplugin-kde4/Makefile
+++ b/graphics/ksaneplugin-kde4/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 plugin for scanning through libksane
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs libksane 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/graphics/ksnapshot-kde4/Makefile b/graphics/ksnapshot-kde4/Makefile
index 01a0a9e93a5c..2abefbcac607 100644
--- a/graphics/ksnapshot-kde4/Makefile
+++ b/graphics/ksnapshot-kde4/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 screen capture program
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs libkipi automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_QT= moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xext xfixes
.include <bsd.port.mk>
diff --git a/graphics/libQGLViewer/Makefile b/graphics/libQGLViewer/Makefile
index 33937a1e7791..ca357ef3c854 100644
--- a/graphics/libQGLViewer/Makefile
+++ b/graphics/libQGLViewer/Makefile
@@ -12,9 +12,9 @@ COMMENT= C++ library based on Qt5 that eases the creation of OpenGL 3D viewers
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENCE
-USES= qmake
+USES= qmake qt:5
USE_GL= gl glu
-USE_QT5= core designer gui opengl widgets xml buildtools_build
+USE_QT= core designer gui opengl widgets xml buildtools_build
USE_LDCONFIG= yes
PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:C/\.[0-9]$//} SHL1=${DISTVERSION:C/\.[0-9]\.[0-9]$//}
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index 16bb608e8645..e5d6edd21d68 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \
CMAKE_ARGS+= -DWITH_OpenMP:BOOL=False \
-DENABLE_RAWSPEED=True
-USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz
+USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build
+USE_QT= corelib gui moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
pre-configure:
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 962b73859fa4..399e23695eb5 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS= libjasper.so:graphics/jasper \
CMAKE_ARGS+= -DWITH_OpenMP:BOOL=False \
-DENABLE_RAWSPEED=True
-USES= cmake:outsource compiler:c++11-lang jpeg kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lang jpeg kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= core gui \
+USE_QT= core gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index 14a2bec07be7..7d92677fbfa8 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT= Exiv2 library interface for KDE
LIB_DEPENDS= libexiv2.so:graphics/exiv2
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= corelib gui xml \
+USE_QT= corelib gui xml \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 69d734aa46e2..15f2f7934230 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -9,9 +9,9 @@ COMMENT= Exiv2 library interface for KDE
LIB_DEPENDS= libexiv2.so:graphics/exiv2
-USES= cmake:outsource compiler:c++11-lang kde:5 pkgconfig tar:xz
+USES= cmake:outsource compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm
-USE_QT5= core gui \
+USE_QT= core gui \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index bda1221f0b43..d4453303fe38 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -9,9 +9,9 @@ CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Image Plugin Interface
-USES= cmake:outsource kde:4 tar:xz
+USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= automoc4 kdelibs
-USE_QT4= gui moc_build qmake_build rcc_build uic_build
+USE_QT= gui moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
pre-configure:
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 7135e34f1499..083e69570f9a 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -7,10 +7,10 @@ CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Image Plugin Interface
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
libkdcraw libkexiv2 service widgetsaddons xmlgui
-USE_QT5= core dbus gui widgets xml \
+USE_QT= core dbus gui widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/graphics/libksane-kde4/Makefile b/graphics/libksane-kde4/Makefile
index 632fa4ec8bf8..1e0075749e2d 100644
--- a/graphics/libksane-kde4/Makefile
+++ b/graphics/libksane-kde4/Makefile
@@ -10,9 +10,9 @@ COMMENT= SANE library interface for KDE
LIB_DEPENDS= libsane.so:graphics/sane-backends
-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_LDCONFIG= yes
pre-configure:
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index 88f96785dbd2..8badd1858e76 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -9,9 +9,9 @@ COMMENT= SANE library interface for KDE
LIB_DEPENDS= libsane.so:graphics/sane-backends
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= config ecm i18n sonnet textwidgets wallet widgetsaddons
-USE_QT5= core gui testlib widgets \
+USE_QT= core gui testlib widgets \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/graphics/libkscreen/Makefile b/graphics/libkscreen/Makefile
index c959cdf6ceae..e5b4ad3cb6cb 100644
--- a/graphics/libkscreen/Makefile
+++ b/graphics/libkscreen/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS= libqjson.so:devel/qjson@qt4 \
libxcb-image.so:x11/xcb-util-image \
libxcb-render-util.so:x11/xcb-util-renderutil
-USES= cmake:outsource kde:4 pkgconfig tar:xz
+USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz
USE_KDE= kdelibs automoc4
-USE_QT4= corelib dbus gui script \
+USE_QT= corelib dbus gui script \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index b977def6a534..5bd7fb3ba1eb 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \
libtiff.so:graphics/tiff \
libvigraimpex.so:graphics/vigra
-USES= cmake desktop-file-utils jpeg tar:bzip2
+USES= cmake desktop-file-utils jpeg qt:4 tar:bzip2
USE_XORG= x11 xext sm ice xxf86vm
-USE_QT4= corelib gui qt3support svg assistantclient \
+USE_QT= corelib gui qt3support svg assistantclient \
linguisttools_build qmake_build moc_build uic_build rcc_build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index 5ae0d039ca65..f9588d6f7625 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-float \
libraw_r.so:graphics/libraw \
libboost_system.so:devel/boost-libs
-USES= cmake:outsource jpeg pkgconfig tar:bzip2
-USE_QT5= concurrent gui printsupport sql webkit xml \
+USES= cmake:outsource jpeg pkgconfig qt:5 tar:bzip2
+USE_QT= concurrent gui printsupport sql webkit xml \
buildtools_build linguist_build qmake_build \
imageformats_run
INSTALLS_ICONS= yes
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index c62726b5005e..31474e3735bb 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-float \
BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-msse2"
-USES= cmake jpeg tar:bzip2
-USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \
+USES= cmake jpeg qt:4 tar:bzip2
+USE_QT= gui sql webkit xml linguist_build moc_build qmake_build \
rcc_build uic_build imageformats_run
INSTALLS_ICONS= yes
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 491ac34f2f60..7c36d42998bd 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -53,7 +53,8 @@ FREEIMAGE_CMAKE_ON= -DLUX_USE_FREEIMAGE:BOOL=ON
FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage
X11_DESC= Build GUI executable (requires Qt 4)
-X11_USE= QT4=moc_build,qmake_build,rcc_build,uic_build,corelib,gui
+X11_USES= qt:4
+X11_USE= QT=moc_build,qmake_build,rcc_build,uic_build,corelib,gui
X11_PLIST_FILES= bin/luxrender
post-extract:
diff --git a/graphics/lximage-qt/Makefile b/graphics/lximage-qt/Makefile
index 6f60e64f07fd..b0a53882bf5c 100644
--- a/graphics/lximage-qt/Makefile
+++ b/graphics/lximage-qt/Makefile
@@ -16,9 +16,9 @@ LIB_DEPENDS= libexif.so:graphics/libexif \
libfm.so:x11/libfm
USES= cmake:outsource compiler:c++11-lib desktop-file-utils gettext-runtime \
- localbase:ldflags lxqt pkgconfig tar:xz
+ localbase:ldflags lxqt pkgconfig qt:5 tar:xz
USE_GNOME= glib20
-USE_QT5= buildtools_build qmake_build core dbus gui linguisttools \
+USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
network printsupport svg widgets x11extras
USE_LXQT= buildtools libfmqt
USE_XORG= ice sm x11 xcb xext xfixes
diff --git a/graphics/lximageqt-l10n/Makefile b/graphics/lximageqt-l10n/Makefile
index d5589073fbac..a9e7ac84c1b8 100644
--- a/graphics/lximageqt-l10n/Makefile
+++ b/graphics/lximageqt-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/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 24d13fd50a53..85c85bfdec4f 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/mview-${PORTVERSION}
-USES= gmake pkgconfig
+USES= gmake pkgconfig qt:4
USE_GL= glu
-USE_QT4= corelib gui opengl moc_build
+USE_QT= corelib gui opengl moc_build
CXXFLAGS+= -I. -Imesh -Imathvector \
`pkg-config --cflags QtOpenGL glu`
LDFLAGS+= -lpthread `pkg-config --libs QtOpenGL glu`
diff --git a/graphics/mitsuba/Makefile b/graphics/mitsuba/Makefile
index 64da413ad453..aa86975adc03 100644
--- a/graphics/mitsuba/Makefile
+++ b/graphics/mitsuba/Makefile
@@ -26,9 +26,9 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= uses SSE instructions
-USES= cmake eigen:3 jpeg tar:bzip2
+USES= cmake eigen:3 jpeg qt:4 tar:bzip2
USE_GL= glew
-USE_QT4= moc_build qmake_build rcc_build uic_build \
+USE_QT= moc_build qmake_build rcc_build uic_build \
gui opengl network xml xmlpatterns
CMAKE_ARGS= -DMTS_SIMPLE_PATHS:BOOL=OFF -DBUILD_PYTHON:BOOL=OFF \
diff --git a/graphics/natron/Makefile b/graphics/natron/Makefile
index c98e9ad6aa60..5b8787b25e91 100644
--- a/graphics/natron/Makefile
+++ b/graphics/natron/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \
libpyside-${PYTHON_VERSION}.so:devel/pyside \
libfreetype.so:print/freetype2
-USES= pkgconfig python qmake shebangfix desktop-file-utils shared-mime-info \
+USES= pkgconfig python qmake qt:4 shebangfix desktop-file-utils shared-mime-info \
gettext-runtime desktop-file-utils
USE_GITHUB= yes
GH_ACCOUNT= NatronGitHub
@@ -37,7 +37,7 @@ GH_TUPLE= NatronGitHub:openfx:a85dc34:openfx/libs/OpenFX \
NatronGitHub:tinydir:3aae922:tinydir/libs/SequenceParsing/tinydir \
NatronGitHub:OpenColorIO-Configs:Natron-v3.0:OpenColorIO_Configs/OpenColorIO-Configs
-USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build network opengl
+USE_QT= corelib gui moc_build qmake_build rcc_build uic_build network opengl
USE_XORG= x11 pixman
USE_GL= gl
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 6ebbfd0f9f2d..a3e72619ffc4 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
liblcms2.so:graphics/lcms2 \
libtbb.so:devel/tbb
-USES= cmake desktop-file-utils dos2unix pkgconfig tar:bzip2
-USE_QT5= concurrent core gui network printsupport svg widgets \
+USES= cmake desktop-file-utils dos2unix pkgconfig qt:5 tar:bzip2
+USE_QT= concurrent core gui network printsupport svg widgets \
buildtools_build linguisttools_build qmake_build
DOS2UNIX_REGEX= .*\.(cpp|h|txt)
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index e18b807ce72d..dc14ed402126 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -38,7 +38,8 @@ OPTIONS_DEFINE= COMPRESSUI DOCS
OPTIONS_SUB= yes
COMPRESSUI_DESC=Build compressor UI (requires Qt4)
-COMPRESSUI_USE= QT4=qmake_build,moc_build,uic_build,rcc_build,corelib,gui,opengl
+COMPRESSUI_USES= qt:4
+COMPRESSUI_USE= QT=qmake_build,moc_build,uic_build,rcc_build,corelib,gui,opengl
post-patch-COMPRESSUI-on:
@${REINPLACE_CMD} -e '/FIND_PACKAGE.*Qt4/ s|)$$| REQUIRED&|' \
diff --git a/graphics/okular-kde4/Makefile b/graphics/okular-kde4/Makefile
index 0c568f86ae3e..df2bf1ea3631 100644
--- a/graphics/okular-kde4/Makefile
+++ b/graphics/okular-kde4/Makefile
@@ -19,10 +19,10 @@ LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \
libepub.so:textproc/ebook-tools \
libqmobipocket.so:graphics/kdegraphics-mobipocket-kde4
-USES= cmake:outsource jpeg kde:4 pkgconfig tar:xz
+USES= cmake:outsource jpeg kde:4 pkgconfig qt:4 tar:xz
USE_KDE= kdelibs automoc4 qimageblitz kactivities \
libkexiv2
-USE_QT4= corelib declarative gui opengl xml \
+USE_QT= corelib declarative gui opengl xml \
qmake_build moc_build uic_build rcc_build
USE_LDCONFIG= yes
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index fae686dbf221..006b5d35f6c1 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -24,14 +24,14 @@ LIB_DEPENDS= libchm.so:misc/chmlib \
libzip.so:archivers/libzip
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- gettext jpeg kde:5 pkgconfig tar:xz
+ gettext jpeg kde:5 pkgconfig qt:5 tar:xz
USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons dbusaddons ecm emoticons i18n \
iconthemes init itemmodels itemviews jobwidgets js \
kdelibs4support khtml kio libkexiv2 parts pty \
service solid sonnet textwidgets threadweaver wallet \
widgetsaddons windowsystem xmlgui
-USE_QT5= core dbus gui network phonon4 printsupport qml quick speech \
+USE_QT= core dbus gui network phonon4 printsupport qml quick speech \
svg widgets xml \
buildtools_build qmake_build
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index edf437f83d27..8dc23bdae7e8 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -14,9 +14,9 @@ COMMENT= Constructive Solid Geometry rendering library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/../license.txt
-USES= compiler:c++11-lang qmake
+USES= compiler:c++11-lang qmake qt:4
USE_GL= gl glew
-USE_QT4= qmake_build
+USE_QT= qmake_build
WRKSRC= ${WRKDIR}/${DISTNAME}/src
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 96169919dc7f..40c5ddd19d31 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -276,7 +276,8 @@ GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig \
liblept.so:graphics/leptonica
-QT4_USE= QT4=corelib,gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib
+QT4_USES= qt:4
+QT4_USE= QT=corelib,gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib
QT4_CMAKE_ON= -DWITH_QT:STRING="4"
QT4_CMAKE_OFF= -DWITH_QT:BOOL=OFF
QT4_LIB_DEPENDS= libfreetype.so:print/freetype2 \
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index ae7639d9e834..f801014f5761 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -58,10 +58,11 @@ GIF_CMAKE_ON= -DUSE_GIF:BOOL=ON
GIF_CMAKE_OFF= -DUSE_GIF:BOOL=OFF
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
+IMAGEVIEWER_USES= qt:4
IMAGEVIEWER_CMAKE_ON= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
IMAGEVIEWER_CMAKE_OFF= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
IMAGEVIEWER_USE= GL=gl,glu,glew \
- QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
+ QT=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
OCIO_CMAKE_ON= -DUSE_OCIO:BOOL=ON
OCIO_CMAKE_OFF= -DUSE_OCIO:BOOL=OFF
diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
index 16b356924d5d..4933077dc916 100644
--- a/graphics/openorienteering-mapper/Makefile
+++ b/graphics/openorienteering-mapper/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= libpolyclipping.so:graphics/polyclipping \
libproj.so:graphics/proj
USES= cmake:outsource,noninja compiler:c++14-lang \
- desktop-file-utils gmake shared-mime-info
-USE_QT5= buildtools_build help qmake_build core gui \
+ desktop-file-utils gmake qt:5 shared-mime-info
+USE_QT= buildtools_build help qmake_build core gui \
location network printsupport sensors widgets
USE_GITHUB= yes
GH_ACCOUNT= OpenOrienteering
@@ -32,19 +32,22 @@ OPTIONS_DEFAULT= GDAL
OPTIONS_SUB= yes
DOCS_CMAKE_BOOL= Mapper_WITH_DOCS
DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
-DOCS_USE= QT5=assistant_run
+DOCS_USES= qt:5
+DOCS_USE= QT=assistant_run
EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES
GDAL_DESC= Use the GDAL library
GDAL_CMAKE_BOOL= Mapper_USE_GDAL
GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal
NLS_CMAKE_BOOL= Mapper_WITH_NLS
NLS_BUILD_DEPENDS= gsed:textproc/gsed
-NLS_USE= QT5=linguisttools_build
-NLS_USES= gettext-runtime
+NLS_USE= QT=linguisttools_build
+NLS_USES= gettext-runtime qt:5
TEST_CMAKE_BOOL= Mapper_WITH_TEST
-TEST_USE= QT5=testlib_build
+TEST_USES= qt:5
+TEST_USE= QT=testlib_build
TEST_TEST_TARGET= test
TIFF_DESC= Support for TIFF
-TIFF_USE= QT5=imageformats
+TIFF_USES= qt:5
+TIFF_USE= QT=imageformats
.include <bsd.port.mk>
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 3085c959c1a4..a6331b00c611 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -98,11 +98,13 @@ PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
PDF_USE= gnome=cairo
PDF_VARS= FORCE_REQUIRE+=Poppler-glib
PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib
-QT4_USE= qt4=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= qt=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4
QT4_VARS= FORCE_REQUIRE+=Qt4
QT4_VARS_OFF= FORCE_IGNORE+=Qt4
-QT5_USE= qt5=buildtools_build,core,gui,opengl,qmake_build,webkit
+QT5_USES= qt:5
+QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit
QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5
QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 345b8c1aa787..40d060d99711 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -99,11 +99,13 @@ PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
PDF_USE= gnome=cairo
PDF_VARS= FORCE_REQUIRE+=Poppler-glib
PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib
-QT4_USE= qt4=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
+QT4_USES= qt:4
+QT4_USE= qt=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4
QT4_VARS= FORCE_REQUIRE+=Qt4
QT4_VARS_OFF= FORCE_IGNORE+=Qt4
-QT5_USE= qt5=buildtools_build,core,gui,opengl,qmake_build,webkit
+QT5_USE= qt:5
+QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit
QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5
QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index 22b4bd23a142..350c64fa346f 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -30,11 +30,11 @@ LIB_DEPENDS= libraw.so:graphics/libraw \
USE_GITHUB= yes
GH_ACCOUNT= oyranos-cms
-USES= cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig
+USES= cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig qt:4
USE_GL= gl
USE_LDCONFIG= yes
USE_GNOME= libxml2
-USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build
+USE_QT= corelib gui moc_build qmake_build rcc_build uic_build
USE_XORG= ice sm x11 xcursor xext xfixes xinerama xrandr xft xxf86vm
CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 547144161afe..d9106fdc65fb 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -19,8 +19,8 @@ BROKEN_armv7= fails to compile: no matching function for call to 'qMax'
LIB_DEPENDS= libming.so:graphics/ming \
libpng.so:graphics/png
-USES= qmake zip
-USE_QT4= gui opengl xml moc_build rcc_build
+USES= qmake qt:4 zip
+USE_QT= gui opengl xml moc_build rcc_build
USE_GL= gl
QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/ming
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index bc2780e34dcf..e6dd477f8407 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -86,8 +86,9 @@ GLVIEW_CMAKE_ON= -DGLUT_INCLUDE_DIRS=${LOCALBASE}/include
GLVIEW_USE= GL=glut GL=gl,glu
VIEW_CMAKE_BOOL= WITH_QT
-VIEW_USE= QT5=buildtools_build,qmake_build,widgets
-VIEW_USE= GL=glut GL=gl,glu QT5=core,gui,widgets
+VIEW_USES= qt:5
+VIEW_USE= QT=buildtools_build,qmake_build,widgets
+VIEW_USE= GL=glut GL=gl,glu QT=core,gui,widgets
OPENMP_USES= compiler:openmp
diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
index 87a7e9878406..6aa62ce79cca 100644
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@@ -37,8 +37,10 @@ _QT5_DEPS= qmake_build buildtools_build core gui network widgets
OPTIONS_DEFINE= QT4
QT4_DESC= Build against Qt 4 instead of Qt 5
-QT4_USE= QT4=${_QT4_DEPS:ts,}
-QT4_USE_OFF= QT5=${_QT5_DEPS:ts,}
+QT4_USES= qt:4
+QT4_USES_OFF= qt:5
+QT4_USE= QT=${_QT4_DEPS:ts,}
+QT4_USE_OFF= QT=${_QT5_DEPS:ts,}
QT4_CMAKE_ON= -DFORCE_QT4:BOOL=true
post-patch:
diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile
index b34a06f58a41..ccc9965b8160 100644
--- a/graphics/photoqt/Makefile
+++ b/graphics/photoqt/Makefile
@@ -11,8 +11,8 @@ COMMENT= Simple, powerful and good looking QT5 image viewer
LICENSE= GPLv2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- localbase:ldflags
-USE_QT5= core graphicaleffects gui multimedia network qml quick \
+ localbase:ldflags qt:5
+USE_QT= core graphicaleffects gui multimedia network qml quick \
quickcontrols sql svg widgets xml \
buildtools_build linguisttools_build qmake_build
diff --git a/graphics/phototonic/Makefile b/graphics/phototonic/Makefile
index 26e383ed30e7..390ba6192477 100644
--- a/graphics/phototonic/Makefile
+++ b/graphics/phototonic/Makefile
@@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexiv2.so:graphics/exiv2
-USES= desktop-file-utils gettext qmake
+USES= desktop-file-utils gettext qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= oferkv
USE_GL= gl
-USE_QT5= core gui imageformats svg widgets buildtools_build
+USE_QT= core gui imageformats svg widgets buildtools_build
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index c00aa8ac9d52..840d27982291 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -64,7 +64,8 @@ CONFIGURE_ARGS+=--disable-poppler-glib
.if ${SLAVEPORT}==qt4
CONFIGURE_ARGS+=--enable-poppler-qt4
CONFIGURE_ENV+= MOCQT4=${MOC}
-USE_QT4= gui corelib xml qtestlib moc_build
+USES+= qt:4
+USE_QT= gui corelib xml qtestlib moc_build
BUILD_WRKSRC= ${WRKSRC}/qt4
INSTALL_WRKSRC= ${WRKSRC}/qt4
.else
@@ -74,7 +75,8 @@ CONFIGURE_ARGS+=--disable-poppler-qt4
.if ${SLAVEPORT}==qt5
CONFIGURE_ARGS+=--enable-poppler-qt5
CONFIGURE_ENV+= MOCQT5=${MOC}
-USE_QT5= core gui widgets xml buildtools_build testlib_build
+USES+= qt:5
+USE_QT= core gui widgets xml buildtools_build testlib_build
# Qt from 5.7.0 on requires c++11.
USE_CXXSTD= c++11
BUILD_WRKSRC= ${WRKSRC}/qt5
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index 1e50abd6626f..e1cecbc82ca3 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libdmtx.so:graphics/libdmtx \
libqrencode.so:graphics/libqrencode
-USES= cmake:outsource tar:xz
-USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build
+USES= cmake:outsource qt:4 tar:xz
+USE_QT= corelib gui qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index e063758dcb1e..4dddc2f7825d 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtSvg module
CONFIGURE_ARGS= --enable QtSvg
PYQT_DIST= yes
-USES= python pyqt:4
+USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run gui_run
USE_PYTHON= flavors
-USE_QT4= corelib gui svg moc_build qmake_build
+USE_QT= corelib gui svg moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index 393749b8b24c..b85de56e775d 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtSvg module
CONFIGURE_ARGS= --enable QtSvg
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 svg widgets qmake_build
+USE_QT= core gui svg widgets qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index ecac4b6fa55d..ebd447ae327c 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2
LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-USES= cmake:outsource compiler:c++11-lang pkgconfig
-USE_QT4= corelib gui linguisttools_build moc_build qmake_build rcc_build \
+USES= cmake:outsource compiler:c++11-lang pkgconfig qt:4
+USE_QT= corelib gui linguisttools_build moc_build qmake_build rcc_build \
uic_build xml
OPTIONS_DEFINE= 7ZIP ACE RAR
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 93e55c07a42f..4431ae942179 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -27,11 +27,11 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libxerces-c.so:textproc/xerces-c3
USES= bison cmake compiler:features cpe desktop-file-utils \
- fortran gmake pyqt:4 python:2.7 sqlite:3
+ fortran gmake pyqt:4 python:2.7 qt:4 sqlite:3
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tu}
USE_PYQT= core gui network qscintilla2 sip sql svg xml webkit_run
-USE_QT4= corelib designer doc gui linguist_build moc_build \
+USE_QT= corelib designer doc gui linguist_build moc_build \
network qmake_build rcc_build script sql sql-pgsql \
sql-sqlite3 svg testlib uic_build webkit xml
USE_LDCONFIG= yes
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index ec5f20987e68..98edb3eb3a3b 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -10,9 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG icon engine
-USES= pkgconfig
-USE_QT4= qmake_build moc_build corelib gui svg xml
-QT_DIST= yes
+USES= pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui svg xml
HAS_CONFIGURE= yes
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index fe2131045024..63545b2eb79f 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -14,9 +14,8 @@ LIB_DEPENDS= libmng.so:graphics/libmng \
libpng.so:graphics/png \
libtiff.so:graphics/tiff
-USES= jpeg pkgconfig
-USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml
-QT_DIST= yes
+USES= jpeg pkgconfig qmake:no_env qt-dist:4
+USE_QT= moc_build rcc_build corelib gui svg xml
HAS_CONFIGURE= yes
diff --git a/graphics/qt4-opengl/Makefile b/graphics/qt4-opengl/Makefile
index 5bf67d9e5469..e6703d06439e 100644
--- a/graphics/qt4-opengl/Makefile
+++ b/graphics/qt4-opengl/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt OpenGL support module
-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
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 569539e9ad9a..f53d2ffcfbea 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4 screen magnifier
-USE_QT4= qmake_build moc_build corelib gui network
-QT_DIST= yes
+USES= qmake:no_env qt-dist:4
+USE_QT= moc_build corelib gui network
HAS_CONFIGURE= yes
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index 49a02e24485d..a384d4cce5b0 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG support module
-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
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
index 38da5121925f..52013204c156 100644
--- a/graphics/qt5-3d/Makefile
+++ b/graphics/qt5-3d/Makefile
@@ -10,9 +10,8 @@ COMMENT= Qt3D module
LIB_DEPENDS= libassimp.so:multimedia/assimp
-USES= pkgconfig qmake:norecursive
-USE_QT5= concurrent core gui network qml quick buildtools_build
-QT_DIST= ${PORTNAME}
+USES= pkgconfig qmake:norecursive qt-dist:5,3d
+USE_QT= concurrent core gui network qml quick buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/graphics/qt5-graphicaleffects/Makefile b/graphics/qt5-graphicaleffects/Makefile
index 6a99f055f96c..308c1fcc6255 100644
--- a/graphics/qt5-graphicaleffects/Makefile
+++ b/graphics/qt5-graphicaleffects/Makefile
@@ -8,8 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Quick graphical effects
-USES= qmake
-USE_QT5= buildtools_build core gui quick qml
-QT_DIST= ${PORTNAME}
+USES= qmake qt-dist:5,graphicaleffects
+USE_QT= buildtools_build core gui quick qml
.include <bsd.port.mk>
diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile
index 0cd7b542ae10..fe10cb544beb 100644
--- a/graphics/qt5-imageformats/Makefile
+++ b/graphics/qt5-imageformats/Makefile
@@ -13,8 +13,7 @@ LIB_DEPENDS= libjasper.so:graphics/jasper \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp
-USE_QT5= core gui buildtools_build
-QT_DIST= ${PORTNAME}
-USES= localbase qmake
+USE_QT= core gui buildtools_build
+USES= localbase qmake qt-dist:5,imageformats
.include <bsd.port.mk>
diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile
index 1ae328cc5b50..aeba157cc2e5 100644
--- a/graphics/qt5-opengl/Makefile
+++ b/graphics/qt5-opengl/Makefile
@@ -8,9 +8,9 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5-compatible OpenGL support module
+USES= qmake:no_env qt-dist:5,base
USE_GL= gl
-USE_QT5= core gui widgets qmake_build buildtools_build
-QT_DIST= base
+USE_QT= core gui widgets qmake_build buildtools_build
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile
index 545c33ad193a..7fed9bf09339 100644
--- a/graphics/qt5-pixeltool/Makefile
+++ b/graphics/qt5-pixeltool/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 screen magnifier
-USE_QT5= core gui widgets buildtools_build
-QT_DIST= tools
-USES= qmake
+USE_QT= core gui widgets buildtools_build
+USES= qmake qt-dist:5,tools
# qt5logo.png is installed by qt5-widgets.
DESKTOP_ENTRIES="Qt 5 PixelTool" "" \
diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile
index 06af1c12e8c7..27dc9bfb71d6 100644
--- a/graphics/qt5-svg/Makefile
+++ b/graphics/qt5-svg/Makefile
@@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG support module
-USE_QT5= core gui widgets buildtools_build
-QT_DIST= ${PORTNAME}
-USES= qmake
+USE_QT= core gui widgets buildtools_build
+USES= qmake qt-dist:5,svg
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>
diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile
index 6f8599e7cc0a..6849ab13bc03 100644
--- a/graphics/qt5-wayland/Makefile
+++ b/graphics/qt5-wayland/Makefile
@@ -14,13 +14,12 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libwayland-client.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon
-USES= pkgconfig qmake:norecursive
+USES= pkgconfig qmake:norecursive qt-dist:5,wayland
USE_GL= egl gl
USE_GNOME= glib20
-USE_QT5= core dbus gui qml quick \
+USE_QT= core dbus gui qml quick \
buildtools_build qmake_build
USE_XORG= x11 xcomposite
-QT_DIST= ${PORTNAME}
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/graphics/qtawesome/Makefile b/graphics/qtawesome/Makefile
index aeb2456cd01c..2b29a9fb363e 100644
--- a/graphics/qtawesome/Makefile
+++ b/graphics/qtawesome/Makefile
@@ -21,8 +21,10 @@ OPTIONS_SINGLE= GUI
OPTIONS_SINGLE_GUI= QT4 QT5
OPTIONS_DEFAULT= QT4
-QT4_USE= qt4=corelib,gui,qmake_build,moc_build
-QT5_USE= qt5=core,gui,qmake_build,buildtools_build
+QT4_USES= qt:4
+QT4_USE= qt=corelib,gui,qmake_build,moc_build
+QT5_USES= qt:5
+QT5_USE= qt=core,gui,qmake_build,buildtools_build
MAKE_ARGS+= ${PORT_OPTIONS:MQT*:S/QT/QT=/}
WRKSRC_SUBDIR= QtAwesome
diff --git a/graphics/qxv/Makefile b/graphics/qxv/Makefile
index 4df5d66f6c34..a569458048b8 100644
--- a/graphics/qxv/Makefile
+++ b/graphics/qxv/Makefile
@@ -13,8 +13,8 @@ COMMENT= Qt 4 program that displays images of various formats
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= qmake tar:bzip2
-USE_QT4= corelib gui moc_build uic_build rcc_build
+USES= qmake qt:4 tar:bzip2
+USE_QT= corelib gui moc_build uic_build rcc_build
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/${PORTNAME}
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 5f7606190d6e..2249f9fbe3d7 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \
libpng.so:graphics/png
#MAKE_JOBS_UNSAFE= yes
-USES= cmake gettext jpeg
-USE_QT4= corelib gui xml qmake_build uic_build moc_build rcc_build \
+USES= cmake gettext jpeg qt:4
+USE_QT= corelib gui xml qmake_build uic_build moc_build rcc_build \
linguist_build
USE_XORG+= xrender
diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
index cb0f7973edaf..67ef4da9b8a0 100644
--- a/graphics/seexpr/Makefile
+++ b/graphics/seexpr/Makefile
@@ -16,9 +16,9 @@ USE_GITHUB= yes
GH_ACCOUNT= wdas
GH_PROJECT= SeExpr
-USES= bison cmake compiler:c++0x pyqt:4 python:2.7
+USES= bison cmake compiler:c++0x pyqt:4 python qt:4
USE_PYQT= gui_build sip_build
-USE_QT4= moc_build qmake_build rcc_build uic_build gui opengl
+USE_QT= moc_build qmake_build rcc_build uic_build gui opengl
BINARY_ALIAS= sip=sip-${PYTHON_VER}
MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40
diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile
index ed8738849e92..e1f3d31b5e47 100644
--- a/graphics/showimage/Makefile
+++ b/graphics/showimage/Makefile
@@ -13,11 +13,11 @@ COMMENT= Simple KDE based image viewer
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource kde:5 tar:bzip2
+USES= cmake:outsource kde:5 qt:5 tar:bzip2
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets 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/graphics/skanlite-kde4/Makefile b/graphics/skanlite-kde4/Makefile
index fb30a181a765..1b1a6b68e6c0 100644
--- a/graphics/skanlite-kde4/Makefile
+++ b/graphics/skanlite-kde4/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/src/COPYING
LIB_DEPENDS= libksane.so:graphics/libksane-kde4
-USES= cmake:outsource gettext kde:4 tar:xz
+USES= cmake:outsource gettext 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
CONFLICTS_INSTALL= skanlite
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index b40fa9b97d2f..b52d30ba594f 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/src/COPYING
LIB_DEPENDS= libKF5Sane.so:graphics/libksane \
libpng.so:graphics/png
-USES= cmake:outsource gettext kde:5 tar:xz
+USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= ecm auth config configwidgets codecs completion \
coreaddons doctools i18n jobwidgets kio \
service widgetsaddons xmlgui
-USE_QT5= buildtools_build qmake_build \
+USE_QT= buildtools_build qmake_build \
core concurrent dbus gui network widgets xml
CONFLICTS_INSTALL= skanlite-kde4
diff --git a/graphics/smillaenlarger/Makefile b/graphics/smillaenlarger/Makefile
index 791aef96ef9d..12f56c8d832b 100644
--- a/graphics/smillaenlarger/Makefile
+++ b/graphics/smillaenlarger/Makefile
@@ -12,8 +12,8 @@ COMMENT= Qt-based tool for high-quality image magnification/resizing
LICENSE= GPLv3
-USES= qmake zip
-USE_QT4= qmake_build moc_build rcc_build uic_build gui
+USES= qmake qt:4 zip
+USE_QT= qmake_build moc_build rcc_build uic_build gui
WRKSRC= ${WRKDIR}/${DISTNAME}/SmillaEnlargerSrc
diff --git a/graphics/spectacle/Makefile b/graphics/spectacle/Makefile
index d41833912848..6d13441d2a09 100644
--- a/graphics/spectacle/Makefile
+++ b/graphics/spectacle/Makefile
@@ -11,12 +11,12 @@ LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor \
libxcb-image.so:x11/xcb-util-image \
libxcb-util.so:x11/xcb-util
-USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
dbusaddons doctools ecm i18n jobwidgets kdeclarative kio \
libkipi newstuff notifications package service widgetsaddons \
windowsystem xmlgui
-USE_QT5= core concurrent dbus gui network printsupport qml quick \
+USE_QT= core concurrent dbus gui network printsupport qml quick \
widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xcb xext xfixes
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index fb5aefefe8f5..c02ffb868aa3 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -11,9 +11,9 @@ DISTNAME= StructureSynth-Source-v${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Rule-based 3D structure generator
-USES= qmake zip dos2unix
+USES= qmake qt:4 zip dos2unix
USE_GL= glu
-USE_QT4= corelib gui opengl moc_build rcc_build xml script
+USE_QT= corelib gui opengl moc_build rcc_build xml script
WRKSRC= ${WRKDIR}/structure-synth
DOS2UNIX_GLOB= *.cpp *.h
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index 64e02bd9a589..07d9babf16a2 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -15,8 +15,8 @@ LICENSE_COMB= multi
USE_GITHUB= yes
GH_ACCOUNT= bjorn
-USES= compiler:c++11-lib desktop-file-utils qmake shared-mime-info
-USE_QT5= core gui widgets opengl network \
+USES= compiler:c++11-lib desktop-file-utils qmake qt:5 shared-mime-info
+USE_QT= core gui widgets opengl network \
buildtools_build linguisttools_build
USE_GL= gl
USE_LDCONFIG= yes
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index aaeb9593b024..2a8e3ed54986 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -47,12 +47,14 @@ OPTIONS_SINGLE= GUI
OPTIONS_SINGLE_GUI= QT4 QT5
OPTIONS_DEFAULT= QT4
-QT4_USE= qt4=corelib,gui,network,opengl,webkit \
- qt4=xml,xmlpatterns \
- qt4=moc_build,qmake_build,rcc_build,uic_build
-QT5_USE= qt5=core,gui,network,opengl,webkit,widgets \
- qt5=xml,xmlpatterns \
- qt5=buildtools_build,qmake_build
+QT4_USES= qt:4
+QT4_USE= qt=corelib,gui,network,opengl,webkit \
+ qt=xml,xmlpatterns \
+ qt=moc_build,qmake_build,rcc_build,uic_build
+QT_USES= qt:5
+QT5_USE= qt=core,gui,network,opengl,webkit,widgets \
+ qt=xml,xmlpatterns \
+ qt=buildtools_build,qmake_build
QT5_CMAKE_BOOL= USE_QT5_IF_INSTALLED
post-build:
diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile
index 958515498ea3..6ccfcff05839 100644
--- a/graphics/xpdf4/Makefile
+++ b/graphics/xpdf4/Makefile
@@ -45,9 +45,9 @@ GUI_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE
GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE
GUI_DESC= QT5 interface
GUI_CMAKE_ARGS+= -DNO_TEXT_SELECT:BOOL=OFF
-GUI_USE= QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg
+GUI_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg
GUI_PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}"
-GUI_USES= desktop-file-utils
+GUI_USES= desktop-file-utils qt:5
PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON
PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF
diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
index 7a3979ecfca0..8460e8cdeb65 100644
--- a/graphics/yagf/Makefile
+++ b/graphics/yagf/Makefile
@@ -25,10 +25,10 @@ TESSERACT_RUN_DEPENDS= tesseract:graphics/tesseract
OPTIONS_DEFAULT= CUNEIFORM
-USES= cmake desktop-file-utils pkgconfig
+USES= cmake desktop-file-utils pkgconfig qt:4
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_QT4= corelib gui imageformats linguist_build \
+USE_QT= corelib gui imageformats linguist_build \
moc_build qmake_build rcc_build uic_build
PLIST_FILES= bin/yagf lib/yagf/libxspreload.so share/applications/YAGF.desktop\
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index cba3a0d5208c..2512f808c9dc 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -45,7 +45,8 @@ GTK2_USE= GNOME=gtk20
GTK2_CONFIGURE_ON= --with-gtk=yes
GTK2_CONFIGURE_OFF= --with-gtk=no
-QT4_USE= QT4=gui,moc_build
+QT4_USES= qt:4
+QT4_USE= QT=gui,moc_build
QT4_CONFIGURE_ON= --with-qt=yes
QT4_CONFIGURE_OFF= --with-qt=no
diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile
index 5626d80fdbe3..54c6ecbd1dcb 100644
--- a/graphics/zint/Makefile
+++ b/graphics/zint/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
-USES= cmake
+USES= cmake qt:4
USE_LDCONFIG= yes
-USE_QT4= gui xml qmake_build uic_build moc_build rcc_build designer
+USE_QT= gui xml qmake_build uic_build moc_build rcc_build designer
DESKTOP_ENTRIES="Zint" "Barcode generator" "" "zint-qt" "" false