Shuffle the KDE ktp-* and related ports into a -kde4 suffix.

This is consistent with r462619, which moved most (but not all,
hence this commit) of the KDE4-era ports out of the way for
newer generation KDE.

Approved by:	tcberner (mentor, implicit)
Differential Revision:	https://reviews.freebsd.org/D14775

52 files changed, 65 insertions, 53 deletions

diff --git a/net-im/Makefile b/net-im/Makefile
index 0c5de3a7ce03..b9344c4f0063 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -39,20 +39,19 @@
     SUBDIR += jarl
     SUBDIR += jggtrans
     SUBDIR += jitsi
-    SUBDIR += kde-telepathy
     SUBDIR += kmess-kde4
     SUBDIR += kopete-kde4
-    SUBDIR += ktp-accounts-kcm
-    SUBDIR += ktp-approver
-    SUBDIR += ktp-auth-handler
-    SUBDIR += ktp-common-internals
-    SUBDIR += ktp-contact-list
-    SUBDIR += ktp-contact-runner
-    SUBDIR += ktp-desktop-applets
-    SUBDIR += ktp-filetransfer-handler
-    SUBDIR += ktp-kded-integration-module
-    SUBDIR += ktp-send-file
-    SUBDIR += ktp-text-ui
+    SUBDIR += ktp-accounts-kcm-kde4
+    SUBDIR += ktp-approver-kde4
+    SUBDIR += ktp-auth-handler-kde4
+    SUBDIR += ktp-common-internals-kde4
+    SUBDIR += ktp-contact-list-kde4
+    SUBDIR += ktp-contact-runner-kde4
+    SUBDIR += ktp-desktop-applets-kde4
+    SUBDIR += ktp-filetransfer-handler-kde4
+    SUBDIR += ktp-kded-integration-module-kde4
+    SUBDIR += ktp-send-file-kde4
+    SUBDIR += ktp-text-ui-kde4
     SUBDIR += libaccounts-glib
     SUBDIR += libaccounts-qt5
     SUBDIR += libjreen
@@ -119,7 +118,7 @@
     SUBDIR += pidgin-skype
     SUBDIR += pidgin-skypeweb
     SUBDIR += pidgin-twitter
-    SUBDIR += plasma-applet-ktp
+    SUBDIR += plasma-applet-ktp-kde4
     SUBDIR += poezio
     SUBDIR += profanity
     SUBDIR += prosody
@@ -180,6 +179,7 @@
     SUBDIR += telepathy-glib
     SUBDIR += telepathy-haze
     SUBDIR += telepathy-idle
+    SUBDIR += telepathy-kde4
     SUBDIR += telepathy-logger
     SUBDIR += telepathy-logger-qt4
     SUBDIR += telepathy-mission-control
diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm-kde4/Makefile
index 30503ad343d9..a4bc100be5d3 100644
--- a/net-im/ktp-accounts-kcm/Makefile
+++ b/net-im/ktp-accounts-kcm-kde4/Makefile
@@ -2,17 +2,18 @@
 
 PORTNAME=	ktp-accounts-kcm
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging account management module
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
+RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-accounts-kcm/distinfo b/net-im/ktp-accounts-kcm-kde4/distinfo
index 5e8e35bd45b5..5e8e35bd45b5 100644
--- a/net-im/ktp-accounts-kcm/distinfo
+++ b/net-im/ktp-accounts-kcm-kde4/distinfo
diff --git a/net-im/ktp-accounts-kcm/pkg-descr b/net-im/ktp-accounts-kcm-kde4/pkg-descr
index 31a5df5ea05e..31a5df5ea05e 100644
--- a/net-im/ktp-accounts-kcm/pkg-descr
+++ b/net-im/ktp-accounts-kcm-kde4/pkg-descr
diff --git a/net-im/ktp-accounts-kcm/pkg-plist b/net-im/ktp-accounts-kcm-kde4/pkg-plist
index fcf43e292ab1..fcf43e292ab1 100644
--- a/net-im/ktp-accounts-kcm/pkg-plist
+++ b/net-im/ktp-accounts-kcm-kde4/pkg-plist
diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver-kde4/Makefile
index 2dfada8449ed..2d016c168bab 100644
--- a/net-im/ktp-approver/Makefile
+++ b/net-im/ktp-approver-kde4/Makefile
@@ -2,16 +2,17 @@
 
 PORTNAME=	ktp-approver
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging notifier
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
+RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-approver/distinfo b/net-im/ktp-approver-kde4/distinfo
index c2bb898d6100..c2bb898d6100 100644
--- a/net-im/ktp-approver/distinfo
+++ b/net-im/ktp-approver-kde4/distinfo
diff --git a/net-im/ktp-approver/pkg-descr b/net-im/ktp-approver-kde4/pkg-descr
index 555936f35c97..555936f35c97 100644
--- a/net-im/ktp-approver/pkg-descr
+++ b/net-im/ktp-approver-kde4/pkg-descr
diff --git a/net-im/ktp-approver/pkg-plist b/net-im/ktp-approver-kde4/pkg-plist
index 98a34b0a02e4..98a34b0a02e4 100644
--- a/net-im/ktp-approver/pkg-plist
+++ b/net-im/ktp-approver-kde4/pkg-plist
diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler-kde4/Makefile
index f3575f952ccc..92758b800edc 100644
--- a/net-im/ktp-auth-handler/Makefile
+++ b/net-im/ktp-auth-handler-kde4/Makefile
@@ -2,9 +2,10 @@
 
 PORTNAME=	ktp-auth-handler
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KWallet integration module for KDE Telepathy
@@ -12,7 +13,7 @@ COMMENT=	KWallet integration module for KDE Telepathy
 LIB_DEPENDS=	libqjson.so:devel/qjson \
 		libqca.so:devel/qca \
 		libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-auth-handler/distinfo b/net-im/ktp-auth-handler-kde4/distinfo
