svn commit: r468499 - in head: . devel devel/kdesdk graphics graphics/kdegraphics misc misc/kdeedu misc/kdeutils multimedia multimedia/dragon multimedia/kdemultimedia net net/kdenetwork sysutils sy...

Fri Apr 27 21:47:39 UTC 2018

Author: tcberner
Date: Fri Apr 27 21:47:35 2018
New Revision: 468499
URL: https://svnweb.freebsd.org/changeset/ports/468499

Log:
  Add the KDE metaports
  
  * add multimedia/dragon (was missing)
  * add the meta ports for the categories
  * add x11/kde5 [yeah, we know, there technically is no "KDE 5"]

Added:
  head/devel/kdesdk/
     - copied from r468494, head/devel/kdesdk-kde4/
  head/graphics/kdegraphics/
     - copied from r468494, head/graphics/kdegraphics-kde4/
  head/misc/kdeedu/
     - copied from r468494, head/misc/kdeedu-kde4/
  head/misc/kdeutils/
     - copied from r468494, head/misc/kdeutils-kde4/
  head/multimedia/dragon/
     - copied from r468495, head/multimedia/dragon-kde4/
  head/multimedia/kdemultimedia/
     - copied from r468494, head/multimedia/kdemultimedia-kde4/
  head/net/kdenetwork/
     - copied from r468494, head/net/kdenetwork-kde4/
  head/sysutils/kdeadmin/
     - copied from r468494, head/sysutils/kdeadmin-kde4/
  head/x11/kde-baseapps/
     - copied from r468495, head/x11/kde-baseapps-kde4/
  head/x11/kde5/
     - copied from r468494, head/x11/kde4/
Deleted:
  head/x11/kde-baseapps/pkg-plist
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/kdesdk/Makefile
  head/graphics/Makefile
  head/graphics/kdegraphics/Makefile
  head/graphics/kdegraphics/pkg-descr
  head/misc/Makefile
  head/misc/kdeedu/Makefile
  head/misc/kdeedu/pkg-descr
  head/misc/kdeutils/Makefile
  head/misc/kdeutils/pkg-descr
  head/multimedia/Makefile
  head/multimedia/dragon/Makefile
  head/multimedia/dragon/distinfo
  head/multimedia/dragon/pkg-plist
  head/multimedia/kdemultimedia/Makefile
  head/multimedia/kdemultimedia/pkg-descr
  head/net/Makefile
  head/net/kdenetwork/Makefile
  head/sysutils/Makefile
  head/sysutils/kdeadmin/Makefile
  head/x11/Makefile
  head/x11/kde-baseapps/Makefile
  head/x11/kde-baseapps/pkg-descr
  head/x11/kde5/Makefile
  head/x11/kde5/pkg-descr

Modified: head/MOVED
==============================================================================

--- head/MOVED	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/MOVED	Fri Apr 27 21:47:35 2018	(r468499)
@@ -9987,7 +9987,6 @@ x11/kgamma|x11/kgamma-kde4|2018-02-22|Make room for KD
 x11/libkonq|x11/libkonq-kde4|2018-02-22|Make room for KDE updates
 deskutils/superkaramba|deskutils/superkaramba-kde4|2018-02-22|Make room for KDE updates
 deskutils/kdeplasma-addons|deskutils/kdeplasma-addons-kde4|2018-02-22|Make room for KDE updates
-multimedia/dragon|multimedia/dragon-kde4|2018-02-22|Make room for KDE updates
 games/pairs|games/pairs-kde4|2018-02-22|Make room for KDE updates
 audio/kio-audiocd|audio/kio-audiocd-kde4|2018-02-22|Make room for KDE updates
 audio/kscd|audio/kscd-kde4|2018-02-22|Make room for KDE updates

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/devel/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1260,6 +1260,7 @@
     SUBDIR += kde-dev-utils
     SUBDIR += kde-dev-utils-kde4
     SUBDIR += kdebindings-kde4
+    SUBDIR += kdesdk
     SUBDIR += kdesdk-kde4
     SUBDIR += kdesdk-kioslaves-kde4
     SUBDIR += kdesdk-strigi-analyzers-kde4

Modified: head/devel/kdesdk/Makefile
==============================================================================
--- head/devel/kdesdk-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/devel/kdesdk/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	kdesdk
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}$
 CATEGORIES=	devel kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
+USE_QT5=	#
 
 OPTIONS_DEFINE=	CERVISIA \
 		DEVUTILS \
@@ -17,64 +16,57 @@ OPTIONS_DEFINE=	CERVISIA \
 		DOLPHIN \
 		KAPPTEMPLATE \
 		KATE \
-		KATE_PATE \
 		KCACHEGRIND \
-		KIOSLAVES \
 		KOMPARE \
 		LOKALIZE \
 		OKTETA \
 		POXML \
-		STRIGI \
 		THUMBNAILER \
 		UMBRELLO
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
+# Remove dolphin from the default list, as it conflicts with the metaport x11/kde4
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NDOLPHIN}
+
 CERVISIA_DESC=		CVS frontend
-CERVISIA_RUN_DEPENDS=	${KDE_PREFIX}/bin/cervisia:devel/cervisia-kde4
+CERVISIA_RUN_DEPENDS=	cervisia>=${KDE_APPLICATIONS_VERSION}:devel/cervisia
 
 DEVUTILS_DESC=		KDE development utilities
-DEVUTILS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kuiviewer:devel/kde-dev-utils-kde4
+DEVUTILS_RUN_DEPENDS=	kde-dev-utils>=${KDE_APPLICATIONS_VERSION}:devel/kde-dev-utils
 
 DEVSCRIPTS_DESC=	KDE development scripts
-DEVSCRIPTS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kdekillall:devel/kde-dev-scripts-kde4
+DEVSCRIPTS_RUN_DEPENDS= kde-dev-scripts>=${KDE_APPLICATIONS_VERSION}:devel/kde-dev-scripts
 
 DOLPHIN_DESC=		Plugins for Dolphin file manager
-DOLPHIN_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins-kde4
+DOLPHIN_RUN_DEPENDS=	dolphin-plugins>=${KDE_APPLICATIONS_VERSION}:devel/dolphin-plugins
 
 KAPPTEMPLATE_DESC=	Template generator
-KAPPTEMPLATE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kapptemplate:devel/kapptemplate-kde4
+KAPPTEMPLATE_RUN_DEPENDS=	kapptemplate>=${KDE_APPLICATIONS_VERSION}:devel/kapptemplate
 
 KATE_DESC=		KDE advanced text editor
 KATE_USE=		KDE=kate_run
 
-KATE_PATE_DESC=		Support for Python plugins in Kate
-KATE_PATE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepateplugin.so:editors/kate-plugin-pate-kde4
-
 KCACHEGRIND_DESC=	Profiler frontend
