svn commit: r484140 - in head: . Mk/Uses astro/kstars astro/marble astro/qmapshack audio/musescore audio/plasma5-plasma-pa audio/supercollider comms/qt5-connectivity comms/qt5-sensors databases/kbi...

Tobias C. Berner tcberner at FreeBSD.org
Sun Nov 4 19:01:08 UTC 2018


Author: tcberner
Date: Sun Nov  4 19:00:53 2018
New Revision: 484140
URL: https://svnweb.freebsd.org/changeset/ports/484140

Log:
  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

Added:
  head/x11-toolkits/qt5-declarative/
     - copied from r484139, head/x11-toolkits/qt5-quick/
Deleted:
  head/lang/qt5-qml/
  head/x11-toolkits/qt5-quick/
Modified:
  head/MOVED
  head/Mk/Uses/qt.mk
  head/astro/kstars/Makefile
  head/astro/marble/Makefile
  head/astro/qmapshack/Makefile
  head/audio/musescore/Makefile
  head/audio/plasma5-plasma-pa/Makefile
  head/audio/supercollider/Makefile
  head/comms/qt5-connectivity/Makefile
  head/comms/qt5-sensors/Makefile
  head/databases/kbibtex/Makefile
  head/databases/kexi/Makefile
  head/databases/redisdesktopmanager/Makefile
  head/deskutils/akregator/Makefile
  head/deskutils/grantlee-editor/Makefile
  head/deskutils/kdeconnect-kde/Makefile
  head/deskutils/kdepim-addons/Makefile
  head/deskutils/kdepim-runtime/Makefile
  head/deskutils/kmail/Makefile
  head/deskutils/kontact/Makefile
  head/deskutils/latte-dock/Makefile
  head/deskutils/plasma5-milou/Makefile
  head/deskutils/plasma5-sddm-kcm/Makefile
  head/deskutils/zanshin/Makefile
  head/devel/RStudio/Makefile
  head/devel/kdevelop/Makefile
  head/devel/kf5-kcmutils/Makefile
  head/devel/kf5-kdeclarative/Makefile
  head/devel/kf5-ki18n/Makefile
  head/devel/kf5-knewstuff/Makefile
  head/devel/kf5-kpeople/Makefile
  head/devel/kf5-solid/Makefile
  head/devel/kio-extras/Makefile
  head/devel/okteta/Makefile
  head/devel/plasma5-plasma-sdk/Makefile
  head/devel/qt5-designer/Makefile
  head/devel/qt5-linguisttools/Makefile
  head/devel/qt5-location/Makefile
  head/devel/qt5-qdoc/Makefile
  head/devel/qt5-scxml/Makefile
  head/devel/qtcreator/Makefile
  head/editors/calligra/Makefile
  head/editors/tea/Makefile
  head/emulators/qmc2/Makefile
  head/emulators/rpcs3/Makefile
  head/finance/kmymoney/Makefile
  head/finance/skrooge/Makefile
  head/games/2048-qt/Makefile
  head/games/bomber/Makefile
  head/games/bovo/Makefile
  head/games/flightgear/Makefile
  head/games/gcompris-qt/Makefile
  head/games/granatier/Makefile
  head/games/kanagram/Makefile
  head/games/kapman/Makefile
  head/games/katomic/Makefile
  head/games/kblackbox/Makefile
  head/games/kblocks/Makefile
  head/games/kbounce/Makefile
  head/games/kbreakout/Makefile
  head/games/kdiamond/Makefile
  head/games/kfourinline/Makefile
  head/games/kgoldrunner/Makefile
  head/games/khangman/Makefile
  head/games/kigo/Makefile
  head/games/killbots/Makefile
  head/games/kiriki/Makefile
  head/games/kjumpingcube/Makefile
  head/games/klickety/Makefile
  head/games/klines/Makefile
  head/games/kmahjongg/Makefile
  head/games/kmines/Makefile
  head/games/knavalbattle/Makefile
  head/games/knetwalk/Makefile
  head/games/kolf/Makefile
  head/games/kollision/Makefile
  head/games/konquest/Makefile
  head/games/kpat/Makefile
  head/games/kreversi/Makefile
  head/games/kshisen/Makefile
  head/games/ksirk/Makefile
  head/games/ksnakeduel/Makefile
  head/games/kspaceduel/Makefile
  head/games/ksquares/Makefile
  head/games/ksudoku/Makefile
  head/games/ktuberling/Makefile
  head/games/kubrick/Makefile
  head/games/libkdegames/Makefile
  head/games/lskat/Makefile
  head/games/openage/Makefile
  head/games/picmi/Makefile
  head/graphics/krita/Makefile
  head/graphics/okular/Makefile
  head/graphics/photoqt/Makefile
  head/graphics/qt5-3d/Makefile
  head/graphics/qt5-graphicaleffects/Makefile
  head/graphics/qt5-wayland/Makefile
  head/graphics/radiance/Makefile
  head/graphics/spectacle/Makefile
  head/lang/Makefile
  head/lang/py-qt5-qml/Makefile
  head/math/analitza/Makefile
  head/math/kalgebra/Makefile
  head/math/rocs/Makefile
  head/misc/artikulate/Makefile
  head/misc/kf5-purpose/Makefile
  head/misc/ktouch/Makefile
  head/misc/parley/Makefile
  head/multimedia/QtAV/Makefile
  head/multimedia/gstreamer1-qt/Makefile
  head/multimedia/kamoso/Makefile
  head/multimedia/kdenlive/Makefile
  head/multimedia/minitube/Makefile
  head/multimedia/mkvtoolnix/Makefile
  head/multimedia/qt5-multimedia/Makefile
  head/multimedia/shotcut/Makefile
  head/multimedia/webcamoid/Makefile
  head/multimedia/webvfx-qt5/Makefile
  head/net-im/cutegram/Makefile
  head/net-im/kaccounts-integration/Makefile
  head/net-im/kaccounts-providers/Makefile
  head/net-im/ktp-accounts-kcm/Makefile
  head/net-im/ktp-call-ui/Makefile
  head/net-im/ktp-common-internals/Makefile
  head/net-im/ktp-desktop-applets/Makefile
  head/net-im/ktp-text-ui/Makefile
  head/net-im/ricochet/Makefile
  head/net-im/telegramqml/Makefile
  head/net/kf5-kholidays/Makefile
  head/net/kitinerary/Makefile
  head/net/libkgapi/Makefile
  head/net/libksieve/Makefile
  head/net/linphone/Makefile
  head/net/messagelib/Makefile
  head/polish/kadu/Makefile
  head/ports-mgmt/octopkg/Makefile
  head/print/print-manager/Makefile
  head/print/scribus-devel/Makefile
  head/science/kalzium/Makefile
  head/science/step/Makefile
  head/security/plasma5-kscreenlocker/Makefile
  head/sysutils/kf5-baloo/Makefile
  head/sysutils/plasma5-discover/Makefile
  head/sysutils/plasma5-systemsettings/Makefile
  head/textproc/kreport/Makefile
  head/www/falkon/Makefile
  head/www/otter-browser/Makefile
  head/www/py-qt5-webchannel/Makefile
  head/www/py-qt5-webengine/Makefile
  head/www/qt5-webchannel/Makefile
  head/www/qt5-webengine/Makefile
  head/www/qt5-webkit/Makefile
  head/www/qt5-websockets-qml/Makefile
  head/x11-fm/konqueror/Makefile
  head/x11-themes/kf5-qqc2-desktop-style/Makefile
  head/x11-themes/plasma5-breeze/Makefile
  head/x11-themes/plasma5-oxygen/Makefile
  head/x11-toolkits/Makefile
  head/x11-toolkits/kf5-kirigami2/Makefile
  head/x11-toolkits/kproperty/Makefile
  head/x11-toolkits/plasma5-kdeplasma-addons/Makefile
  head/x11-toolkits/py-qt5-quick/Makefile
  head/x11-toolkits/py-qt5-quickwidgets/Makefile
  head/x11-toolkits/qml-box2d/Makefile
  head/x11-toolkits/qt5-canvas3d/Makefile
  head/x11-toolkits/qt5-charts/Makefile
  head/x11-toolkits/qt5-datavis3d/Makefile
  head/x11-toolkits/qt5-declarative/Makefile
  head/x11-toolkits/qt5-declarative/pkg-plist
  head/x11-toolkits/qt5-gamepad/Makefile
  head/x11-toolkits/qt5-quickcontrols/Makefile
  head/x11-toolkits/qt5-quickcontrols2/Makefile
  head/x11-toolkits/qt5-virtualkeyboard/Makefile
  head/x11-wm/plasma5-kwin/Makefile
  head/x11/cool-retro-term/Makefile
  head/x11/kf5-kactivities/Makefile
  head/x11/kf5-krunner/Makefile
  head/x11/kf5-plasma-framework/Makefile
  head/x11/plasma5-kscreen/Makefile
  head/x11/plasma5-plasma-desktop/Makefile
  head/x11/plasma5-plasma-integration/Makefile
  head/x11/plasma5-plasma-workspace/Makefile
  head/x11/radare-cutter/Makefile
  head/x11/sddm/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/MOVED	Sun Nov  4 19:00:53 2018	(r484140)