index ebc1a26dffc9..ebc1a26dffc9 100644
--- a/net-im/ktp-auth-handler/distinfo
+++ b/net-im/ktp-auth-handler-kde4/distinfo
diff --git a/net-im/ktp-auth-handler/pkg-descr b/net-im/ktp-auth-handler-kde4/pkg-descr
index 7c6d4cc80870..7c6d4cc80870 100644
--- a/net-im/ktp-auth-handler/pkg-descr
+++ b/net-im/ktp-auth-handler-kde4/pkg-descr
diff --git a/net-im/ktp-auth-handler/pkg-plist b/net-im/ktp-auth-handler-kde4/pkg-plist
index 61fdda69c591..61fdda69c591 100644
--- a/net-im/ktp-auth-handler/pkg-plist
+++ b/net-im/ktp-auth-handler-kde4/pkg-plist
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals-kde4/Makefile
index 3aefcf681fd1..e0ad6001ef16 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals-kde4/Makefile
@@ -2,9 +2,10 @@
 
 PORTNAME=	ktp-common-internals
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Telepathy internal library
diff --git a/net-im/ktp-common-internals/distinfo b/net-im/ktp-common-internals-kde4/distinfo
index 5a16f1e73ade..5a16f1e73ade 100644
--- a/net-im/ktp-common-internals/distinfo
+++ b/net-im/ktp-common-internals-kde4/distinfo
diff --git a/net-im/ktp-common-internals/files/patch-CMakeLists.txt b/net-im/ktp-common-internals-kde4/files/patch-CMakeLists.txt
index 9fc875a2d59a..9fc875a2d59a 100644
--- a/net-im/ktp-common-internals/files/patch-CMakeLists.txt
+++ b/net-im/ktp-common-internals-kde4/files/patch-CMakeLists.txt
diff --git a/net-im/ktp-common-internals/pkg-descr b/net-im/ktp-common-internals-kde4/pkg-descr
index 64152602ef40..64152602ef40 100644
--- a/net-im/ktp-common-internals/pkg-descr
+++ b/net-im/ktp-common-internals-kde4/pkg-descr
diff --git a/net-im/ktp-common-internals/pkg-plist b/net-im/ktp-common-internals-kde4/pkg-plist
index c60763bcc8f7..c60763bcc8f7 100644
--- a/net-im/ktp-common-internals/pkg-plist
+++ b/net-im/ktp-common-internals-kde4/pkg-plist
diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list-kde4/Makefile
index 55114be2d19c..1a3d2265dea5 100644
--- a/net-im/ktp-contact-list/Makefile
+++ b/net-im/ktp-contact-list-kde4/Makefile
@@ -2,16 +2,17 @@
 
 PORTNAME=	ktp-contact-list
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging contact list application
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-contact-list/distinfo b/net-im/ktp-contact-list-kde4/distinfo
index d7c1eacfcf29..d7c1eacfcf29 100644
--- a/net-im/ktp-contact-list/distinfo
+++ b/net-im/ktp-contact-list-kde4/distinfo
diff --git a/net-im/ktp-contact-list/pkg-descr b/net-im/ktp-contact-list-kde4/pkg-descr
index 7448b831e183..7448b831e183 100644
--- a/net-im/ktp-contact-list/pkg-descr
+++ b/net-im/ktp-contact-list-kde4/pkg-descr
diff --git a/net-im/ktp-contact-list/pkg-plist b/net-im/ktp-contact-list-kde4/pkg-plist
index 363f18bf6c88..363f18bf6c88 100644
--- a/net-im/ktp-contact-list/pkg-plist
+++ b/net-im/ktp-contact-list-kde4/pkg-plist
diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner-kde4/Makefile
index 2c58fa0c4ed4..ed7084f66f0a 100644
--- a/net-im/ktp-contact-runner/Makefile
+++ b/net-im/ktp-contact-runner-kde4/Makefile
@@ -2,15 +2,16 @@
 
 PORTNAME=	ktp-contact-runner
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KRunner integration module for KDE Telepathy
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-contact-runner/distinfo b/net-im/ktp-contact-runner-kde4/distinfo
index a38d648e2d09..a38d648e2d09 100644
--- a/net-im/ktp-contact-runner/distinfo
+++ b/net-im/ktp-contact-runner-kde4/distinfo
diff --git a/net-im/ktp-contact-runner/pkg-descr b/net-im/ktp-contact-runner-kde4/pkg-descr
index 9443a00f57e3..9443a00f57e3 100644
--- a/net-im/ktp-contact-runner/pkg-descr
+++ b/net-im/ktp-contact-runner-kde4/pkg-descr
diff --git a/net-im/ktp-contact-runner/pkg-plist b/net-im/ktp-contact-runner-kde4/pkg-plist
index 340704f2faec..340704f2faec 100644
--- a/net-im/ktp-contact-runner/pkg-plist
+++ b/net-im/ktp-contact-runner-kde4/pkg-plist
diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets-kde4/Makefile
index dea96839a061..ae23875788bb 100644
--- a/net-im/ktp-desktop-applets/Makefile
+++ b/net-im/ktp-desktop-applets-kde4/Makefile
@@ -2,14 +2,15 @@
 
 PORTNAME=	ktp-desktop-applets
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging plasma widgets
 