-KCACHEGRIND_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcachegrind:devel/kcachegrind-kde4
+KCACHEGRIND_RUN_DEPENDS=	kcachegrind>=${KDE_APPLICATIONS_VERSION}:devel/kcachegrind
 
-KIOSLAVES_DESC=		SDK related KIO slaves
-KIOSLAVES_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kio_svn.so:devel/kdesdk-kioslaves-kde4
-
 KOMPARE_DESC=		Diff/Patch frontend
-KOMPARE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kompare:textproc/kompare-kde4
+KOMPARE_RUN_DEPENDS=	kompare>=${KDE_APPLICATIONS_VERSION}:textproc/kompare
 
 LOKALIZE_DESC=		Computer-aided translation system
-LOKALIZE_RUN_DEPENDS=	${KDE_PREFIX}/bin/lokalize:devel/lokalize-kde4
+LOKALIZE_RUN_DEPENDS=	lokalize>=${KDE_APPLICATIONS_VERSION}:devel/lokalize
 
 OKTETA_DESC=		Hex editor
-OKTETA_RUN_DEPENDS=	${KDE_PREFIX}/bin/okteta:devel/okteta-kde4
+# As to not get an old kde4 version of okteta, depend on at least 17.12.3.
+# This will change once okteta is released outside of applications. Maybe
+# it should also be dropped from this meta port entirely.
+OKTETA_RUN_DEPENDS=	okteta>=17.12.3:devel/okteta
 
 POXML_DESC=		Tools to translate DocBook XML using gettext
-POXML_RUN_DEPENDS=	${KDE_PREFIX}/bin/po2xml:devel/poxml-kde4
+POXML_RUN_DEPENDS=	poxml>=${KDE_APPLICATIONS_VERSION}:devel/poxml
 
-STRIGI_DESC=		Strigi analyzers for SDK file formats
-STRIGI_RUN_DEPENDS=	${KDE_PREFIX}/lib/strigi/strigila_diff.so:devel/kdesdk-strigi-analyzers-kde4
-
 THUMBNAILER_DESC=	Thumbnail generator for gettext po files
-THUMBNAILER_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/pothumbnail.so:devel/kdesdk-thumbnailers-kde4
+THUMBNAILER_RUN_DEPENDS=	kdesdk-thumbnailers>=${KDE_APPLICATIONS_VERSION}:devel/kdesdk-thumbnailers
 
 UMBRELLO_DESC=		UML modeller
-UMBRELLO_RUN_DEPENDS=	${KDE_PREFIX}/bin/umbrello:devel/umbrello-kde4
+UMBRELLO_RUN_DEPENDS=	umbrello>=${KDE_APPLICATIONS_VERSION}:devel/umbrello
 
 .include <bsd.port.mk>

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/graphics/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -412,6 +412,7 @@
     SUBDIR += kcolorchooser
     SUBDIR += kcolorchooser-kde4
     SUBDIR += kcoloredit
+    SUBDIR += kdegraphics
     SUBDIR += kdegraphics-kde4
     SUBDIR += kdegraphics-mobipocket
     SUBDIR += kdegraphics-mobipocket-kde4

Modified: head/graphics/kdegraphics/Makefile
==============================================================================
--- head/graphics/kdegraphics-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/graphics/kdegraphics/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,65 +1,52 @@
-# Created by: Martin Wilke <miwi at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdegraphics
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
 CATEGORIES=	graphics kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Graphics utilities for KDE 4 (meta port)
+COMMENT=	Graphics utilities for KDE (meta port)
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
+USE_QT5=	#
 
 OPTIONS_DEFINE=	GPHOTO \
 		GWENVIEW \
 		KCOLORCHOOSER \
-		KGAMMA \
 		KOLOURPAINT \
 		KRULER \
-		KSNAPSHOT \
+		SPECTACLE \
 		MOBIPOCKET \
-		SANE \
-		STRIGI \
 		SVG \
 		THUMBNAILER
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
-GPHOTO_DESC=		Digital camera manager
-GPHOTO_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kio_kamera.so:graphics/kamera-kde4
+OPTIONS_DEFAULT=		${OPTIONS_DEFINE}
 
-GWENVIEW_DESC=		Image viewer and browser
-GWENVIEW_RUN_DEPENDS=	${KDE_PREFIX}/bin/gwenview:graphics/gwenview-kde4
+GPHOTO_DESC=			Digital camera manager
+GPHOTO_RUN_DEPENDS=		kamera>=${KDE_APPLICATIONS_VERSION}:graphics/kamera
 
-KCOLORCHOOSER_DESC=	Utility for colors selection
-KCOLORCHOOSER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcolorchooser:graphics/kcolorchooser-kde4
+GWENVIEW_DESC=			Image viewer and browser
+GWENVIEW_RUN_DEPENDS=		gwenview>=${KDE_APPLICATIONS_VERSION}:graphics/gwenview
 
-KGAMMA_DESC=		Monitor calibration tool
-KGAMMA_RUN_DEPENDS=	${KDE_PREFIX}/bin/xf86gammacfg:x11/kgamma-kde4
+KCOLORCHOOSER_DESC=		Utility for colors selection
+KCOLORCHOOSER_RUN_DEPENDS=	kcolorchooser>=${KDE_APPLICATIONS_VERSION}:graphics/kcolorchooser
 
-KOLOURPAINT_DESC=	Paint application
-KOLOURPAINT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kolourpaint:graphics/kolourpaint-kde4
+KOLOURPAINT_DESC=		Paint application
+KOLOURPAINT_RUN_DEPENDS=	kolourpaint>=${KDE_APPLICATIONS_VERSION}:graphics/kolourpaint
 
-KRULER_DESC=		Screen ruler
-KRULER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kruler:deskutils/kruler-kde4
+KRULER_DESC=			Screen ruler
+KRULER_RUN_DEPENDS=		kruler>=${KDE_APPLICATIONS_VERSION}:deskutils/kruler
 
-KSNAPSHOT_DESC=		Screen capture program
-KSNAPSHOT_RUN_DEPENDS=	${KDE_PREFIX}/bin/ksnapshot:graphics/ksnapshot-kde4
+SPECTACLE_DESC=			Screen capture program
+SPECTACLE_RUN_DEPENDS=		spectacle>=${KDE_APPLICATIONS_VERSION}:graphics/spectacle
 
-MOBIPOCKET_DESC=	Mobipocket plugins for Strigi indexing and thumbnailers
-MOBIPOCKET_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/mobithumbnail.so:graphics/kdegraphics-mobipocket-kde4 \
+MOBIPOCKET_DESC=		Mobipocket plugins for Strigi indexing and thumbnailers
+MOBIPOCKET_RUN_DEPENDS=		kdegraphics-mobipocket>=${KDE_APPLICATIONS_VERSION}:graphics/kdegraphics-mobipocket
 
