728 files changed, 596 insertions, 439 deletions

diff --git a/MOVED b/MOVED
index 1d00bca9950e..3a27c46ef4b3 100644
--- a/MOVED
+++ b/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
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 53f5b06a557a..f9df3f3406b4 100644
--- a/Mk/Uses/kde.mk
+++ b/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
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 377c7b00d4d8..4bb174d71695 100644
--- a/accessibility/Makefile
+++ b/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
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie-kde4/Makefile
index 6039eaa336d8..a8e1429ccd3a 100644
--- a/accessibility/jovie/Makefile
+++ b/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
diff --git a/accessibility/jovie/distinfo b/accessibility/jovie-kde4/distinfo
index d2e1fcdd04bc..d2e1fcdd04bc 100644
--- a/accessibility/jovie/distinfo
+++ b/accessibility/jovie-kde4/distinfo
diff --git a/accessibility/jovie/pkg-descr b/accessibility/jovie-kde4/pkg-descr
index 4b4cac86d498..4b4cac86d498 100644
--- a/accessibility/jovie/pkg-descr
+++ b/accessibility/jovie-kde4/pkg-descr
diff --git a/accessibility/jovie/pkg-message b/accessibility/jovie-kde4/pkg-message
index f3d5cdc35c73..f3d5cdc35c73 100644
--- a/accessibility/jovie/pkg-message
+++ b/accessibility/jovie-kde4/pkg-message
diff --git a/accessibility/jovie/pkg-plist b/accessibility/jovie-kde4/pkg-plist
index 9fd68428d9f1..9fd68428d9f1 100644
--- a/accessibility/jovie/pkg-plist
+++ b/accessibility/jovie-kde4/pkg-plist
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible-kde4/Makefile
index 53e90eb6c1c2..197c6f0a9975 100644
--- a/accessibility/kaccessible/Makefile
+++ b/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
diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible-kde4/distinfo
index 922b76652db0..922b76652db0 100644
--- a/accessibility/kaccessible/distinfo
+++ b/accessibility/kaccessible-kde4/distinfo
diff --git a/accessibility/kaccessible/pkg-descr b/accessibility/kaccessible-kde4/pkg-descr
index c96c59ff12d2..c96c59ff12d2 100644
--- a/accessibility/kaccessible/pkg-descr
+++ b/accessibility/kaccessible-kde4/pkg-descr
diff --git a/accessibility/kaccessible/pkg-plist b/accessibility/kaccessible-kde4/pkg-plist
index 61df1bd78686..61df1bd78686 100644
--- a/accessibility/kaccessible/pkg-plist
+++ b/accessibility/kaccessible-kde4/pkg-plist
diff --git a/accessibility/kdeaccessibility-kde4/Makefile b/accessibility/kdeaccessibility-kde4/Makefile
index a6564c00e69a..3ee20b565944 100644
--- a/accessibility/kdeaccessibility-kde4/Makefile
+++ b/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>
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag-kde4/Makefile
index 8b324d589b03..a2ac4ba42ac1 100644
--- a/accessibility/kmag/Makefile
+++ b/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
diff --git a/accessibility/kmag/distinfo b/accessibility/kmag-kde4/distinfo
index 08073e223475..08073e223475 100644
--- a/accessibility/kmag/distinfo
+++ b/accessibility/kmag-kde4/distinfo
diff --git a/accessibility/kmag/pkg-descr b/accessibility/kmag-kde4/pkg-descr
index bdfcd347a87d..bdfcd347a87d 100644
--- a/accessibility/kmag/pkg-descr
+++ b/accessibility/kmag-kde4/pkg-descr
diff --git a/accessibility/kmag/pkg-plist b/accessibility/kmag-kde4/pkg-plist
index ed0b4f6a4e72..ed0b4f6a4e72 100644
--- a/accessibility/kmag/pkg-plist
+++ b/accessibility/kmag-kde4/pkg-plist
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool-kde4/Makefile
index ccf31c8ec037..640ddd6ace93 100644
--- a/accessibility/kmousetool/Makefile
+++ b/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
diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool-kde4/distinfo
index bf7fba8bdc1b..bf7fba8bdc1b 100644
--- a/accessibility/kmousetool/distinfo
+++ b/accessibility/kmousetool-kde4/distinfo
diff --git a/accessibility/kmousetool/pkg-descr b/accessibility/kmousetool-kde4/pkg-descr
index 0804ca75c38e..0804ca75c38e 100644
--- a/accessibility/kmousetool/pkg-descr
+++ b/accessibility/kmousetool-kde4/pkg-descr
diff --git a/accessibility/kmousetool/pkg-plist b/accessibility/kmousetool-kde4/pkg-plist
index c25ccca14f2b..c25ccca14f2b 100644
--- a/accessibility/kmousetool/pkg-plist
+++ b/accessibility/kmousetool-kde4/pkg-plist
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth-kde4/Makefile
index 007649704363..74bfb286be43 100644
--- a/accessibility/kmouth/Makefile
+++ b/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
diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth-kde4/distinfo
index 717cfdca854b..717cfdca854b 100644
--- a/accessibility/kmouth/distinfo
+++ b/accessibility/kmouth-kde4/distinfo
diff --git a/accessibility/kmouth/pkg-descr b/accessibility/kmouth-kde4/pkg-descr
index 3e23878fe2ea..3e23878fe2ea 100644
--- a/accessibility/kmouth/pkg-descr
+++ b/accessibility/kmouth-kde4/pkg-descr
diff --git a/accessibility/kmouth/pkg-plist b/accessibility/kmouth-kde4/pkg-plist
index d32880306ef0..d32880306ef0 100644
--- a/accessibility/kmouth/pkg-plist
+++ b/accessibility/kmouth-kde4/pkg-plist
diff --git a/archivers/Makefile b/archivers/Makefile
index 24f1222dad5e..b1c48ed323d8 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -8,7 +8,7 @@
     SUBDIR += amigadepacker
     SUBDIR += arc
     SUBDIR += arj
-    SUBDIR += ark
+    SUBDIR += ark-kde4
     SUBDIR += atool
     SUBDIR += bicom
     SUBDIR += brotli
diff --git a/archivers/ark/Makefile b/archivers/ark-kde4/Makefile
index 17a006e2cb4f..4ceaebbd256e 100644
--- a/archivers/ark/Makefile
+++ b/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
diff --git a/archivers/ark/distinfo b/archivers/ark-kde4/distinfo
index 3d60ee0469f2..3d60ee0469f2 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark-kde4/distinfo
diff --git a/archivers/ark/files/patch-git_cd8ad27 b/archivers/ark-kde4/files/patch-git_cd8ad27
index 058d208c0c68..058d208c0c68 100644
--- a/archivers/ark/files/patch-git_cd8ad27
+++ b/archivers/ark-kde4/files/patch-git_cd8ad27
diff --git a/archivers/ark/pkg-descr b/archivers/ark-kde4/pkg-descr
index dfdfed20b0d5..dfdfed20b0d5 100644
--- a/archivers/ark/pkg-descr
+++ b/archivers/ark-kde4/pkg-descr
diff --git a/archivers/ark/pkg-plist b/archivers/ark-kde4/pkg-plist
index b80e5edb27c8..b80e5edb27c8 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark-kde4/pkg-plist
diff --git a/astro/Makefile b/astro/Makefile
index 2574cd030414..24205a5b8d3c 100644
--- a/astro/Makefile
+++ b/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
diff --git a/astro/kstars/Makefile b/astro/kstars-kde4/Makefile
index eba716c1b5fa..dff52740f7da 100644
--- a/astro/kstars/Makefile
+++ b/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
diff --git a/astro/kstars/distinfo b/astro/kstars-kde4/distinfo
index 233c82d47024..233c82d47024 100644
--- a/astro/kstars/distinfo
+++ b/astro/kstars-kde4/distinfo
diff --git a/astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp b/astro/kstars-kde4/files/patch-kstars_skyobjects_kscomet.cpp
index 85037a9c3a6e..85037a9c3a6e 100644
--- a/astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp
+++ b/astro/kstars-kde4/files/patch-kstars_skyobjects_kscomet.cpp
diff --git a/astro/kstars/pkg-descr b/astro/kstars-kde4/pkg-descr
index 0e4116d41f71..0e4116d41f71 100644
--- a/astro/kstars/pkg-descr
+++ b/astro/kstars-kde4/pkg-descr
diff --git a/astro/kstars/pkg-plist b/astro/kstars-kde4/pkg-plist
index 6a5fbbdfe45e..6a5fbbdfe45e 100644
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars-kde4/pkg-plist
diff --git a/astro/marble/Makefile b/astro/marble-kde4/Makefile
index a1d54262a44b..60eb4b67314d 100644
--- a/astro/marble/Makefile
+++ b/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
diff --git a/astro/marble/distinfo b/astro/marble-kde4/distinfo
index 2008b9abb49e..2008b9abb49e 100644
--- a/astro/marble/distinfo
+++ b/astro/marble-kde4/distinfo
diff --git a/astro/marble/files/patch-git_486f618 b/astro/marble-kde4/files/patch-git_486f618
index e8b55fb88f61..e8b55fb88f61 100644
--- a/astro/marble/files/patch-git_486f618
+++ b/astro/marble-kde4/files/patch-git_486f618
diff --git a/astro/marble/pkg-descr b/astro/marble-kde4/pkg-descr
index 560456bce97f..560456bce97f 100644
--- a/astro/marble/pkg-descr
+++ b/astro/marble-kde4/pkg-descr
diff --git a/astro/marble/pkg-plist b/astro/marble-kde4/pkg-plist
index 7d6f34a6f789..7d6f34a6f789 100644
--- a/astro/marble/pkg-plist
+++ b/astro/marble-kde4/pkg-plist
diff --git a/audio/Makefile b/audio/Makefile
index 42de39b42bd8..9757089d01ec 100644
--- a/audio/Makefile
+++ b/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
diff --git a/audio/juk/Makefile b/audio/juk-kde4/Makefile
index 5c37364bb904..f25adbc1b12f 100644
--- a/audio/juk/Makefile
+++ b/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
diff --git a/audio/juk/distinfo b/audio/juk-kde4/distinfo
index be4afc57cef7..be4afc57cef7 100644
--- a/audio/juk/distinfo
+++ b/audio/juk-kde4/distinfo
diff --git a/audio/juk/pkg-descr b/audio/juk-kde4/pkg-descr
index 03450cabee7b..03450cabee7b 100644
--- a/audio/juk/pkg-descr
+++ b/audio/juk-kde4/pkg-descr
diff --git a/audio/juk/pkg-plist b/audio/juk-kde4/pkg-plist
index b9e899cdfae7..b9e899cdfae7 100644
--- a/audio/juk/pkg-plist
+++ b/audio/juk-kde4/pkg-plist
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd-kde4/Makefile
index 85a2f5d93be7..eef218563d19 100644
--- a/audio/kio-audiocd/Makefile
+++ b/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}
 
diff --git a/audio/kio-audiocd/distinfo b/audio/kio-audiocd-kde4/distinfo
index e35f9a34c20c..e35f9a34c20c 100644
--- a/audio/kio-audiocd/distinfo
+++ b/audio/kio-audiocd-kde4/distinfo
diff --git a/audio/kio-audiocd/files/patch-audiocd.cpp b/audio/kio-audiocd-kde4/files/patch-audiocd.cpp
index 7940aadd67c5..7940aadd67c5 100644
--- a/audio/kio-audiocd/files/patch-audiocd.cpp
+++ b/audio/kio-audiocd-kde4/files/patch-audiocd.cpp
diff --git a/audio/kio-audiocd/pkg-descr b/audio/kio-audiocd-kde4/pkg-descr
index b05915ce46de..b05915ce46de 100644
--- a/audio/kio-audiocd/pkg-descr
+++ b/audio/kio-audiocd-kde4/pkg-descr
diff --git a/audio/kio-audiocd/pkg-plist b/audio/kio-audiocd-kde4/pkg-plist
index 286ab08ab286..286ab08ab286 100644
--- a/audio/kio-audiocd/pkg-plist
+++ b/audio/kio-audiocd-kde4/pkg-plist
diff --git a/audio/kmix/Makefile b/audio/kmix-kde4/Makefile
index 2d700ba87c3b..0f760578415e 100644
--- a/audio/kmix/Makefile
+++ b/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
diff --git a/audio/kmix/distinfo b/audio/kmix-kde4/distinfo
index 89c030d00364..89c030d00364 100644
--- a/audio/kmix/distinfo
+++ b/audio/kmix-kde4/distinfo
diff --git a/audio/kmix/files/extrapatch-no_alsa b/audio/kmix-kde4/files/extrapatch-no_alsa
index 46157620bddf..46157620bddf 100644
--- a/audio/kmix/files/extrapatch-no_alsa
+++ b/audio/kmix-kde4/files/extrapatch-no_alsa
diff --git a/audio/kmix/files/patch-backends_mixer__oss.cpp b/audio/kmix-kde4/files/patch-backends_mixer__oss.cpp
index 1c46111d64e5..1c46111d64e5 100644
--- a/audio/kmix/files/patch-backends_mixer__oss.cpp
+++ b/audio/kmix-kde4/files/patch-backends_mixer__oss.cpp
diff --git a/audio/kmix/pkg-descr b/audio/kmix-kde4/pkg-descr
index 4c4b06f0fae2..4c4b06f0fae2 100644
--- a/audio/kmix/pkg-descr
+++ b/audio/kmix-kde4/pkg-descr
diff --git a/audio/kmix/pkg-plist b/audio/kmix-kde4/pkg-plist
index c00f8d98902c..c00f8d98902c 100644
--- a/audio/kmix/pkg-plist
+++ b/audio/kmix-kde4/pkg-plist
diff --git a/audio/kscd/Makefile b/audio/kscd-kde4/Makefile
index 3fdffa9adb6c..8a963896a41c 100644
--- a/audio/kscd/Makefile
+++ b/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
diff --git a/audio/kscd/distinfo b/audio/kscd-kde4/distinfo
index 2666c29b1f84..2666c29b1f84 100644
--- a/audio/kscd/distinfo
+++ b/audio/kscd-kde4/distinfo
diff --git a/audio/kscd/files/extrapatch-no_alsa b/audio/kscd-kde4/files/extrapatch-no_alsa
index babc3c26609a..babc3c26609a 100644
--- a/audio/kscd/files/extrapatch-no_alsa
+++ b/audio/kscd-kde4/files/extrapatch-no_alsa
diff --git a/audio/kscd/pkg-descr b/audio/kscd-kde4/pkg-descr
index 4595a2284b18..4595a2284b18 100644
--- a/audio/kscd/pkg-descr
+++ b/audio/kscd-kde4/pkg-descr
diff --git a/audio/kscd/pkg-plist b/audio/kscd-kde4/pkg-plist
index e9d015347254..e9d015347254 100644
--- a/audio/kscd/pkg-plist
+++ b/audio/kscd-kde4/pkg-plist
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb-kde4/Makefile
index 70e8bc0f2ae7..8426afb53ff5 100644
--- a/audio/libkcddb/Makefile
+++ b/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
diff --git a/audio/libkcddb/distinfo b/audio/libkcddb-kde4/distinfo
index eb9550c1afe7..eb9550c1afe7 100644
--- a/audio/libkcddb/distinfo
+++ b/audio/libkcddb-kde4/distinfo
diff --git a/audio/libkcddb/pkg-descr b/audio/libkcddb-kde4/pkg-descr
index c56ccdf3dbc0..c56ccdf3dbc0 100644
--- a/audio/libkcddb/pkg-descr
+++ b/audio/libkcddb-kde4/pkg-descr
diff --git a/audio/libkcddb/pkg-plist b/audio/libkcddb-kde4/pkg-plist
index c3189bffbfde..c3189bffbfde 100644
--- a/audio/libkcddb/pkg-plist
+++ b/audio/libkcddb-kde4/pkg-plist
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc-kde4/Makefile
index f9537958299b..6b772a071717 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/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
diff --git a/audio/libkcompactdisc/distinfo b/audio/libkcompactdisc-kde4/distinfo
index 59a079399f6a..59a079399f6a 100644
--- a/audio/libkcompactdisc/distinfo
+++ b/audio/libkcompactdisc-kde4/distinfo
diff --git a/audio/libkcompactdisc/files/patch-git_d6927712 b/audio/libkcompactdisc-kde4/files/patch-git_d6927712
index e906498dca88..e906498dca88 100644
--- a/audio/libkcompactdisc/files/patch-git_d6927712
+++ b/audio/libkcompactdisc-kde4/files/patch-git_d6927712
diff --git a/audio/libkcompactdisc/pkg-descr b/audio/libkcompactdisc-kde4/pkg-descr
index 6769b8f61ed4..6769b8f61ed4 100644
--- a/audio/libkcompactdisc/pkg-descr
+++ b/audio/libkcompactdisc-kde4/pkg-descr
diff --git a/audio/libkcompactdisc/pkg-plist b/audio/libkcompactdisc-kde4/pkg-plist
index 855591f34bdf..855591f34bdf 100644
--- a/audio/libkcompactdisc/pkg-plist
+++ b/audio/libkcompactdisc-kde4/pkg-plist
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 4dc36189de66..136461419616 100644
--- a/cad/astk-serveur/Makefile
+++ b/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
diff --git a/comms/Makefile b/comms/Makefile
index 96a867a7122b..e587b8a66318 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -78,7 +78,7 @@
     SUBDIR += kb
     SUBDIR += kermit
     SUBDIR += klog
-    SUBDIR += kremotecontrol
+    SUBDIR += kremotecontrol-kde4
     SUBDIR += kvasd
     SUBDIR += libconcord
     SUBDIR += libfap
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol-kde4/Makefile
index c5097160933c..0e5066f8edb5 100644
--- a/comms/kremotecontrol/Makefile
+++ b/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
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol-kde4/distinfo
index a13810f4a229..a13810f4a229 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol-kde4/distinfo
diff --git a/comms/kremotecontrol/pkg-descr b/comms/kremotecontrol-kde4/pkg-descr
index 2e36cf0d5f83..2e36cf0d5f83 100644
--- a/comms/kremotecontrol/pkg-descr
+++ b/comms/kremotecontrol-kde4/pkg-descr
diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol-kde4/pkg-plist
index 42cccf05fbf0..42cccf05fbf0 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol-kde4/pkg-plist
diff --git a/deskutils/Makefile b/deskutils/Makefile
index ff4dff2a544c..eba8f9aa5e91 100644
--- a/deskutils/Makefile
+++ b/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
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect-kde4/Makefile
index 063d80651f9e..e8e7755f1ea1 100644
--- a/deskutils/kcharselect/Makefile
+++ b/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
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect-kde4/distinfo
index 2440461f49df..2440461f49df 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect-kde4/distinfo
diff --git a/deskutils/kcharselect/pkg-descr b/deskutils/kcharselect-kde4/pkg-descr
index 70b6bbca2c2f..70b6bbca2c2f 100644
--- a/deskutils/kcharselect/pkg-descr
+++ b/deskutils/kcharselect-kde4/pkg-descr
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect-kde4/pkg-plist
index 65d8229cce6d..65d8229cce6d 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect-kde4/pkg-plist
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons-kde4/Makefile
index 2086788e55ac..a1759e99b288 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/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
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons-kde4/distinfo
index ff4a9080981c..ff4a9080981c 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons-kde4/distinfo
diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons-kde4/files/patch-CMakeLists.txt
index 8d8f6daf183c..8d8f6daf183c 100644
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons-kde4/files/patch-CMakeLists.txt
diff --git a/deskutils/kdeplasma-addons/files/patch-applets_timer_timer.cpp b/deskutils/kdeplasma-addons-kde4/files/patch-applets_timer_timer.cpp
index 2218e86f96c9..2218e86f96c9 100644
--- a/deskutils/kdeplasma-addons/files/patch-applets_timer_timer.cpp
+++ b/deskutils/kdeplasma-addons-kde4/files/patch-applets_timer_timer.cpp
diff --git a/deskutils/kdeplasma-addons/pkg-descr b/deskutils/kdeplasma-addons-kde4/pkg-descr
index 0e170aeae19b..0e170aeae19b 100644
--- a/deskutils/kdeplasma-addons/pkg-descr
+++ b/deskutils/kdeplasma-addons-kde4/pkg-descr
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons-kde4/pkg-plist
index f9303fcde99e..f9303fcde99e 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons-kde4/pkg-plist
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler-kde4/Makefile
index ead43c9bd717..33e0588ddd6f 100644
--- a/deskutils/kruler/Makefile
+++ b/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
diff --git a/deskutils/kruler/distinfo b/deskutils/kruler-kde4/distinfo
index 51ccd97e2ed8..51ccd97e2ed8 100644
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler-kde4/distinfo
diff --git a/deskutils/kruler/pkg-descr b/deskutils/kruler-kde4/pkg-descr
index 7956c46d094b..7956c46d094b 100644
--- a/deskutils/kruler/pkg-descr
+++ b/deskutils/kruler-kde4/pkg-descr
diff --git a/deskutils/kruler/pkg-plist b/deskutils/kruler-kde4/pkg-plist
index 4202edb1d336..4202edb1d336 100644
--- a/deskutils/kruler/pkg-plist
+++ b/deskutils/kruler-kde4/pkg-plist
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index 1917dcf5b167..a938b072bf08 100644
--- a/deskutils/silence/Makefile
+++ b/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
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba-kde4/Makefile
index 76d62734daa2..76d62734daa2 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba-kde4/Makefile
diff --git a/deskutils/superkaramba/distinfo b/deskutils/superkaramba-kde4/distinfo
index 8ed71ac2b162..8ed71ac2b162 100644
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba-kde4/distinfo
diff --git a/deskutils/superkaramba/files/patch-src_sensors_mem.cpp b/deskutils/superkaramba-kde4/files/patch-src_sensors_mem.cpp
index 9f13d0271925..9f13d0271925 100644
--- a/deskutils/superkaramba/files/patch-src_sensors_mem.cpp
+++ b/deskutils/superkaramba-kde4/files/patch-src_sensors_mem.cpp
diff --git a/deskutils/superkaramba/pkg-descr b/deskutils/superkaramba-kde4/pkg-descr
index 0eb815a6444e..0eb815a6444e 100644
--- a/deskutils/superkaramba/pkg-descr
+++ b/deskutils/superkaramba-kde4/pkg-descr
diff --git a/deskutils/superkaramba/pkg-plist b/deskutils/superkaramba-kde4/pkg-plist
index 9044a88ee13d..9044a88ee13d 100644
--- a/deskutils/superkaramba/pkg-plist
+++ b/deskutils/superkaramba-kde4/pkg-plist
diff --git a/devel/Makefile b/devel/Makefile
index 52f3966989a2..2b759ab2513d 100644
--- a/devel/Makefile
+++ b/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
diff --git a/devel/cervisia/Makefile b/devel/cervisia-kde4/Makefile
index 0454844d93e1..93f379e7b375 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cervisia
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/cervisia/distinfo b/devel/cervisia-kde4/distinfo
index 01f9bf5ef1a2..01f9bf5ef1a2 100644
--- a/devel/cervisia/distinfo
+++ b/devel/cervisia-kde4/distinfo
diff --git a/devel/cervisia/pkg-descr b/devel/cervisia-kde4/pkg-descr
index fe38b65f435b..fe38b65f435b 100644
--- a/devel/cervisia/pkg-descr
+++ b/devel/cervisia-kde4/pkg-descr
diff --git a/devel/cervisia/pkg-plist b/devel/cervisia-kde4/pkg-plist
index 62ecd93dd96e..62ecd93dd96e 100644
--- a/devel/cervisia/pkg-plist
+++ b/devel/cervisia-kde4/pkg-plist
diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins-kde4/Makefile
index 9ee664ddc878..495e3f382b48 100644
--- a/devel/dolphin-plugins/Makefile
+++ b/devel/dolphin-plugins-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	dolphin-plugins
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/dolphin-plugins/distinfo b/devel/dolphin-plugins-kde4/distinfo
index 9b5817b13bce..9b5817b13bce 100644
--- a/devel/dolphin-plugins/distinfo
+++ b/devel/dolphin-plugins-kde4/distinfo
diff --git a/devel/dolphin-plugins/pkg-descr b/devel/dolphin-plugins-kde4/pkg-descr
index 50940741f304..50940741f304 100644
--- a/devel/dolphin-plugins/pkg-descr
+++ b/devel/dolphin-plugins-kde4/pkg-descr
diff --git a/devel/dolphin-plugins/pkg-plist b/devel/dolphin-plugins-kde4/pkg-plist
index d222fb83b56f..d222fb83b56f 100644
--- a/devel/dolphin-plugins/pkg-plist
+++ b/devel/dolphin-plugins-kde4/pkg-plist
diff --git a/devel/dragon/Makefile b/devel/dragon/Makefile
index 4de990a44e53..f41801f3309e 100644
--- a/devel/dragon/Makefile
+++ b/devel/dragon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dragon
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lemke-it.com/
 
@@ -13,7 +14,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	liblfcbase.so:devel/lfcbase
 
-CONFLICTS=	dragon-player
+CONFLICTS=	dragon-kde4
 
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/dragon
diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate-kde4/Makefile
index 1c5b8ab39532..77b8e0eaf96f 100644
--- a/devel/kapptemplate/Makefile
+++ b/devel/kapptemplate-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kapptemplate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kapptemplate/distinfo b/devel/kapptemplate-kde4/distinfo
index ffb35d600080..ffb35d600080 100644
--- a/devel/kapptemplate/distinfo
+++ b/devel/kapptemplate-kde4/distinfo
diff --git a/devel/kapptemplate/pkg-descr b/devel/kapptemplate-kde4/pkg-descr
index 181733c79662..181733c79662 100644
--- a/devel/kapptemplate/pkg-descr
+++ b/devel/kapptemplate-kde4/pkg-descr
diff --git a/devel/kapptemplate/pkg-plist b/devel/kapptemplate-kde4/pkg-plist
index e124e08c46da..e124e08c46da 100644
--- a/devel/kapptemplate/pkg-plist
+++ b/devel/kapptemplate-kde4/pkg-plist
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind-kde4/Makefile
index b183bdf882a8..14d291c82494 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kcachegrind
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kcachegrind/distinfo b/devel/kcachegrind-kde4/distinfo
index c7656bf2bfb3..c7656bf2bfb3 100644
--- a/devel/kcachegrind/distinfo
+++ b/devel/kcachegrind-kde4/distinfo
diff --git a/devel/kcachegrind/pkg-descr b/devel/kcachegrind-kde4/pkg-descr
index 3b2fec63a983..3b2fec63a983 100644
--- a/devel/kcachegrind/pkg-descr
+++ b/devel/kcachegrind-kde4/pkg-descr
diff --git a/devel/kcachegrind/pkg-plist b/devel/kcachegrind-kde4/pkg-plist
index 2424462fdad3..2424462fdad3 100644
--- a/devel/kcachegrind/pkg-plist
+++ b/devel/kcachegrind-kde4/pkg-plist
diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts-kde4/Makefile
index 0b06f4c7db39..bf88ecf561ba 100644
--- a/devel/kde-dev-scripts/Makefile
+++ b/devel/kde-dev-scripts-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-dev-scripts
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kde-dev-scripts/distinfo b/devel/kde-dev-scripts-kde4/distinfo
index 0d38801684c9..0d38801684c9 100644
--- a/devel/kde-dev-scripts/distinfo
+++ b/devel/kde-dev-scripts-kde4/distinfo
diff --git a/devel/kde-dev-scripts/pkg-descr b/devel/kde-dev-scripts-kde4/pkg-descr
index 969f392608a5..969f392608a5 100644
--- a/devel/kde-dev-scripts/pkg-descr
+++ b/devel/kde-dev-scripts-kde4/pkg-descr
diff --git a/devel/kde-dev-scripts/pkg-plist b/devel/kde-dev-scripts-kde4/pkg-plist
index 1b608c0c248b..1b608c0c248b 100644
--- a/devel/kde-dev-scripts/pkg-plist
+++ b/devel/kde-dev-scripts-kde4/pkg-plist
diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils-kde4/Makefile
index d8ad35caabc2..3e8db9097bb0 100644
--- a/devel/kde-dev-utils/Makefile
+++ b/devel/kde-dev-utils-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-dev-utils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kde-dev-utils/distinfo b/devel/kde-dev-utils-kde4/distinfo
index e97ef44ee6d5..e97ef44ee6d5 100644
--- a/devel/kde-dev-utils/distinfo
+++ b/devel/kde-dev-utils-kde4/distinfo
diff --git a/devel/kde-dev-utils/pkg-descr b/devel/kde-dev-utils-kde4/pkg-descr
index 48fcbe1821c5..48fcbe1821c5 100644
--- a/devel/kde-dev-utils/pkg-descr
+++ b/devel/kde-dev-utils-kde4/pkg-descr
diff --git a/devel/kde-dev-utils/pkg-plist b/devel/kde-dev-utils-kde4/pkg-plist
index ca62d992fb5b..ca62d992fb5b 100644
--- a/devel/kde-dev-utils/pkg-plist
+++ b/devel/kde-dev-utils-kde4/pkg-plist
diff --git a/devel/kdebindings-kde4/Makefile b/devel/kdebindings-kde4/Makefile
index 8b1166783305..bee5e281a5a6 100644
--- a/devel/kdebindings-kde4/Makefile
+++ b/devel/kdebindings-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdebindings
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 PKGNAMESUFFIX=	-kde4
 
