Update the KDE Telepathy ports to 0.9.0.

Contains commits by myself and alonso@.

30 files changed, 96 insertions, 75 deletions

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 217749bcc763..e1fe3a83776e 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -79,7 +79,7 @@ KDE4_VERSION?=		4.14.3
 KDE4_ACTIVITES_VERSION=	4.13.3
 KDE4_WORKSPACE_VERSION=	4.11.14
 KDE4_BRANCH?=		stable
-KTP_VERSION?=		0.8.0
+KTP_VERSION?=		0.9.0
 KTP_BRANCH?=		stable
 CALLIGRA_VERSION?=	2.9.11
 CALLIGRA_BRANCH?=	stable
diff --git a/net-im/kde-telepathy/Makefile b/net-im/kde-telepathy/Makefile
index da7b0f4c2a57..b7e8488a58b1 100644
--- a/net-im/kde-telepathy/Makefile
+++ b/net-im/kde-telepathy/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kde-telepathy
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	3
 CATEGORIES=	net-im kde
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net-im/ktp-accounts-kcm/distinfo b/net-im/ktp-accounts-kcm/distinfo
index e90aa6c51f79..5e8e35bd45b5 100644
--- a/net-im/ktp-accounts-kcm/distinfo
+++ b/net-im/ktp-accounts-kcm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-accounts-kcm-0.8.0.tar.bz2) = da9d42ed1dda00066a2dc4cfd9b00087557c765d467a6dd010f695a1f93e0b31
-SIZE (ktp-accounts-kcm-0.8.0.tar.bz2) = 256666
+SHA256 (ktp-accounts-kcm-0.9.0.tar.bz2) = b9d7cf3b2a8f99e50ba60fec039b107f3049df41e44787683dbc346d08c37de7
+SIZE (ktp-accounts-kcm-0.9.0.tar.bz2) = 264892
diff --git a/net-im/ktp-accounts-kcm/pkg-plist b/net-im/ktp-accounts-kcm/pkg-plist
index 19ce30bd2dc4..d6ac0ee3fae7 100644
--- a/net-im/ktp-accounts-kcm/pkg-plist
+++ b/net-im/ktp-accounts-kcm/pkg-plist
@@ -3,6 +3,7 @@ lib/kde4/ktpaccountskcm_plugin_butterfly.so
 lib/kde4/ktpaccountskcm_plugin_gabble.so
 lib/kde4/ktpaccountskcm_plugin_haze.so
 lib/kde4/ktpaccountskcm_plugin_idle.so
+lib/kde4/ktpaccountskcm_plugin_morse.so
 lib/kde4/ktpaccountskcm_plugin_rakia.so
 lib/kde4/ktpaccountskcm_plugin_salut.so
 lib/kde4/ktpaccountskcm_plugin_sipe.so
@@ -15,6 +16,7 @@ share/kde4/services/ktpaccountskcm_plugin_butterfly.desktop
 share/kde4/services/ktpaccountskcm_plugin_gabble.desktop
 share/kde4/services/ktpaccountskcm_plugin_haze.desktop
 share/kde4/services/ktpaccountskcm_plugin_idle.desktop
+share/kde4/services/ktpaccountskcm_plugin_morse.desktop
 share/kde4/services/ktpaccountskcm_plugin_rakia.desktop
 share/kde4/services/ktpaccountskcm_plugin_salut.desktop
 share/kde4/services/ktpaccountskcm_plugin_sipe.desktop
@@ -78,6 +80,13 @@ share/locale/el/LC_MESSAGES/kcmtelepathyaccounts_plugin_rakia.mo
 share/locale/el/LC_MESSAGES/kcmtelepathyaccounts_plugin_salut.mo
 share/locale/el/LC_MESSAGES/kcmtelepathyaccounts_plugin_sunshine.mo
 share/locale/en_GB/LC_MESSAGES/kcm_ktp_accounts.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_butterfly.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_gabble.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_haze.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_idle.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_rakia.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_salut.mo
+share/locale/en_GB/LC_MESSAGES/kcmtelepathyaccounts_plugin_sunshine.mo
 share/locale/eo/LC_MESSAGES/kcm_ktp_accounts.mo
 share/locale/es/LC_MESSAGES/kcm_ktp_accounts.mo
 share/locale/es/LC_MESSAGES/kcmtelepathyaccounts_plugin_butterfly.mo
