Merge lang/qt5-qml and x11-toolkits/qt5-quick into x11-toolkits/qt5-declarative

- There was no obvious reason to split these ports, and it makes
  porting simpler; the set of ports using either mostly coincided.

Exp-run by:	antoine
PR:		223687
PR:		232751

10 files changed, 27 insertions, 19 deletions

diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index 3a9e34118073..2aacd24047c3 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cool-retro-term
 PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
 
@@ -18,7 +18,7 @@ GH_PROJECT=	qmltermwidget:qtw
 GH_TAGNAME=	v0.1.0:qtw
 
 USES=		desktop-file-utils qmake qt:5
-USE_QT=		qmake_build buildtools_build core gui qml quick widgets \
+USE_QT=		qmake_build buildtools_build core declarative gui widgets \
 		graphicaleffects_run quickcontrols_run
 
 .include <bsd.port.pre.mk>
diff --git a/x11/kf5-kactivities/Makefile b/x11/kf5-kactivities/Makefile
index 7b984c9f7889..d5d1c24d8be9 100644
--- a/x11/kf5-kactivities/Makefile
+++ b/x11/kf5-kactivities/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kactivities
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,7 +14,7 @@ USES=		cmake:outsource compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz
 USE_KDE=	bookmarks config configwidgets coreaddons dbusaddons ecm \
 		globalaccel i18n kcmutils kdeclarative  kio package \
 		service widgetsaddons windowsystem xmlgui
-USE_QT=		buildtools_build core dbus gui network qmake_build qml \
-		quick sql widgets
+USE_QT=		buildtools_build core dbus declarative gui network qmake_build \
+		sql widgets
 
 .include <bsd.port.mk>
diff --git a/x11/kf5-krunner/Makefile b/x11/kf5-krunner/Makefile
index 22112e5dff27..1c68292f6d8f 100644
--- a/x11/kf5-krunner/Makefile
+++ b/x11/kf5-krunner/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	krunner
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	KF5 parallelized query system
 USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n kio package plasma-framework \
 		service solid threadweaver
-USE_QT=		buildtools_build core gui network qmake_build qml \
-		quick widgets
+USE_QT=		buildtools_build core declarative gui network qmake_build \
+		widgets
 
 .include <bsd.port.mk>
diff --git a/x11/kf5-plasma-framework/Makefile b/x11/kf5-plasma-framework/Makefile
index 81fd012dc088..aafc47d5490c 100644
--- a/x11/kf5-plasma-framework/Makefile
+++ b/x11/kf5-plasma-framework/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-framework
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,8 +15,8 @@ USE_KDE=	activities archive auth codecs completion config \
 		guiaddons i18n iconthemes jobwidgets kirigami2 kio package \
 		notifications service wayland windowsystem xmlgui kdeclarative \
 		widgetsaddons
-USE_QT=		buildtools_build core dbus gui network qmake_build qml \
-		quick script sql svg widgets x11extras xml
+USE_QT=		buildtools_build core dbus declarative gui network qmake_build \
+		script sql svg widgets x11extras xml
 USE_XORG=	ice sm x11 xcb xext xrandr
 
 .include <bsd.port.mk>
diff --git a/x11/plasma5-kscreen/Makefile b/x11/plasma5-kscreen/Makefile
index 242fdf56ab2a..6dade04c6886 100644
--- a/x11/plasma5-kscreen/Makefile
+++ b/x11/plasma5-kscreen/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kscreen
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,7 +13,7 @@ USES=		cmake:outsource compiler:c++11-lang cpe gettext kde:5 qt:5 \
 USE_KDE=	auth codecs config configwidgets coreaddons dbusaddons ecm \
 		globalaccel i18n kdeclarative libkscreen plasma-framework \
 		widgetsaddons xmlgui
-USE_QT=		core dbus gui network qml quick testlib widgets xml \
+USE_QT=		core dbus declarative gui network testlib widgets xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
index 04b08bacd5ad..2affb4dddeea 100644
--- a/x11/plasma5-plasma-desktop/Makefile
+++ b/x11/plasma5-plasma-desktop/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-desktop
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -36,8 +37,8 @@ USE_KDE=	activities activities-stats archive attica auth baloo \
 		widgetsaddons windowsystem xmlgui
 USE_KDE+=	drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run ksysguard_run \
 		polkit-kde-agent-1_run systemsettings_run
