9 files changed, 69 insertions, 257 deletions

diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index cde25a61f1d7..a14df69b5606 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -2,40 +2,33 @@
 
 PORTNAME=	kopete
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
-CATEGORIES=	net-im kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdenetwork-${PORTVERSION}
+CATEGORIES=	net-im kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multi-protocol instant messenger
 
-LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn \
-		qca.2:${PORTSDIR}/devel/qca \
-		otr.4:${PORTSDIR}/security/libotr3 \
-		gadu.3:${PORTSDIR}/polish/libgadu \
-		ortp.8:${PORTSDIR}/net/linphone-base \
-		mediastreamer.0:${PORTSDIR}/net/linphone-base \
-		speex.1:${PORTSDIR}/audio/speex \
-		expat.6:${PORTSDIR}/textproc/expat2 \
-		meanwhile.1:${PORTSDIR}/net-im/meanwhile \
-		v4l2.0:${PORTSDIR}/multimedia/libv4l \
-		jasper.4:${PORTSDIR}/graphics/jasper \
-		gif.5:${PORTSDIR}/graphics/giflib \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
+		libqca.so:${PORTSDIR}/devel/qca \
+		libotr.so:${PORTSDIR}/security/libotr \
+		libgadu.so:${PORTSDIR}/polish/libgadu \
+		libortp.so:${PORTSDIR}/net/linphone-base \
+		libmediastreamer.so:${PORTSDIR}/net/linphone-base \
+		libspeex.so:${PORTSDIR}/audio/speex \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libmeanwhile.so:${PORTSDIR}/net-im/meanwhile \
+		libv4l2.so:${PORTSDIR}/multimedia/libv4l \
+		libjasper.so:${PORTSDIR}/graphics/jasper \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
 		${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
 		${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc
 
-LATEST_LINK=	${PORTNAME}4
-DISTINFO_FILE=	${.CURDIR}/../../net/kdenetwork4/distinfo
-
-CONFLICTS_INSTALL=	kdenetwork-4.[1-8].*
-
-USES=		cmake:outsource
+USES=		cmake:outsource webplugin:native
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
 		automoc4 qimageblitz
@@ -47,18 +40,15 @@ USE_XORG=	x11 xdamage xext xscrnsaver xtst
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 
-CMAKE_SOURCE_PATH=	${WRKSRC}/${PORTNAME}
-
-USE_WEBPLUGINS=	native
-WEBPLUGINS_NAME=	# empty
-WEBPLUGINS_FILES=	skypebuttons.so
+WEBPLUGIN_NAME=	# empty
+WEBPLUGIN_FILES=	skypebuttons.so
 
 # Explicitly disable ALSA, as it's not used (Jabber Jingle support is
 # not built).
 CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
 
 # Route Mozilla plugin by standard path.
-CMAKE_ARGS+=	-DMOZPLUGIN_INSTALL_DIR:PATH="${WEBPLUGINS_DIR}"
+CMAKE_ARGS+=	-DMOZPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}"
 
 # Forcefully disable net-im/libmsn which was deprecated on 2013-07-27.
 CMAKE_ARGS+=	-DHAVE_LIBMSN:BOOL=OFF
@@ -68,16 +58,12 @@ CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES=1
 
 OPTIONS_DEFINE=	XMMS
 XMMS_DESC=	XMMS Kopete nowlistening plugin
+XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_CMAKE_ON=	-DWITH_Xmms:BOOL=ON
+XMMS_CMAKE_OFF=	-DWITH_Xmms:BOOL=OFF
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-
-.if ${PORT_OPTIONS:MXMMS}
-CMAKE_ARGS+=	-DWITH_Xmms:BOOL=ON
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-.else
-CMAKE_ARGS+=	-DWITH_Xmms:BOOL=OFF
-.endif
+post-patch:
+	${REINPLACE_CMD} 's,-std=gnu90,-std=gnu89,' \
+		${WRKSRC}/protocols/jabber/libiris/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/net-im/kopete-kde4/distinfo b/net-im/kopete-kde4/distinfo
new file mode 100644
index 000000000000..2ee1627946c1
--- /dev/null
+++ b/net-im/kopete-kde4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/kopete-4.12.2.tar.xz) = fc09e506a34916c017a0179c3171a4ab28600e3db1430b5d8df9f79104b8b013
+SIZE (KDE/4.12.2/kopete-4.12.2.tar.xz) = 6311696
diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__diskcache.h b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__diskcache.h
deleted file mode 100644
index c742e2b4c250..000000000000
--- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__diskcache.h
+++ /dev/null
@@ -1,14 +0,0 @@
-Build fix for clang.
-
-    error: unknown type name 'time_t'
-
---- kopete/protocols/jabber/googletalk/libjingle/talk/base/diskcache.h
-++- kopete/protocols/jabber/googletalk/libjingle/talk/base/diskcache.h
-@@ -30,6 +30,7 @@
- 
- #include <map>
- #include <string>
-+#include <time.h>
- 
- #ifdef WIN32
- #undef UnlockResource
diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc
deleted file mode 100644
index 5aebcd5d4a19..000000000000
--- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- kopete/protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc.orig	2008-09-06 23:18:41.000000000 -0300
-+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc	2008-09-06 23:31:38.000000000 -0300
-@@ -25,6 +25,10 @@
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #include <time.h>
- 
- #ifdef WIN32
-@@ -369,7 +373,7 @@
-     }
-     gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
-   }
--#ifdef OSX
-+#if defined(OSX) || defined(__FreeBSD__)
-   tm *tm_for_timezone = localtime((time_t *)&gmt);
-   *seconds = gmt + tm_for_timezone->tm_gmtoff;
- #else
diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__ssladapter.cc b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__ssladapter.cc
deleted file mode 100644
index 978bfc486c45..000000000000
--- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__ssladapter.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-Build fix for clang.
-
-  error: use of undeclared identifier 'pthread_mutex_lock'
-  error: use of undeclared identifier 'pthread_mutex_unlock'
-  error: use of undeclared identifier 'pthread_self'
-  error: use of undeclared identifier 'pthread_mutex_init'
-  error: use of undeclared identifier 'pthread_mutex_destroy'
-
---- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc.orig	2013-11-04 01:20:09.000000000 +0200
-+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	2013-11-04 01:20:20.000000000 +0200
-@@ -29,6 +29,7 @@
- 
- #ifdef POSIX
- extern "C" {
-+#include <pthread.h>
- #include <unistd.h>
- }
- #endif
diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc
deleted file mode 100644
index 3679a3e12031..000000000000
--- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc
-===================================================================
---- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc	(revision 1242947)
-+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc	(working copy)
-@@ -29,10 +29,6 @@
- #include <malloc.h>
- #endif  // WIN32
- #include <stdlib.h>
--#ifdef POSIX
--#include <alloca.h>
--#define _alloca alloca
--#endif  // POSIX
- 
- #include "talk/base/basictypes.h"
- #include "talk/base/common.h"
-@@ -477,16 +473,18 @@
- 
- void transform(std::string& value, size_t maxlen, const std::string& source,
-                Transform t) {
--  char * buffer = static_cast<char *>(_alloca(maxlen + 1));
-+  char * buffer = new char[maxlen + 1];
-   value.assign(buffer, t(buffer, maxlen + 1, source.data(), source.length()));
-+  delete [] buffer;
- }
- 
- std::string s_transform(const std::string& source, Transform t) {
-   // Ask transformation function to approximate the destination size (returns upper bound)
-   size_t maxlen = t(NULL, 0, source.data(), source.length());
--  char * buffer = static_cast<char *>(_alloca(maxlen));
-+  char * buffer = new char[maxlen];
-   size_t len = t(buffer, maxlen, source.data(), source.length());
-   std::string result(buffer, len);
-+  delete [] buffer;
-   return result;
- }
- 
diff --git a/net-im/kopete-kde4/files/patch-libcxx_support b/net-im/kopete-kde4/files/patch-libcxx_support
deleted file mode 100644
index 159d2e5df5d2..000000000000
--- a/net-im/kopete-kde4/files/patch-libcxx_support
+++ /dev/null
@@ -1,98 +0,0 @@
-Build fix for clang and libc++.
-
-stl_decl.h overrides std::vector which is not supposed to be done and does not
-work with libc++. Using plain std::vector with both libc++ and libstdc++ should
-be harmless on FreeBSD.
-
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.cc
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.cc
-@@ -25,7 +25,6 @@
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include "talk/base/stl_decl.h"
- #include <vector>
- #include <set>
- #include <expat.h>
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.h
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.h
-@@ -29,8 +29,8 @@
- #define _xmlbuilder_h_
- 
- #include <string>
-+#include <vector>
- #include "talk/base/scoped_ptr.h"
--#include "talk/base/stl_decl.h"
- #include "talk/xmllite/xmlparser.h"
- 
- #include <expat.h>
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.cc
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.cc
-@@ -25,7 +25,6 @@
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include "talk/base/stl_decl.h"
- #include <string>
- #include <iostream>
- #include <vector>
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.h
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.h
-@@ -29,8 +29,8 @@
- #define _xmlnsstack_h_
- 
- #include <string>
-+#include <vector>
- #include "talk/base/scoped_ptr.h"
--#include "talk/base/stl_decl.h"
- #include "talk/xmllite/qname.h"
- 
- namespace buzz {
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlparser.cc
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlparser.cc
-@@ -27,7 +27,6 @@
- 
- #include "talk/xmllite/xmlparser.h"
- 
--#include "talk/base/stl_decl.h"
- #include <string>
- #include <vector>
- #include <iostream>
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlprinter.cc
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlprinter.cc
-@@ -25,7 +25,6 @@
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include "talk/base/stl_decl.h"
- #include <string>
- #include <iostream>
- #include <vector>
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmppengineimpl.h
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmppengineimpl.h
-@@ -259,10 +259,10 @@ private:
-   XmppOutputHandler* output_handler_;
-   XmppSessionHandler* session_handler_;
- 
--  typedef STD_VECTOR(XmppStanzaHandler*) StanzaHandlerVector;
-+  typedef std::vector<XmppStanzaHandler*> StanzaHandlerVector;
-   scoped_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT];
- 
--  typedef STD_VECTOR(XmppIqEntry*) IqEntryVector;
-+  typedef std::vector<XmppIqEntry*> IqEntryVector;
-   scoped_ptr<IqEntryVector> iq_entries_;
- 
-   scoped_ptr<SaslHandler> sasl_handler_;
---- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmpplogintask.h
-++- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmpplogintask.h
-@@ -29,9 +29,9 @@
- #define _logintask_h_
- 
- #include <string>
-+#include <vector>
- #include "talk/base/logging.h"
- #include "talk/base/scoped_ptr.h"
--#include "talk/base/stl_decl.h"
- #include "talk/xmpp/jid.h"
- #include "talk/xmpp/xmppengine.h"
- 
diff --git a/net-im/kopete-kde4/files/patch-protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc b/net-im/kopete-kde4/files/patch-protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc
new file mode 100644
index 000000000000..b3c2bfa81095
--- /dev/null
+++ b/net-im/kopete-kde4/files/patch-protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc
@@ -0,0 +1,22 @@
+--- protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc.orig	2013-08-12 12:58:35.392328957 +0000
++++ protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc	2013-08-12 13:01:23.000326301 +0000
+@@ -25,6 +25,10 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#  include <sys/param.h>
++#endif
++
+ #include <time.h>
+ 
+ #ifdef WIN32
+@@ -399,7 +403,7 @@
+     gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
+   }
+   // TODO: Android should support timezone, see b/2441195
+-#if defined(OSX) || defined(ANDROID) || defined(BSD)
++#if defined(OSX) || defined(ANDROID) || defined(BSD) || defined(__FreeBSD__)
+   tm *tm_for_timezone = localtime((time_t *)&gmt);
+   *seconds = gmt + tm_for_timezone->tm_gmtoff;
+ #else
diff --git a/net-im/kopete-kde4/pkg-plist b/net-im/kopete-kde4/pkg-plist
index 97e0e0fc9037..958e461204ec 100644
--- a/net-im/kopete-kde4/pkg-plist
+++ b/net-im/kopete-kde4/pkg-plist
@@ -1,4 +1,3 @@
-bin/googletalk-call
 bin/kopete
 bin/kopete_latexconvert.sh
 bin/winpopup-install
