69 files changed, 33 insertions, 28 deletions
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