-LIB_DEPENDS=	libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+LIB_DEPENDS=	libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-desktop-applets/distinfo b/net-im/ktp-desktop-applets-kde4/distinfo
index 620e50f43fd5..620e50f43fd5 100644
--- a/net-im/ktp-desktop-applets/distinfo
+++ b/net-im/ktp-desktop-applets-kde4/distinfo
diff --git a/net-im/ktp-desktop-applets/pkg-descr b/net-im/ktp-desktop-applets-kde4/pkg-descr
index 630f088f07bb..630f088f07bb 100644
--- a/net-im/ktp-desktop-applets/pkg-descr
+++ b/net-im/ktp-desktop-applets-kde4/pkg-descr
diff --git a/net-im/ktp-desktop-applets/pkg-plist b/net-im/ktp-desktop-applets-kde4/pkg-plist
index 554a16744421..554a16744421 100644
--- a/net-im/ktp-desktop-applets/pkg-plist
+++ b/net-im/ktp-desktop-applets-kde4/pkg-plist
diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler-kde4/Makefile
index 144cd5a37819..70b0942f3b81 100644
--- a/net-im/ktp-filetransfer-handler/Makefile
+++ b/net-im/ktp-filetransfer-handler-kde4/Makefile
@@ -2,15 +2,16 @@
 
 PORTNAME=	ktp-filetransfer-handler
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging file transfer handler
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-filetransfer-handler/distinfo b/net-im/ktp-filetransfer-handler-kde4/distinfo
index d9078268112c..d9078268112c 100644
--- a/net-im/ktp-filetransfer-handler/distinfo
+++ b/net-im/ktp-filetransfer-handler-kde4/distinfo
diff --git a/net-im/ktp-filetransfer-handler/pkg-descr b/net-im/ktp-filetransfer-handler-kde4/pkg-descr
index 1915927ee9a4..1915927ee9a4 100644
--- a/net-im/ktp-filetransfer-handler/pkg-descr
+++ b/net-im/ktp-filetransfer-handler-kde4/pkg-descr
diff --git a/net-im/ktp-filetransfer-handler/pkg-plist b/net-im/ktp-filetransfer-handler-kde4/pkg-plist
index ea9074d722be..ea9074d722be 100644
--- a/net-im/ktp-filetransfer-handler/pkg-plist
+++ b/net-im/ktp-filetransfer-handler-kde4/pkg-plist
diff --git a/net-im/ktp-kded-integration-module/Makefile b/net-im/ktp-kded-integration-module-kde4/Makefile
index 82224482364d..36fc6ced253d 100644
--- a/net-im/ktp-kded-integration-module/Makefile
+++ b/net-im/ktp-kded-integration-module-kde4/Makefile
@@ -2,15 +2,16 @@
 
 PORTNAME=	ktp-kded-integration-module
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Module for integration of instant messaging into KDE Workspaces
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-kded-integration-module/distinfo b/net-im/ktp-kded-integration-module-kde4/distinfo
index 82fa72b60491..82fa72b60491 100644
--- a/net-im/ktp-kded-integration-module/distinfo
+++ b/net-im/ktp-kded-integration-module-kde4/distinfo
diff --git a/net-im/ktp-kded-integration-module/pkg-descr b/net-im/ktp-kded-integration-module-kde4/pkg-descr
index ab5914f53b40..ab5914f53b40 100644
--- a/net-im/ktp-kded-integration-module/pkg-descr
+++ b/net-im/ktp-kded-integration-module-kde4/pkg-descr
diff --git a/net-im/ktp-kded-integration-module/pkg-plist b/net-im/ktp-kded-integration-module-kde4/pkg-plist
index 45fcb37d2d8e..45fcb37d2d8e 100644
--- a/net-im/ktp-kded-integration-module/pkg-plist
+++ b/net-im/ktp-kded-integration-module-kde4/pkg-plist
diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file-kde4/Makefile
index 67eac2c2a634..1d1dd55ab1fb 100644
--- a/net-im/ktp-send-file/Makefile
+++ b/net-im/ktp-send-file-kde4/Makefile
@@ -2,17 +2,18 @@
 
 PORTNAME=	ktp-send-file
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging file transfer application
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
-		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
+RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler-kde4 \
+		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/ktp-send-file/distinfo b/net-im/ktp-send-file-kde4/distinfo
index 46d85ee9ffdd..46d85ee9ffdd 100644
--- a/net-im/ktp-send-file/distinfo
+++ b/net-im/ktp-send-file-kde4/distinfo
diff --git a/net-im/ktp-send-file/pkg-descr b/net-im/ktp-send-file-kde4/pkg-descr
index 1d2f2c8ae910..1d2f2c8ae910 100644
--- a/net-im/ktp-send-file/pkg-descr
+++ b/net-im/ktp-send-file-kde4/pkg-descr
diff --git a/net-im/ktp-send-file/pkg-plist b/net-im/ktp-send-file-kde4/pkg-plist
index 190b3a6429e2..190b3a6429e2 100644
--- a/net-im/ktp-send-file/pkg-plist
+++ b/net-im/ktp-send-file-kde4/pkg-plist
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui-kde4/Makefile
index 33e3bbff8331..381359d0b896 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui-kde4/Makefile
@@ -2,17 +2,18 @@
 
 PORTNAME=	ktp-text-ui
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE chat window application
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
-RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
+RUN_DEPENDS=	${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4
 
 USES=		cmake compiler:c++11-lang gettext kde:4 tar:bzip2
 USE_KDE=	automoc4
diff --git a/net-im/ktp-text-ui/distinfo b/net-im/ktp-text-ui-kde4/distinfo
index 0c76dcd628f4..0c76dcd628f4 100644
--- a/net-im/ktp-text-ui/distinfo
+++ b/net-im/ktp-text-ui-kde4/distinfo
diff --git a/net-im/ktp-text-ui/pkg-descr b/net-im/ktp-text-ui-kde4/pkg-descr
index 1a7c1dd704f0..1a7c1dd704f0 100644
--- a/net-im/ktp-text-ui/pkg-descr
+++ b/net-im/ktp-text-ui-kde4/pkg-descr
diff --git a/net-im/ktp-text-ui/pkg-plist b/net-im/ktp-text-ui-kde4/pkg-plist
index da5a042925dc..da5a042925dc 100644
--- a/net-im/ktp-text-ui/pkg-plist
+++ b/net-im/ktp-text-ui-kde4/pkg-plist
diff --git a/net-im/plasma-applet-ktp/Makefile b/net-im/plasma-applet-ktp-kde4/Makefile
index 75b76cf0f9a9..22d7ad0b8b95 100644
--- a/net-im/plasma-applet-ktp/Makefile
+++ b/net-im/plasma-applet-ktp-kde4/Makefile
@@ -2,17 +2,18 @@
 
 PORTNAME=	ktp
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 PKGNAMEPREFIX=	plasma-applet-
 DISTNAME=	${PORTNAME}-desktop-applets-${PORTVERSION}
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE instant messaging Plasma applets
 
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
-		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
+		libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4
 
 USES=		cmake gettext kde:4 tar:bzip2
 USE_KDE=	kdelibs automoc4
diff --git a/net-im/plasma-applet-ktp/distinfo b/net-im/plasma-applet-ktp-kde4/distinfo
index 620e50f43fd5..620e50f43fd5 100644
--- a/net-im/plasma-applet-ktp/distinfo
+++ b/net-im/plasma-applet-ktp-kde4/distinfo
diff --git a/net-im/plasma-applet-ktp/pkg-descr b/net-im/plasma-applet-ktp-kde4/pkg-descr
index f6ce13b4b463..f6ce13b4b463 100644
--- a/net-im/plasma-applet-ktp/pkg-descr
+++ b/net-im/plasma-applet-ktp-kde4/pkg-descr
diff --git a/net-im/plasma-applet-ktp/pkg-plist b/net-im/plasma-applet-ktp-kde4/pkg-plist
index 554a16744421..554a16744421 100644
--- a/net-im/plasma-applet-ktp/pkg-plist
+++ b/net-im/plasma-applet-ktp-kde4/pkg-plist
diff --git a/net-im/kde-telepathy/Makefile b/net-im/telepathy-kde4/Makefile
index 52d888ae8350..03a4dc0c3bcb 100644
--- a/net-im/kde-telepathy/Makefile
+++ b/net-im/telepathy-kde4/Makefile
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
-PORTNAME=	kde-telepathy
+PORTNAME=	telepathy
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im kde
 PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE integrated instant messaging framework
 
-RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kcm_ktp_accounts.so:net-im/ktp-accounts-kcm \
-		${KDE_PREFIX}/lib/kde4/kded_ktp_approver.so:net-im/ktp-approver \
-		${KDE_PREFIX}/lib/kde4/libexec/ktp-auth-handler:net-im/ktp-auth-handler \
-		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list \
-		${KDE_PREFIX}/lib/kde4/krunner_ktp_contacts.so:net-im/ktp-contact-runner \
-		${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
-		${KDE_PREFIX}/lib/kde4/kded_ktp_integration_module.so:net-im/ktp-kded-integration-module \
-		${KDE_PREFIX}/lib/kde4/libexec/ktp-text-ui:net-im/ktp-text-ui
+RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/kcm_ktp_accounts.so:net-im/ktp-accounts-kcm-kde4 \
+		${KDE_PREFIX}/lib/kde4/kded_ktp_approver.so:net-im/ktp-approver-kde4 \
+		${KDE_PREFIX}/lib/kde4/libexec/ktp-auth-handler:net-im/ktp-auth-handler-kde4 \
+		${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4 \
+		${KDE_PREFIX}/lib/kde4/krunner_ktp_contacts.so:net-im/ktp-contact-runner-kde4 \
+		${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler-kde4 \
+		${KDE_PREFIX}/lib/kde4/kded_ktp_integration_module.so:net-im/ktp-kded-integration-module-kde4 \
+		${KDE_PREFIX}/lib/kde4/libexec/ktp-text-ui:net-im/ktp-text-ui-kde4
 
 USES=		kde:4 metaport
 
@@ -29,11 +29,11 @@ SEND_FILE_DESC=	Context menu plugin for sending files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPLASMA}
-RUN_DEPENDS+=	${KDE_PREFIX}/lib/kde4/plasma_applet_ktp_presence.so:net-im/plasma-applet-ktp
+RUN_DEPENDS+=	${KDE_PREFIX}/lib/kde4/plasma_applet_ktp_presence.so:net-im/plasma-applet-ktp-kde4
 .endif
 
 .if ${PORT_OPTIONS:MSEND_FILE}
-RUN_DEPENDS+=	${KDE_PREFIX}/bin/ktp-send-file:net-im/ktp-send-file
+RUN_DEPENDS+=	${KDE_PREFIX}/bin/ktp-send-file:net-im/ktp-send-file-kde4
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/kde-telepathy/pkg-descr b/net-im/telepathy-kde4/pkg-descr
index 821717164e72..821717164e72 100644
--- a/net-im/kde-telepathy/pkg-descr
+++ b/net-im/telepathy-kde4/pkg-descr