diff --git a/net-im/ktp-approver/distinfo b/net-im/ktp-approver/distinfo
index 44e1e227c99e..c2bb898d6100 100644
--- a/net-im/ktp-approver/distinfo
+++ b/net-im/ktp-approver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-approver-0.8.0.tar.bz2) = 50a1ded6c9fecc184c0772e7b78eff2b4ff2afc17d1897172c173b327be98eb7
-SIZE (ktp-approver-0.8.0.tar.bz2) = 36464
+SHA256 (ktp-approver-0.9.0.tar.bz2) = 3ac663cdfa51f564bb7f9898974acb630ab9112a5d76a73657d10f53c42b82e7
+SIZE (ktp-approver-0.9.0.tar.bz2) = 36866
diff --git a/net-im/ktp-approver/pkg-plist b/net-im/ktp-approver/pkg-plist
index e56293cfb688..98a34b0a02e4 100644
--- a/net-im/ktp-approver/pkg-plist
+++ b/net-im/ktp-approver/pkg-plist
@@ -10,6 +10,7 @@ share/locale/cs/LC_MESSAGES/kded_ktp_approver.mo
 share/locale/da/LC_MESSAGES/kded_ktp_approver.mo
 share/locale/de/LC_MESSAGES/kded_ktp_approver.mo
 share/locale/el/LC_MESSAGES/kded_ktp_approver.mo
+share/locale/en_GB/LC_MESSAGES/kded_ktp_approver.mo
 share/locale/es/LC_MESSAGES/kded_ktp_approver.mo
 share/locale/et/LC_MESSAGES/kded_ktp_approver.mo
 share/locale/fi/LC_MESSAGES/kded_ktp_approver.mo
diff --git a/net-im/ktp-auth-handler/distinfo b/net-im/ktp-auth-handler/distinfo
index cd928d307e6b..ebc1a26dffc9 100644
--- a/net-im/ktp-auth-handler/distinfo
+++ b/net-im/ktp-auth-handler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-auth-handler-0.8.0.tar.bz2) = fb47f565b445ccaf965120ee0a9da8895be57489f02c656465421866dd60ac5b
-SIZE (ktp-auth-handler-0.8.0.tar.bz2) = 48471
+SHA256 (ktp-auth-handler-0.9.0.tar.bz2) = 6eb07a75200bd18154f42fbe1ff64a9fb0799b709899c3cb31474523b418478e
+SIZE (ktp-auth-handler-0.9.0.tar.bz2) = 49212
diff --git a/net-im/ktp-auth-handler/pkg-plist b/net-im/ktp-auth-handler/pkg-plist
index d1ecb02bad94..61fdda69c591 100644
--- a/net-im/ktp-auth-handler/pkg-plist
+++ b/net-im/ktp-auth-handler/pkg-plist
@@ -9,6 +9,7 @@ share/locale/cs/LC_MESSAGES/ktp-auth-handler.mo
 share/locale/da/LC_MESSAGES/ktp-auth-handler.mo
 share/locale/de/LC_MESSAGES/ktp-auth-handler.mo
 share/locale/el/LC_MESSAGES/ktp-auth-handler.mo
+share/locale/en_GB/LC_MESSAGES/ktp-auth-handler.mo
 share/locale/es/LC_MESSAGES/ktp-auth-handler.mo
 share/locale/et/LC_MESSAGES/ktp-auth-handler.mo
 share/locale/fi/LC_MESSAGES/ktp-auth-handler.mo
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index e65c11d79b88..4c66affd9888 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	ktp-common-internals
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	1
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 
@@ -16,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy
 USE_KDE4=	kdeprefix kdelibs pimlibs automoc4
 USE_QT4=	declarative script \
 		moc_build qmake_build rcc_build uic_build
