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

11 files changed, 21 insertions, 11 deletions

diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile
index b3afb4b80e95..c7d6734122ed 100644
--- a/deskutils/akregator/Makefile
+++ b/deskutils/akregator/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	akregator
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -23,7 +24,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
 # pim components
 USE_KDE+=	akonadi akonadimime contacts grantleetheme kontactinterface \
 		libkdepim libkleo messagelib mime pimcommon pimtextedit syndication
-USE_QT=		core dbus gui location network printsupport qml quick \
+USE_QT=		core dbus declarative gui location network printsupport \
 		webchannel webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile
index cd4c308c4a21..f19c757c5171 100644
--- a/deskutils/grantlee-editor/Makefile
+++ b/deskutils/grantlee-editor/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grantlee-editor
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -24,7 +25,7 @@ USE_KDE=	archive attica auth codecs completion config configwidgets \
 # pim components
 USE_KDE+=	akonadi akonadicontacts akonadimime contacts grantleetheme \
 		kdepim-apps-libs libkleo messagelib mime pimcommon pimtextedit
-USE_QT=		core dbus gui location network qml quick webchannel webengine \
+USE_QT=		core dbus declarative gui location network webchannel webengine \
 		widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
index 84ec0d358ac4..634543660709 100644
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdeconnect-kde
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/stable/kdeconnect/${DISTVERSION}/src/
 DIST_SUBDIR=	KDE
@@ -24,7 +25,7 @@ USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons dbusaddons doctools ecm i18n iconthemes \
 		itemviews jobwidgets kcmutils kio notifications service \
 		solid wayland widgetsaddons xmlgui
-USE_QT=		concurrent core dbus gui network qml quick testlib widgets x11extras xml \
+USE_QT=		concurrent core dbus declarative gui network testlib widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xext xtst
 USE_LDCONFIG=	${QT_QMLDIR}/org/kde/kdeconnect
diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile
index 0ca4015d617d..6fde8f85b1a0 100644
--- a/deskutils/kdepim-addons/Makefile
+++ b/deskutils/kdepim-addons/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdepim-addons
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,7 +30,7 @@ USE_KDE+=	akonadi akonadicalendar akonadicontacts akonadiimportwizard \
 		kdepim-apps-libs kitinerary kpkpass libkdepim libkleo libksieve mailcommon \
 		mailimporter mailtransport messagelib mime pimcommon \
 		pimtextedit tnef
-USE_QT=		core dbus gui location network printsupport qml quick testlib \
+USE_QT=		core dbus declarative gui location network printsupport testlib \
 		webchannel webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile
index e8f5242f2da8..d5ad20ce8b7b 100644
--- a/deskutils/kdepim-runtime/Makefile
+++ b/deskutils/kdepim-runtime/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdepim-runtime
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -28,7 +29,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadinotes \
 		calendarutils contacts gapi identitymanagement imap \
 		kontactinterface kpimdav mailtransport mbox mime pimcommon \
 		pimtextedit syndication
-USE_QT=		core dbus gui location network printsupport qml quick speech \
+USE_QT=		core dbus declarative gui location network printsupport speech \
 		script webchannel webengine widgets xml xmlpatterns \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile
index 8b32b5eda9ba..470834487baa 100644
--- a/deskutils/kmail/Makefile
+++ b/deskutils/kmail/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kmail
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -34,7 +35,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadisearch calendarcore \
 		kontactinterface ldap mailcommon mailtransport messagelib \
 		mime pimcommon pimtextedit tnef \
 		kdepim-runtime5_run
-USE_QT=		core dbus gui location network printsupport qml quick \
+USE_QT=		core dbus declarative gui location network printsupport \
 		webchannel webengine widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/kontact/Makefile b/deskutils/kontact/Makefile
index b7e9b9e1e981..bc1a72d39b7e 100644
--- a/deskutils/kontact/Makefile
+++ b/deskutils/kontact/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kontact
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
 		service sonnet textwidgets widgetsaddons windowsystem xmlgui
 # pim components
 USE_KDE+=	akonadi grantleetheme kdepim-apps-libs kontactinterface libkdepim
-USE_QT=		core dbus gui location network qml quick webchannel webengine \
+USE_QT=		core dbus declarative gui location network webchannel webengine \
 		widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile
index 1c84500db8be..a615430a98da 100644
--- a/deskutils/latte-dock/Makefile
+++ b/deskutils/latte-dock/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	latte-dock
 DISTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/stable/latte-dock
 
@@ -19,7 +20,7 @@ USE_KDE=	activities archive attica auth codecs config configwidgets \
 		kdeclarative newstuff notifications package plasma-framework service \
 		wayland widgetsaddons windowsystem xmlgui \
 		ecm_build
-USE_QT=		core dbus gui network qml quick widgets x11extras xml \
+USE_QT=		core dbus declarative gui network widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xcb xext
 
diff --git a/deskutils/plasma5-milou/Makefile b/deskutils/plasma5-milou/Makefile
index 4b6bb9ed1093..d26c2e372bb0 100644
--- a/deskutils/plasma5-milou/Makefile
+++ b/deskutils/plasma5-milou/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	milou
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Plasma5 Plasmoid for search
 USES=		cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config coreaddons i18n kdeclarative package \
 		plasma-framework runner service
-USE_QT=		core gui network qml quick script testlib widgets \
+USE_QT=		core declarative gui network script testlib widgets \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>
diff --git a/deskutils/plasma5-sddm-kcm/Makefile b/deskutils/plasma5-sddm-kcm/Makefile
index 8b23c9e80fc4..046140f482fd 100644
--- a/deskutils/plasma5-sddm-kcm/Makefile
+++ b/deskutils/plasma5-sddm-kcm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sddm-kcm
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,7 +13,7 @@ USES=		cmake:outsource compiler:c++11-lib gettext kde:5 cpe pkgconfig \
 USE_KDE=	auth archive attica codecs completion config configwidgets \
 		coreaddons ecm i18n jobwidgets kio newstuff service \
 		widgetsaddons xmlgui
-USE_QT=		concurrent core dbus designer gui network qml quick uiplugin widgets \
+USE_QT=		concurrent core dbus declarative designer gui network uiplugin widgets \
 		x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	ice sm x11 xcb xcursor xext xfixes
diff --git a/deskutils/zanshin/Makefile b/deskutils/zanshin/Makefile
index 684621cf5d69..0aaf86010e1a 100644
--- a/deskutils/zanshin/Makefile
+++ b/deskutils/zanshin/Makefile
@@ -22,7 +22,7 @@ USE_KDE+=	akonadicalendar akonadicontacts akonadinotes akonadisearch \
 		calendarcore contacts identitymanagement kontactinterface ldap \
 		mime pimtextedit \
 		kdepim-runtime5_run
-USE_QT=		concurrent core dbus gui network printsupport qml testlib \
+USE_QT=		concurrent core dbus declarative gui network printsupport testlib \
 		widgets xml \
 		buildtools_build qmake_build