-SANE_DESC=		Plugin for scanning on KDE
-SANE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/ksaneplugin.so:graphics/ksaneplugin-kde4
+SVG_DESC=			SVG KPart
+SVG_RUN_DEPENDS=		kdegraphics-svgpart>=${KDE_APPLICATIONS_VERSION}:graphics/kdegraphics-svgpart
 
-STRIGI_DESC=		Strigi analyzers for graphics file formats
-STRIGI_RUN_DEPENDS=	${KDE_PREFIX}/lib/strigi/strigiea_dvi.so:graphics/kdegraphics-strigi-analyzer-kde4
-
-SVG_DESC=		SVG KPart
-SVG_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/svgpart.so:graphics/kdegraphics-svgpart-kde4
-
-THUMBNAILER_DESC=	Thumbnail generator for graphics file formats
-THUMBNAILER_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/gsthumbnail.so:graphics/kdegraphics-thumbnailers-kde4
+THUMBNAILER_DESC=		Thumbnail generator for graphics file formats
+THUMBNAILER_RUN_DEPENDS=	kdegraphics-thumbnailers>=${KDE_APPLICATIONS_VERSION}:graphics/kdegraphics-thumbnailers
 
 .include <bsd.port.mk>

Modified: head/graphics/kdegraphics/pkg-descr
==============================================================================
--- head/graphics/kdegraphics-kde4/pkg-descr	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/graphics/kdegraphics/pkg-descr	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,4 +1,4 @@
 This meta-port installs the graphics and image manipulation components
-of KDE 4.
+of KDE.
 
 WWW: http://www.kde.org

Modified: head/misc/Makefile
==============================================================================
--- head/misc/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/misc/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -236,8 +236,10 @@
     SUBDIR += kde4-l10n-ug
     SUBDIR += kde4-l10n-wa
     SUBDIR += kde4-xdg-env
+    SUBDIR += kdeedu
     SUBDIR += kdeedu-data
     SUBDIR += kdeedu-kde4
+    SUBDIR += kdeutils
     SUBDIR += kdeutils-kde4
     SUBDIR += kenny
     SUBDIR += kf5-purpose

Modified: head/misc/kdeedu/Makefile
==============================================================================
--- head/misc/kdeedu-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/misc/kdeedu/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,86 +1,71 @@
-# Created by: Martin Wilke <miwi at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdeedu
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
 CATEGORIES=	misc kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Entertaining and educational programs for KDE 4 (meta port)
+COMMENT=	Entertaining and educational programs for KDE (meta port)
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
 
 OPTIONS_DEFINE=	ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOGRAPHY \
-		KHANGMAN KIG KITEN KLETTRES KMPLOT KSTARS KTOUCH KTURTLE \
+		KHANGMAN KIG KITEN KLETTRES KMPLOT KTOUCH KTURTLE \
 		KWORDQUIZ MARBLE PAIRS PARLEY ROCS STEP
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NARTIKULATE}
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 ARTIKULATE_DESC=	Pronunciation trainer
-ARTIKULATE_RUN_DEPENDS=	${KDE_PREFIX}/bin/artikulate:misc/artikulate-kde4
+ARTIKULATE_RUN_DEPENDS=	artikulate>=${KDE_APPLICATIONS_VERSION}:misc/artikulate
 
 BLINKEN_DESC=		Memory enhancement game
-BLINKEN_RUN_DEPENDS=	${KDE_PREFIX}/bin/blinken:games/blinken-kde4
+BLINKEN_RUN_DEPENDS=	blinken>=${KDE_APPLICATIONS_VERSION}:games/blinken
 
 CANTOR_DESC=		Frontend to mathematical software
-CANTOR_RUN_DEPENDS=	${KDE_PREFIX}/bin/cantor:math/cantor-kde4
+CANTOR_RUN_DEPENDS=	cantor>=${KDE_APPLICATIONS_VERSION}:math/cantor
 
 KALGEBRA_DESC=		Graph calculator
-KALGEBRA_RUN_DEPENDS=	${KDE_PREFIX}/bin/kalgebra:math/kalgebra-kde4
+KALGEBRA_RUN_DEPENDS=	kalgebra>=${KDE_APPLICATIONS_VERSION}:math/kalgebra
 
-KALZIUM_DESC=		Periodic table of elements
-KALZIUM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kalzium:science/kalzium-kde4
-
 KANAGRAM_DESC=		Letter order game
-KANAGRAM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kanagram:games/kanagram-kde4
+KANAGRAM_RUN_DEPENDS=	kanagram>=${KDE_APPLICATIONS_VERSION}:games/kanagram
 
 KBRUCH_DESC=		Application to exercise fractions
-KBRUCH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kbruch:math/kbruch-kde4
+KBRUCH_RUN_DEPENDS=	kbruch>=${KDE_APPLICATIONS_VERSION}:math/kbruch
 
 KGEOGRAPHY_DESC=	Geography trainer
-KGEOGRAPHY_RUN_DEPENDS=	${KDE_PREFIX}/bin/kgeography:misc/kgeography-kde4
+KGEOGRAPHY_RUN_DEPENDS=	kgeography>=${KDE_APPLICATIONS_VERSION}:misc/kgeography
 
 KHANGMAN_DESC=		Hangman game
-KHANGMAN_RUN_DEPENDS=	${KDE_PREFIX}/bin/khangman:games/khangman-kde4
+KHANGMAN_RUN_DEPENDS=	khangman>=${KDE_APPLICATIONS_VERSION}:games/khangman
 
 KIG_DESC=		Interactive geometry application
-KIG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kig:math/kig-kde4
+KIG_RUN_DEPENDS=	kig>=${KDE_APPLICATIONS_VERSION}:math/kig
 
 KITEN_DESC=		Japanese reference/study tool
-KITEN_RUN_DEPENDS=	${KDE_PREFIX}/bin/kiten:japanese/kiten-kde4
+KITEN_RUN_DEPENDS=	ja-kiten>=${KDE_APPLICATIONS_VERSION}:japanese/kiten
 
 KLETTRES_DESC=		Alphabet learning tool
-KLETTRES_RUN_DEPENDS=	${KDE_PREFIX}/bin/klettres:misc/klettres-kde4
+KLETTRES_RUN_DEPENDS=	klettres>=${KDE_APPLICATIONS_VERSION}:misc/klettres
 
 KMPLOT_DESC=		Mathematical function plotter
-KMPLOT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmplot:math/kmplot-kde4
+KMPLOT_RUN_DEPENDS=	kmplot>=${KDE_APPLICATIONS_VERSION}:math/kmplot
 
-KSTARS_DESC=		Desktop planetarium
-KSTARS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kstars:astro/kstars-kde4
-
-KTOUCH_DESC=		Touch typing tutor
-KTOUCH_RUN_DEPENDS=	${KDE_PREFIX}/bin/ktouch:misc/ktouch-kde4
-
 KTURTLE_DESC=		Educational programming environment