-USES=		cmake gettext tar:bzip2
+USES=		cmake compiler:c++11-lang gettext tar:bzip2
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	KTP_VERSION=${KTP_VERSION}
diff --git a/net-im/ktp-common-internals/distinfo b/net-im/ktp-common-internals/distinfo
index 6516edf15ae6..5a16f1e73ade 100644
--- a/net-im/ktp-common-internals/distinfo
+++ b/net-im/ktp-common-internals/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-common-internals-0.8.0.tar.bz2) = bd8eedb9b5753ad204322e1453a2a7f157643519d2cbbd04759b6da69eb12114
-SIZE (ktp-common-internals-0.8.0.tar.bz2) = 387961
+SHA256 (ktp-common-internals-0.9.0.tar.bz2) = b358d134345225dacddffb2e61177a4819093c55f2ca15c4c3481e1a6e9f9443
+SIZE (ktp-common-internals-0.9.0.tar.bz2) = 439404
diff --git a/net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp b/net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp
deleted file mode 100644
index 4a9bc1f2263a..000000000000
--- a/net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 60452d2718f1b5a910dad64d6360d600d4107642
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Thu Apr 10 21:08:59 2014 +0200
-
-    Fix build (sorry!)
-
-commit ccd4d133ba4becb7c8662eb3e57612e8aa9773e4
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Thu Apr 10 20:58:47 2014 +0200
-
-    Don't crash when TelepathyLoggerQt4 returns a null TextEvent
-
-    Tpl::PendingEvents sometimes returns a list of events that includes a null
-        event, which leads to a crash when we try to dereference it (either by
-            hitting an assert in QtGlib, or by calling methods on a null pointer).
-
-    BUG: 331104
-        FIXED-IN: 0.8.1
---- KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
-+++ KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
-@@ -28,6 +28,8 @@
- 
- #include <KTp/message-processor.h>
- 
-+#include <KDebug>
-+
- PendingTpLoggerLogs::PendingTpLoggerLogs(const Tp::AccountPtr &account,
-                                          const KTp::LogEntity &entity,
-                                          const QDate &date,
-@@ -60,6 +62,11 @@ void PendingTpLoggerLogs::logsRetrieved(Tpl::PendingOperation *op)
-     QList<KTp::LogMessage> logs;
-     Q_FOREACH (const Tpl::EventPtr &event, events) {
-         const Tpl::TextEventPtr textEvent = event.dynamicCast<Tpl::TextEvent>();
-+        if (textEvent.isNull()) {
-+            kDebug() << "Received a null TextEvent!";
-+            continue;
-+        }
-+
-         logs << KTp::LogMessage(Utils::fromTplEntity(event->sender()),
-                                 account(), event->timestamp(), textEvent->message(),
-                                 textEvent->messageToken());
diff --git a/net-im/ktp-common-internals/pkg-plist b/net-im/ktp-common-internals/pkg-plist
index d49a0f3ce84c..c60763bcc8f7 100644
--- a/net-im/ktp-common-internals/pkg-plist
+++ b/net-im/ktp-common-internals/pkg-plist
@@ -17,8 +17,15 @@ include/kde4/KTp/Models/contacts-filter-model.h
 include/kde4/KTp/Models/contacts-list-model.h
 include/kde4/KTp/Models/contacts-model.h
 include/kde4/KTp/Models/groups-tree-proxy-model.h
+include/kde4/KTp/Models/presence-model.h
 include/kde4/KTp/Models/rooms-model.h
 include/kde4/KTp/Models/text-channel-watcher-proxy-model.h
+include/kde4/KTp/OTR/channel-adapter.h
+include/kde4/KTp/OTR/channel-proxy-interface.h
+include/kde4/KTp/OTR/constants.h
+include/kde4/KTp/OTR/proxy-service-interface.h
+include/kde4/KTp/OTR/types.h
+include/kde4/KTp/OTR/utils.h
 include/kde4/KTp/Widgets/accounts-combo-box.h
 include/kde4/KTp/Widgets/add-contact-dialog.h
 include/kde4/KTp/Widgets/contact-grid-dialog.h
@@ -26,6 +33,7 @@ include/kde4/KTp/Widgets/contact-grid-widget.h
 include/kde4/KTp/Widgets/contact-view-widget.h
 include/kde4/KTp/Widgets/join-chat-room-dialog.h
 include/kde4/KTp/Widgets/notification-config-dialog.h
+include/kde4/KTp/Widgets/settings-kcm-dialog.h
 include/kde4/KTp/Widgets/start-chat-dialog.h
 include/kde4/KTp/abstract-message-filter.h
 include/kde4/KTp/actions.h
@@ -59,16 +67,19 @@ lib/kde4/imports/org/kde/telepathy/qmldir
 lib/kde4/ktploggerplugin_tplogger.so
 lib/libktpcommoninternalsprivate.so
 lib/libktpcommoninternalsprivate.so.%%KTP_VERSION%%
-lib/libktpcommoninternalsprivate.so.7
+lib/libktpcommoninternalsprivate.so.8
 lib/libktploggerprivate.so
 lib/libktploggerprivate.so.%%KTP_VERSION%%
-lib/libktploggerprivate.so.7
+lib/libktploggerprivate.so.8
 lib/libktpmodelsprivate.so
 lib/libktpmodelsprivate.so.%%KTP_VERSION%%
-lib/libktpmodelsprivate.so.7
+lib/libktpmodelsprivate.so.8
+lib/libktpotrprivate.so
+lib/libktpotrprivate.so.%%KTP_VERSION%%
+lib/libktpotrprivate.so.8
 lib/libktpwidgetsprivate.so
 lib/libktpwidgetsprivate.so.%%KTP_VERSION%%
-lib/libktpwidgetsprivate.so.7
+lib/libktpwidgetsprivate.so.8
 share/apps/katepart/syntax/ktpdebugoutput.xml
 share/apps/ktelepathy/ktelepathy.notifyrc
 share/icons/hicolor/128x128/apps/telepathy-kde.png
@@ -130,6 +141,7 @@ share/locale/cs/LC_MESSAGES/ktp-common-internals.mo
 share/locale/da/LC_MESSAGES/ktp-common-internals.mo
 share/locale/de/LC_MESSAGES/ktp-common-internals.mo
 share/locale/el/LC_MESSAGES/ktp-common-internals.mo
+share/locale/en_GB/LC_MESSAGES/ktp-common-internals.mo
 share/locale/es/LC_MESSAGES/ktp-common-internals.mo
 share/locale/et/LC_MESSAGES/ktp-common-internals.mo
 share/locale/fi/LC_MESSAGES/ktp-common-internals.mo
diff --git a/net-im/ktp-contact-list/distinfo b/net-im/ktp-contact-list/distinfo
index 941dde068004..d7c1eacfcf29 100644
--- a/net-im/ktp-contact-list/distinfo
+++ b/net-im/ktp-contact-list/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-contact-list-0.8.0.tar.bz2) = d4d20bdf5435baa3581b7f12b6e5a3dcbb7997825275efd5024ea467311fc858
-SIZE (ktp-contact-list-0.8.0.tar.bz2) = 135142
+SHA256 (ktp-contact-list-0.9.0.tar.bz2) = 7d78b9369825fd5bbf227feccd533a282791725ad4875e85c62b53f443c5e49b
+SIZE (ktp-contact-list-0.9.0.tar.bz2) = 140159
diff --git a/net-im/ktp-contact-list/pkg-plist b/net-im/ktp-contact-list/pkg-plist
index 6fad8cc571ce..363f18bf6c88 100644
--- a/net-im/ktp-contact-list/pkg-plist
+++ b/net-im/ktp-contact-list/pkg-plist
@@ -7,6 +7,7 @@ share/locale/cs/LC_MESSAGES/ktp-contactlist.mo
 share/locale/da/LC_MESSAGES/ktp-contactlist.mo
 share/locale/de/LC_MESSAGES/ktp-contactlist.mo
 share/locale/el/LC_MESSAGES/ktp-contactlist.mo
+share/locale/en_GB/LC_MESSAGES/ktp-contactlist.mo
 share/locale/es/LC_MESSAGES/ktp-contactlist.mo
 share/locale/et/LC_MESSAGES/ktp-contactlist.mo
 share/locale/fi/LC_MESSAGES/ktp-contactlist.mo
diff --git a/net-im/ktp-contact-runner/distinfo b/net-im/ktp-contact-runner/distinfo
index e432269c8d95..a38d648e2d09 100644
--- a/net-im/ktp-contact-runner/distinfo
+++ b/net-im/ktp-contact-runner/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-contact-runner-0.8.0.tar.bz2) = 11f89cecec08f7e6bd54fd22ae8d4c12f6688551db393f07e4ac55db345cb535
-SIZE (ktp-contact-runner-0.8.0.tar.bz2) = 41364
+SHA256 (ktp-contact-runner-0.9.0.tar.bz2) = 20c68896ee848e3b16d6dd8002eb0a286513ae18054801f45d3d893898cf9b70
+SIZE (ktp-contact-runner-0.9.0.tar.bz2) = 42207
diff --git a/net-im/ktp-contact-runner/pkg-plist b/net-im/ktp-contact-runner/pkg-plist
index eb4520b1c120..340704f2faec 100644
--- a/net-im/ktp-contact-runner/pkg-plist
+++ b/net-im/ktp-contact-runner/pkg-plist
@@ -7,6 +7,7 @@ share/locale/cs/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/da/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/de/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/el/LC_MESSAGES/plasma_runner_ktp_contacts.mo
+share/locale/en_GB/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/es/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/et/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/fi/LC_MESSAGES/plasma_runner_ktp_contacts.mo
@@ -16,6 +17,7 @@ share/locale/gl/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/hu/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/ia/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/it/LC_MESSAGES/plasma_runner_ktp_contacts.mo
+share/locale/ja/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/kk/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/km/LC_MESSAGES/plasma_runner_ktp_contacts.mo
 share/locale/ko/LC_MESSAGES/plasma_runner_ktp_contacts.mo