@@ -71,7 +70,7 @@ include/kopete/ui/kopeteview.h
 include/kopete/ui/kopeteviewplugin.h
 include/kopete/ui/ui_kopeteawaydialogbase.h
 include/kopete/ui/ui_kopetepasswordwidgetbase.h
-%%WEBPLUGINS_DIR%%/skypebuttons.so
+%%WEBPLUGIN_DIR%%/skypebuttons.so
 lib/kde4/kcm_kopete_accountconfig.so
 lib/kde4/kcm_kopete_addbookmarks.so
 lib/kde4/kcm_kopete_appearanceconfig.so
@@ -81,6 +80,7 @@ lib/kde4/kcm_kopete_behaviorconfig.so
 lib/kde4/kcm_kopete_chatwindowconfig.so
 lib/kde4/kcm_kopete_highlight.so
 lib/kde4/kcm_kopete_history.so
+lib/kde4/kcm_kopete_history2.so
 lib/kde4/kcm_kopete_latex.so
 lib/kde4/kcm_kopete_nowlistening.so
 lib/kde4/kcm_kopete_otr.so
@@ -103,6 +103,7 @@ lib/kde4/kopete_gadu.so
 lib/kde4/kopete_groupwise.so
 lib/kde4/kopete_highlight.so
 lib/kde4/kopete_history.so