-KTURTLE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kturtle:lang/kturtle-kde4
+KTURTLE_RUN_DEPENDS=	kturtle>=${KDE_APPLICATIONS_VERSION}:lang/kturtle
 
 KWORDQUIZ_DESC=		Flash card trainer
-KWORDQUIZ_RUN_DEPENDS=	${KDE_PREFIX}/bin/kwordquiz:misc/kwordquiz-kde4
+KWORDQUIZ_RUN_DEPENDS=	kwordquiz>=${KDE_APPLICATIONS_VERSION}:misc/kwordquiz
 
 MARBLE_DESC=		Virtual globe and world atlas
-MARBLE_USE=		KDE=marble_run
+MARBLE_RUN_DEPENDS=	marble>=${KDE_APPLICATIONS_VERSION}:astro/marble
 
-PAIRS_DESC=		Memory and pairs game
-PAIRS_RUN_DEPENDS=	${KDE_PREFIX}/bin/pairs:games/pairs-kde4
-
 PARLEY_DESC=		Vocabulary trainer
-PARLEY_RUN_DEPENDS=	${KDE_PREFIX}/bin/parley:misc/parley-kde4
+PARLEY_RUN_DEPENDS=	parley>=${KDE_APPLICATIONS_VERSION}:misc/parley
 
 ROCS_DESC=		Graph teory IDE
-ROCS_RUN_DEPENDS=	${KDE_PREFIX}/bin/rocs:math/rocs-kde4
+ROCS_RUN_DEPENDS=	rocs>=${KDE_APPLICATIONS_VERSION}:math/rocs
 
 STEP_DESC=		Interactive physics simulator
-STEP_RUN_DEPENDS=	${KDE_PREFIX}/bin/step:science/step-kde4
+STEP_RUN_DEPENDS=	step>=${KDE_APPLICATIONS_VERSION}:science/step
 
 .include <bsd.port.mk>

Modified: head/misc/kdeedu/pkg-descr
==============================================================================
--- head/misc/kdeedu-kde4/pkg-descr	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/misc/kdeedu/pkg-descr	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,4 +1,4 @@
 This port installs a collection of entertaining, educational programs
-for KDE 4.
+for KDE.
 
 WWW: http://www.kde.org

Modified: head/misc/kdeutils/Makefile
==============================================================================
--- head/misc/kdeutils-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/misc/kdeutils/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,59 +1,25 @@
-# Created by: Martin Wilke <miwi at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdeutils
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
 CATEGORIES=	misc kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Collection of utilities for KDE 4
+COMMENT=	Collection of utilities for KDE
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
 
-OPTIONS_DEFINE=	ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \
-		KREMOTECONTROL KTIMER KWALLET PRINTMANAGER \
-		SUPERKARAMBA SWEEPER
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-
-ARK_DESC=		Archiving tool Ark
-ARK_RUN_DEPENDS=	${KDE_PREFIX}/bin/ark:archivers/ark-kde4
-
-FILELIGHT_DESC=		File system viewer Filelight
-FILELIGHT_RUN_DEPENDS=	${KDE_PREFIX}/bin/filelight:sysutils/filelight-kde4
-
-KCALC_DESC=		Scientific calculator KCalc
-KCALC_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcalc:math/kcalc-kde4
-
-KCHARSELECT_DESC=	Character selector KCharSelect
-KCHARSELECT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcharselect:deskutils/kcharselect-kde4
-
-KDF_DESC=		Disk usage tool KDiskFree
-KDF_RUN_DEPENDS=	${KDE_PREFIX}/bin/kdf:sysutils/kdf-kde4
-
-KFLOPPY_DESC=		Floppy formatter KFloppy
-KFLOPPY_RUN_DEPENDS=	${KDE_PREFIX}/bin/kfloppy:sysutils/kfloppy-kde4
-
-KGPG_DESC=		Encryption tool KGpg
-KGPG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kgpg:security/kgpg-kde4
-
-KREMOTECONTROL_DESC=	KRemoteControl
-KREMOTECONTROL_RUN_DEPENDS=	${KDE_PREFIX}/bin/krcdnotifieritem:comms/kremotecontrol-kde4
-
-KTIMER_DESC=		Countdown launcher KTimer
-KTIMER_RUN_DEPENDS=	${KDE_PREFIX}/bin/ktimer:x11-clocks/ktimer-kde4
-
-KWALLET_DESC=		Password manager KWallet
-KWALLET_RUN_DEPENDS=	${KDE_PREFIX}/bin/kwalletmanager:security/kwalletmanager-kde4
-
-PRINTMANAGER_DESC=	Print manager
-PRINTMANAGER_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kcm_printer_manager.so:print/print-manager-kde4
-
-SUPERKARAMBA_DESC=	Widget framework SuperKaramba
-SUPERKARAMBA_RUN_DEPENDS=	${KDE_PREFIX}/bin/superkaramba:deskutils/superkaramba-kde4
-
-SWEEPER_DESC=		System cleaner Sweeper
-SWEEPER_RUN_DEPENDS=	${KDE_PREFIX}/bin/sweeper:sysutils/sweeper-kde4
+RUN_DEPENDS=	ark>=${KDE_APPLICATIONS_VERSION}:archivers/ark \
+		filelight>=${KDE_APPLICATIONS_VERSION}:sysutils/filelight \
+		kcalc>=${KDE_APPLICATIONS_VERSION}:math/kcalc \
+		kcharselect>=${KDE_APPLICATIONS_VERSION}:deskutils/kcharselect \
+		kdebugsettings>=${KDE_APPLICATIONS_VERSION}:sysutils/kdebugsettings \
+		kdf>=${KDE_APPLICATIONS_VERSION}:sysutils/kdf \
+		kfloppy>=${KDE_APPLICATIONS_VERSION}:sysutils/kfloppy \
+		kgpg>=${KDE_APPLICATIONS_VERSION}:security/kgpg \
+		kteatime>=${KDE_APPLICATIONS_VERSION}:x11-clocks/kteatime \
+		ktimer>=${KDE_APPLICATIONS_VERSION}:x11-clocks/ktimer \
+		kwalletmanager>=${KDE_APPLICATIONS_VERSION}:security/kwalletmanager \
+		print-manager>=${KDE_APPLICATIONS_VERSION}:print/print-manager
 
 .include <bsd.port.mk>

Modified: head/misc/kdeutils/pkg-descr
==============================================================================
--- head/misc/kdeutils-kde4/pkg-descr	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/misc/kdeutils/pkg-descr	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,4 +1,4 @@
 The KDE utilities are a compilation of various desktop utilities,
 developed in the KDE module kdeutils.
 
-WWW: http://utils.kde.org
+WWW: https://www.kde.org/applications/utilities/

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/multimedia/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -42,6 +42,7 @@
     SUBDIR += deforaos-player
     SUBDIR += devede
     SUBDIR += dirac
