Give the KDE SC4 applications ports a -kde4 suffix

In order to make room for the up-to-date version of the KDE Desktop and its
applications move the KDE Application ports based on Qt4.

PR:		225992
Exp-run by:	antoine
Reviewed by:	rakuco, adridg
Differential Revision:	https://reviews.freebsd.org/D14413

MOVED

@@ -9973,3 +9973,152 @@ devel/elixir-sorted_set||2018-02-19|Has expired: No longer maintained upstream
 devel/elixir-red_black_tree||2018-02-19|Has expired: No longer maintained upstream
 emulators/wine-staging|emulators/wine-devel|2018-02-20|Broken for months, abandoned upstream
 misc/rubygem-dotenv-rails|misc/rubygem-dotenv-rails-rails4|2018-02-20|Rename to match our rubygems naming
+accessibility/kaccessible|accessibility/kaccessible-kde4|2018-02-22|Make room for KDE updates
+accessibility/kmousetool|accessibility/kmousetool-kde4|2018-02-22|Make room for KDE updates
+accessibility/jovie|accessibility/jovie-kde4|2018-02-22|Make room for KDE updates
+accessibility/kmouth|accessibility/kmouth-kde4|2018-02-22|Make room for KDE updates
+accessibility/kmag|accessibility/kmag-kde4|2018-02-22|Make room for KDE updates
+misc/klettres|misc/klettres-kde4|2018-02-22|Make room for KDE updates
+misc/kwordquiz|misc/kwordquiz-kde4|2018-02-22|Make room for KDE updates
+misc/libkdeedu|misc/libkdeedu-kde4|2018-02-22|Make room for KDE updates
+misc/kgeography|misc/kgeography-kde4|2018-02-22|Make room for KDE updates
+misc/artikulate|misc/artikulate-kde4|2018-02-22|Make room for KDE updates
+misc/parley|misc/parley-kde4|2018-02-22|Make room for KDE updates
+misc/ktouch|misc/ktouch-kde4|2018-02-22|Make room for KDE updates
+science/step|science/step-kde4|2018-02-22|Make room for KDE updates
+science/kalzium|science/kalzium-kde4|2018-02-22|Make room for KDE updates
+sysutils/kuser|sysutils/kuser-kde4|2018-02-22|Make room for KDE updates
+sysutils/kdf|sysutils/kdf-kde4|2018-02-22|Make room for KDE updates
+sysutils/sweeper|sysutils/sweeper-kde4|2018-02-22|Make room for KDE updates
+sysutils/kcron|sysutils/kcron-kde4|2018-02-22|Make room for KDE updates
+sysutils/nepomuk-widgets|sysutils/nepomuk-widgets-kde4|2018-02-22|Make room for KDE updates
+sysutils/baloo-widgets|sysutils/baloo-widgets-kde4|2018-02-22|Make room for KDE updates
+sysutils/nepomuk-core|sysutils/nepomuk-core-kde4|2018-02-22|Make room for KDE updates
+sysutils/kfloppy|sysutils/kfloppy-kde4|2018-02-22|Make room for KDE updates
+sysutils/ksystemlog|sysutils/ksystemlog-kde4|2018-02-22|Make room for KDE updates
+sysutils/baloo|sysutils/baloo-kde4|2018-02-22|Make room for KDE updates
+sysutils/kfilemetadata|sysutils/kfilemetadata-kde4|2018-02-22|Make room for KDE updates
+editors/kate|editors/kate-kde4|2018-02-22|Make room for KDE updates
+editors/kate-plugin-pate|editors/kate-plugin-pate-kde4|2018-02-22|Make room for KDE updates
+x11-clocks/kteatime|x11-clocks/kteatime-kde4|2018-02-22|Make room for KDE updates
+x11-clocks/ktux|x11-clocks/ktux-kde4|2018-02-22|Make room for KDE updates
+x11-clocks/ktimer|x11-clocks/ktimer-kde4|2018-02-22|Make room for KDE updates
+x11-clocks/amor|x11-clocks/amor-kde4|2018-02-22|Make room for KDE updates
+devel/smokeqt|devel/smokeqt-kde4|2018-02-22|Make room for KDE updates
+devel/smokegen|devel/smokegen-kde4|2018-02-22|Make room for KDE updates
+devel/umbrello|devel/umbrello-kde4|2018-02-22|Make room for KDE updates
+devel/p5-perlqt|devel/p5-perlqt-kde4|2018-02-22|Make room for KDE updates
+devel/okteta|devel/okteta-kde4|2018-02-22|Make room for KDE updates
+devel/smokekde|devel/smokekde-kde4|2018-02-22|Make room for KDE updates
+devel/ruby-qtruby|devel/ruby-qtruby-kde4|2018-02-22|Make room for KDE updates
+devel/lokalize|devel/lokalize-kde4|2018-02-22|Make room for KDE updates
+devel/kcachegrind|devel/kcachegrind-kde4|2018-02-22|Make room for KDE updates
+devel/kde-dev-scripts|devel/kde-dev-scripts-kde4|2018-02-22|Make room for KDE updates
+devel/kapptemplate|devel/kapptemplate-kde4|2018-02-22|Make room for KDE updates
+devel/p5-perlkde|devel/p5-perlkde-kde4|2018-02-22|Make room for KDE updates
+devel/cervisia|devel/cervisia-kde4|2018-02-22|Make room for KDE updates
+devel/ruby-krossruby|devel/ruby-krossruby-kde4|2018-02-22|Make room for KDE updates
+devel/py-pykde4|devel/py-pykde4-kde4|2018-02-22|Make room for KDE updates
+devel/py-krosspython|devel/py-krosspython-kde4|2018-02-22|Make room for KDE updates
+devel/py-pykdeuic4|devel/py-pykdeuic4-kde4|2018-02-22|Make room for KDE updates
+devel/kde-dev-utils|devel/kde-dev-utils-kde4|2018-02-22|Make room for KDE updates
+devel/dolphin-plugins|devel/dolphin-plugins-kde4|2018-02-22|Make room for KDE updates
+devel/poxml|devel/poxml-kde4|2018-02-22|Make room for KDE updates
+devel/ruby-korundum|devel/ruby-korundum-kde4|2018-02-22|Make room for KDE updates
+x11/konsole|x11/konsole-kde4|2018-02-22|Make room for KDE updates
+x11/kgamma|x11/kgamma-kde4|2018-02-22|Make room for KDE updates
+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/kruler|deskutils/kruler-kde4|2018-02-22|Make room for KDE updates
+deskutils/kcharselect|deskutils/kcharselect-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
+security/kwalletmanager|security/kwalletmanager-kde4|2018-02-22|Make room for KDE updates
+games/palapeli|games/palapeli-kde4|2018-02-22|Make room for KDE updates
+games/kbounce|games/kbounce-kde4|2018-02-22|Make room for KDE updates
+games/bomber|games/bomber-kde4|2018-02-22|Make room for KDE updates
+games/picmi|games/picmi-kde4|2018-02-22|Make room for KDE updates
+games/kblocks|games/kblocks-kde4|2018-02-22|Make room for KDE updates
+games/ktuberling|games/ktuberling-kde4|2018-02-22|Make room for KDE updates
+games/ksirk|games/ksirk-kde4|2018-02-22|Make room for KDE updates
+games/kshisen|games/kshisen-kde4|2018-02-22|Make room for KDE updates
+games/kblackbox|games/kblackbox-kde4|2018-02-22|Make room for KDE updates
+games/kmahjongg|games/kmahjongg-kde4|2018-02-22|Make room for KDE updates
+games/lskat|games/lskat-kde4|2018-02-22|Make room for KDE updates
+games/katomic|games/katomic-kde4|2018-02-22|Make room for KDE updates
+games/ksquares|games/ksquares-kde4|2018-02-22|Make room for KDE updates
+games/kdiamond|games/kdiamond-kde4|2018-02-22|Make room for KDE updates
+games/kiriki|games/kiriki-kde4|2018-02-22|Make room for KDE updates
+games/kjumpingcube|games/kjumpingcube-kde4|2018-02-22|Make room for KDE updates
+games/ksudoku|games/ksudoku-kde4|2018-02-22|Make room for KDE updates
+games/kapman|games/kapman-kde4|2018-02-22|Make room for KDE updates
+games/kanagram|games/kanagram-kde4|2018-02-22|Make room for KDE updates
+games/killbots|games/killbots-kde4|2018-02-22|Make room for KDE updates
+games/kollision|games/kollision-kde4|2018-02-22|Make room for KDE updates
+games/knavalbattle|games/knavalbattle-kde4|2018-02-22|Make room for KDE updates
+games/granatier|games/granatier-kde4|2018-02-22|Make room for KDE updates
+games/kbreakout|games/kbreakout-kde4|2018-02-22|Make room for KDE updates
+games/kreversi|games/kreversi-kde4|2018-02-22|Make room for KDE updates
+games/blinken|games/blinken-kde4|2018-02-22|Make room for KDE updates
+games/kubrick|games/kubrick-kde4|2018-02-22|Make room for KDE updates
+games/ksnakeduel|games/ksnakeduel-kde4|2018-02-22|Make room for KDE updates
+games/knetwalk|games/knetwalk-kde4|2018-02-22|Make room for KDE updates
+games/pairs|games/pairs-kde4|2018-02-22|Make room for KDE updates
+games/khangman|games/khangman-kde4|2018-02-22|Make room for KDE updates
+games/kajongg|games/kajongg-kde4|2018-02-22|Make room for KDE updates
+games/kmines|games/kmines-kde4|2018-02-22|Make room for KDE updates
+games/konquest|games/konquest-kde4|2018-02-22|Make room for KDE updates
+games/bovo|games/bovo-kde4|2018-02-22|Make room for KDE updates
+games/kigo|games/kigo-kde4|2018-02-22|Make room for KDE updates
+games/klickety|games/klickety-kde4|2018-02-22|Make room for KDE updates
+games/klines|games/klines-kde4|2018-02-22|Make room for KDE updates
+games/libkmahjongg|games/libkmahjongg-kde4|2018-02-22|Make room for KDE updates
+games/kspaceduel|games/kspaceduel-kde4|2018-02-22|Make room for KDE updates
+games/kpat|games/kpat-kde4|2018-02-22|Make room for KDE updates
+games/kfourinline|games/kfourinline-kde4|2018-02-22|Make room for KDE updates
+games/libkdegames|games/libkdegames-kde4|2018-02-22|Make room for KDE updates
+games/kgoldrunner|games/kgoldrunner-kde4|2018-02-22|Make room for KDE updates
+games/kolf|games/kolf-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/libkcddb|audio/libkcddb-kde4|2018-02-22|Make room for KDE updates
+audio/juk|audio/juk-kde4|2018-02-22|Make room for KDE updates
+audio/kmix|audio/kmix-kde4|2018-02-22|Make room for KDE updates
+audio/libkcompactdisc|audio/libkcompactdisc-kde4|2018-02-22|Make room for KDE updates
+audio/kscd|audio/kscd-kde4|2018-02-22|Make room for KDE updates
+lang/kturtle|lang/kturtle-kde4|2018-02-22|Make room for KDE updates
+textproc/kompare|textproc/kompare-kde4|2018-02-22|Make room for KDE updates
+textproc/libkomparediff2|textproc/libkomparediff2-kde4|2018-02-22|Make room for KDE updates
+net/zeroconf-ioslave|net/zeroconf-ioslave-kde4|2018-02-22|Make room for KDE updates
+net/krfb|net/krfb-kde4|2018-02-22|Make room for KDE updates
+net/krdc|net/krdc-kde4|2018-02-22|Make room for KDE updates
+net/kget|net/kget-kde4|2018-02-22|Make room for KDE updates
+astro/marble|astro/marble-kde4|2018-02-22|Make room for KDE updates
+astro/kstars|astro/kstars-kde4|2018-02-22|Make room for KDE updates
+japanese/kiten|japanese/kiten-kde4|2018-02-22|Make room for KDE updates
+comms/kremotecontrol|comms/kremotecontrol-kde4|2018-02-22|Make room for KDE updates
+math/cantor|math/cantor-kde4|2018-02-22|Make room for KDE updates
+math/kmplot|math/kmplot-kde4|2018-02-22|Make room for KDE updates
+math/analitza|math/analitza-kde4|2018-02-22|Make room for KDE updates
+math/kalgebra|math/kalgebra-kde4|2018-02-22|Make room for KDE updates
+math/kbruch|math/kbruch-kde4|2018-02-22|Make room for KDE updates
+math/kig|math/kig-kde4|2018-02-22|Make room for KDE updates
+math/kcalc|math/kcalc-kde4|2018-02-22|Make room for KDE updates
+math/rocs|math/rocs-kde4|2018-02-22|Make room for KDE updates
+graphics/kolourpaint|graphics/kolourpaint-kde4|2018-02-22|Make room for KDE updates
+graphics/ksnapshot|graphics/ksnapshot-kde4|2018-02-22|Make room for KDE updates
+graphics/okular|graphics/okular-kde4|2018-02-22|Make room for KDE updates
+graphics/libksane|graphics/libksane-kde4|2018-02-22|Make room for KDE updates
+graphics/ksaneplugin|graphics/ksaneplugin-kde4|2018-02-22|Make room for KDE updates
+graphics/kcolorchooser|graphics/kcolorchooser-kde4|2018-02-22|Make room for KDE updates
+graphics/kqtquickcharts|graphics/kqtquickcharts-kde4|2018-02-22|Make room for KDE updates
+archivers/ark|archivers/ark-kde4|2018-02-22|Make room for KDE updates
+x11/kde4-baseapps|x11/kde-baseapps-kde4|2018-02-22|Make room for KDE updates
+x11/kde4-runtime|x11/kde-runtime-kde4|2018-02-22|Make room for KDE updates
+x11/kde4-workspace|x11/kde-workspace-kde4|2018-02-22|Make room for KDE updates
+print/kde4-print-manager|print/print-manager-kde4|2018-02-22|Make room for KDE updates
+x11-themes/kde4-base-artwork|x11-themes/kde-base-artwork-kde4|2018-02-22|Make room for KDE updates
+x11-themes/kde4-wallpapers|x11-themes/kde-wallpapers-kde4|2018-02-22|Make room for KDE updates
+x11-themes/kde4-wallpapers-freebsd|x11-themes/wallpapers-freebsd-kde4|2018-02-22|Make room for KDE updates
+sysutils/ksysguardd|sysutils/ksysguardd-kde4|2018-02-22|Make room for KDE updates
+x11/plasma-scriptengine-ruby|x11/plasma-scriptengine-ruby-kde4|2018-02-22|Make room for KDE updates
+x11/plasma-scriptengine-python|x11/plasma-scriptengine-python-kde4|2018-02-22|Make room for KDE updates