@@ -9378,7 +9378,6 @@ www/apache22-event-mpm||2017-07-01|Has expired: Upstre
 net/freeradius2|net/freeradius3|2017-07-01|Has expired: EoL, use net/freeradius3 instead
 net/abills||2017-07-01|Removed, unmaintained and depends on expired net/freeradius2
 net-mgmt/ezradius||2017-07-01|Removed, unmaintained and depends on expired net/freeradius2
-x11-toolkits/qt5-declarative||2017-07-01|Has expired: Has not been released since Qt 5.5 -- installation can lead to runtime conflicts with qt5-quick
 deskutils/california|deskutils/gnome-calendar|2017-07-02|Has expired: Orphaned upstream, replaced by gnome-calendar
 devel/etcd3|devel/etcd31|2017-07-07|Version 3.2 introduces breaking changes
 sysutils/py-iocage|sysutils/py3-iocage|2017-07-10|Has expired: obsoleted by sysutils/py3-iocage port using Python 3 instead of Python 2
@@ -10616,3 +10615,5 @@ www/rubygem-dropzonejs-rails07|www/rubygem-dropzonejs-
 audio/icecast2|audio/icecast|2018-11-03|Use upstream naming
 security/openssl-devel|security/openssl111|2018-11-04|Use security/openssl111 instead
 irc/netwalker-ircc||2018-11-04|Has expired: Upstream gone, very old code base, use modern irc client instead
