*: (KDE ports) tidy up dependencies

Go another round with the dependency-cleanup:
- ECM and doctools are still more only a build-dep
- Qt testlibs is a build-dep

This touches plenty of ports outside of KDE Frameworks
that did **not** list their full dependencies and could
get away with it because frameworks pulled in too much.

10 files changed, 52 insertions, 30 deletions

diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 60556b2d9e20..1e7dbc4a7bf8 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	filelight
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,11 +12,12 @@ BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext \
 		kde:5 qt:5 tar:xz
-USE_KDE=	auth codecs completion config configwidgets coreaddons doctools \
-		ecm i18n jobwidgets kio parts service solid sonnet textwidgets \
-		widgetsaddons xmlgui
+USE_KDE=	auth codecs completion config configwidgets coreaddons \
+		i18n jobwidgets kio parts service solid sonnet textwidgets \
+		widgetsaddons xmlgui \
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network script widgets xml \
-		buildtools_build qmake_build
+		buildtools_build qmake_build testlib_build
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index 6dd4ee9b2956..48a7e9b653d1 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	khelpcenter
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications # kde kde-applications-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,10 +12,15 @@ USES=		cmake compiler:c++11-lib cpe gettext gnome grantlee:5 kde:5 \
 		qt:5 shebangfix tar:xz
 USE_GNOME=	libxml2
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
-		coreaddons dbusaddons doctools ecm emoticons i18n init \
-		itemmodels itemviews jobwidgets js kcmutils kdelibs4support \
+		coreaddons dbusaddons emoticons i18n init \
+		itemmodels itemviews jobwidgets js kcmutils \
 		kio khtml parts service sonnet textwidgets widgetsaddons \
-		windowsystem xmlgui
+		windowsystem xmlgui \
+		ecm_build
+# This port depends on doctools; we need the entities and such for runtime
+# documentation support, where all the other KDE Plasma parts need it
+# only for the build-time documentation-generation.
+USE_KDE+=	doctools
 USE_QT=		concurrent core dbus gui network widgets xml \
 		buildtools_build qmake_build
 SHEBANG_FILES=	searchhandlers/khc_mansearch.pl
diff --git a/sysutils/plasma5-discover/Makefile b/sysutils/plasma5-discover/Makefile
index 271bddf596d2..a12816d959c4 100644
--- a/sysutils/plasma5-discover/Makefile
+++ b/sysutils/plasma5-discover/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	discover
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,12 +12,13 @@ COMMENT=	Plasma5 package management tools
 USES=		cmake compiler:c++11-lib cpe desktop-file-utils \
 		gettext kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	archive attica auth codecs completion config configwidgets \
-		coreaddons crash dbusaddons ecm i18n iconthemes idletime itemmodels \
+		coreaddons crash dbusaddons i18n iconthemes idletime itemmodels \
 		itemviews jobwidgets kcmutils kdeclarative kio kirigami2 newstuff \
 		notifications package plasma-framework service solid \
-		textwidgets wallet windowsystem widgetsaddons xmlgui
-USE_QT=		concurrent core dbus declarative gui network svg testlib \
+		textwidgets wallet windowsystem widgetsaddons xmlgui \
+		ecm_build
+USE_QT=		concurrent core dbus declarative gui network svg \
 		widgets x11extras xml \
-		buildtools_build qmake_build
+		buildtools_build qmake_build testlib_build
 
 .include <bsd.port.mk>
diff --git a/sysutils/plasma5-drkonqi/Makefile b/sysutils/plasma5-drkonqi/Makefile
index cfabdc95e6aa..525697a16fec 100644
--- a/sysutils/plasma5-drkonqi/Makefile
+++ b/sysutils/plasma5-drkonqi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	drkonqi
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -7,10 +8,11 @@ COMMENT=	Plasma5 crash handler
 
 USES=		cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
-		 crash i18n idletime jobwidgets kio notifications \
+		crash i18n idletime jobwidgets kio notifications \
 		service syntaxhighlighting wallet widgetsaddons \
-		windowsystem xmlrpcclient
+		windowsystem xmlrpcclient \
+		ecm_build
 USE_QT=		concurrent core dbus gui network widgets x11extras xml \
-		buildtools_build qmake_build
+		buildtools_build qmake_build testlib_build
 
 .include <bsd.port.mk>
diff --git a/sysutils/plasma5-kde-cli-tools/Makefile b/sysutils/plasma5-kde-cli-tools/Makefile
index fa4e2a4a77a2..1abf6aedb3dd 100644
--- a/sysutils/plasma5-kde-cli-tools/Makefile
+++ b/sysutils/plasma5-kde-cli-tools/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kde-cli-tools
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -8,13 +9,14 @@ COMMENT=	Plasma5 non-interactive system tools
 
 USES=		cmake compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	activities auth bookmarks codecs completion config configwidgets \
-		coreaddons crash ecm emoticons guiaddons i18n iconthemes init \
-		itemmodels itemviews jobwidgets kcmutils kdeclarative kdelibs4support kdesu \
+		coreaddons crash emoticons guiaddons i18n iconthemes init \
+		itemmodels itemviews jobwidgets kcmutils kdeclarative kdesu \
 		kio notifications parts plasma-workspace pty service solid sonnet \
