Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and

Plasma5 ports

At the moment KDE ports use bsd.kde4.mk to handle their dependencies. When
working on the ports for KDE Frameworks and Plasma5 it seemed to be more
reasonable to create a new kde.mk instead of adding an bsd.kde5.mk.

The kde.mk in this review is a stripped down version of the one we are using in
the KDE Test repositories plasma5 branch [1] to only contain the parts relevant
to the current KDE4 ports in the portstree [2].

Changes to the KDE Ports needed by this:

Replace USE_KDE4 by USE_KDE [3]
Add USES=kde:4 [4]
[1] http://src.mouf.net/area51/view/branches/plasma5/KDE/Mk/Uses/kde.mk
[2] The version in the plasma5 branch also handles frameworks/plasma5 and
    handles MASTER_SITES via a KDE_DIST variable similar to bsd.qt.mk for Qt
    Ports -- I chose to leave this out for now, as the diff is already large
    enough.
[3] I chose USE_KDE instead of USE_KDE4, USE_KDE5, USE_KDEX as the version we
    want is already specified as argument to kde:<arg>
[4] For KDE Frameworks and Plasma5 ports this would be kde:5

PR:             210667
Approved by:    portmgr, mat (mentor), rakuco (mentor)
Reviewed by:    mat, rakuco
Differential Revision:   https://reviews.freebsd.org/D6961

15 files changed, 31 insertions, 30 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index c5b709e90aa8..c5e340554baa 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -20,16 +20,16 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 		libdbus-1.so:devel/dbus
 BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator
 RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \
-		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
+		${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
 
-USE_KDE4=	kdelibs libkcddb libkcompactdisc \
+USES=		cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2
+USE_KDE=	kdelibs libkcddb libkcompactdisc \
 		nepomuk-core runtime automoc4 strigi
 USE_MYSQL=	embedded
 USE_QT4=	corelib dbus designer gui network opengl \
 		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11
-USES=		cmake pkgconfig shared-mime-info shebangfix tar:bzip2
 SHEBANG_FILES=	src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
 USE_LDCONFIG=	yes
 
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index 67d1076b9ec2..846c106ed712 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -12,8 +12,8 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcdda_paranoia.so:audio/cdparanoia
 
-USES=		tar:xz cmake
-USE_KDE4=	automoc4 kdelibs libkcddb libkcompactdisc
+USES=		tar:xz cmake kde:4
+USE_KDE=	automoc4 kdelibs libkcddb libkcompactdisc
 USE_QT4=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
 
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 78cff4a32eb7..6c67f1bf1268 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -17,8 +17,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	laudrup
 GH_PROJECT=	Creox4
 
-USES=		cmake:outsource
-USE_KDE4=	automoc4 kdelibs
+USES=		cmake:outsource kde:4
+USE_KDE=	automoc4 kdelibs
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XORG=	xft xpm
 
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 12671ce80a3d..40568273eeb4 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtag.so:audio/taglib
 
-USES=		cmake:outsource tar:xz
-USE_KDE4=	automoc4 kdelibs
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	automoc4 kdelibs
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
 CMAKE_ARGS=	-DWITH_TunePimp:BOOL=OFF
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 834e55e5ce08..17053b3d5e88 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	flac:audio/flac \
 RUN_DEPENDS+=	lame:audio/lame
 .endif
 
-USES=		cmake tar:bzip2
+USES=		cmake kde:4 tar:bzip2
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_KDE4=	automoc4 libkcddb libkcompactdisc
+USE_KDE=	automoc4 libkcddb libkcompactdisc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 9defd2e10837..83d59fe0677f 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -12,7 +12,7 @@ COMMENT?=	MP3/Ogg/FLAC tag editor for KDE
 LICENSE=	GPLv2
 
 USE_PERL5=	build
-USES=		cmake:outsource perl5
+USES=		cmake:outsource kde:4 perl5
 CMAKE_ARGS=	-DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \
 		-DWITH_MANDIR=man \
 		-DFFMPEG_ROOT=${LOCALBASE} \
@@ -61,7 +61,7 @@ PLIST_SUB+=	QT="" KDE="@comment "
 .else
 CONFLICTS_INSTALL+=	kid3-qt4-3.* kid3-qt5-3.*
 
-USE_KDE4=	kdelibs automoc4
+USE_KDE=	kdelibs automoc4
 CMAKE_ARGS+=	-DWITH_APPS="${KID3_CLI}KDE"
 PLIST_SUB+=	QT="@comment " KDE=""
 .endif
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index 437c5761a84d..dad3c0626f3c 100644
--- a/audio/kio-audiocd/Makefile
+++ b/audio/kio-audiocd/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis
 
-USES=		cmake:outsource tar:xz
-USE_KDE4=	kdelibs libkcddb libkcompactdisc \
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs libkcddb libkcompactdisc \
 		automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 2ffe68c5512f..82737f530554 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Sound mixer for KDE
 
 LICENSE=	GPLv2
 
-USES=		cmake:outsource tar:xz
-USE_KDE4=	automoc4 kdelibs
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	automoc4 kdelibs
 USE_QT4=	gui phonon xml \
 		moc_build qmake_build rcc_build uic_build
 
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
index 5f8d42be109d..ec1692255722 100644
--- a/audio/kscd/Makefile
+++ b/audio/kscd/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libmusicbrainz3.so:audio/libmusicbrainz3
 
-USES=		cmake:outsource tar:xz
-USE_KDE4=	kdelibs automoc4
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs automoc4
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 
 OPTIONS_DEFINE=	ALSA
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index aaf56120bac5..6890fa648e14 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Program for recording streams for KDE4
 
 RUN_DEPENDS=	${LOCALBASE}/bin/streamripper:audio/streamripper
 
-USES=		cmake gettext-tools tar:bzip2
-USE_KDE4=	kdelibs automoc4
+USES=		cmake gettext-tools kde:4 tar:bzip2
+USE_KDE=	kdelibs automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index de82c362d274..bd3c09b362e6 100644
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	KDE CDDB library
 
 LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5
 
-USES=		cmake:outsource tar:xz
-USE_KDE4=	automoc4 kdelibs
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	automoc4 kdelibs
 USE_QT4=	qtestlib moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 5f9b39be46a0..6d99e4a4af1a 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE library for interfacing with audio CDs
 
-USES=		cmake:outsource tar:xz
-USE_KDE4=	automoc4 kdelibs
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	automoc4 kdelibs
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
diff --git a/audio/simon/Makefile b/audio/simon/Makefile
index ef0ca644a824..7021750d0831 100644
--- a/audio/simon/Makefile
+++ b/audio/simon/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libsphinxad.so:audio/sphinxbase \
 		libqwt6.so:x11-toolkits/qwt6
 
-USE_KDE4=	kdelibs automoc4 pimlibs
-USES=		cmake:outsource gettext tar:bz2
+USES=		cmake:outsource gettext kde:4 tar:bz2
+USE_KDE=	kdelibs automoc4 pimlibs
 USE_QT4=	accessible corelib dbus gui script testlib xml \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 17f88af8b11b..a0e43102009e 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -17,10 +17,10 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 		libphonon.so:multimedia/phonon
 
 GH_ACCOUNT=	HessiJames
-USES=		cmake compiler:c++11-lang
+USES=		cmake compiler:c++11-lang kde:4
 USE_GITHUB=	yes
 USE_QT4=	corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
-USE_KDE4=	automoc4 kdelibs libkcddb
+USE_KDE=	automoc4 kdelibs libkcddb
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFAULT=	VORBIS FLAC NORMALIZE VORBISGAIN CDPARANOIA
diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index 02b20f883435..2be3924d5c4d 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -34,7 +34,8 @@ GH_ACCOUNT=	tomahawk-player
 
 TELEPATHY_LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4
 TELEPATHY_DESC=	Configure Telepathy Settings
-TELEPATHY_USE_KDE4=	kdelibs automoc4
+TELEPATHY_USES=	kde:4
+TELEPATHY_USE=	KDE=kdelibs,automoc4
 
 INSTALLS_ICONS=	yes