@@ -18,11 +18,11 @@ PERL_DESC=	Perl bindings
 PERL_USE=	KDE=perlkde_run
 
 PYTHON_DESC=	Python bindings
-PYTHON_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython
+PYTHON_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython-kde4
 PYTHON_USE=	KDE=pykde4_run,pykdeuic4_run
 
 RUBY_DESC=	Ruby bindings
-RUBY_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/krossruby.so:devel/ruby-krossruby
+RUBY_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/krossruby.so:devel/ruby-krossruby-kde4
 RUBY_USE=	KDE=korundum_run
 
 .include <bsd.port.mk>
diff --git a/devel/kdesdk-kde4/Makefile b/devel/kdesdk-kde4/Makefile
index cfa1f37cca27..8391aacb2393 100644
--- a/devel/kdesdk-kde4/Makefile
+++ b/devel/kdesdk-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 PKGNAMESUFFIX=	-kde4
 
@@ -30,43 +30,43 @@ OPTIONS_DEFINE=	CERVISIA \
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CERVISIA_DESC=		CVS frontend
-CERVISIA_RUN_DEPENDS=	${KDE_PREFIX}/bin/cervisia:devel/cervisia
+CERVISIA_RUN_DEPENDS=	${KDE_PREFIX}/bin/cervisia:devel/cervisia-kde4
 
 DEVUTILS_DESC=		KDE development utilities
-DEVUTILS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kuiviewer:devel/kde-dev-utils
+DEVUTILS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kuiviewer:devel/kde-dev-utils-kde4
 
 DEVSCRIPTS_DESC=	KDE development scripts
-DEVSCRIPTS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kdekillall:devel/kde-dev-scripts
+DEVSCRIPTS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kdekillall:devel/kde-dev-scripts-kde4
 
 DOLPHIN_DESC=		Plugins for Dolphin file manager
-DOLPHIN_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins
+DOLPHIN_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins-kde4
 
 KAPPTEMPLATE_DESC=	Template generator
-KAPPTEMPLATE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kapptemplate:devel/kapptemplate
+KAPPTEMPLATE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kapptemplate:devel/kapptemplate-kde4
 
 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
+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
+KCACHEGRIND_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcachegrind:devel/kcachegrind-kde4
 
 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
+KOMPARE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kompare:textproc/kompare-kde4
 
 LOKALIZE_DESC=		Computer-aided translation system
-LOKALIZE_RUN_DEPENDS=	${KDE_PREFIX}/bin/lokalize:devel/lokalize
+LOKALIZE_RUN_DEPENDS=	${KDE_PREFIX}/bin/lokalize:devel/lokalize-kde4
 
 OKTETA_DESC=		Hex editor
-OKTETA_RUN_DEPENDS=	${KDE_PREFIX}/bin/okteta:devel/okteta
+OKTETA_RUN_DEPENDS=	${KDE_PREFIX}/bin/okteta:devel/okteta-kde4
 
 POXML_DESC=		Tools to translate DocBook XML using gettext
-POXML_RUN_DEPENDS=	${KDE_PREFIX}/bin/po2xml:devel/poxml
+POXML_RUN_DEPENDS=	${KDE_PREFIX}/bin/po2xml:devel/poxml-kde4
 
 STRIGI_DESC=		Strigi analyzers for SDK file formats
 STRIGI_RUN_DEPENDS=	${KDE_PREFIX}/lib/strigi/strigila_diff.so:devel/kdesdk-strigi-analyzers-kde4
@@ -75,6 +75,6 @@ THUMBNAILER_DESC=	Thumbnail generator for gettext po files
 THUMBNAILER_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/pothumbnail.so:devel/kdesdk-thumbnailers-kde4
 
 UMBRELLO_DESC=		UML modeller
-UMBRELLO_RUN_DEPENDS=	${KDE_PREFIX}/bin/umbrello:devel/umbrello
+UMBRELLO_RUN_DEPENDS=	${KDE_PREFIX}/bin/umbrello:devel/umbrello-kde4
 
 .include <bsd.port.mk>
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 45245000f5f5..34626350c42b 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdesvn
 DISTVERSION=	1.7.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
 		libapr-1.so:devel/apr1 \
 		libgdbm.so:databases/gdbm \
 		libexpat.so:textproc/expat2
-RUN_DEPENDS=	keditbookmarks:x11/kde4-baseapps
 
 CONFLICTS=	qsvn-[0-9]*
 
@@ -25,7 +24,7 @@ CMAKE_ARGS+=	-DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
 		-DMAN_INSTALL_DIR=${MANPREFIX}/man
 
 USES=		cmake:outsource compiler:c11 bdb kde:4 tar:xz
-USE_KDE=	automoc4 kdelibs soprano
+USE_KDE=	automoc4 kdelibs soprano baseapps_run
 USE_LDCONFIG=	yes
 USE_QT4=	corelib gui xml network dbus svg sql \
 		qmake_build moc_build rcc_build uic_build linguist_build
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index a2ff0a4fcaa5..640bfe949ba2 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdevelop
 DISTVERSION=	${KDEVELOP_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}
 DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	OKTETA PHP
 OPTIONS_SUB=	yes
 
 OKTETA_DESC=	Hex editing support via Okteta
-OKTETA_LIB_DEPENDS=	libokteta1core.so:devel/okteta
+OKTETA_LIB_DEPENDS=	libokteta1core.so:devel/okteta-kde4
 OKTETA_CMAKE_OFF=	-DWITH_LibOktetaKasten:BOOL=OFF
 OKTETA_CMAKE_ON=	-DWITH_LibOktetaKasten:BOOL=ON
 
diff --git a/devel/lokalize/Makefile b/devel/lokalize-kde4/Makefile
index 97bc3bd11246..c842a9fdd0f5 100644
--- a/devel/lokalize/Makefile
+++ b/devel/lokalize-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lokalize
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/lokalize/distinfo b/devel/lokalize-kde4/distinfo
index d33211288618..d33211288618 100644
--- a/devel/lokalize/distinfo
+++ b/devel/lokalize-kde4/distinfo
diff --git a/devel/lokalize/pkg-descr b/devel/lokalize-kde4/pkg-descr
index f5cd7a7532de..f5cd7a7532de 100644
--- a/devel/lokalize/pkg-descr
+++ b/devel/lokalize-kde4/pkg-descr
diff --git a/devel/lokalize/pkg-plist b/devel/lokalize-kde4/pkg-plist
index 90916a5d2f38..90916a5d2f38 100644
--- a/devel/lokalize/pkg-plist
+++ b/devel/lokalize-kde4/pkg-plist
diff --git a/devel/okteta/Makefile b/devel/okteta-kde4/Makefile
index dc7e8e9db475..e5d0dfc002ee 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	okteta
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/okteta/distinfo b/devel/okteta-kde4/distinfo
index 8763d52f3d4f..8763d52f3d4f 100644
--- a/devel/okteta/distinfo
+++ b/devel/okteta-kde4/distinfo
diff --git a/devel/okteta/pkg-descr b/devel/okteta-kde4/pkg-descr
index 033265dc021d..033265dc021d 100644
--- a/devel/okteta/pkg-descr
+++ b/devel/okteta-kde4/pkg-descr
diff --git a/devel/okteta/pkg-plist b/devel/okteta-kde4/pkg-plist
index 8b17dbc77152..8b17dbc77152 100644
--- a/devel/okteta/pkg-plist
+++ b/devel/okteta-kde4/pkg-plist
diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde-kde4/Makefile
index 8f2b1f136988..a22b43b620c9 100644
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	perlkde
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel kde kde-kde4 perl5
 PKGNAMEPREFIX=	p5-
 
