Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10094,7 +10094,6 @@
 net-im/plasma-applet-ktp|net-im/plasma-applet-ktp-kde4|2018-03-23|Make room for KDE updates
 multimedia/gmencoder||2018-03-23|Abandonware, does not support modern codecs
 mail/wanderlust-devel|mail/wanderlust|2018-03-23|Removed, use mail/wanderlust instead
-graphics/skanlite|graphics/skanlite-kde4|2018-03-25|Make room for KDE updates
 lang/x10||2018-03-25|Has expired: Broken for more than 6 months
 science/siril|astro/siril|2018-03-25|Moved to a more appropriate category
 net/samba44|net/samba45|2018-03-26|Has expired: unsupported upstream
Index: graphics/Makefile
===================================================================
--- graphics/Makefile
+++ graphics/Makefile
@@ -1046,6 +1046,7 @@
     SUBDIR += simage
     SUBDIR += simpleviewer
     SUBDIR += sk1libs
+    SUBDIR += skanlite
     SUBDIR += skanlite-kde4
     SUBDIR += smillaenlarger
     SUBDIR += spectacle
Index: graphics/kdegraphics/Makefile
===================================================================
--- graphics/kdegraphics/Makefile
+++ graphics/kdegraphics/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdegraphics
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,8 +16,9 @@
 		KCOLORCHOOSER \
 		KOLOURPAINT \
 		KRULER \
-		SPECTACLE \
 		MOBIPOCKET \
+		SKANLITE \
+		SPECTACLE \
 		SVG \
 		THUMBNAILER
 
@@ -37,6 +39,9 @@
 KRULER_DESC=			Screen ruler
 KRULER_RUN_DEPENDS=		kruler>=${KDE_APPLICATIONS_VERSION}:deskutils/kruler
 
+SKANLITE_DESC=			Simple scanning application
+SKANLITE_RUN_DEPENDS=		skanlite>=2.1:graphics/skanlite
+
 SPECTACLE_DESC=			Screen capture program
 SPECTACLE_RUN_DEPENDS=		spectacle>=${KDE_APPLICATIONS_VERSION}:graphics/spectacle
 
Index: graphics/skanlite/Makefile
===================================================================
--- graphics/skanlite/Makefile
+++ graphics/skanlite/Makefile
@@ -1,20 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	skanlite
-PORTVERSION=	1.1
-PORTREVISION=	7
+DISTVERSION=	2.1.0
 CATEGORIES=	graphics kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
-PKGNAMESUFFIX=	-kde4
-DIST_SUBDIR=	KDE/extragear
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Simple image scanning application for KDE
 
-LIB_DEPENDS=	libksane.so:graphics/libksane-kde4
+LIB_DEPENDS=	libKF5Sane.so:graphics/libksane \
+		libpng16.so:graphics/png
 
-USES=		cmake:outsource gettext kde:4 tar:xz
-USE_KDE=	kdelibs automoc4
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USES=		cmake:outsource gettext kde:5 tar:xz
+USE_KDE=	ecm auth config configwidgets codecs completion \
+		coreaddons doctools i18n jobwidgets kio \
+		service widgetsaddons xmlgui
+USE_QT5=	buildtools_build qmake_build \
+		core concurrent dbus gui network widgets xml
 
 .include <bsd.port.mk>
Index: graphics/skanlite/distinfo
===================================================================
--- graphics/skanlite/distinfo
+++ graphics/skanlite/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/extragear/skanlite-1.1.tar.xz) = 657cece15bbb6966fefd2de91504d421d12e662560c1b30514e060847b9eea26
-SIZE (KDE/extragear/skanlite-1.1.tar.xz) = 2513692
+TIMESTAMP = 1525441048
+SHA256 (skanlite-2.1.0.tar.xz) = e625db6eed8e2ca9713936ae8175fb96d30d88c0986528ee8845d198624e41bd
+SIZE (skanlite-2.1.0.tar.xz) = 1121468
Index: graphics/skanlite/pkg-plist
===================================================================
--- graphics/skanlite/pkg-plist
+++ graphics/skanlite/pkg-plist
@@ -1,18 +1,7 @@
 bin/skanlite
-share/applications/kde4/skanlite.desktop
-share/doc/HTML/de/skanlite/buttons-main.png
-share/doc/HTML/de/skanlite/common
-share/doc/HTML/de/skanlite/final-button.png
-share/doc/HTML/de/skanlite/index.cache.bz2
-share/doc/HTML/de/skanlite/index.docbook
-share/doc/HTML/de/skanlite/main-window.png
-share/doc/HTML/de/skanlite/no-scanner-found.png
-share/doc/HTML/de/skanlite/other-options.png
-share/doc/HTML/de/skanlite/preview-button.png
-share/doc/HTML/de/skanlite/zoom-to-fit.png
+share/applications/org.kde.skanlite.desktop
 share/doc/HTML/en/skanlite/buttons-main.png
 share/doc/HTML/en/skanlite/choose-scanner.png
-share/doc/HTML/en/skanlite/common
 share/doc/HTML/en/skanlite/final-button.png
 share/doc/HTML/en/skanlite/index.cache.bz2
 share/doc/HTML/en/skanlite/index.docbook