diff --git a/net-im/ktp-desktop-applets/distinfo b/net-im/ktp-desktop-applets/distinfo
index f8280cd8b1a9..620e50f43fd5 100644
--- a/net-im/ktp-desktop-applets/distinfo
+++ b/net-im/ktp-desktop-applets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-desktop-applets-0.8.0.tar.bz2) = 022a35317003dabed7ccefb24977419f6aa0d3c3daeb151a722299d9acf35ce7
-SIZE (ktp-desktop-applets-0.8.0.tar.bz2) = 64326
+SHA256 (ktp-desktop-applets-0.9.0.tar.bz2) = fe6254b5c2178b22e2d53ced5dc72a3cb96e667294b4a34936d37b434c8dc88d
+SIZE (ktp-desktop-applets-0.9.0.tar.bz2) = 64913
diff --git a/net-im/ktp-desktop-applets/pkg-plist b/net-im/ktp-desktop-applets/pkg-plist
index 6dd03c76fc6a..554a16744421 100644
--- a/net-im/ktp-desktop-applets/pkg-plist
+++ b/net-im/ktp-desktop-applets/pkg-plist
@@ -41,6 +41,8 @@ share/locale/de/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
 share/locale/de/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
 share/locale/el/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
 share/locale/el/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
+share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
+share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
 share/locale/es/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
 share/locale/es/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
 share/locale/et/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