+x11-toolkits/qt5-quick|x11-toolkits/qt5-declarative|2018-11-04|Remove unnecessary split
+lang/qt5-qml|x11-toolkits/qt5-declarative|2018-11-04|Remove unnecessary split

Modified: head/Mk/Uses/qt.mk
==============================================================================
--- head/Mk/Uses/qt.mk	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/Mk/Uses/qt.mk	Sun Nov  4 19:00:53 2018	(r484140)
@@ -137,7 +137,7 @@ _USES_POST+=		qt
 _QT_MK_POST_INCLUDED=	qt.mk
 
 # The Qt components supported by qt.mk: list of shared, and version specific ones
-_USE_QT_ALL=		assistant dbus designer doc gui help \
+_USE_QT_ALL=		assistant dbus declarative designer doc gui help \
 			imageformats l10n linguist linguisttools multimedia \
 			network opengl pixeltool qdbusviewer qmake script \
 			scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
@@ -145,7 +145,7 @@ _USE_QT_ALL=		assistant dbus designer doc gui help \
 			xml xmlpatterns
 
 _USE_QT4_ONLY=		accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
-			codecs-kr codecs-tw corelib declarative demo graphicssystems-opengl \
+			codecs-kr codecs-tw corelib demo graphicssystems-opengl \
 			help-tools iconengines inputmethods makeqpf moc phonon \
 			phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
 			qtestlib qvfb rcc uic uic3 xmlpatterns-tool
@@ -153,7 +153,7 @@ _USE_QT4_ONLY=		accessible assistant-adp assistantclie
 _USE_QT5_ONLY=		3d buildtools canvas3d charts concurrent connectivity \
 			core datavis3d diag examples gamepad \
 			graphicaleffects location paths phonon4 plugininfo printsupport \
-			qdbus qdoc qdoc-data qev qml quick quickcontrols \
+			qdbus qdoc qdoc-data qev quickcontrols \
 			quickcontrols2 scxml sensors serialbus serialport speech \
 			sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
 			webengine websockets websockets-qml widgets x11extras
@@ -217,7 +217,11 @@ dbus_PORT=		devel/${_QT_RELNAME}-dbus
 dbus_LIB=		libQt${_QT_LIBVER}DBus.so
 
 declarative_PORT=	x11-toolkits/${_QT_RELNAME}-declarative
+.  if ${_QT_VER:M4}
 declarative_LIB=	libQt${_QT_LIBVER}Declarative.so
+.  else
+declarative_LIB=	libQt${_QT_LIBVER}Qml.so
+.  endif
 
 demo_PORT=		misc/${_QT_RELNAME}-qtdemo
 demo_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qtdemo
@@ -333,9 +337,6 @@ qev_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qev
 qmake_PORT=		devel/${_QT_RELNAME}-qmake
 qmake_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qmake
 
-qml_PORT=		lang/${_QT_RELNAME}-qml
-qml_LIB=		libQt${_QT_LIBVER}Qml.so
-
 qmlviewer_PORT=		devel/${_QT_RELNAME}-qmlviewer
 qmlviewer_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer
 
@@ -347,9 +348,6 @@ qtconfig_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qtconfig
 
 qtestlib_PORT=		${testlib_PORT}
 qtestlib_LIB=		${testlib_LIB}
-
-quick_PORT=		x11-toolkits/${_QT_RELNAME}-quick
-quick_LIB=		libQt${_QT_LIBVER}Quick.so
 
 quickcontrols_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols
 quickcontrols_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir

Modified: head/astro/kstars/Makefile
==============================================================================
--- head/astro/kstars/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/astro/kstars/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kstars
 DISTVERSION=	2.9.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
@@ -25,8 +26,8 @@ USE_KDE=	attica auth bookmarks codecs completion confi
 		iconthemes init itemviews jobwidgets kio newstuff notifications \
 		notifyconfig parts plotting service solid texteditor \
 		widgetsaddons xmlgui
-USE_QT=		concurrent core dbus gui multimedia network opengl printsupport \
-		qml quick sql svg testlib websockets widgets xml \
+USE_QT=		concurrent core dbus declarative gui multimedia network opengl printsupport \
+		sql svg testlib websockets widgets xml \
 		buildtools_build qmake_build
 
 post-patch:

Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/astro/marble/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -18,8 +19,8 @@ USE_KDE=	attica auth codecs completion config configwi
 		crash doctools ecm i18n jobwidgets kio newstuff package parts \
 		plasma-framework runner service sonnet textwidgets wallet \
 		widgetsaddons xmlgui
-USE_QT=		concurrent core dbus designer gui location network opengl \
-		phonon4 printsupport qml quick script sql svg webkit widgets xml \
+USE_QT=		concurrent core dbus declarative designer gui location network opengl \
+		phonon4 printsupport script sql svg webkit widgets xml \
 		buildtools_build qmake_build
 
 USE_LDCONFIG=	yes

Modified: head/astro/qmapshack/Makefile
==============================================================================
--- head/astro/qmapshack/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/astro/qmapshack/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qmapshack
 PORTVERSION=	1.12.0
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/
 