+lib/kde4/kopete_history2.so
 lib/kde4/kopete_icq.so
 lib/kde4/kopete_jabber.so
 lib/kde4/kopete_latex.so
@@ -125,17 +126,17 @@ lib/kde4/kopete_yahoo.so
 lib/kde4/libchattexteditpart.so
 lib/kde4/plugins/accessible/chatwindowaccessiblewidgetfactory.so
 lib/libkopete.so
-lib/libkopete.so.5
-lib/libkopete.so.5.0.1
+lib/libkopete.so.4
+lib/libkopete.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkopete_oscar.so
-lib/libkopete_oscar.so.5
-lib/libkopete_oscar.so.5.0.1
+lib/libkopete_oscar.so.4
+lib/libkopete_oscar.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkopete_otr_shared.so
 lib/libkopete_otr_shared.so.1
 lib/libkopete_otr_shared.so.1.0.0
 lib/libkopete_videodevice.so
-lib/libkopete_videodevice.so.5
-lib/libkopete_videodevice.so.5.0.1
+lib/libkopete_videodevice.so.4
+lib/libkopete_videodevice.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkopeteaddaccountwizard.so
 lib/libkopeteaddaccountwizard.so.1
 lib/libkopeteaddaccountwizard.so.1.0.0
@@ -180,6 +181,8 @@ share/apps/kconf_update/kopete-pluginloader2.sh
 share/apps/kconf_update/kopete-pluginloader2.upd
 share/apps/kconf_update/kopete-update_icq_server.pl
 share/apps/kconf_update/kopete-update_icq_server.upd