diff --git a/net-im/ktp-filetransfer-handler/distinfo b/net-im/ktp-filetransfer-handler/distinfo
index 9ea63846c32c..d9078268112c 100644
--- a/net-im/ktp-filetransfer-handler/distinfo
+++ b/net-im/ktp-filetransfer-handler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-filetransfer-handler-0.8.0.tar.bz2) = 8cf06bd8a7a50498985bd5b51a263db1233770aeb4ea4d5c196191f4f785f453
-SIZE (ktp-filetransfer-handler-0.8.0.tar.bz2) = 47510
+SHA256 (ktp-filetransfer-handler-0.9.0.tar.bz2) = e6270427415071bf7f07cc35261f5e82bb7cb64f6c264e0b54ca46a3b313ebc0
+SIZE (ktp-filetransfer-handler-0.9.0.tar.bz2) = 48041
diff --git a/net-im/ktp-filetransfer-handler/pkg-plist b/net-im/ktp-filetransfer-handler/pkg-plist
index c9ec26e0d67e..ea9074d722be 100644
--- a/net-im/ktp-filetransfer-handler/pkg-plist
+++ b/net-im/ktp-filetransfer-handler/pkg-plist
@@ -7,6 +7,7 @@ share/locale/cs/LC_MESSAGES/ktp-filetransfer-handler.mo
 share/locale/da/LC_MESSAGES/ktp-filetransfer-handler.mo
 share/locale/de/LC_MESSAGES/ktp-filetransfer-handler.mo
 share/locale/el/LC_MESSAGES/ktp-filetransfer-handler.mo