Mk/Uses/kde.mk

@@ -117,6 +117,8 @@ CPE_VENDOR?=		kde
 PORTVERSION?=		${KDE4_VERSION}
 MASTER_SITES?=		KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
 DIST_SUBDIR?=		KDE/${KDE4_VERSION}
+PKGNAMESUFFIX=		-kde4
+CONFLICTS_INSTALL=	${PORTNAME:C/-kde4//}-4.*
 .    elif  ${_KDE_CATEGORY:Mkde-applications}
 PORTVERSION?=           ${KDE_APPLICATIONS_VERSION}
 .      if ${_KDE_VERSION:M4}
@@ -251,45 +253,45 @@ _USE_FRAMEWORKS_ALL=	ecm \
 _USE_KDE5_ALL=		${_USE_FRAMEWORKS_ALL}
 
 # ====================== kde4 components =======================================
-baloo_PORT=		sysutils/baloo
+baloo_PORT=		sysutils/baloo-kde4
 baloo_LIB=		libbaloocore.so
 
-baloo-widgets_PORT=	sysutils/baloo-widgets
+baloo-widgets_PORT=	sysutils/baloo-widgets-kde4
 baloo-widgets_LIB=	libbaloowidgets.so
 
-baseapps_PORT=		x11/kde4-baseapps
+baseapps_PORT=		x11/kde-baseapps-kde4
 baseapps_PATH=		${KDE_PREFIX}/bin/kfmclient
 baseapps_TYPE=		run
 
 kactivities_PORT=	x11/kactivities
 kactivities_LIB=	libkactivities.so
 
-kate_PORT=		editors/kate
+kate_PORT=		editors/kate-kde4
 kate_LIB=		libkateinterfaces.so
 
 kdelibs_PORT=		x11/kdelibs-kde4
 kdelibs_LIB=		libkdecore.so
 
-kfilemetadata_PORT=	sysutils/kfilemetadata
+kfilemetadata_PORT=	sysutils/kfilemetadata-kde4
 kfilemetadata_LIB=	libkfilemetadata.so
 
-korundum_PORT=		devel/ruby-korundum
+korundum_PORT=		devel/ruby-korundum-kde4
 korundum_PATH=		${KDE_PREFIX}/lib/kde4/krubypluginfactory.so
 korundum_TYPE=		run
 
-libkcddb_PORT=		audio/libkcddb
+libkcddb_PORT=		audio/libkcddb-kde4
 libkcddb_LIB=		libkcddb.so
 
-libkcompactdisc_PORT=	audio/libkcompactdisc
+libkcompactdisc_PORT=	audio/libkcompactdisc-kde4
 libkcompactdisc_LIB=	libkcompactdisc.so
 
 libkdcraw_PORT=		graphics/libkdcraw-kde4
 libkdcraw_LIB=		libkdcraw.so
 
-libkdeedu_PORT=		misc/libkdeedu
+libkdeedu_PORT=		misc/libkdeedu-kde4
 libkdeedu_LIB=		libkeduvocdocument.so
 
-libkdegames_PORT=	games/libkdegames
+libkdegames_PORT=	games/libkdegames-kde4
 libkdegames_LIB=	libkdegames.so
 
 libkexiv2_PORT=		graphics/libkexiv2-kde4
@@ -298,59 +300,59 @@ libkexiv2_LIB=		libkexiv2.so
 libkipi_PORT=		graphics/libkipi-kde4
 libkipi_LIB=		libkipi.so
 
-libkonq_PORT=		x11/libkonq
+libkonq_PORT=		x11/libkonq-kde4
 libkonq_LIB=		libkonq.so
 
-libksane_PORT=		graphics/libksane
+libksane_PORT=		graphics/libksane-kde4
 libksane_LIB=		libksane.so
 
-marble_PORT=		astro/marble
+marble_PORT=		astro/marble-kde4
 marble_LIB=		libmarblewidget.so
 
-nepomuk-core_PORT=	sysutils/nepomuk-core
+nepomuk-core_PORT=	sysutils/nepomuk-core-kde4
 nepomuk-core_LIB=	libnepomukcore.so
 
-nepomuk-widgets_PORT=	sysutils/nepomuk-widgets
+nepomuk-widgets_PORT=	sysutils/nepomuk-widgets-kde4
 nepomuk-widgets_LIB=	libnepomukwidgets.so
 
-okular_PORT=		graphics/okular
+okular_PORT=		graphics/okular-kde4
 okular_LIB=		libokularcore.so
 
-perlkde_PORT=		devel/p5-perlkde
+perlkde_PORT=		devel/p5-perlkde-kde4
 perlkde_PATH=		${KDE_PREFIX}/lib/kde4/kperlpluginfactory.so
 perlkde_TYPE=		run
 
-perlqt_PORT=		devel/p5-perlqt
+perlqt_PORT=		devel/p5-perlqt-kde4
 perlqt_PATH=		${KDE_PREFIX}/bin/puic4
 
 pimlibs_PORT=		deskutils/kdepimlibs-kde4
 pimlibs_LIB=		libkpimutils.so
 
-pykde4_PORT=		devel/py-pykde4
+pykde4_PORT=		devel/py-pykde4-kde4
 pykde4_PATH=		${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so
 pykde4_TYPE=		run
 
-pykdeuic4_PORT=		devel/py-pykdeuic4
+pykdeuic4_PORT=		devel/py-pykdeuic4-kde4
 pykdeuic4_PATH=		${LOCALBASE}/bin/pykdeuic4
 pykdeuic4_TYPE=		run
 
-qtruby_PORT=		devel/ruby-qtruby
+qtruby_PORT=		devel/ruby-qtruby-kde4
 qtruby_LIB=		libqtruby4shared.so
 
-runtime_PORT=		x11/kde4-runtime
+runtime_PORT=		x11/kde-runtime-kde4
 runtime_PATH=		${KDE_PREFIX}/bin/knotify4
 runtime_TYPE=		run
 
-smokegen_PORT=		devel/smokegen
+smokegen_PORT=		devel/smokegen-kde4
 smokegen_LIB=		libsmokebase.so
 
-smokekde_PORT=		devel/smokekde
+smokekde_PORT=		devel/smokekde-kde4
 smokekde_LIB=		libsmokekdecore.so
 
-smokeqt_PORT=		devel/smokeqt
+smokeqt_PORT=		devel/smokeqt-kde4
 smokeqt_LIB=		libsmokeqtcore.so
 
-workspace_PORT=		x11/kde4-workspace
+workspace_PORT=		x11/kde-workspace-kde4
 workspace_LIB=		libkworkspace.so
 
 # Non-Software Compilation components

accessibility/Makefile

@@ -11,12 +11,12 @@
     SUBDIR += atkmm
     SUBDIR += caribou
     SUBDIR += eflite
-    SUBDIR += jovie
-    SUBDIR += kaccessible
+    SUBDIR += jovie-kde4
+    SUBDIR += kaccessible-kde4
     SUBDIR += kdeaccessibility-kde4
-    SUBDIR += kmag
-    SUBDIR += kmousetool
-    SUBDIR += kmouth
+    SUBDIR += kmag-kde4
+    SUBDIR += kmousetool-kde4
+    SUBDIR += kmouth-kde4
     SUBDIR += linux-c6-atk
     SUBDIR += linux-c7-atk
     SUBDIR += mousetweaks

accessibility/jovie-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	jovie
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

accessibility/kaccessible-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kaccessible
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

accessibility/kdeaccessibility-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde
 PKGNAMESUFFIX=	-kde4
 
@@ -16,18 +16,18 @@ OPTIONS_DEFINE=	JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH
 OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
 
 JOVIE_DESC=		Install Jovie text-to-speech system
-JOVIE_RUN_DEPENDS=	${KDE_PREFIX}/bin/jovie:accessibility/jovie
+JOVIE_RUN_DEPENDS=	${KDE_PREFIX}/bin/jovie:accessibility/jovie-kde4
 
 KACCESSIBLE_DESC=	Install Accessibility services for KDE
-KACCESSIBLE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible
+KACCESSIBLE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible-kde4
 
 KMAG_DESC=		Install Screen magnifier
-KMAG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmag:accessibility/kmag
+KMAG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmag:accessibility/kmag-kde4
 
 KMOUSETOOL_DESC=	Install Automatic mouse click tool
-KMOUSETOOL_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmousetool:accessibility/kmousetool
+KMOUSETOOL_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmousetool:accessibility/kmousetool-kde4
 
 KMOUTH_DESC=		Install Speech synthesizer frontend
-KMOUTH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmouth:accessibility/kmouth
+KMOUTH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmouth:accessibility/kmouth-kde4
 
 .include <bsd.port.mk>

accessibility/kmag-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kmag
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

accessibility/kmousetool-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kmousetool
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

accessibility/kmouth-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kmouth
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

archivers/Makefile

@@ -8,7 +8,7 @@
     SUBDIR += amigadepacker
     SUBDIR += arc
     SUBDIR += arj
-    SUBDIR += ark
+    SUBDIR += ark-kde4
     SUBDIR += atool
     SUBDIR += bicom
     SUBDIR += brotli

archivers/ark-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	ark
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

astro/Makefile

@@ -29,14 +29,14 @@
     SUBDIR += gpxloggerd
     SUBDIR += jday
     SUBDIR += josm
-    SUBDIR += kstars
+    SUBDIR += kstars-kde4
     SUBDIR += libgal
     SUBDIR += libkgeomap
     SUBDIR += libnova
     SUBDIR += libosmium
     SUBDIR += libosmpbf
     SUBDIR += luna
-    SUBDIR += marble
+    SUBDIR += marble-kde4
     SUBDIR += match
     SUBDIR += merkaartor
     SUBDIR += mkgmap

astro/kstars-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kstars
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

astro/marble-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

audio/Makefile

@@ -354,7 +354,7 @@
     SUBDIR += jid3lib
     SUBDIR += jmusic
     SUBDIR += jokosher
-    SUBDIR += juk
+    SUBDIR += juk-kde4
     SUBDIR += juke
     SUBDIR += julius
     SUBDIR += jxm
@@ -363,9 +363,9 @@
     SUBDIR += kid3-kde4
     SUBDIR += kid3-qt4
     SUBDIR += kid3-qt5
-    SUBDIR += kio-audiocd
-    SUBDIR += kmix
-    SUBDIR += kscd
+    SUBDIR += kio-audiocd-kde4
+    SUBDIR += kmix-kde4
+    SUBDIR += kscd-kde4
     SUBDIR += ksmp3play
     SUBDIR += kstreamripper
     SUBDIR += ladspa
@@ -402,8 +402,8 @@
     SUBDIR += libgpod-sharp
     SUBDIR += libgroove
     SUBDIR += libid3tag
-    SUBDIR += libkcddb
-    SUBDIR += libkcompactdisc
+    SUBDIR += libkcddb-kde4
+    SUBDIR += libkcompactdisc-kde4
     SUBDIR += liblastfm
     SUBDIR += liblo
     SUBDIR += liblscp

audio/juk-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	juk
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

audio/kio-audiocd-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kio-audiocd
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde kde-kde4
 DISTNAME=	audiocd-kio-${PORTVERSION}
 

audio/kmix-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	kmix
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

audio/kscd-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	kscd
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

audio/libkcddb-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	libkcddb
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

audio/libkcompactdisc-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	libkcompactdisc
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

cad/astk-serveur/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	astk
 DISTVERSION=	1.13.10-1
+PORTREVISION=	1
 CATEGORIES=	cad
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
@@ -142,7 +143,7 @@ WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/kwrite)
 WITH_ED=	kwrite
-RUN_DEPENDS+=	${LOCALBASE}/bin/kwrite:editors/kate
+RUN_DEPENDS+=	${LOCALBASE}/bin/kwrite:editors/kate-kde4
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit

comms/Makefile

@@ -78,7 +78,7 @@
     SUBDIR += kb
     SUBDIR += kermit
     SUBDIR += klog
-    SUBDIR += kremotecontrol
+    SUBDIR += kremotecontrol-kde4
     SUBDIR += kvasd
     SUBDIR += libconcord
     SUBDIR += libfap

comms/kremotecontrol-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kremotecontrol
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

deskutils/Makefile

@@ -121,14 +121,14 @@
     SUBDIR += ithought
     SUBDIR += jjclient
     SUBDIR += jlj
-    SUBDIR += kcharselect
+    SUBDIR += kcharselect-kde4
     SUBDIR += kchmviewer
     SUBDIR += kdeconnect
     SUBDIR += kdepim-kde4
     SUBDIR += kdepim-runtime-kde4
     SUBDIR += kdepimlibs-kde4
-    SUBDIR += kdeplasma-addons
-    SUBDIR += kruler
+    SUBDIR += kdeplasma-addons-kde4
+    SUBDIR += kruler-kde4
     SUBDIR += ksshaskpass
     SUBDIR += latte-dock
     SUBDIR += launchy
@@ -233,7 +233,7 @@
     SUBDIR += strigidaemon
     SUBDIR += strigiutils
     SUBDIR += sugarcrm
-    SUBDIR += superkaramba
+    SUBDIR += superkaramba-kde4
     SUBDIR += surrealtodo
     SUBDIR += syncthing-gtk
     SUBDIR += systempreferences

deskutils/kcharselect-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	kcharselect
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

deskutils/kdeplasma-addons-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

deskutils/kruler-kde4/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	kruler
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

deskutils/silence/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	silence
 PORTVERSION=	0.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://kde-apps.org/CONTENT/content-files/
 DISTNAME=	124776-${PORTNAME}-${PORTVERSION}
@@ -14,7 +14,7 @@ COMMENT=	Information management tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
+RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate-kde4
 
 USES=		cmake kde:4
 USE_KDE=	kdelibs automoc4

devel/Makefile

@@ -270,7 +270,7 @@
     SUBDIR += cdecl
     SUBDIR += cdialog
     SUBDIR += cdk
-    SUBDIR += cervisia
+    SUBDIR += cervisia-kde4
     SUBDIR += cflow
     SUBDIR += cflow2vcg
     SUBDIR += cgdb
@@ -456,7 +456,7 @@
     SUBDIR += dmalloc
     SUBDIR += dmucs
     SUBDIR += doctorj
-    SUBDIR += dolphin-plugins
+    SUBDIR += dolphin-plugins-kde4
     SUBDIR += dotconf
     SUBDIR += dotconf++
     SUBDIR += doxygen
@@ -1243,12 +1243,12 @@
     SUBDIR += jwasm
     SUBDIR += k8048
     SUBDIR += kBuild
-    SUBDIR += kapptemplate
+    SUBDIR += kapptemplate-kde4
     SUBDIR += kaptain
-    SUBDIR += kcachegrind
+    SUBDIR += kcachegrind-kde4
     SUBDIR += kdbg
-    SUBDIR += kde-dev-scripts
-    SUBDIR += kde-dev-utils
+    SUBDIR += kde-dev-scripts-kde4
+    SUBDIR += kde-dev-utils-kde4
     SUBDIR += kdebindings-kde4
     SUBDIR += kdesdk-kde4
     SUBDIR += kdesdk-kioslaves-kde4
@@ -1652,7 +1652,7 @@
     SUBDIR += log4net
     SUBDIR += log4sh
     SUBDIR += log4shib
-    SUBDIR += lokalize
+    SUBDIR += lokalize-kde4
     SUBDIR += loki
     SUBDIR += looks
     SUBDIR += love
@@ -1820,7 +1820,7 @@
     SUBDIR += oclgrind
     SUBDIR += ode
     SUBDIR += ois
-    SUBDIR += okteta
+    SUBDIR += okteta-kde4
     SUBDIR += omake
     SUBDIR += omniNotify
     SUBDIR += omniORB
@@ -3752,8 +3752,8 @@
     SUBDIR += p5-namespace-sweep
     SUBDIR += p5-orz
     SUBDIR += p5-parent
-    SUBDIR += p5-perlkde
-    SUBDIR += p5-perlqt
+    SUBDIR += p5-perlkde-kde4
+    SUBDIR += p5-perlqt-kde4
     SUBDIR += p5-pip
     SUBDIR += p5-prefork
     SUBDIR += p5-reaper
@@ -4108,7 +4108,7 @@
     SUBDIR += powerpc64-binutils
     SUBDIR += powerpc64-gcc
     SUBDIR += powerpc64-xtoolchain-gcc
-    SUBDIR += poxml
+    SUBDIR += poxml-kde4
     SUBDIR += ppl
     SUBDIR += pragmarcs
     SUBDIR += premake
@@ -4564,7 +4564,7 @@
     SUBDIR += py-kitchen
     SUBDIR += py-kjbuckets
     SUBDIR += py-kqueue
-    SUBDIR += py-krosspython
+    SUBDIR += py-krosspython-kde4
     SUBDIR += py-lazr.config
     SUBDIR += py-lazr.delegates
     SUBDIR += py-lazy
@@ -4753,8 +4753,8 @@
     SUBDIR += py-pyicu
     SUBDIR += py-pyinotify
     SUBDIR += py-pyinstaller
-    SUBDIR += py-pykde4
-    SUBDIR += py-pykdeuic4
+    SUBDIR += py-pykde4-kde4
+    SUBDIR += py-pykdeuic4-kde4
     SUBDIR += py-pyke
     SUBDIR += py-pylru
     SUBDIR += py-pylru-cache
@@ -5247,10 +5247,10 @@
     SUBDIR += ruby-bsearch
     SUBDIR += ruby-build
     SUBDIR += ruby-gems
-    SUBDIR += ruby-korundum
-    SUBDIR += ruby-krossruby
+    SUBDIR += ruby-korundum-kde4
+    SUBDIR += ruby-krossruby-kde4
     SUBDIR += ruby-ncurses
-    SUBDIR += ruby-qtruby
+    SUBDIR += ruby-qtruby-kde4
     SUBDIR += ruby-rbprof
     SUBDIR += ruby-sdl
     SUBDIR += ruby-setup.rb
@@ -5923,9 +5923,9 @@
     SUBDIR += smack
     SUBDIR += smake
     SUBDIR += smc
-    SUBDIR += smokegen
-    SUBDIR += smokekde
-    SUBDIR += smokeqt
+    SUBDIR += smokegen-kde4
+    SUBDIR += smokekde-kde4
+    SUBDIR += smokeqt-kde4
     SUBDIR += smv
     SUBDIR += soapui
     SUBDIR += sonar-ant-task
@@ -6043,7 +6043,7 @@
     SUBDIR += ucpp
     SUBDIR += udis86
     SUBDIR += ultragetopt
-    SUBDIR += umbrello
+    SUBDIR += umbrello-kde4
     SUBDIR += umem
     SUBDIR += umlgraph
     SUBDIR += unibilium