+share/apps/kconf_update/kopete-update_icq_ssl.pl
+share/apps/kconf_update/kopete-update_icq_ssl.upd
 share/apps/kconf_update/kopete-update_yahoo_server.pl
 share/apps/kconf_update/kopete-update_yahoo_server.upd
 share/apps/kopete/CompactContactListLayouts.xml
@@ -302,19 +305,6 @@ share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_away.png
 share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_dnd.png
 share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_idle.png
 share/apps/kopete/icons/oxygen/16x16/actions/meanwhile_unknown.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_blockcontact.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_call.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.mng
-share/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_away.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_dnd.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_invisible.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_not_available.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_offline.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_online.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeme.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeout.png
-share/apps/kopete/icons/oxygen/16x16/actions/skype_contact_unknown.png
 share/apps/kopete/icons/oxygen/16x16/actions/wp_away.png
 share/apps/kopete/icons/oxygen/16x16/actions/yahoo_away.png
 share/apps/kopete/icons/oxygen/16x16/actions/yahoo_busy.png
@@ -348,9 +338,6 @@ share/apps/kopete/icons/oxygen/16x16/apps/testbed_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/wp_protocol.png
 share/apps/kopete/icons/oxygen/16x16/apps/yahoo_protocol.png
 share/apps/kopete/icons/oxygen/22x22/actions/logging.png
-share/apps/kopete/icons/oxygen/22x22/actions/skype_blockcontact.png
-share/apps/kopete/icons/oxygen/22x22/actions/skype_call.png
-share/apps/kopete/icons/oxygen/22x22/actions/skype_contact_skypeout.png
 share/apps/kopete/icons/oxygen/22x22/actions/yahoo_stealthed.png
 share/apps/kopete/icons/oxygen/22x22/apps/aim_protocol.png
 share/apps/kopete/icons/oxygen/22x22/apps/bonjour_protocol.png
@@ -362,9 +349,6 @@ share/apps/kopete/icons/oxygen/22x22/apps/meanwhile_protocol.png
 share/apps/kopete/icons/oxygen/22x22/apps/qq_protocol.png
 share/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
 share/apps/kopete/icons/oxygen/32x32/actions/logging.png
