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

14 files changed, 30 insertions, 27 deletions

diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index 1b976022a928..8cd864927817 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
 # We need to add a RUN_DEPENDS on eigen2, as the cmake file shiped with
 # avogadro to use it, contains 'find_package(Eigen2 REQUIRED)'.
-USES=		cmake desktop-file-utils eigen:2,build,run pkgconfig tar:bzip2
+USES=		cmake desktop-file-utils eigen:2,build,run pkgconfig qt:4 tar:bzip2
 USE_GL=		glu gl
-USE_QT4=	gui network opengl \
+USE_QT=		gui network opengl \
 		linguisttools_build moc_build qmake_build rcc_build uic_build
 CMAKE_ARGS=	-DENABLE_GLSL=OFF \
 		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
diff --git a/science/iboview/Makefile b/science/iboview/Makefile
index 6bdf60270a4d..3b5c187a1004 100644
--- a/science/iboview/Makefile
+++ b/science/iboview/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	boost-libs>=0:devel/boost-libs
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON_amd64=	only builds and is supported on amd64
 
-USES=		fortran blaslapack:openblas qmake:outsource tar:bz2
+USES=		fortran blaslapack:openblas qmake:outsource qt:5 tar:bz2
 USE_GL=		gl glu
-USE_QT5=	buildtools_build core gui widgets opengl script svg
+USE_QT=		buildtools_build core gui widgets opengl script svg
 
 PLIST_FILES=	bin/iboview
 
diff --git a/science/kalzium-kde4/Makefile b/science/kalzium-kde4/Makefile
index 350f8741ccda..2aaf60525b73 100644
--- a/science/kalzium-kde4/Makefile
+++ b/science/kalzium-kde4/Makefile
@@ -14,11 +14,11 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
-USES=		cmake:outsource eigen:3 kde:4 pkgconfig tar:xz
+USES=		cmake:outsource eigen:3 kde:4 pkgconfig qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
-USE_QT4=	corelib declarative designer opengl script xml \
+USE_QT=		corelib declarative designer opengl script xml \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index 598d62701eed..774b8c3606e9 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
-USES=		cmake:outsource gettext kde:5 pkgconfig tar:xz
+USES=		cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	auth archive bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools ecm emoticons guiaddons i18n \
 		iconthemes itemmodels itemviews jobwidgets js kdelibs4support \
@@ -22,7 +22,7 @@ USE_KDE=	auth archive bookmarks codecs completion config configwidgets \
 		xmlgui
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
-USE_QT5=	core dbus gui network opengl printsupport qml quick script svg \
+USE_QT=		core dbus gui network opengl printsupport qml quick script svg \
 		widgets xml \
 		buildtools_build qmake_build
 
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index f2e361033086..28fc82b9ed85 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -51,8 +51,10 @@ NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_IGNORE=	does not support NetCDF 4
 
 TOOLKIT_DESC=	Qt toolkit
-QT4_USE=	${_USE_QT4:S/^/QT4=/}
-QT5_USE=	${_USE_QT5:S/^/QT5=/}
+QT4_USES=	qt:4
+QT4_USE=	${_USE_QT4:S/^/QT=/}
+QT5_USES=	qt:5
+QT5_USE=	${_USE_QT5:S/^/QT=/}
 QT5_CMAKE_ON=	-Dkst_qt5=on
 
 post-patch:
diff --git a/science/libgeodecomp/Makefile b/science/libgeodecomp/Makefile
index 699de583a3b0..50b412b266f9 100644
--- a/science/libgeodecomp/Makefile
+++ b/science/libgeodecomp/Makefile
@@ -30,7 +30,8 @@ OPTIONS_DEFAULT=	MPI QT4 SILO SCOTCH
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 MPI_CMAKE_BOOL=		WITH_MPI
 
-QT4_USE=		QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
+QT4_USES=	qt:4
+QT4_USE=		QT=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
 QT4_CMAKE_BOOL=		WITH_QT
 
 SILO_DESC=		Enable Silo dependend output
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index 345abc87ec97..724310556be0 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GCC=	any
-USES=		cmake gettext tar:bzip2
+USES=		cmake gettext qt:4 tar:bzip2
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_GNOME=	glib20
-USE_QT4=	corelib gui xml rcc_build qmake_build uic_build moc_build \
+USE_QT=		corelib gui xml rcc_build qmake_build uic_build moc_build \
 		svg
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 16842a5f31c7..3a76db318b30 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -31,8 +31,8 @@ LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 RUN_DEPENDS=	bash:shells/bash	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 
-USES=		alias cmake:outsource jpeg localbase python:2.7 shebangfix
-USE_QT5=	core gui help network sql widgets x11extras buildtools_build qmake_build
+USES=		alias cmake:outsource jpeg localbase python:2.7 qt:5 shebangfix
+USE_QT=		core gui help network sql widgets x11extras buildtools_build qmake_build
 USE_GL=		gl glu
 USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto
 USE_LDCONFIG=	yes
