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

26 files changed, 62 insertions, 56 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 2c3d8416655b..bc1f920e025b 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -28,9 +28,9 @@ CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-* \
 		libfwbuilder-[234].* libfwbuilder-devel-*
 .endif
 
-USES=		autoreconf:build gmake libtool ssl
+USES=		autoreconf:build gmake libtool qmake:no_configure qt:4 ssl
 PLIST_SUB=	BUILD_VERSION=${PORTVERSION}.${BUILD}
-USE_QT4=	corelib \
+USE_QT=		corelib \
 		gui \
 		iconengines \
 		inputmethods \
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 7d4f32703a58..2a0648bd7f29 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -71,15 +71,15 @@ NO_TEST=	yes
 
 .  if ${SLAVEPORT} == "qt5"
 LIB_DEPENDS+=	libgpgmepp.so:security/gpgme-cpp
-USES+=		compiler:c++11-lib pkgconfig
-USE_QT5=	buildtools_build core
+USES+=		compiler:c++11-lib pkgconfig qt:5
+USE_QT=	buildtools_build core
 CONFIGURE_ARGS+=--enable-languages="cpp qt"
 DOCSDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE+=	DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dot:graphics/graphviz
-TEST_USE=		QT5=testlib_build
+TEST_USE=		QT=testlib_build
 .  endif
 
 .  if ${SLAVEPORT} == "python"
diff --git a/security/ike/Makefile b/security/ike/Makefile
index b334dfbc094a..675656932fca 100644
--- a/security/ike/Makefile
+++ b/security/ike/Makefile
@@ -37,7 +37,8 @@ LDAP_USE=	OPENLDAP=yes
 LDAP_CMAKE_ON=	-DLDAP=YES
 NATT_CMAKE_ON=	-DNATT=YES
 QTGUI_CMAKE_ON=	-DQTGUI=YES
-QTGUI_USE=	QT4=gui,moc_build,qmake_build,rcc_build,uic_build
+QTGUI_USES=	qt:4
+QTGUI_USE=	QT=gui,moc_build,qmake_build,rcc_build,uic_build
 
 post-install:
 	@if ! ${SYSCTL} -a | ${GREP} -q ipsec; then \
diff --git a/security/keepassx-devel/Makefile b/security/keepassx-devel/Makefile
index 95e2c0ae9f4e..fe5f77c79b49 100644
--- a/security/keepassx-devel/Makefile
+++ b/security/keepassx-devel/Makefile
@@ -23,10 +23,10 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 CONFLICTS_INSTALL=	keepassx-0.* keepassx2-* keepassxc-*
 
-USES=		cmake compiler:c++11-lib desktop-file-utils shared-mime-info
+USES=		cmake compiler:c++11-lib desktop-file-utils qt:5 shared-mime-info
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_QT5=	buildtools_build concurrent core gui linguisttools qmake_build \
+USE_QT=		buildtools_build concurrent core gui linguisttools qmake_build \
 		testlib widgets x11extras
 USE_XORG=	ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \
 		xt xtst
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 877ab050ad86..5c34e962d406 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Cross Platform Password Manager
 DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 
-USES=		desktop-file-utils qmake shared-mime-info
-USE_QT4=	moc_build uic_build qt3support_build rcc_build \
+USES=		desktop-file-utils qmake qt:4 shared-mime-info
+USE_QT=		moc_build uic_build qt3support_build rcc_build \
 		corelib gui xml
 USE_XORG=	xt inputproto xtst xrender xrandr xfixes xcursor\
 		xext x11 sm ice xi
diff --git a/security/keepassx2/Makefile b/security/keepassx2/Makefile
index 81c9f5270d5b..6ac08e07f7c6 100644
--- a/security/keepassx2/Makefile
+++ b/security/keepassx2/Makefile
@@ -24,10 +24,10 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 CONFLICTS_INSTALL=	keepassx-0.* keepassx-devel-* keepassxc-*
 
-USES=		cmake compiler:features desktop-file-utils shared-mime-info
+USES=		cmake compiler:features desktop-file-utils qt:4 shared-mime-info
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_QT4=	corelib gui xml qtestlib uic_build moc_build \
+USE_QT=		corelib gui xml qtestlib uic_build moc_build \
 		qmake_build rcc_build linguisttools
 USE_XORG=	ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \
 		xt xtst
diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index d4ac9962062a..ddde29c9dcfc 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 
-USES=		cmake:outsource desktop-file-utils shared-mime-info tar:xz
-USE_QT5=	buildtools_build concurrent core dbus gui linguisttools network \
+USES=		cmake:outsource desktop-file-utils qt:5 shared-mime-info tar:xz
+USE_QT=		buildtools_build concurrent core dbus gui linguisttools network \
 		qmake_build testlib widgets
 USE_XORG=	x11
 USE_LDCONFIG=	yes
@@ -41,7 +41,8 @@ OPTIONS_SUB=		yes
 
 AUTOTYPE_CMAKE_BOOL=	WITH_XC_AUTOTYPE
 AUTOTYPE_DESC=		Auto-type passwords in input fields
-AUTOTYPE_USE=		QT5=x11extras XORG=xi,xtst
+AUTOTYPE_USES=	qt:5
+AUTOTYPE_USE=		QT=x11extras XORG=xi,xtst
 
 BROWSER_CMAKE_BOOL=	WITH_XC_BROWSER
 BROWSER_DESC=		Browser integration with KeePassXC-Browser
diff --git a/security/kf5-kdesu/Makefile b/security/kf5-kdesu/Makefile
index 3ca461fca136..91b6ec56a3b5 100644
--- a/security/kf5-kdesu/Makefile
+++ b/security/kf5-kdesu/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	security kde kde-frameworks
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 integration with su for elevated privileges
 
-USES=		cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons dbusaddons ecm i18n pty service
-USE_QT5=	buildtools_build core dbus qmake_build xml
+USE_QT=		buildtools_build core dbus qmake_build xml
 USE_XORG=	ice sm x11 xext
 
 .include <bsd.port.mk>
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index c78f9fdadc1c..24b4bf2ee9fa 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Encryption tool for KDE
 
 RUN_DEPENDS=	gpg2:security/gnupg
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	automoc4 kdelibs pimlibs
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USE_QT=		qmake_build moc_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index 9f9178e8f2c4..38d818c4b615 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -9,13 +9,13 @@ COMMENT=	Encryption tool for KDE
 
 RUN_DEPENDS=	gpg2:security/gnupg
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	akonadi akonadicontacts archive auth bookmarks codecs \
 		completion config configwidgets contacts coreaddons crash \
 		dbusaddons doctools ecm i18n iconthemes itemmodels itemviews \
 		jobwidgets kio notifications service solid sonnet textwidgets \
 		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/security/kleopatra/Makefile b/security/kleopatra/Makefile
index a9b2e72ea9a3..469d74301fb9 100644
--- a/security/kleopatra/Makefile
+++ b/security/kleopatra/Makefile
@@ -14,12 +14,12 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgpgmepp.so:security/gpgme-cpp \
 		libqgpgme.so:security/gpgme-qt5
 
-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 \
 		doctools ecm i18n iconthemes itemmodels kcmutils notifications \
 		service sonnet textwidgets widgetsaddons windowsystem xmlgui \
 		libkleo mime
-USE_QT5=	core dbus gui network printsupport testlib widgets xml \
+USE_QT=		core dbus gui network printsupport testlib widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/security/kqoauth/Makefile b/security/kqoauth/Makefile
index c8327290ae61..6f6345dadc6d 100644
--- a/security/kqoauth/Makefile
+++ b/security/kqoauth/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Implementation of OAuth 1.0 in C++ for Qt
 
 LICENSE=	LGPL21
 
-USES=		pkgconfig qmake
-USE_QT4=	corelib network gui moc_build qtestlib_build
+USES=		pkgconfig qmake qt:4
+USE_QT=		corelib network gui moc_build qtestlib_build
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 QMAKE_SOURCE_PATH=	${PORTNAME}.pro
diff --git a/security/kwalletmanager-kde4/Makefile b/security/kwalletmanager-kde4/Makefile
index 0da92a8372f9..fc02755ed566 100644
--- a/security/kwalletmanager-kde4/Makefile
+++ b/security/kwalletmanager-kde4/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	security kde kde-kde4
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Password manager for KDE
 
-USES=		cmake:outsource kde:4 tar:xz
+USES=		cmake:outsource kde:4 qt:4 tar:xz
 USE_KDE=	automoc4 kdelibs
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USE_QT=		qmake_build moc_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/security/kwalletmanager/Makefile b/security/kwalletmanager/Makefile
index d7e6a69533c4..9823698b765e 100644
--- a/security/kwalletmanager/Makefile
+++ b/security/kwalletmanager/Makefile
@@ -7,13 +7,13 @@ CATEGORIES=	security kde kde-applications
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Password manager for KDE
 
