Update x11-toolkits/kirigami2 to 2.1.0

* while here, make portlint happy, and drop out-dated comment
* same for x11-toolkits/kirigami

Reviewed by:	rakuco
Approved by:	rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D10594

4 files changed, 47 insertions, 38 deletions

diff --git a/x11-toolkits/kirigami/Makefile b/x11-toolkits/kirigami/Makefile
index 5bec8c232748..f79ce0832647 100644
--- a/x11-toolkits/kirigami/Makefile
+++ b/x11-toolkits/kirigami/Makefile
@@ -4,10 +4,9 @@
 PORTNAME=	kirigami
 PORTVERSION=	1.1.0
 PORTREVISION=	1
+CATEGORIES=	x11-toolkits kde # kde-framework
 MASTER_SITES=	KDE/stable/${PORTNAME}
-# kirigami will likely become a framework. So already put the distfile there.
 DIST_SUBDIR=	KDE/kirigami
-CATEGORIES=	x11-toolkits kde # kde-framework
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QtQuick based components set
diff --git a/x11-toolkits/kirigami2/Makefile b/x11-toolkits/kirigami2/Makefile
index b8ceb285bfc5..4a5f51fb3401 100644
--- a/x11-toolkits/kirigami2/Makefile
+++ b/x11-toolkits/kirigami2/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	kirigami2
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.1.0
+CATEGORIES=	x11-toolkits kde # kde-framework
 MASTER_SITES=	KDE/stable/${PORTNAME:C/2//}
-# kirigami will likely become a framework. So already put the distfile there.
 DIST_SUBDIR=	KDE/kirigami
-CATEGORIES=	x11-toolkits kde # kde-framework
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QtQuick based components set
diff --git a/x11-toolkits/kirigami2/distinfo b/x11-toolkits/kirigami2/distinfo
index a5d6b50eccdd..787d4b51c9a6 100644
--- a/x11-toolkits/kirigami2/distinfo
+++ b/x11-toolkits/kirigami2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489235144
-SHA256 (KDE/kirigami/kirigami2-2.0.0.tar.xz) = 499bfcc5080dd65877a67700ff71f84a7b43f0f87b7c72e9f68c7bb92e11a293
-SIZE (KDE/kirigami/kirigami2-2.0.0.tar.xz) = 266580
+TIMESTAMP = 1493500771
+SHA256 (KDE/kirigami/kirigami2-2.1.0.tar.xz) = e744ff974ef100d23feda68f3fdb465aa56bf8da6992ab7e3f3fed2f4180e934
+SIZE (KDE/kirigami/kirigami2-2.1.0.tar.xz) = 274808
diff --git a/x11-toolkits/kirigami2/pkg-plist b/x11-toolkits/kirigami2/pkg-plist
index de8cfb0e696e..7e090700746f 100644
--- a/x11-toolkits/kirigami2/pkg-plist
+++ b/x11-toolkits/kirigami2/pkg-plist
@@ -3,16 +3,20 @@ lib/cmake/KF5Kirigami2/KF5Kirigami2ConfigVersion.cmake
 lib/cmake/KF5Kirigami2/KF5Kirigami2Macros.cmake
 %%QT_MKSPECDIR%%/modules/qt_Kirigami2.pri
 %%QT_QMLDIR%%/org/kde/kirigami.2/AbstractApplicationHeader.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/AbstractApplicationItem.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/AbstractApplicationWindow.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/AbstractItemViewHeader.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/AbstractListItem.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/Action.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/ApplicationHeader.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/ApplicationItem.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/ApplicationWindow.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/BasicListItem.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/ContextDrawer.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/GlobalDrawer.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/Heading.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/Icon.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/ItemViewHeader.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/Label.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/OverlayDrawer.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/OverlaySheet.qml
@@ -25,6 +29,7 @@ lib/cmake/KF5Kirigami2/KF5Kirigami2Macros.cmake
 %%QT_QMLDIR%%/org/kde/kirigami.2/ToolBarApplicationHeader.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/Units.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/libkirigamiplugin.so
+%%QT_QMLDIR%%/org/kde/kirigami.2/plugins.qmltypes
 %%QT_QMLDIR%%/org/kde/kirigami.2/private/ActionButton.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/private/CornerShadow.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/private/DefaultListItemBackground.qml
@@ -34,13 +39,6 @@ lib/cmake/KF5Kirigami2/KF5Kirigami2Macros.cmake
 %%QT_QMLDIR%%/org/kde/kirigami.2/private/RefreshableScrollView.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/private/SwipeItemEventFilter.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/qmldir
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/AbstractApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/AbstractListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/ApplicationWindow.qml
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/OverlayDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/SwipeListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/Theme.qml
-%%QT_QMLDIR%%/org/kde/kirigami.2/styles/Desktop/Units.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/styles/Material/AbstractListItem.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/styles/Material/Label.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/styles/Material/SwipeListItem.qml
@@ -48,6 +46,14 @@ lib/cmake/KF5Kirigami2/KF5Kirigami2Macros.cmake
 %%QT_QMLDIR%%/org/kde/kirigami.2/styles/Plasma/Icon.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/styles/Plasma/Theme.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/styles/Plasma/Units.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop.plasma/Units.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/AbstractApplicationHeader.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/AbstractListItem.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/ApplicationWindow.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/OverlayDrawer.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/SwipeListItem.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/Theme.qml
+%%QT_QMLDIR%%/org/kde/kirigami.2/styles/org.kde.desktop/Units.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/templates/AbstractApplicationHeader.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/templates/AbstractListItem.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/templates/ApplicationHeader.qml
@@ -59,25 +65,31 @@ lib/cmake/KF5Kirigami2/KF5Kirigami2Macros.cmake
 %%QT_QMLDIR%%/org/kde/kirigami.2/templates/private/MenuIcon.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/templates/private/PassiveNotification.qml
 %%QT_QMLDIR%%/org/kde/kirigami.2/templates/private/ScrollView.qml
-share/locale/ast/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/ca/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/ca@valencia/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/cs/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/de/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/en_GB/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/es/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/fr/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/gl/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/ja/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/nl/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/nn/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/pl/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/pt/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/pt_BR/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/ru/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/sk/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/sl/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/sv/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/uk/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/zh_CN/LC_MESSAGES/libkirigami2plugin_qt.qm
-share/locale/zh_TW/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/ar/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/ast/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/ca/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/ca@valencia/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/cs/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/de/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/el/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/en_GB/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/es/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/et/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/fr/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/gl/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/hu/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/it/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/ja/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/ko/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/nl/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/nn/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/pl/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/pt/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/pt_BR/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/ru/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/sk/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/sl/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/sv/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/uk/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/zh_CN/LC_MESSAGES/desktop_extragear-libs_kirigami.qm
+share/locale/zh_TW/LC_MESSAGES/desktop_extragear-libs_kirigami.qm