diff --git a/devel/p5-perlkde/distinfo b/devel/p5-perlkde-kde4/distinfo
index 19d78e4153a3..19d78e4153a3 100644
--- a/devel/p5-perlkde/distinfo
+++ b/devel/p5-perlkde-kde4/distinfo
diff --git a/devel/p5-perlkde/pkg-descr b/devel/p5-perlkde-kde4/pkg-descr
index b8875a975163..b8875a975163 100644
--- a/devel/p5-perlkde/pkg-descr
+++ b/devel/p5-perlkde-kde4/pkg-descr
diff --git a/devel/p5-perlkde/pkg-plist b/devel/p5-perlkde-kde4/pkg-plist
index 7789b90b5a1c..7789b90b5a1c 100644
--- a/devel/p5-perlkde/pkg-plist
+++ b/devel/p5-perlkde-kde4/pkg-plist
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt-kde4/Makefile
index 822c72fa6c05..822c72fa6c05 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt-kde4/Makefile
diff --git a/devel/p5-perlqt/distinfo b/devel/p5-perlqt-kde4/distinfo
index 8714bb6492fb..8714bb6492fb 100644
--- a/devel/p5-perlqt/distinfo
+++ b/devel/p5-perlqt-kde4/distinfo
diff --git a/devel/p5-perlqt/files/perl-kdebindings-env.sh.in b/devel/p5-perlqt-kde4/files/perl-kdebindings-env.sh.in
index f311c50d1cf5..f311c50d1cf5 100644
--- a/devel/p5-perlqt/files/perl-kdebindings-env.sh.in
+++ b/devel/p5-perlqt-kde4/files/perl-kdebindings-env.sh.in
diff --git a/devel/p5-perlqt/files/pkg-message.in b/devel/p5-perlqt-kde4/files/pkg-message.in
index 1d8417f0a1dd..1d8417f0a1dd 100644
--- a/devel/p5-perlqt/files/pkg-message.in
+++ b/devel/p5-perlqt-kde4/files/pkg-message.in
diff --git a/devel/p5-perlqt/pkg-descr b/devel/p5-perlqt-kde4/pkg-descr
index c6760a44ed94..c6760a44ed94 100644
--- a/devel/p5-perlqt/pkg-descr
+++ b/devel/p5-perlqt-kde4/pkg-descr
diff --git a/devel/p5-perlqt/pkg-plist b/devel/p5-perlqt-kde4/pkg-plist
index a866ea4edc2f..a866ea4edc2f 100644
--- a/devel/p5-perlqt/pkg-plist
+++ b/devel/p5-perlqt-kde4/pkg-plist
diff --git a/devel/poxml/Makefile b/devel/poxml-kde4/Makefile
index 7a03c0c549c0..79e8644aafe3 100644
--- a/devel/poxml/Makefile
+++ b/devel/poxml-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	poxml
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/poxml/distinfo b/devel/poxml-kde4/distinfo
index a12809028c9e..a12809028c9e 100644
--- a/devel/poxml/distinfo
+++ b/devel/poxml-kde4/distinfo
diff --git a/devel/poxml/pkg-descr b/devel/poxml-kde4/pkg-descr
index 778e7d1ebaa6..778e7d1ebaa6 100644
--- a/devel/poxml/pkg-descr
+++ b/devel/poxml-kde4/pkg-descr
diff --git a/devel/poxml/pkg-plist b/devel/poxml-kde4/pkg-plist
index 70b0299985b0..70b0299985b0 100644
--- a/devel/poxml/pkg-plist
+++ b/devel/poxml-kde4/pkg-plist
diff --git a/devel/py-krosspython/Makefile b/devel/py-krosspython-kde4/Makefile
index 0126d17c6d57..0126d17c6d57 100644
--- a/devel/py-krosspython/Makefile
+++ b/devel/py-krosspython-kde4/Makefile
diff --git a/devel/py-krosspython/distinfo b/devel/py-krosspython-kde4/distinfo
index 8621563cb924..8621563cb924 100644
--- a/devel/py-krosspython/distinfo
+++ b/devel/py-krosspython-kde4/distinfo
diff --git a/devel/py-krosspython/files/patch-git_81e17bf b/devel/py-krosspython-kde4/files/patch-git_81e17bf
index ec6746654e36..ec6746654e36 100644
--- a/devel/py-krosspython/files/patch-git_81e17bf
+++ b/devel/py-krosspython-kde4/files/patch-git_81e17bf
diff --git a/devel/py-krosspython/pkg-descr b/devel/py-krosspython-kde4/pkg-descr
index 7cab4d1d77ea..7cab4d1d77ea 100644
--- a/devel/py-krosspython/pkg-descr
+++ b/devel/py-krosspython-kde4/pkg-descr
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4-kde4/Makefile
index 37103cf95f34..37103cf95f34 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4-kde4/Makefile
diff --git a/devel/py-pykde4/distinfo b/devel/py-pykde4-kde4/distinfo
index aaed1117e66b..aaed1117e66b 100644
--- a/devel/py-pykde4/distinfo
+++ b/devel/py-pykde4-kde4/distinfo
diff --git a/devel/py-pykde4/files/kdebindings4.pth.in b/devel/py-pykde4-kde4/files/kdebindings4.pth.in
index 216704e831bb..216704e831bb 100644
--- a/devel/py-pykde4/files/kdebindings4.pth.in
+++ b/devel/py-pykde4-kde4/files/kdebindings4.pth.in
diff --git a/devel/py-pykde4/files/patch-CMakeLists.txt b/devel/py-pykde4-kde4/files/patch-CMakeLists.txt
index 1b3ccdc67277..1b3ccdc67277 100644
--- a/devel/py-pykde4/files/patch-CMakeLists.txt
+++ b/devel/py-pykde4-kde4/files/patch-CMakeLists.txt
diff --git a/devel/py-pykde4/files/patch-__init__.py b/devel/py-pykde4-kde4/files/patch-__init__.py
index aad9e5904c5b..aad9e5904c5b 100644
--- a/devel/py-pykde4/files/patch-__init__.py
+++ b/devel/py-pykde4-kde4/files/patch-__init__.py
diff --git a/devel/py-pykde4/files/patch-git_2d1eadf5 b/devel/py-pykde4-kde4/files/patch-git_2d1eadf5
index cd1cf8059184..cd1cf8059184 100644
--- a/devel/py-pykde4/files/patch-git_2d1eadf5
+++ b/devel/py-pykde4-kde4/files/patch-git_2d1eadf5
diff --git a/devel/py-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp b/devel/py-pykde4-kde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
index d1dddd936268..d1dddd936268 100644
--- a/devel/py-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
+++ b/devel/py-pykde4-kde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
diff --git a/devel/py-pykde4/files/patch-sip-4.19.6 b/devel/py-pykde4-kde4/files/patch-sip-4.19.6
index 98225534693c..98225534693c 100644
--- a/devel/py-pykde4/files/patch-sip-4.19.6
+++ b/devel/py-pykde4-kde4/files/patch-sip-4.19.6
diff --git a/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip b/devel/py-pykde4-kde4/files/patch-sip_phonon_abstractvideodataoutput.sip
index 8580740467e7..8580740467e7 100644
--- a/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip
+++ b/devel/py-pykde4-kde4/files/patch-sip_phonon_abstractvideodataoutput.sip
diff --git a/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip b/devel/py-pykde4-kde4/files/patch-sip_solid_powermanagement.sip
index 2b628d90c222..2b628d90c222 100644
--- a/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip
+++ b/devel/py-pykde4-kde4/files/patch-sip_solid_powermanagement.sip
diff --git a/devel/py-pykde4/files/patch-sip_solid_predicate.sip b/devel/py-pykde4-kde4/files/patch-sip_solid_predicate.sip
index d4759268e38b..d4759268e38b 100644
--- a/devel/py-pykde4/files/patch-sip_solid_predicate.sip
+++ b/devel/py-pykde4-kde4/files/patch-sip_solid_predicate.sip
diff --git a/devel/py-pykde4/pkg-descr b/devel/py-pykde4-kde4/pkg-descr
index 7cab4d1d77ea..7cab4d1d77ea 100644
--- a/devel/py-pykde4/pkg-descr
+++ b/devel/py-pykde4-kde4/pkg-descr
diff --git a/devel/py-pykde4/pkg-plist b/devel/py-pykde4-kde4/pkg-plist
index af22ed4242df..af22ed4242df 100644
--- a/devel/py-pykde4/pkg-plist
+++ b/devel/py-pykde4-kde4/pkg-plist
diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4-kde4/Makefile
index 8b95c96a4bd7..72d3df873003 100644
--- a/devel/py-pykdeuic4/Makefile
+++ b/devel/py-pykdeuic4-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pykdeuic4
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel kde kde-kde4 python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pykde4-${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT=	Enhanced version of pyuic4
 USES=		cmake:outsource python:2.7 kde:4 shebangfix tar:xz
 USE_KDE=	kdelibs automoc4 pykde4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-DISTINFO_FILE=	${.CURDIR:H:H}/devel/py-pykde4/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/devel/py-pykde4-kde4/distinfo
 
 NO_ARCH=	yes
 SHEBANG_FILES=	pykdeuic4.py
diff --git a/devel/py-pykdeuic4/files/patch-CMakeLists.txt b/devel/py-pykdeuic4-kde4/files/patch-CMakeLists.txt
index f5e3e177758d..f5e3e177758d 100644
--- a/devel/py-pykdeuic4/files/patch-CMakeLists.txt
+++ b/devel/py-pykdeuic4-kde4/files/patch-CMakeLists.txt
diff --git a/devel/py-pykdeuic4/pkg-descr b/devel/py-pykdeuic4-kde4/pkg-descr
index 6728503f49a5..6728503f49a5 100644
--- a/devel/py-pykdeuic4/pkg-descr
+++ b/devel/py-pykdeuic4-kde4/pkg-descr
diff --git a/devel/py-pykdeuic4/pkg-plist b/devel/py-pykdeuic4-kde4/pkg-plist
index a40bf218e6b2..a40bf218e6b2 100644
--- a/devel/py-pykdeuic4/pkg-plist
+++ b/devel/py-pykdeuic4-kde4/pkg-plist
diff --git a/devel/ruby-korundum/Makefile b/devel/ruby-korundum-kde4/Makefile
index c197e44e6622..5c8aaed7098c 100644
--- a/devel/ruby-korundum/Makefile
+++ b/devel/ruby-korundum-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	korundum
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4 ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 
diff --git a/devel/ruby-korundum/distinfo b/devel/ruby-korundum-kde4/distinfo
index 26e5f69fb6ec..26e5f69fb6ec 100644
--- a/devel/ruby-korundum/distinfo
+++ b/devel/ruby-korundum-kde4/distinfo
diff --git a/devel/ruby-korundum/pkg-descr b/devel/ruby-korundum-kde4/pkg-descr
index 996edfb9babe..996edfb9babe 100644
--- a/devel/ruby-korundum/pkg-descr
+++ b/devel/ruby-korundum-kde4/pkg-descr
diff --git a/devel/ruby-korundum/pkg-plist b/devel/ruby-korundum-kde4/pkg-plist
index 5cbeacc93d1f..5cbeacc93d1f 100644
--- a/devel/ruby-korundum/pkg-plist
+++ b/devel/ruby-korundum-kde4/pkg-plist
diff --git a/devel/ruby-krossruby/Makefile b/devel/ruby-krossruby-kde4/Makefile
index a70ae5768bce..496368244874 100644
--- a/devel/ruby-krossruby/Makefile
+++ b/devel/ruby-krossruby-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	krossruby
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4 ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	kross-interpreters-${PORTVERSION}
diff --git a/devel/ruby-krossruby/distinfo b/devel/ruby-krossruby-kde4/distinfo
index 8621563cb924..8621563cb924 100644
--- a/devel/ruby-krossruby/distinfo
+++ b/devel/ruby-krossruby-kde4/distinfo
diff --git a/devel/ruby-krossruby/pkg-descr b/devel/ruby-krossruby-kde4/pkg-descr
index d52dfce43466..d52dfce43466 100644
--- a/devel/ruby-krossruby/pkg-descr
+++ b/devel/ruby-krossruby-kde4/pkg-descr
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby-kde4/Makefile
index c01d2b67b4d8..c01d2b67b4d8 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby-kde4/Makefile
diff --git a/devel/ruby-qtruby/distinfo b/devel/ruby-qtruby-kde4/distinfo
index c3dc880a2810..c3dc880a2810 100644
--- a/devel/ruby-qtruby/distinfo
+++ b/devel/ruby-qtruby-kde4/distinfo
diff --git a/devel/ruby-qtruby/files/patch-src_qtruby.cpp b/devel/ruby-qtruby-kde4/files/patch-src_qtruby.cpp
index 7a8fbc24c112..7a8fbc24c112 100644
--- a/devel/ruby-qtruby/files/patch-src_qtruby.cpp
+++ b/devel/ruby-qtruby-kde4/files/patch-src_qtruby.cpp
diff --git a/devel/ruby-qtruby/files/pkg-message.in b/devel/ruby-qtruby-kde4/files/pkg-message.in
index 859cd8da176a..859cd8da176a 100644
--- a/devel/ruby-qtruby/files/pkg-message.in
+++ b/devel/ruby-qtruby-kde4/files/pkg-message.in
diff --git a/devel/ruby-qtruby/files/ruby-kdebindings-env.sh.in b/devel/ruby-qtruby-kde4/files/ruby-kdebindings-env.sh.in
index 041908374ce9..041908374ce9 100644
--- a/devel/ruby-qtruby/files/ruby-kdebindings-env.sh.in
+++ b/devel/ruby-qtruby-kde4/files/ruby-kdebindings-env.sh.in
diff --git a/devel/ruby-qtruby/pkg-descr b/devel/ruby-qtruby-kde4/pkg-descr
index 8a616b9a256e..8a616b9a256e 100644
--- a/devel/ruby-qtruby/pkg-descr
+++ b/devel/ruby-qtruby-kde4/pkg-descr
diff --git a/devel/ruby-qtruby/pkg-plist b/devel/ruby-qtruby-kde4/pkg-plist
index d9c28fca59dc..d9c28fca59dc 100644
--- a/devel/ruby-qtruby/pkg-plist
+++ b/devel/ruby-qtruby-kde4/pkg-plist
diff --git a/devel/smokegen/Makefile b/devel/smokegen-kde4/Makefile
index 46d2987e44c0..46d2987e44c0 100644
--- a/devel/smokegen/Makefile
+++ b/devel/smokegen-kde4/Makefile
diff --git a/devel/smokegen/distinfo b/devel/smokegen-kde4/distinfo
index 37b683da2e72..37b683da2e72 100644
--- a/devel/smokegen/distinfo
+++ b/devel/smokegen-kde4/distinfo
diff --git a/devel/smokegen/files/patch-cmake_FindQScintilla.cmake b/devel/smokegen-kde4/files/patch-cmake_FindQScintilla.cmake
index 0dca8bea51dc..0dca8bea51dc 100644
--- a/devel/smokegen/files/patch-cmake_FindQScintilla.cmake
+++ b/devel/smokegen-kde4/files/patch-cmake_FindQScintilla.cmake
diff --git a/devel/smokegen/files/patch-cmake__CMakeLists.txt b/devel/smokegen-kde4/files/patch-cmake__CMakeLists.txt
index c65ef9bbb1e0..c65ef9bbb1e0 100644
--- a/devel/smokegen/files/patch-cmake__CMakeLists.txt
+++ b/devel/smokegen-kde4/files/patch-cmake__CMakeLists.txt
diff --git a/devel/smokegen/pkg-descr b/devel/smokegen-kde4/pkg-descr
index 07a6f16544f9..07a6f16544f9 100644
--- a/devel/smokegen/pkg-descr
+++ b/devel/smokegen-kde4/pkg-descr
diff --git a/devel/smokegen/pkg-plist b/devel/smokegen-kde4/pkg-plist
index 3194bcb89f32..3194bcb89f32 100644
--- a/devel/smokegen/pkg-plist
+++ b/devel/smokegen-kde4/pkg-plist
diff --git a/devel/smokekde/Makefile b/devel/smokekde-kde4/Makefile
index 4caaff8ff94a..f65f4985d052 100644
--- a/devel/smokekde/Makefile
+++ b/devel/smokekde-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	smokekde
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/smokekde/distinfo b/devel/smokekde-kde4/distinfo
index 94486eb4d2ed..94486eb4d2ed 100644
--- a/devel/smokekde/distinfo
+++ b/devel/smokekde-kde4/distinfo
diff --git a/devel/smokekde/pkg-descr b/devel/smokekde-kde4/pkg-descr
index 07a6f16544f9..07a6f16544f9 100644
--- a/devel/smokekde/pkg-descr
+++ b/devel/smokekde-kde4/pkg-descr
diff --git a/devel/smokekde/pkg-plist b/devel/smokekde-kde4/pkg-plist
index d5e2e3f7c32d..d5e2e3f7c32d 100644
--- a/devel/smokekde/pkg-plist
+++ b/devel/smokekde-kde4/pkg-plist
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt-kde4/Makefile
index 27dca7ea5d88..27dca7ea5d88 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt-kde4/Makefile
diff --git a/devel/smokeqt/distinfo b/devel/smokeqt-kde4/distinfo
index 987f60785a50..987f60785a50 100644
--- a/devel/smokeqt/distinfo
+++ b/devel/smokeqt-kde4/distinfo
diff --git a/devel/smokeqt/files/patch-qtopengl__CMakeLists.txt b/devel/smokeqt-kde4/files/patch-qtopengl__CMakeLists.txt
index 79d018c4e4fb..79d018c4e4fb 100644
--- a/devel/smokeqt/files/patch-qtopengl__CMakeLists.txt
+++ b/devel/smokeqt-kde4/files/patch-qtopengl__CMakeLists.txt
diff --git a/devel/smokeqt/pkg-descr b/devel/smokeqt-kde4/pkg-descr
index 07a6f16544f9..07a6f16544f9 100644
--- a/devel/smokeqt/pkg-descr
+++ b/devel/smokeqt-kde4/pkg-descr
diff --git a/devel/smokeqt/pkg-plist b/devel/smokeqt-kde4/pkg-plist
index 56bc1163e9b5..56bc1163e9b5 100644
--- a/devel/smokeqt/pkg-plist
+++ b/devel/smokeqt-kde4/pkg-plist
diff --git a/devel/umbrello/Makefile b/devel/umbrello-kde4/Makefile
index 72074536e654..6a8276779b1c 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	umbrello
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/umbrello/distinfo b/devel/umbrello-kde4/distinfo
index d7817ac6742f..d7817ac6742f 100644
--- a/devel/umbrello/distinfo
+++ b/devel/umbrello-kde4/distinfo
diff --git a/devel/umbrello/pkg-descr b/devel/umbrello-kde4/pkg-descr
index 582abd2f5527..582abd2f5527 100644
--- a/devel/umbrello/pkg-descr
+++ b/devel/umbrello-kde4/pkg-descr
diff --git a/devel/umbrello/pkg-plist b/devel/umbrello-kde4/pkg-plist
index 9b414a59b23b..9b414a59b23b 100644
--- a/devel/umbrello/pkg-plist
+++ b/devel/umbrello-kde4/pkg-plist
diff --git a/editors/Makefile b/editors/Makefile
index 76d487c69f41..ad32b7f7f83b 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -66,8 +66,8 @@
     SUBDIR += jove
     SUBDIR += jucipp
     SUBDIR += jupp
-    SUBDIR += kate
-    SUBDIR += kate-plugin-pate
+    SUBDIR += kate-kde4
+    SUBDIR += kate-plugin-pate-kde4
     SUBDIR += kile-kde4
     SUBDIR += klat4
     SUBDIR += komodo-edit
diff --git a/editors/kate/Makefile b/editors/kate-kde4/Makefile
index 878d173055bb..d481bd102f05 100644
--- a/editors/kate/Makefile
+++ b/editors/kate-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,7 +18,7 @@ USE_QT4=	dbus gui script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
-# editors/kate-plugin-pate installs pate
+# editors/kate-kde4-plugin-pate installs pate
 CMAKE_ARGS+=	-DBUILD_pate=off
 
 .include <bsd.port.mk>
diff --git a/editors/kate/distinfo b/editors/kate-kde4/distinfo
index d4486d339e69..d4486d339e69 100644
--- a/editors/kate/distinfo
+++ b/editors/kate-kde4/distinfo
diff --git a/editors/kate/files/patch-CMakeLists.txt b/editors/kate-kde4/files/patch-CMakeLists.txt
index ad0cdf1d8550..ad0cdf1d8550 100644
--- a/editors/kate/files/patch-CMakeLists.txt
+++ b/editors/kate-kde4/files/patch-CMakeLists.txt
diff --git a/editors/kate/files/patch-part_view_kateviewhelpers.cpp b/editors/kate-kde4/files/patch-part_view_kateviewhelpers.cpp
index 9abb4df2ff93..9abb4df2ff93 100644
--- a/editors/kate/files/patch-part_view_kateviewhelpers.cpp
+++ b/editors/kate-kde4/files/patch-part_view_kateviewhelpers.cpp
diff --git a/editors/kate/pkg-descr b/editors/kate-kde4/pkg-descr
index 1886a29bd553..1886a29bd553 100644
--- a/editors/kate/pkg-descr
+++ b/editors/kate-kde4/pkg-descr
diff --git a/editors/kate/pkg-plist b/editors/kate-kde4/pkg-plist
index fcac332d58d2..fcac332d58d2 100644
--- a/editors/kate/pkg-plist
+++ b/editors/kate-kde4/pkg-plist
diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate-kde4/Makefile
index 95fde811e253..784789978259 100644
--- a/editors/kate-plugin-pate/Makefile
+++ b/editors/kate-plugin-pate-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kate-plugin-pate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors kde kde-kde4
 DISTNAME=	kate-${PORTVERSION}
 
@@ -15,7 +15,7 @@ USE_KDE=	kdelibs automoc4 kate \
 USE_QT4=	gui webkit \
 		moc_build qmake_build rcc_build uic_build
 
-DISTINFO_FILE=	${.CURDIR:H:H}/editors/kate/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/editors/kate-kde4/distinfo
 
 # cmake.mk doesn't allow to overwrite BUILD_WRKSRC for out-of-source builds
 _pate_WRKSRC=	${BUILD_WRKSRC}/addons/kate/pate
diff --git a/editors/kate-plugin-pate/files/patch-addons__kate__pate__src__version_checker.h b/editors/kate-plugin-pate-kde4/files/patch-addons__kate__pate__src__version_checker.h
index c2a515da5337..c2a515da5337 100644
--- a/editors/kate-plugin-pate/files/patch-addons__kate__pate__src__version_checker.h
+++ b/editors/kate-plugin-pate-kde4/files/patch-addons__kate__pate__src__version_checker.h
diff --git a/editors/kate-plugin-pate/pkg-descr b/editors/kate-plugin-pate-kde4/pkg-descr
index 9c97912e9633..9c97912e9633 100644
--- a/editors/kate-plugin-pate/pkg-descr
+++ b/editors/kate-plugin-pate-kde4/pkg-descr
diff --git a/editors/kate-plugin-pate/pkg-plist b/editors/kate-plugin-pate-kde4/pkg-plist
index 61d325682564..61d325682564 100644
--- a/editors/kate-plugin-pate/pkg-plist
+++ b/editors/kate-plugin-pate-kde4/pkg-plist
diff --git a/games/Makefile b/games/Makefile
index 71875a7ac35f..0de9d147d1d6 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -90,7 +90,7 @@
     SUBDIR += black-box
     SUBDIR += blackjackclient
     SUBDIR += blackshadeselite
-    SUBDIR += blinken
+    SUBDIR += blinken-kde4
     SUBDIR += blinkensisters
     SUBDIR += blobby
     SUBDIR += bloboats
@@ -102,7 +102,7 @@
     SUBDIR += blokish
     SUBDIR += bloodfrontier
     SUBDIR += bluemoon
-    SUBDIR += bomber
+    SUBDIR += bomber-kde4
     SUBDIR += bomberclone
     SUBDIR += bomberinstinct
     SUBDIR += bombherman
@@ -110,7 +110,7 @@
     SUBDIR += bomns
     SUBDIR += boswars
     SUBDIR += bouncy
-    SUBDIR += bovo
+    SUBDIR += bovo-kde4
     SUBDIR += braincurses
     SUBDIR += brainparty
     SUBDIR += brainworkshop
@@ -385,7 +385,7 @@
     SUBDIR += goonies
     SUBDIR += gottet
     SUBDIR += gracer
-    SUBDIR += granatier
+    SUBDIR += granatier-kde4
     SUBDIR += greed
     SUBDIR += gretools
     SUBDIR += grhino
@@ -461,54 +461,54 @@
     SUBDIR += jvgs
     SUBDIR += jzip
     SUBDIR += kajaani-kombat
-    SUBDIR += kajongg
-    SUBDIR += kanagram
-    SUBDIR += kapman
+    SUBDIR += kajongg-kde4
+    SUBDIR += kanagram-kde4
+    SUBDIR += kapman-kde4
     SUBDIR += kardsgt
     SUBDIR += kartofel
     SUBDIR += katawa-shoujo
-    SUBDIR += katomic
-    SUBDIR += kblackbox
-    SUBDIR += kblocks
-    SUBDIR += kbounce
-    SUBDIR += kbreakout
+    SUBDIR += katomic-kde4
+    SUBDIR += kblackbox-kde4
+    SUBDIR += kblocks-kde4
+    SUBDIR += kbounce-kde4
+    SUBDIR += kbreakout-kde4
     SUBDIR += kcheckers
     SUBDIR += kdegames-kde4
-    SUBDIR += kdiamond
+    SUBDIR += kdiamond-kde4
     SUBDIR += keeperrl
     SUBDIR += kevedit
-    SUBDIR += kfourinline
-    SUBDIR += kgoldrunner
-    SUBDIR += khangman
-    SUBDIR += kigo
+    SUBDIR += kfourinline-kde4
+    SUBDIR += kgoldrunner-kde4
+    SUBDIR += khangman-kde4
+    SUBDIR += kigo-kde4
     SUBDIR += kiki
-    SUBDIR += killbots
-    SUBDIR += kiriki
-    SUBDIR += kjumpingcube
+    SUBDIR += killbots-kde4
+    SUBDIR += kiriki-kde4
+    SUBDIR += kjumpingcube-kde4
     SUBDIR += klavaro
-    SUBDIR += klickety
-    SUBDIR += klines
+    SUBDIR += klickety-kde4
+    SUBDIR += klines-kde4
     SUBDIR += klondike
-    SUBDIR += kmahjongg
-    SUBDIR += kmines
-    SUBDIR += knavalbattle
-    SUBDIR += knetwalk
+    SUBDIR += kmahjongg-kde4
+    SUBDIR += kmines-kde4
+    SUBDIR += knavalbattle-kde4
+    SUBDIR += knetwalk-kde4
     SUBDIR += knights-kde4
     SUBDIR += kobodeluxe
-    SUBDIR += kolf
-    SUBDIR += kollision
-    SUBDIR += konquest
-    SUBDIR += kpat
+    SUBDIR += kolf-kde4
+    SUBDIR += kollision-kde4
+    SUBDIR += konquest-kde4
+    SUBDIR += kpat-kde4
     SUBDIR += krank
-    SUBDIR += kreversi
-    SUBDIR += kshisen
-    SUBDIR += ksirk
-    SUBDIR += ksnakeduel
-    SUBDIR += kspaceduel
-    SUBDIR += ksquares
-    SUBDIR += ksudoku
-    SUBDIR += ktuberling
-    SUBDIR += kubrick
+    SUBDIR += kreversi-kde4
+    SUBDIR += kshisen-kde4
+    SUBDIR += ksirk-kde4
+    SUBDIR += ksnakeduel-kde4
+    SUBDIR += kspaceduel-kde4
+    SUBDIR += ksquares-kde4
+    SUBDIR += ksudoku-kde4
+    SUBDIR += ktuberling-kde4
+    SUBDIR += kubrick-kde4
     SUBDIR += kuklomenos
     SUBDIR += kye
     SUBDIR += ladder
@@ -526,8 +526,8 @@
     SUBDIR += libdungeonmaker
     SUBDIR += libggz
     SUBDIR += libgnome-games-support
-    SUBDIR += libkdegames
-    SUBDIR += libkmahjongg
+    SUBDIR += libkdegames-kde4
+    SUBDIR += libkmahjongg-kde4
     SUBDIR += liblcf
     SUBDIR += libmaitretarot
     SUBDIR += libmt_client
@@ -574,7 +574,7 @@
     SUBDIR += lmpc
     SUBDIR += lordsawar
     SUBDIR += lpairs
-    SUBDIR += lskat
+    SUBDIR += lskat-kde4
     SUBDIR += ltris
     SUBDIR += lugaru
     SUBDIR += luola
@@ -733,8 +733,8 @@
     SUBDIR += pachi
     SUBDIR += pacmanarena
     SUBDIR += paintown
-    SUBDIR += pairs
-    SUBDIR += palapeli
+    SUBDIR += pairs-kde4
+    SUBDIR += palapeli-kde4
     SUBDIR += palomino
     SUBDIR += pangzero
     SUBDIR += passage
@@ -749,7 +749,7 @@
     SUBDIR += pentobi
     SUBDIR += phalanx
     SUBDIR += phlipple
-    SUBDIR += picmi
+    SUBDIR += picmi-kde4
     SUBDIR += pinball
     SUBDIR += pingus
     SUBDIR += pink-pony
diff --git a/games/blinken/Makefile b/games/blinken-kde4/Makefile
index 21bec8621e00..63a51787f5ff 100644
--- a/games/blinken/Makefile
+++ b/games/blinken-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	blinken
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/blinken/distinfo b/games/blinken-kde4/distinfo
index b64838db52d1..b64838db52d1 100644
--- a/games/blinken/distinfo
+++ b/games/blinken-kde4/distinfo
diff --git a/games/blinken/pkg-descr b/games/blinken-kde4/pkg-descr
index 3be599385940..3be599385940 100644
--- a/games/blinken/pkg-descr
+++ b/games/blinken-kde4/pkg-descr
diff --git a/games/blinken/pkg-plist b/games/blinken-kde4/pkg-plist
index 059429552526..059429552526 100644
--- a/games/blinken/pkg-plist
+++ b/games/blinken-kde4/pkg-plist
diff --git a/games/bomber/Makefile b/games/bomber-kde4/Makefile
index 11d6d901c187..8c72072e39e0 100644
--- a/games/bomber/Makefile
+++ b/games/bomber-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bomber
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/bomber/distinfo b/games/bomber-kde4/distinfo
index 41c70148d8b4..41c70148d8b4 100644
--- a/games/bomber/distinfo
+++ b/games/bomber-kde4/distinfo
diff --git a/games/bomber/pkg-descr b/games/bomber-kde4/pkg-descr
index 0f3acb21439b..0f3acb21439b 100644
--- a/games/bomber/pkg-descr
+++ b/games/bomber-kde4/pkg-descr
diff --git a/games/bomber/pkg-plist b/games/bomber-kde4/pkg-plist
index fa760a2bd85a..fa760a2bd85a 100644
--- a/games/bomber/pkg-plist
+++ b/games/bomber-kde4/pkg-plist
diff --git a/games/bovo/Makefile b/games/bovo-kde4/Makefile
index 256a74cea350..bbc0d98b63c0 100644
--- a/games/bovo/Makefile
+++ b/games/bovo-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bovo
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/bovo/distinfo b/games/bovo-kde4/distinfo
index 14de779cd7df..14de779cd7df 100644
--- a/games/bovo/distinfo
+++ b/games/bovo-kde4/distinfo
diff --git a/games/bovo/pkg-descr b/games/bovo-kde4/pkg-descr
index 6c8c3d25deb4..6c8c3d25deb4 100644
--- a/games/bovo/pkg-descr
+++ b/games/bovo-kde4/pkg-descr
diff --git a/games/bovo/pkg-plist b/games/bovo-kde4/pkg-plist
index 6ffcdb7b0e1d..6ffcdb7b0e1d 100644
--- a/games/bovo/pkg-plist
+++ b/games/bovo-kde4/pkg-plist
diff --git a/games/granatier/Makefile b/games/granatier-kde4/Makefile
index 4d3d57018d3d..949cabedaad5 100644
--- a/games/granatier/Makefile
+++ b/games/granatier-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	granatier
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/granatier/distinfo b/games/granatier-kde4/distinfo
index b1060a7769ed..b1060a7769ed 100644
--- a/games/granatier/distinfo
+++ b/games/granatier-kde4/distinfo
diff --git a/games/granatier/pkg-descr b/games/granatier-kde4/pkg-descr
index a7edcd7658ab..a7edcd7658ab 100644
--- a/games/granatier/pkg-descr
+++ b/games/granatier-kde4/pkg-descr
diff --git a/games/granatier/pkg-plist b/games/granatier-kde4/pkg-plist
index d622f05407cb..d622f05407cb 100644
--- a/games/granatier/pkg-plist
+++ b/games/granatier-kde4/pkg-plist
diff --git a/games/kajongg/Makefile b/games/kajongg-kde4/Makefile
index 26bb54832dff..1271b4289b27 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kajongg
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kajongg/distinfo b/games/kajongg-kde4/distinfo
index 4ac92d9c8c5a..4ac92d9c8c5a 100644
--- a/games/kajongg/distinfo
+++ b/games/kajongg-kde4/distinfo
diff --git a/games/kajongg/pkg-descr b/games/kajongg-kde4/pkg-descr
index 17d013487038..17d013487038 100644
--- a/games/kajongg/pkg-descr
+++ b/games/kajongg-kde4/pkg-descr
diff --git a/games/kajongg/pkg-plist b/games/kajongg-kde4/pkg-plist
index 3ea4dc72f3d2..3ea4dc72f3d2 100644
--- a/games/kajongg/pkg-plist
+++ b/games/kajongg-kde4/pkg-plist
diff --git a/games/kanagram/Makefile b/games/kanagram-kde4/Makefile
index d73b6721a2b3..7b1466b558cc 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kanagram
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kanagram/distinfo b/games/kanagram-kde4/distinfo
index 9dc92917d696..9dc92917d696 100644
--- a/games/kanagram/distinfo
+++ b/games/kanagram-kde4/distinfo
diff --git a/games/kanagram/pkg-descr b/games/kanagram-kde4/pkg-descr
index 60d02a352fcc..60d02a352fcc 100644
--- a/games/kanagram/pkg-descr
+++ b/games/kanagram-kde4/pkg-descr
diff --git a/games/kanagram/pkg-plist b/games/kanagram-kde4/pkg-plist
index 40fd3cdcb74a..40fd3cdcb74a 100644
--- a/games/kanagram/pkg-plist
+++ b/games/kanagram-kde4/pkg-plist
diff --git a/games/kapman/Makefile b/games/kapman-kde4/Makefile
index 5319ef75d20c..226d031de0cd 100644
--- a/games/kapman/Makefile
+++ b/games/kapman-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kapman
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kapman/distinfo b/games/kapman-kde4/distinfo
index e247a44337bc..e247a44337bc 100644
--- a/games/kapman/distinfo
+++ b/games/kapman-kde4/distinfo
diff --git a/games/kapman/pkg-descr b/games/kapman-kde4/pkg-descr
index f977965ee531..f977965ee531 100644
--- a/games/kapman/pkg-descr
+++ b/games/kapman-kde4/pkg-descr
diff --git a/games/kapman/pkg-plist b/games/kapman-kde4/pkg-plist
index a1b56126a423..a1b56126a423 100644
--- a/games/kapman/pkg-plist
+++ b/games/kapman-kde4/pkg-plist
diff --git a/games/katomic/Makefile b/games/katomic-kde4/Makefile
index 9334d176cca0..2358dda2bd7a 100644
--- a/games/katomic/Makefile
+++ b/games/katomic-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	katomic
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/katomic/distinfo b/games/katomic-kde4/distinfo
index e34dec73c010..e34dec73c010 100644
--- a/games/katomic/distinfo
+++ b/games/katomic-kde4/distinfo
diff --git a/games/katomic/pkg-descr b/games/katomic-kde4/pkg-descr
index 39049abbcb7f..39049abbcb7f 100644
--- a/games/katomic/pkg-descr
+++ b/games/katomic-kde4/pkg-descr
diff --git a/games/katomic/pkg-plist b/games/katomic-kde4/pkg-plist
index 01cb3384a142..01cb3384a142 100644
--- a/games/katomic/pkg-plist
+++ b/games/katomic-kde4/pkg-plist
diff --git a/games/kblackbox/Makefile b/games/kblackbox-kde4/Makefile
index f627d57739ee..add79a706a14 100644
--- a/games/kblackbox/Makefile
+++ b/games/kblackbox-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kblackbox
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kblackbox/distinfo b/games/kblackbox-kde4/distinfo
index f3f08c1280cb..f3f08c1280cb 100644
--- a/games/kblackbox/distinfo
+++ b/games/kblackbox-kde4/distinfo
diff --git a/games/kblackbox/pkg-descr b/games/kblackbox-kde4/pkg-descr
index 7f0758f532b6..7f0758f532b6 100644
--- a/games/kblackbox/pkg-descr
+++ b/games/kblackbox-kde4/pkg-descr
diff --git a/games/kblackbox/pkg-plist b/games/kblackbox-kde4/pkg-plist
index 622c1be8f9eb..622c1be8f9eb 100644
--- a/games/kblackbox/pkg-plist
+++ b/games/kblackbox-kde4/pkg-plist
diff --git a/games/kblocks/Makefile b/games/kblocks-kde4/Makefile
index 9760cd2c8cf1..c3c7e8767114 100644
--- a/games/kblocks/Makefile
+++ b/games/kblocks-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kblocks
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kblocks/distinfo b/games/kblocks-kde4/distinfo
index d0772969b46a..d0772969b46a 100644
--- a/games/kblocks/distinfo
+++ b/games/kblocks-kde4/distinfo
diff --git a/games/kblocks/pkg-descr b/games/kblocks-kde4/pkg-descr
index 1dbe2a9405e1..1dbe2a9405e1 100644
--- a/games/kblocks/pkg-descr
+++ b/games/kblocks-kde4/pkg-descr
diff --git a/games/kblocks/pkg-plist b/games/kblocks-kde4/pkg-plist
index a6d255bf1860..a6d255bf1860 100644
--- a/games/kblocks/pkg-plist
+++ b/games/kblocks-kde4/pkg-plist
diff --git a/games/kbounce/Makefile b/games/kbounce-kde4/Makefile
index f1e6ebfe0862..162e56ed873a 100644
--- a/games/kbounce/Makefile
+++ b/games/kbounce-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kbounce
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kbounce/distinfo b/games/kbounce-kde4/distinfo
index 5e08d973c251..5e08d973c251 100644
--- a/games/kbounce/distinfo
+++ b/games/kbounce-kde4/distinfo
diff --git a/games/kbounce/pkg-descr b/games/kbounce-kde4/pkg-descr
index 95241f0ce187..95241f0ce187 100644
--- a/games/kbounce/pkg-descr
+++ b/games/kbounce-kde4/pkg-descr
diff --git a/games/kbounce/pkg-plist b/games/kbounce-kde4/pkg-plist
index 340b568c24aa..340b568c24aa 100644
--- a/games/kbounce/pkg-plist
+++ b/games/kbounce-kde4/pkg-plist
diff --git a/games/kbreakout/Makefile b/games/kbreakout-kde4/Makefile
index f69e760fdcec..968bc1fac6bd 100644
--- a/games/kbreakout/Makefile
+++ b/games/kbreakout-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kbreakout
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kbreakout/distinfo b/games/kbreakout-kde4/distinfo
index 6c42921e40fb..6c42921e40fb 100644
--- a/games/kbreakout/distinfo
+++ b/games/kbreakout-kde4/distinfo
diff --git a/games/kbreakout/pkg-descr b/games/kbreakout-kde4/pkg-descr
index 4b15cf85558d..4b15cf85558d 100644
--- a/games/kbreakout/pkg-descr
+++ b/games/kbreakout-kde4/pkg-descr
diff --git a/games/kbreakout/pkg-plist b/games/kbreakout-kde4/pkg-plist
index a7b25891d660..a7b25891d660 100644
--- a/games/kbreakout/pkg-plist
+++ b/games/kbreakout-kde4/pkg-plist
diff --git a/games/kdegames-kde4/Makefile b/games/kdegames-kde4/Makefile
index 81706609bc81..287eacb143bd 100644
--- a/games/kdegames-kde4/Makefile
+++ b/games/kdegames-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdegames
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games kde
 PKGNAMESUFFIX=	-kde4
 
@@ -18,7 +18,7 @@ OPTIONS_DEFAULT=	ALL
 
 .for game in ${KDE4_GAMES_ALL}
 # _PORT, _DETECT, and _DESC are defined in Makefile.common
-${game}_PORT?=		games/${game}
+${game}_PORT?=		games/${game}-kde4
 ${game}_DETECT?=	${KDE_PREFIX}/bin/${game}
 ${game}_DESC?=		Please fix a typo in option name/desc!
 ${game}_RUN_DEPENDS=	${${game}_DETECT}:${${game}_PORT}
diff --git a/games/kdiamond/Makefile b/games/kdiamond-kde4/Makefile
index b59970e26d4b..e9e981d6a103 100644
--- a/games/kdiamond/Makefile
+++ b/games/kdiamond-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdiamond
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kdiamond/distinfo b/games/kdiamond-kde4/distinfo
index cf6dd65c601c..cf6dd65c601c 100644
--- a/games/kdiamond/distinfo
+++ b/games/kdiamond-kde4/distinfo
diff --git a/games/kdiamond/pkg-descr b/games/kdiamond-kde4/pkg-descr
index 65665e286bcc..65665e286bcc 100644
--- a/games/kdiamond/pkg-descr
+++ b/games/kdiamond-kde4/pkg-descr
diff --git a/games/kdiamond/pkg-plist b/games/kdiamond-kde4/pkg-plist
index c8f0fdb15b99..c8f0fdb15b99 100644
--- a/games/kdiamond/pkg-plist
+++ b/games/kdiamond-kde4/pkg-plist
diff --git a/games/kfourinline/Makefile b/games/kfourinline-kde4/Makefile
index 09d7907016bf..f3313d8d72b8 100644
--- a/games/kfourinline/Makefile
+++ b/games/kfourinline-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kfourinline
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kfourinline/distinfo b/games/kfourinline-kde4/distinfo
index 5e37abcdc110..5e37abcdc110 100644
--- a/games/kfourinline/distinfo
+++ b/games/kfourinline-kde4/distinfo
diff --git a/games/kfourinline/pkg-descr b/games/kfourinline-kde4/pkg-descr
index 59090475bfc3..59090475bfc3 100644
--- a/games/kfourinline/pkg-descr
+++ b/games/kfourinline-kde4/pkg-descr
diff --git a/games/kfourinline/pkg-plist b/games/kfourinline-kde4/pkg-plist
index 5f29aae0de57..5f29aae0de57 100644
--- a/games/kfourinline/pkg-plist
+++ b/games/kfourinline-kde4/pkg-plist
diff --git a/games/kgoldrunner/Makefile b/games/kgoldrunner-kde4/Makefile
index 5e5d97e6ffea..e1a953ca0a4c 100644
--- a/games/kgoldrunner/Makefile
+++ b/games/kgoldrunner-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kgoldrunner
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kgoldrunner/distinfo b/games/kgoldrunner-kde4/distinfo
index c5ff2a0adf9c..c5ff2a0adf9c 100644
--- a/games/kgoldrunner/distinfo
+++ b/games/kgoldrunner-kde4/distinfo
diff --git a/games/kgoldrunner/pkg-descr b/games/kgoldrunner-kde4/pkg-descr
index e70f4d85934c..e70f4d85934c 100644
--- a/games/kgoldrunner/pkg-descr
+++ b/games/kgoldrunner-kde4/pkg-descr
diff --git a/games/kgoldrunner/pkg-plist b/games/kgoldrunner-kde4/pkg-plist
index 4a2fc05e0a9f..4a2fc05e0a9f 100644
--- a/games/kgoldrunner/pkg-plist
+++ b/games/kgoldrunner-kde4/pkg-plist
diff --git a/games/khangman/Makefile b/games/khangman-kde4/Makefile
index 7ff954d12882..d09f51bfa433 100644
--- a/games/khangman/Makefile
+++ b/games/khangman-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	khangman
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/khangman/distinfo b/games/khangman-kde4/distinfo
index 88a4a8440fe8..88a4a8440fe8 100644
--- a/games/khangman/distinfo
+++ b/games/khangman-kde4/distinfo
diff --git a/games/khangman/pkg-descr b/games/khangman-kde4/pkg-descr
index 78f5e86b8e9a..78f5e86b8e9a 100644
--- a/games/khangman/pkg-descr
+++ b/games/khangman-kde4/pkg-descr
diff --git a/games/khangman/pkg-plist b/games/khangman-kde4/pkg-plist
index 3809e7a392ee..3809e7a392ee 100644
--- a/games/khangman/pkg-plist
+++ b/games/khangman-kde4/pkg-plist
diff --git a/games/kigo/Makefile b/games/kigo-kde4/Makefile
index cfa51f6d7113..189e6abaa22e 100644
--- a/games/kigo/Makefile
+++ b/games/kigo-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kigo
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kigo/distinfo b/games/kigo-kde4/distinfo
index 104ba9ff93ea..104ba9ff93ea 100644
--- a/games/kigo/distinfo
+++ b/games/kigo-kde4/distinfo
diff --git a/games/kigo/pkg-descr b/games/kigo-kde4/pkg-descr
index 411af6e47921..411af6e47921 100644
--- a/games/kigo/pkg-descr
+++ b/games/kigo-kde4/pkg-descr
diff --git a/games/kigo/pkg-plist b/games/kigo-kde4/pkg-plist
index eb63b0c56053..eb63b0c56053 100644
--- a/games/kigo/pkg-plist
+++ b/games/kigo-kde4/pkg-plist
diff --git a/games/killbots/Makefile b/games/killbots-kde4/Makefile
index 7d6e01dec00c..7e5c95f32e15 100644
--- a/games/killbots/Makefile
+++ b/games/killbots-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	killbots
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/killbots/distinfo b/games/killbots-kde4/distinfo
index 9df96f3a96f6..9df96f3a96f6 100644
--- a/games/killbots/distinfo
+++ b/games/killbots-kde4/distinfo
diff --git a/games/killbots/pkg-descr b/games/killbots-kde4/pkg-descr
index 21c7cc6ff796..21c7cc6ff796 100644
--- a/games/killbots/pkg-descr
+++ b/games/killbots-kde4/pkg-descr
diff --git a/games/killbots/pkg-plist b/games/killbots-kde4/pkg-plist
index 15b5c4b4132f..15b5c4b4132f 100644
--- a/games/killbots/pkg-plist
+++ b/games/killbots-kde4/pkg-plist
diff --git a/games/kiriki/Makefile b/games/kiriki-kde4/Makefile
index 5dc1fd595e6a..2f015bb2326f 100644
--- a/games/kiriki/Makefile
+++ b/games/kiriki-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kiriki
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kiriki/distinfo b/games/kiriki-kde4/distinfo
index de1dfbbdfec7..de1dfbbdfec7 100644
--- a/games/kiriki/distinfo
+++ b/games/kiriki-kde4/distinfo
diff --git a/games/kiriki/pkg-descr b/games/kiriki-kde4/pkg-descr
index 948eb4f00097..948eb4f00097 100644
--- a/games/kiriki/pkg-descr
+++ b/games/kiriki-kde4/pkg-descr
diff --git a/games/kiriki/pkg-plist b/games/kiriki-kde4/pkg-plist
index 60b7bdec2ee7..60b7bdec2ee7 100644
--- a/games/kiriki/pkg-plist
+++ b/games/kiriki-kde4/pkg-plist
diff --git a/games/kjumpingcube/Makefile b/games/kjumpingcube-kde4/Makefile
index b52e4a779550..f7acfce20c22 100644
--- a/games/kjumpingcube/Makefile
+++ b/games/kjumpingcube-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kjumpingcube
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kjumpingcube/distinfo b/games/kjumpingcube-kde4/distinfo
index 91575b702a96..91575b702a96 100644
--- a/games/kjumpingcube/distinfo
+++ b/games/kjumpingcube-kde4/distinfo
diff --git a/games/kjumpingcube/pkg-descr b/games/kjumpingcube-kde4/pkg-descr
index d034d87ee47b..d034d87ee47b 100644
--- a/games/kjumpingcube/pkg-descr
+++ b/games/kjumpingcube-kde4/pkg-descr
diff --git a/games/kjumpingcube/pkg-plist b/games/kjumpingcube-kde4/pkg-plist
index bc95363f9492..bc95363f9492 100644
--- a/games/kjumpingcube/pkg-plist
+++ b/games/kjumpingcube-kde4/pkg-plist
diff --git a/games/klickety/Makefile b/games/klickety-kde4/Makefile
index cef273df9d88..7d5ec5f0f976 100644
--- a/games/klickety/Makefile
+++ b/games/klickety-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	klickety
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/klickety/distinfo b/games/klickety-kde4/distinfo
index 4d3d9c4be27a..4d3d9c4be27a 100644
--- a/games/klickety/distinfo
+++ b/games/klickety-kde4/distinfo
diff --git a/games/klickety/pkg-descr b/games/klickety-kde4/pkg-descr
index ec8cfe2a4f43..ec8cfe2a4f43 100644
--- a/games/klickety/pkg-descr
+++ b/games/klickety-kde4/pkg-descr
diff --git a/games/klickety/pkg-plist b/games/klickety-kde4/pkg-plist
index da8196030b41..da8196030b41 100644
--- a/games/klickety/pkg-plist
+++ b/games/klickety-kde4/pkg-plist
diff --git a/games/klines/Makefile b/games/klines-kde4/Makefile
index ec5974aeabc5..052037ecdd8f 100644
--- a/games/klines/Makefile
+++ b/games/klines-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	klines
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/klines/distinfo b/games/klines-kde4/distinfo
index 417d813bd9ed..417d813bd9ed 100644
--- a/games/klines/distinfo
+++ b/games/klines-kde4/distinfo
diff --git a/games/klines/pkg-descr b/games/klines-kde4/pkg-descr
index f8b2207f8cf1..f8b2207f8cf1 100644
--- a/games/klines/pkg-descr
+++ b/games/klines-kde4/pkg-descr
diff --git a/games/klines/pkg-plist b/games/klines-kde4/pkg-plist
index 4bb15cacc258..4bb15cacc258 100644
--- a/games/klines/pkg-plist
+++ b/games/klines-kde4/pkg-plist
diff --git a/games/kmahjongg/Makefile b/games/kmahjongg-kde4/Makefile
index eff03a1f4b48..5d88f255729b 100644
--- a/games/kmahjongg/Makefile
+++ b/games/kmahjongg-kde4/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	kmahjongg
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-LIB_DEPENDS=	libkmahjongglib.so:games/libkmahjongg
+LIB_DEPENDS=	libkmahjongglib.so:games/libkmahjongg-kde4
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs libkdegames automoc4
diff --git a/games/kmahjongg/distinfo b/games/kmahjongg-kde4/distinfo
index 7a51ee3e8270..7a51ee3e8270 100644
--- a/games/kmahjongg/distinfo
+++ b/games/kmahjongg-kde4/distinfo
diff --git a/games/kmahjongg/pkg-descr b/games/kmahjongg-kde4/pkg-descr
index 0238b53d61ab..0238b53d61ab 100644
--- a/games/kmahjongg/pkg-descr
+++ b/games/kmahjongg-kde4/pkg-descr
diff --git a/games/kmahjongg/pkg-plist b/games/kmahjongg-kde4/pkg-plist
index 13529957ee5f..13529957ee5f 100644
--- a/games/kmahjongg/pkg-plist
+++ b/games/kmahjongg-kde4/pkg-plist
diff --git a/games/kmines/Makefile b/games/kmines-kde4/Makefile
index b4d895c1ffe7..b69c1ef29d35 100644
--- a/games/kmines/Makefile
+++ b/games/kmines-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kmines
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kmines/distinfo b/games/kmines-kde4/distinfo
index 6580c1eefe08..6580c1eefe08 100644
--- a/games/kmines/distinfo
+++ b/games/kmines-kde4/distinfo
diff --git a/games/kmines/pkg-descr b/games/kmines-kde4/pkg-descr
index e1cb886ebf55..e1cb886ebf55 100644
--- a/games/kmines/pkg-descr
+++ b/games/kmines-kde4/pkg-descr
diff --git a/games/kmines/pkg-plist b/games/kmines-kde4/pkg-plist
index 9ccc622b3577..9ccc622b3577 100644
--- a/games/kmines/pkg-plist
+++ b/games/kmines-kde4/pkg-plist
diff --git a/games/knavalbattle/Makefile b/games/knavalbattle-kde4/Makefile
index 04b38488c359..1e1c1181e7a9 100644
--- a/games/knavalbattle/Makefile
+++ b/games/knavalbattle-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	knavalbattle
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/knavalbattle/distinfo b/games/knavalbattle-kde4/distinfo
index 7bb36f190ae9..7bb36f190ae9 100644
--- a/games/knavalbattle/distinfo
+++ b/games/knavalbattle-kde4/distinfo
diff --git a/games/knavalbattle/pkg-descr b/games/knavalbattle-kde4/pkg-descr
index 6123de0fd669..6123de0fd669 100644
--- a/games/knavalbattle/pkg-descr
+++ b/games/knavalbattle-kde4/pkg-descr
diff --git a/games/knavalbattle/pkg-plist b/games/knavalbattle-kde4/pkg-plist
index 24dce5efbd4c..24dce5efbd4c 100644
--- a/games/knavalbattle/pkg-plist
+++ b/games/knavalbattle-kde4/pkg-plist
diff --git a/games/knetwalk/Makefile b/games/knetwalk-kde4/Makefile
index 54b52858591e..5c088f32ba7f 100644
--- a/games/knetwalk/Makefile
+++ b/games/knetwalk-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	knetwalk
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/knetwalk/distinfo b/games/knetwalk-kde4/distinfo
index cae46f7d5850..cae46f7d5850 100644
--- a/games/knetwalk/distinfo
+++ b/games/knetwalk-kde4/distinfo
diff --git a/games/knetwalk/pkg-descr b/games/knetwalk-kde4/pkg-descr
index 8e5d6540e198..8e5d6540e198 100644
--- a/games/knetwalk/pkg-descr
+++ b/games/knetwalk-kde4/pkg-descr
diff --git a/games/knetwalk/pkg-plist b/games/knetwalk-kde4/pkg-plist
index 4f40d4c8677c..4f40d4c8677c 100644
--- a/games/knetwalk/pkg-plist
+++ b/games/knetwalk-kde4/pkg-plist
diff --git a/games/kolf/Makefile b/games/kolf-kde4/Makefile
index e44284a58fa6..c6c2cc5c7383 100644
--- a/games/kolf/Makefile
+++ b/games/kolf-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kolf
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kolf/distinfo b/games/kolf-kde4/distinfo
index 6f89e517f1c1..6f89e517f1c1 100644
--- a/games/kolf/distinfo
+++ b/games/kolf-kde4/distinfo
diff --git a/games/kolf/pkg-descr b/games/kolf-kde4/pkg-descr
index bc43ac2a2df1..bc43ac2a2df1 100644
--- a/games/kolf/pkg-descr
+++ b/games/kolf-kde4/pkg-descr
diff --git a/games/kolf/pkg-plist b/games/kolf-kde4/pkg-plist
index 2b51e1aaaaa9..2b51e1aaaaa9 100644
--- a/games/kolf/pkg-plist
+++ b/games/kolf-kde4/pkg-plist
diff --git a/games/kollision/Makefile b/games/kollision-kde4/Makefile
index 92e03b01fd13..6cfc68b36036 100644
--- a/games/kollision/Makefile
+++ b/games/kollision-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kollision
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kollision/distinfo b/games/kollision-kde4/distinfo
index a060dc0e3679..a060dc0e3679 100644
--- a/games/kollision/distinfo
+++ b/games/kollision-kde4/distinfo
diff --git a/games/kollision/pkg-descr b/games/kollision-kde4/pkg-descr
index aae9d94b314c..aae9d94b314c 100644
--- a/games/kollision/pkg-descr
+++ b/games/kollision-kde4/pkg-descr
diff --git a/games/kollision/pkg-plist b/games/kollision-kde4/pkg-plist
index bf2942ae91ae..bf2942ae91ae 100644
--- a/games/kollision/pkg-plist
+++ b/games/kollision-kde4/pkg-plist
diff --git a/games/konquest/Makefile b/games/konquest-kde4/Makefile
index 1097a4edf2c5..92a11e72a89e 100644
--- a/games/konquest/Makefile
+++ b/games/konquest-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	konquest
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/konquest/distinfo b/games/konquest-kde4/distinfo
index e38904902db9..e38904902db9 100644
--- a/games/konquest/distinfo
+++ b/games/konquest-kde4/distinfo
diff --git a/games/konquest/pkg-descr b/games/konquest-kde4/pkg-descr
index e015a9e7fdb8..e015a9e7fdb8 100644
--- a/games/konquest/pkg-descr
+++ b/games/konquest-kde4/pkg-descr
diff --git a/games/konquest/pkg-plist b/games/konquest-kde4/pkg-plist
index 8df833555b50..8df833555b50 100644
--- a/games/konquest/pkg-plist
+++ b/games/konquest-kde4/pkg-plist
diff --git a/games/kpat/Makefile b/games/kpat-kde4/Makefile
index 126245702ffa..3f0118ab4cad 100644
--- a/games/kpat/Makefile
+++ b/games/kpat-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kpat
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kpat/distinfo b/games/kpat-kde4/distinfo
index 7e6ea0e2aab1..7e6ea0e2aab1 100644
--- a/games/kpat/distinfo
+++ b/games/kpat-kde4/distinfo
diff --git a/games/kpat/pkg-descr b/games/kpat-kde4/pkg-descr
index 5f20e210522e..5f20e210522e 100644
--- a/games/kpat/pkg-descr
+++ b/games/kpat-kde4/pkg-descr
diff --git a/games/kpat/pkg-plist b/games/kpat-kde4/pkg-plist
index 4c9af99b88c1..4c9af99b88c1 100644
--- a/games/kpat/pkg-plist
+++ b/games/kpat-kde4/pkg-plist
diff --git a/games/kreversi/Makefile b/games/kreversi-kde4/Makefile
index b2c8e16afc58..1bd7067d71f8 100644
--- a/games/kreversi/Makefile
+++ b/games/kreversi-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kreversi
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kreversi/distinfo b/games/kreversi-kde4/distinfo
index 1afe953c038f..1afe953c038f 100644
--- a/games/kreversi/distinfo
+++ b/games/kreversi-kde4/distinfo
diff --git a/games/kreversi/pkg-descr b/games/kreversi-kde4/pkg-descr
index e322c1177648..e322c1177648 100644
--- a/games/kreversi/pkg-descr
+++ b/games/kreversi-kde4/pkg-descr
diff --git a/games/kreversi/pkg-plist b/games/kreversi-kde4/pkg-plist
index e1d60e7daad3..e1d60e7daad3 100644
--- a/games/kreversi/pkg-plist
+++ b/games/kreversi-kde4/pkg-plist
diff --git a/games/kshisen/Makefile b/games/kshisen-kde4/Makefile
index 1e78c31a99ca..74780fba8a4b 100644
--- a/games/kshisen/Makefile
+++ b/games/kshisen-kde4/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	kshisen
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-LIB_DEPENDS=	libkmahjongglib.so:games/libkmahjongg
+LIB_DEPENDS=	libkmahjongglib.so:games/libkmahjongg-kde4
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs libkdegames automoc4
diff --git a/games/kshisen/distinfo b/games/kshisen-kde4/distinfo
index 43e08fb9c90c..43e08fb9c90c 100644
--- a/games/kshisen/distinfo
+++ b/games/kshisen-kde4/distinfo
diff --git a/games/kshisen/pkg-descr b/games/kshisen-kde4/pkg-descr
index 937cce6e844c..937cce6e844c 100644
--- a/games/kshisen/pkg-descr
+++ b/games/kshisen-kde4/pkg-descr
diff --git a/games/kshisen/pkg-plist b/games/kshisen-kde4/pkg-plist
index 635f5a7e7af4..635f5a7e7af4 100644
--- a/games/kshisen/pkg-plist
+++ b/games/kshisen-kde4/pkg-plist
diff --git a/games/ksirk/Makefile b/games/ksirk-kde4/Makefile
index 835bf66f52e8..d36a46456576 100644
--- a/games/ksirk/Makefile
+++ b/games/ksirk-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksirk
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/ksirk/distinfo b/games/ksirk-kde4/distinfo
index 11b62694eea6..11b62694eea6 100644
--- a/games/ksirk/distinfo
+++ b/games/ksirk-kde4/distinfo
diff --git a/games/ksirk/pkg-descr b/games/ksirk-kde4/pkg-descr
index e98b502445ec..e98b502445ec 100644
--- a/games/ksirk/pkg-descr
+++ b/games/ksirk-kde4/pkg-descr
diff --git a/games/ksirk/pkg-plist b/games/ksirk-kde4/pkg-plist
index 69a9c19f9177..69a9c19f9177 100644
--- a/games/ksirk/pkg-plist
+++ b/games/ksirk-kde4/pkg-plist
diff --git a/games/ksnakeduel/Makefile b/games/ksnakeduel-kde4/Makefile
index 121463b24ed4..dbb4a4e5991b 100644
--- a/games/ksnakeduel/Makefile
+++ b/games/ksnakeduel-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksnakeduel
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/ksnakeduel/distinfo b/games/ksnakeduel-kde4/distinfo
index 4de2137d9ead..4de2137d9ead 100644
--- a/games/ksnakeduel/distinfo
+++ b/games/ksnakeduel-kde4/distinfo
diff --git a/games/ksnakeduel/pkg-descr b/games/ksnakeduel-kde4/pkg-descr
index 0fa0acafb268..0fa0acafb268 100644
--- a/games/ksnakeduel/pkg-descr
+++ b/games/ksnakeduel-kde4/pkg-descr
diff --git a/games/ksnakeduel/pkg-plist b/games/ksnakeduel-kde4/pkg-plist
index 4672f29c1cd4..4672f29c1cd4 100644
--- a/games/ksnakeduel/pkg-plist
+++ b/games/ksnakeduel-kde4/pkg-plist
diff --git a/games/kspaceduel/Makefile b/games/kspaceduel-kde4/Makefile
index cdd0dca6f526..a2a3b5009b81 100644
--- a/games/kspaceduel/Makefile
+++ b/games/kspaceduel-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kspaceduel
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kspaceduel/distinfo b/games/kspaceduel-kde4/distinfo
index c4db6284d898..c4db6284d898 100644
--- a/games/kspaceduel/distinfo
+++ b/games/kspaceduel-kde4/distinfo
diff --git a/games/kspaceduel/pkg-descr b/games/kspaceduel-kde4/pkg-descr
index a52bb89ed5b5..a52bb89ed5b5 100644
--- a/games/kspaceduel/pkg-descr
+++ b/games/kspaceduel-kde4/pkg-descr
diff --git a/games/kspaceduel/pkg-plist b/games/kspaceduel-kde4/pkg-plist
index c1d2f6641037..c1d2f6641037 100644
--- a/games/kspaceduel/pkg-plist
+++ b/games/kspaceduel-kde4/pkg-plist
diff --git a/games/ksquares/Makefile b/games/ksquares-kde4/Makefile
index 8e498308486f..bcddd12fc52d 100644
--- a/games/ksquares/Makefile
+++ b/games/ksquares-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksquares
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/ksquares/distinfo b/games/ksquares-kde4/distinfo
index 07f893e209ce..07f893e209ce 100644
--- a/games/ksquares/distinfo
+++ b/games/ksquares-kde4/distinfo
diff --git a/games/ksquares/pkg-descr b/games/ksquares-kde4/pkg-descr
index d192b32953e3..d192b32953e3 100644
--- a/games/ksquares/pkg-descr
+++ b/games/ksquares-kde4/pkg-descr
diff --git a/games/ksquares/pkg-plist b/games/ksquares-kde4/pkg-plist
index 8e91749c604e..8e91749c604e 100644
--- a/games/ksquares/pkg-plist
+++ b/games/ksquares-kde4/pkg-plist
diff --git a/games/ksudoku/Makefile b/games/ksudoku-kde4/Makefile
index 9923a59dae1b..eb6081ee317d 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksudoku
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/ksudoku/distinfo b/games/ksudoku-kde4/distinfo
index 54a1d3f478d6..54a1d3f478d6 100644
--- a/games/ksudoku/distinfo
+++ b/games/ksudoku-kde4/distinfo
diff --git a/games/ksudoku/pkg-descr b/games/ksudoku-kde4/pkg-descr
index 6a40506a17ef..6a40506a17ef 100644
--- a/games/ksudoku/pkg-descr
+++ b/games/ksudoku-kde4/pkg-descr
diff --git a/games/ksudoku/pkg-plist b/games/ksudoku-kde4/pkg-plist
index 56496711f7ca..56496711f7ca 100644
--- a/games/ksudoku/pkg-plist
+++ b/games/ksudoku-kde4/pkg-plist
diff --git a/games/ktuberling/Makefile b/games/ktuberling-kde4/Makefile
index 3ac17f161220..e3c69a000e3e 100644
--- a/games/ktuberling/Makefile
+++ b/games/ktuberling-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ktuberling
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/ktuberling/distinfo b/games/ktuberling-kde4/distinfo
index e2946044d89f..e2946044d89f 100644
--- a/games/ktuberling/distinfo
+++ b/games/ktuberling-kde4/distinfo
diff --git a/games/ktuberling/pkg-descr b/games/ktuberling-kde4/pkg-descr
index b53319f2907b..b53319f2907b 100644
--- a/games/ktuberling/pkg-descr
+++ b/games/ktuberling-kde4/pkg-descr
diff --git a/games/ktuberling/pkg-plist b/games/ktuberling-kde4/pkg-plist
index 080a3e3899e4..080a3e3899e4 100644
--- a/games/ktuberling/pkg-plist
+++ b/games/ktuberling-kde4/pkg-plist
diff --git a/games/kubrick/Makefile b/games/kubrick-kde4/Makefile
index d5f6ba2a05ca..8914d3776aed 100644
--- a/games/kubrick/Makefile
+++ b/games/kubrick-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kubrick
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/kubrick/distinfo b/games/kubrick-kde4/distinfo
index 86834e0f0ade..86834e0f0ade 100644
--- a/games/kubrick/distinfo
+++ b/games/kubrick-kde4/distinfo
diff --git a/games/kubrick/pkg-descr b/games/kubrick-kde4/pkg-descr
index 24b8264f6883..24b8264f6883 100644
--- a/games/kubrick/pkg-descr
+++ b/games/kubrick-kde4/pkg-descr
diff --git a/games/kubrick/pkg-plist b/games/kubrick-kde4/pkg-plist
index d9cc217d3708..d9cc217d3708 100644
--- a/games/kubrick/pkg-plist
+++ b/games/kubrick-kde4/pkg-plist
diff --git a/games/libkdegames/Makefile b/games/libkdegames-kde4/Makefile
index faef2cb397df..9a303d333c51 100644
--- a/games/libkdegames/Makefile
+++ b/games/libkdegames-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkdegames
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/libkdegames/distinfo b/games/libkdegames-kde4/distinfo
index 9e40fc862b64..9e40fc862b64 100644
--- a/games/libkdegames/distinfo
+++ b/games/libkdegames-kde4/distinfo
diff --git a/games/libkdegames/pkg-descr b/games/libkdegames-kde4/pkg-descr
index f3cccab792ce..f3cccab792ce 100644
--- a/games/libkdegames/pkg-descr
+++ b/games/libkdegames-kde4/pkg-descr
diff --git a/games/libkdegames/pkg-plist b/games/libkdegames-kde4/pkg-plist
index 90beab79e74b..90beab79e74b 100644
--- a/games/libkdegames/pkg-plist
+++ b/games/libkdegames-kde4/pkg-plist
diff --git a/games/libkmahjongg/Makefile b/games/libkmahjongg-kde4/Makefile
index 94a74c78ac87..ff70e3eebc04 100644
--- a/games/libkmahjongg/Makefile
+++ b/games/libkmahjongg-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkmahjongg
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/libkmahjongg/distinfo b/games/libkmahjongg-kde4/distinfo
index 2354282b1ccd..2354282b1ccd 100644
--- a/games/libkmahjongg/distinfo
+++ b/games/libkmahjongg-kde4/distinfo
diff --git a/games/libkmahjongg/pkg-descr b/games/libkmahjongg-kde4/pkg-descr
index d229cb308602..d229cb308602 100644
--- a/games/libkmahjongg/pkg-descr
+++ b/games/libkmahjongg-kde4/pkg-descr
diff --git a/games/libkmahjongg/pkg-plist b/games/libkmahjongg-kde4/pkg-plist
index 1acd765f061b..1acd765f061b 100644
--- a/games/libkmahjongg/pkg-plist
+++ b/games/libkmahjongg-kde4/pkg-plist
diff --git a/games/lskat/Makefile b/games/lskat-kde4/Makefile
index eac18fd26aa7..7339a56ff18e 100644
--- a/games/lskat/Makefile
+++ b/games/lskat-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lskat
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/lskat/distinfo b/games/lskat-kde4/distinfo
index e5ccd0a4ec75..e5ccd0a4ec75 100644
--- a/games/lskat/distinfo
+++ b/games/lskat-kde4/distinfo
diff --git a/games/lskat/pkg-descr b/games/lskat-kde4/pkg-descr
index 671efd7f64b2..671efd7f64b2 100644
--- a/games/lskat/pkg-descr
+++ b/games/lskat-kde4/pkg-descr
diff --git a/games/lskat/pkg-plist b/games/lskat-kde4/pkg-plist
index 45a4f72cec4c..45a4f72cec4c 100644
--- a/games/lskat/pkg-plist
+++ b/games/lskat-kde4/pkg-plist
diff --git a/games/pairs/Makefile b/games/pairs-kde4/Makefile
index 22134db0fb47..bd7d72ce774c 100644
--- a/games/pairs/Makefile
+++ b/games/pairs-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pairs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/pairs/distinfo b/games/pairs-kde4/distinfo
index 1f66658bce46..1f66658bce46 100644
--- a/games/pairs/distinfo
+++ b/games/pairs-kde4/distinfo
diff --git a/games/pairs/pkg-descr b/games/pairs-kde4/pkg-descr
index e7d72e148fdf..e7d72e148fdf 100644
--- a/games/pairs/pkg-descr
+++ b/games/pairs-kde4/pkg-descr
diff --git a/games/pairs/pkg-plist b/games/pairs-kde4/pkg-plist
index 1858a32c2783..1858a32c2783 100644
--- a/games/pairs/pkg-plist
+++ b/games/pairs-kde4/pkg-plist
diff --git a/games/palapeli/Makefile b/games/palapeli-kde4/Makefile
index a2251e0cd6f8..34d75c341bba 100644
--- a/games/palapeli/Makefile
+++ b/games/palapeli-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	palapeli
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/palapeli/distinfo b/games/palapeli-kde4/distinfo
index 72bf372010a1..72bf372010a1 100644
--- a/games/palapeli/distinfo
+++ b/games/palapeli-kde4/distinfo
diff --git a/games/palapeli/pkg-descr b/games/palapeli-kde4/pkg-descr
index 1700a27bbe5d..1700a27bbe5d 100644
--- a/games/palapeli/pkg-descr
+++ b/games/palapeli-kde4/pkg-descr
diff --git a/games/palapeli/pkg-plist b/games/palapeli-kde4/pkg-plist
index e4a44deb8448..e4a44deb8448 100644
--- a/games/palapeli/pkg-plist
+++ b/games/palapeli-kde4/pkg-plist
diff --git a/games/picmi/Makefile b/games/picmi-kde4/Makefile
index 8de195f14ea3..a13a693858ff 100644
--- a/games/picmi/Makefile
+++ b/games/picmi-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	picmi
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/games/picmi/distinfo b/games/picmi-kde4/distinfo
index b62c58f46c6a..b62c58f46c6a 100644
--- a/games/picmi/distinfo
+++ b/games/picmi-kde4/distinfo
diff --git a/games/picmi/pkg-descr b/games/picmi-kde4/pkg-descr
index 6180180a9a31..6180180a9a31 100644
--- a/games/picmi/pkg-descr
+++ b/games/picmi-kde4/pkg-descr
diff --git a/games/picmi/pkg-plist b/games/picmi-kde4/pkg-plist
index 3f42b7e54f84..3f42b7e54f84 100644
--- a/games/picmi/pkg-plist
+++ b/games/picmi-kde4/pkg-plist
diff --git a/graphics/Makefile b/graphics/Makefile
index cf1f0c599775..a77f13e01da5 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -405,7 +405,7 @@
     SUBDIR += jpgtn
     SUBDIR += jslice
     SUBDIR += kamera-kde4
-    SUBDIR += kcolorchooser
+    SUBDIR += kcolorchooser-kde4
     SUBDIR += kcoloredit
     SUBDIR += kdegraphics-kde4
     SUBDIR += kdegraphics-mobipocket-kde4
@@ -462,13 +462,13 @@
     SUBDIR += kix-kmod
     SUBDIR += klatexformula
     SUBDIR += kludge3d
-    SUBDIR += kolourpaint
+    SUBDIR += kolourpaint-kde4
     SUBDIR += kphotoalbum-kde4
     SUBDIR += kpovmodeler
-    SUBDIR += kqtquickcharts
+    SUBDIR += kqtquickcharts-kde4
     SUBDIR += krita
-    SUBDIR += ksaneplugin
-    SUBDIR += ksnapshot
+    SUBDIR += ksaneplugin-kde4
+    SUBDIR += ksnapshot-kde4
     SUBDIR += kudu
     SUBDIR += l2p
     SUBDIR += largetifftools
@@ -522,7 +522,7 @@
     SUBDIR += libkface
     SUBDIR += libkipi-kde4
     SUBDIR += libkipiplugins
-    SUBDIR += libksane
+    SUBDIR += libksane-kde4
     SUBDIR += libkscreen
     SUBDIR += liblqr-1
     SUBDIR += liblug
@@ -630,7 +630,7 @@
     SUBDIR += ocrad
     SUBDIR += ocre
     SUBDIR += ogre3d
-    SUBDIR += okular
+    SUBDIR += okular-kde4
     SUBDIR += opencollada
     SUBDIR += opencolorio
     SUBDIR += opencolorio-tools
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser-kde4/Makefile
index 5af365e3680b..59775eb7334d 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kcolorchooser
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/kcolorchooser/distinfo b/graphics/kcolorchooser-kde4/distinfo
index c68023c35bf8..c68023c35bf8 100644
--- a/graphics/kcolorchooser/distinfo
+++ b/graphics/kcolorchooser-kde4/distinfo
diff --git a/graphics/kcolorchooser/pkg-descr b/graphics/kcolorchooser-kde4/pkg-descr
index 1e760f7912f1..1e760f7912f1 100644
--- a/graphics/kcolorchooser/pkg-descr
+++ b/graphics/kcolorchooser-kde4/pkg-descr
diff --git a/graphics/kcolorchooser/pkg-plist b/graphics/kcolorchooser-kde4/pkg-plist
index 52341567364f..52341567364f 100644
--- a/graphics/kcolorchooser/pkg-plist
+++ b/graphics/kcolorchooser-kde4/pkg-plist
diff --git a/graphics/kdegraphics-kde4/Makefile b/graphics/kdegraphics-kde4/Makefile
index 41ef0036af09..02f1a544862d 100644
--- a/graphics/kdegraphics-kde4/Makefile
+++ b/graphics/kdegraphics-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde
 PKGNAMESUFFIX=	-kde4
 
@@ -33,25 +33,25 @@ GWENVIEW_DESC=		Image viewer and browser
 GWENVIEW_RUN_DEPENDS=	${KDE_PREFIX}/bin/gwenview:graphics/gwenview-kde4
 
 KCOLORCHOOSER_DESC=	Utility for colors selection
-KCOLORCHOOSER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcolorchooser:graphics/kcolorchooser
+KCOLORCHOOSER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcolorchooser:graphics/kcolorchooser-kde4
 
 KGAMMA_DESC=		Monitor calibration tool
-KGAMMA_RUN_DEPENDS=	${KDE_PREFIX}/bin/xf86gammacfg:x11/kgamma
+KGAMMA_RUN_DEPENDS=	${KDE_PREFIX}/bin/xf86gammacfg:x11/kgamma-kde4
 
 KOLOURPAINT_DESC=	Paint application
-KOLOURPAINT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kolourpaint:graphics/kolourpaint
+KOLOURPAINT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kolourpaint:graphics/kolourpaint-kde4
 
 KRULER_DESC=		Screen ruler
-KRULER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kruler:deskutils/kruler
+KRULER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kruler:deskutils/kruler-kde4
 
 KSNAPSHOT_DESC=		Screen capture program
-KSNAPSHOT_RUN_DEPENDS=	${KDE_PREFIX}/bin/ksnapshot:graphics/ksnapshot
+KSNAPSHOT_RUN_DEPENDS=	${KDE_PREFIX}/bin/ksnapshot:graphics/ksnapshot-kde4
 
 MOBIPOCKET_DESC=	Mobipocket plugins for Strigi indexing and thumbnailers
 MOBIPOCKET_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/mobithumbnail.so:graphics/kdegraphics-mobipocket-kde4 \
 
 SANE_DESC=		Plugin for scanning on KDE
-SANE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/ksaneplugin.so:graphics/ksaneplugin
+SANE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/ksaneplugin.so:graphics/ksaneplugin-kde4
 
 STRIGI_DESC=		Strigi analyzers for graphics file formats
 STRIGI_RUN_DEPENDS=	${KDE_PREFIX}/lib/strigi/strigiea_dvi.so:graphics/kdegraphics-strigi-analyzer-kde4
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint-kde4/Makefile
index 92e91e1f0dd3..a0bdf87305df 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kolourpaint
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/kolourpaint/distinfo b/graphics/kolourpaint-kde4/distinfo
index bd5ee0679c91..bd5ee0679c91 100644
--- a/graphics/kolourpaint/distinfo
+++ b/graphics/kolourpaint-kde4/distinfo
diff --git a/graphics/kolourpaint/pkg-descr b/graphics/kolourpaint-kde4/pkg-descr
index 23753169c575..23753169c575 100644
--- a/graphics/kolourpaint/pkg-descr
+++ b/graphics/kolourpaint-kde4/pkg-descr
diff --git a/graphics/kolourpaint/pkg-plist b/graphics/kolourpaint-kde4/pkg-plist
index e36462b5a31a..e36462b5a31a 100644
--- a/graphics/kolourpaint/pkg-plist
+++ b/graphics/kolourpaint-kde4/pkg-plist
diff --git a/graphics/kqtquickcharts/Makefile b/graphics/kqtquickcharts-kde4/Makefile
index 4ff7361d3cbf..53bc75a35621 100644
--- a/graphics/kqtquickcharts/Makefile
+++ b/graphics/kqtquickcharts-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kqtquickcharts
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/kqtquickcharts/distinfo b/graphics/kqtquickcharts-kde4/distinfo
index c07da525160d..c07da525160d 100644
--- a/graphics/kqtquickcharts/distinfo
+++ b/graphics/kqtquickcharts-kde4/distinfo
diff --git a/graphics/kqtquickcharts/pkg-descr b/graphics/kqtquickcharts-kde4/pkg-descr
index c50ab0d39c8e..c50ab0d39c8e 100644
--- a/graphics/kqtquickcharts/pkg-descr
+++ b/graphics/kqtquickcharts-kde4/pkg-descr
diff --git a/graphics/kqtquickcharts/pkg-plist b/graphics/kqtquickcharts-kde4/pkg-plist
index d359aa86feef..d359aa86feef 100644
--- a/graphics/kqtquickcharts/pkg-plist
+++ b/graphics/kqtquickcharts-kde4/pkg-plist
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin-kde4/Makefile
index ede7013fccb8..f11b95265946 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksaneplugin
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/ksaneplugin/distinfo b/graphics/ksaneplugin-kde4/distinfo
index 8a4fbb855c2f..8a4fbb855c2f 100644
--- a/graphics/ksaneplugin/distinfo
+++ b/graphics/ksaneplugin-kde4/distinfo
diff --git a/graphics/ksaneplugin/pkg-descr b/graphics/ksaneplugin-kde4/pkg-descr
index ea7f4a8f1adb..ea7f4a8f1adb 100644
--- a/graphics/ksaneplugin/pkg-descr
+++ b/graphics/ksaneplugin-kde4/pkg-descr
diff --git a/graphics/ksaneplugin/pkg-plist b/graphics/ksaneplugin-kde4/pkg-plist
index dc0ea6fcec66..dc0ea6fcec66 100644
--- a/graphics/ksaneplugin/pkg-plist
+++ b/graphics/ksaneplugin-kde4/pkg-plist
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot-kde4/Makefile
index 1ea0d1c02a3d..01a0a9e93a5c 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksnapshot
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/ksnapshot/distinfo b/graphics/ksnapshot-kde4/distinfo
index 8ebacc1d15ae..8ebacc1d15ae 100644
--- a/graphics/ksnapshot/distinfo
+++ b/graphics/ksnapshot-kde4/distinfo
diff --git a/graphics/ksnapshot/pkg-descr b/graphics/ksnapshot-kde4/pkg-descr
index c2af9743f727..c2af9743f727 100644
--- a/graphics/ksnapshot/pkg-descr
+++ b/graphics/ksnapshot-kde4/pkg-descr
diff --git a/graphics/ksnapshot/pkg-plist b/graphics/ksnapshot-kde4/pkg-plist
index 10c11ef1e18e..10c11ef1e18e 100644
--- a/graphics/ksnapshot/pkg-plist
+++ b/graphics/ksnapshot-kde4/pkg-plist
diff --git a/graphics/libksane/Makefile b/graphics/libksane-kde4/Makefile
index 2eb30001cca5..632fa4ec8bf8 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libksane
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/libksane/distinfo b/graphics/libksane-kde4/distinfo
index ae03eabe5178..ae03eabe5178 100644
--- a/graphics/libksane/distinfo
+++ b/graphics/libksane-kde4/distinfo
diff --git a/graphics/libksane/files/patch-KSaneConfig.cmake.in b/graphics/libksane-kde4/files/patch-KSaneConfig.cmake.in
index a8021394bf7f..a8021394bf7f 100644
--- a/graphics/libksane/files/patch-KSaneConfig.cmake.in
+++ b/graphics/libksane-kde4/files/patch-KSaneConfig.cmake.in
diff --git a/graphics/libksane/pkg-descr b/graphics/libksane-kde4/pkg-descr
index 584c715f04ec..584c715f04ec 100644
--- a/graphics/libksane/pkg-descr
+++ b/graphics/libksane-kde4/pkg-descr
diff --git a/graphics/libksane/pkg-plist b/graphics/libksane-kde4/pkg-plist
index 0ec5044adfc5..0ec5044adfc5 100644
--- a/graphics/libksane/pkg-plist
+++ b/graphics/libksane-kde4/pkg-plist
diff --git a/graphics/okular/Makefile b/graphics/okular-kde4/Makefile
index 01012dea0515..baa9e826f8f3 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	okular
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/okular/distinfo b/graphics/okular-kde4/distinfo
index fa7dc33bd41b..fa7dc33bd41b 100644
--- a/graphics/okular/distinfo
+++ b/graphics/okular-kde4/distinfo
diff --git a/graphics/okular/files/patch-OkularConfig.cmake b/graphics/okular-kde4/files/patch-OkularConfig.cmake
index 965d76a1272d..965d76a1272d 100644
--- a/graphics/okular/files/patch-OkularConfig.cmake
+++ b/graphics/okular-kde4/files/patch-OkularConfig.cmake
diff --git a/graphics/okular/files/patch-shell__shell.cpp b/graphics/okular-kde4/files/patch-shell__shell.cpp
index 9fb4366c96d2..9fb4366c96d2 100644
--- a/graphics/okular/files/patch-shell__shell.cpp
+++ b/graphics/okular-kde4/files/patch-shell__shell.cpp
diff --git a/graphics/okular/pkg-descr b/graphics/okular-kde4/pkg-descr
index e89ed77d62b9..e89ed77d62b9 100644
--- a/graphics/okular/pkg-descr
+++ b/graphics/okular-kde4/pkg-descr
diff --git a/graphics/okular/pkg-plist b/graphics/okular-kde4/pkg-plist
index 49cd3510367a..49cd3510367a 100644
--- a/graphics/okular/pkg-plist
+++ b/graphics/okular-kde4/pkg-plist
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index fb4540c6799f..d559b4f4db5b 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	skanlite
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/extragear
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Simple image scanning application for KDE
 
-LIB_DEPENDS=	libksane.so:graphics/libksane
+LIB_DEPENDS=	libksane.so:graphics/libksane-kde4
 
 USES=		cmake:outsource gettext kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
diff --git a/japanese/Makefile b/japanese/Makefile
index 01982bda6a4b..572d65e720a9 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -141,7 +141,7 @@
     SUBDIR += kde4-l10n
     SUBDIR += kdrill
     SUBDIR += kinput2
-    SUBDIR += kiten
+    SUBDIR += kiten-kde4
     SUBDIR += kon2-14dot
     SUBDIR += kon2-16dot
     SUBDIR += kpcal
diff --git a/japanese/kiten/Makefile b/japanese/kiten-kde4/Makefile
index 5aedfb3ddc24..80269512f29b 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kiten
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/japanese/kiten/distinfo b/japanese/kiten-kde4/distinfo
index 3af2fe5e4595..3af2fe5e4595 100644
--- a/japanese/kiten/distinfo
+++ b/japanese/kiten-kde4/distinfo
diff --git a/japanese/kiten/pkg-descr b/japanese/kiten-kde4/pkg-descr
index db66701f05c6..db66701f05c6 100644
--- a/japanese/kiten/pkg-descr
+++ b/japanese/kiten-kde4/pkg-descr
diff --git a/japanese/kiten/pkg-plist b/japanese/kiten-kde4/pkg-plist
index b5b8b19e4ac9..b5b8b19e4ac9 100644
--- a/japanese/kiten/pkg-plist
+++ b/japanese/kiten-kde4/pkg-plist
diff --git a/lang/Makefile b/lang/Makefile
index f645b7f8e928..d6c70f2bc9bd 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -150,7 +150,7 @@
     SUBDIR += jython
     SUBDIR += kawa
     SUBDIR += kf5-kross
-    SUBDIR += kturtle
+    SUBDIR += kturtle-kde4
     SUBDIR += lafontaine
     SUBDIR += lci
     SUBDIR += ldc
diff --git a/lang/kturtle/Makefile b/lang/kturtle-kde4/Makefile
index 055bc81b3736..39626ff269b3 100644
--- a/lang/kturtle/Makefile
+++ b/lang/kturtle-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kturtle
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/lang/kturtle/distinfo b/lang/kturtle-kde4/distinfo
index c965ef680e0c..c965ef680e0c 100644
--- a/lang/kturtle/distinfo
+++ b/lang/kturtle-kde4/distinfo
diff --git a/lang/kturtle/pkg-descr b/lang/kturtle-kde4/pkg-descr
index eb1c114f5db0..eb1c114f5db0 100644
--- a/lang/kturtle/pkg-descr
+++ b/lang/kturtle-kde4/pkg-descr
diff --git a/lang/kturtle/pkg-plist b/lang/kturtle-kde4/pkg-plist
index 4de63e6326a4..4de63e6326a4 100644
--- a/lang/kturtle/pkg-plist
+++ b/lang/kturtle-kde4/pkg-plist
diff --git a/math/Makefile b/math/Makefile
index e3849753af1e..21e859c9d76f 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -106,7 +106,7 @@
     SUBDIR += alt-ergo
     SUBDIR += amath
     SUBDIR += ambit
-    SUBDIR += analitza
+    SUBDIR += analitza-kde4
     SUBDIR += ann
     SUBDIR += apc
     SUBDIR += aribas
@@ -129,7 +129,7 @@
     SUBDIR += calc
     SUBDIR += calcoo
     SUBDIR += calctool
-    SUBDIR += cantor
+    SUBDIR += cantor-kde4
     SUBDIR += cblas
     SUBDIR += ccmath
     SUBDIR += ceres-solver
@@ -263,12 +263,12 @@
     SUBDIR += jsmath-fonts
     SUBDIR += jtransforms
     SUBDIR += jts
-    SUBDIR += kalgebra
-    SUBDIR += kbruch
-    SUBDIR += kcalc
-    SUBDIR += kig
+    SUBDIR += kalgebra-kde4
+    SUBDIR += kbruch-kde4
+    SUBDIR += kcalc-kde4
+    SUBDIR += kig-kde4
     SUBDIR += kktdirect
-    SUBDIR += kmplot
+    SUBDIR += kmplot-kde4
     SUBDIR += labplot
     SUBDIR += lambda
     SUBDIR += lapack
@@ -693,7 +693,7 @@
     SUBDIR += rexx-regmath
     SUBDIR += rkward-kde4
     SUBDIR += rngstreams
-    SUBDIR += rocs
+    SUBDIR += rocs-kde4
     SUBDIR += rpcalc
     SUBDIR += rpy
     SUBDIR += rpy2
diff --git a/math/analitza/Makefile b/math/analitza-kde4/Makefile
index 519d48a190bf..a830604d0eaf 100644
--- a/math/analitza/Makefile
+++ b/math/analitza-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	analitza
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/analitza/distinfo b/math/analitza-kde4/distinfo
index a404a3b7481c..a404a3b7481c 100644
--- a/math/analitza/distinfo
+++ b/math/analitza-kde4/distinfo
diff --git a/math/analitza/pkg-descr b/math/analitza-kde4/pkg-descr
index 23091312e8ee..23091312e8ee 100644
--- a/math/analitza/pkg-descr
+++ b/math/analitza-kde4/pkg-descr
diff --git a/math/analitza/pkg-plist b/math/analitza-kde4/pkg-plist
index 48b2d9debc16..48b2d9debc16 100644
--- a/math/analitza/pkg-plist
+++ b/math/analitza-kde4/pkg-plist
diff --git a/math/cantor/Makefile b/math/cantor-kde4/Makefile
index 74bb82e81f2f..e8df1d3b6802 100644
--- a/math/cantor/Makefile
+++ b/math/cantor-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cantor
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	KDE 4 frontend to mathematical software
 
 LIB_DEPENDS=	libspectre.so:print/libspectre \
 		libqalculate.so:math/libqalculate \
-		libanalitza.so:math/analitza
+		libanalitza.so:math/analitza-kde4
 
 USES=		cmake:outsource kde:4 pkgconfig python:2.7 tar:xz
 USE_KDE=	kdelibs automoc4
diff --git a/math/cantor/distinfo b/math/cantor-kde4/distinfo
index b6d141a04bd6..b6d141a04bd6 100644
--- a/math/cantor/distinfo
+++ b/math/cantor-kde4/distinfo
diff --git a/math/cantor/files/patch-src__backends__R__rserver__rcallbacks.cpp b/math/cantor-kde4/files/patch-src__backends__R__rserver__rcallbacks.cpp
index be86fd4c37d9..be86fd4c37d9 100644
--- a/math/cantor/files/patch-src__backends__R__rserver__rcallbacks.cpp
+++ b/math/cantor-kde4/files/patch-src__backends__R__rserver__rcallbacks.cpp
diff --git a/math/cantor/files/patch-src__backends__python2__python2extensions.cpp b/math/cantor-kde4/files/patch-src__backends__python2__python2extensions.cpp
index 9ca9683b7ff7..9ca9683b7ff7 100644
--- a/math/cantor/files/patch-src__backends__python2__python2extensions.cpp
+++ b/math/cantor-kde4/files/patch-src__backends__python2__python2extensions.cpp
diff --git a/math/cantor/pkg-descr b/math/cantor-kde4/pkg-descr
index 0e627020f3d0..0e627020f3d0 100644
--- a/math/cantor/pkg-descr
+++ b/math/cantor-kde4/pkg-descr
diff --git a/math/cantor/pkg-plist b/math/cantor-kde4/pkg-plist
index 94bf8c8c086f..94bf8c8c086f 100644
--- a/math/cantor/pkg-plist
+++ b/math/cantor-kde4/pkg-plist
diff --git a/math/kalgebra/Makefile b/math/kalgebra-kde4/Makefile
index 7abaa7de257f..f41b601ce281 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra-kde4/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	kalgebra
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE graph calculator
 
-LIB_DEPENDS=	libanalitza.so:math/analitza
+LIB_DEPENDS=	libanalitza.so:math/analitza-kde4
 
 CMAKE_ARGS=	-DBUILD_mobile:BOOL=FALSE
 
diff --git a/math/kalgebra/distinfo b/math/kalgebra-kde4/distinfo
index 054ae93f7b16..054ae93f7b16 100644
--- a/math/kalgebra/distinfo
+++ b/math/kalgebra-kde4/distinfo
diff --git a/math/kalgebra/pkg-descr b/math/kalgebra-kde4/pkg-descr
index 5aa3fa36bad7..5aa3fa36bad7 100644
--- a/math/kalgebra/pkg-descr
+++ b/math/kalgebra-kde4/pkg-descr
diff --git a/math/kalgebra/pkg-plist b/math/kalgebra-kde4/pkg-plist
index 018619de4961..018619de4961 100644
--- a/math/kalgebra/pkg-plist
+++ b/math/kalgebra-kde4/pkg-plist
diff --git a/math/kbruch/Makefile b/math/kbruch-kde4/Makefile
index fae1377c2d06..7c1e58bae518 100644
--- a/math/kbruch/Makefile
+++ b/math/kbruch-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kbruch
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/kbruch/distinfo b/math/kbruch-kde4/distinfo
index c52c97a916bc..c52c97a916bc 100644
--- a/math/kbruch/distinfo
+++ b/math/kbruch-kde4/distinfo
diff --git a/math/kbruch/pkg-descr b/math/kbruch-kde4/pkg-descr
index bf56d5f78b0a..bf56d5f78b0a 100644
--- a/math/kbruch/pkg-descr
+++ b/math/kbruch-kde4/pkg-descr
diff --git a/math/kbruch/pkg-plist b/math/kbruch-kde4/pkg-plist
index a031dd421bb3..a031dd421bb3 100644
--- a/math/kbruch/pkg-plist
+++ b/math/kbruch-kde4/pkg-plist
diff --git a/math/kcalc/Makefile b/math/kcalc-kde4/Makefile
index 1cdc170e8ee6..771a39d5b298 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kcalc
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/kcalc/distinfo b/math/kcalc-kde4/distinfo
index 504d31ab74a9..504d31ab74a9 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc-kde4/distinfo
diff --git a/math/kcalc/files/patch-CMakeLists.txt b/math/kcalc-kde4/files/patch-CMakeLists.txt
index 4004ff08f0df..4004ff08f0df 100644
--- a/math/kcalc/files/patch-CMakeLists.txt
+++ b/math/kcalc-kde4/files/patch-CMakeLists.txt
diff --git a/math/kcalc/files/patch-knumber_tests_CMakeLists.txt b/math/kcalc-kde4/files/patch-knumber_tests_CMakeLists.txt
index ec9798e88609..ec9798e88609 100644
--- a/math/kcalc/files/patch-knumber_tests_CMakeLists.txt
+++ b/math/kcalc-kde4/files/patch-knumber_tests_CMakeLists.txt
diff --git a/math/kcalc/pkg-descr b/math/kcalc-kde4/pkg-descr
index 8b553ada7023..8b553ada7023 100644
--- a/math/kcalc/pkg-descr
+++ b/math/kcalc-kde4/pkg-descr
diff --git a/math/kcalc/pkg-plist b/math/kcalc-kde4/pkg-plist
index 70febbb1786c..70febbb1786c 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc-kde4/pkg-plist
diff --git a/math/kig/Makefile b/math/kig-kde4/Makefile
index 2329ebc8b62c..7e5ec64e879a 100644
--- a/math/kig/Makefile
+++ b/math/kig-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kig
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/kig/distinfo b/math/kig-kde4/distinfo
index 34df52efc941..34df52efc941 100644
--- a/math/kig/distinfo
+++ b/math/kig-kde4/distinfo
diff --git a/math/kig/pkg-descr b/math/kig-kde4/pkg-descr
index 0a9ef0be59f1..0a9ef0be59f1 100644
--- a/math/kig/pkg-descr
+++ b/math/kig-kde4/pkg-descr
diff --git a/math/kig/pkg-plist b/math/kig-kde4/pkg-plist
index 606efabf73a1..606efabf73a1 100644
--- a/math/kig/pkg-plist
+++ b/math/kig-kde4/pkg-plist
diff --git a/math/kmplot/Makefile b/math/kmplot-kde4/Makefile
index 3bab4d9969d1..d4395f7d7f4f 100644
--- a/math/kmplot/Makefile
+++ b/math/kmplot-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kmplot
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/kmplot/distinfo b/math/kmplot-kde4/distinfo
index 4fb313337be8..4fb313337be8 100644
--- a/math/kmplot/distinfo
+++ b/math/kmplot-kde4/distinfo
diff --git a/math/kmplot/files/patch-git_e903ca5 b/math/kmplot-kde4/files/patch-git_e903ca5
index dce35edbf832..dce35edbf832 100644
--- a/math/kmplot/files/patch-git_e903ca5
+++ b/math/kmplot-kde4/files/patch-git_e903ca5
diff --git a/math/kmplot/pkg-descr b/math/kmplot-kde4/pkg-descr
index a41ca4b628a0..a41ca4b628a0 100644
--- a/math/kmplot/pkg-descr
+++ b/math/kmplot-kde4/pkg-descr
diff --git a/math/kmplot/pkg-plist b/math/kmplot-kde4/pkg-plist
index bfd246cd3fbb..bfd246cd3fbb 100644
--- a/math/kmplot/pkg-plist
+++ b/math/kmplot-kde4/pkg-plist
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index edeaafad6025..59e730f0d332 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rkward
 PORTVERSION=	0.6.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libR.so:math/R \
 		libsoprano.so:textproc/soprano
-RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
+RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate-kde4
 
 USES=		cmake gettext fortran kde:4 php:cli shared-mime-info
 USE_QT4=	corelib dbus gui qmake_build moc_build network phonon rcc_build	\
diff --git a/math/rocs/Makefile b/math/rocs-kde4/Makefile
index 5fdf61051dbd..8b4d601ce80b 100644
--- a/math/rocs/Makefile
+++ b/math/rocs-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rocs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/math/rocs/distinfo b/math/rocs-kde4/distinfo
index f686e944c95a..f686e944c95a 100644
--- a/math/rocs/distinfo
+++ b/math/rocs-kde4/distinfo
diff --git a/math/rocs/pkg-descr b/math/rocs-kde4/pkg-descr
index eefccd1a79ff..eefccd1a79ff 100644
--- a/math/rocs/pkg-descr
+++ b/math/rocs-kde4/pkg-descr
diff --git a/math/rocs/pkg-plist b/math/rocs-kde4/pkg-plist
index 073bd5a88836..073bd5a88836 100644
--- a/math/rocs/pkg-plist
+++ b/math/rocs-kde4/pkg-plist
diff --git a/misc/Makefile b/misc/Makefile
index 7e5d8ea0ce54..7ac4c1323282 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -12,7 +12,7 @@
     SUBDIR += amfm
     SUBDIR += ansiweather
     SUBDIR += apparix
-    SUBDIR += artikulate
+    SUBDIR += artikulate-kde4
     SUBDIR += asbutton
     SUBDIR += asr-manpages
     SUBDIR += astrolog
@@ -239,18 +239,18 @@
     SUBDIR += kdeutils-kde4
     SUBDIR += kenny
     SUBDIR += kf5-purpose
-    SUBDIR += kgeography
-    SUBDIR += klettres
+    SUBDIR += kgeography-kde4
+    SUBDIR += klettres-kde4
     SUBDIR += krecipes-kde4
-    SUBDIR += ktouch
-    SUBDIR += kwordquiz
+    SUBDIR += ktouch-kde4
+    SUBDIR += kwordquiz-kde4
     SUBDIR += latex-mk
     SUBDIR += lazyread
     SUBDIR += lc
     SUBDIR += lesspipe
     SUBDIR += libeatmydata
     SUBDIR += libisocodes
-    SUBDIR += libkdeedu
+    SUBDIR += libkdeedu-kde4
     SUBDIR += liblxi
     SUBDIR += libmetalink
     SUBDIR += libpostal
@@ -361,7 +361,7 @@
     SUBDIR += p5-Zen-Koans
     SUBDIR += p5-asterisk-perl
     SUBDIR += pantry
-    SUBDIR += parley
+    SUBDIR += parley-kde4
     SUBDIR += pastebinit
     SUBDIR += patchutils
     SUBDIR += pauker
diff --git a/misc/artikulate/Makefile b/misc/artikulate-kde4/Makefile
index a0fd57d8da96..13eb441d8b51 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	artikulate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Pronunciation trainer for KDE
 
 LIB_DEPENDS=	libQtGStreamer-1.0.so:multimedia/gstreamer1-qt4 \
 		libboost_thread.so:devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
+RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts-kde4
 
 IGNORE=		not usable, links to both GStreamer 0.10.x and 1.x
 
diff --git a/misc/artikulate/distinfo b/misc/artikulate-kde4/distinfo
index ff0c7b48a974..ff0c7b48a974 100644
--- a/misc/artikulate/distinfo
+++ b/misc/artikulate-kde4/distinfo
diff --git a/misc/artikulate/pkg-descr b/misc/artikulate-kde4/pkg-descr
index 858e6c0cd686..858e6c0cd686 100644
--- a/misc/artikulate/pkg-descr
+++ b/misc/artikulate-kde4/pkg-descr
diff --git a/misc/artikulate/pkg-plist b/misc/artikulate-kde4/pkg-plist
index 7a70ddb3df18..7a70ddb3df18 100644
--- a/misc/artikulate/pkg-plist
+++ b/misc/artikulate-kde4/pkg-plist
diff --git a/misc/kdeedu-kde4/Makefile b/misc/kdeedu-kde4/Makefile
index e1b348e8c098..7b561f234253 100644
--- a/misc/kdeedu-kde4/Makefile
+++ b/misc/kdeedu-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdeedu
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde
 PKGNAMESUFFIX=	-kde4
 
@@ -18,69 +18,69 @@ OPTIONS_DEFINE=	ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOG
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NARTIKULATE}
 
 ARTIKULATE_DESC=	Pronunciation trainer