-USE_QT=		concurrent core dbus gui network phonon4 printsupport qml \
-		quick sql svg widgets x11extras xml \
+USE_QT=		concurrent core dbus declarative gui network phonon4 printsupport \
+		sql svg widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xcb xcursor xext xfixes xft xi xrender
 
diff --git a/x11/plasma5-plasma-integration/Makefile b/x11/plasma5-plasma-integration/Makefile
index 0c3b0451cc79..1fb3289daaea 100644
--- a/x11/plasma5-plasma-integration/Makefile
+++ b/x11/plasma5-plasma-integration/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-integration
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE=	auth bookmarks breeze codecs completion config configwidgets \
 		coreaddons ecm i18n iconthemes itemviews jobwidgets kio \
 		notifications service solid wayland \
 		widgetsaddons windowsystem xmlgui
-USE_QT=		concurrent core dbus gui network qml quick quickcontrols2 widgets \
+USE_QT=		concurrent core declarative dbus gui network quickcontrols2 widgets \
 		x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	xcb xcursor
@@ -32,7 +33,7 @@ NOTO_DESC=	KDE default font
 LIGHT_DESC=	Use noto-light
 BIG_DESC=	Use complete noto
 
-LIGHT_RUN_DEPENDS=	noto-lite>=0:x11-fonts/noto-lite 
+LIGHT_RUN_DEPENDS=	noto-lite>=0:x11-fonts/noto-lite
 BIG_RUN_DEPENDS=	noto>=0:x11-fonts/noto
 
 .include <bsd.port.mk>
diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
index 9158dd60199c..ce3246db8e59 100644
--- a/x11/plasma5-plasma-workspace/Makefile
+++ b/x11/plasma5-plasma-workspace/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -35,8 +36,8 @@ USE_KDE=	activities activitymanagerd attica auth baloo bookmarks \
 		widgetsaddons windowsystem xmlgui xmlrpcclient \
 		breeze_run breeze-icons_run oxygen-icons5_run \
 		kded_run milou_run
-USE_QT=		concurrent core dbus graphicaleffects gui network phonon4 \
-		printsupport qdbus qml quick quickcontrols_run script sql \
+USE_QT=		concurrent core declarative dbus graphicaleffects gui network phonon4 \
+		printsupport qdbus quickcontrols_run script sql \
 		testlib webkit widgets x11extras xml \
 		paths_run \
 		buildtools_build qmake_build
diff --git a/x11/radare-cutter/Makefile b/x11/radare-cutter/Makefile
index 4ec9da5c2c4d..43d2d49d16cd 100644
--- a/x11/radare-cutter/Makefile
+++ b/x11/radare-cutter/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	radare-cutter
 PORTVERSION=	1.7.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	swills@FreeBSD.org
@@ -19,8 +20,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	radareorg
 GH_PROJECT=	cutter
 
-USE_QT=		buildtools_build core gui location network printsupport qml \
-		quick svg webchannel webengine widgets
+USE_QT=		buildtools_build core declarative gui location network printsupport \
+		svg webchannel webengine widgets
 USE_GL=		gl
 
 WRKSRC_SUBDIR=	src
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
index 07545b74b55a..9debe42699e9 100644
--- a/x11/sddm/Makefile
+++ b/x11/sddm/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	sddm
 PORTVERSION=	0.17.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	kde@FreeBSD.org
@@ -23,7 +23,7 @@ RUN_DEPENDS=	dbus-run-session:devel/dbus
 USES=		cmake:outsource compiler:c++11-lang kde:5 qt:5
 USE_GITHUB=	yes
 USE_KDE=	ecm
-USE_QT=		core dbus gui network qml quick \
+USE_QT=		core declarative dbus gui network \
 		buildtools_build linguisttools_build qmake_build
 USE_XORG=	xcb