+    SUBDIR += dragon
     SUBDIR += dragon-kde4
     SUBDIR += dtv-scan-tables
     SUBDIR += dumpmpeg
@@ -163,6 +164,7 @@
     SUBDIR += jmref
     SUBDIR += k9copy-kde4
     SUBDIR += kaffeine
+    SUBDIR += kdemultimedia
     SUBDIR += kdemultimedia-ffmpegthumbs
     SUBDIR += kdemultimedia-kde4
     SUBDIR += kdemultimedia-ffmpegthumbs-kde4

Modified: head/multimedia/dragon/Makefile
==============================================================================
--- head/multimedia/dragon-kde4/Makefile	Fri Apr 27 20:29:36 2018	(r468495)
+++ head/multimedia/dragon/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,18 +1,21 @@
-# Created by: Raphael Kubo da Costa <rakuco at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dragon
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
-CATEGORIES=	multimedia kde kde-kde4
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+CATEGORIES=	multimedia kde kde-applications
+PKGNAMESUFFIX=	-player
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE multimedia player with a focus on simplicity
 
 LICENSE=	GPLv2
 
-USES=		cmake:outsource kde:4 tar:xz
-USE_KDE=	automoc4 kdelibs
-USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
+USES=		cmake:outsource gettext kde:5 tar:xz
+USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
+		dbusaddons doctools ecm  kio service sonnet textwidgets i18n \
+		iconthemes jobwidgets notifications parts solid widgetsaddons \
+		windowsystem xmlgui
+USE_QT5=	core dbus gui network phonon4 widgets xml \
+		buildtools_build qmake_build
 
 .include <bsd.port.mk>

Modified: head/multimedia/dragon/distinfo
==============================================================================
--- head/multimedia/dragon-kde4/distinfo	Fri Apr 27 20:29:36 2018	(r468495)
+++ head/multimedia/dragon/distinfo	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/dragon-4.14.3.tar.xz) = d39ef6d550d114af6c1e0583c4d7a4632042bf1c12af061f16c31a3e28d8b0a4
-SIZE (KDE/4.14.3/dragon-4.14.3.tar.xz) = 391000
+TIMESTAMP = 1524863500
+SHA256 (KDE/applications/17.12.3/dragon-17.12.3.tar.xz) = 448725522965fd06779034fad9342526d9a1ac88c3ac5ea7b73e7cefc089b4c8
+SIZE (KDE/applications/17.12.3/dragon-17.12.3.tar.xz) = 1464016

Modified: head/multimedia/dragon/pkg-plist
==============================================================================
--- head/multimedia/dragon-kde4/pkg-plist	Fri Apr 27 20:29:36 2018	(r468495)
+++ head/multimedia/dragon/pkg-plist	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,17 +1,21 @@
 bin/dragon
-lib/kde4/dragonpart.so
+etc/xdg/dragonplayerrc
+%%QT_PLUGINDIR%%/dragonpart.so
+man/ca/man1/dragon.1.gz
+man/de/man1/dragon.1.gz
+man/es/man1/dragon.1.gz
+man/et/man1/dragon.1.gz
+man/fr/man1/dragon.1.gz
+man/it/man1/dragon.1.gz
 man/man1/dragon.1.gz
-share/applications/kde4/dragonplayer.desktop
-share/apps/dragonplayer/dragonlogo.png
-share/apps/dragonplayer/dragonplayerui.rc
-share/apps/solid/actions/dragonplayer-opendvd.desktop
-share/config/dragonplayerrc
-share/doc/HTML/en/dragonplayer/common
-share/doc/HTML/en/dragonplayer/index.cache.bz2
-share/doc/HTML/en/dragonplayer/index.docbook
-share/doc/HTML/en/dragonplayer/main.png
-share/doc/HTML/en/dragonplayer/man-dragon.1.docbook
-share/doc/HTML/en/dragonplayer/playmedia.png
+man/nl/man1/dragon.1.gz
+man/pt/man1/dragon.1.gz
+man/pt_BR/man1/dragon.1.gz
+man/sr/man1/dragon.1.gz
+man/sv/man1/dragon.1.gz
+man/tr/man1/dragon.1.gz
+man/uk/man1/dragon.1.gz
+share/applications/org.kde.dragonplayer.desktop
 share/icons/hicolor/128x128/apps/dragonplayer.png
 share/icons/hicolor/16x16/apps/dragonplayer.png
 share/icons/hicolor/22x22/apps/dragonplayer.png
@@ -24,5 +28,63 @@ share/icons/oxygen/22x22/actions/player-volume-muted.p
 share/icons/oxygen/32x32/actions/player-volume-muted.png
 share/icons/oxygen/48x48/actions/player-volume-muted.png
 share/icons/oxygen/scalable/actions/player-volume-muted.svgz
-share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
-share/kde4/services/dragonplayer_part.desktop
+share/kservices5/ServiceMenus/dragonplayer_play_dvd.desktop
+share/kservices5/dragonplayer_part.desktop
+share/kxmlgui5/dragonplayer/dragonlogo.png
+share/kxmlgui5/dragonplayer/dragonplayerui.rc
+share/locale/ar/LC_MESSAGES/dragonplayer.mo
+share/locale/ast/LC_MESSAGES/dragonplayer.mo
+share/locale/bg/LC_MESSAGES/dragonplayer.mo
+share/locale/bs/LC_MESSAGES/dragonplayer.mo
+share/locale/ca/LC_MESSAGES/dragonplayer.mo
+share/locale/ca at valencia/LC_MESSAGES/dragonplayer.mo
+share/locale/cs/LC_MESSAGES/dragonplayer.mo
+share/locale/da/LC_MESSAGES/dragonplayer.mo
+share/locale/de/LC_MESSAGES/dragonplayer.mo
+share/locale/el/LC_MESSAGES/dragonplayer.mo
+share/locale/en_GB/LC_MESSAGES/dragonplayer.mo
+share/locale/eo/LC_MESSAGES/dragonplayer.mo
+share/locale/es/LC_MESSAGES/dragonplayer.mo
+share/locale/et/LC_MESSAGES/dragonplayer.mo
+share/locale/eu/LC_MESSAGES/dragonplayer.mo
+share/locale/fi/LC_MESSAGES/dragonplayer.mo
+share/locale/fr/LC_MESSAGES/dragonplayer.mo
+share/locale/ga/LC_MESSAGES/dragonplayer.mo
+share/locale/gl/LC_MESSAGES/dragonplayer.mo
+share/locale/he/LC_MESSAGES/dragonplayer.mo
+share/locale/hr/LC_MESSAGES/dragonplayer.mo
+share/locale/hu/LC_MESSAGES/dragonplayer.mo
+share/locale/ia/LC_MESSAGES/dragonplayer.mo
+share/locale/id/LC_MESSAGES/dragonplayer.mo
+share/locale/is/LC_MESSAGES/dragonplayer.mo
+share/locale/it/LC_MESSAGES/dragonplayer.mo
+share/locale/ja/LC_MESSAGES/dragonplayer.mo
+share/locale/kk/LC_MESSAGES/dragonplayer.mo
+share/locale/km/LC_MESSAGES/dragonplayer.mo
+share/locale/ko/LC_MESSAGES/dragonplayer.mo
+share/locale/lt/LC_MESSAGES/dragonplayer.mo
+share/locale/lv/LC_MESSAGES/dragonplayer.mo
+share/locale/mr/LC_MESSAGES/dragonplayer.mo
+share/locale/nb/LC_MESSAGES/dragonplayer.mo
+share/locale/nds/LC_MESSAGES/dragonplayer.mo
+share/locale/nl/LC_MESSAGES/dragonplayer.mo
+share/locale/nn/LC_MESSAGES/dragonplayer.mo
+share/locale/pa/LC_MESSAGES/dragonplayer.mo
+share/locale/pl/LC_MESSAGES/dragonplayer.mo
+share/locale/pt/LC_MESSAGES/dragonplayer.mo
+share/locale/pt_BR/LC_MESSAGES/dragonplayer.mo
+share/locale/ro/LC_MESSAGES/dragonplayer.mo
+share/locale/ru/LC_MESSAGES/dragonplayer.mo
+share/locale/sk/LC_MESSAGES/dragonplayer.mo
+share/locale/sl/LC_MESSAGES/dragonplayer.mo
+share/locale/sr/LC_MESSAGES/dragonplayer.mo
+share/locale/sv/LC_MESSAGES/dragonplayer.mo
+share/locale/tr/LC_MESSAGES/dragonplayer.mo
+share/locale/ug/LC_MESSAGES/dragonplayer.mo
+share/locale/uk/LC_MESSAGES/dragonplayer.mo
+share/locale/wa/LC_MESSAGES/dragonplayer.mo
+share/locale/zh_CN/LC_MESSAGES/dragonplayer.mo
+share/locale/zh_TW/LC_MESSAGES/dragonplayer.mo
+share/metainfo/org.kde.dragonplayer.appdata.xml
+share/solid/actions/dragonplayer-openaudiocd.desktop
+share/solid/actions/dragonplayer-opendvd.desktop