-ARTIKULATE_RUN_DEPENDS=	${KDE_PREFIX}/bin/artikulate:misc/artikulate
+ARTIKULATE_RUN_DEPENDS=	${KDE_PREFIX}/bin/artikulate:misc/artikulate-kde4
 
 BLINKEN_DESC=		Memory enhancement game
-BLINKEN_RUN_DEPENDS=	${KDE_PREFIX}/bin/blinken:games/blinken
+BLINKEN_RUN_DEPENDS=	${KDE_PREFIX}/bin/blinken:games/blinken-kde4
 
 CANTOR_DESC=		Frontend to mathematical software
-CANTOR_RUN_DEPENDS=	${KDE_PREFIX}/bin/cantor:math/cantor
+CANTOR_RUN_DEPENDS=	${KDE_PREFIX}/bin/cantor:math/cantor-kde4
 
 KALGEBRA_DESC=		Graph calculator
-KALGEBRA_RUN_DEPENDS=	${KDE_PREFIX}/bin/kalgebra:math/kalgebra
+KALGEBRA_RUN_DEPENDS=	${KDE_PREFIX}/bin/kalgebra:math/kalgebra-kde4
 
 KALZIUM_DESC=		Periodic table of elements
-KALZIUM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kalzium:science/kalzium
+KALZIUM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kalzium:science/kalzium-kde4
 
 KANAGRAM_DESC=		Letter order game