+share/locale/en_GB/LC_MESSAGES/ktp-filetransfer-handler.mo
 share/locale/es/LC_MESSAGES/ktp-filetransfer-handler.mo
 share/locale/et/LC_MESSAGES/ktp-filetransfer-handler.mo
 share/locale/fi/LC_MESSAGES/ktp-filetransfer-handler.mo
diff --git a/net-im/ktp-kded-integration-module/distinfo b/net-im/ktp-kded-integration-module/distinfo
index 37b26938f3ed..82fa72b60491 100644
--- a/net-im/ktp-kded-integration-module/distinfo
+++ b/net-im/ktp-kded-integration-module/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-kded-integration-module-0.8.0.tar.bz2) = 2b801eb4e19713b2dbfe28f79421aa4c9e0fa298383ca0f8a604fa1f557de233
-SIZE (ktp-kded-integration-module-0.8.0.tar.bz2) = 76893
+SHA256 (ktp-kded-integration-module-0.9.0.tar.bz2) = e7fb9cd8770b9c2560f8325ed17c334726c082b932fb17820cc881d49b11419d
+SIZE (ktp-kded-integration-module-0.9.0.tar.bz2) = 79387
diff --git a/net-im/ktp-kded-integration-module/pkg-plist b/net-im/ktp-kded-integration-module/pkg-plist
index a2792d4d6180..45fcb37d2d8e 100644
--- a/net-im/ktp-kded-integration-module/pkg-plist
+++ b/net-im/ktp-kded-integration-module/pkg-plist
@@ -10,6 +10,7 @@ share/locale/cs/LC_MESSAGES/kded_ktp_integration_module.mo
 share/locale/da/LC_MESSAGES/kded_ktp_integration_module.mo
 share/locale/de/LC_MESSAGES/kded_ktp_integration_module.mo
 share/locale/el/LC_MESSAGES/kded_ktp_integration_module.mo
+share/locale/en_GB/LC_MESSAGES/kded_ktp_integration_module.mo
 share/locale/es/LC_MESSAGES/kded_ktp_integration_module.mo
 share/locale/et/LC_MESSAGES/kded_ktp_integration_module.mo
 share/locale/fi/LC_MESSAGES/kded_ktp_integration_module.mo
diff --git a/net-im/ktp-send-file/distinfo b/net-im/ktp-send-file/distinfo
index 2fb18ec5502f..46d85ee9ffdd 100644
--- a/net-im/ktp-send-file/distinfo
+++ b/net-im/ktp-send-file/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-send-file-0.8.0.tar.bz2) = 999fd217fe2b049aca470e6acc09c6d0f539472622b98623cdbb36b2e6bf9034
-SIZE (ktp-send-file-0.8.0.tar.bz2) = 29485
+SHA256 (ktp-send-file-0.9.0.tar.bz2) = a453ae5ca8d18242c9050d961be4fa5d7e8f230f0397fd0206f84a3635106864
+SIZE (ktp-send-file-0.9.0.tar.bz2) = 29739
diff --git a/net-im/ktp-send-file/pkg-plist b/net-im/ktp-send-file/pkg-plist
index 31a72b57c6e8..190b3a6429e2 100644
--- a/net-im/ktp-send-file/pkg-plist
+++ b/net-im/ktp-send-file/pkg-plist
@@ -7,6 +7,7 @@ share/locale/cs/LC_MESSAGES/ktp-send-file.mo
 share/locale/da/LC_MESSAGES/ktp-send-file.mo
 share/locale/de/LC_MESSAGES/ktp-send-file.mo
 share/locale/el/LC_MESSAGES/ktp-send-file.mo