@@ -19,8 +20,8 @@ LIB_DEPENDS=	libgdal.so:graphics/gdal \
 RUN_DEPENDS=	${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
 
 USES=		cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
-USE_QT=		buildtools core dbus gui linguisttools location network \
-		printsupport qmake qml quick sql sql-sqlite3 uitools \
+USE_QT=		buildtools core dbus declarative gui linguisttools location network \
+		printsupport qmake sql sql-sqlite3 uitools \
 		webchannel webengine widgets xml
 
 .include <bsd.port.mk>

Modified: head/audio/musescore/Makefile
==============================================================================
--- head/audio/musescore/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/audio/musescore/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,7 +3,7 @@
 
 PORTNAME=	musescore
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/
 DISTNAME=	MuseScore-${PORTVERSION}
@@ -24,8 +24,8 @@ LIB_DEPENDS=	libmp3lame.so:audio/lame \
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils \
 		pkgconfig qt:5 shared-mime-info zip
-USE_QT=		core gui widgets opengl concurrent designer help network \
-		scripttools qml quick svg sql printsupport testlib webkit \
+USE_QT=		core declarative gui widgets opengl concurrent designer help network \
+		scripttools svg sql printsupport testlib webkit \
 		xml xmlpatterns \
 		buildtools_build linguisttools_build qmake_build uitools_build
 ALL_TARGET=	lrelease manpages all

Modified: head/audio/plasma5-plasma-pa/Makefile
==============================================================================
--- head/audio/plasma5-plasma-pa/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/audio/plasma5-plasma-pa/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-pa
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-plasma
 
 MAINTAINER=	kde at FreeBSD.org
@@ -15,7 +16,7 @@ USES=		cmake:outsource compiler:c++11-lib cpe gettext 
 USE_GNOME=	gconf2
 USE_KDE=	config configwidgets coreaddons ecm globalaccel i18n \
 		kdeclarative package plasma-framework
-USE_QT=		core dbus gui network qml quick widgets \
+USE_QT=		core dbus declarative gui network widgets \
 		buildtools_build qmake_build
 
 SHEBANG_FILES=	data/plasmaVolumeDisableKMixAutostart.pl

Modified: head/audio/supercollider/Makefile
==============================================================================
--- head/audio/supercollider/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/audio/supercollider/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,7 +2,7 @@
 
 PORTNAME=	supercollider
 DISTVERSION=	3.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
 DISTNAME=	SuperCollider-${PORTVERSION}-Source-linux
@@ -22,8 +22,8 @@ LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 
 USES=		cmake:outsource compiler:c++11-lang iconv localbase pkgconfig \
 		qt:5 readline shared-mime-info tar:bzip2
-USE_QT=		buildtools_build concurrent core gui linguisttools location \
-		network opengl printsupport qmake_build qml quick sensors \
+USE_QT=		buildtools_build concurrent core declarative gui linguisttools location \
+		network opengl printsupport qmake_build sensors \
 		sql webkit widgets
 USE_XORG=	x11
 USE_LDCONFIG=	yes

Modified: head/comms/qt5-connectivity/Makefile
==============================================================================
--- head/comms/qt5-connectivity/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/comms/qt5-connectivity/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,13 +2,14 @@
 
 PORTNAME=	connectivity
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt connectivity (Bluetooth/NFC) module
 
-USE_QT=		concurrent core qml quick buildtools_build
+USE_QT=		concurrent core declarative buildtools_build
 USES=		qmake qt-dist:5,connectivity
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

Modified: head/comms/qt5-sensors/Makefile
==============================================================================
--- head/comms/qt5-sensors/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/comms/qt5-sensors/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,13 +2,14 @@
 
 PORTNAME=	sensors
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt sensors module
 
-USE_QT=		core qml quick buildtools_build
+USE_QT=		core declarative buildtools_build
 USES=		compiler:c++11-lang qmake:norecursive qt-dist:5,sensors
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

Modified: head/databases/kbibtex/Makefile
==============================================================================
--- head/databases/kbibtex/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/databases/kbibtex/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -23,8 +23,8 @@ USE_KDE=	auth bookmarks codecs completion config confi
 		coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
 		kio parts service solid sonnet textwidgets wallet \
 		widgetsaddons xmlgui
-USE_QT=		concurrent core dbus gui location network printsupport qml \
-		quick webchannel webengine widgets xml xmlpatterns \
+USE_QT=		concurrent core dbus declarative gui location network printsupport \
+		webchannel webengine widgets xml xmlpatterns \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 

Modified: head/databases/kexi/Makefile
==============================================================================
--- head/databases/kexi/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/databases/kexi/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -21,8 +21,8 @@ USE_KDE=		auth bookmarks codecs completion config \
 			iconthemes itemviews jobwidgets kio parts service \
 			solid sonnet texteditor textwidgets widgetsaddons \
 			xmlgui breeze-icons_build
-USE_QT=			core dbus gui network printsupport webkit widgets xml \
-			buildtools_build qmake_build qml
+USE_QT=			core dbus declarative gui network printsupport webkit widgets xml \
+			buildtools_build qmake_build
 
 CONFLICTS_INSTALL=	calligra-2*
 

Modified: head/databases/redisdesktopmanager/Makefile
==============================================================================
--- head/databases/redisdesktopmanager/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/databases/redisdesktopmanager/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	redisdesktopmanager
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	swills at FreeBSD.org
@@ -32,7 +33,7 @@ GH_TUPLE=	\
 		uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
 		redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
 		libssh2:libssh2:62b825c:libssh2/3rdparty/qredisclient/3rdparty/qsshclient/3rdparty/libssh2
-USE_QT=		buildtools_build charts concurrent core gui network qmake_build qml quick widgets
+USE_QT=		buildtools_build charts concurrent core declarative gui network qmake_build widgets
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h

Modified: head/deskutils/akregator/Makefile
==============================================================================
--- head/deskutils/akregator/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/akregator/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	akregator
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -23,7 +24,7 @@ USE_KDE=	auth codecs completion config configwidgets c
 # 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

Modified: head/deskutils/grantlee-editor/Makefile
==============================================================================
--- head/deskutils/grantlee-editor/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/grantlee-editor/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	grantlee-editor
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -24,7 +25,7 @@ USE_KDE=	archive attica auth codecs completion config 
 # 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

Modified: head/deskutils/kdeconnect-kde/Makefile
==============================================================================
--- head/deskutils/kdeconnect-kde/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/kdeconnect-kde/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -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 confi
 		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

Modified: head/deskutils/kdepim-addons/Makefile
==============================================================================
--- head/deskutils/kdepim-addons/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/kdepim-addons/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdepim-addons
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -29,7 +30,7 @@ USE_KDE+=	akonadi akonadicalendar akonadicontacts akon
 		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

Modified: head/deskutils/kdepim-runtime/Makefile
==============================================================================
--- head/deskutils/kdepim-runtime/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/kdepim-runtime/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdepim-runtime
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -28,7 +29,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadin
 		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

Modified: head/deskutils/kmail/Makefile
==============================================================================
--- head/deskutils/kmail/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/kmail/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kmail
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -34,7 +35,7 @@ USE_KDE+=	akonadi akonadicontacts akonadimime akonadis
 		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

Modified: head/deskutils/kontact/Makefile
==============================================================================
--- head/deskutils/kontact/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/kontact/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kontact
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE=	auth codecs completion config configwidgets c
 		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

Modified: head/deskutils/latte-dock/Makefile
==============================================================================
--- head/deskutils/latte-dock/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/latte-dock/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -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 
 		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
 

Modified: head/deskutils/plasma5-milou/Makefile
==============================================================================
--- head/deskutils/plasma5-milou/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/plasma5-milou/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	milou
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-plasma
 
 MAINTAINER=	kde at 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>

Modified: head/deskutils/plasma5-sddm-kcm/Makefile
==============================================================================
--- head/deskutils/plasma5-sddm-kcm/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/plasma5-sddm-kcm/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	sddm-kcm
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-plasma
 
 MAINTAINER=	kde at FreeBSD.org
@@ -12,7 +13,7 @@ USES=		cmake:outsource compiler:c++11-lib gettext kde:
 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

Modified: head/deskutils/zanshin/Makefile
==============================================================================
--- head/deskutils/zanshin/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/deskutils/zanshin/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -22,7 +22,7 @@ USE_KDE+=	akonadicalendar akonadicontacts akonadinotes
 		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
 

Modified: head/devel/RStudio/Makefile
==============================================================================
--- head/devel/RStudio/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/RStudio/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -6,7 +6,7 @@
 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.679
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libR.so:math/R \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake:outsource desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl
-USE_QT=		core dbus gui location network opengl printsupport qml quick sensors \
+USE_QT=		core dbus declarative gui location network opengl printsupport sensors \
 		sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
 USE_JAVA=	yes
 JAVA_BUILD=	yes

Modified: head/devel/kdevelop/Makefile
==============================================================================
--- head/devel/kdevelop/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kdevelop/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdevelop
 DISTVERSION=	5.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/kdevelop/${DISTVERSION}/src
 DIST_SUBDIR=	KDE/kdevelop
@@ -31,7 +31,7 @@ USE_KDE=	archive attica auth bookmarks codecs completi
 		notifyconfig package parts plasma-framework \
 		runner service solid sonnet texteditor textwidgets threadweaver \
 		widgetsaddons windowsystem xmlgui
-USE_QT=		concurrent core dbus gui help network qml quick \
+USE_QT=		concurrent core dbus declarative gui help network \
 		script sql widgets xml buildtools_build qmake_build
 CONFLICTS=	kdevelop-kde4-4* kdevelop-4* kdevplatform-kde4-4* kdevplatform-4*
 SHEBANG_FILES=	kdevplatform/util/kdevplatform_shell_environment.sh \

Modified: head/devel/kf5-kcmutils/Makefile
==============================================================================
--- head/devel/kf5-kcmutils/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kf5-kcmutils/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kcmutils
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde at FreeBSD.org
@@ -11,7 +12,7 @@ USES=		cmake:outsource compiler:c++11-lib gettext kde:
 USE_KDE=	auth codecs config configwidgets coreaddons ecm i18n \
 		iconthemes itemviews kdeclarative package service \
 		widgetsaddons xmlgui
-USE_QT=		buildtools_build core dbus gui network qmake_build \
-		qml quick widgets xml
+USE_QT=		buildtools_build core dbus declarative gui network qmake_build \
+		widgets xml
 
 .include <bsd.port.mk>

Modified: head/devel/kf5-kdeclarative/Makefile
==============================================================================
--- head/devel/kf5-kdeclarative/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kf5-kdeclarative/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdeclarative
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde at FreeBSD.org
@@ -14,7 +15,7 @@ USES=		cmake:outsource compiler:c++11-lib gettext kde:
 USE_KDE=	completion config coreaddons globalaccel guiaddons i18n \
 		iconthemes jobwidgets kio package service widgetsaddons \
 		windowsystem
-USE_QT=		buildtools_build core dbus gui network qmake_build qml \
-		quick testlib widgets xml
+USE_QT=		buildtools_build core dbus declarative gui network qmake_build \
+		testlib widgets xml
 
 .include <bsd.port.mk>

Modified: head/devel/kf5-ki18n/Makefile
==============================================================================
--- head/devel/kf5-ki18n/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kf5-ki18n/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -10,6 +10,6 @@ COMMENT=	KF5 advanced internationalization framework
 USES=		cmake:outsource compiler:c++11-lib gettext-runtime \
 		gettext-tools:build,run kde:5 qt:5 tar:xz
 USE_KDE=	ecm
-USE_QT=		buildtools_build concurrent core qmake_build qml script testlib
+USE_QT=		buildtools_build concurrent core declarative qmake_build script testlib
 
 .include <bsd.port.mk>

Modified: head/devel/kf5-knewstuff/Makefile
==============================================================================
--- head/devel/kf5-knewstuff/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kf5-knewstuff/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	knewstuff
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde at FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE=	archive attica5 auth codecs completion config
 		configwidgets coreaddons ecm i18n iconthemes itemviews \
 		jobwidgets kio service sonnet textwidgets widgetsaddons \
 		xmlgui
-USE_QT=		buildtools_build core dbus gui network qmake_build \
-		quick widgets xml
+USE_QT=		buildtools_build core dbus declarative gui network qmake_build \
+		widgets xml
 
 .include <bsd.port.mk>

Modified: head/devel/kf5-kpeople/Makefile
==============================================================================
--- head/devel/kf5-kpeople/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kf5-kpeople/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -9,7 +9,7 @@ COMMENT=	KF5 library providing access to contacts
 
 USES=		cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
 USE_KDE=	config coreaddons ecm i18n itemviews service widgetsaddons
-USE_QT=		buildtools_build core dbus gui network qmake_build qml \
+USE_QT=		buildtools_build core dbus declarative gui network qmake_build \
 		sql widgets
 
 .include <bsd.port.mk>

Modified: head/devel/kf5-solid/Makefile
==============================================================================
--- head/devel/kf5-solid/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kf5-solid/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -9,8 +9,8 @@ COMMENT=	KF5 hardware integration and detection
 
 USES=		bison cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	ecm
-USE_QT=		buildtools_build concurrent core dbus gui linguisttools \
-		network qmake_build qml testlib widgets xml
+USE_QT=		buildtools_build concurrent core dbus declarative gui linguisttools \
+		network qmake_build testlib widgets xml
 
 OPTIONS_DEFINE=		BSDISKS
 BSDISKS_DESC=		Use bsdisks instead of hald to mount drives

Modified: head/devel/kio-extras/Makefile
==============================================================================
--- head/devel/kio-extras/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/kio-extras/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kio-extras
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-applications # kde kde-applications-plasma
 
 MAINTAINER=	kde at FreeBSD.org
@@ -18,7 +19,7 @@ USE_KDE=	activities archive auth bookmarks codecs comp
 		jobwidgets js kdelibs4support khtml kio notifications parts \
 		pty service solid sonnet textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui
-USE_QT=		core dbus gui location network phonon4 printsupport qml quick \
+USE_QT=		core dbus declarative gui location network phonon4 printsupport \
 		sql svg testlib webchannel widgets xml \
 		buildtools_build qmake_build
 SHEBANG_FILES=	info/kde-info2html

Modified: head/devel/okteta/Makefile
==============================================================================
--- head/devel/okteta/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/okteta/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -18,7 +18,7 @@ USE_KDE=	attica auth bookmarks codecs completion crash
 		ecm i18n iconthemes itemviews jobwidgets kcmutils kio \
 		newstuff parts service solid sonnet textwidgets \
 		widgetsaddons xmlgui
-USE_QT=		concurrent core dbus designer gui network printsupport qml \
+USE_QT=		concurrent core dbus declarative designer gui network printsupport  \
 		script scripttools widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes

Modified: head/devel/plasma5-plasma-sdk/Makefile
==============================================================================
--- head/devel/plasma5-plasma-sdk/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/plasma5-plasma-sdk/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-sdk
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-plasma
 
 MAINTAINER=	kde at FreeBSD.org
@@ -13,7 +14,7 @@ USE_KDE=	archive attica auth codecs completion config 
 		jobwidgets kdeclarative kio kirigami2 newstuff package parts \
 		plasma-framework service sonnet texteditor textwidgets \
 		widgetsaddons windowsystem xmlgui
-USE_QT=		concurrent core dbus gui network qml quick webkit widgets x11extras xml \
+USE_QT=		concurrent core dbus declarative gui network webkit widgets x11extras xml \
 		buildtools_build qmake_build
 
 .include <bsd.port.mk>

Modified: head/devel/qt5-designer/Makefile
==============================================================================
--- head/devel/qt5-designer/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/qt5-designer/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,13 +2,14 @@
 
 PORTNAME=	designer
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt 5 graphical user interface designer
 
-USE_QT=		assistant_run core gui network printsupport quick uiplugin \
+USE_QT=		assistant_run core declarative gui network printsupport uiplugin \
 		widgets xml buildtools_build
 USES=		compiler:c++11-lang qmake qt-dist:5,tools
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

Modified: head/devel/qt5-linguisttools/Makefile
==============================================================================
--- head/devel/qt5-linguisttools/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/qt5-linguisttools/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt localization tools
 
-USE_QT=		core xml buildtools_build qml_build
+USE_QT=		core xml buildtools_build declarative_build
 USES=		compiler:c++11-lang qmake qt-dist:5,tools
 
 BUILD_WRKSRC=	${WRKSRC}/src/linguist

Modified: head/devel/qt5-location/Makefile
==============================================================================
--- head/devel/qt5-location/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/qt5-location/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,13 +2,14 @@
 
 PORTNAME=	location
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt location module
 
-USE_QT=		concurrent core dbus gui network qml quick buildtools_build
+USE_QT=		concurrent core dbus declarative gui network buildtools_build
 USES=		compiler:c++11-lang qmake:norecursive qt-dist:5,location
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

Modified: head/devel/qt5-qdoc/Makefile
==============================================================================
--- head/devel/qt5-qdoc/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/qt5-qdoc/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -12,7 +12,7 @@ BUILD_DEPENDS=	llvm60>=0:devel/llvm60
 RUN_DEPENDS=	llvm60>=0:devel/llvm60
 
 USES=		compiler:c++11-lang qmake qt-dist:5,tools
-USE_QT=		core qml buildtools_build qdoc-data_run
+USE_QT=		core declarative buildtools_build qdoc-data_run
 
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

Modified: head/devel/qt5-scxml/Makefile
==============================================================================
--- head/devel/qt5-scxml/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/qt5-scxml/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Qt5 SXCML module
 
-USE_QT=		core network qml buildtools_build
+USE_QT=		core declarative network buildtools_build
 USES=		compiler:c++11-lang qmake qt-dist:5,scxml
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 

Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/devel/qtcreator/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtcreator
 DISTVERSION=	4.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libqbscore.so:devel/qbs
 USES=		qmake compiler:c++14-lang qt:5 tar:xz
 USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
 USE_GL=		gl
-USE_QT=		buildtools concurrent core designer gui help \
-		linguist location network printsupport qdoc qmake qml quick \
+USE_QT=		buildtools concurrent core declarative designer gui help \
+		linguist location network printsupport qdoc qmake \
 		quickcontrols script script sql svg webchannel webengine \
 		widgets xml xmlpatterns
 

Modified: head/editors/calligra/Makefile
==============================================================================
--- head/editors/calligra/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/editors/calligra/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra
 DISTVERSION=	3.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -47,9 +47,9 @@ USE_KDE=	activities archive auth bookmarks codecs comp
 		texteditor textwidgets threadweaver unitconversion wallet \
 		widgetsaddons windowsystem xmlgui \
 		calendarcore okular
-USE_QT=		buildtools_build core dbus gui network opengl \
-		phonon4 printsupport qmake_build qml \
-		quick script sql svg testlib webkit widgets x11extras xml
+USE_QT=		buildtools_build core dbus declarative gui network opengl \
+		phonon4 printsupport qmake_build \
+		script sql svg testlib webkit widgets x11extras xml
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
 

Modified: head/editors/tea/Makefile
==============================================================================
--- head/editors/tea/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/editors/tea/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tea
 PORTVERSION=	46.3.0
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	danilo at FreeBSD.org
@@ -31,7 +32,7 @@ GH_PROJECT=	${PORTNAME}-qt
 QT4_USES=	qt:4
 QT4_USE=	qt=corelib,gui,moc_build,network,rcc_build
 QT5_USES=	qt:5
-QT5_USE=	qt=buildtools_build,core,gui,network,widgets,printsupport,qml,quick
+QT5_USE=	qt=buildtools_build,core,declarative,gui,network,widgets,printsupport
 
 LDFLAGS+=	-lz
 PLIST_FILES=	bin/tea share/pixmaps/tea_icon_v2.png

Modified: head/emulators/qmc2/Makefile
==============================================================================
--- head/emulators/qmc2/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/emulators/qmc2/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qmc2
 PORTVERSION=	0.195
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
@@ -19,8 +20,8 @@ NO_WRKSUBDIR=	yes
 USES=		gmake qt:5 tar:bzip2
 USE_XORG=	x11 xmu
 USE_GL=		gl glu
-USE_QT=		buildtools_build core gui multimedia \
-		network opengl quick qmake_build qml \
+USE_QT=		buildtools_build core declarative gui multimedia \
+		network opengl qmake_build \
 		testlib script scripttools sql svg \
 		webkit widgets xml xmlpatterns
 USE_SDL=	sdl

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/emulators/rpcs3/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -39,7 +39,7 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-26-g4c27501:hi
 USES=		cmake:outsource compiler:c++17-lang iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig qt:5
 USE_GL=		gl glew
-USE_QT=		qmake_build buildtools_build core dbus gui network widgets qml
+USE_QT=		qmake_build buildtools_build core dbus declarative gui network widgets
 USE_XORG=	x11
 LLD_UNSAFE=	yes # XXX ports/219089
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG

Modified: head/finance/kmymoney/Makefile
==============================================================================
--- head/finance/kmymoney/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/finance/kmymoney/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kmymoney
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 
@@ -64,7 +64,7 @@ KBANKING_DESC=		Online banking via KBanking (AqBanking
 KBANKING_LIB_DEPENDS=	libgwenhywfar.so:devel/gwenhywfar \
 			libgwengui-qt5.so:devel/gwenhywfar-qt5 \
 			libaqbanking.so:finance/aqbanking
-KBANKING_USE=		qt=qml,quick
+KBANKING_USE=		qt=declarative
 KBANKING_CMAKE_BOOL=	ENABLE_KBANKING
 
 KDEWEBKIT_DESC=		Web content rendering via KDEWebKit

Modified: head/finance/skrooge/Makefile
==============================================================================
--- head/finance/skrooge/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/finance/skrooge/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	skrooge
 DISTVERSION=	2.15.0
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -28,8 +29,8 @@ USE_KDE=	activities archive attica5 auth bookmarks cod
 		package parts plasma-framework runner service solid sonnet \
 		textwidgets unitconversion wallet widgetsaddons windowsystem \
 		xmlgui
-USE_QT=		concurrent core dbus designer gui network printsupport qml \
-		quick script sql svg webkit widgets xml \
+USE_QT=		concurrent core dbus declarative designer gui network printsupport \
+		script sql svg webkit widgets xml \
 		qmake_build buildtools_build
 SHEBANG_FILES=	plugins/import/skrooge_import_backend/skrooge-sabb.py \
 		skgbankmodeler/skrooge-coinmarketcap.py \

Modified: head/games/2048-qt/Makefile
==============================================================================
--- head/games/2048-qt/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/2048-qt/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,6 +3,7 @@
 PORTNAME=	2048-qt
 PORTVERSION=	0.1.6
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	swills at FreeBSD.org
@@ -16,7 +17,7 @@ GH_ACCOUNT=	xiaoyong
 GH_PROJECT=	2048-Qt
 
 USES=		gmake pkgconfig qmake qt:5
-USE_QT=		core gui network widgets qml quick buildtools_build quickcontrols
+USE_QT=		core declarative gui network widgets buildtools_build quickcontrols
 
 PLIST_FILES=	bin/2048-qt ${DESKTOPDIR}/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.png

Modified: head/games/bomber/Makefile
==============================================================================
--- head/games/bomber/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/bomber/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	bomber
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	${${PORTNAME}_DESC}
 USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons crash dbusaddons \
 		ecm i18n kio libkdegames widgetsaddons xmlgui
-USE_QT=		core dbus gui network widgets phonon4 qml quick xml \
+USE_QT=		core dbus declarative gui network widgets phonon4 xml \
 		buildtools_build qmake_build
 
 OPTIONS_DEFINE=	DOCS

Modified: head/games/bovo/Makefile
==============================================================================
--- head/games/bovo/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/bovo/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	bovo
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	${${PORTNAME}_DESC}
 USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth codecs config configwidgets coreaddons crash dbusaddons \
 		ecm i18n kdeclarative libkdegames newstuff widgetsaddons xmlgui
-USE_QT=		concurrent core dbus gui network qml quick svg widgets xml \
+USE_QT=		concurrent core dbus declarative gui network svg widgets xml \
 		buildtools_build qmake_build
 
 OPTIONS_DEFINE=	DOCS

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/flightgear/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -3,7 +3,7 @@
 
 PORTNAME=	flightgear
 PORTVERSION=	2018.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -49,7 +49,7 @@ DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
 QT5_CMAKE_ON=	-DENABLE_QT:BOOL=ON
 QT5_CMAKE_OFF=	-DENABLE_QT:BOOL=OFF
 QT5_USES=	qt:5
-QT5_USE=	QT=core,buildtools,gui,network,qmake,qml,quick,widgets
+QT5_USE=	QT=core,buildtools,gui,declarative,network,qmake,widgets
 
 .include <bsd.port.pre.mk>
 

Modified: head/games/gcompris-qt/Makefile
==============================================================================
--- head/games/gcompris-qt/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/gcompris-qt/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gcompris-qt
 DISTVERSION=	0.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games kde
 MASTER_SITES=	http://gcompris.net/download/qt/src/
 
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libBox2D.so:x11-toolkits/qml-box2d
 
 USES=		cmake:outsource kde:5 qt:5 tar:xz
 USE_KDE=	doctools
-USE_QT=		core graphicaleffects gui multimedia network qml quick quickcontrols \
+USE_QT=		core declarative graphicaleffects gui multimedia network quickcontrols \
 		sensors svg widgets xml xmlpatterns \
 		buildtools_build linguisttools_build qmake_build
 

Modified: head/games/granatier/Makefile
==============================================================================
--- head/games/granatier/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/granatier/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	granatier
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org
@@ -11,7 +12,7 @@ USES=		cmake:outsource gettext kde:5 qt:5 tar:xz
 USE_KDE=	attica auth codecs config configwidgets coreaddons crash \
 		dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
 		libkdegames newstuff notifyconfig service widgetsaddons xmlgui
-USE_QT=		core dbus gui network qml quick svg widgets xml \
+USE_QT=		core dbus declarative gui network svg widgets xml \
 		buildtools_build qmake_build
 
 OPTIONS_DEFINE=	DOCS

Modified: head/games/kanagram/Makefile
==============================================================================
--- head/games/kanagram/Makefile	Sun Nov  4 18:58:27 2018	(r484139)
+++ head/games/kanagram/Makefile	Sun Nov  4 19:00:53 2018	(r484140)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kanagram
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-all mailing list