-KANAGRAM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kanagram:games/kanagram
+KANAGRAM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kanagram:games/kanagram-kde4
 
 KBRUCH_DESC=		Application to exercise fractions
-KBRUCH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kbruch:math/kbruch
+KBRUCH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kbruch:math/kbruch-kde4
 
 KGEOGRAPHY_DESC=	Geography trainer
-KGEOGRAPHY_RUN_DEPENDS=	${KDE_PREFIX}/bin/kgeography:misc/kgeography
+KGEOGRAPHY_RUN_DEPENDS=	${KDE_PREFIX}/bin/kgeography:misc/kgeography-kde4
 
 KHANGMAN_DESC=		Hangman game
-KHANGMAN_RUN_DEPENDS=	${KDE_PREFIX}/bin/khangman:games/khangman
+KHANGMAN_RUN_DEPENDS=	${KDE_PREFIX}/bin/khangman:games/khangman-kde4
 
 KIG_DESC=		Interactive geometry application
-KIG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kig:math/kig
+KIG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kig:math/kig-kde4
 
 KITEN_DESC=		Japanese reference/study tool
-KITEN_RUN_DEPENDS=	${KDE_PREFIX}/bin/kiten:japanese/kiten
+KITEN_RUN_DEPENDS=	${KDE_PREFIX}/bin/kiten:japanese/kiten-kde4
 
 KLETTRES_DESC=		Alphabet learning tool