-		textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT=		concurrent core dbus declarative gui network printsupport svg testlib  widgets \
+		textwidgets unitconversion widgetsaddons windowsystem xmlgui \
+		doctools_build ecm_build
+USE_QT=		concurrent core dbus declarative gui network printsupport svg widgets \
 		x11extras xml \
-		buildtools_build qmake_build
+		buildtools_build qmake_build testlib_build
 USE_XORG=	x11
 
 .include <bsd.port.mk>
diff --git a/sysutils/plasma5-kinfocenter/Makefile b/sysutils/plasma5-kinfocenter/Makefile
index 7dab4857efd6..05f7549cb1e7 100644
--- a/sysutils/plasma5-kinfocenter/Makefile
+++ b/sysutils/plasma5-kinfocenter/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kinfocenter
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,11 +12,12 @@ USES=		cmake compiler:c++11-lib cpe gettext gl kde:5 pkgconfig \
 		qt:5 tar:xz xorg
 USE_GL=		egl gl glu
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
-		coreaddons crash dbusaddons doctools ecm emoticons guiaddons \
+		coreaddons crash dbusaddons emoticons guiaddons \
 		i18n iconthemes jobwidgets kcmutils kdeclarative \
-		kdelibs4support kio notifications package parts init \
+		kio notifications package parts init \
 		itemmodels itemviews service solid sonnet textwidgets \
 		unitconversion wayland wayland widgetsaddons windowsystem xmlgui \
+		doctools_build ecm_build \
 		systemsettings_run
 USE_QT=		concurrent core dbus declarative gui network printsupport widgets xml \
 		buildtools_build qmake_build
diff --git a/sysutils/plasma5-kmenuedit/Makefile b/sysutils/plasma5-kmenuedit/Makefile
index eb0c26d18b95..fd235d555abf 100644
--- a/sysutils/plasma5-kmenuedit/Makefile
+++ b/sysutils/plasma5-kmenuedit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kmenuedit
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -7,10 +8,11 @@ COMMENT=	Plasma5 menu editor
 
 USES=		cmake compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
-		coreaddons crash dbusaddons guiaddons ecm emoticons globalaccel \
+		coreaddons crash dbusaddons emoticons globalaccel guiaddons \
 		hotkeys i18n iconthemes init itemmodels itemviews jobwidgets \
-		kdelibs4support kio notifications parts service solid sonnet \
-		textwidgets unitconversion widgetsaddons windowsystem xmlgui
+		kio notifications parts service solid sonnet \
+		textwidgets unitconversion widgetsaddons windowsystem xmlgui \
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network printsupport widgets xml\
 		buildtools_build qmake_build
 
diff --git a/sysutils/plasma5-ksysguard/Makefile b/sysutils/plasma5-ksysguard/Makefile
index 441d19b07927..475f79a70c58 100644
--- a/sysutils/plasma5-ksysguard/Makefile
+++ b/sysutils/plasma5-ksysguard/Makefile
@@ -15,9 +15,9 @@ USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
 		itemviews jobwidgets kdelibs4support kio libksysguard \
 		newstuff notifications service widgetsaddons windowsystem \
 		xmlgui \
-		doctools_build
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network widgets xml \
-		buildtools_build qmake_build
+		buildtools_build qmake_build testlib_build
 
 OPTIONS_DEFINE=		INOTIFY
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
diff --git a/sysutils/plasma5-powerdevil/Makefile b/sysutils/plasma5-powerdevil/Makefile
index fd1e717904f4..0efb21a9731d 100644
--- a/sysutils/plasma5-powerdevil/Makefile
+++ b/sysutils/plasma5-powerdevil/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	powerdevil
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,12 +11,13 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/upowerd:sysutils/upower
 
 USES=		cmake compiler:c++11-lib cpe gettext kde:5 pkgconfig qt:5 tar:xz xorg
 USE_KDE=	activities auth bookmarks codecs completion configwidgets \
-		coreaddons crash config dbusaddons ecm emoticons globalaccel \
+		coreaddons crash config dbusaddons emoticons globalaccel \
 		guiaddons i18n idletime iconthemes init itemmodels itemviews \
 		jobwidgets kdelibs4support kio libkscreen notifications \
 		notifyconfig parts plasma-workspace service solid sonnet \
 		textwidgets unitconversion wayland widgetsaddons windowsystem \
-		xmlgui
+		xmlgui \
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus gui network printsupport widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	xcb
diff --git a/sysutils/plasma5-systemsettings/Makefile b/sysutils/plasma5-systemsettings/Makefile
index 0887a5327861..7c6427a12add 100644
--- a/sysutils/plasma5-systemsettings/Makefile
+++ b/sysutils/plasma5-systemsettings/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	systemsettings
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -7,10 +8,11 @@ COMMENT=	Plasma5 system settings
 
 USES=		cmake compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
 USE_KDE=	activities activities-stats auth codecs completion config \
-		configwidgets coreaddons crash dbusaddons doctools ecm guiaddons \
+		configwidgets coreaddons crash dbusaddons guiaddons \
 		i18n iconthemes itemmodels itemviews jobwidgets js kcmutils \
 		kdeclarative khtml kio kirigami2 package parts plasma-workspace \
-		service sonnet textwidgets widgetsaddons windowsystem xmlgui
+		service sonnet textwidgets widgetsaddons windowsystem xmlgui \
+		doctools_build ecm_build
 USE_QT=		concurrent core dbus declarative gui network widgets xml \
 		buildtools_build qmake_build