+share/locale/en_GB/LC_MESSAGES/ktp-send-file.mo
 share/locale/es/LC_MESSAGES/ktp-send-file.mo
 share/locale/et/LC_MESSAGES/ktp-send-file.mo
 share/locale/fi/LC_MESSAGES/ktp-send-file.mo
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index 04026d90c500..437ffa91c861 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	ktp-text-ui
 PORTVERSION=	${KTP_VERSION}
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.1
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE chat window application
diff --git a/net-im/ktp-text-ui/distinfo b/net-im/ktp-text-ui/distinfo
index 1c83f3717468..0c76dcd628f4 100644
--- a/net-im/ktp-text-ui/distinfo
+++ b/net-im/ktp-text-ui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-text-ui-0.8.0.tar.bz2) = 3e954e3f85f1764ff4cf49d537a8876365236997021abdb71a622055de926db9
-SIZE (ktp-text-ui-0.8.0.tar.bz2) = 314141
+SHA256 (ktp-text-ui-0.9.0.tar.bz2) = 54e7247c25fbd5fee431471d179f56cd4a9851822e997ab99492e644118723b2
+SIZE (ktp-text-ui-0.9.0.tar.bz2) = 471280
diff --git a/net-im/ktp-text-ui/pkg-plist b/net-im/ktp-text-ui/pkg-plist
index 9dd4d70061ee..da5a042925dc 100644
--- a/net-im/ktp-text-ui/pkg-plist
+++ b/net-im/ktp-text-ui/pkg-plist
@@ -2,6 +2,7 @@ bin/ktp-log-viewer
 lib/kde4/kcm_ktp_chat_appearance.so
 lib/kde4/kcm_ktp_chat_behavior.so
 lib/kde4/kcm_ktp_chat_messages.so
+lib/kde4/kcm_ktp_chat_otr.so
 lib/kde4/kcm_ktp_logviewer_behavior.so
 lib/kde4/kcm_ktptextui_message_filter_latex.so
 lib/kde4/ktptextui_message_filter_bugzilla.so
@@ -10,6 +11,7 @@ lib/kde4/ktptextui_message_filter_formatting.so
 lib/kde4/ktptextui_message_filter_highlight.so
 lib/kde4/ktptextui_message_filter_images.so
 lib/kde4/ktptextui_message_filter_latex.so
+lib/kde4/ktptextui_message_filter_otr.so
 lib/kde4/ktptextui_message_filter_searchexpansion.so
 lib/kde4/ktptextui_message_filter_tts.so
 lib/kde4/ktptextui_message_filter_urlexpansion.so
@@ -17,6 +19,7 @@ lib/kde4/ktptextui_message_filter_youtube.so
 lib/kde4/libexec/ktp-adiumxtra-protocol-handler
 lib/kde4/libexec/ktp-text-ui
 lib/libktpchat.so
+lib/libktpimagesharer.so
 share/applications/kde4/ktp-log-viewer.desktop
 share/apps/ktelepathy/Template.html
 share/apps/ktelepathy/longurl.js
@@ -33,6 +36,24 @@ share/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/Resources/Outgoi
 share/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html
 share/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/Resources/Status.html
 share/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/Resources/main.css
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Info.plist
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Footer.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Header.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Status.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Styles/Header.css
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Template.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/Topic.html
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/img/sidebar_header_bg.png
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/jquery.min.js
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/livepipe.js
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/scriptaculous183.js
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/scrollbar.js
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/main.css
+share/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/LICENSE
 share/apps/ktelepathy/styles/renkoo.AdiumMessageStyle/Contents/Info.plist
 share/apps/ktelepathy/styles/renkoo.AdiumMessageStyle/Contents/Resources/Demo.html
 share/apps/ktelepathy/styles/renkoo.AdiumMessageStyle/Contents/Resources/Footer.html
@@ -194,6 +215,7 @@ share/kde4/services/adiumxtra.protocol
 share/kde4/services/kcm_ktp_chat_appearance.desktop
 share/kde4/services/kcm_ktp_chat_behavior.desktop
 share/kde4/services/kcm_ktp_chat_messages.desktop
+share/kde4/services/kcm_ktp_chat_otr.desktop
 share/kde4/services/kcm_ktp_logviewer_behavior.desktop
 share/kde4/services/kcm_ktptextui_message_filter_latex.desktop
 share/kde4/services/ktptextui_message_filter_bugzilla.desktop
@@ -202,6 +224,7 @@ share/kde4/services/ktptextui_message_filter_formatting.desktop
 share/kde4/services/ktptextui_message_filter_highlight.desktop
 share/kde4/services/ktptextui_message_filter_images.desktop
 share/kde4/services/ktptextui_message_filter_latex.desktop