-KLETTRES_RUN_DEPENDS=	${KDE_PREFIX}/bin/klettres:misc/klettres
+KLETTRES_RUN_DEPENDS=	${KDE_PREFIX}/bin/klettres:misc/klettres-kde4
 
 KMPLOT_DESC=		Mathematical function plotter
-KMPLOT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmplot:math/kmplot
+KMPLOT_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmplot:math/kmplot-kde4
 
 KSTARS_DESC=		Desktop planetarium
-KSTARS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kstars:astro/kstars
+KSTARS_RUN_DEPENDS=	${KDE_PREFIX}/bin/kstars:astro/kstars-kde4
 
 KTOUCH_DESC=		Touch typing tutor
-KTOUCH_RUN_DEPENDS=	${KDE_PREFIX}/bin/ktouch:misc/ktouch
+KTOUCH_RUN_DEPENDS=	${KDE_PREFIX}/bin/ktouch:misc/ktouch-kde4
 
 KTURTLE_DESC=		Educational programming environment
-KTURTLE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kturtle:lang/kturtle
+KTURTLE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kturtle:lang/kturtle-kde4
 
 KWORDQUIZ_DESC=		Flash card trainer
-KWORDQUIZ_RUN_DEPENDS=	${KDE_PREFIX}/bin/kwordquiz:misc/kwordquiz
+KWORDQUIZ_RUN_DEPENDS=	${KDE_PREFIX}/bin/kwordquiz:misc/kwordquiz-kde4
 
 MARBLE_DESC=		Virtual globe and world atlas
 MARBLE_USE=		KDE=marble_run
 
 PAIRS_DESC=		Memory and pairs game
-PAIRS_RUN_DEPENDS=	${KDE_PREFIX}/bin/pairs:games/pairs
+PAIRS_RUN_DEPENDS=	${KDE_PREFIX}/bin/pairs:games/pairs-kde4
 
 PARLEY_DESC=		Vocabulary trainer
-PARLEY_RUN_DEPENDS=	${KDE_PREFIX}/bin/parley:misc/parley
+PARLEY_RUN_DEPENDS=	${KDE_PREFIX}/bin/parley:misc/parley-kde4
 
 ROCS_DESC=		Graph teory IDE
-ROCS_RUN_DEPENDS=	${KDE_PREFIX}/bin/rocs:math/rocs
+ROCS_RUN_DEPENDS=	${KDE_PREFIX}/bin/rocs:math/rocs-kde4
 
 STEP_DESC=		Interactive physics simulator
-STEP_RUN_DEPENDS=	${KDE_PREFIX}/bin/step:science/step
+STEP_RUN_DEPENDS=	${KDE_PREFIX}/bin/step:science/step-kde4
 
 .include <bsd.port.mk>
diff --git a/misc/kdeutils-kde4/Makefile b/misc/kdeutils-kde4/Makefile
index 20d7a9637e29..a2a79df96ac5 100644
--- a/misc/kdeutils-kde4/Makefile
+++ b/misc/kdeutils-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc kde
 PKGNAMESUFFIX=	-kde4
 
@@ -18,42 +18,42 @@ OPTIONS_DEFINE=	ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 ARK_DESC=		Archiving tool Ark
-ARK_RUN_DEPENDS=	${KDE_PREFIX}/bin/ark:archivers/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
 
 KCALC_DESC=		Scientific calculator KCalc
-KCALC_RUN_DEPENDS=	${KDE_PREFIX}/bin/kcalc:math/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
+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
+KDF_RUN_DEPENDS=	${KDE_PREFIX}/bin/kdf:sysutils/kdf-kde4
 
 KFLOPPY_DESC=		Floppy formatter KFloppy
-KFLOPPY_RUN_DEPENDS=	${KDE_PREFIX}/bin/kfloppy:sysutils/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
+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
+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
+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/kde4-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
+SUPERKARAMBA_RUN_DEPENDS=	${KDE_PREFIX}/bin/superkaramba:deskutils/superkaramba-kde4
 
 SWEEPER_DESC=		System cleaner Sweeper
-SWEEPER_RUN_DEPENDS=	${KDE_PREFIX}/bin/sweeper:sysutils/sweeper
+SWEEPER_RUN_DEPENDS=	${KDE_PREFIX}/bin/sweeper:sysutils/sweeper-kde4
 
 .include <bsd.port.mk>
diff --git a/misc/kgeography/Makefile b/misc/kgeography-kde4/Makefile
index b69bb7c369c3..21748074f7ea 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kgeography
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/misc/kgeography/distinfo b/misc/kgeography-kde4/distinfo
index 31a1de3210e0..31a1de3210e0 100644
--- a/misc/kgeography/distinfo
+++ b/misc/kgeography-kde4/distinfo
diff --git a/misc/kgeography/pkg-descr b/misc/kgeography-kde4/pkg-descr
index 5c2c3f67d53c..5c2c3f67d53c 100644
--- a/misc/kgeography/pkg-descr
+++ b/misc/kgeography-kde4/pkg-descr
diff --git a/misc/kgeography/pkg-plist b/misc/kgeography-kde4/pkg-plist
index b4f8b8fa149b..b4f8b8fa149b 100644
--- a/misc/kgeography/pkg-plist
+++ b/misc/kgeography-kde4/pkg-plist
diff --git a/misc/klettres/Makefile b/misc/klettres-kde4/Makefile
index f459b82c3f64..b01cc7443ccd 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	klettres
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/misc/klettres/distinfo b/misc/klettres-kde4/distinfo
index 344aa3b9f191..344aa3b9f191 100644
--- a/misc/klettres/distinfo
+++ b/misc/klettres-kde4/distinfo
diff --git a/misc/klettres/pkg-descr b/misc/klettres-kde4/pkg-descr
index ee3fac62548b..ee3fac62548b 100644
--- a/misc/klettres/pkg-descr
+++ b/misc/klettres-kde4/pkg-descr
diff --git a/misc/klettres/pkg-plist b/misc/klettres-kde4/pkg-plist
index c2b8a8f76061..c2b8a8f76061 100644
--- a/misc/klettres/pkg-plist
+++ b/misc/klettres-kde4/pkg-plist
diff --git a/misc/ktouch/Makefile b/misc/ktouch-kde4/Makefile
index 8a2baeec0f90..812019ec713d 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch-kde4/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	ktouch
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Touch typing tutor for KDE 4
 
-RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
+RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts-kde4
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
diff --git a/misc/ktouch/distinfo b/misc/ktouch-kde4/distinfo
index 685121be8ab7..685121be8ab7 100644
--- a/misc/ktouch/distinfo
+++ b/misc/ktouch-kde4/distinfo
diff --git a/misc/ktouch/pkg-descr b/misc/ktouch-kde4/pkg-descr
index 87059c2623cb..87059c2623cb 100644
--- a/misc/ktouch/pkg-descr
+++ b/misc/ktouch-kde4/pkg-descr
diff --git a/misc/ktouch/pkg-plist b/misc/ktouch-kde4/pkg-plist
index 763f8d935812..763f8d935812 100644
--- a/misc/ktouch/pkg-plist
+++ b/misc/ktouch-kde4/pkg-plist
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz-kde4/Makefile
index 9bbf59f5543e..c316608f8921 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kwordquiz
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/misc/kwordquiz/distinfo b/misc/kwordquiz-kde4/distinfo
index 6d548614c123..6d548614c123 100644
--- a/misc/kwordquiz/distinfo
+++ b/misc/kwordquiz-kde4/distinfo
diff --git a/misc/kwordquiz/pkg-descr b/misc/kwordquiz-kde4/pkg-descr
index f8d896ed3fdd..f8d896ed3fdd 100644
--- a/misc/kwordquiz/pkg-descr
+++ b/misc/kwordquiz-kde4/pkg-descr
diff --git a/misc/kwordquiz/pkg-plist b/misc/kwordquiz-kde4/pkg-plist
index 39ff36d48ced..39ff36d48ced 100644
--- a/misc/kwordquiz/pkg-plist
+++ b/misc/kwordquiz-kde4/pkg-plist
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu-kde4/Makefile
index 820f38a3b42a..f456d9868990 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkdeedu
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/misc/libkdeedu/distinfo b/misc/libkdeedu-kde4/distinfo
index 10621e7b6d8f..10621e7b6d8f 100644
--- a/misc/libkdeedu/distinfo
+++ b/misc/libkdeedu-kde4/distinfo
diff --git a/misc/libkdeedu/pkg-descr b/misc/libkdeedu-kde4/pkg-descr
index 45c0ed4ccbf0..45c0ed4ccbf0 100644
--- a/misc/libkdeedu/pkg-descr
+++ b/misc/libkdeedu-kde4/pkg-descr
diff --git a/misc/libkdeedu/pkg-plist b/misc/libkdeedu-kde4/pkg-plist
index d7b3a0ec4b77..d7b3a0ec4b77 100644
--- a/misc/libkdeedu/pkg-plist
+++ b/misc/libkdeedu-kde4/pkg-plist
diff --git a/misc/parley/Makefile b/misc/parley-kde4/Makefile
index 586e5215a214..1bea4b07e60f 100644
--- a/misc/parley/Makefile
+++ b/misc/parley-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	parley
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/misc/parley/distinfo b/misc/parley-kde4/distinfo
index c6295d92c54e..c6295d92c54e 100644
--- a/misc/parley/distinfo
+++ b/misc/parley-kde4/distinfo
diff --git a/misc/parley/pkg-descr b/misc/parley-kde4/pkg-descr
index a5d499074dc7..a5d499074dc7 100644
--- a/misc/parley/pkg-descr
+++ b/misc/parley-kde4/pkg-descr
diff --git a/misc/parley/pkg-plist b/misc/parley-kde4/pkg-plist
index 4d8cbfdd0fec..4d8cbfdd0fec 100644
--- a/misc/parley/pkg-plist
+++ b/misc/parley-kde4/pkg-plist
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 122d7be1ce65..597248e7126b 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -41,7 +41,7 @@
     SUBDIR += deforaos-player
     SUBDIR += devede
     SUBDIR += dirac
-    SUBDIR += dragon
+    SUBDIR += dragon-kde4
     SUBDIR += dtv-scan-tables
     SUBDIR += dumpmpeg
     SUBDIR += dv2jpg
diff --git a/multimedia/dragon/Makefile b/multimedia/dragon-kde4/Makefile
index 3bfcd9545a68..91be6d377962 100644
--- a/multimedia/dragon/Makefile
+++ b/multimedia/dragon-kde4/Makefile
@@ -3,10 +3,8 @@
 
 PORTNAME=	dragon
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia kde kde-kde4
-# Avoid clash with devel/dragon
-PKGNAMESUFFIX=	-player
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multimedia player with a focus on simplicity
diff --git a/multimedia/dragon/distinfo b/multimedia/dragon-kde4/distinfo
index ebf7b996def5..ebf7b996def5 100644
--- a/multimedia/dragon/distinfo
+++ b/multimedia/dragon-kde4/distinfo
diff --git a/multimedia/dragon/pkg-descr b/multimedia/dragon-kde4/pkg-descr
index bf7ff3e00be6..bf7ff3e00be6 100644
--- a/multimedia/dragon/pkg-descr
+++ b/multimedia/dragon-kde4/pkg-descr
diff --git a/multimedia/dragon/pkg-message b/multimedia/dragon-kde4/pkg-message
index 6202fcc48cfb..6202fcc48cfb 100644
--- a/multimedia/dragon/pkg-message
+++ b/multimedia/dragon-kde4/pkg-message
diff --git a/multimedia/dragon/pkg-plist b/multimedia/dragon-kde4/pkg-plist
index eb83a9672f64..eb83a9672f64 100644
--- a/multimedia/dragon/pkg-plist
+++ b/multimedia/dragon-kde4/pkg-plist
diff --git a/multimedia/kdemultimedia-kde4/Makefile b/multimedia/kdemultimedia-kde4/Makefile
index bbe17c307b75..ba8ff96897d8 100644
--- a/multimedia/kdemultimedia-kde4/Makefile
+++ b/multimedia/kdemultimedia-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia kde
 PKGNAMESUFFIX=	-kde4
 
@@ -16,22 +16,22 @@ OPTIONS_DEFINE=		DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
 OPTIONS_DEFAULT=	DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
 
 DRAGON_DESC=		Simple video player
-DRAGON_RUN_DEPENDS=	${KDE_PREFIX}/bin/dragon:multimedia/dragon
+DRAGON_RUN_DEPENDS=	${KDE_PREFIX}/bin/dragon:multimedia/dragon-kde4
 
 FFMPEG_DESC=		FFMPEG-based video thumbnailer
 FFMPEG_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia-ffmpegthumbs-kde4
 
 JUK_DESC=		Audio player
-JUK_RUN_DEPENDS=	${KDE_PREFIX}/bin/juk:audio/juk
+JUK_RUN_DEPENDS=	${KDE_PREFIX}/bin/juk:audio/juk-kde4
 
 KIO_AUDIOCD_DESC=	Audio CD IOSlave