diff --git a/science/pulseview/Makefile b/science/pulseview/Makefile
index effb5fa1d5db..e28b358680ab 100644
--- a/science/pulseview/Makefile
+++ b/science/pulseview/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libsigrok.so:devel/libsigrok \
 		libsigrokdecode.so:devel/libsigrokdecode
 
-USES=		cmake desktop-file-utils pkgconfig
+USES=		cmake desktop-file-utils pkgconfig qt:5
 USE_GNOME=	glibmm glib20 libsigc++20
-USE_QT5=	buildtools core gui qmake_build svg widgets
+USE_QT=		buildtools core gui qmake_build svg widgets
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
 		-DDISABLE_WERROR:BOOL=TRUE
 INSTALLS_ICONS=	yes
diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile
index 1a6d4a385e00..3d3e0804994c 100644
--- a/science/py-veusz/Makefile
+++ b/science/py-veusz/Makefile
@@ -17,10 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	${PYNUMPY}
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-USES=		python pyqt:4 shebangfix
+USES=		python pyqt:4 qt:4 shebangfix
 USE_PYQT=	gui svg
 USE_PYTHON=	distutils concurrent autoplist
-USE_QT4=	corelib gui xml
+USE_QT=		corelib gui xml
 SHEBANG_FILES=	examples/embedexample.py
 
 post-patch:
diff --git a/science/qtresistors/Makefile b/science/qtresistors/Makefile
index 7727ec29019a..1980b69418e7 100644
--- a/science/qtresistors/Makefile
+++ b/science/qtresistors/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	118297-qtResistors-201001102229
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Calculate resistance of resistor by the colors on the resistor
 
-USES=		qmake
-USE_QT4=	gui uic_build moc_build
+USES=		qmake qt:4
+USE_QT=		gui uic_build moc_build
 
 WRKSRC=		${WRKDIR}/qtResistors
 
diff --git a/science/silo/Makefile b/science/silo/Makefile
index c3f6ae8f4037..163e40e744b0 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -36,12 +36,12 @@ HDF5_PLIST_SUB_OFF=		SUFX_HDF5=""
 PYTHON_CONFIGURE_ENABLE=	pythonmodule
 PYTHON_USES=			python:2.7
 
+QT4_USES=			qmake:no_env qt:4
 QT4_USE=			XORG=ice,sm,x11,xext,xi,xmu,xt \
-				QT4=corelib,gui,linguisttools_build,moc_build,uic_build
+				QT=corelib,gui,linguisttools_build,moc_build,uic_build
 QT4_CONFIGURE_ON=		--with-Qt-dir=${PREFIX} \
 				--with-Qt-lib="QtGui -lQtCore"
 QT4_CONFIGURE_ENABLE=		silex
-QT4_VARS=			QT_NONSTANDARD=yes
 QT4_DESKTOP_ENTRIES=		"Silex" "Silex browser for Silo files" \
 				"" "silex" "" true
 
diff --git a/science/step-kde4/Makefile b/science/step-kde4/Makefile
index a7edabc1fa89..a2f4102e1813 100644
--- a/science/step-kde4/Makefile
+++ b/science/step-kde4/Makefile
@@ -11,9 +11,9 @@ COMMENT=	KDE 4 interactive physics simulator
 LIB_DEPENDS=	libqalculate.so:math/libqalculate \
 		libgsl.so:math/gsl
 
-USES=		cmake:outsource eigen:2 kde:4 pkgconfig tar:xz
+USES=		cmake:outsource eigen:2 kde:4 pkgconfig qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
-USE_QT4=	opengl moc_build qmake_build rcc_build uic_build
+USE_QT=		opengl moc_build qmake_build rcc_build uic_build
 
 pre-configure:
 # Avoid building translations, should the user pass
diff --git a/science/step/Makefile b/science/step/Makefile
index 22deaca38001..78d6c6bc1383 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -12,14 +12,14 @@ LIB_DEPENDS=	libcln.so:math/cln \
 		libgsl.so:math/gsl \
 		libqalculate.so:math/libqalculate
 
-USES=		cmake:outsource eigen:3 gettext kde:5 pkgconfig tar:xz
+USES=		cmake:outsource eigen:3 gettext kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools ecm emoticons guiaddons i18n \
 		iconthemes init itemmodels itemviews jobwidgets js \
 		kdelibs4support khtml kio newstuff notifications parts \
 		plotting service solid sonnet textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui
-USE_QT5=	core dbus gui network opengl printsupport qml quick svg \
+USE_QT=		core dbus gui network opengl printsupport qml quick svg \
 		widgets xml \
 		buildtools_build qmake_build