@@ -27,75 +16,4 @@
 share/doc/HTML/en/skanlite/settings.png
 share/doc/HTML/en/skanlite/zoom-in.png
 share/doc/HTML/en/skanlite/zoom-to-fit.png
-share/doc/HTML/fr/skanlite/common
-share/doc/HTML/fr/skanlite/index.cache.bz2
-share/doc/HTML/fr/skanlite/index.docbook
-share/doc/HTML/nl/skanlite/common
-share/doc/HTML/nl/skanlite/index.cache.bz2
-share/doc/HTML/nl/skanlite/index.docbook
-share/doc/HTML/uk/skanlite/buttons-main.png
-share/doc/HTML/uk/skanlite/choose-scanner.png
-share/doc/HTML/uk/skanlite/common
-share/doc/HTML/uk/skanlite/final-button.png
-share/doc/HTML/uk/skanlite/index.cache.bz2
-share/doc/HTML/uk/skanlite/index.docbook
-share/doc/HTML/uk/skanlite/main-window.png
-share/doc/HTML/uk/skanlite/multiple-selections.png
-share/doc/HTML/uk/skanlite/no-scanner-found.png
-share/doc/HTML/uk/skanlite/other-options.png
-share/doc/HTML/uk/skanlite/preview-button.png
-share/doc/HTML/uk/skanlite/preview.png
-share/doc/HTML/uk/skanlite/save-location.png
-share/doc/HTML/uk/skanlite/scanning.png
-share/doc/HTML/uk/skanlite/settings.png
-share/doc/HTML/uk/skanlite/zoom-in.png
-share/doc/HTML/uk/skanlite/zoom-to-fit.png
-share/locale/be/LC_MESSAGES/skanlite.mo
-share/locale/bs/LC_MESSAGES/skanlite.mo
-share/locale/ca/LC_MESSAGES/skanlite.mo
-share/locale/ca@valencia/LC_MESSAGES/skanlite.mo
-share/locale/cs/LC_MESSAGES/skanlite.mo
-share/locale/da/LC_MESSAGES/skanlite.mo
-share/locale/de/LC_MESSAGES/skanlite.mo
-share/locale/el/LC_MESSAGES/skanlite.mo
-share/locale/en_GB/LC_MESSAGES/skanlite.mo
-share/locale/eo/LC_MESSAGES/skanlite.mo
-share/locale/es/LC_MESSAGES/skanlite.mo
-share/locale/et/LC_MESSAGES/skanlite.mo
-share/locale/eu/LC_MESSAGES/skanlite.mo
-share/locale/fi/LC_MESSAGES/skanlite.mo
-share/locale/fr/LC_MESSAGES/skanlite.mo
-share/locale/ga/LC_MESSAGES/skanlite.mo
-share/locale/gl/LC_MESSAGES/skanlite.mo
-share/locale/hr/LC_MESSAGES/skanlite.mo
-share/locale/hu/LC_MESSAGES/skanlite.mo
-share/locale/ia/LC_MESSAGES/skanlite.mo
-share/locale/is/LC_MESSAGES/skanlite.mo
-share/locale/it/LC_MESSAGES/skanlite.mo
-share/locale/ja/LC_MESSAGES/skanlite.mo
-share/locale/km/LC_MESSAGES/skanlite.mo
-share/locale/ko/LC_MESSAGES/skanlite.mo
-share/locale/lt/LC_MESSAGES/skanlite.mo
-share/locale/lv/LC_MESSAGES/skanlite.mo
-share/locale/mai/LC_MESSAGES/skanlite.mo
-share/locale/mr/LC_MESSAGES/skanlite.mo
-share/locale/nb/LC_MESSAGES/skanlite.mo
-share/locale/nds/LC_MESSAGES/skanlite.mo
-share/locale/nl/LC_MESSAGES/skanlite.mo
-share/locale/nn/LC_MESSAGES/skanlite.mo
-share/locale/pa/LC_MESSAGES/skanlite.mo
-share/locale/pl/LC_MESSAGES/skanlite.mo
-share/locale/pt/LC_MESSAGES/skanlite.mo
-share/locale/pt_BR/LC_MESSAGES/skanlite.mo
-share/locale/ro/LC_MESSAGES/skanlite.mo
-share/locale/ru/LC_MESSAGES/skanlite.mo
-share/locale/sk/LC_MESSAGES/skanlite.mo
-share/locale/sl/LC_MESSAGES/skanlite.mo
-share/locale/sq/LC_MESSAGES/skanlite.mo
-share/locale/sv/LC_MESSAGES/skanlite.mo
-share/locale/tr/LC_MESSAGES/skanlite.mo
-share/locale/ug/LC_MESSAGES/skanlite.mo
-share/locale/uk/LC_MESSAGES/skanlite.mo
-share/locale/wa/LC_MESSAGES/skanlite.mo
-share/locale/zh_CN/LC_MESSAGES/skanlite.mo
-share/locale/zh_TW/LC_MESSAGES/skanlite.mo
+share/metainfo/org.kde.skanlite.appdata.xml