Modified: head/multimedia/kdemultimedia/Makefile
==============================================================================
--- head/multimedia/kdemultimedia-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/multimedia/kdemultimedia/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,39 +1,28 @@
-# Created by: Martin Wilke <miwi at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
 CATEGORIES=	multimedia kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE Multimedia applications (meta port)
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
+USE_QT5=	#
 
-OPTIONS_DEFINE=		DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
-OPTIONS_DEFAULT=	DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
+OPTIONS_DEFINE=		DRAGON FFMPEG AUDIOCD_KIO KMIX
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 DRAGON_DESC=		Simple video player
-DRAGON_RUN_DEPENDS=	${KDE_PREFIX}/bin/dragon:multimedia/dragon-kde4
+DRAGON_RUN_DEPENDS=	dragon-player>=${KDE_APPLICATIONS_VERSION}:multimedia/dragon
 
 FFMPEG_DESC=		FFMPEG-based video thumbnailer
-FFMPEG_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia-ffmpegthumbs-kde4
+FFMPEG_RUN_DEPENDS=	kdemultimedia-ffmpegthumbs>=${KDE_APPLICATIONS_VERSION}:multimedia/kdemultimedia-ffmpegthumbs
 
-JUK_DESC=		Audio player
-JUK_RUN_DEPENDS=	${KDE_PREFIX}/bin/juk:audio/juk-kde4
+AUDIOCD_KIO_DESC=	Audio CD IOSlave
+AUDIOCD_KIO_RUN_DEPENDS=	audiocd-kio>=${KDE_APPLICATIONS_VERSION}:audio/audiocd-kio
 
-KIO_AUDIOCD_DESC=	Audio CD IOSlave
-KIO_AUDIOCD_RUN_DEPENDS=	${KDE_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd-kde4
-
 KMIX_DESC=		Audio mixer
-KMIX_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmix:audio/kmix-kde4
-
-KSCD_DESC=		CD Player
-KSCD_RUN_DEPENDS=	${KDE_PREFIX}/bin/kscd:audio/kscd-kde4
-
-MPLAYER_DESC=		MPlayer-based video thumbnailer
-MPLAYER_RUN_DEPENDS=	${KDE_PREFIX}/bin/mplayerthumbsconfig:multimedia/kdemultimedia-mplayerthumbs-kde4
+KMIX_RUN_DEPENDS=	kmix>=${KDE_APPLICATIONS_VERSION}:audio/kmix
 
 .include <bsd.port.mk>

Modified: head/multimedia/kdemultimedia/pkg-descr
==============================================================================
--- head/multimedia/kdemultimedia-kde4/pkg-descr	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/multimedia/kdemultimedia/pkg-descr	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,3 +1,3 @@
-Multimedia tools for KDE4.
+Multimedia tools for KDE.
 
 WWW: http://multimedia.kde.org

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/net/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -319,6 +319,7 @@
     SUBDIR += kcalutils
     SUBDIR += kcontacts
     SUBDIR += kdav
+    SUBDIR += kdenetwork
     SUBDIR += kdenetwork-filesharing
     SUBDIR += kdenetwork-kde4
     SUBDIR += kdenetwork-filesharing-kde4

Modified: head/net/kdenetwork/Makefile
==============================================================================
--- head/net/kdenetwork-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/net/kdenetwork/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,38 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	kdenetwork
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
 CATEGORIES=	net kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE Network applications (meta port)
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
+USE_QT5=	#
 
-OPTIONS_DEFINE=	FILESHARING KDNSSD KGET KOPETE KRDC KRFB STRIGI
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFINE=	FILESHARING KGET KRDC KRFB
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NKOPETE}
 
 FILESHARING_DESC=	Network file sharing via Samba
-FILESHARING_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/sambausershareplugin.so:net/kdenetwork-filesharing-kde4
+FILESHARING_RUN_DEPENDS=	kdenetwork-filesharing>=${KDE_APPLICATIONS_VERSION}:net/kdenetwork-filesharing
 
-KDNSSD_DESC=		Network monitor for DNS-SD services (Zeroconf)
-KDNSSD_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kded_dnssdwatcher.so:net/zeroconf-ioslave-kde4
-
 KGET_DESC=		Download manager
-KGET_RUN_DEPENDS=	${KDE_PREFIX}/bin/kget:net/kget-kde4
+KGET_RUN_DEPENDS=	kget>=${KDE_APPLICATIONS_VERSION}:net/kget
 
-KOPETE_DESC=		Multi-protocol instant messenger
-KOPETE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kopete:net-im/kopete-kde4
+# Kopete will be added with the 18.04 update
+# KOPETE_DESC=		Multi-protocol instant messenger
+# KOPETE_RUN_DEPENDS=	kopete>=${KDE_APPLICATIONS_VERSION}:net-im/kopete
 
 KRDC_DESC=		RDP and VNC client