-share/apps/kopete/icons/oxygen/32x32/actions/skype_blockcontact.png
-share/apps/kopete/icons/oxygen/32x32/actions/skype_call.png
-share/apps/kopete/icons/oxygen/32x32/actions/skype_contact_skypeout.png
 share/apps/kopete/icons/oxygen/32x32/actions/yahoo_stealthed.png
 share/apps/kopete/icons/oxygen/32x32/apps/aim_protocol.png
 share/apps/kopete/icons/oxygen/32x32/apps/bonjour_protocol.png
@@ -607,6 +591,8 @@ share/apps/kopete_contactnotes/contactnotesui.rc
 share/apps/kopete_groupwise/gwchatui.rc
 share/apps/kopete_history/historychatui.rc
 share/apps/kopete_history/historyui.rc
+share/apps/kopete_history2/history2chatui.rc
+share/apps/kopete_history2/history2ui.rc
 share/apps/kopete_jabber/jabberchatui.rc
 share/apps/kopete_latex/latexchatui.rc
 share/apps/kopete_otr/otrchatui.rc
@@ -622,6 +608,7 @@ share/apps/kopete_yahoo/yahoochatui.rc
 share/apps/kopete_yahoo/yahooconferenceui.rc
 share/apps/kopete_yahoo/yahooimui.rc
 share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+share/config.kcfg/history2config.kcfg
 share/config.kcfg/historyconfig.kcfg
 share/config.kcfg/kopete_otr.kcfg
 share/config.kcfg/kopeteappearancesettings.kcfg
@@ -703,6 +690,7 @@ share/icons/oxygen/16x16/actions/account_offline_overlay.png
 share/icons/oxygen/16x16/actions/contact_away_overlay.png
 share/icons/oxygen/16x16/actions/contact_busy_overlay.png
 share/icons/oxygen/16x16/actions/contact_food_overlay.png
+share/icons/oxygen/16x16/actions/contact_freeforchat_overlay.png
 share/icons/oxygen/16x16/actions/contact_invisible_overlay.png
 share/icons/oxygen/16x16/actions/contact_phone_overlay.png
 share/icons/oxygen/16x16/actions/contact_xa_overlay.png
@@ -758,6 +746,7 @@ share/kde4/services/emailwindow.desktop
 share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
 share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
 share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
+share/kde4/services/kconfiguredialog/kopete_history2_config.desktop
 share/kde4/services/kconfiguredialog/kopete_history_config.desktop
 share/kde4/services/kconfiguredialog/kopete_latex_config.desktop
 share/kde4/services/kconfiguredialog/kopete_nowlistening_config.desktop
@@ -782,6 +771,7 @@ share/kde4/services/kopete_gadu.desktop
 share/kde4/services/kopete_groupwise.desktop
 share/kde4/services/kopete_highlight.desktop
 share/kde4/services/kopete_history.desktop
+share/kde4/services/kopete_history2.desktop
 share/kde4/services/kopete_icq.desktop
 share/kde4/services/kopete_jabber.desktop
 share/kde4/services/kopete_latex.desktop
@@ -809,7 +799,6 @@ share/kde4/services/xmpp.protocol
 share/kde4/servicetypes/kopeteplugin.desktop
 share/kde4/servicetypes/kopeteprotocol.desktop
 share/kde4/servicetypes/kopeteui.desktop
-share/sounds/KDE-Im-Phone-Ring.wav
 share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg
@@ -825,6 +814,7 @@ share/sounds/Kopete_User_is_Online.ogg
 @dirrm share/apps/kopete_otr
 @dirrm share/apps/kopete_latex
 @dirrm share/apps/kopete_jabber
+@dirrm share/apps/kopete_history2
 @dirrm share/apps/kopete_history
 @dirrm share/apps/kopete_groupwise
 @dirrm share/apps/kopete_contactnotes
@@ -917,6 +907,6 @@ share/sounds/Kopete_User_is_Online.ogg
 @dirrm share/apps/kopete/icons
 @dirrm share/apps/kopete
 @dirrmtry lib/kde4/plugins/accessible
-@dirrmtry %%WEBPLUGINS_DIR%%
+@dirrmtry %%WEBPLUGIN_DIR%%
 @dirrm include/kopete/ui
 @dirrm include/kopete