-KIO_AUDIOCD_RUN_DEPENDS=	${KDE_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd
+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
+KMIX_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmix:audio/kmix-kde4
 
 KSCD_DESC=		CD Player
-KSCD_RUN_DEPENDS=	${KDE_PREFIX}/bin/kscd:audio/kscd
+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
diff --git a/net/Makefile b/net/Makefile
index 2f116c2803c7..a9a4912a661c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -311,14 +311,14 @@
     SUBDIR += kea
     SUBDIR += kf5-kholidays
     SUBDIR += kf5-kxmlrpcclient
-    SUBDIR += kget
+    SUBDIR += kget-kde4
     SUBDIR += kio-upnp-ms
     SUBDIR += kippo
     SUBDIR += kissd
     SUBDIR += knc
     SUBDIR += knemo-kde4
-    SUBDIR += krdc
-    SUBDIR += krfb
+    SUBDIR += krdc-kde4
+    SUBDIR += krfb-kde4
     SUBDIR += kwooty
     SUBDIR += l2tpd
     SUBDIR += l4ip
@@ -1497,7 +1497,7 @@
     SUBDIR += yptransitd
     SUBDIR += zebra
     SUBDIR += zebra-server
-    SUBDIR += zeroconf-ioslave
+    SUBDIR += zeroconf-ioslave-kde4
     SUBDIR += zerotier
     SUBDIR += zillion
     SUBDIR += zmap
diff --git a/net/kdenetwork-kde4/Makefile b/net/kdenetwork-kde4/Makefile
index 5e9091c426c6..60b8182b6576 100644
--- a/net/kdenetwork-kde4/Makefile
+++ b/net/kdenetwork-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net kde
 PKGNAMESUFFIX=	-kde4
 
@@ -18,19 +18,19 @@ FILESHARING_DESC=	Network file sharing via Samba
 FILESHARING_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/sambausershareplugin.so:net/kdenetwork-filesharing-kde4
 
 KDNSSD_DESC=		Network monitor for DNS-SD services (Zeroconf)
-KDNSSD_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kded_dnssdwatcher.so:net/zeroconf-ioslave
+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
+KGET_RUN_DEPENDS=	${KDE_PREFIX}/bin/kget:net/kget-kde4
 
 KOPETE_DESC=		Multi-protocol instant messenger
 KOPETE_RUN_DEPENDS=	${KDE_PREFIX}/bin/kopete:net-im/kopete-kde4
 
 KRDC_DESC=		RDP and VNC client
-KRDC_RUN_DEPENDS=	${KDE_PREFIX}/bin/krdc:net/krdc
+KRDC_RUN_DEPENDS=	${KDE_PREFIX}/bin/krdc:net/krdc-kde4
 
 KRFB_DESC=		Desktop Sharing (VNC server)
-KRFB_RUN_DEPENDS=	${KDE_PREFIX}/bin/krfb:net/krfb
+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
diff --git a/net/kget/Makefile b/net/kget-kde4/Makefile
index 9cccd5eef9c7..9ad3ee9d0164 100644
--- a/net/kget/Makefile
+++ b/net/kget-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kget
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/kget/distinfo b/net/kget-kde4/distinfo
index cba197c27ae4..cba197c27ae4 100644
--- a/net/kget/distinfo
+++ b/net/kget-kde4/distinfo
diff --git a/net/kget/pkg-descr b/net/kget-kde4/pkg-descr
index cdf1c8ba336e..cdf1c8ba336e 100644
--- a/net/kget/pkg-descr
+++ b/net/kget-kde4/pkg-descr
diff --git a/net/kget/pkg-plist b/net/kget-kde4/pkg-plist
index 66a63d382a77..66a63d382a77 100644
--- a/net/kget/pkg-plist
+++ b/net/kget-kde4/pkg-plist
diff --git a/net/krdc/Makefile b/net/krdc-kde4/Makefile
index ce5719af6a80..f3ef0f6507e0 100644
--- a/net/krdc/Makefile
+++ b/net/krdc-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	krdc
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/krdc/distinfo b/net/krdc-kde4/distinfo
index 63df5b10eff4..63df5b10eff4 100644
--- a/net/krdc/distinfo
+++ b/net/krdc-kde4/distinfo
diff --git a/net/krdc/files/patch-git8436cc62 b/net/krdc-kde4/files/patch-git8436cc62
index d568be962d4a..d568be962d4a 100644
--- a/net/krdc/files/patch-git8436cc62
+++ b/net/krdc-kde4/files/patch-git8436cc62
diff --git a/net/krdc/pkg-descr b/net/krdc-kde4/pkg-descr
index 360d78fcf4c1..360d78fcf4c1 100644
--- a/net/krdc/pkg-descr
+++ b/net/krdc-kde4/pkg-descr
diff --git a/net/krdc/pkg-plist b/net/krdc-kde4/pkg-plist
index 9a06ab48eadf..9a06ab48eadf 100644
--- a/net/krdc/pkg-plist
+++ b/net/krdc-kde4/pkg-plist
diff --git a/net/krfb/Makefile b/net/krfb-kde4/Makefile
index a310d3205220..89381e435dcb 100644
--- a/net/krfb/Makefile
+++ b/net/krfb-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	krfb
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/krfb/distinfo b/net/krfb-kde4/distinfo
index 60aa97f7641e..60aa97f7641e 100644
--- a/net/krfb/distinfo
+++ b/net/krfb-kde4/distinfo
diff --git a/net/krfb/pkg-descr b/net/krfb-kde4/pkg-descr
index 4723843e622d..4723843e622d 100644
--- a/net/krfb/pkg-descr
+++ b/net/krfb-kde4/pkg-descr
diff --git a/net/krfb/pkg-plist b/net/krfb-kde4/pkg-plist
index 508210b0d55b..508210b0d55b 100644
--- a/net/krfb/pkg-plist
+++ b/net/krfb-kde4/pkg-plist
diff --git a/net/zeroconf-ioslave/Makefile b/net/zeroconf-ioslave-kde4/Makefile
index d154fa4b06b8..c8fa5320d9b6 100644
--- a/net/zeroconf-ioslave/Makefile
+++ b/net/zeroconf-ioslave-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zeroconf-ioslave
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/zeroconf-ioslave/distinfo b/net/zeroconf-ioslave-kde4/distinfo
index e5046a4139ab..e5046a4139ab 100644
--- a/net/zeroconf-ioslave/distinfo
+++ b/net/zeroconf-ioslave-kde4/distinfo
diff --git a/net/zeroconf-ioslave/pkg-descr b/net/zeroconf-ioslave-kde4/pkg-descr
index 12d2640db9b1..12d2640db9b1 100644
--- a/net/zeroconf-ioslave/pkg-descr
+++ b/net/zeroconf-ioslave-kde4/pkg-descr
diff --git a/net/zeroconf-ioslave/pkg-plist b/net/zeroconf-ioslave-kde4/pkg-plist
index aa7be73f25b4..aa7be73f25b4 100644
--- a/net/zeroconf-ioslave/pkg-plist
+++ b/net/zeroconf-ioslave-kde4/pkg-plist
diff --git a/print/Makefile b/print/Makefile
index 6d4cf51e197c..6afbafa75aeb 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -97,7 +97,7 @@
     SUBDIR += hyperlatex
     SUBDIR += indexinfo
     SUBDIR += jabref
-    SUBDIR += kde4-print-manager
+    SUBDIR += print-manager-kde4
     SUBDIR += kde_poster
     SUBDIR += kover
     SUBDIR += kpdftool
diff --git a/print/kde4-print-manager/Makefile b/print/print-manager-kde4/Makefile
index 28a17d9f1acd..680068c3b93a 100644
--- a/print/kde4-print-manager/Makefile
+++ b/print/print-manager-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	print-manager
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/print/kde4-print-manager/distinfo b/print/print-manager-kde4/distinfo
index 927b8efc763a..927b8efc763a 100644
--- a/print/kde4-print-manager/distinfo
+++ b/print/print-manager-kde4/distinfo
diff --git a/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp b/print/print-manager-kde4/files/patch-libkcups-KCupsRequest.cpp
index 142c49173d7a..142c49173d7a 100644
--- a/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp
+++ b/print/print-manager-kde4/files/patch-libkcups-KCupsRequest.cpp
diff --git a/print/kde4-print-manager/pkg-descr b/print/print-manager-kde4/pkg-descr
index 9ba4820af185..9ba4820af185 100644
--- a/print/kde4-print-manager/pkg-descr
+++ b/print/print-manager-kde4/pkg-descr
diff --git a/print/kde4-print-manager/pkg-plist b/print/print-manager-kde4/pkg-plist
index 4ee40d93112a..4ee40d93112a 100644
--- a/print/kde4-print-manager/pkg-plist
+++ b/print/print-manager-kde4/pkg-plist
diff --git a/science/Makefile b/science/Makefile
index d7dedbed2413..123a5c5edabb 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -78,7 +78,7 @@
     SUBDIR += iboview
     SUBDIR += isaac-cfd
     SUBDIR += jstrack
-    SUBDIR += kalzium
+    SUBDIR += kalzium-kde4
     SUBDIR += kst2
     SUBDIR += lamprop
     SUBDIR += libaec
@@ -200,7 +200,7 @@
     SUBDIR += simlib
     SUBDIR += simsmith
     SUBDIR += siril
-    SUBDIR += step
+    SUBDIR += step-kde4
     SUBDIR += svmlight
     SUBDIR += szip
     SUBDIR += tfel
diff --git a/science/kalzium/Makefile b/science/kalzium-kde4/Makefile
index 9d7f316fa5b4..2be7fa8febec 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kalzium
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/science/kalzium/distinfo b/science/kalzium-kde4/distinfo
index 2056ef39d2eb..2056ef39d2eb 100644
--- a/science/kalzium/distinfo
+++ b/science/kalzium-kde4/distinfo
diff --git a/science/kalzium/pkg-descr b/science/kalzium-kde4/pkg-descr
index 1c4c89f1604a..1c4c89f1604a 100644
--- a/science/kalzium/pkg-descr
+++ b/science/kalzium-kde4/pkg-descr
diff --git a/science/kalzium/pkg-plist b/science/kalzium-kde4/pkg-plist
index 7be753bc4556..7be753bc4556 100644
--- a/science/kalzium/pkg-plist
+++ b/science/kalzium-kde4/pkg-plist
diff --git a/science/step/Makefile b/science/step-kde4/Makefile
index b6f20fbc96dd..c9593ef9a724 100644
--- a/science/step/Makefile
+++ b/science/step-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	step
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/science/step/distinfo b/science/step-kde4/distinfo
index fa7e98d3f655..fa7e98d3f655 100644
--- a/science/step/distinfo
+++ b/science/step-kde4/distinfo
diff --git a/science/step/pkg-descr b/science/step-kde4/pkg-descr
index af664ea528f4..af664ea528f4 100644
--- a/science/step/pkg-descr
+++ b/science/step-kde4/pkg-descr
diff --git a/science/step/pkg-plist b/science/step-kde4/pkg-plist
index baebb361d0e3..baebb361d0e3 100644
--- a/science/step/pkg-plist
+++ b/science/step-kde4/pkg-plist
diff --git a/security/Makefile b/security/Makefile
index 2e2ff7c1e5ec..d39ea182c613 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -318,7 +318,7 @@
     SUBDIR += krb5-devel
     SUBDIR += kripp
     SUBDIR += kstart
-    SUBDIR += kwalletmanager
+    SUBDIR += kwalletmanager-kde4
     SUBDIR += l0pht-watch
     SUBDIR += l0phtcrack
     SUBDIR += l5
diff --git a/security/kwalletmanager/Makefile b/security/kwalletmanager-kde4/Makefile
index 626cc82dd3bc..0da92a8372f9 100644
--- a/security/kwalletmanager/Makefile
+++ b/security/kwalletmanager-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kwalletmanager
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/security/kwalletmanager/distinfo b/security/kwalletmanager-kde4/distinfo
index fe6b39dc4c83..fe6b39dc4c83 100644
--- a/security/kwalletmanager/distinfo
+++ b/security/kwalletmanager-kde4/distinfo
diff --git a/security/kwalletmanager/pkg-descr b/security/kwalletmanager-kde4/pkg-descr
index 761fabfa94c4..761fabfa94c4 100644
--- a/security/kwalletmanager/pkg-descr
+++ b/security/kwalletmanager-kde4/pkg-descr
diff --git a/security/kwalletmanager/pkg-plist b/security/kwalletmanager-kde4/pkg-plist
index fe00fc4e412c..fe00fc4e412c 100644
--- a/security/kwalletmanager/pkg-plist
+++ b/security/kwalletmanager-kde4/pkg-plist
diff --git a/sysutils/Makefile b/sysutils/Makefile
index a7e5791ce14b..e6b98aa1b7eb 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -79,8 +79,8 @@
     SUBDIR += bacula9-client-static
     SUBDIR += bacula9-docs
     SUBDIR += bacula9-server
-    SUBDIR += baloo
-    SUBDIR += baloo-widgets
+    SUBDIR += baloo-kde4
+    SUBDIR += baloo-widgets-kde4
     SUBDIR += bamf
     SUBDIR += bareos-bat
     SUBDIR += bareos-client
@@ -524,24 +524,24 @@
     SUBDIR += k3b-kde4
     SUBDIR += k8temp
     SUBDIR += kcm-polkit-kde
-    SUBDIR += kcron
+    SUBDIR += kcron-kde4
     SUBDIR += kdeadmin-kde4
-    SUBDIR += kdf
+    SUBDIR += kdf-kde4
     SUBDIR += kdirstat
     SUBDIR += keyboard-daemon
     SUBDIR += kf5-baloo
     SUBDIR += kf5-kwallet
-    SUBDIR += kfilemetadata
-    SUBDIR += kfloppy
+    SUBDIR += kfilemetadata-kde4
+    SUBDIR += kfloppy-kde4
     SUBDIR += kiconvtool
     SUBDIR += kldfind
     SUBDIR += kldpatch
     SUBDIR += knutclient-kde4
     SUBDIR += krename
     SUBDIR += kshutdown-kde4
-    SUBDIR += ksysguardd
-    SUBDIR += ksystemlog
-    SUBDIR += kuser
+    SUBDIR += ksysguardd-kde4
+    SUBDIR += ksystemlog-kde4
+    SUBDIR += kuser-kde4
     SUBDIR += lava
     SUBDIR += lbl-cf
     SUBDIR += lbl-hf
@@ -698,8 +698,8 @@
     SUBDIR += ncdu
     SUBDIR += ndmpd
     SUBDIR += neofetch
-    SUBDIR += nepomuk-core
-    SUBDIR += nepomuk-widgets
+    SUBDIR += nepomuk-core-kde4
+    SUBDIR += nepomuk-widgets-kde4
     SUBDIR += nfcutils
     SUBDIR += nfsping
     SUBDIR += nitrogen
@@ -1154,7 +1154,7 @@
     SUBDIR += swapd
     SUBDIR += swapexd
     SUBDIR += swapmon
-    SUBDIR += sweeper
+    SUBDIR += sweeper-kde4
     SUBDIR += symlinks
     SUBDIR += symon
     SUBDIR += synergy
diff --git a/sysutils/baloo/Makefile b/sysutils/baloo-kde4/Makefile
index 7c0e2661530f..c2bd34447749 100644
--- a/sysutils/baloo/Makefile
+++ b/sysutils/baloo-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	baloo
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/baloo/distinfo b/sysutils/baloo-kde4/distinfo
index 8e44843c8f39..8e44843c8f39 100644
--- a/sysutils/baloo/distinfo
+++ b/sysutils/baloo-kde4/distinfo
diff --git a/sysutils/baloo/files/patch-src__file__lib__baloo_xattr_p.h b/sysutils/baloo-kde4/files/patch-src__file__lib__baloo_xattr_p.h
index bda9070d2188..bda9070d2188 100644
--- a/sysutils/baloo/files/patch-src__file__lib__baloo_xattr_p.h
+++ b/sysutils/baloo-kde4/files/patch-src__file__lib__baloo_xattr_p.h
diff --git a/sysutils/baloo/files/patch-src_file_lib_CMakeLists.txt b/sysutils/baloo-kde4/files/patch-src_file_lib_CMakeLists.txt
index 208c2b5c98dd..208c2b5c98dd 100644
--- a/sysutils/baloo/files/patch-src_file_lib_CMakeLists.txt
+++ b/sysutils/baloo-kde4/files/patch-src_file_lib_CMakeLists.txt
diff --git a/sysutils/baloo/pkg-descr b/sysutils/baloo-kde4/pkg-descr
index d0fadfadd221..d0fadfadd221 100644
--- a/sysutils/baloo/pkg-descr
+++ b/sysutils/baloo-kde4/pkg-descr
diff --git a/sysutils/baloo/pkg-plist b/sysutils/baloo-kde4/pkg-plist
index 22c8d0ac0b66..22c8d0ac0b66 100644
--- a/sysutils/baloo/pkg-plist
+++ b/sysutils/baloo-kde4/pkg-plist
diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets-kde4/Makefile
index fb59e155026b..7b0383190845 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	baloo-widgets
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/baloo-widgets/distinfo b/sysutils/baloo-widgets-kde4/distinfo
index 9573393166be..9573393166be 100644
--- a/sysutils/baloo-widgets/distinfo
+++ b/sysutils/baloo-widgets-kde4/distinfo
diff --git a/sysutils/baloo-widgets/pkg-descr b/sysutils/baloo-widgets-kde4/pkg-descr
index 329cc76215ce..329cc76215ce 100644
--- a/sysutils/baloo-widgets/pkg-descr
+++ b/sysutils/baloo-widgets-kde4/pkg-descr
diff --git a/sysutils/baloo-widgets/pkg-plist b/sysutils/baloo-widgets-kde4/pkg-plist
index 31bd66756997..31bd66756997 100644
--- a/sysutils/baloo-widgets/pkg-plist
+++ b/sysutils/baloo-widgets-kde4/pkg-plist
diff --git a/sysutils/kcron/Makefile b/sysutils/kcron-kde4/Makefile
index b43f33c64103..7de3e5fc2858 100644
--- a/sysutils/kcron/Makefile
+++ b/sysutils/kcron-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kcron
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kcron/distinfo b/sysutils/kcron-kde4/distinfo
index db686cb93ee4..db686cb93ee4 100644
--- a/sysutils/kcron/distinfo
+++ b/sysutils/kcron-kde4/distinfo
diff --git a/sysutils/kcron/pkg-descr b/sysutils/kcron-kde4/pkg-descr
index 69d95b1bc54d..69d95b1bc54d 100644
--- a/sysutils/kcron/pkg-descr
+++ b/sysutils/kcron-kde4/pkg-descr
diff --git a/sysutils/kcron/pkg-plist b/sysutils/kcron-kde4/pkg-plist
index 28b8bbdb4781..28b8bbdb4781 100644
--- a/sysutils/kcron/pkg-plist
+++ b/sysutils/kcron-kde4/pkg-plist
diff --git a/sysutils/kdeadmin-kde4/Makefile b/sysutils/kdeadmin-kde4/Makefile
index 70884881ee3a..bbffbd44f0b5 100644
--- a/sysutils/kdeadmin-kde4/Makefile
+++ b/sysutils/kdeadmin-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde
 PKGNAMESUFFIX=	-kde4
 
@@ -15,12 +15,12 @@ OPTIONS_DEFINE=	KCRON KSYSTEMLOG KUSER
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 KCRON_DESC=		Task scheduler
-KCRON_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kcm_cron.so:sysutils/kcron
+KCRON_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kcm_cron.so:sysutils/kcron-kde4
 
 KSYSTEMLOG_DESC=	System log viewer
-KSYSTEMLOG_RUN_DEPENDS=	${KDE_PREFIX}/bin/ksystemlog:sysutils/ksystemlog
+KSYSTEMLOG_RUN_DEPENDS=	${KDE_PREFIX}/bin/ksystemlog:sysutils/ksystemlog-kde4
 
 KUSER_DESC=		User management application
-KUSER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kuser:sysutils/kuser
+KUSER_RUN_DEPENDS=	${KDE_PREFIX}/bin/kuser:sysutils/kuser-kde4
 
 .include <bsd.port.mk>
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf-kde4/Makefile
index b47b6dc84a8a..b97a13f26735 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdf
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf-kde4/distinfo
index 803fe42a17ce..803fe42a17ce 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf-kde4/distinfo
diff --git a/sysutils/kdf/pkg-descr b/sysutils/kdf-kde4/pkg-descr
index 85fdc236a309..85fdc236a309 100644
--- a/sysutils/kdf/pkg-descr
+++ b/sysutils/kdf-kde4/pkg-descr
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf-kde4/pkg-plist
index 5b239807fae0..5b239807fae0 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf-kde4/pkg-plist
diff --git a/sysutils/kfilemetadata/Makefile b/sysutils/kfilemetadata-kde4/Makefile
index b9a1d9b4d0f4..fe85ccbad39e 100644
--- a/sysutils/kfilemetadata/Makefile
+++ b/sysutils/kfilemetadata-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kfilemetadata
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kfilemetadata/distinfo b/sysutils/kfilemetadata-kde4/distinfo
index 195111022033..195111022033 100644
--- a/sysutils/kfilemetadata/distinfo
+++ b/sysutils/kfilemetadata-kde4/distinfo
diff --git a/sysutils/kfilemetadata/pkg-descr b/sysutils/kfilemetadata-kde4/pkg-descr
index 2bcc8b720650..2bcc8b720650 100644
--- a/sysutils/kfilemetadata/pkg-descr
+++ b/sysutils/kfilemetadata-kde4/pkg-descr
diff --git a/sysutils/kfilemetadata/pkg-plist b/sysutils/kfilemetadata-kde4/pkg-plist
index 6cd18a21ca71..6cd18a21ca71 100644
--- a/sysutils/kfilemetadata/pkg-plist
+++ b/sysutils/kfilemetadata-kde4/pkg-plist
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy-kde4/Makefile
index 0f2e22730020..3748a8d837c8 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kfloppy
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy-kde4/distinfo
index 98007655f003..98007655f003 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy-kde4/distinfo
diff --git a/sysutils/kfloppy/pkg-descr b/sysutils/kfloppy-kde4/pkg-descr
index 532ece5993fe..532ece5993fe 100644
--- a/sysutils/kfloppy/pkg-descr
+++ b/sysutils/kfloppy-kde4/pkg-descr
diff --git a/sysutils/kfloppy/pkg-message b/sysutils/kfloppy-kde4/pkg-message
index 18142d9b9298..18142d9b9298 100644
--- a/sysutils/kfloppy/pkg-message
+++ b/sysutils/kfloppy-kde4/pkg-message
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy-kde4/pkg-plist
index d971318dddaf..d971318dddaf 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy-kde4/pkg-plist
diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd-kde4/Makefile
index 80d9a9696bb8..b5512c9ab446 100644
--- a/sysutils/ksysguardd/Makefile
+++ b/sysutils/ksysguardd-kde4/Makefile
@@ -2,14 +2,15 @@
 
 PORTNAME=	ksysguardd
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 DISTNAME=	kde-workspace-${PORTVERSION}
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE System Guard Daemon
 
-DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde-workspace-kde4/distinfo
 USES=		cmake kde:4 tar:xz
 CMAKE_ARGS+=	-DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \
 		-DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc"
diff --git a/sysutils/ksysguardd/files/patch-CMakeLists.txt b/sysutils/ksysguardd-kde4/files/patch-CMakeLists.txt
index f7e699e29eae..f7e699e29eae 100644
--- a/sysutils/ksysguardd/files/patch-CMakeLists.txt
+++ b/sysutils/ksysguardd-kde4/files/patch-CMakeLists.txt
diff --git a/sysutils/ksysguardd/files/patch-FreeBSD_Memory.c b/sysutils/ksysguardd-kde4/files/patch-FreeBSD_Memory.c
index 1eb46370dd8a..1eb46370dd8a 100644
--- a/sysutils/ksysguardd/files/patch-FreeBSD_Memory.c
+++ b/sysutils/ksysguardd-kde4/files/patch-FreeBSD_Memory.c
diff --git a/sysutils/ksysguardd/files/patch-config-ksysguardd.h.cmake b/sysutils/ksysguardd-kde4/files/patch-config-ksysguardd.h.cmake
index e0c9355668ff..e0c9355668ff 100644
--- a/sysutils/ksysguardd/files/patch-config-ksysguardd.h.cmake
+++ b/sysutils/ksysguardd-kde4/files/patch-config-ksysguardd.h.cmake
diff --git a/sysutils/ksysguardd/files/patch-modules.h b/sysutils/ksysguardd-kde4/files/patch-modules.h
index c324abe657b5..c324abe657b5 100644
--- a/sysutils/ksysguardd/files/patch-modules.h
+++ b/sysutils/ksysguardd-kde4/files/patch-modules.h
diff --git a/sysutils/ksysguardd/pkg-descr b/sysutils/ksysguardd-kde4/pkg-descr
index 313215a75f7e..313215a75f7e 100644
--- a/sysutils/ksysguardd/pkg-descr
+++ b/sysutils/ksysguardd-kde4/pkg-descr
diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog-kde4/Makefile
index c01815d9f328..2c64efa494e1 100644
--- a/sysutils/ksystemlog/Makefile
+++ b/sysutils/ksystemlog-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ksystemlog
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/ksystemlog/distinfo b/sysutils/ksystemlog-kde4/distinfo
index 53056dbba818..53056dbba818 100644
--- a/sysutils/ksystemlog/distinfo
+++ b/sysutils/ksystemlog-kde4/distinfo
diff --git a/sysutils/ksystemlog/files/patch-src-modes-daemon-daemonConfiguration.h b/sysutils/ksystemlog-kde4/files/patch-src-modes-daemon-daemonConfiguration.h
index c6de282cf807..c6de282cf807 100644
--- a/sysutils/ksystemlog/files/patch-src-modes-daemon-daemonConfiguration.h
+++ b/sysutils/ksystemlog-kde4/files/patch-src-modes-daemon-daemonConfiguration.h
diff --git a/sysutils/ksystemlog/files/patch-src-modes-system-systemConfiguration.h b/sysutils/ksystemlog-kde4/files/patch-src-modes-system-systemConfiguration.h
index 4d9bd614c460..4d9bd614c460 100644
--- a/sysutils/ksystemlog/files/patch-src-modes-system-systemConfiguration.h
+++ b/sysutils/ksystemlog-kde4/files/patch-src-modes-system-systemConfiguration.h
diff --git a/sysutils/ksystemlog/pkg-descr b/sysutils/ksystemlog-kde4/pkg-descr
index b6ea8431dded..b6ea8431dded 100644
--- a/sysutils/ksystemlog/pkg-descr
+++ b/sysutils/ksystemlog-kde4/pkg-descr
diff --git a/sysutils/ksystemlog/pkg-plist b/sysutils/ksystemlog-kde4/pkg-plist
index 11c0d92fa8bb..11c0d92fa8bb 100644
--- a/sysutils/ksystemlog/pkg-plist
+++ b/sysutils/ksystemlog-kde4/pkg-plist
diff --git a/sysutils/kuser/Makefile b/sysutils/kuser-kde4/Makefile
index 6a90b34457ad..4b8980bc0368 100644
--- a/sysutils/kuser/Makefile
+++ b/sysutils/kuser-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kuser
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kuser/distinfo b/sysutils/kuser-kde4/distinfo
index 5f0778bf049b..5f0778bf049b 100644
--- a/sysutils/kuser/distinfo
+++ b/sysutils/kuser-kde4/distinfo
diff --git a/sysutils/kuser/files/patch-git_0bf52af6a b/sysutils/kuser-kde4/files/patch-git_0bf52af6a
index e1a51305989f..e1a51305989f 100644
--- a/sysutils/kuser/files/patch-git_0bf52af6a
+++ b/sysutils/kuser-kde4/files/patch-git_0bf52af6a
diff --git a/sysutils/kuser/files/patch-globals.h b/sysutils/kuser-kde4/files/patch-globals.h
index 854d707c8b80..854d707c8b80 100644
--- a/sysutils/kuser/files/patch-globals.h
+++ b/sysutils/kuser-kde4/files/patch-globals.h
diff --git a/sysutils/kuser/pkg-descr b/sysutils/kuser-kde4/pkg-descr
index defa00dde4f6..defa00dde4f6 100644
--- a/sysutils/kuser/pkg-descr
+++ b/sysutils/kuser-kde4/pkg-descr
diff --git a/sysutils/kuser/pkg-plist b/sysutils/kuser-kde4/pkg-plist
index 957cabac0c4d..957cabac0c4d 100644
--- a/sysutils/kuser/pkg-plist
+++ b/sysutils/kuser-kde4/pkg-plist
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core-kde4/Makefile
index 5a8bfbd3e040..e9f4c0fdc358 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nepomuk-core
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/nepomuk-core/distinfo b/sysutils/nepomuk-core-kde4/distinfo
index 4d4552ed10e4..4d4552ed10e4 100644
--- a/sysutils/nepomuk-core/distinfo
+++ b/sysutils/nepomuk-core-kde4/distinfo
diff --git a/sysutils/nepomuk-core/files/nepomuk-env.sh.in b/sysutils/nepomuk-core-kde4/files/nepomuk-env.sh.in
index 472cbb2580dc..472cbb2580dc 100644
--- a/sysutils/nepomuk-core/files/nepomuk-env.sh.in
+++ b/sysutils/nepomuk-core-kde4/files/nepomuk-env.sh.in
diff --git a/sysutils/nepomuk-core/pkg-descr b/sysutils/nepomuk-core-kde4/pkg-descr
index 64d19de48621..64d19de48621 100644
--- a/sysutils/nepomuk-core/pkg-descr
+++ b/sysutils/nepomuk-core-kde4/pkg-descr
diff --git a/sysutils/nepomuk-core/pkg-plist b/sysutils/nepomuk-core-kde4/pkg-plist
index a157ec08c388..a157ec08c388 100644
--- a/sysutils/nepomuk-core/pkg-plist
+++ b/sysutils/nepomuk-core-kde4/pkg-plist
diff --git a/sysutils/nepomuk-widgets/Makefile b/sysutils/nepomuk-widgets-kde4/Makefile
index dbea40b4a21b..2e4fa5382df6 100644
--- a/sysutils/nepomuk-widgets/Makefile
+++ b/sysutils/nepomuk-widgets-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nepomuk-widgets
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/nepomuk-widgets/distinfo b/sysutils/nepomuk-widgets-kde4/distinfo
index b22106982799..b22106982799 100644
--- a/sysutils/nepomuk-widgets/distinfo
+++ b/sysutils/nepomuk-widgets-kde4/distinfo
diff --git a/sysutils/nepomuk-widgets/pkg-descr b/sysutils/nepomuk-widgets-kde4/pkg-descr
index 160e92981d15..160e92981d15 100644
--- a/sysutils/nepomuk-widgets/pkg-descr
+++ b/sysutils/nepomuk-widgets-kde4/pkg-descr
diff --git a/sysutils/nepomuk-widgets/pkg-plist b/sysutils/nepomuk-widgets-kde4/pkg-plist
index dc5da94543d1..dc5da94543d1 100644
--- a/sysutils/nepomuk-widgets/pkg-plist
+++ b/sysutils/nepomuk-widgets-kde4/pkg-plist
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper-kde4/Makefile
index ae7f65c7a763..7001f9f23f4e 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sweeper
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper-kde4/distinfo
index 200e4d207050..200e4d207050 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper-kde4/distinfo
diff --git a/sysutils/sweeper/pkg-descr b/sysutils/sweeper-kde4/pkg-descr
index ca9672b7506a..ca9672b7506a 100644
--- a/sysutils/sweeper/pkg-descr
+++ b/sysutils/sweeper-kde4/pkg-descr
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper-kde4/pkg-plist
index e0323d0e17c9..e0323d0e17c9 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper-kde4/pkg-plist
diff --git a/textproc/Makefile b/textproc/Makefile
index 393bf81360c7..0d77c610f047 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -398,7 +398,7 @@
     SUBDIR += kmfl-varamozhi-malayalam
     SUBDIR += kmflcomp
     SUBDIR += kn-aspell
-    SUBDIR += kompare
+    SUBDIR += kompare-kde4
     SUBDIR += kreport
     SUBDIR += ku-aspell
     SUBDIR += ky-aspell
@@ -425,7 +425,7 @@
     SUBDIR += libguess
     SUBDIR += libkmfl
     SUBDIR += libkolabxml
-    SUBDIR += libkomparediff2
+    SUBDIR += libkomparediff2-kde4
     SUBDIR += liblingoteach
     SUBDIR += liblrdf
     SUBDIR += libmrss
diff --git a/textproc/kompare/Makefile b/textproc/kompare-kde4/Makefile
index 6229cb0f22dd..eba70f8aeed8 100644
--- a/textproc/kompare/Makefile
+++ b/textproc/kompare-kde4/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	kompare
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Diff/Patch Frontend
 
-LIB_DEPENDS=	libkomparediff2.so:textproc/libkomparediff2
+LIB_DEPENDS=	libkomparediff2.so:textproc/libkomparediff2-kde4
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
diff --git a/textproc/kompare/distinfo b/textproc/kompare-kde4/distinfo
index 58f45e8eda2c..58f45e8eda2c 100644
--- a/textproc/kompare/distinfo
+++ b/textproc/kompare-kde4/distinfo
diff --git a/textproc/kompare/pkg-descr b/textproc/kompare-kde4/pkg-descr
index 1d31ff186b7f..1d31ff186b7f 100644
--- a/textproc/kompare/pkg-descr
+++ b/textproc/kompare-kde4/pkg-descr
diff --git a/textproc/kompare/pkg-plist b/textproc/kompare-kde4/pkg-plist
index c632be22d61f..c632be22d61f 100644
--- a/textproc/kompare/pkg-plist
+++ b/textproc/kompare-kde4/pkg-plist
diff --git a/textproc/libkomparediff2/Makefile b/textproc/libkomparediff2-kde4/Makefile
index 2d09c42e4165..b7c378f30227 100644
--- a/textproc/libkomparediff2/Makefile
+++ b/textproc/libkomparediff2-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkomparediff2
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/textproc/libkomparediff2/distinfo b/textproc/libkomparediff2-kde4/distinfo
index bb068682ca95..bb068682ca95 100644
--- a/textproc/libkomparediff2/distinfo
+++ b/textproc/libkomparediff2-kde4/distinfo
diff --git a/textproc/libkomparediff2/pkg-descr b/textproc/libkomparediff2-kde4/pkg-descr
index 3ed7a0ddbd01..3ed7a0ddbd01 100644
--- a/textproc/libkomparediff2/pkg-descr
+++ b/textproc/libkomparediff2-kde4/pkg-descr
diff --git a/textproc/libkomparediff2/pkg-plist b/textproc/libkomparediff2-kde4/pkg-plist
index f6e67ce72666..f6e67ce72666 100644
--- a/textproc/libkomparediff2/pkg-plist
+++ b/textproc/libkomparediff2-kde4/pkg-plist
diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile
index e8904a8ae813..b904d4702912 100644
--- a/x11-clocks/Makefile
+++ b/x11-clocks/Makefile
@@ -6,7 +6,7 @@
     SUBDIR += abclock
     SUBDIR += aclock
     SUBDIR += alltraxclock
-    SUBDIR += amor
+    SUBDIR += amor-kde4
     SUBDIR += asclock
     SUBDIR += asclock-gtk
     SUBDIR += asclock-xlib
@@ -23,9 +23,9 @@
     SUBDIR += gtubeclock
     SUBDIR += intclock
     SUBDIR += kdetoys-kde4
-    SUBDIR += kteatime
-    SUBDIR += ktimer
-    SUBDIR += ktux
+    SUBDIR += kteatime-kde4
+    SUBDIR += ktimer-kde4
+    SUBDIR += ktux-kde4
     SUBDIR += lmclock
     SUBDIR += mlclock
     SUBDIR += mouseclock
diff --git a/x11-clocks/amor/Makefile b/x11-clocks/amor-kde4/Makefile
index f98eefec7fdd..8ff2e1896eed 100644
--- a/x11-clocks/amor/Makefile
+++ b/x11-clocks/amor-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	amor
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-clocks/amor/distinfo b/x11-clocks/amor-kde4/distinfo
index 26f0e623e3a9..26f0e623e3a9 100644
--- a/x11-clocks/amor/distinfo
+++ b/x11-clocks/amor-kde4/distinfo
diff --git a/x11-clocks/amor/pkg-descr b/x11-clocks/amor-kde4/pkg-descr
index 5baa8403abaa..5baa8403abaa 100644
--- a/x11-clocks/amor/pkg-descr
+++ b/x11-clocks/amor-kde4/pkg-descr
diff --git a/x11-clocks/amor/pkg-plist b/x11-clocks/amor-kde4/pkg-plist
index 770f97474d7c..770f97474d7c 100644
--- a/x11-clocks/amor/pkg-plist
+++ b/x11-clocks/amor-kde4/pkg-plist
diff --git a/x11-clocks/kdetoys-kde4/Makefile b/x11-clocks/kdetoys-kde4/Makefile
index b248927e8dea..105ff73a74f0 100644
--- a/x11-clocks/kdetoys-kde4/Makefile
+++ b/x11-clocks/kdetoys-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks kde
 PKGNAMESUFFIX=	-kde4
 
@@ -15,12 +15,12 @@ OPTIONS_DEFINE=	AMOR KTEATIME KTUX
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 AMOR_DESC=		Small animation which sits on top of active window
-AMOR_RUN_DEPENDS=	${KDE_PREFIX}/bin/amor:x11-clocks/amor
+AMOR_RUN_DEPENDS=	${KDE_PREFIX}/bin/amor:x11-clocks/amor-kde4
 
 KTEATIME_DESC=		Handy timer for steeping tea
-KTEATIME_RUN_DEPENDS=	${KDE_PREFIX}/bin/kteatime:x11-clocks/kteatime
+KTEATIME_RUN_DEPENDS=	${KDE_PREFIX}/bin/kteatime:x11-clocks/kteatime-kde4
 
 KTUX_DESC=		Tux-in-a-Spaceship screen saver
-KTUX_RUN_DEPENDS=	${KDE_PREFIX}/bin/ktux:x11-clocks/ktux
+KTUX_RUN_DEPENDS=	${KDE_PREFIX}/bin/ktux:x11-clocks/ktux-kde4
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/kteatime/Makefile b/x11-clocks/kteatime-kde4/Makefile
index f4b3d6420ef8..38840c04d8e5 100644
--- a/x11-clocks/kteatime/Makefile
+++ b/x11-clocks/kteatime-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kteatime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-clocks/kteatime/distinfo b/x11-clocks/kteatime-kde4/distinfo
index 19f4e8211532..19f4e8211532 100644
--- a/x11-clocks/kteatime/distinfo
+++ b/x11-clocks/kteatime-kde4/distinfo
diff --git a/x11-clocks/kteatime/pkg-descr b/x11-clocks/kteatime-kde4/pkg-descr
index dbd470a1bfa4..dbd470a1bfa4 100644
--- a/x11-clocks/kteatime/pkg-descr
+++ b/x11-clocks/kteatime-kde4/pkg-descr
diff --git a/x11-clocks/kteatime/pkg-plist b/x11-clocks/kteatime-kde4/pkg-plist
index e608f593c164..e608f593c164 100644
--- a/x11-clocks/kteatime/pkg-plist
+++ b/x11-clocks/kteatime-kde4/pkg-plist
diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer-kde4/Makefile
index 8493f63e4645..e870a7e1e296 100644
--- a/x11-clocks/ktimer/Makefile
+++ b/x11-clocks/ktimer-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ktimer
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-clocks/ktimer/distinfo b/x11-clocks/ktimer-kde4/distinfo
index c8368add3b31..c8368add3b31 100644
--- a/x11-clocks/ktimer/distinfo
+++ b/x11-clocks/ktimer-kde4/distinfo
diff --git a/x11-clocks/ktimer/pkg-descr b/x11-clocks/ktimer-kde4/pkg-descr
index 59fa7daacb0e..59fa7daacb0e 100644
--- a/x11-clocks/ktimer/pkg-descr
+++ b/x11-clocks/ktimer-kde4/pkg-descr
diff --git a/x11-clocks/ktimer/pkg-plist b/x11-clocks/ktimer-kde4/pkg-plist
index 60796a2cf7d7..60796a2cf7d7 100644
--- a/x11-clocks/ktimer/pkg-plist
+++ b/x11-clocks/ktimer-kde4/pkg-plist
diff --git a/x11-clocks/ktux/Makefile b/x11-clocks/ktux-kde4/Makefile
index 20222bad875f..a401f7fffe7e 100644
--- a/x11-clocks/ktux/Makefile
+++ b/x11-clocks/ktux-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ktux
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-clocks/ktux/distinfo b/x11-clocks/ktux-kde4/distinfo
index 76c7a338b6ad..76c7a338b6ad 100644
--- a/x11-clocks/ktux/distinfo
+++ b/x11-clocks/ktux-kde4/distinfo
diff --git a/x11-clocks/ktux/pkg-descr b/x11-clocks/ktux-kde4/pkg-descr
index 7d0904a01a12..7d0904a01a12 100644
--- a/x11-clocks/ktux/pkg-descr
+++ b/x11-clocks/ktux-kde4/pkg-descr
diff --git a/x11-clocks/ktux/pkg-plist b/x11-clocks/ktux-kde4/pkg-plist
index 73054e7e1fbb..73054e7e1fbb 100644
--- a/x11-clocks/ktux/pkg-plist
+++ b/x11-clocks/ktux-kde4/pkg-plist
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 8a3e653e1cbb..5dab0de978fa 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -110,14 +110,13 @@
     SUBDIR += kde-icons-noia
     SUBDIR += kde-icons-nuovext2
     SUBDIR += kde-icons-nuvola
-    SUBDIR += kde4-base-artwork
+    SUBDIR += kde-base-artwork-kde4
+    SUBDIR += kde-wallpapers-kde4
     SUBDIR += kde4-style-bespin
     SUBDIR += kde4-style-nitrogen
     SUBDIR += kde4-style-oxygen-transparent
     SUBDIR += kde4-style-polyester
     SUBDIR += kde4-style-skulpture
-    SUBDIR += kde4-wallpapers
-    SUBDIR += kde4-wallpapers-freebsd
     SUBDIR += kde4-windeco-crystal
     SUBDIR += kde4-windeco-dekorator
     SUBDIR += kdeartwork-kde4
@@ -170,6 +169,7 @@
     SUBDIR += slim-themes
     SUBDIR += thewidgetfactory
     SUBDIR += ubuntulooks
+    SUBDIR += wallpapers-freebsd-kde4
     SUBDIR += xcursor-themes
     SUBDIR += xfce-evolution
     SUBDIR += xfce-icons-elementary
diff --git a/x11-themes/kde4-base-artwork/Makefile b/x11-themes/kde-base-artwork-kde4/Makefile
index 11e4e23240bb..6788c422ce8a 100644
--- a/x11-themes/kde4-base-artwork/Makefile
+++ b/x11-themes/kde-base-artwork-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kde-base-artwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-themes/kde4-base-artwork/distinfo b/x11-themes/kde-base-artwork-kde4/distinfo
index d6b1e51921e4..d6b1e51921e4 100644
--- a/x11-themes/kde4-base-artwork/distinfo
+++ b/x11-themes/kde-base-artwork-kde4/distinfo
diff --git a/x11-themes/kde4-base-artwork/pkg-descr b/x11-themes/kde-base-artwork-kde4/pkg-descr
index ae2e333378a3..ae2e333378a3 100644
--- a/x11-themes/kde4-base-artwork/pkg-descr
+++ b/x11-themes/kde-base-artwork-kde4/pkg-descr
diff --git a/x11-themes/kde4-base-artwork/pkg-plist b/x11-themes/kde-base-artwork-kde4/pkg-plist
index 90f5506db909..90f5506db909 100644
--- a/x11-themes/kde4-base-artwork/pkg-plist
+++ b/x11-themes/kde-base-artwork-kde4/pkg-plist
diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde-wallpapers-kde4/Makefile
index 7d2cb8d9a874..542f096c7000 100644
--- a/x11-themes/kde4-wallpapers/Makefile
+++ b/x11-themes/kde-wallpapers-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-wallpapers
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-themes/kde4-wallpapers/distinfo b/x11-themes/kde-wallpapers-kde4/distinfo
index 372a64e682c5..372a64e682c5 100644
--- a/x11-themes/kde4-wallpapers/distinfo
+++ b/x11-themes/kde-wallpapers-kde4/distinfo
diff --git a/x11-themes/kde4-wallpapers/pkg-descr b/x11-themes/kde-wallpapers-kde4/pkg-descr
index 3cde00d8ddda..3cde00d8ddda 100644
--- a/x11-themes/kde4-wallpapers/pkg-descr
+++ b/x11-themes/kde-wallpapers-kde4/pkg-descr
diff --git a/x11-themes/kde4-wallpapers/pkg-plist b/x11-themes/kde-wallpapers-kde4/pkg-plist
index 0bcb03591db7..0bcb03591db7 100644
--- a/x11-themes/kde4-wallpapers/pkg-plist
+++ b/x11-themes/kde-wallpapers-kde4/pkg-plist
diff --git a/x11-themes/kde4-wallpapers-freebsd/Makefile b/x11-themes/wallpapers-freebsd-kde4/Makefile
index 331f0fc4b769..ef514f2ccc6f 100644
--- a/x11-themes/kde4-wallpapers-freebsd/Makefile
+++ b/x11-themes/wallpapers-freebsd-kde4/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	kde4-wallpapers-freebsd
+PORTNAME=	wallpapers-freebsd-kde4
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	LOCAL/avilla
 DISTNAME=	stripes-freebsd-${PORTVERSION}
diff --git a/x11-themes/kde4-wallpapers-freebsd/distinfo b/x11-themes/wallpapers-freebsd-kde4/distinfo
index 44fabd4b3304..44fabd4b3304 100644
--- a/x11-themes/kde4-wallpapers-freebsd/distinfo
+++ b/x11-themes/wallpapers-freebsd-kde4/distinfo
diff --git a/x11-themes/kde4-wallpapers-freebsd/files/05-freebsdWallpaper.js b/x11-themes/wallpapers-freebsd-kde4/files/05-freebsdWallpaper.js
index 3e01d888a71b..3e01d888a71b 100644
--- a/x11-themes/kde4-wallpapers-freebsd/files/05-freebsdWallpaper.js
+++ b/x11-themes/wallpapers-freebsd-kde4/files/05-freebsdWallpaper.js
diff --git a/x11-themes/kde4-wallpapers-freebsd/pkg-descr b/x11-themes/wallpapers-freebsd-kde4/pkg-descr
index 624ea5b18b70..624ea5b18b70 100644
--- a/x11-themes/kde4-wallpapers-freebsd/pkg-descr
+++ b/x11-themes/wallpapers-freebsd-kde4/pkg-descr
diff --git a/x11-themes/kde4-wallpapers-freebsd/pkg-plist b/x11-themes/wallpapers-freebsd-kde4/pkg-plist
index 776cf10c9704..776cf10c9704 100644
--- a/x11-themes/kde4-wallpapers-freebsd/pkg-plist
+++ b/x11-themes/wallpapers-freebsd-kde4/pkg-plist
diff --git a/x11/Makefile b/x11/Makefile
index b635c4ff21f1..41260f36bd18 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -124,10 +124,10 @@
     SUBDIR += kactivitymanagerd
     SUBDIR += kb2mb2
     SUBDIR += kbproto
+    SUBDIR += kde-baseapps-kde4
+    SUBDIR += kde-runtime-kde4
+    SUBDIR += kde-workspace-kde4
     SUBDIR += kde4
-    SUBDIR += kde4-baseapps
-    SUBDIR += kde4-runtime
-    SUBDIR += kde4-workspace
     SUBDIR += kdelibs-kde4
     SUBDIR += keybinder
     SUBDIR += keybinder-gtk3
@@ -144,8 +144,8 @@
     SUBDIR += kf5-kwayland
     SUBDIR += kf5-kwindowsystem
     SUBDIR += kf5-plasma-framework
-    SUBDIR += kgamma
-    SUBDIR += konsole
+    SUBDIR += kgamma-kde4
+    SUBDIR += konsole-kde4
     SUBDIR += leechcraft
     SUBDIR += lemonbar
     SUBDIR += libICE
@@ -189,7 +189,7 @@
     SUBDIR += libgnomekbd
     SUBDIR += libgnomemm26
     SUBDIR += libinput
-    SUBDIR += libkonq
+    SUBDIR += libkonq-kde4
     SUBDIR += libmatekbd
     SUBDIR += liboldX
     SUBDIR += libsx
@@ -263,8 +263,8 @@
     SUBDIR += pcdm
     SUBDIR += pipeglade
     SUBDIR += pixman
-    SUBDIR += plasma-scriptengine-python
-    SUBDIR += plasma-scriptengine-ruby
+    SUBDIR += plasma-scriptengine-python-kde4
+    SUBDIR += plasma-scriptengine-ruby-kde4
     SUBDIR += polybar
     SUBDIR += presentproto
     SUBDIR += printproto
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde-baseapps-kde4/Makefile
index afa84ef34725..c7774e714cbe 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde-baseapps-kde4/Makefile
@@ -2,8 +2,9 @@
 
 PORTNAME=	kde-baseapps
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 kde kde-kde4
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for KDE
@@ -25,7 +26,7 @@ OPTIONS_DEFINE=	KONSOLE KWRITE
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 KONSOLE_DESC=	Install Konsole terminal emulator
-KONSOLE_RUN_DEPENDS=	${KDE_PREFIX}/bin/konsole:x11/konsole
+KONSOLE_RUN_DEPENDS=	${KDE_PREFIX}/bin/konsole:x11/konsole-kde4
 
 KWRITE_DESC=	Install KWrite text editor
 KWRITE_USE=	KDE=kate_run
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde-baseapps-kde4/distinfo
index 8907780918a1..8907780918a1 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde-baseapps-kde4/distinfo
diff --git a/x11/kde4-baseapps/pkg-descr b/x11/kde-baseapps-kde4/pkg-descr
index 1886a29bd553..1886a29bd553 100644
--- a/x11/kde4-baseapps/pkg-descr
+++ b/x11/kde-baseapps-kde4/pkg-descr
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde-baseapps-kde4/pkg-plist
index 00808b265922..00808b265922 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde-baseapps-kde4/pkg-plist
diff --git a/x11/kde4-runtime/Makefile b/x11/kde-runtime-kde4/Makefile
index 413461ee09c9..101286575378 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde-runtime-kde4/Makefile
@@ -2,8 +2,9 @@
 
 PORTNAME=	kde-runtime
 PORTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11 kde kde-applications
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Runtime components for KDE Plasma Desktop
diff --git a/x11/kde4-runtime/distinfo b/x11/kde-runtime-kde4/distinfo
index e28c5d2f7846..e28c5d2f7846 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde-runtime-kde4/distinfo
diff --git a/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp b/x11/kde-runtime-kde4/files/patch-kdesu_kdesu_kdesu.cpp
index 2b0b1754bedc..2b0b1754bedc 100644
--- a/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp
+++ b/x11/kde-runtime-kde4/files/patch-kdesu_kdesu_kdesu.cpp
diff --git a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kde-runtime-kde4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
index c52c60e287b1..c52c60e287b1 100644
--- a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
+++ b/x11/kde-runtime-kde4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl
diff --git a/x11/kde4-runtime/files/patch-kimgio__CMakeLists.txt b/x11/kde-runtime-kde4/files/patch-kimgio__CMakeLists.txt
index 962639660cb0..962639660cb0 100644
--- a/x11/kde4-runtime/files/patch-kimgio__CMakeLists.txt
+++ b/x11/kde-runtime-kde4/files/patch-kimgio__CMakeLists.txt
diff --git a/x11/kde4-runtime/files/patch-phonon_kcm_CMakeLists.txt b/x11/kde-runtime-kde4/files/patch-phonon_kcm_CMakeLists.txt
index f2d450c73953..f2d450c73953 100644
--- a/x11/kde4-runtime/files/patch-phonon_kcm_CMakeLists.txt
+++ b/x11/kde-runtime-kde4/files/patch-phonon_kcm_CMakeLists.txt
diff --git a/x11/kde4-runtime/pkg-descr b/x11/kde-runtime-kde4/pkg-descr
index a618af7d124b..a618af7d124b 100644
--- a/x11/kde4-runtime/pkg-descr
+++ b/x11/kde-runtime-kde4/pkg-descr
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde-runtime-kde4/pkg-plist
index 2395b3968cae..2395b3968cae 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde-runtime-kde4/pkg-plist
diff --git a/x11/kde4-workspace/Makefile b/x11/kde-workspace-kde4/Makefile
index a3db45cef917..a444958239e1 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde-workspace-kde4/Makefile
@@ -2,8 +2,9 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	x11 kde kde-applications
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Plasma Desktop
@@ -34,11 +35,11 @@ RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \
 		mkfontdir:x11-fonts/mkfontdir \
 		xset:x11/xset \
 		setxkbmap:x11/setxkbmap \
-		${KDE_PREFIX}/bin/ksysguardd:sysutils/ksysguardd \
+		${KDE_PREFIX}/bin/ksysguardd:sysutils/ksysguardd-kde4 \
 		${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \
 		${KDE_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \
 		${LOCALBASE}/etc/pam.d/kde:security/pam_kde \
-		${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork
+		${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde-base-artwork-kde4
 
 USES=		cmake:outsource,noninja compiler:c++11-lib gettext gmake jpeg kde:4 \
 		pkgconfig shebangfix tar:xz
@@ -107,8 +108,8 @@ VLC_DESC=		Multimedia via Phonon-VLC
 VLC_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc
 
 WALLPAPERS_DESC=	Install official KDE wallpapers
-WALLPAPERS_RUN_DEPENDS=	${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde4-wallpapers \
-			${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd
+WALLPAPERS_RUN_DEPENDS=	${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde-wallpapers-kde4 \
+			${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/wallpapers-freebsd-kde4
 
 .if !exists(/usr/lib/libutempter.so)
 LIB_DEPENDS+=	libutempter.so:sysutils/libutempter
diff --git a/x11/kde4-workspace/distinfo b/x11/kde-workspace-kde4/distinfo
index 613b6b1fa611..613b6b1fa611 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde-workspace-kde4/distinfo
diff --git a/x11/kde4-workspace/files/kde4.desktop b/x11/kde-workspace-kde4/files/kde4.desktop
index 9b5bb888248d..9b5bb888248d 100644
--- a/x11/kde4-workspace/files/kde4.desktop
+++ b/x11/kde-workspace-kde4/files/kde4.desktop
diff --git a/x11/kde4-workspace/files/kdm4.in b/x11/kde-workspace-kde4/files/kdm4.in
index 278ff6223518..278ff6223518 100644
--- a/x11/kde4-workspace/files/kdm4.in
+++ b/x11/kde-workspace-kde4/files/kdm4.in
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde-workspace-kde4/files/patch-CMakeLists.txt
index 418ac6c5e40e..418ac6c5e40e 100644
--- a/x11/kde4-workspace/files/patch-CMakeLists.txt
+++ b/x11/kde-workspace-kde4/files/patch-CMakeLists.txt
diff --git a/x11/kde4-workspace/files/patch-ConfigureChecks.cmake b/x11/kde-workspace-kde4/files/patch-ConfigureChecks.cmake
index ceb47dd93117..ceb47dd93117 100644
--- a/x11/kde4-workspace/files/patch-ConfigureChecks.cmake
+++ b/x11/kde-workspace-kde4/files/patch-ConfigureChecks.cmake
diff --git a/x11/kde4-workspace/files/patch-kdm_backend_client.c b/x11/kde-workspace-kde4/files/patch-kdm_backend_client.c
index cff83e810c9f..cff83e810c9f 100644
--- a/x11/kde4-workspace/files/patch-kdm_backend_client.c
+++ b/x11/kde-workspace-kde4/files/patch-kdm_backend_client.c
diff --git a/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt b/x11/kde-workspace-kde4/files/patch-kdm_kfrontend_CMakeLists.txt
index 40bcb9a68ff4..40bcb9a68ff4 100644
--- a/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt
+++ b/x11/kde-workspace-kde4/files/patch-kdm_kfrontend_CMakeLists.txt
diff --git a/x11/kde4-workspace/files/patch-kinfocenter b/x11/kde-workspace-kde4/files/patch-kinfocenter
index effd580055ab..effd580055ab 100644
--- a/x11/kde4-workspace/files/patch-kinfocenter
+++ b/x11/kde-workspace-kde4/files/patch-kinfocenter
diff --git a/x11/kde4-workspace/files/patch-kinfocenter_Modules_pci_kpci.cpp b/x11/kde-workspace-kde4/files/patch-kinfocenter_Modules_pci_kpci.cpp
index 10b57e9feccf..10b57e9feccf 100644
--- a/x11/kde4-workspace/files/patch-kinfocenter_Modules_pci_kpci.cpp
+++ b/x11/kde-workspace-kde4/files/patch-kinfocenter_Modules_pci_kpci.cpp
diff --git a/x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp
index 72d181a797e2..72d181a797e2 100644
--- a/x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp
+++ b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp
diff --git a/x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h
index e81bcb039dc1..e81bcb039dc1 100644
--- a/x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h
+++ b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h
diff --git a/x11/kde4-workspace/files/patch-ksysguard_gui_SystemLoad2.sgrd b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_SystemLoad2.sgrd
index 07b0f46205f7..07b0f46205f7 100644
--- a/x11/kde4-workspace/files/patch-ksysguard_gui_SystemLoad2.sgrd
+++ b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_SystemLoad2.sgrd
diff --git a/x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.cpp b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_ksysguard.cpp
index 071689cb5fcc..071689cb5fcc 100644
--- a/x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.cpp
+++ b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_ksysguard.cpp
diff --git a/x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.h b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_ksysguard.h
index 8afa4d9b3225..8afa4d9b3225 100644
--- a/x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.h
+++ b/x11/kde-workspace-kde4/files/patch-ksysguard_gui_ksysguard.h
diff --git a/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp b/x11/kde-workspace-kde4/files/patch-kwin_effects_blur_blur.cpp
index f41d9a184da9..f41d9a184da9 100644
--- a/x11/kde4-workspace/files/patch-kwin_effects_blur_blur.cpp
+++ b/x11/kde-workspace-kde4/files/patch-kwin_effects_blur_blur.cpp
diff --git a/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt b/x11/kde-workspace-kde4/files/patch-kwin_opengltest_CMakeLists.txt
index f9d589472c79..f9d589472c79 100644
--- a/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt
+++ b/x11/kde-workspace-kde4/files/patch-kwin_opengltest_CMakeLists.txt
diff --git a/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp b/x11/kde-workspace-kde4/files/patch-kwin_scene__xrender.cpp
index 6132b4a9e04f..6132b4a9e04f 100644
--- a/x11/kde4-workspace/files/patch-kwin_scene__xrender.cpp
+++ b/x11/kde-workspace-kde4/files/patch-kwin_scene__xrender.cpp
diff --git a/x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp b/x11/kde-workspace-kde4/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp
index 9c761bd9aff2..9c761bd9aff2 100644
--- a/x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp
+++ b/x11/kde-workspace-kde4/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp
diff --git a/x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h b/x11/kde-workspace-kde4/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h
index 07e35d50d86d..07e35d50d86d 100644
--- a/x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h
+++ b/x11/kde-workspace-kde4/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h
diff --git a/x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt b/x11/kde-workspace-kde4/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt
index afb71b25bfe4..afb71b25bfe4 100644
--- a/x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt
+++ b/x11/kde-workspace-kde4/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt
diff --git a/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp b/x11/kde-workspace-kde4/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp
index 53fa3cbebf8e..53fa3cbebf8e 100644
--- a/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp
+++ b/x11/kde-workspace-kde4/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp
diff --git a/x11/kde4-workspace/files/patch-startkde.cmake b/x11/kde-workspace-kde4/files/patch-startkde.cmake
index e322d8a68db9..e322d8a68db9 100644
--- a/x11/kde4-workspace/files/patch-startkde.cmake
+++ b/x11/kde-workspace-kde4/files/patch-startkde.cmake
diff --git a/x11/kde4-workspace/files/patch-usbview b/x11/kde-workspace-kde4/files/patch-usbview
index 9c56664bb6ce..9c56664bb6ce 100644
--- a/x11/kde4-workspace/files/patch-usbview
+++ b/x11/kde-workspace-kde4/files/patch-usbview
diff --git a/x11/kde4-workspace/files/pkg-message.gstreamer b/x11/kde-workspace-kde4/files/pkg-message.gstreamer
index f6d499b7bb95..f6d499b7bb95 100644
--- a/x11/kde4-workspace/files/pkg-message.gstreamer
+++ b/x11/kde-workspace-kde4/files/pkg-message.gstreamer
diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde-workspace-kde4/files/pkg-message.in
index 158456987cbb..158456987cbb 100644
--- a/x11/kde4-workspace/files/pkg-message.in
+++ b/x11/kde-workspace-kde4/files/pkg-message.in
diff --git a/x11/kde4-workspace/pkg-descr b/x11/kde-workspace-kde4/pkg-descr
index d2a70cd666b3..d2a70cd666b3 100644
--- a/x11/kde4-workspace/pkg-descr
+++ b/x11/kde-workspace-kde4/pkg-descr
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde-workspace-kde4/pkg-plist
index c7fa75ee303f..c7fa75ee303f 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde-workspace-kde4/pkg-plist
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 9ea974f20bb0..5a946ee0f057 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kde
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 kde
 
 MAINTAINER=	kde@FreeBSD.org
@@ -48,7 +48,7 @@ KDEPIM_DESC=		Personal information management
 KDEPIM_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmail:deskutils/kdepim-kde4
 
 KDEPLASMA_DESC=		Extra plasmoids and plugins for Plasma
-KDEPLASMA_RUN_DEPENDS=	${KDE_PREFIX}/bin/lancelot:deskutils/kdeplasma-addons
+KDEPLASMA_RUN_DEPENDS=	${KDE_PREFIX}/bin/lancelot:deskutils/kdeplasma-addons-kde4
 
 KDESDK_DESC=		Software development kit
 KDESDK_RUN_DEPENDS=	kdesdk-kde4>=${KDE4_VERSION}:devel/kdesdk-kde4
diff --git a/x11/kgamma/Makefile b/x11/kgamma-kde4/Makefile
index 6db5991e8ba6..8001281dfebf 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kgamma
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kgamma/distinfo b/x11/kgamma-kde4/distinfo
index 19c9f8d510b9..19c9f8d510b9 100644
--- a/x11/kgamma/distinfo
+++ b/x11/kgamma-kde4/distinfo
diff --git a/x11/kgamma/files/patch-CMakeLists.txt b/x11/kgamma-kde4/files/patch-CMakeLists.txt
index c8c15a5c03a0..c8c15a5c03a0 100644
--- a/x11/kgamma/files/patch-CMakeLists.txt
+++ b/x11/kgamma-kde4/files/patch-CMakeLists.txt
diff --git a/x11/kgamma/pkg-descr b/x11/kgamma-kde4/pkg-descr
index f58c955bc234..f58c955bc234 100644
--- a/x11/kgamma/pkg-descr
+++ b/x11/kgamma-kde4/pkg-descr
diff --git a/x11/kgamma/pkg-plist b/x11/kgamma-kde4/pkg-plist
index b45aa25b8a31..b45aa25b8a31 100644
--- a/x11/kgamma/pkg-plist
+++ b/x11/kgamma-kde4/pkg-plist
diff --git a/x11/konsole/Makefile b/x11/konsole-kde4/Makefile
index 796c2c3ee3ad..db29ce6a90ca 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	konsole
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/konsole/distinfo b/x11/konsole-kde4/distinfo
index 800440a65a1a..800440a65a1a 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole-kde4/distinfo
diff --git a/x11/konsole/files/patch-src_CMakeLists.txt b/x11/konsole-kde4/files/patch-src_CMakeLists.txt
index 5a79923fa3a6..5a79923fa3a6 100644
--- a/x11/konsole/files/patch-src_CMakeLists.txt
+++ b/x11/konsole-kde4/files/patch-src_CMakeLists.txt
diff --git a/x11/konsole/files/patch-src_ColorScheme.cpp b/x11/konsole-kde4/files/patch-src_ColorScheme.cpp
index 415fc20485aa..415fc20485aa 100644
--- a/x11/konsole/files/patch-src_ColorScheme.cpp
+++ b/x11/konsole-kde4/files/patch-src_ColorScheme.cpp
diff --git a/x11/konsole/files/patch-src_History.cpp b/x11/konsole-kde4/files/patch-src_History.cpp
index bc11a945bf48..bc11a945bf48 100644
--- a/x11/konsole/files/patch-src_History.cpp
+++ b/x11/konsole-kde4/files/patch-src_History.cpp
diff --git a/x11/konsole/files/patch-src_History.h b/x11/konsole-kde4/files/patch-src_History.h
index e6dd66f44faa..e6dd66f44faa 100644
--- a/x11/konsole/files/patch-src_History.h
+++ b/x11/konsole-kde4/files/patch-src_History.h
diff --git a/x11/konsole/files/patch-src_ProcessInfo.cpp b/x11/konsole-kde4/files/patch-src_ProcessInfo.cpp
index 798f45fab999..798f45fab999 100644
--- a/x11/konsole/files/patch-src_ProcessInfo.cpp
+++ b/x11/konsole-kde4/files/patch-src_ProcessInfo.cpp
diff --git a/x11/konsole/files/patch-src_TerminalDisplay.cpp b/x11/konsole-kde4/files/patch-src_TerminalDisplay.cpp
index 2587cf2bbf4c..2587cf2bbf4c 100644
--- a/x11/konsole/files/patch-src_TerminalDisplay.cpp
+++ b/x11/konsole-kde4/files/patch-src_TerminalDisplay.cpp
diff --git a/x11/konsole/pkg-descr b/x11/konsole-kde4/pkg-descr
index 8d2e79d96b24..8d2e79d96b24 100644
--- a/x11/konsole/pkg-descr
+++ b/x11/konsole-kde4/pkg-descr
diff --git a/x11/konsole/pkg-plist b/x11/konsole-kde4/pkg-plist
index c352bafba5c2..c352bafba5c2 100644
--- a/x11/konsole/pkg-plist
+++ b/x11/konsole-kde4/pkg-plist
diff --git a/x11/libkonq/Makefile b/x11/libkonq-kde4/Makefile
index 30055a15922c..b28748c95d41 100644
--- a/x11/libkonq/Makefile
+++ b/x11/libkonq-kde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkonq
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 kde kde-kde4
 DISTNAME=	kde-baseapps-${PORTVERSION}
 
@@ -18,7 +18,7 @@ USE_QT4=	corelib dbus gui network svg xml \
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
-DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-baseapps/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde-baseapps-kde4/distinfo
 
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}/lib/konq
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/x11/libkonq/pkg-descr b/x11/libkonq-kde4/pkg-descr
index d270ce31c750..d270ce31c750 100644
--- a/x11/libkonq/pkg-descr
+++ b/x11/libkonq-kde4/pkg-descr
diff --git a/x11/libkonq/pkg-plist b/x11/libkonq-kde4/pkg-plist
index f3c248f920a1..f3c248f920a1 100644
--- a/x11/libkonq/pkg-plist
+++ b/x11/libkonq-kde4/pkg-plist
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python-kde4/Makefile
index e0b3e20ef3f4..aae0a332f80f 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python-kde4/Makefile
@@ -2,9 +2,10 @@
 
 PORTNAME=	plasma-scriptengine-python
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 kde kde-applications
 DISTNAME=	kde-workspace-${PORTVERSION}
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma scriptengine for Python
@@ -13,7 +14,7 @@ NO_ARCH=	yes
 USES=		cmake:outsource kde:4 python:2.7 tar:xz
 USE_KDE=	kdelibs pykde4 automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
-DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde-workspace-kde4/distinfo
 
 KDE_APPLICATIONS_VERSION=	15.08.0
 
diff --git a/x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt b/x11/plasma-scriptengine-python-kde4/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt
index 97303a9a6173..97303a9a6173 100644
--- a/x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt
+++ b/x11/plasma-scriptengine-python-kde4/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt
diff --git a/x11/plasma-scriptengine-python/pkg-descr b/x11/plasma-scriptengine-python-kde4/pkg-descr
index 9b8530aa6991..9b8530aa6991 100644
--- a/x11/plasma-scriptengine-python/pkg-descr
+++ b/x11/plasma-scriptengine-python-kde4/pkg-descr
diff --git a/x11/plasma-scriptengine-python/pkg-plist b/x11/plasma-scriptengine-python-kde4/pkg-plist
index 9230a14adcb5..9230a14adcb5 100644
--- a/x11/plasma-scriptengine-python/pkg-plist
+++ b/x11/plasma-scriptengine-python-kde4/pkg-plist
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby-kde4/Makefile
index 00e7540d0a44..5820f6ac0a7d 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby-kde4/Makefile
@@ -2,9 +2,10 @@
 
 PORTNAME=	plasma-scriptengine-ruby
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde kde-applications
 DISTNAME=	kde-workspace-${PORTVERSION}
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma scriptengine for Ruby
@@ -14,7 +15,7 @@ USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs korundum automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_RUBY=	yes
-DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde-workspace-kde4/distinfo
 
 KDE_APPLICATIONS_VERSION=	15.08.0
 
diff --git a/x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt b/x11/plasma-scriptengine-ruby-kde4/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt
index 6a920d8816da..6a920d8816da 100644
--- a/x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt
+++ b/x11/plasma-scriptengine-ruby-kde4/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt
diff --git a/x11/plasma-scriptengine-ruby/pkg-descr b/x11/plasma-scriptengine-ruby-kde4/pkg-descr
index cfb31ce5ec31..cfb31ce5ec31 100644
--- a/x11/plasma-scriptengine-ruby/pkg-descr
+++ b/x11/plasma-scriptengine-ruby-kde4/pkg-descr
diff --git a/x11/plasma-scriptengine-ruby/pkg-plist b/x11/plasma-scriptengine-ruby-kde4/pkg-plist
index c9f5f320feea..c9f5f320feea 100644
--- a/x11/plasma-scriptengine-ruby/pkg-plist
+++ b/x11/plasma-scriptengine-ruby-kde4/pkg-plist
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index 63f0d985aa58..0cf8ca57b8ce 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yakuake
 PORTVERSION=	2.9.9
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11 kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
@@ -14,7 +14,7 @@ COMMENT=	Drop-down terminal emulator for KDE
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	konsole:x11/konsole
+RUN_DEPENDS=	konsole:x11/konsole-kde4
 
 USES=		cmake gettext kde:4 shebangfix tar:xz
 SHEBANG_FILES=	data/updaters/yakuake-${PORTVERSION}-startupnotification.pl