-KRDC_RUN_DEPENDS=	${KDE_PREFIX}/bin/krdc:net/krdc-kde4
+KRDC_RUN_DEPENDS=	krdc>=${KDE_APPLICATIONS_VERSION}:net/krdc
 
 KRFB_DESC=		Desktop Sharing (VNC server)
-KRFB_RUN_DEPENDS=	${KDE_PREFIX}/bin/krfb:net/krfb-kde4
-
-STRIGI_DESC=		Strigi analyzers for network-related file formats
-STRIGI_RUN_DEPENDS=	${KDE_PREFIX}/lib/strigi/strigita_torrent_analyzer.so:net/kdenetwork-strigi-analyzers-kde4
+KRFB_RUN_DEPENDS=	krfb>=${KDE_APPLICATIONS_VERSION}:net/krfb
 
 .include <bsd.port.mk>

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/sysutils/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -541,6 +541,7 @@
     SUBDIR += kcm-polkit-kde
     SUBDIR += kcron
     SUBDIR += kcron-kde4
+    SUBDIR += kdeadmin
     SUBDIR += kdeadmin-kde4
     SUBDIR += kdebugsettings
     SUBDIR += kdf

Modified: head/sysutils/kdeadmin/Makefile
==============================================================================
--- head/sysutils/kdeadmin-kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/sysutils/kdeadmin/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,26 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	kdeadmin
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}$
 CATEGORIES=	sysutils kde
-PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE Administration applications (meta port)
 
-USES=		kde:4 metaport
+USES=		kde:5 metaport
 
-OPTIONS_DEFINE=	KCRON KSYSTEMLOG KUSER
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFINE=		KCRON KSYSTEMLOG
+OPTIONS_DEFAULT=	KCRON KSYSTEMLOG
 
 KCRON_DESC=		Task scheduler
-KCRON_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kcm_cron.so:sysutils/kcron-kde4
+KCRON_RUN_DEPENDS=	kcron>=${KDE_APPLICATIONS_VERSION}:sysutils/kcron
 
 KSYSTEMLOG_DESC=	System log viewer
-KSYSTEMLOG_RUN_DEPENDS=	${KDE_PREFIX}/bin/ksystemlog:sysutils/ksystemlog-kde4
-
-KUSER_DESC=		User management application
-KUSER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kuser:sysutils/kuser-kde4
+KSYSTEMLOG_RUN_DEPENDS=	ksystemlog>=${KDE_APPLICATIONS_VERSION}:sysutils/ksystemlog
 
 .include <bsd.port.mk>

Modified: head/x11/Makefile
==============================================================================
--- head/x11/Makefile	Fri Apr 27 20:59:13 2018	(r468498)
+++ head/x11/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -124,10 +124,12 @@
     SUBDIR += kactivitymanagerd
     SUBDIR += kb2mb2
     SUBDIR += kbproto
+    SUBDIR += kde-baseapps
     SUBDIR += kde-baseapps-kde4
     SUBDIR += kde-runtime-kde4
     SUBDIR += kde-workspace-kde4
     SUBDIR += kde4
+    SUBDIR += kde5
     SUBDIR += kdelibs-kde4
     SUBDIR += keybinder
     SUBDIR += keybinder-gtk3

Modified: head/x11/kde-baseapps/Makefile
==============================================================================
--- head/x11/kde-baseapps-kde4/Makefile	Fri Apr 27 20:29:36 2018	(r468495)
+++ head/x11/kde-baseapps/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,41 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	kde-baseapps
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
-CATEGORIES=	x11 kde kde-kde4
-PKGNAMESUFFIX=	-kde4
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+CATEGORIES=	x11 kde
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Basic applications for KDE
+COMMENT=	KDE5 baseapps meta port
 
-LIB_DEPENDS=	libtidy.so:www/tidy-lib
+LICENSE=	LGPL20
 
-USES=		cmake:outsource gettext kde:4 tar:xz
-USE_GNOME=	glib20
-USE_KDE=	kdelibs baloo baloo-widgets libkonq \
-		automoc4 kactivities
-USE_QT4=	corelib dbus gui script xml \
-		moc_build qmake_build rcc_build uic_build
-USE_XORG=	x11 xt
-USE_LDCONFIG=	yes
-
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
-
-OPTIONS_DEFINE=	KONSOLE KWRITE
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-
-KONSOLE_DESC=	Install Konsole terminal emulator
-KONSOLE_RUN_DEPENDS=	${KDE_PREFIX}/bin/konsole:x11/konsole-kde4
-
-KWRITE_DESC=	Install KWrite text editor
-KWRITE_USE=	KDE=kate_run
-
-pre-configure:
-# Quick hack to avoid building libkonq here
-	${REINPLACE_CMD} -e '/add_subdirectory (konq)/d' \
-		${WRKSRC}/lib/CMakeLists.txt
-	${MKDIR} ${BUILD_WRKSRC}/lib && \
-	${LN} -s ${KDE_PREFIX}/lib/libkonq.so ${BUILD_WRKSRC}/lib
+USES=		kde:5 metaport
+RUN_DEPENDS=	ark>=${KDE_APPLICATIONS_VERSION}:archivers/ark \
+		dolphin>=${KDE_APPLICATIONS_VERSION}:x11-fm/dolphin  \
+		gwenview>=${KDE_APPLICATIONS_VERSION}:graphics/gwenview \
+		kate>=${KDE_APPLICATIONS_VERSION}:editors/kate \
+		kdialog>=${KDE_APPLICATIONS_VERSION}:sysutils/kdialog \
+		keditbookmarks>=${KDE_APPLICATIONS_VERSION}:deskutils/keditbookmarks \
+		khelpcenter>=${KDE_APPLICATIONS_VERSION}:sysutils/khelpcenter \
+		konsole>=${KDE_APPLICATIONS_VERSION}:x11/konsole \
+		konqueror>=${KDE_APPLICATIONS_VERSION}:x11-fm/konqueror \
+		okular>=${KDE_APPLICATIONS_VERSION}:graphics/okular
 
 .include <bsd.port.mk>

Modified: head/x11/kde-baseapps/pkg-descr
==============================================================================
--- head/x11/kde-baseapps-kde4/pkg-descr	Fri Apr 27 20:29:36 2018	(r468495)
+++ head/x11/kde-baseapps/pkg-descr	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,9 +1,3 @@
-KDE Base Applications consists of what runs on the desktop. This
-module isn't a complete collection of essential applications that a
-user would expect on a desktop (such as e-mail and calculator). This
-package is the basic set of applications beyond the workspace that KDE
-applications can assume are installed. These applications should have
-no problem running on Windows, OS X, Gnome, etc. as stand alone
-applications if the user wanted to use them there.
+Collection of applications useful on a KDE based desktop.
 