+share/kde4/services/ktptextui_message_filter_otr.desktop
 share/kde4/services/ktptextui_message_filter_searchexpansion.desktop
 share/kde4/services/ktptextui_message_filter_tts.desktop
 share/kde4/services/ktptextui_message_filter_urlexpansion.desktop
@@ -249,6 +272,12 @@ share/locale/el/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
 share/locale/el/LC_MESSAGES/ktp-filters.mo
 share/locale/el/LC_MESSAGES/ktp-text-ui.mo
 share/locale/el/LC_MESSAGES/ktpchat.mo
+share/locale/en_GB/LC_MESSAGES/kcm_ktp_chat_appearance.mo
+share/locale/en_GB/LC_MESSAGES/kcm_ktp_chat_behavior.mo
+share/locale/en_GB/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/en_GB/LC_MESSAGES/ktp-filters.mo
+share/locale/en_GB/LC_MESSAGES/ktp-text-ui.mo
+share/locale/en_GB/LC_MESSAGES/ktpchat.mo
 share/locale/es/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/es/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/es/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
@@ -258,6 +287,7 @@ share/locale/es/LC_MESSAGES/ktpchat.mo
 share/locale/et/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/et/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/et/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/et/LC_MESSAGES/ktp-filters.mo
 share/locale/et/LC_MESSAGES/ktp-text-ui.mo
 share/locale/et/LC_MESSAGES/ktpchat.mo
 share/locale/fi/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -304,6 +334,7 @@ share/locale/it/LC_MESSAGES/ktpchat.mo
 share/locale/ja/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/ja/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/ja/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/ja/LC_MESSAGES/ktp-filters.mo
 share/locale/ja/LC_MESSAGES/ktp-text-ui.mo
 share/locale/ja/LC_MESSAGES/ktpchat.mo
 share/locale/kk/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -343,6 +374,7 @@ share/locale/nb/LC_MESSAGES/ktpchat.mo
 share/locale/nds/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/nds/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/nds/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/nds/LC_MESSAGES/ktp-filters.mo
 share/locale/nds/LC_MESSAGES/ktp-text-ui.mo
 share/locale/nds/LC_MESSAGES/ktpchat.mo
 share/locale/nl/LC_MESSAGES/kcm_ktp_chat_appearance.mo
diff --git a/net-im/plasma-applet-ktp/distinfo b/net-im/plasma-applet-ktp/distinfo
index f8280cd8b1a9..620e50f43fd5 100644
--- a/net-im/plasma-applet-ktp/distinfo
+++ b/net-im/plasma-applet-ktp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-desktop-applets-0.8.0.tar.bz2) = 022a35317003dabed7ccefb24977419f6aa0d3c3daeb151a722299d9acf35ce7
-SIZE (ktp-desktop-applets-0.8.0.tar.bz2) = 64326
+SHA256 (ktp-desktop-applets-0.9.0.tar.bz2) = fe6254b5c2178b22e2d53ced5dc72a3cb96e667294b4a34936d37b434c8dc88d
+SIZE (ktp-desktop-applets-0.9.0.tar.bz2) = 64913
diff --git a/net-im/plasma-applet-ktp/pkg-plist b/net-im/plasma-applet-ktp/pkg-plist
index 6dd03c76fc6a..554a16744421 100644
--- a/net-im/plasma-applet-ktp/pkg-plist
+++ b/net-im/plasma-applet-ktp/pkg-plist
@@ -41,6 +41,8 @@ share/locale/de/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
 share/locale/de/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
 share/locale/el/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
 share/locale/el/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
+share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
+share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
 share/locale/es/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
 share/locale/es/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo
 share/locale/et/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo
diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile
index 1ce6dc7c3b67..f3ad860d2ccf 100644
--- a/net-im/telepathy-logger-qt4/Makefile
+++ b/net-im/telepathy-logger-qt4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	telepathy-logger-qt4
-PORTVERSION=	${KTP_VERSION}
+PORTVERSION=	0.8.0
 CATEGORIES=	net-im
 MASTER_SITES=	KDE/stable/${PORTNAME:C/4$//}/${PORTVERSION}/src
 DISTNAME=	${PORTNAME:C/4$//}-${PORTVERSION}