-USES=		cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USES=		cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
 USE_KDE=	archive auth codecs config configwidgets coreaddons crash \
 		dbusaddons doctools ecm emoticons i18n iconthemes init \
 		itemmodels itemviews kcmutils kdelibs4support kio \
 		jobwidgets notifications service wallet widgetsaddons \
 		windowsystem 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/security/libkleo/Makefile b/security/libkleo/Makefile
index b81fafe42e67..16a42afc3481 100644
--- a/security/libkleo/Makefile
+++ b/security/libkleo/Makefile
@@ -15,11 +15,11 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 RUN_DEPENDS=	${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
 
 
-USES=		cmake:outsource gettext kde:5 tar:xz
+USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	codecs completion config coreaddons i18n itemmodels \
 		widgetsaddons windowsystem \
 		pimtextedit
-USE_QT5=	core gui widgets \
+USE_QT=		core gui widgets \
 		buildtools_build qmake_build
 
 _CORETOOLS=	md5sum sha1sum sha256sum sha512sum
diff --git a/security/openconnect-gui/Makefile b/security/openconnect-gui/Makefile
index ec0381688732..2cdd90fb20c8 100644
--- a/security/openconnect-gui/Makefile
+++ b/security/openconnect-gui/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	openconnect:security/openconnect \
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:C/-gui//}
 
-USES=		cmake pkgconfig
-USE_QT5=	buildtools_build concurrent core gui network qmake_build widgets
+USES=		cmake pkgconfig qt:5
+USE_QT=		buildtools_build concurrent core gui network qmake_build widgets
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 PLIST_FILES=	bin/openconnect-gui
 
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index 1bb741c236d1..f923ead90895 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -27,7 +27,8 @@ GRAPH_IMPLIES=	X11
 X11_DESC=	Build Qt 4 GUI frontend
 GRAPH_DESC=	Enable graph rendering via Qwt
 
-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_CONFIGURE_OFF=	--disable-gui
 
 GRAPH_LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index e707f757c8e1..824787029d17 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -94,14 +94,14 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome3
 .endif
 
 .if ${PINENTRY_GUI} == "qt4"
-USES+=		compiler:c++11-lib
-USE_QT4=	corelib gui moc_build
+USES+=		compiler:c++11-lib qt:4
+USE_QT=		corelib gui moc_build
 PLIST_FILES=	bin/pinentry-qt4
 CONFIGURE_ARGS+=--disable-pinentry-qt5 \
 		--program-suffix=4
 .elif ${PINENTRY_GUI} == "qt5"
-USES+=		compiler:c++11-lib
-USE_QT5=	core gui widgets buildtools_build
+USES+=		compiler:c++11-lib qt:5
+USE_QT=		core gui widgets buildtools_build
 PLIST_FILES=	bin/pinentry-qt5
 CONFIGURE_ARGS+=--enable-pinentry-qt5 \
 		--program-suffix=5
diff --git a/security/plasma5-kscreenlocker/Makefile b/security/plasma5-kscreenlocker/Makefile
index da3d9b0a17ae..53fa2844b990 100644
--- a/security/plasma5-kscreenlocker/Makefile
+++ b/security/plasma5-kscreenlocker/Makefile
@@ -13,13 +13,13 @@ RUN_DEPENDS=	ck-list-sessions:sysutils/consolekit2\
 		dbus-send:devel/dbus
 
 USES=		cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \
-		shebangfix tar:xz
+		qt:5 shebangfix tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons crash ecm \
 		emoticons globalaccel i18n idletime init itemmodels kcmutils \
 		kdeclarative kdelibs4support notifications package \
 		plasma-framework sonnet textwidgets wayland widgetsaddons \
 		windowsystem xmlgui
-USE_QT5=	core dbus gui network qml quick testlib widgets x11extras xml \
+USE_QT=		core dbus gui network qml quick testlib widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xcb xcursor xext xi
 
diff --git a/security/plasma5-ksshaskpass/Makefile b/security/plasma5-ksshaskpass/Makefile
index 8887692367e6..ea6ec278bea1 100644
--- a/security/plasma5-ksshaskpass/Makefile
+++ b/security/plasma5-ksshaskpass/Makefile
@@ -7,9 +7,9 @@ CATEGORIES=	security kde kde-plasma
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 ssh-add frontend
 
-USES=		cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz
+USES=		cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
 USE_KDE=	coreaddons doctools ecm i18n wallet widgetsaddons
-USE_QT5=	core gui widgets \
+USE_QT=		core gui widgets \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/security/plasma5-kwallet-pam/Makefile b/security/plasma5-kwallet-pam/Makefile
index f1fc5e8441ff..7eb00e6c4592 100644
--- a/security/plasma5-kwallet-pam/Makefile
+++ b/security/plasma5-kwallet-pam/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Plasma5 KWallet PAM Integration
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 
-USES=		cmake:outsource cpe gettext kde:5 tar:xz
+USES=		cmake:outsource cpe gettext kde:5 qt:5 tar:xz
 USE_KDE=	ecm
-USE_QT5=	buildtools_build qmake_build
+USE_QT=		buildtools_build qmake_build
 
 # The qmake dependency is only needed so that kf5-e-c-m can query qmake for
 # some installation directories.
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index 762c30663131..c6cf6b805006 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -24,12 +24,14 @@ USE_KDE=	ecm
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .  if ${FLAVOR} == qt4
+USES+=		qt:4
 CMAKE_ON=	BUILD_WITH_QT4
-USE_QT4=	corelib dbus linguisttools_build moc_build rcc_build qmake_build
+USE_QT=		corelib dbus linguisttools_build moc_build rcc_build qmake_build
 PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
 PLIST=		${PKGDIR}/pkg-plist.${FLAVOR}
 .  else
-USE_QT5=	core dbus linguisttools_build buildtools_build qmake_build
+USES+=		qt:5
+USE_QT=		core dbus linguisttools_build buildtools_build qmake_build
 PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
 PLIST=		${PKGDIR}/pkg-plist.${FLAVOR}
 .  endif
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index 671f2e383fed..bec1e10d0ac7 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -32,8 +32,7 @@ TOOL_DESC=	Build EasyQuantis application
 GUI_DESC=	Build QT4 GUI for EasyQuantis application
 
 EXTRACT_BEFORE_ARGS=	-aqo
-USES=		cmake compiler:c++11-lang zip:infozip
-USE_QT4=	# empty but required
+USES=		cmake compiler:c++11-lang qt:4 zip:infozip
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 
@@ -78,7 +77,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libboost_date_time.a:devel/boost-libs
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 . if ${PORT_OPTIONS:MGUI}
-USE_QT4+=	gui moc_build uic_build rcc_build qmake_build
+USE_QT+=	gui moc_build uic_build rcc_build qmake_build
 . else
 CMAKE_ARGS+=	-DDISABLE_EASYQUANTIS_GUI=1
 . endif
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index f54ac2c9214f..0f766a90a516 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtspi.so:security/trousers
 
-USES=		qmake
-USE_QT4=	gui moc_build rcc_build uic_build
+USES=		qmake qt:4
+USE_QT=		gui moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
diff --git a/security/xca/Makefile b/security/xca/Makefile
index ece783d31cf5..43c7ead8de7f 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -27,9 +27,11 @@ OPTIONS_SINGLE=		TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
 OPTIONS_DEFAULT=	QT4
 
-QT4_USE=		qt4=gui,linguist_build,moc_build,qmake_build \
-			qt4=rcc_build,uic_build
-QT5_USE=		qt5=widgets,buildtools_build,linguist_build \
+QT4_USES=		qt:4
+QT4_USE=		qt=gui,linguist_build,moc_build,qmake_build \
+			qt=rcc_build,uic_build
+QT5_USES=		qt:5
+QT5_USE=		qt=widgets,buildtools_build,linguist_build \
 			CXXSTD=c++11
 TOOLKIT_DESC=		Qt toolkit
 
diff --git a/security/yubikey-personalization-gui/Makefile b/security/yubikey-personalization-gui/Makefile
index 1385f583c50d..667de8417a50 100644
--- a/security/yubikey-personalization-gui/Makefile
+++ b/security/yubikey-personalization-gui/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libykpers-1.so:security/ykpers \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yubico
 
-USES=		pkgconfig qmake
-USE_QT4=	corelib gui moc_build rcc_build testlib_build uic_build
+USES=		pkgconfig qmake qt:4
+USE_QT=		corelib gui moc_build rcc_build testlib_build uic_build
 
 PLIST_FILES=	bin/yubikey-personalization-gui \
 		man/man1/yubikey-personalization-gui.1.gz \