-WWW: http://www.kde.org
+WWW: https://www.kde.org/applications//

Modified: head/x11/kde5/Makefile
==============================================================================
--- head/x11/kde4/Makefile	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/x11/kde5/Makefile	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,65 +1,52 @@
-# Created by: Will Andrews <will at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	kde
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	7
-CATEGORIES=	x11 kde
+PORTNAME=	kde5
+DISTVERSION=	${KDE_PLASMA_VERSION}.${KDE_APPLICATIONS_VERSION}
+CATEGORIES=	x11 kde # kde-plasma
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	KDE Software Compilation 4 (meta port)
+COMMENT=	KDE5 meta port
 
-USES=		kde:4 metaport
-USE_KDE=	baseapps_run runtime_run workspace_run
+LICENSE=	LGPL20
 
-OPTIONS_DEFINE=	KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEBINDINGS KDEEDU \
+RUN_DEPENDS=	kde-baseapps>=0:x11/kde-baseapps \
+		kwalletmanager5:security/kwalletmanager
+
+USES=		kde:5 metaport
+USE_KDE=	plasma-desktop_run
+USE_QT5=	# empty
+
+OPTIONS_DEFINE=	KDEADMIN KDEEDU \
 		KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK \
-		KDEPLASMA KDEPIM KDESDK KDETOYS KDEUTILS KDEWEBDEV
-OPTIONS_DEFAULT=${OPTIONS_DEFINE:NKDEBINDINGS}
+		KDEPIM KDEUTILS \
+		PULSEAUDIO
 
-KDEACCESSIBILITY_DESC=	Accessibility applications
-KDEACCESSIBILITY_RUN_DEPENDS=	kdeaccessibility-kde4>=${KDE4_VERSION}:accessibility/kdeaccessibility-kde4
+OPTIONS_DEFAULT=${OPTIONS_DEFINE:NPULSEAUDIO}
 
 KDEADMIN_DESC=		Administration utilities
-KDEADMIN_RUN_DEPENDS=	kdeadmin-kde4>=${KDE4_VERSION}:sysutils/kdeadmin-kde4
+KDEADMIN_RUN_DEPENDS=	kdeadmin>=${KDE_APPLICATIONS_VERSION}:sysutils/kdeadmin
 
-KDEARTWORK_DESC=	Additional screensavers and wallpapers
-KDEARTWORK_RUN_DEPENDS=	${KDE_PREFIX}/bin/kxsconfig:x11-themes/kdeartwork-kde4
-
-KDEBINDINGS_DESC=	Bindings for programming languages
-KDEBINDINGS_RUN_DEPENDS=	kdebindings-kde4>=${KDE4_VERSION}:devel/kdebindings-kde4
-
 KDEEDU_DESC=		Entertaining, educational programs
-KDEEDU_RUN_DEPENDS=	kdeedu-kde4>=${KDE4_VERSION}:misc/kdeedu-kde4
+KDEEDU_RUN_DEPENDS=	kdeedu>=${KDE_APPLICATIONS_VERSION}:misc/kdeedu
 
 KDEGAMES_DESC=		Collection of games
-KDEGAMES_RUN_DEPENDS=	kdegames-kde4>=${KDE4_VERSION}:games/kdegames-kde4
+KDEGAMES_RUN_DEPENDS=	kdegames>=${KDE_APPLICATIONS_VERSION}:games/kdegames
 
 KDEGRAPHICS_DESC=	Graphics utilities
-KDEGRAPHICS_RUN_DEPENDS=	kdegraphics-kde4>=${KDE4_VERSION}:graphics/kdegraphics-kde4
+KDEGRAPHICS_RUN_DEPENDS=	kdegraphics>=${KDE_APPLICATIONS_VERSION}:graphics/kdegraphics
 
 KDEMULTIMEDIA_DESC=	Multimedia applications
-KDEMULTIMEDIA_RUN_DEPENDS=	kdemultimedia-kde4>=${KDE4_VERSION}:multimedia/kdemultimedia-kde4
+KDEMULTIMEDIA_RUN_DEPENDS=	kdemultimedia>=${KDE_APPLICATIONS_VERSION}:multimedia/kdemultimedia
 
 KDENETWORK_DESC=	Network-related programs
-KDENETWORK_RUN_DEPENDS=	kdenetwork-kde4>=${KDE4_VERSION}:net/kdenetwork-kde4
+KDENETWORK_RUN_DEPENDS=	kdenetwork>=${KDE_APPLICATIONS_VERSION}:net/kdenetwork
 
 KDEPIM_DESC=		Personal information management
-KDEPIM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmail:deskutils/kdepim-kde4
+KDEPIM_RUN_DEPENDS=	kdepim>=${KDE_APPLICATIONS_VERSION}:deskutils/kdepim
 
-KDEPLASMA_DESC=		Extra plasmoids and plugins for Plasma
-KDEPLASMA_RUN_DEPENDS=	${KDE_PREFIX}/bin/lancelot:deskutils/kdeplasma-addons-kde4
+KDEUTILS_DESC=		Collection of utilities for KDE
+KDEUTILS_RUN_DEPENDS=	kdeutils>=${KDE_APPLICATIONS_VERSION}:misc/kdeutils
 
-KDESDK_DESC=		Software development kit
-KDESDK_RUN_DEPENDS=	kdesdk-kde4>=${KDE4_VERSION}:devel/kdesdk-kde4
-
-KDETOYS_DESC=		Miscellaneous small applications
-KDETOYS_RUN_DEPENDS=	kdetoys-kde4>=${KDE4_VERSION}:x11-clocks/kdetoys-kde4
-
-KDEUTILS_DESC=		Set of generic utilities
-KDEUTILS_RUN_DEPENDS=	kdeutils-kde4>=${KDE4_VERSION}:misc/kdeutils-kde4
-
-KDEWEBDEV_DESC=		Web development environment
-KDEWEBDEV_RUN_DEPENDS=	${KDE_PREFIX}/bin/klinkstatus:www/kdewebdev-kde4
+PULSEAUDIO_USE=		KDE=plasma-pa
 
 .include <bsd.port.mk>

Modified: head/x11/kde5/pkg-descr
==============================================================================
--- head/x11/kde4/pkg-descr	Fri Apr 27 19:49:20 2018	(r468494)
+++ head/x11/kde5/pkg-descr	Fri Apr 27 21:47:35 2018	(r468499)
@@ -1,9 +1,3 @@
-KDE is a powerful Free Software graphical desktop environment for Linux
-and Unix workstations.
+KDE5 Meta Port
 
-This package does not contain anything by itself -- it is a
-"meta-port" that depends on other KDE packages.  Its sole purpose is
-to require dependencies so users can install this package only and
-have all the KDE stuff pulled in by the port/package dependency mechanism.
-
-WWW: http://www.kde.org/
+WWW: https://www.kde.org
