32 files changed, 968 insertions, 1335 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 4b1a79df695a..23a75146b16a 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -8,16 +8,15 @@ PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
-		netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		zip.1:${PORTSDIR}/archivers/libzip
+		zip.1:${PORTSDIR}/archivers/libzip \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
@@ -25,10 +24,12 @@ LATEST_LINK=	${PORTNAME}4
 USE_BZIP2=	yes
 USE_QT_VER=	4
 KDE4_BUILDENV= yes
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
 
+MAN1=		ark.1
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index b32341e6b180..5bf5f73fd46e 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.1.4.tar.bz2) = 542663eeae777978dafab2dcf9d422c2
-SHA256 (KDE/kdeutils-4.1.4.tar.bz2) = fc20381de8df78548a88361dc845624c66eeaa9415c883461ba24b094c81b7df
-SIZE (KDE/kdeutils-4.1.4.tar.bz2) = 2285905
+MD5 (KDE/kdeutils-4.2.0.tar.bz2) = f0ca24c7d3e5bb0ab55bf6b26fc6224e
+SHA256 (KDE/kdeutils-4.2.0.tar.bz2) = 1b811b5ea12641aa4003dcc97ea19570418e83a909866f78c08a358a1e1a1cfd
+SIZE (KDE/kdeutils-4.2.0.tar.bz2) = 2234345
diff --git a/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp b/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
index c5e3f75034b6..eb03ee5e2287 100644
--- a/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
+++ b/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
@@ -1,13 +1,13 @@
---- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-08-30 13:07:45.000000000 +0400
-+++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-08-30 13:12:59.000000000 +0400
-@@ -30,8 +30,8 @@
- //usually compiled with off_t to 32bit. in the long run libzip should be
- //compiled according to bugs.kde.org bug #167018
- //but for now this will probably do
+--- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-12-10 16:13:03.000000000 +0000
++++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-12-29 22:16:13.000000000 +0000
+@@ -28,8 +28,8 @@
+ 
+ #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
+ 
 -#define __off_t_defined
 -typedef quint32 off_t;
 +// #define __off_t_defined
 +// typedef quint32 off_t;
  
- #include "kerfuffle/archiveinterface.h"
- #include "kerfuffle/archivefactory.h"
+ #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
+ 
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 1f32022c99f9..03f698c23b80 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -13,8 +13,9 @@ bin/superkaramba
 bin/sweeper
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
-lib/kde4/kerfuffle_bk.so
+lib/kde4/kerfuffle_7zip.so
 lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libzip.so
 lib/kde4/kerfuffle_rar.so
 lib/kde4/libarkpart.so
@@ -25,16 +26,16 @@ lib/kde4/plasma_scriptengine_superkaramba.so
 lib/libkdeinit4_kcalc.so
 lib/libkerfuffle.so
 lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.0
+lib/libkerfuffle.so.5.0.1
 lib/liboktetacore.so
 lib/liboktetacore.so.5
-lib/liboktetacore.so.5.0.0
+lib/liboktetacore.so.5.0.1
 lib/liboktetagui.so
 lib/liboktetagui.so.5
-lib/liboktetagui.so.5.0.0
+lib/liboktetagui.so.5.0.1
 lib/libsuperkaramba.so
 lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.0
+lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
@@ -145,8 +146,12 @@ share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/kicker.png
 share/doc/HTML/en/kgpg/options.png
 share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/first.png
 share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
+share/doc/HTML/en/ktimer/main.png
+share/doc/HTML/en/ktimer/running.png
+share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
@@ -176,7 +181,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager.png
 share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
-share/icons/hicolor/16x16/apps/kcalc.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@@ -186,14 +190,12 @@ share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
 share/icons/hicolor/16x16/apps/okteta.png
 share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/22x22/apps/kcalc.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
 share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
-share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@@ -203,7 +205,6 @@ share/icons/hicolor/32x32/apps/kwalletmanager2.png
 share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/okteta.png
 share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@@ -213,26 +214,28 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/okteta.png
 share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/64x64/apps/kcalc.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
 share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/icons/hicolor/64x64/apps/kwikdisk.png
 share/icons/hicolor/64x64/apps/superkaramba.png
-share/icons/hicolor/scalable/apps/kcalc.svgz
 share/icons/hicolor/scalable/apps/superkaramba.svgz
 share/icons/oxygen/16x16/apps/kcmdf.png
 share/icons/oxygen/22x22/apps/kcmdf.png
 share/icons/oxygen/32x32/apps/kcmdf.png
+share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
+share/kde4/services/ServiceMenus/ark_servicemenu.desktop
 share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
+share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kcmdf.desktop
-share/kde4/services/kerfuffle_bk.desktop
+share/kde4/services/kerfuffle_7zip.desktop
 share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libzip.desktop
 share/kde4/services/kerfuffle_rar.desktop
 share/kde4/services/kwalletconfig.desktop
@@ -241,33 +244,6 @@ share/kde4/services/oktetapart.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
-@dirrmtry share/kde4/servicetypes
-@dirrmtry share/kde4/services/ServiceMenus
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/oxygen/32x32/apps
-@dirrmtry share/icons/oxygen/32x32
-@dirrmtry share/icons/oxygen/22x22/apps
-@dirrmtry share/icons/oxygen/22x22
-@dirrmtry share/icons/oxygen/16x16/apps
-@dirrmtry share/icons/oxygen/16x16
-@dirrmtry share/icons/oxygen
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/doc/HTML/en/superkaramba
 @dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/kwallet
@@ -279,13 +255,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
 @dirrm share/doc/HTML/en/ark
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/dbus-1/interfaces
-@dirrmtry share/dbus-1
-@dirrmtry share/config.kcfg
-@dirrmtry share/config
-@dirrmtry share/autostart
 @dirrm share/apps/sweeper
 @dirrm share/apps/superkaramba
 @dirrm share/apps/oktetapart
@@ -316,11 +285,5 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/apps/kgpg
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
-@dirrmtry share/apps/kconf_update
-@dirrmtry share/apps/kcharselect
 @dirrm share/apps/kcalc
 @dirrm share/apps/ark
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index f2338d0ccca3..e7b240153c85 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,10 +6,9 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,7 +19,8 @@ LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_python:${PORTSDIR}/devel/boost-python \
 		mal.1:${PORTSDIR}/palm/libmal \
-		pisock.9:${PORTSDIR}/palm/pilot-link
+		pisock.9:${PORTSDIR}/palm/pilot-link \
+		qca.2:${PORTSDIR}/devel/qca
 
 LATEST_LINK=	${PORTNAME}4
 
@@ -32,8 +32,13 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		qmake_build moc_build rcc_build uic_build
 USE_OPENLDAP=	yes
 
-OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off \
-		KITCHENSYNC "PIM synchronization utility" off
+#fix build when kdepim3 is here
+CMAKE_ARGS+=	-DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
+
+MAN1=		kabcclient.1
+
+OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off
+# 		KITCHENSYNC "PIM synchronization utility" off
 
 .include <bsd.port.pre.mk>
 
@@ -45,15 +50,21 @@ CMAKE_ARGS+=	-DWITH_GNOKII:BOOL=off
 PLIST_SUB+=	GNOKII="@comment "
 .endif
 
-.if defined(WITH_KITCHENSYNC)
-LIB_DEPENDS+=	opensync.1:${PORTSDIR}/devel/libopensync
-PLIST_SUB+=	KITCHENSYNC=""
-.else
-CMAKE_ARGS+=	-DWITH_Opensync:BOOL=off
-PLIST_SUB+=	KITCHENSYNC="@comment "
-.endif
+# kitchensync is disabled in KDE 4.2
+# .if defined(WITH_KITCHENSYNC)
+# LIB_DEPENDS+=	opensync.1:${PORTSDIR}/devel/libopensync
+# PLIST_SUB+=	KITCHENSYNC=""
+# .else
+# CMAKE_ARGS+=	-DWITH_Opensync:BOOL=off
+# PLIST_SUB+=	KITCHENSYNC="@comment "
+# .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+pre-configure:
+	#respect prefix
+	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+	${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
+
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 77ab72de87e6..45abad85ea51 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.1.4.tar.bz2) = 297ffe93343bc0dd62c7d90feae0ee6c
-SHA256 (KDE/kdepim-4.1.4.tar.bz2) = 0e8b1d68975a4e898d2e1794d6f63360e9178af7e9d689501166e7153cc2c11c
-SIZE (KDE/kdepim-4.1.4.tar.bz2) = 13465584
+MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
+SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
+SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
diff --git a/deskutils/kdepim4/files/patch-kmail_accountmanager.cpp b/deskutils/kdepim4/files/patch-kmail_accountmanager.cpp
deleted file mode 100644
index 6d6c1e53e6bf..000000000000
--- a/deskutils/kdepim4/files/patch-kmail_accountmanager.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
---- ../kmail/accountmanager.cpp	2009/01/20 11:56:48	914004
-+++ ../kmail/accountmanager.cpp	2009/01/20 12:11:59	914005
-@@ -39,88 +39,68 @@
-   qDeleteAll(mAcctList);
- }
- 
-+//-----------------------------------------------------------------------------
-+QStringList AccountManager::accountGroups() const
-+{
-+  return KMKernel::config()->groupList().filter( QRegExp( "Account \\d+" ) );
-+}
- 
- //-----------------------------------------------------------------------------
- void AccountManager::writeConfig( bool withSync )
- {
-   KConfig* config = KMKernel::config();
- 
--  // Delete all accounts for groups in the config file not having 
--  // Enabled=false flag (accountGroups) 
--  // and replace them with account groups existing in memory (mAcctList)
--  uint accounts = 0;
--  QStringList accountGroups =
--    config->groupList().filter( QRegExp( "Account \\d+" ) );
--  AccountList::ConstIterator enabledAccountIt = mAcctList.constBegin();
--  for ( QStringList::ConstIterator it = accountGroups.constBegin() ;; ) {
--    QString groupName;
--    bool appendNewGroup = false;
--    if ( it == accountGroups.constEnd() ) {
--      if ( enabledAccountIt == mAcctList.constEnd() )
--        break;
--      appendNewGroup = true;
--      groupName.sprintf( "Account %d", accounts + 1 );
--    }
--    else {
--      groupName = *it;
--      ++it;
--    }
-+  QStringList accountGroupsInConfig = accountGroups();
-+  QStringList accountGroupsToKeep;
- 
--    KConfigGroup group(config, groupName);
--    uint id = group.readEntry( "Id", 0 );
--    if ( mDisabledAccounts.contains( id ) )
--      accounts++; // do not modify disabled account - skip
--    else {
--      if ( appendNewGroup ) {
--        (*enabledAccountIt)->writeConfig( group );
--        ++enabledAccountIt;
--        accounts++;
--      }
--      else // no such account on the list - disabled / enabled
--        config->deleteGroup( groupName );
--    }
-+  // Write all account config groups to the config file and remember
-+  // the config group names
-+  foreach( KMAccount *account, mAcctList ) {
-+    uint accountId = account->id();
-+    QString groupName = QString( "Account %1" ).arg( accountId );
-+    accountGroupsToKeep += groupName;
-+    KConfigGroup group( config, groupName );
-+    account->writeConfig( group );
-   }
- 
--  KConfigGroup group(config, "General");
--  group.writeEntry("accounts", accounts);
-+  // Now, delete all config groups with "Account" in them which don't
-+  // belong to the accounts we just saved (these are deleted accounts, then
-+  // NOTE: This has to be done _after_ writing out the accounts, otherwise
-+  //       there is the risk of data loss, see bug 169166
-+  foreach( const QString &groupName, accountGroupsInConfig ) {
-+    if ( !accountGroupsToKeep.contains( groupName ) )
-+      config->deleteGroup( groupName );
-+  }
- 
--  if (withSync) config->sync();
-+  if ( withSync )
-+    config->sync();
- }
- 
- 
- //-----------------------------------------------------------------------------
- void AccountManager::readConfig(void)
- {
--  KConfig* config = KMKernel::config();
--  KMAccount* acct;
--  QString acctName;
--  QString groupName;
--  int i, num;
--
-+  // Delete all in-memory accounts
-   for ( AccountList::Iterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
-       delete *it;
-   mAcctList.clear();
- 
--  KConfigGroup general(config, "General");
--  num = general.readEntry( "accounts", 0 );
--
--  for (i=1; i<=num; i++)
--  {
--    groupName.sprintf("Account %d", i);
--    KConfigGroup group(config, groupName);
-+  // Now loop over all account groups and load the accounts in them
-+  KConfig* config = KMKernel::config();
-+  QStringList accountGroupNames = accountGroups();
-+  int accountNum = 1;
-+  foreach( const QString &accountGroupName, accountGroupNames ) {
-+    KConfigGroup group( config, accountGroupName );
-     uint id = group.readEntry( "Id", 0 );
--    if ( !group.readEntry("Enabled", true) ) {
--      mDisabledAccounts += id;
--      continue;
--    }
--
-     KAccount::Type acctType = KAccount::typeForName( group.readEntry( "Type" ) );
--    acctName = group.readEntry("Name");
--    if (acctName.isEmpty()) acctName = i18n("Account %1", i);
--    acct = create(acctType, acctName, id);
--    if (!acct) continue;
--    add(acct);
--    acct->readConfig(group);
-+    QString accountName = group.readEntry( "Name" );
-+    if ( accountName.isEmpty() )
-+      accountName = i18n( "Account %1", accountNum++ );
-+    KMAccount *account = create( acctType, accountName, id );
-+    if ( !account )
-+      continue;
-+    add( account );
-+    account->readConfig( group );
-   }
- }
- 
diff --git a/deskutils/kdepim4/files/patch-kmail_accountmanager.h b/deskutils/kdepim4/files/patch-kmail_accountmanager.h
deleted file mode 100644
index af0d5132723b..000000000000
--- a/deskutils/kdepim4/files/patch-kmail_accountmanager.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- ../kmail/accountmanager.h	2009/01/20 11:56:48	914004
-+++ ../kmail/accountmanager.h	2009/01/20 12:11:59	914005
-@@ -80,13 +80,6 @@
-     KMAccount *find( const uint id ) const;
- 
-     /**
--      @return true if account with ID @p id is enabled. 
--      Accounts can be disabled by setting "enabled" flag to false 
--      in "Account #" groups of kmailrc.
--    */
--    bool isEnabled( const uint id ) const { return !mDisabledAccounts.contains(id); }
--
--    /**
-       Physically remove account. Also deletes the given account object !
-       Returns false and does nothing if the account cannot be removed.
-     */
-@@ -163,6 +156,12 @@
-      */
-     uint createId();
- 
-+    /**
-+     * Return a list of config group names of all config groups that store
-+     * receiving accounts.
-+     */
-+    QStringList accountGroups() const;
-+
-     AccountList   mAcctList;
-     AccountList::Iterator mPtrListInterfaceProxyIterator;
-     AccountList   mAcctChecking;
-@@ -176,9 +175,6 @@
- 
-     // if a summary should be displayed
-     bool mDisplaySummary;
--
--    // IDs of disabled accounts, used in AccountManager::writeConfig()
--    QSet<uint> mDisabledAccounts;
- };
- 
- } // namespace KMail
diff --git a/deskutils/kdepim4/files/patch-kmail_kmkernel.cpp b/deskutils/kdepim4/files/patch-kmail_kmkernel.cpp
deleted file mode 100644
index e561b7a9a5f9..000000000000
--- a/deskutils/kdepim4/files/patch-kmail_kmkernel.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../kmail/kmkernel.cpp	2009/01/20 11:56:48	914004
-+++ ../kmail/kmkernel.cpp	2009/01/20 12:11:59	914005
-@@ -1480,8 +1480,7 @@
-   {
-     KMFolderNode *node = *it;
-     if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
--                          && ( acct->type() == KAccount::Imap ))
--                      || !the_acctMgr->isEnabled( node->id() ))
-+                          && ( acct->type() == KAccount::Imap )))
-     {
-       ++it;
-     } else {
diff --git a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
new file mode 100644
index 000000000000..2ccddb36fd90
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
@@ -0,0 +1,10 @@
+--- ../kpilot/conduits/todo/todoconduit.cc	2009/01/24 05:11:42	915906
++++ ../kpilot/conduits/todo/todoconduit.cc	2009/01/24 05:19:21	915907
+@@ -68,6 +68,7 @@
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 7f6996b523c6..b68e8a57a049 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,3 +1,4 @@
+bin/akonadi_distlist_resource
 bin/akonadi_ical_resource
 bin/akonadi_imaplib_resource
 bin/akonadi_kabc_resource
@@ -8,9 +9,11 @@ bin/akonadi_maildir_resource
 bin/akonadi_mailthreader_agent
 bin/akonadi_nepomuk_contact_feeder
 bin/akonadi_nepomuk_email_feeder
+bin/akonadi_nepomuktag_resource
 bin/akonadi_nntp_resource
 bin/akonadi_strigi_feeder
 bin/akonadi_vcard_resource
+bin/akonadi_vcarddir_resource
 bin/akonadiconsole
 bin/akonaditray
 bin/akregator
@@ -20,12 +23,12 @@ bin/groupwisewizard
 bin/ical2vcal
 bin/kabc2mutt
 bin/kabcclient
+bin/kabcdistlistupdater
 bin/kaddressbook
 bin/kalarm
 bin/kalarmautostart
 bin/karm
 bin/kgpgconf
-%%KITCHENSYNC%%bin/kitchensync
 bin/kjots
 bin/kleopatra
 bin/kmail
@@ -42,8 +45,11 @@ bin/konsolekalendar
 bin/kontact
 bin/korgac
 bin/korganizer
+bin/kpilot
+bin/kpilotDaemon
+bin/kres-migrator
+bin/ksendemail
 bin/ktimetracker
-bin/ktnefviewer
 bin/kung
 bin/kwatchgnupg
 bin/kwsdl_compiler
@@ -53,7 +59,6 @@ bin/scalixadmin
 bin/scalixwizard
 bin/schematest
 bin/sloxwizard
-bin/thememain
 include/akregator/akregator_export.h
 include/akregator/article.h
 include/akregator/command.h
@@ -126,6 +131,20 @@ include/kpgp/kpgpblock.h
 include/kpgp/kpgpkey.h
 include/kpgp/kpgpui.h
 include/kpgp/libkpgp_export.h
+include/kpilot/kpilot_export.h
+include/kpilot/kpilotdevicelink.h
+include/kpilot/kpilotlink.h
+include/kpilot/kpilotlocallink.h
+include/kpilot/options.h
+include/kpilot/pilot.h
+include/kpilot/pilotDatabase.h
+include/kpilot/pilotLinkVersion.h
+include/kpilot/pilotLocalDatabase.h
+include/kpilot/pilotRecord.h
+include/kpilot/pilotSerialDatabase.h
+include/kpilot/plugin.h
+include/kpilot/pluginfactory.h
+include/kpilot/syncAction.h
 include/ksieve/error.h
 include/ksieve/lexer.h
 include/ksieve/libksieve_export.h
@@ -139,6 +158,7 @@ include/libkleopatraclient/gui/certificaterequester.h
 include/libkleopatraclient/kleopatraclient_export.h
 lib/kde4/akonadi_serializer_addressee.so
 lib/kde4/akonadi_serializer_bookmark.so
+lib/kde4/akonadi_serializer_contactgroup.so
 lib/kde4/akonadi_serializer_kcal.so
 lib/kde4/akonadi_serializer_mail.so
 lib/kde4/akregator_config_advanced.so
@@ -177,7 +197,6 @@ lib/kde4/kaddressbookpart.so
 lib/kde4/kalarm_local.so
 lib/kde4/kalarm_localdir.so
 lib/kde4/kalarm_remote.so
-lib/kde4/karmpart.so
 lib/kde4/kcal_akonadi.so
 lib/kde4/kcal_blog.so
 lib/kde4/kcal_groupdav.so
@@ -189,7 +208,9 @@ lib/kde4/kcal_resourcefeatureplan_plugin.so
 lib/kde4/kcal_scalix.so
 lib/kde4/kcal_slox.so
 lib/kde4/kcal_xmlrpc.so
+lib/kde4/kcm_akonadi.so
 lib/kde4/kcm_akonadi_resources.so
+lib/kde4/kcm_akonadi_server.so
 lib/kde4/kcm_apptsummary.so
 lib/kde4/kcm_kabconfig.so
 lib/kde4/kcm_kabcustomfields.so
@@ -201,13 +222,14 @@ lib/kde4/kcm_knode.so
 lib/kde4/kcm_kontact.so
 lib/kde4/kcm_kontactsummary.so
 lib/kde4/kcm_korganizer.so
+lib/kde4/kcm_kpilot.so
 lib/kde4/kcm_ktimetrackerconfig.so
+lib/kde4/kcm_planner.so
 lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
 lib/kde4/kio_akonadi.so
 lib/kde4/kio_groupwise.so
 lib/kde4/kio_scalix.so
-%%KITCHENSYNC%%lib/kde4/kitchensyncpart.so
 lib/kde4/kjotspart.so
 lib/kde4/kmail_bodypartformatter_application_octetstream.so
 lib/kde4/kmail_bodypartformatter_text_calendar.so
@@ -222,12 +244,13 @@ lib/kde4/knotes_xmlrpc.so
 lib/kde4/kontact_akregatorplugin.so
 lib/kde4/kontact_journalplugin.so
 lib/kde4/kontact_kaddressbookplugin.so
-lib/kde4/kontact_karmplugin.so
 lib/kde4/kontact_kjotsplugin.so
 lib/kde4/kontact_kmailplugin.so
 lib/kde4/kontact_knodeplugin.so
 lib/kde4/kontact_knotesplugin.so
 lib/kde4/kontact_korganizerplugin.so
+lib/kde4/kontact_ktimetrackerplugin.so
+lib/kde4/kontact_plannerplugin.so
 lib/kde4/kontact_specialdatesplugin.so
 lib/kde4/kontact_summaryplugin.so
 lib/kde4/kontact_todoplugin.so
@@ -239,187 +262,187 @@ lib/kde4/korg_thisdayinhistory.so
 lib/kde4/korg_yearprint.so
 lib/kde4/korganizerpart.so
 lib/kde4/kpartsdesignerplugin.so
+lib/kde4/kpilot_conduit_calendar.so
+lib/kde4/kpilot_conduit_contacts.so
+lib/kde4/kpilot_conduit_memofile.so
+lib/kde4/kpilot_conduit_time.so
+lib/kde4/kpilot_conduit_todo.so
 lib/kde4/ktexteditorkabcbridge.so
+lib/kde4/ktimetrackerpart.so
 lib/kde4/ldifvcardthumbnail.so
 lib/kde4/plugins/designer/kdepimwidgets.so
-lib/libakonadi-kabc.so
-lib/libakonadi-kabc.so.5
-lib/libakonadi-kabc.so.5.0.0
+lib/libakonadi-kabccommon.so
+lib/libakonadi-kabccommon.so.5
+lib/libakonadi-kabccommon.so.5.0.1
 lib/libakonadi-kcal.so
 lib/libakonadi-kcal.so.5
-lib/libakonadi-kcal.so.5.0.0
+lib/libakonadi-kcal.so.5.0.1
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.5
-lib/libakregatorinterfaces.so.5.0.0
-lib/libakregatorprivate.so
+lib/libakregatorinterfaces.so.5.0.1
 lib/libakregatorprivate.so.5
-lib/libakregatorprivate.so.5.0.0
+lib/libakregatorprivate.so.5.0.1
 lib/libgwsoap.so
 lib/libgwsoap.so.5
-lib/libgwsoap.so.5.0.0
+lib/libgwsoap.so.5.0.1
 lib/libimap.so
 lib/libimap.so.5
-lib/libimap.so.5.0.0
+lib/libimap.so.5.0.1
 lib/libkabc_groupdav.so
 lib/libkabc_groupdav.so.5
-lib/libkabc_groupdav.so.5.0.0
+lib/libkabc_groupdav.so.5.0.1
 lib/libkabc_slox.so
 lib/libkabc_slox.so.5
-lib/libkabc_slox.so.5.0.0
+lib/libkabc_slox.so.5.0.1
 lib/libkabc_xmlrpc.so
 lib/libkabc_xmlrpc.so.5
-lib/libkabc_xmlrpc.so.5.0.0
+lib/libkabc_xmlrpc.so.5.0.1
 lib/libkabcgroupwise.so
 lib/libkabcgroupwise.so.5
-lib/libkabcgroupwise.so.5.0.0
+lib/libkabcgroupwise.so.5.0.1
 lib/libkabckolab.so
 lib/libkabckolab.so.5
-lib/libkabckolab.so.5.0.0
+lib/libkabckolab.so.5.0.1
 lib/libkabcommon.so
 lib/libkabcommon.so.5
-lib/libkabcommon.so.5.0.0
+lib/libkabcommon.so.5.0.1
 lib/libkabcscalix.so
 lib/libkabcscalix.so.5
-lib/libkabcscalix.so.5.0.0
+lib/libkabcscalix.so.5.0.1
 lib/libkabinterfaces.so
 lib/libkabinterfaces.so.5
-lib/libkabinterfaces.so.5.0.0
-lib/libkaddressbookprivate.so
+lib/libkabinterfaces.so.5.0.1
 lib/libkaddressbookprivate.so.5
-lib/libkaddressbookprivate.so.5.0.0
+lib/libkaddressbookprivate.so.5.0.1
 lib/libkalarm_resources.so
 lib/libkalarm_resources.so.5
-lib/libkalarm_resources.so.5.0.0
+lib/libkalarm_resources.so.5.0.1
 lib/libkcal_groupdav.so
 lib/libkcal_groupdav.so.5
-lib/libkcal_groupdav.so.5.0.0
+lib/libkcal_groupdav.so.5.0.1
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.5
-lib/libkcal_resourceblog.so.5.0.0
+lib/libkcal_resourceblog.so.5.0.1
 lib/libkcal_resourcefeatureplan.so
 lib/libkcal_resourcefeatureplan.so.5
-lib/libkcal_resourcefeatureplan.so.5.0.0
+lib/libkcal_resourcefeatureplan.so.5.0.1
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.5
-lib/libkcal_resourceremote.so.5.0.0
+lib/libkcal_resourceremote.so.5.0.1
 lib/libkcal_slox.so
 lib/libkcal_slox.so.5
-lib/libkcal_slox.so.5.0.0
+lib/libkcal_slox.so.5.0.1
 lib/libkcal_xmlrpc.so
 lib/libkcal_xmlrpc.so.5
-lib/libkcal_xmlrpc.so.5.0.0
+lib/libkcal_xmlrpc.so.5.0.1
 lib/libkcalgroupwise.so
 lib/libkcalgroupwise.so.5
-lib/libkcalgroupwise.so.5.0.0
+lib/libkcalgroupwise.so.5.0.1
 lib/libkcalkolab.so
 lib/libkcalkolab.so.5
-lib/libkcalkolab.so.5.0.0
+lib/libkcalkolab.so.5.0.1
 lib/libkcalscalix.so
 lib/libkcalscalix.so.5
-lib/libkcalscalix.so.5.0.0
+lib/libkcalscalix.so.5.0.1
 lib/libkdepim.so
 lib/libkdepim.so.5
-lib/libkdepim.so.5.0.0
+lib/libkdepim.so.5.0.1
 lib/libkgroupwarebase.so
 lib/libkgroupwarebase.so.5
-lib/libkgroupwarebase.so.5.0.0
+lib/libkgroupwarebase.so.5.0.1
 lib/libkgroupwaredav.so
 lib/libkgroupwaredav.so.5
-lib/libkgroupwaredav.so.5.0.0
+lib/libkgroupwaredav.so.5.0.1
 lib/libkholidays.so
 lib/libkholidays.so.5
-lib/libkholidays.so.5.0.0
-%%KITCHENSYNC%%lib/libkitchensyncprivate.so
-%%KITCHENSYNC%%lib/libkitchensyncprivate.so.5
-%%KITCHENSYNC%%lib/libkitchensyncprivate.so.5.0.0
+lib/libkholidays.so.5.0.1
 lib/libkleo.so
 lib/libkleo.so.5
-lib/libkleo.so.5.0.0
+lib/libkleo.so.5.0.1
 lib/libkleopatraclientcore.so
-lib/libkleopatraclientcore.so.0.2.0
+lib/libkleopatraclientcore.so.0.2.1
 lib/libkleopatraclientgui.so
-lib/libkleopatraclientgui.so.0.2.0
-lib/libkmailprivate.so
+lib/libkleopatraclientgui.so.0.2.1
 lib/libkmailprivate.so.5
-lib/libkmailprivate.so.5.0.0
+lib/libkmailprivate.so.5.0.1
 lib/libknodecommon.so
 lib/libknodecommon.so.5
-lib/libknodecommon.so.5.0.0
+lib/libknodecommon.so.5.0.1
 lib/libknotes_xmlrpc.so
 lib/libknotes_xmlrpc.so.5
-lib/libknotes_xmlrpc.so.5.0.0
+lib/libknotes_xmlrpc.so.5.0.1
 lib/libknoteskolab.so
 lib/libknoteskolab.so.5
-lib/libknoteskolab.so.5.0.0
+lib/libknoteskolab.so.5.0.1
 lib/libknotesscalix.so
 lib/libknotesscalix.so.5
-lib/libknotesscalix.so.5.0.0
+lib/libknotesscalix.so.5.0.1
 lib/libkocorehelper.so
 lib/libkocorehelper.so.5
-lib/libkocorehelper.so.5.0.0
+lib/libkocorehelper.so.5.0.1
 lib/libkode.so
 lib/libkode.so.5
-lib/libkode.so.5.0.0
+lib/libkode.so.5.0.1
 lib/libkontactinterfaces.so
 lib/libkontactinterfaces.so.5
-lib/libkontactinterfaces.so.5.0.0
-lib/libkontactprivate.so
+lib/libkontactinterfaces.so.5.0.1
 lib/libkontactprivate.so.5
-lib/libkontactprivate.so.5.0.0
+lib/libkontactprivate.so.5.0.1
 lib/libkorg_stdprinting.so
 lib/libkorg_stdprinting.so.5
-lib/libkorg_stdprinting.so.5.0.0
+lib/libkorg_stdprinting.so.5.0.1
 lib/libkorganizer_calendar.so
 lib/libkorganizer_calendar.so.5
-lib/libkorganizer_calendar.so.5.0.0
+lib/libkorganizer_calendar.so.5.0.1
 lib/libkorganizer_eventviewer.so
 lib/libkorganizer_eventviewer.so.5
-lib/libkorganizer_eventviewer.so.5.0.0
+lib/libkorganizer_eventviewer.so.5.0.1
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.5
-lib/libkorganizer_interfaces.so.5.0.0
-lib/libkorganizerprivate.so
+lib/libkorganizer_interfaces.so.5.0.1
 lib/libkorganizerprivate.so.5
-lib/libkorganizerprivate.so.5.0.0
+lib/libkorganizerprivate.so.5.0.1
 lib/libkpgp.so
 lib/libkpgp.so.5
-lib/libkpgp.so.5.0.0
+lib/libkpgp.so.5.0.1
+lib/libkpilot.so
+lib/libkpilot.so.5
+lib/libkpilot.so.5.0.1
+lib/libkpilot_akonadibase.so
+lib/libkpilot_conduit_base.so
 lib/libkschema.so
 lib/libkschema.so.5
-lib/libkschema.so.5.0.0
+lib/libkschema.so.5.0.1
 lib/libkschemawidgets.so
 lib/libkschemawidgets.so.5
-lib/libkschemawidgets.so.5.0.0
+lib/libkschemawidgets.so.5.0.1
 lib/libksieve.so
 lib/libksieve.so.5
-lib/libksieve.so.5.0.0
+lib/libksieve.so.5.0.1
 lib/libkslox.so
 lib/libkslox.so.5
-lib/libkslox.so.5.0.0
+lib/libkslox.so.5.0.1
 lib/libkxmlcommon.so
 lib/libkxmlcommon.so.5
-lib/libkxmlcommon.so.5.0.0
+lib/libkxmlcommon.so.5.0.1
 lib/libmaildir.so
 lib/libmaildir.so.5
-lib/libmaildir.so.5.0.0
+lib/libmaildir.so.5.0.1
 lib/libmimelib.so
 lib/libmimelib.so.5
-lib/libmimelib.so.5.0.0
-%%KITCHENSYNC%%lib/libqopensync.so
-%%KITCHENSYNC%%lib/libqopensync.so.5
-%%KITCHENSYNC%%lib/libqopensync.so.5.0.0
+lib/libmimelib.so.5.0.1
 lib/libschema.so
 lib/libschema.so.5
-lib/libschema.so.5.0.0
+lib/libschema.so.5.0.1
 lib/libwscl.so
 lib/libwscl.so.5
-lib/libwscl.so.5.0.0
+lib/libwscl.so.5.0.1
 lib/libwsdl.so
 lib/libwsdl.so.5
-lib/libwsdl.so.5.0.0
+lib/libwsdl.so.5.0.1
 lib/strigi/strigiea_ics.so
-lib/strigi/strigiea_rfc822.so
 lib/strigi/strigiea_vcf.so
+share/akonadi/agents/distlistresource.desktop
 share/akonadi/agents/icalresource.desktop
 share/akonadi/agents/imaplibresource.desktop
 share/akonadi/agents/kabcresource.desktop
@@ -430,8 +453,10 @@ share/akonadi/agents/maildirresource.desktop
 share/akonadi/agents/mailthreaderagent.desktop
 share/akonadi/agents/nepomukcontactfeeder.desktop
 share/akonadi/agents/nepomukemailfeeder.desktop
+share/akonadi/agents/nepomuktagresource.desktop
 share/akonadi/agents/nntpresource.desktop
 share/akonadi/agents/strigifeeder.desktop
+share/akonadi/agents/vcarddirresource.desktop
 share/akonadi/agents/vcardresource.desktop
 share/applications/kde4/KMail.desktop
 share/applications/kde4/KNode.desktop
@@ -443,18 +468,19 @@ share/applications/kde4/akregator.desktop
 share/applications/kde4/groupwarewizard.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
-share/applications/kde4/karm.desktop
-%%KITCHENSYNC%%share/applications/kde4/kitchensync.desktop
 share/applications/kde4/kleopatra_import.desktop
 share/applications/kde4/kmail_view.desktop
 share/applications/kde4/knotes.desktop
 share/applications/kde4/konsolekalendar.desktop
 share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
-share/applications/kde4/ktnef.desktop
+share/applications/kde4/kpilot.desktop
+share/applications/kde4/kpilotdaemon.desktop
+share/applications/kde4/ktimetracker.desktop
 share/applications/kde4/kwsdl_compiler.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/apps/akonadiconsole/akonadiconsoleui.rc
@@ -503,7 +529,6 @@ share/apps/kaddressbook/printing/ringbinder-style.png
 share/apps/kaddressbook/vcard_xxportui.rc
 share/apps/kaddressbook/zone.tab
 share/apps/kalarm/kalarmui.rc
-share/apps/karmpart/karmui.rc
 share/apps/kconf_update/kalarm-1.2.1-general.pl
 share/apps/kconf_update/kalarm-1.9.5-defaults.pl
 share/apps/kconf_update/kalarm-2.0.2-general.pl
@@ -531,6 +556,7 @@ share/apps/kconf_update/kolab-resource.upd
 share/apps/kconf_update/korganizer.upd
 share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/apps/kconf_update/kpgp.upd
+share/apps/kconf_update/kpilot.upd
 share/apps/kconf_update/upgrade-resourcetype.pl
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
@@ -538,11 +564,6 @@ share/apps/kdepimwidgets/pics/addresseelineedit.png
 share/apps/kdepimwidgets/pics/clicklineedit.png
 share/apps/kdepimwidgets/pics/kdateedit.png
 share/apps/kdepimwidgets/pics/ktimeedit.png
-%%KITCHENSYNC%%share/apps/kitchensync/about/kitchensync.css
-%%KITCHENSYNC%%share/apps/kitchensync/about/main.html
-%%KITCHENSYNC%%share/apps/kitchensync/about/top-right-kitchensync.png
-%%KITCHENSYNC%%share/apps/kitchensync/kitchensync_part.rc
-%%KITCHENSYNC%%share/apps/kitchensync/kitchensyncui.rc
 share/apps/kjots/kjotspartui.rc
 share/apps/kjots/kjotsui.rc
 share/apps/kleopatra/kleopatra.rc
@@ -558,6 +579,23 @@ share/apps/kmail/kmail_part.rc
 share/apps/kmail/kmcomposerui.rc
 share/apps/kmail/kmmainwin.rc
 share/apps/kmail/kmreadermainwin.rc
+share/apps/kmail/pics/attachmentQuicklistClosed.png
+share/apps/kmail/pics/attachmentQuicklistOpened.png
+share/apps/kmail/pics/enterprise_bottom.png
+share/apps/kmail/pics/enterprise_bottom_left.png
+share/apps/kmail/pics/enterprise_bottom_right.png
+share/apps/kmail/pics/enterprise_icon.png
+share/apps/kmail/pics/enterprise_left.png
+share/apps/kmail/pics/enterprise_right.png
+share/apps/kmail/pics/enterprise_s_left.png
+share/apps/kmail/pics/enterprise_s_right.png
+share/apps/kmail/pics/enterprise_sbar.png
+share/apps/kmail/pics/enterprise_sp_right.png
+share/apps/kmail/pics/enterprise_sw.png
+share/apps/kmail/pics/enterprise_top.png
+share/apps/kmail/pics/enterprise_top_left.png
+share/apps/kmail/pics/enterprise_top_right.png
+share/apps/kmail/pics/enterprise_w.png
 share/apps/kmail/pics/key.png
 share/apps/kmail/pics/key_bad.png
 share/apps/kmail/pics/key_ok.png
@@ -567,8 +605,14 @@ share/apps/kmail/pics/mail-deleted.png
 share/apps/kmail/pics/mail-encrypted-full.png
 share/apps/kmail/pics/mail-encrypted-part.png
 share/apps/kmail/pics/mail-encrypted.png
+share/apps/kmail/pics/mail-horizontal-space.png
 share/apps/kmail/pics/mail-thread-ignored.png
 share/apps/kmail/pics/mail-thread-watch.png
+share/apps/kmail/pics/mail-vertical-separator-line.png
+share/apps/kmail/pics/overlay-busy-clock-1.png
+share/apps/kmail/pics/overlay-busy-clock-2.png
+share/apps/kmail/pics/overlay-busy-clock-3.png
+share/apps/kmail/pics/overlay-busy-clock-4.png
 share/apps/kmail/pics/pgp-keys.png
 share/apps/kmail/pics/quotecollapse.png
 share/apps/kmail/pics/quoteexpand.png
@@ -636,6 +680,7 @@ share/apps/kontact/ksettingsdialog/knode.setdlg
 share/apps/kontact/ksettingsdialog/knotes.setdlg
 share/apps/kontact/ksettingsdialog/korganizer.setdlg
 share/apps/kontact/ksettingsdialog/ktimetracker.setdlg
+share/apps/kontact/ksettingsdialog/planner.setdlg
 share/apps/kontact/ksettingsdialog/specialdates.setdlg
 share/apps/kontact/ksettingsdialog/summary.setdlg
 share/apps/kontactsummary/kontactsummary_part.rc
@@ -648,6 +693,7 @@ share/apps/korganizer/sounds/lightmag.wav
 share/apps/korganizer/sounds/onscreen.wav
 share/apps/korganizer/sounds/spinout.wav
 share/apps/korganizer/tips
+share/apps/kpilot/kpilotui.rc
 share/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
@@ -655,7 +701,7 @@ share/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
-share/apps/ktimetracker/karmui.rc
+share/apps/ktimetracker/ktimetrackerui.rc
 share/apps/ktimetracker/pics/active-icon-0.xpm
 share/apps/ktimetracker/pics/active-icon-1.xpm
 share/apps/ktimetracker/pics/active-icon-2.xpm
@@ -678,7 +724,6 @@ share/apps/ktimetracker/pics/watch-4.xpm
 share/apps/ktimetracker/pics/watch-5.xpm
 share/apps/ktimetracker/pics/watch-6.xpm
 share/apps/ktimetracker/pics/watch-7.xpm
-share/apps/ktnef/ktnefui.rc
 share/apps/kwatchgnupg/kwatchgnupgui.rc
 share/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/apps/kwatchgnupg/pics/kwatchgnupg2.png
@@ -765,9 +810,12 @@ share/apps/nepomuk/ontologies/nco.desktop
 share/apps/nepomuk/ontologies/nco.trig
 share/apps/nepomuk/ontologies/nmo.desktop
 share/apps/nepomuk/ontologies/nmo.trig
+share/autostart/kabcdistlistupdater.desktop
 share/autostart/kalarm.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/akregator.kcfg
+share/config.kcfg/calendarsettings.kcfg
+share/config.kcfg/contactssettings.kcfg
 share/config.kcfg/custommimeheader.kcfg
 share/config.kcfg/customtemplates_kfg.kcfg
 share/config.kcfg/egroupware.kcfg
@@ -780,14 +828,20 @@ share/config.kcfg/knotesglobalconfig.kcfg
 share/config.kcfg/kolab.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
+share/config.kcfg/kpilot.kcfg
+share/config.kcfg/kpilotlib.kcfg
 share/config.kcfg/kxforms.kcfg
+share/config.kcfg/memofileconduit.kcfg
 share/config.kcfg/replyphrases.kcfg
 share/config.kcfg/scalix.kcfg
 share/config.kcfg/slox.kcfg
 share/config.kcfg/templatesconfiguration_kfg.kcfg
+share/config.kcfg/timeconduit.kcfg
+share/config.kcfg/todosettings.kcfg
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
 share/config/korganizer.knsrc
+share/config/kres-migratorrc
 share/config/libkleopatrarc
 share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
 share/dbus-1/interfaces/org.kde.KNotes.xml
@@ -825,6 +879,10 @@ share/doc/HTML/en/akregator/main-window4.png
 share/doc/HTML/en/akregator/quick-filter.png
 share/doc/HTML/en/akregator/rss.png
 share/doc/HTML/en/akregator/rss3.png
+share/doc/HTML/en/kabcclient/common
+share/doc/HTML/en/kabcclient/index.cache.bz2
+share/doc/HTML/en/kabcclient/index.docbook
+share/doc/HTML/en/kabcclient/man-kabcclient.1.docbook
 share/doc/HTML/en/kaddressbook/addhost.png
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
@@ -841,11 +899,15 @@ share/doc/HTML/en/kaddressbook/resourcesdlg.png
 share/doc/HTML/en/kaddressbook/vieweditdlg.png
 share/doc/HTML/en/kalarm/alarmmessage.png
 share/doc/HTML/en/kalarm/common
+share/doc/HTML/en/kalarm/editwindow-simple.png
 share/doc/HTML/en/kalarm/editwindow.png
 share/doc/HTML/en/kalarm/index.cache.bz2
 share/doc/HTML/en/kalarm/index.docbook
 share/doc/HTML/en/kalarm/mainwindow.png
 share/doc/HTML/en/kalarm/spinbox.png
+share/doc/HTML/en/kioslave/news/common
+share/doc/HTML/en/kioslave/news/index.cache.bz2
+share/doc/HTML/en/kioslave/news/index.docbook
 share/doc/HTML/en/kjots/common
 share/doc/HTML/en/kjots/index.cache.bz2
 share/doc/HTML/en/kjots/index.docbook
@@ -993,6 +1055,41 @@ share/doc/HTML/en/korganizer/outlook-to-vcalendar.docbook
 share/doc/HTML/en/korganizer/plugins-chapter.docbook
 share/doc/HTML/en/korganizer/remotefile-resource.png
 share/doc/HTML/en/korganizer/todo-general.png
+share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
+share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-mal.png
+share/doc/HTML/en/kpilot/conduit-palmdoc.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
+share/doc/HTML/en/kpilot/conduit-sysinfo.png
+share/doc/HTML/en/kpilot/conduit-vcal.png
+share/doc/HTML/en/kpilot/configuration.docbook
+share/doc/HTML/en/kpilot/daemon-menu.png
+share/doc/HTML/en/kpilot/db-app.png
+share/doc/HTML/en/kpilot/faq.docbook
+share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
+share/doc/HTML/en/kpilot/index.docbook
+share/doc/HTML/en/kpilot/main-app.png
+share/doc/HTML/en/kpilot/memo-app.png
+share/doc/HTML/en/kpilot/setup-address.png
+share/doc/HTML/en/kpilot/setup-conduit.png
+share/doc/HTML/en/kpilot/setup-dbspecial.png
+share/doc/HTML/en/kpilot/setup-general.png
+share/doc/HTML/en/kpilot/setup-hotsync.png
+share/doc/HTML/en/kpilot/setup-items.png
+share/doc/HTML/en/kpilot/setup-startup-exit.png
+share/doc/HTML/en/kpilot/setup-tabs.png
+share/doc/HTML/en/kpilot/setup-viewer.png
+share/doc/HTML/en/kpilot/sidebar.png
+share/doc/HTML/en/kpilot/sync.docbook
+share/doc/HTML/en/kpilot/todo-app.png
+share/doc/HTML/en/kpilot/toolbar_backup.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/doc/HTML/en/kpilot/usage.docbook
+share/doc/HTML/en/kpilot/wizard-conduits.png
+share/doc/HTML/en/kpilot/wizard-connection.png
+share/doc/HTML/en/kpilot/wizard-general.png
 share/doc/HTML/en/ktimetracker/clipboard-history.png
 share/doc/HTML/en/ktimetracker/common
 share/doc/HTML/en/ktimetracker/copy-this-task.png
@@ -1003,9 +1100,6 @@ share/doc/HTML/en/ktimetracker/index.cache.bz2
 share/doc/HTML/en/ktimetracker/index.docbook
 share/doc/HTML/en/ktimetracker/karm.png
 share/doc/HTML/en/ktimetracker/systray.png
-share/doc/HTML/en/kwsdl_compiler/common
-share/doc/HTML/en/kwsdl_compiler/index.cache.bz2
-share/doc/HTML/en/kwsdl_compiler/index.docbook
 share/icons/hicolor/128x128/apps/akregator.png
 share/icons/hicolor/128x128/apps/kaddressbook.png
 share/icons/hicolor/128x128/apps/kjots.png
@@ -1016,12 +1110,18 @@ share/icons/hicolor/128x128/apps/knotes.png
 share/icons/hicolor/128x128/apps/kontact.png
 share/icons/hicolor/128x128/apps/korganizer.png
 share/icons/hicolor/128x128/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/16x16/actions/sync-start.png
+share/icons/hicolor/16x16/actions/kpilot_backup.png
+share/icons/hicolor/16x16/actions/kpilot_busysync.png
+share/icons/hicolor/16x16/actions/kpilot_fullsync.png
+share/icons/hicolor/16x16/actions/kpilot_hhtopc.png
+share/icons/hicolor/16x16/actions/kpilot_hotsync.png
+share/icons/hicolor/16x16/actions/kpilot_nosync.png
+share/icons/hicolor/16x16/actions/kpilot_reset.png
+share/icons/hicolor/16x16/actions/kpilot_restore.png
 share/icons/hicolor/16x16/apps/akregator.png
 share/icons/hicolor/16x16/apps/akregator_empty.png
 share/icons/hicolor/16x16/apps/kaddressbook.png
 share/icons/hicolor/16x16/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/16x16/apps/kitchensync.png
 share/icons/hicolor/16x16/apps/kjots.png
 share/icons/hicolor/16x16/apps/kmail.png
 share/icons/hicolor/16x16/apps/knode.png
@@ -1029,23 +1129,34 @@ share/icons/hicolor/16x16/apps/knode2.png
 share/icons/hicolor/16x16/apps/knotes.png
 share/icons/hicolor/16x16/apps/kontact.png
 share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/16x16/apps/kpilot.png
+share/icons/hicolor/16x16/apps/kpilotDaemon.png
 share/icons/hicolor/16x16/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/22x22/actions/sync-start.png
+share/icons/hicolor/22x22/actions/kpilot_backup.png
+share/icons/hicolor/22x22/actions/kpilot_busysync.png
+share/icons/hicolor/22x22/actions/kpilot_fullsync.png
+share/icons/hicolor/22x22/actions/kpilot_hhtopc.png
+share/icons/hicolor/22x22/actions/kpilot_hotsync.png
+share/icons/hicolor/22x22/actions/kpilot_nosync.png
+share/icons/hicolor/22x22/actions/kpilot_reset.png
+share/icons/hicolor/22x22/actions/kpilot_restore.png
 share/icons/hicolor/22x22/apps/akregator.png
 share/icons/hicolor/22x22/apps/kaddressbook.png
-share/icons/hicolor/22x22/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/22x22/apps/kitchensync.png
 share/icons/hicolor/22x22/apps/kjots.png
 share/icons/hicolor/22x22/apps/kmail.png
 share/icons/hicolor/22x22/apps/knotes.png
 share/icons/hicolor/22x22/apps/kontact.png
 share/icons/hicolor/22x22/apps/korganizer.png
+share/icons/hicolor/22x22/apps/kpilot.png
+share/icons/hicolor/22x22/apps/kpilotDaemon.png
 share/icons/hicolor/22x22/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/32x32/actions/sync-start.png
+share/icons/hicolor/32x32/actions/kpilot_fullsync.png
+share/icons/hicolor/32x32/actions/kpilot_hhtopc.png
+share/icons/hicolor/32x32/actions/kpilot_hotsync.png
+share/icons/hicolor/32x32/actions/kpilot_reset.png
 share/icons/hicolor/32x32/apps/akregator.png
 share/icons/hicolor/32x32/apps/kaddressbook.png
 share/icons/hicolor/32x32/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/32x32/apps/kitchensync.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kmail.png
 share/icons/hicolor/32x32/apps/knode.png
@@ -1053,12 +1164,16 @@ share/icons/hicolor/32x32/apps/knode2.png
 share/icons/hicolor/32x32/apps/knotes.png
 share/icons/hicolor/32x32/apps/kontact.png
 share/icons/hicolor/32x32/apps/korganizer.png
+share/icons/hicolor/32x32/apps/kpilot.png
+share/icons/hicolor/32x32/apps/kpilotDaemon.png
 share/icons/hicolor/32x32/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/48x48/actions/sync-start.png
+share/icons/hicolor/48x48/actions/kpilot_fullsync.png
+share/icons/hicolor/48x48/actions/kpilot_hhtopc.png
+share/icons/hicolor/48x48/actions/kpilot_hotsync.png
+share/icons/hicolor/48x48/actions/kpilot_reset.png
 share/icons/hicolor/48x48/apps/akregator.png
 share/icons/hicolor/48x48/apps/kaddressbook.png
 share/icons/hicolor/48x48/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/48x48/apps/kitchensync.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kmail.png
 share/icons/hicolor/48x48/apps/knode.png
@@ -1066,8 +1181,16 @@ share/icons/hicolor/48x48/apps/knode2.png
 share/icons/hicolor/48x48/apps/knotes.png
 share/icons/hicolor/48x48/apps/kontact.png
 share/icons/hicolor/48x48/apps/korganizer.png
+share/icons/hicolor/48x48/apps/kpilot.png
+share/icons/hicolor/48x48/apps/kpilotDaemon.png
 share/icons/hicolor/48x48/apps/ktimetracker.png
-share/icons/hicolor/48x48/apps/ktnef.png
+share/icons/hicolor/64x64/actions/kpilot_address.png
+share/icons/hicolor/64x64/actions/kpilot_bhotsync.png
+share/icons/hicolor/64x64/actions/kpilot_calendar.png
+share/icons/hicolor/64x64/actions/kpilot_db.png
+share/icons/hicolor/64x64/actions/kpilot_fileinstaller.png
+share/icons/hicolor/64x64/actions/kpilot_knotes.png
+share/icons/hicolor/64x64/actions/kpilot_todo.png
 share/icons/hicolor/64x64/apps/akregator.png
 share/icons/hicolor/64x64/apps/kaddressbook.png
 share/icons/hicolor/64x64/apps/kjots.png
@@ -1083,6 +1206,7 @@ share/icons/hicolor/scalable/apps/kaddressbook.svgz
 share/icons/hicolor/scalable/apps/kjots.svgz
 share/icons/hicolor/scalable/apps/kmail.svgz
 share/icons/hicolor/scalable/apps/korganizer.svgz
+share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/apps/kleopatra.png
 share/icons/oxygen/16x16/actions/document-new-from-template.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
@@ -1090,8 +1214,8 @@ share/icons/oxygen/16x16/actions/ldap_lookup.png
 share/icons/oxygen/16x16/actions/mail-forwarded-replied.png
 share/icons/oxygen/16x16/actions/mail-forwarded.png
 share/icons/oxygen/16x16/actions/mail-reply-custom.png
+share/icons/oxygen/16x16/actions/mail-signed-fully.png
 share/icons/oxygen/16x16/actions/mail-signed-part.png
-share/icons/oxygen/16x16/actions/mail-signed-verified.png
 share/icons/oxygen/16x16/actions/mail-signed.png
 share/icons/oxygen/16x16/actions/meeting-attending-tentative.png
 share/icons/oxygen/16x16/actions/meeting-attending.png
@@ -1115,6 +1239,7 @@ share/icons/oxygen/22x22/actions/button_more.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/document-new-from-template.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
+share/icons/oxygen/22x22/actions/kalarm.png
 share/icons/oxygen/22x22/actions/mail-reply-custom.png
 share/icons/oxygen/22x22/actions/meeting-attending-tentative.png
 share/icons/oxygen/22x22/actions/meeting-attending.png
@@ -1154,14 +1279,16 @@ share/icons/oxygen/48x48/apps/kleopatra.png
 share/icons/oxygen/48x48/apps/kmailcvt.png
 share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/48x48/status/mail-tagged.png
+share/icons/oxygen/64x64/apps/kalarm.png
 share/icons/oxygen/64x64/apps/kleopatra.png
 share/icons/oxygen/scalable/actions/edit-delete-page.svgz
 share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz
 share/icons/oxygen/scalable/actions/mail-forwarded.svgz
 share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
+share/icons/oxygen/scalable/actions/mail-signed-fully.svgz
 share/icons/oxygen/scalable/actions/mail-signed-part.svgz
-share/icons/oxygen/scalable/actions/mail-signed-verified.svgz
 share/icons/oxygen/scalable/actions/mail-signed.svgz
+share/icons/oxygen/scalable/apps/kalarm.svgz
 share/icons/oxygen/scalable/apps/kleopatra.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
 share/icons/oxygen/scalable/status/mail-tagged.svgz
@@ -1209,11 +1336,14 @@ share/kde4/services/kaddressbook/smsprotocol.desktop
 share/kde4/services/kaddressbook/tableview.desktop
 share/kde4/services/kaddressbook/vcard_xxport.desktop
 share/kde4/services/kaddressbook/yahooprotocol.desktop
-share/kde4/services/karm_part.desktop
+share/kde4/services/kaddressbookpart.desktop
+share/kde4/services/kcm_akonadi.desktop
 share/kde4/services/kcm_akonadi_resources.desktop
+share/kde4/services/kcm_akonadi_server.desktop
 share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
+share/kde4/services/kcmplanner.desktop
 share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
 share/kde4/services/kjotspart.desktop
@@ -1248,6 +1378,7 @@ share/kde4/services/kontact/knodeplugin.desktop
 share/kde4/services/kontact/knotesplugin.desktop
 share/kde4/services/kontact/korganizerplugin.desktop
 share/kde4/services/kontact/ktimetracker_plugin.desktop
+share/kde4/services/kontact/plannerplugin.desktop
 share/kde4/services/kontact/specialdatesplugin.desktop
 share/kde4/services/kontact/summaryplugin.desktop
 share/kde4/services/kontact/todoplugin.desktop
@@ -1266,6 +1397,10 @@ share/kde4/services/korganizer_configmain.desktop
 share/kde4/services/korganizer_configplugins.desktop
 share/kde4/services/korganizer_configtime.desktop
 share/kde4/services/korganizer_configviews.desktop
+share/kde4/services/kpilot-conduit-calendar.desktop
+share/kde4/services/kpilot-conduit-contacts.desktop
+share/kde4/services/kpilot-conduit-todo.desktop
+share/kde4/services/kpilot_config.desktop
 share/kde4/services/kresources/alarms/local.desktop
 share/kde4/services/kresources/alarms/localdir.desktop
 share/kde4/services/kresources/alarms/remote.desktop
@@ -1298,9 +1433,12 @@ share/kde4/services/kresources/knotes/local.desktop
 share/kde4/services/kresources/knotes/scalix.desktop
 share/kde4/services/kresources/knotes_manager.desktop
 share/kde4/services/ktimetrackerconfig.desktop
+share/kde4/services/ktimetrackerpart.desktop
 share/kde4/services/ldifvcardthumbnail.desktop
+share/kde4/services/memofile-conduit.desktop
 share/kde4/services/scalix.protocol
 share/kde4/services/scalixs.protocol
+share/kde4/services/time_conduit.desktop
 share/kde4/services/webcal.protocol
 share/kde4/servicetypes/akregator_plugin.desktop
 share/kde4/servicetypes/calendardecoration.desktop
@@ -1317,13 +1455,14 @@ share/kde4/servicetypes/kaddressbookimprotocol.desktop
 share/kde4/servicetypes/kontactplugin.desktop
 share/kde4/servicetypes/korganizerpart.desktop
 share/kde4/servicetypes/korgprintplugin.desktop
+share/kde4/servicetypes/kpilotconduit.desktop
 @dirrm share/kde4/services/kresources/knotes
 @dirrm share/kde4/services/kresources/alarms
 @dirrm share/kde4/services/korganizer
 @dirrm share/kde4/services/kontact
 @dirrm share/kde4/services/kaddressbook
-@dirrm share/doc/HTML/en/kwsdl_compiler
 @dirrm share/doc/HTML/en/ktimetracker
+@dirrm share/doc/HTML/en/kpilot
 @dirrm share/doc/HTML/en/korganizer
 @dirrm share/doc/HTML/en/kontact
 @dirrm share/doc/HTML/en/konsolekalendar
@@ -1332,12 +1471,11 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en/kleopatra
 @dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kioslave/news
 @dirrm share/doc/HTML/en/kalarm
 @dirrm share/doc/HTML/en/kaddressbook
+@dirrm share/doc/HTML/en/kabcclient
 @dirrm share/doc/HTML/en/akregator
-@dirrmtry share/autostart
-@dirrmtry share/apps/nepomuk/ontologies
-@dirrmtry share/apps/nepomuk
 @dirrm share/apps/libkleopatra/pics
 @dirrm share/apps/libkleopatra
 @dirrm share/apps/libkholidays
@@ -1346,7 +1484,6 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/kxforms
 @dirrm share/apps/kwatchgnupg/pics
 @dirrm share/apps/kwatchgnupg
-@dirrm share/apps/ktnef
 @dirrm share/apps/ktimetracker/pics
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable/actions
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable
@@ -1365,6 +1502,7 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/ktimetracker/icons/oxygen
 @dirrm share/apps/ktimetracker/icons
 @dirrm share/apps/ktimetracker
+@dirrm share/apps/kpilot
 @dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer
 @dirrm share/apps/korgac/icons/oxygen/22x22/actions
@@ -1394,12 +1532,8 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/kleopatra/pics
 @dirrm share/apps/kleopatra
 @dirrm share/apps/kjots
-%%KITCHENSYNC%%@dirrm share/apps/kitchensync/about
-%%KITCHENSYNC%%@dirrm share/apps/kitchensync
 @dirrm share/apps/kdepimwidgets/pics
 @dirrm share/apps/kdepimwidgets
-@dirrmtry share/apps/kconf_update
-@dirrm share/apps/karmpart
 @dirrm share/apps/kalarm
 @dirrm share/apps/kaddressbook/printing
 @dirrm share/apps/kaddressbook/pics
@@ -1409,24 +1543,21 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/kaddressbook/icons
 @dirrm share/apps/kaddressbook/csv-templates
 @dirrm share/apps/kaddressbook
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
 @dirrm share/apps/akregator_onlinesync_plugin
-@dirrm share/apps/akregator/pics
+@dirrmtry share/apps/akregator/pics
 @dirrm share/apps/akregator/about
-@dirrm share/apps/akregator
+@dirrmtry share/apps/akregator
 @dirrm share/apps/akonadiconsole
 @dirrm share/apps/akonadi/plugins/serializer
 @dirrm share/apps/akonadi/plugins
 @dirrm share/apps/akonadi
 @dirrm share/akonadi/agents
 @dirrm share/akonadi
-@dirrmtry lib/strigi
-@dirrmtry lib/kde4/plugins/designer
 @dirrm include/libkleopatraclient/gui
 @dirrm include/libkleopatraclient/core
 @dirrm include/libkleopatraclient
 @dirrm include/ksieve
+@dirrm include/kpilot
 @dirrm include/kpgp
 @dirrm include/kmail/interfaces
 @dirrm include/kmail
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index f2338d0ccca3..e7b240153c85 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,10 +6,9 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,7 +19,8 @@ LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_python:${PORTSDIR}/devel/boost-python \
 		mal.1:${PORTSDIR}/palm/libmal \
-		pisock.9:${PORTSDIR}/palm/pilot-link
+		pisock.9:${PORTSDIR}/palm/pilot-link \
+		qca.2:${PORTSDIR}/devel/qca
 
 LATEST_LINK=	${PORTNAME}4
 
@@ -32,8 +32,13 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		qmake_build moc_build rcc_build uic_build
 USE_OPENLDAP=	yes
 
-OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off \
-		KITCHENSYNC "PIM synchronization utility" off
+#fix build when kdepim3 is here
+CMAKE_ARGS+=	-DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
+
+MAN1=		kabcclient.1
+
+OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off
+# 		KITCHENSYNC "PIM synchronization utility" off
 
 .include <bsd.port.pre.mk>
 
@@ -45,15 +50,21 @@ CMAKE_ARGS+=	-DWITH_GNOKII:BOOL=off
 PLIST_SUB+=	GNOKII="@comment "
 .endif
 
-.if defined(WITH_KITCHENSYNC)
-LIB_DEPENDS+=	opensync.1:${PORTSDIR}/devel/libopensync
-PLIST_SUB+=	KITCHENSYNC=""
-.else
-CMAKE_ARGS+=	-DWITH_Opensync:BOOL=off
-PLIST_SUB+=	KITCHENSYNC="@comment "
-.endif
+# kitchensync is disabled in KDE 4.2
+# .if defined(WITH_KITCHENSYNC)
+# LIB_DEPENDS+=	opensync.1:${PORTSDIR}/devel/libopensync
+# PLIST_SUB+=	KITCHENSYNC=""
+# .else
+# CMAKE_ARGS+=	-DWITH_Opensync:BOOL=off
+# PLIST_SUB+=	KITCHENSYNC="@comment "
+# .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+pre-configure:
+	#respect prefix
+	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+	${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
+
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 77ab72de87e6..45abad85ea51 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.1.4.tar.bz2) = 297ffe93343bc0dd62c7d90feae0ee6c
-SHA256 (KDE/kdepim-4.1.4.tar.bz2) = 0e8b1d68975a4e898d2e1794d6f63360e9178af7e9d689501166e7153cc2c11c
-SIZE (KDE/kdepim-4.1.4.tar.bz2) = 13465584
+MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
+SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
+SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
diff --git a/deskutils/kdepim44/files/patch-kmail_accountmanager.cpp b/deskutils/kdepim44/files/patch-kmail_accountmanager.cpp
deleted file mode 100644
index 6d6c1e53e6bf..000000000000
--- a/deskutils/kdepim44/files/patch-kmail_accountmanager.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
---- ../kmail/accountmanager.cpp	2009/01/20 11:56:48	914004
-+++ ../kmail/accountmanager.cpp	2009/01/20 12:11:59	914005
-@@ -39,88 +39,68 @@
-   qDeleteAll(mAcctList);
- }
- 
-+//-----------------------------------------------------------------------------
-+QStringList AccountManager::accountGroups() const
-+{
-+  return KMKernel::config()->groupList().filter( QRegExp( "Account \\d+" ) );
-+}
- 
- //-----------------------------------------------------------------------------
- void AccountManager::writeConfig( bool withSync )
- {
-   KConfig* config = KMKernel::config();
- 
--  // Delete all accounts for groups in the config file not having 
--  // Enabled=false flag (accountGroups) 
--  // and replace them with account groups existing in memory (mAcctList)
--  uint accounts = 0;
--  QStringList accountGroups =
--    config->groupList().filter( QRegExp( "Account \\d+" ) );
--  AccountList::ConstIterator enabledAccountIt = mAcctList.constBegin();
--  for ( QStringList::ConstIterator it = accountGroups.constBegin() ;; ) {
--    QString groupName;
--    bool appendNewGroup = false;
--    if ( it == accountGroups.constEnd() ) {
--      if ( enabledAccountIt == mAcctList.constEnd() )
--        break;
--      appendNewGroup = true;
--      groupName.sprintf( "Account %d", accounts + 1 );
--    }
--    else {
--      groupName = *it;
--      ++it;
--    }
-+  QStringList accountGroupsInConfig = accountGroups();
-+  QStringList accountGroupsToKeep;
- 
--    KConfigGroup group(config, groupName);
--    uint id = group.readEntry( "Id", 0 );
--    if ( mDisabledAccounts.contains( id ) )
--      accounts++; // do not modify disabled account - skip
--    else {
--      if ( appendNewGroup ) {
--        (*enabledAccountIt)->writeConfig( group );
--        ++enabledAccountIt;
--        accounts++;
--      }
--      else // no such account on the list - disabled / enabled
--        config->deleteGroup( groupName );
--    }
-+  // Write all account config groups to the config file and remember
-+  // the config group names
-+  foreach( KMAccount *account, mAcctList ) {
-+    uint accountId = account->id();
-+    QString groupName = QString( "Account %1" ).arg( accountId );
-+    accountGroupsToKeep += groupName;
-+    KConfigGroup group( config, groupName );
-+    account->writeConfig( group );
-   }
- 
--  KConfigGroup group(config, "General");
--  group.writeEntry("accounts", accounts);
-+  // Now, delete all config groups with "Account" in them which don't
-+  // belong to the accounts we just saved (these are deleted accounts, then
-+  // NOTE: This has to be done _after_ writing out the accounts, otherwise
-+  //       there is the risk of data loss, see bug 169166
-+  foreach( const QString &groupName, accountGroupsInConfig ) {
-+    if ( !accountGroupsToKeep.contains( groupName ) )
-+      config->deleteGroup( groupName );
-+  }
- 
--  if (withSync) config->sync();
-+  if ( withSync )
-+    config->sync();
- }
- 
- 
- //-----------------------------------------------------------------------------
- void AccountManager::readConfig(void)
- {
--  KConfig* config = KMKernel::config();
--  KMAccount* acct;
--  QString acctName;
--  QString groupName;
--  int i, num;
--
-+  // Delete all in-memory accounts
-   for ( AccountList::Iterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
-       delete *it;
-   mAcctList.clear();
- 
--  KConfigGroup general(config, "General");
--  num = general.readEntry( "accounts", 0 );
--
--  for (i=1; i<=num; i++)
--  {
--    groupName.sprintf("Account %d", i);
--    KConfigGroup group(config, groupName);
-+  // Now loop over all account groups and load the accounts in them
-+  KConfig* config = KMKernel::config();
-+  QStringList accountGroupNames = accountGroups();
-+  int accountNum = 1;
-+  foreach( const QString &accountGroupName, accountGroupNames ) {
-+    KConfigGroup group( config, accountGroupName );
-     uint id = group.readEntry( "Id", 0 );
--    if ( !group.readEntry("Enabled", true) ) {
--      mDisabledAccounts += id;
--      continue;
--    }
--
-     KAccount::Type acctType = KAccount::typeForName( group.readEntry( "Type" ) );
--    acctName = group.readEntry("Name");
--    if (acctName.isEmpty()) acctName = i18n("Account %1", i);
--    acct = create(acctType, acctName, id);
--    if (!acct) continue;
--    add(acct);
--    acct->readConfig(group);
-+    QString accountName = group.readEntry( "Name" );
-+    if ( accountName.isEmpty() )
-+      accountName = i18n( "Account %1", accountNum++ );
-+    KMAccount *account = create( acctType, accountName, id );
-+    if ( !account )
-+      continue;
-+    add( account );
-+    account->readConfig( group );
-   }
- }
- 
diff --git a/deskutils/kdepim44/files/patch-kmail_accountmanager.h b/deskutils/kdepim44/files/patch-kmail_accountmanager.h
deleted file mode 100644
index af0d5132723b..000000000000
--- a/deskutils/kdepim44/files/patch-kmail_accountmanager.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- ../kmail/accountmanager.h	2009/01/20 11:56:48	914004
-+++ ../kmail/accountmanager.h	2009/01/20 12:11:59	914005
-@@ -80,13 +80,6 @@
-     KMAccount *find( const uint id ) const;
- 
-     /**
--      @return true if account with ID @p id is enabled. 
--      Accounts can be disabled by setting "enabled" flag to false 
--      in "Account #" groups of kmailrc.
--    */
--    bool isEnabled( const uint id ) const { return !mDisabledAccounts.contains(id); }
--
--    /**
-       Physically remove account. Also deletes the given account object !
-       Returns false and does nothing if the account cannot be removed.
-     */
-@@ -163,6 +156,12 @@
-      */
-     uint createId();
- 
-+    /**
-+     * Return a list of config group names of all config groups that store
-+     * receiving accounts.
-+     */
-+    QStringList accountGroups() const;
-+
-     AccountList   mAcctList;
-     AccountList::Iterator mPtrListInterfaceProxyIterator;
-     AccountList   mAcctChecking;
-@@ -176,9 +175,6 @@
- 
-     // if a summary should be displayed
-     bool mDisplaySummary;
--
--    // IDs of disabled accounts, used in AccountManager::writeConfig()
--    QSet<uint> mDisabledAccounts;
- };
- 
- } // namespace KMail
diff --git a/deskutils/kdepim44/files/patch-kmail_kmkernel.cpp b/deskutils/kdepim44/files/patch-kmail_kmkernel.cpp
deleted file mode 100644
index e561b7a9a5f9..000000000000
--- a/deskutils/kdepim44/files/patch-kmail_kmkernel.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../kmail/kmkernel.cpp	2009/01/20 11:56:48	914004
-+++ ../kmail/kmkernel.cpp	2009/01/20 12:11:59	914005
-@@ -1480,8 +1480,7 @@
-   {
-     KMFolderNode *node = *it;
-     if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
--                          && ( acct->type() == KAccount::Imap ))
--                      || !the_acctMgr->isEnabled( node->id() ))
-+                          && ( acct->type() == KAccount::Imap )))
-     {
-       ++it;
-     } else {
diff --git a/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc
new file mode 100644
index 000000000000..2ccddb36fd90
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc
@@ -0,0 +1,10 @@
+--- ../kpilot/conduits/todo/todoconduit.cc	2009/01/24 05:11:42	915906
++++ ../kpilot/conduits/todo/todoconduit.cc	2009/01/24 05:19:21	915907
+@@ -68,6 +68,7 @@
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 7f6996b523c6..b68e8a57a049 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -1,3 +1,4 @@
+bin/akonadi_distlist_resource
 bin/akonadi_ical_resource
 bin/akonadi_imaplib_resource
 bin/akonadi_kabc_resource
@@ -8,9 +9,11 @@ bin/akonadi_maildir_resource
 bin/akonadi_mailthreader_agent
 bin/akonadi_nepomuk_contact_feeder
 bin/akonadi_nepomuk_email_feeder
+bin/akonadi_nepomuktag_resource
 bin/akonadi_nntp_resource
 bin/akonadi_strigi_feeder
 bin/akonadi_vcard_resource
+bin/akonadi_vcarddir_resource
 bin/akonadiconsole
 bin/akonaditray
 bin/akregator
@@ -20,12 +23,12 @@ bin/groupwisewizard
 bin/ical2vcal
 bin/kabc2mutt
 bin/kabcclient
+bin/kabcdistlistupdater
 bin/kaddressbook
 bin/kalarm
 bin/kalarmautostart
 bin/karm
 bin/kgpgconf
-%%KITCHENSYNC%%bin/kitchensync
 bin/kjots
 bin/kleopatra
 bin/kmail
@@ -42,8 +45,11 @@ bin/konsolekalendar
 bin/kontact
 bin/korgac
 bin/korganizer
+bin/kpilot
+bin/kpilotDaemon
+bin/kres-migrator
+bin/ksendemail
 bin/ktimetracker
-bin/ktnefviewer
 bin/kung
 bin/kwatchgnupg
 bin/kwsdl_compiler
@@ -53,7 +59,6 @@ bin/scalixadmin
 bin/scalixwizard
 bin/schematest
 bin/sloxwizard
-bin/thememain
 include/akregator/akregator_export.h
 include/akregator/article.h
 include/akregator/command.h
@@ -126,6 +131,20 @@ include/kpgp/kpgpblock.h
 include/kpgp/kpgpkey.h
 include/kpgp/kpgpui.h
 include/kpgp/libkpgp_export.h
+include/kpilot/kpilot_export.h
+include/kpilot/kpilotdevicelink.h
+include/kpilot/kpilotlink.h
+include/kpilot/kpilotlocallink.h
+include/kpilot/options.h
+include/kpilot/pilot.h
+include/kpilot/pilotDatabase.h
+include/kpilot/pilotLinkVersion.h
+include/kpilot/pilotLocalDatabase.h
+include/kpilot/pilotRecord.h
+include/kpilot/pilotSerialDatabase.h
+include/kpilot/plugin.h
+include/kpilot/pluginfactory.h
+include/kpilot/syncAction.h
 include/ksieve/error.h
 include/ksieve/lexer.h
 include/ksieve/libksieve_export.h
@@ -139,6 +158,7 @@ include/libkleopatraclient/gui/certificaterequester.h
 include/libkleopatraclient/kleopatraclient_export.h
 lib/kde4/akonadi_serializer_addressee.so
 lib/kde4/akonadi_serializer_bookmark.so
+lib/kde4/akonadi_serializer_contactgroup.so
 lib/kde4/akonadi_serializer_kcal.so
 lib/kde4/akonadi_serializer_mail.so
 lib/kde4/akregator_config_advanced.so
@@ -177,7 +197,6 @@ lib/kde4/kaddressbookpart.so
 lib/kde4/kalarm_local.so
 lib/kde4/kalarm_localdir.so
 lib/kde4/kalarm_remote.so
-lib/kde4/karmpart.so
 lib/kde4/kcal_akonadi.so
 lib/kde4/kcal_blog.so
 lib/kde4/kcal_groupdav.so
@@ -189,7 +208,9 @@ lib/kde4/kcal_resourcefeatureplan_plugin.so
 lib/kde4/kcal_scalix.so
 lib/kde4/kcal_slox.so
 lib/kde4/kcal_xmlrpc.so
+lib/kde4/kcm_akonadi.so
 lib/kde4/kcm_akonadi_resources.so
+lib/kde4/kcm_akonadi_server.so
 lib/kde4/kcm_apptsummary.so
 lib/kde4/kcm_kabconfig.so
 lib/kde4/kcm_kabcustomfields.so
@@ -201,13 +222,14 @@ lib/kde4/kcm_knode.so
 lib/kde4/kcm_kontact.so
 lib/kde4/kcm_kontactsummary.so
 lib/kde4/kcm_korganizer.so
+lib/kde4/kcm_kpilot.so
 lib/kde4/kcm_ktimetrackerconfig.so
+lib/kde4/kcm_planner.so
 lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
 lib/kde4/kio_akonadi.so
 lib/kde4/kio_groupwise.so
 lib/kde4/kio_scalix.so
-%%KITCHENSYNC%%lib/kde4/kitchensyncpart.so
 lib/kde4/kjotspart.so
 lib/kde4/kmail_bodypartformatter_application_octetstream.so
 lib/kde4/kmail_bodypartformatter_text_calendar.so
@@ -222,12 +244,13 @@ lib/kde4/knotes_xmlrpc.so
 lib/kde4/kontact_akregatorplugin.so
 lib/kde4/kontact_journalplugin.so
 lib/kde4/kontact_kaddressbookplugin.so
-lib/kde4/kontact_karmplugin.so
 lib/kde4/kontact_kjotsplugin.so
 lib/kde4/kontact_kmailplugin.so
 lib/kde4/kontact_knodeplugin.so
 lib/kde4/kontact_knotesplugin.so
 lib/kde4/kontact_korganizerplugin.so
+lib/kde4/kontact_ktimetrackerplugin.so
+lib/kde4/kontact_plannerplugin.so
 lib/kde4/kontact_specialdatesplugin.so
 lib/kde4/kontact_summaryplugin.so
 lib/kde4/kontact_todoplugin.so
@@ -239,187 +262,187 @@ lib/kde4/korg_thisdayinhistory.so
 lib/kde4/korg_yearprint.so
 lib/kde4/korganizerpart.so
 lib/kde4/kpartsdesignerplugin.so
+lib/kde4/kpilot_conduit_calendar.so
+lib/kde4/kpilot_conduit_contacts.so
+lib/kde4/kpilot_conduit_memofile.so
+lib/kde4/kpilot_conduit_time.so
+lib/kde4/kpilot_conduit_todo.so
 lib/kde4/ktexteditorkabcbridge.so
+lib/kde4/ktimetrackerpart.so
 lib/kde4/ldifvcardthumbnail.so
 lib/kde4/plugins/designer/kdepimwidgets.so
-lib/libakonadi-kabc.so
-lib/libakonadi-kabc.so.5
-lib/libakonadi-kabc.so.5.0.0
+lib/libakonadi-kabccommon.so
+lib/libakonadi-kabccommon.so.5
+lib/libakonadi-kabccommon.so.5.0.1
 lib/libakonadi-kcal.so
 lib/libakonadi-kcal.so.5
-lib/libakonadi-kcal.so.5.0.0
+lib/libakonadi-kcal.so.5.0.1
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.5
-lib/libakregatorinterfaces.so.5.0.0
-lib/libakregatorprivate.so
+lib/libakregatorinterfaces.so.5.0.1
 lib/libakregatorprivate.so.5
-lib/libakregatorprivate.so.5.0.0
+lib/libakregatorprivate.so.5.0.1
 lib/libgwsoap.so
 lib/libgwsoap.so.5
-lib/libgwsoap.so.5.0.0
+lib/libgwsoap.so.5.0.1
 lib/libimap.so
 lib/libimap.so.5
-lib/libimap.so.5.0.0
+lib/libimap.so.5.0.1
 lib/libkabc_groupdav.so
 lib/libkabc_groupdav.so.5
-lib/libkabc_groupdav.so.5.0.0
+lib/libkabc_groupdav.so.5.0.1
 lib/libkabc_slox.so
 lib/libkabc_slox.so.5
-lib/libkabc_slox.so.5.0.0
+lib/libkabc_slox.so.5.0.1
 lib/libkabc_xmlrpc.so
 lib/libkabc_xmlrpc.so.5
-lib/libkabc_xmlrpc.so.5.0.0
+lib/libkabc_xmlrpc.so.5.0.1
 lib/libkabcgroupwise.so
 lib/libkabcgroupwise.so.5
-lib/libkabcgroupwise.so.5.0.0
+lib/libkabcgroupwise.so.5.0.1
 lib/libkabckolab.so
 lib/libkabckolab.so.5
-lib/libkabckolab.so.5.0.0
+lib/libkabckolab.so.5.0.1
 lib/libkabcommon.so
 lib/libkabcommon.so.5
-lib/libkabcommon.so.5.0.0
+lib/libkabcommon.so.5.0.1
 lib/libkabcscalix.so
 lib/libkabcscalix.so.5
-lib/libkabcscalix.so.5.0.0
+lib/libkabcscalix.so.5.0.1
 lib/libkabinterfaces.so
 lib/libkabinterfaces.so.5
-lib/libkabinterfaces.so.5.0.0
-lib/libkaddressbookprivate.so
+lib/libkabinterfaces.so.5.0.1
 lib/libkaddressbookprivate.so.5
-lib/libkaddressbookprivate.so.5.0.0
+lib/libkaddressbookprivate.so.5.0.1
 lib/libkalarm_resources.so
 lib/libkalarm_resources.so.5
-lib/libkalarm_resources.so.5.0.0
+lib/libkalarm_resources.so.5.0.1
 lib/libkcal_groupdav.so
 lib/libkcal_groupdav.so.5
-lib/libkcal_groupdav.so.5.0.0
+lib/libkcal_groupdav.so.5.0.1
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.5
-lib/libkcal_resourceblog.so.5.0.0
+lib/libkcal_resourceblog.so.5.0.1
 lib/libkcal_resourcefeatureplan.so
 lib/libkcal_resourcefeatureplan.so.5
-lib/libkcal_resourcefeatureplan.so.5.0.0
+lib/libkcal_resourcefeatureplan.so.5.0.1
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.5
-lib/libkcal_resourceremote.so.5.0.0
+lib/libkcal_resourceremote.so.5.0.1
 lib/libkcal_slox.so
 lib/libkcal_slox.so.5
-lib/libkcal_slox.so.5.0.0
+lib/libkcal_slox.so.5.0.1
 lib/libkcal_xmlrpc.so
 lib/libkcal_xmlrpc.so.5
-lib/libkcal_xmlrpc.so.5.0.0
+lib/libkcal_xmlrpc.so.5.0.1
 lib/libkcalgroupwise.so
 lib/libkcalgroupwise.so.5
-lib/libkcalgroupwise.so.5.0.0
+lib/libkcalgroupwise.so.5.0.1
 lib/libkcalkolab.so
 lib/libkcalkolab.so.5
-lib/libkcalkolab.so.5.0.0
+lib/libkcalkolab.so.5.0.1
 lib/libkcalscalix.so
 lib/libkcalscalix.so.5
-lib/libkcalscalix.so.5.0.0
+lib/libkcalscalix.so.5.0.1
 lib/libkdepim.so
 lib/libkdepim.so.5
-lib/libkdepim.so.5.0.0
+lib/libkdepim.so.5.0.1
 lib/libkgroupwarebase.so
 lib/libkgroupwarebase.so.5
-lib/libkgroupwarebase.so.5.0.0
+lib/libkgroupwarebase.so.5.0.1
 lib/libkgroupwaredav.so
 lib/libkgroupwaredav.so.5
-lib/libkgroupwaredav.so.5.0.0
+lib/libkgroupwaredav.so.5.0.1
 lib/libkholidays.so
 lib/libkholidays.so.5
-lib/libkholidays.so.5.0.0
-%%KITCHENSYNC%%lib/libkitchensyncprivate.so
-%%KITCHENSYNC%%lib/libkitchensyncprivate.so.5
-%%KITCHENSYNC%%lib/libkitchensyncprivate.so.5.0.0
+lib/libkholidays.so.5.0.1
 lib/libkleo.so
 lib/libkleo.so.5
-lib/libkleo.so.5.0.0
+lib/libkleo.so.5.0.1
 lib/libkleopatraclientcore.so
-lib/libkleopatraclientcore.so.0.2.0
+lib/libkleopatraclientcore.so.0.2.1
 lib/libkleopatraclientgui.so
-lib/libkleopatraclientgui.so.0.2.0
-lib/libkmailprivate.so
+lib/libkleopatraclientgui.so.0.2.1
 lib/libkmailprivate.so.5
-lib/libkmailprivate.so.5.0.0
+lib/libkmailprivate.so.5.0.1
 lib/libknodecommon.so
 lib/libknodecommon.so.5
-lib/libknodecommon.so.5.0.0
+lib/libknodecommon.so.5.0.1
 lib/libknotes_xmlrpc.so
 lib/libknotes_xmlrpc.so.5
-lib/libknotes_xmlrpc.so.5.0.0
+lib/libknotes_xmlrpc.so.5.0.1
 lib/libknoteskolab.so
 lib/libknoteskolab.so.5
-lib/libknoteskolab.so.5.0.0
+lib/libknoteskolab.so.5.0.1
 lib/libknotesscalix.so
 lib/libknotesscalix.so.5
-lib/libknotesscalix.so.5.0.0
+lib/libknotesscalix.so.5.0.1
 lib/libkocorehelper.so
 lib/libkocorehelper.so.5
-lib/libkocorehelper.so.5.0.0
+lib/libkocorehelper.so.5.0.1
 lib/libkode.so
 lib/libkode.so.5
-lib/libkode.so.5.0.0
+lib/libkode.so.5.0.1
 lib/libkontactinterfaces.so
 lib/libkontactinterfaces.so.5
-lib/libkontactinterfaces.so.5.0.0
-lib/libkontactprivate.so
+lib/libkontactinterfaces.so.5.0.1
 lib/libkontactprivate.so.5
-lib/libkontactprivate.so.5.0.0
+lib/libkontactprivate.so.5.0.1
 lib/libkorg_stdprinting.so
 lib/libkorg_stdprinting.so.5
-lib/libkorg_stdprinting.so.5.0.0
+lib/libkorg_stdprinting.so.5.0.1
 lib/libkorganizer_calendar.so
 lib/libkorganizer_calendar.so.5
-lib/libkorganizer_calendar.so.5.0.0
+lib/libkorganizer_calendar.so.5.0.1
 lib/libkorganizer_eventviewer.so
 lib/libkorganizer_eventviewer.so.5
-lib/libkorganizer_eventviewer.so.5.0.0
+lib/libkorganizer_eventviewer.so.5.0.1
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.5
-lib/libkorganizer_interfaces.so.5.0.0
-lib/libkorganizerprivate.so
+lib/libkorganizer_interfaces.so.5.0.1
 lib/libkorganizerprivate.so.5
-lib/libkorganizerprivate.so.5.0.0
+lib/libkorganizerprivate.so.5.0.1
 lib/libkpgp.so
 lib/libkpgp.so.5
-lib/libkpgp.so.5.0.0
+lib/libkpgp.so.5.0.1
+lib/libkpilot.so
+lib/libkpilot.so.5
+lib/libkpilot.so.5.0.1
+lib/libkpilot_akonadibase.so
+lib/libkpilot_conduit_base.so
 lib/libkschema.so
 lib/libkschema.so.5
-lib/libkschema.so.5.0.0
+lib/libkschema.so.5.0.1
 lib/libkschemawidgets.so
 lib/libkschemawidgets.so.5
-lib/libkschemawidgets.so.5.0.0
+lib/libkschemawidgets.so.5.0.1
 lib/libksieve.so
 lib/libksieve.so.5
-lib/libksieve.so.5.0.0
+lib/libksieve.so.5.0.1
 lib/libkslox.so
 lib/libkslox.so.5
-lib/libkslox.so.5.0.0
+lib/libkslox.so.5.0.1
 lib/libkxmlcommon.so
 lib/libkxmlcommon.so.5
-lib/libkxmlcommon.so.5.0.0
+lib/libkxmlcommon.so.5.0.1
 lib/libmaildir.so
 lib/libmaildir.so.5
-lib/libmaildir.so.5.0.0
+lib/libmaildir.so.5.0.1
 lib/libmimelib.so
 lib/libmimelib.so.5
-lib/libmimelib.so.5.0.0
-%%KITCHENSYNC%%lib/libqopensync.so
-%%KITCHENSYNC%%lib/libqopensync.so.5
-%%KITCHENSYNC%%lib/libqopensync.so.5.0.0
+lib/libmimelib.so.5.0.1
 lib/libschema.so
 lib/libschema.so.5
-lib/libschema.so.5.0.0
+lib/libschema.so.5.0.1
 lib/libwscl.so
 lib/libwscl.so.5
-lib/libwscl.so.5.0.0
+lib/libwscl.so.5.0.1
 lib/libwsdl.so
 lib/libwsdl.so.5
-lib/libwsdl.so.5.0.0
+lib/libwsdl.so.5.0.1
 lib/strigi/strigiea_ics.so
-lib/strigi/strigiea_rfc822.so
 lib/strigi/strigiea_vcf.so
+share/akonadi/agents/distlistresource.desktop
 share/akonadi/agents/icalresource.desktop
 share/akonadi/agents/imaplibresource.desktop
 share/akonadi/agents/kabcresource.desktop
@@ -430,8 +453,10 @@ share/akonadi/agents/maildirresource.desktop
 share/akonadi/agents/mailthreaderagent.desktop
 share/akonadi/agents/nepomukcontactfeeder.desktop
 share/akonadi/agents/nepomukemailfeeder.desktop
+share/akonadi/agents/nepomuktagresource.desktop
 share/akonadi/agents/nntpresource.desktop
 share/akonadi/agents/strigifeeder.desktop
+share/akonadi/agents/vcarddirresource.desktop
 share/akonadi/agents/vcardresource.desktop
 share/applications/kde4/KMail.desktop
 share/applications/kde4/KNode.desktop
@@ -443,18 +468,19 @@ share/applications/kde4/akregator.desktop
 share/applications/kde4/groupwarewizard.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
-share/applications/kde4/karm.desktop
-%%KITCHENSYNC%%share/applications/kde4/kitchensync.desktop
 share/applications/kde4/kleopatra_import.desktop
 share/applications/kde4/kmail_view.desktop
 share/applications/kde4/knotes.desktop
 share/applications/kde4/konsolekalendar.desktop
 share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
-share/applications/kde4/ktnef.desktop
+share/applications/kde4/kpilot.desktop
+share/applications/kde4/kpilotdaemon.desktop
+share/applications/kde4/ktimetracker.desktop
 share/applications/kde4/kwsdl_compiler.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/apps/akonadiconsole/akonadiconsoleui.rc
@@ -503,7 +529,6 @@ share/apps/kaddressbook/printing/ringbinder-style.png
 share/apps/kaddressbook/vcard_xxportui.rc
 share/apps/kaddressbook/zone.tab
 share/apps/kalarm/kalarmui.rc
-share/apps/karmpart/karmui.rc
 share/apps/kconf_update/kalarm-1.2.1-general.pl
 share/apps/kconf_update/kalarm-1.9.5-defaults.pl
 share/apps/kconf_update/kalarm-2.0.2-general.pl
@@ -531,6 +556,7 @@ share/apps/kconf_update/kolab-resource.upd
 share/apps/kconf_update/korganizer.upd
 share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/apps/kconf_update/kpgp.upd
+share/apps/kconf_update/kpilot.upd
 share/apps/kconf_update/upgrade-resourcetype.pl
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
@@ -538,11 +564,6 @@ share/apps/kdepimwidgets/pics/addresseelineedit.png
 share/apps/kdepimwidgets/pics/clicklineedit.png
 share/apps/kdepimwidgets/pics/kdateedit.png
 share/apps/kdepimwidgets/pics/ktimeedit.png
-%%KITCHENSYNC%%share/apps/kitchensync/about/kitchensync.css
-%%KITCHENSYNC%%share/apps/kitchensync/about/main.html
-%%KITCHENSYNC%%share/apps/kitchensync/about/top-right-kitchensync.png
-%%KITCHENSYNC%%share/apps/kitchensync/kitchensync_part.rc
-%%KITCHENSYNC%%share/apps/kitchensync/kitchensyncui.rc
 share/apps/kjots/kjotspartui.rc
 share/apps/kjots/kjotsui.rc
 share/apps/kleopatra/kleopatra.rc
@@ -558,6 +579,23 @@ share/apps/kmail/kmail_part.rc
 share/apps/kmail/kmcomposerui.rc
 share/apps/kmail/kmmainwin.rc
 share/apps/kmail/kmreadermainwin.rc
+share/apps/kmail/pics/attachmentQuicklistClosed.png
+share/apps/kmail/pics/attachmentQuicklistOpened.png
+share/apps/kmail/pics/enterprise_bottom.png
+share/apps/kmail/pics/enterprise_bottom_left.png
+share/apps/kmail/pics/enterprise_bottom_right.png
+share/apps/kmail/pics/enterprise_icon.png
+share/apps/kmail/pics/enterprise_left.png
+share/apps/kmail/pics/enterprise_right.png
+share/apps/kmail/pics/enterprise_s_left.png
+share/apps/kmail/pics/enterprise_s_right.png
+share/apps/kmail/pics/enterprise_sbar.png
+share/apps/kmail/pics/enterprise_sp_right.png
+share/apps/kmail/pics/enterprise_sw.png
+share/apps/kmail/pics/enterprise_top.png
+share/apps/kmail/pics/enterprise_top_left.png
+share/apps/kmail/pics/enterprise_top_right.png
+share/apps/kmail/pics/enterprise_w.png
 share/apps/kmail/pics/key.png
 share/apps/kmail/pics/key_bad.png
 share/apps/kmail/pics/key_ok.png
@@ -567,8 +605,14 @@ share/apps/kmail/pics/mail-deleted.png
 share/apps/kmail/pics/mail-encrypted-full.png
 share/apps/kmail/pics/mail-encrypted-part.png
 share/apps/kmail/pics/mail-encrypted.png
+share/apps/kmail/pics/mail-horizontal-space.png
 share/apps/kmail/pics/mail-thread-ignored.png
 share/apps/kmail/pics/mail-thread-watch.png
+share/apps/kmail/pics/mail-vertical-separator-line.png
+share/apps/kmail/pics/overlay-busy-clock-1.png
+share/apps/kmail/pics/overlay-busy-clock-2.png
+share/apps/kmail/pics/overlay-busy-clock-3.png
+share/apps/kmail/pics/overlay-busy-clock-4.png
 share/apps/kmail/pics/pgp-keys.png
 share/apps/kmail/pics/quotecollapse.png
 share/apps/kmail/pics/quoteexpand.png
@@ -636,6 +680,7 @@ share/apps/kontact/ksettingsdialog/knode.setdlg
 share/apps/kontact/ksettingsdialog/knotes.setdlg
 share/apps/kontact/ksettingsdialog/korganizer.setdlg
 share/apps/kontact/ksettingsdialog/ktimetracker.setdlg
+share/apps/kontact/ksettingsdialog/planner.setdlg
 share/apps/kontact/ksettingsdialog/specialdates.setdlg
 share/apps/kontact/ksettingsdialog/summary.setdlg
 share/apps/kontactsummary/kontactsummary_part.rc
@@ -648,6 +693,7 @@ share/apps/korganizer/sounds/lightmag.wav
 share/apps/korganizer/sounds/onscreen.wav
 share/apps/korganizer/sounds/spinout.wav
 share/apps/korganizer/tips
+share/apps/kpilot/kpilotui.rc
 share/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
@@ -655,7 +701,7 @@ share/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
 share/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
-share/apps/ktimetracker/karmui.rc
+share/apps/ktimetracker/ktimetrackerui.rc
 share/apps/ktimetracker/pics/active-icon-0.xpm
 share/apps/ktimetracker/pics/active-icon-1.xpm
 share/apps/ktimetracker/pics/active-icon-2.xpm
@@ -678,7 +724,6 @@ share/apps/ktimetracker/pics/watch-4.xpm
 share/apps/ktimetracker/pics/watch-5.xpm
 share/apps/ktimetracker/pics/watch-6.xpm
 share/apps/ktimetracker/pics/watch-7.xpm
-share/apps/ktnef/ktnefui.rc
 share/apps/kwatchgnupg/kwatchgnupgui.rc
 share/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/apps/kwatchgnupg/pics/kwatchgnupg2.png
@@ -765,9 +810,12 @@ share/apps/nepomuk/ontologies/nco.desktop
 share/apps/nepomuk/ontologies/nco.trig
 share/apps/nepomuk/ontologies/nmo.desktop
 share/apps/nepomuk/ontologies/nmo.trig
+share/autostart/kabcdistlistupdater.desktop
 share/autostart/kalarm.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/akregator.kcfg
+share/config.kcfg/calendarsettings.kcfg
+share/config.kcfg/contactssettings.kcfg
 share/config.kcfg/custommimeheader.kcfg
 share/config.kcfg/customtemplates_kfg.kcfg
 share/config.kcfg/egroupware.kcfg
@@ -780,14 +828,20 @@ share/config.kcfg/knotesglobalconfig.kcfg
 share/config.kcfg/kolab.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
+share/config.kcfg/kpilot.kcfg
+share/config.kcfg/kpilotlib.kcfg
 share/config.kcfg/kxforms.kcfg
+share/config.kcfg/memofileconduit.kcfg
 share/config.kcfg/replyphrases.kcfg
 share/config.kcfg/scalix.kcfg
 share/config.kcfg/slox.kcfg
 share/config.kcfg/templatesconfiguration_kfg.kcfg
+share/config.kcfg/timeconduit.kcfg
+share/config.kcfg/todosettings.kcfg
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
 share/config/korganizer.knsrc
+share/config/kres-migratorrc
 share/config/libkleopatrarc
 share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
 share/dbus-1/interfaces/org.kde.KNotes.xml
@@ -825,6 +879,10 @@ share/doc/HTML/en/akregator/main-window4.png
 share/doc/HTML/en/akregator/quick-filter.png
 share/doc/HTML/en/akregator/rss.png
 share/doc/HTML/en/akregator/rss3.png
+share/doc/HTML/en/kabcclient/common
+share/doc/HTML/en/kabcclient/index.cache.bz2
+share/doc/HTML/en/kabcclient/index.docbook
+share/doc/HTML/en/kabcclient/man-kabcclient.1.docbook
 share/doc/HTML/en/kaddressbook/addhost.png
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
@@ -841,11 +899,15 @@ share/doc/HTML/en/kaddressbook/resourcesdlg.png
 share/doc/HTML/en/kaddressbook/vieweditdlg.png
 share/doc/HTML/en/kalarm/alarmmessage.png
 share/doc/HTML/en/kalarm/common
+share/doc/HTML/en/kalarm/editwindow-simple.png
 share/doc/HTML/en/kalarm/editwindow.png
 share/doc/HTML/en/kalarm/index.cache.bz2
 share/doc/HTML/en/kalarm/index.docbook
 share/doc/HTML/en/kalarm/mainwindow.png
 share/doc/HTML/en/kalarm/spinbox.png
+share/doc/HTML/en/kioslave/news/common
+share/doc/HTML/en/kioslave/news/index.cache.bz2
+share/doc/HTML/en/kioslave/news/index.docbook
 share/doc/HTML/en/kjots/common
 share/doc/HTML/en/kjots/index.cache.bz2
 share/doc/HTML/en/kjots/index.docbook
@@ -993,6 +1055,41 @@ share/doc/HTML/en/korganizer/outlook-to-vcalendar.docbook
 share/doc/HTML/en/korganizer/plugins-chapter.docbook
 share/doc/HTML/en/korganizer/remotefile-resource.png
 share/doc/HTML/en/korganizer/todo-general.png
+share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
+share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-mal.png
+share/doc/HTML/en/kpilot/conduit-palmdoc.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
+share/doc/HTML/en/kpilot/conduit-sysinfo.png
+share/doc/HTML/en/kpilot/conduit-vcal.png
+share/doc/HTML/en/kpilot/configuration.docbook
+share/doc/HTML/en/kpilot/daemon-menu.png
+share/doc/HTML/en/kpilot/db-app.png
+share/doc/HTML/en/kpilot/faq.docbook
+share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
+share/doc/HTML/en/kpilot/index.docbook
+share/doc/HTML/en/kpilot/main-app.png
+share/doc/HTML/en/kpilot/memo-app.png
+share/doc/HTML/en/kpilot/setup-address.png
+share/doc/HTML/en/kpilot/setup-conduit.png
+share/doc/HTML/en/kpilot/setup-dbspecial.png
+share/doc/HTML/en/kpilot/setup-general.png
+share/doc/HTML/en/kpilot/setup-hotsync.png
+share/doc/HTML/en/kpilot/setup-items.png
+share/doc/HTML/en/kpilot/setup-startup-exit.png
+share/doc/HTML/en/kpilot/setup-tabs.png
+share/doc/HTML/en/kpilot/setup-viewer.png
+share/doc/HTML/en/kpilot/sidebar.png
+share/doc/HTML/en/kpilot/sync.docbook
+share/doc/HTML/en/kpilot/todo-app.png
+share/doc/HTML/en/kpilot/toolbar_backup.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/doc/HTML/en/kpilot/usage.docbook
+share/doc/HTML/en/kpilot/wizard-conduits.png
+share/doc/HTML/en/kpilot/wizard-connection.png
+share/doc/HTML/en/kpilot/wizard-general.png
 share/doc/HTML/en/ktimetracker/clipboard-history.png
 share/doc/HTML/en/ktimetracker/common
 share/doc/HTML/en/ktimetracker/copy-this-task.png
@@ -1003,9 +1100,6 @@ share/doc/HTML/en/ktimetracker/index.cache.bz2
 share/doc/HTML/en/ktimetracker/index.docbook
 share/doc/HTML/en/ktimetracker/karm.png
 share/doc/HTML/en/ktimetracker/systray.png
-share/doc/HTML/en/kwsdl_compiler/common
-share/doc/HTML/en/kwsdl_compiler/index.cache.bz2
-share/doc/HTML/en/kwsdl_compiler/index.docbook
 share/icons/hicolor/128x128/apps/akregator.png
 share/icons/hicolor/128x128/apps/kaddressbook.png
 share/icons/hicolor/128x128/apps/kjots.png
@@ -1016,12 +1110,18 @@ share/icons/hicolor/128x128/apps/knotes.png
 share/icons/hicolor/128x128/apps/kontact.png
 share/icons/hicolor/128x128/apps/korganizer.png
 share/icons/hicolor/128x128/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/16x16/actions/sync-start.png
+share/icons/hicolor/16x16/actions/kpilot_backup.png
+share/icons/hicolor/16x16/actions/kpilot_busysync.png
+share/icons/hicolor/16x16/actions/kpilot_fullsync.png
+share/icons/hicolor/16x16/actions/kpilot_hhtopc.png
+share/icons/hicolor/16x16/actions/kpilot_hotsync.png
+share/icons/hicolor/16x16/actions/kpilot_nosync.png
+share/icons/hicolor/16x16/actions/kpilot_reset.png
+share/icons/hicolor/16x16/actions/kpilot_restore.png
 share/icons/hicolor/16x16/apps/akregator.png
 share/icons/hicolor/16x16/apps/akregator_empty.png
 share/icons/hicolor/16x16/apps/kaddressbook.png
 share/icons/hicolor/16x16/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/16x16/apps/kitchensync.png
 share/icons/hicolor/16x16/apps/kjots.png
 share/icons/hicolor/16x16/apps/kmail.png
 share/icons/hicolor/16x16/apps/knode.png
@@ -1029,23 +1129,34 @@ share/icons/hicolor/16x16/apps/knode2.png
 share/icons/hicolor/16x16/apps/knotes.png
 share/icons/hicolor/16x16/apps/kontact.png
 share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/16x16/apps/kpilot.png
+share/icons/hicolor/16x16/apps/kpilotDaemon.png
 share/icons/hicolor/16x16/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/22x22/actions/sync-start.png
+share/icons/hicolor/22x22/actions/kpilot_backup.png
+share/icons/hicolor/22x22/actions/kpilot_busysync.png
+share/icons/hicolor/22x22/actions/kpilot_fullsync.png
+share/icons/hicolor/22x22/actions/kpilot_hhtopc.png
+share/icons/hicolor/22x22/actions/kpilot_hotsync.png
+share/icons/hicolor/22x22/actions/kpilot_nosync.png
+share/icons/hicolor/22x22/actions/kpilot_reset.png
+share/icons/hicolor/22x22/actions/kpilot_restore.png
 share/icons/hicolor/22x22/apps/akregator.png
 share/icons/hicolor/22x22/apps/kaddressbook.png
-share/icons/hicolor/22x22/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/22x22/apps/kitchensync.png
 share/icons/hicolor/22x22/apps/kjots.png
 share/icons/hicolor/22x22/apps/kmail.png
 share/icons/hicolor/22x22/apps/knotes.png
 share/icons/hicolor/22x22/apps/kontact.png
 share/icons/hicolor/22x22/apps/korganizer.png
+share/icons/hicolor/22x22/apps/kpilot.png
+share/icons/hicolor/22x22/apps/kpilotDaemon.png
 share/icons/hicolor/22x22/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/32x32/actions/sync-start.png
+share/icons/hicolor/32x32/actions/kpilot_fullsync.png
+share/icons/hicolor/32x32/actions/kpilot_hhtopc.png
+share/icons/hicolor/32x32/actions/kpilot_hotsync.png
+share/icons/hicolor/32x32/actions/kpilot_reset.png
 share/icons/hicolor/32x32/apps/akregator.png
 share/icons/hicolor/32x32/apps/kaddressbook.png
 share/icons/hicolor/32x32/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/32x32/apps/kitchensync.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kmail.png
 share/icons/hicolor/32x32/apps/knode.png
@@ -1053,12 +1164,16 @@ share/icons/hicolor/32x32/apps/knode2.png
 share/icons/hicolor/32x32/apps/knotes.png
 share/icons/hicolor/32x32/apps/kontact.png
 share/icons/hicolor/32x32/apps/korganizer.png
+share/icons/hicolor/32x32/apps/kpilot.png
+share/icons/hicolor/32x32/apps/kpilotDaemon.png
 share/icons/hicolor/32x32/apps/ktimetracker.png
-%%KITCHENSYNC%%share/icons/hicolor/48x48/actions/sync-start.png
+share/icons/hicolor/48x48/actions/kpilot_fullsync.png
+share/icons/hicolor/48x48/actions/kpilot_hhtopc.png
+share/icons/hicolor/48x48/actions/kpilot_hotsync.png
+share/icons/hicolor/48x48/actions/kpilot_reset.png
 share/icons/hicolor/48x48/apps/akregator.png
 share/icons/hicolor/48x48/apps/kaddressbook.png
 share/icons/hicolor/48x48/apps/kalarm.png
-%%KITCHENSYNC%%share/icons/hicolor/48x48/apps/kitchensync.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kmail.png
 share/icons/hicolor/48x48/apps/knode.png
@@ -1066,8 +1181,16 @@ share/icons/hicolor/48x48/apps/knode2.png
 share/icons/hicolor/48x48/apps/knotes.png
 share/icons/hicolor/48x48/apps/kontact.png
 share/icons/hicolor/48x48/apps/korganizer.png
+share/icons/hicolor/48x48/apps/kpilot.png
+share/icons/hicolor/48x48/apps/kpilotDaemon.png
 share/icons/hicolor/48x48/apps/ktimetracker.png
-share/icons/hicolor/48x48/apps/ktnef.png
+share/icons/hicolor/64x64/actions/kpilot_address.png
+share/icons/hicolor/64x64/actions/kpilot_bhotsync.png
+share/icons/hicolor/64x64/actions/kpilot_calendar.png
+share/icons/hicolor/64x64/actions/kpilot_db.png
+share/icons/hicolor/64x64/actions/kpilot_fileinstaller.png
+share/icons/hicolor/64x64/actions/kpilot_knotes.png
+share/icons/hicolor/64x64/actions/kpilot_todo.png
 share/icons/hicolor/64x64/apps/akregator.png
 share/icons/hicolor/64x64/apps/kaddressbook.png
 share/icons/hicolor/64x64/apps/kjots.png
@@ -1083,6 +1206,7 @@ share/icons/hicolor/scalable/apps/kaddressbook.svgz
 share/icons/hicolor/scalable/apps/kjots.svgz
 share/icons/hicolor/scalable/apps/kmail.svgz
 share/icons/hicolor/scalable/apps/korganizer.svgz
+share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/apps/kleopatra.png
 share/icons/oxygen/16x16/actions/document-new-from-template.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
@@ -1090,8 +1214,8 @@ share/icons/oxygen/16x16/actions/ldap_lookup.png
 share/icons/oxygen/16x16/actions/mail-forwarded-replied.png
 share/icons/oxygen/16x16/actions/mail-forwarded.png
 share/icons/oxygen/16x16/actions/mail-reply-custom.png
+share/icons/oxygen/16x16/actions/mail-signed-fully.png
 share/icons/oxygen/16x16/actions/mail-signed-part.png
-share/icons/oxygen/16x16/actions/mail-signed-verified.png
 share/icons/oxygen/16x16/actions/mail-signed.png
 share/icons/oxygen/16x16/actions/meeting-attending-tentative.png
 share/icons/oxygen/16x16/actions/meeting-attending.png
@@ -1115,6 +1239,7 @@ share/icons/oxygen/22x22/actions/button_more.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/document-new-from-template.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
+share/icons/oxygen/22x22/actions/kalarm.png
 share/icons/oxygen/22x22/actions/mail-reply-custom.png
 share/icons/oxygen/22x22/actions/meeting-attending-tentative.png
 share/icons/oxygen/22x22/actions/meeting-attending.png
@@ -1154,14 +1279,16 @@ share/icons/oxygen/48x48/apps/kleopatra.png
 share/icons/oxygen/48x48/apps/kmailcvt.png
 share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/48x48/status/mail-tagged.png
+share/icons/oxygen/64x64/apps/kalarm.png
 share/icons/oxygen/64x64/apps/kleopatra.png
 share/icons/oxygen/scalable/actions/edit-delete-page.svgz
 share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz
 share/icons/oxygen/scalable/actions/mail-forwarded.svgz
 share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
+share/icons/oxygen/scalable/actions/mail-signed-fully.svgz
 share/icons/oxygen/scalable/actions/mail-signed-part.svgz
-share/icons/oxygen/scalable/actions/mail-signed-verified.svgz
 share/icons/oxygen/scalable/actions/mail-signed.svgz
+share/icons/oxygen/scalable/apps/kalarm.svgz
 share/icons/oxygen/scalable/apps/kleopatra.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
 share/icons/oxygen/scalable/status/mail-tagged.svgz
@@ -1209,11 +1336,14 @@ share/kde4/services/kaddressbook/smsprotocol.desktop
 share/kde4/services/kaddressbook/tableview.desktop
 share/kde4/services/kaddressbook/vcard_xxport.desktop
 share/kde4/services/kaddressbook/yahooprotocol.desktop
-share/kde4/services/karm_part.desktop
+share/kde4/services/kaddressbookpart.desktop
+share/kde4/services/kcm_akonadi.desktop
 share/kde4/services/kcm_akonadi_resources.desktop
+share/kde4/services/kcm_akonadi_server.desktop
 share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
+share/kde4/services/kcmplanner.desktop
 share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
 share/kde4/services/kjotspart.desktop
@@ -1248,6 +1378,7 @@ share/kde4/services/kontact/knodeplugin.desktop
 share/kde4/services/kontact/knotesplugin.desktop
 share/kde4/services/kontact/korganizerplugin.desktop
 share/kde4/services/kontact/ktimetracker_plugin.desktop
+share/kde4/services/kontact/plannerplugin.desktop
 share/kde4/services/kontact/specialdatesplugin.desktop
 share/kde4/services/kontact/summaryplugin.desktop
 share/kde4/services/kontact/todoplugin.desktop
@@ -1266,6 +1397,10 @@ share/kde4/services/korganizer_configmain.desktop
 share/kde4/services/korganizer_configplugins.desktop
 share/kde4/services/korganizer_configtime.desktop
 share/kde4/services/korganizer_configviews.desktop
+share/kde4/services/kpilot-conduit-calendar.desktop
+share/kde4/services/kpilot-conduit-contacts.desktop
+share/kde4/services/kpilot-conduit-todo.desktop
+share/kde4/services/kpilot_config.desktop
 share/kde4/services/kresources/alarms/local.desktop
 share/kde4/services/kresources/alarms/localdir.desktop
 share/kde4/services/kresources/alarms/remote.desktop
@@ -1298,9 +1433,12 @@ share/kde4/services/kresources/knotes/local.desktop
 share/kde4/services/kresources/knotes/scalix.desktop
 share/kde4/services/kresources/knotes_manager.desktop
 share/kde4/services/ktimetrackerconfig.desktop
+share/kde4/services/ktimetrackerpart.desktop
 share/kde4/services/ldifvcardthumbnail.desktop
+share/kde4/services/memofile-conduit.desktop
 share/kde4/services/scalix.protocol
 share/kde4/services/scalixs.protocol
+share/kde4/services/time_conduit.desktop
 share/kde4/services/webcal.protocol
 share/kde4/servicetypes/akregator_plugin.desktop
 share/kde4/servicetypes/calendardecoration.desktop
@@ -1317,13 +1455,14 @@ share/kde4/servicetypes/kaddressbookimprotocol.desktop
 share/kde4/servicetypes/kontactplugin.desktop
 share/kde4/servicetypes/korganizerpart.desktop
 share/kde4/servicetypes/korgprintplugin.desktop
+share/kde4/servicetypes/kpilotconduit.desktop
 @dirrm share/kde4/services/kresources/knotes
 @dirrm share/kde4/services/kresources/alarms
 @dirrm share/kde4/services/korganizer
 @dirrm share/kde4/services/kontact
 @dirrm share/kde4/services/kaddressbook
-@dirrm share/doc/HTML/en/kwsdl_compiler
 @dirrm share/doc/HTML/en/ktimetracker
+@dirrm share/doc/HTML/en/kpilot
 @dirrm share/doc/HTML/en/korganizer
 @dirrm share/doc/HTML/en/kontact
 @dirrm share/doc/HTML/en/konsolekalendar
@@ -1332,12 +1471,11 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en/kleopatra
 @dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kioslave/news
 @dirrm share/doc/HTML/en/kalarm
 @dirrm share/doc/HTML/en/kaddressbook
+@dirrm share/doc/HTML/en/kabcclient
 @dirrm share/doc/HTML/en/akregator
-@dirrmtry share/autostart
-@dirrmtry share/apps/nepomuk/ontologies
-@dirrmtry share/apps/nepomuk
 @dirrm share/apps/libkleopatra/pics
 @dirrm share/apps/libkleopatra
 @dirrm share/apps/libkholidays
@@ -1346,7 +1484,6 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/kxforms
 @dirrm share/apps/kwatchgnupg/pics
 @dirrm share/apps/kwatchgnupg
-@dirrm share/apps/ktnef
 @dirrm share/apps/ktimetracker/pics
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable/actions
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable
@@ -1365,6 +1502,7 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/ktimetracker/icons/oxygen
 @dirrm share/apps/ktimetracker/icons
 @dirrm share/apps/ktimetracker
+@dirrm share/apps/kpilot
 @dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer
 @dirrm share/apps/korgac/icons/oxygen/22x22/actions
@@ -1394,12 +1532,8 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/kleopatra/pics
 @dirrm share/apps/kleopatra
 @dirrm share/apps/kjots
-%%KITCHENSYNC%%@dirrm share/apps/kitchensync/about
-%%KITCHENSYNC%%@dirrm share/apps/kitchensync
 @dirrm share/apps/kdepimwidgets/pics
 @dirrm share/apps/kdepimwidgets
-@dirrmtry share/apps/kconf_update
-@dirrm share/apps/karmpart
 @dirrm share/apps/kalarm
 @dirrm share/apps/kaddressbook/printing
 @dirrm share/apps/kaddressbook/pics
@@ -1409,24 +1543,21 @@ share/kde4/servicetypes/korgprintplugin.desktop
 @dirrm share/apps/kaddressbook/icons
 @dirrm share/apps/kaddressbook/csv-templates
 @dirrm share/apps/kaddressbook
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
 @dirrm share/apps/akregator_onlinesync_plugin
-@dirrm share/apps/akregator/pics
+@dirrmtry share/apps/akregator/pics
 @dirrm share/apps/akregator/about
-@dirrm share/apps/akregator
+@dirrmtry share/apps/akregator
 @dirrm share/apps/akonadiconsole
 @dirrm share/apps/akonadi/plugins/serializer
 @dirrm share/apps/akonadi/plugins
 @dirrm share/apps/akonadi
 @dirrm share/akonadi/agents
 @dirrm share/akonadi
-@dirrmtry lib/strigi
-@dirrmtry lib/kde4/plugins/designer
 @dirrm include/libkleopatraclient/gui
 @dirrm include/libkleopatraclient/core
 @dirrm include/libkleopatraclient
 @dirrm include/ksieve
+@dirrm include/kpilot
 @dirrm include/kpgp
 @dirrm include/kmail/interfaces
 @dirrm include/kmail
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index f9b569a3afef..f50691491554 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -16,7 +16,8 @@ COMMENT=	Libraries for KDE-PIM applications
 
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_python:${PORTSDIR}/devel/boost-python
+		boost_python:${PORTSDIR}/devel/boost-python \
+		ical.42:${PORTSDIR}/devel/libical
 
 USE_KDE4=	kdelibs akonadi kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
@@ -35,5 +36,7 @@ PLIST_SUB+=	WITH_PTH='@comment '
 
 post-extract:
 	${MKDIR} ${WRKSRC}
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/../cmake/modules/*.cmake
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 351dcf41822c..978a0c7565b7 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.1.4.tar.bz2) = 9546430309b1f34707bffdceec0fbc4b
-SHA256 (KDE/kdepimlibs-4.1.4.tar.bz2) = 4aca66ce34a6e944a4707ff06b6c950c096d9b9383d46961b8be1d0a93826d7e
-SIZE (KDE/kdepimlibs-4.1.4.tar.bz2) = 1891181
+MD5 (KDE/kdepimlibs-4.2.0.tar.bz2) = 8a91677e2dca7d4db26b33c78e239e5e
+SHA256 (KDE/kdepimlibs-4.2.0.tar.bz2) = e6a6c5c1eb69141a6925b182e94704cda37ef48eb488bb71dc224bc00583b254
+SIZE (KDE/kdepimlibs-4.2.0.tar.bz2) = 1589202
diff --git a/deskutils/kdepimlibs4/files/patch-akonadi-tests-testrunner-setup.cpp b/deskutils/kdepimlibs4/files/patch-akonadi-tests-testrunner-setup.cpp
new file mode 100644
index 000000000000..958847c15879
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-akonadi-tests-testrunner-setup.cpp
@@ -0,0 +1,16 @@
+--- ../akonadi/tests/testrunner/setup.cpp.orig	2009-01-31 17:51:35.000000000 +0100
++++ ../akonadi/tests/testrunner/setup.cpp	2009-01-31 20:19:24.000000000 +0100
+@@ -50,9 +50,13 @@
+ 
+   foreach(const QString& s, environment.keys()) {
+     if (s != "HOME") {
++#if defined(Q_OS_FREEBSD) && __FreeBSD_version < 700038
++      unsetenv( s.toAscii() );
++#else
+       if ( !unsetenv( s.toAscii() )) {
+         return false;
+       }
++#endif
+     }
+   }
+ 
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index af9dc4d46d7b..faa899b0ccd5 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -6,6 +6,7 @@ include/akonadi/agentinstancemodel.h
 include/akonadi/agentinstancewidget.h
 include/akonadi/agentmanager.h
 include/akonadi/agenttype.h
+include/akonadi/agenttypedialog.h
 include/akonadi/agenttypemodel.h
 include/akonadi/agenttypewidget.h
 include/akonadi/akonadi_export.h
@@ -30,6 +31,7 @@ include/akonadi/collectionstatisticsmodel.h
 include/akonadi/collectionview.h
 include/akonadi/control.h
 include/akonadi/entity.h
+include/akonadi/entitydisplayattribute.h
 include/akonadi/item.h
 include/akonadi/itemcopyjob.h
 include/akonadi/itemcreatejob.h
@@ -45,21 +47,25 @@ include/akonadi/itemserializerplugin.h
 include/akonadi/itemsync.h
 include/akonadi/itemview.h
 include/akonadi/job.h
+include/akonadi/kabc/akonadi-kabc_export.h
+include/akonadi/kabc/contactparts.h
 include/akonadi/kmime/akonadi-kmime_export.h
 include/akonadi/kmime/messagemodel.h
 include/akonadi/kmime/messageparts.h
 include/akonadi/kmime/messagethreaderproxymodel.h
 include/akonadi/kmime/messagethreadingattribute.h
+include/akonadi/linkjob.h
 include/akonadi/monitor.h
 include/akonadi/private/collectionpathresolver_p.h
 include/akonadi/resourcebase.h
 include/akonadi/searchcreatejob.h
+include/akonadi/servermanager.h
 include/akonadi/session.h
 include/akonadi/standardactionmanager.h
 include/akonadi/transactionjobs.h
 include/akonadi/transactionsequence.h
+include/akonadi/unlinkjob.h
 include/gpgme++/context.h
-include/gpgme++/gpgadduserideditinteractor.h
 include/gpgme++/data.h
 include/gpgme++/decryptionresult.h
 include/gpgme++/editinteractor.h
@@ -69,6 +75,7 @@ include/gpgme++/error.h
 include/gpgme++/eventloopinteractor.h
 include/gpgme++/exception.h
 include/gpgme++/global.h
+include/gpgme++/gpgadduserideditinteractor.h
 include/gpgme++/gpgme++_export.h
 include/gpgme++/gpgmefw.h
 include/gpgme++/gpgsetexpirytimeeditinteractor.h
@@ -326,6 +333,10 @@ include/syndication/specificitem.h
 include/syndication/specificitemvisitor.h
 include/syndication/syndication.h
 include/syndication/tools.h
+lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
+lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
+lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfig.cmake
+lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfigVersion.cmake
 lib/gpgmepp/GpgmeppConfig.cmake
 lib/gpgmepp/GpgmeppLibraryDepends.cmake
 lib/kde4/kabc_directory.so
@@ -344,12 +355,18 @@ lib/kde4/kio_nntp.so
 lib/kde4/kio_pop3.so
 lib/kde4/kio_sieve.so
 lib/kde4/kio_smtp.so
+lib/libakonadi-kabc.so
+lib/libakonadi-kabc.so.5
+lib/libakonadi-kabc.so.5.0.1
 lib/libakonadi-kde.so
 lib/libakonadi-kde.so.5
-lib/libakonadi-kde.so.5.0.0
+lib/libakonadi-kde.so.5.0.1
 lib/libakonadi-kmime.so
 lib/libakonadi-kmime.so.5
-lib/libakonadi-kmime.so.5.0.0
+lib/libakonadi-kmime.so.5.0.1
+%%WITH_PTH%%lib/libgpgme++-pth.so
+%%WITH_PTH%%lib/libgpgme++-pth.so.2
+%%WITH_PTH%%lib/libgpgme++-pth.so.2.0.2
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
 lib/libgpgme++-pthread.so.2.0.2
@@ -358,49 +375,49 @@ lib/libgpgme++.so.2
 lib/libgpgme++.so.2.0.2
 lib/libkabc.so
 lib/libkabc.so.5
-lib/libkabc.so.5.0.0
+lib/libkabc.so.5.0.1
 lib/libkabc_file_core.so
 lib/libkabc_file_core.so.5
-lib/libkabc_file_core.so.5.0.0
+lib/libkabc_file_core.so.5.0.1
 lib/libkblog.so
 lib/libkblog.so.5
-lib/libkblog.so.5.0.0
+lib/libkblog.so.5.0.1
 lib/libkcal.so
 lib/libkcal.so.5
-lib/libkcal.so.5.0.0
+lib/libkcal.so.5.0.1
 lib/libkimap.so
 lib/libkimap.so.5
-lib/libkimap.so.5.0.0
+lib/libkimap.so.5.0.1
 lib/libkldap.so
 lib/libkldap.so.5
-lib/libkldap.so.5.0.0
+lib/libkldap.so.5.0.1
 lib/libkmime.so
 lib/libkmime.so.5
-lib/libkmime.so.5.0.0
+lib/libkmime.so.5.0.1
 lib/libkpimidentities.so
 lib/libkpimidentities.so.5
-lib/libkpimidentities.so.5.0.0
+lib/libkpimidentities.so.5.0.1
 lib/libkpimutils.so
 lib/libkpimutils.so.5
-lib/libkpimutils.so.5.0.0
+lib/libkpimutils.so.5.0.1
 lib/libkresources.so
 lib/libkresources.so.5
-lib/libkresources.so.5.0.0
+lib/libkresources.so.5.0.1
 lib/libktnef.so
 lib/libktnef.so.5
-lib/libktnef.so.5.0.0
+lib/libktnef.so.5.0.1
 lib/libkxmlrpcclient.so
 lib/libkxmlrpcclient.so.5
-lib/libkxmlrpcclient.so.5.0.0
+lib/libkxmlrpcclient.so.5.0.1
 lib/libmailtransport.so
 lib/libmailtransport.so.5
-lib/libmailtransport.so.5.0.0
+lib/libmailtransport.so.5.0.1
 lib/libqgpgme.so
 lib/libqgpgme.so.1
 lib/libqgpgme.so.1.0.1
 lib/libsyndication.so
 lib/libsyndication.so.5
-lib/libsyndication.so.5.0.0
+lib/libsyndication.so.5.0.1
 share/apps/akonadi-kde/kcfg2dbus.xsl
 share/apps/cmake/modules/CheckTimezone.cmake
 share/apps/cmake/modules/FindAkonadi.cmake
@@ -413,412 +430,27 @@ share/apps/kabc/countrytransl.map
 share/apps/kabc/formats/binary.desktop
 share/apps/kconf_update/mailtransports.upd
 share/apps/kconf_update/migrate-transports.pl
-share/apps/libical/zoneinfo/Africa/Abidjan.ics
-share/apps/libical/zoneinfo/Africa/Accra.ics
-share/apps/libical/zoneinfo/Africa/Addis_Ababa.ics
-share/apps/libical/zoneinfo/Africa/Algiers.ics
-share/apps/libical/zoneinfo/Africa/Asmara.ics
-share/apps/libical/zoneinfo/Africa/Bamako.ics
-share/apps/libical/zoneinfo/Africa/Bangui.ics
-share/apps/libical/zoneinfo/Africa/Banjul.ics
-share/apps/libical/zoneinfo/Africa/Bissau.ics
-share/apps/libical/zoneinfo/Africa/Blantyre.ics
-share/apps/libical/zoneinfo/Africa/Brazzaville.ics
-share/apps/libical/zoneinfo/Africa/Bujumbura.ics
-share/apps/libical/zoneinfo/Africa/Cairo.ics
-share/apps/libical/zoneinfo/Africa/Casablanca.ics
-share/apps/libical/zoneinfo/Africa/Ceuta.ics
-share/apps/libical/zoneinfo/Africa/Conakry.ics
-share/apps/libical/zoneinfo/Africa/Dakar.ics
-share/apps/libical/zoneinfo/Africa/Dar_es_Salaam.ics
-share/apps/libical/zoneinfo/Africa/Djibouti.ics
-share/apps/libical/zoneinfo/Africa/Douala.ics
-share/apps/libical/zoneinfo/Africa/El_Aaiun.ics
-share/apps/libical/zoneinfo/Africa/Freetown.ics
-share/apps/libical/zoneinfo/Africa/Gaborone.ics
-share/apps/libical/zoneinfo/Africa/Harare.ics
-share/apps/libical/zoneinfo/Africa/Johannesburg.ics
-share/apps/libical/zoneinfo/Africa/Kampala.ics
-share/apps/libical/zoneinfo/Africa/Khartoum.ics
-share/apps/libical/zoneinfo/Africa/Kigali.ics
-share/apps/libical/zoneinfo/Africa/Kinshasa.ics
-share/apps/libical/zoneinfo/Africa/Lagos.ics
-share/apps/libical/zoneinfo/Africa/Libreville.ics
-share/apps/libical/zoneinfo/Africa/Lome.ics
-share/apps/libical/zoneinfo/Africa/Luanda.ics
-share/apps/libical/zoneinfo/Africa/Lubumbashi.ics
-share/apps/libical/zoneinfo/Africa/Lusaka.ics
-share/apps/libical/zoneinfo/Africa/Malabo.ics
-share/apps/libical/zoneinfo/Africa/Maputo.ics
-share/apps/libical/zoneinfo/Africa/Maseru.ics
-share/apps/libical/zoneinfo/Africa/Mbabane.ics
-share/apps/libical/zoneinfo/Africa/Mogadishu.ics
-share/apps/libical/zoneinfo/Africa/Monrovia.ics
-share/apps/libical/zoneinfo/Africa/Nairobi.ics
-share/apps/libical/zoneinfo/Africa/Ndjamena.ics
-share/apps/libical/zoneinfo/Africa/Niamey.ics
-share/apps/libical/zoneinfo/Africa/Nouakchott.ics
-share/apps/libical/zoneinfo/Africa/Ouagadougou.ics
-share/apps/libical/zoneinfo/Africa/Porto-Novo.ics
-share/apps/libical/zoneinfo/Africa/Sao_Tome.ics
-share/apps/libical/zoneinfo/Africa/Tripoli.ics
-share/apps/libical/zoneinfo/Africa/Tunis.ics
-share/apps/libical/zoneinfo/Africa/Windhoek.ics
-share/apps/libical/zoneinfo/America/Adak.ics
-share/apps/libical/zoneinfo/America/Anchorage.ics
-share/apps/libical/zoneinfo/America/Anguilla.ics
-share/apps/libical/zoneinfo/America/Antigua.ics
-share/apps/libical/zoneinfo/America/Araguaina.ics
-share/apps/libical/zoneinfo/America/Argentina/Buenos_Aires.ics
-share/apps/libical/zoneinfo/America/Argentina/Catamarca.ics
-share/apps/libical/zoneinfo/America/Argentina/Cordoba.ics
-share/apps/libical/zoneinfo/America/Argentina/Jujuy.ics
-share/apps/libical/zoneinfo/America/Argentina/La_Rioja.ics
-share/apps/libical/zoneinfo/America/Argentina/Mendoza.ics
-share/apps/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics
-share/apps/libical/zoneinfo/America/Argentina/San_Juan.ics
-share/apps/libical/zoneinfo/America/Argentina/San_Luis.ics
-share/apps/libical/zoneinfo/America/Argentina/Tucuman.ics
-share/apps/libical/zoneinfo/America/Argentina/Ushuaia.ics
-share/apps/libical/zoneinfo/America/Aruba.ics
-share/apps/libical/zoneinfo/America/Asuncion.ics
-share/apps/libical/zoneinfo/America/Atikokan.ics
-share/apps/libical/zoneinfo/America/Bahia.ics
-share/apps/libical/zoneinfo/America/Barbados.ics
-share/apps/libical/zoneinfo/America/Belem.ics
-share/apps/libical/zoneinfo/America/Belize.ics
-share/apps/libical/zoneinfo/America/Blanc-Sablon.ics
-share/apps/libical/zoneinfo/America/Boa_Vista.ics
-share/apps/libical/zoneinfo/America/Bogota.ics
-share/apps/libical/zoneinfo/America/Boise.ics
-share/apps/libical/zoneinfo/America/Cambridge_Bay.ics
-share/apps/libical/zoneinfo/America/Campo_Grande.ics
-share/apps/libical/zoneinfo/America/Cancun.ics
-share/apps/libical/zoneinfo/America/Caracas.ics
-share/apps/libical/zoneinfo/America/Cayenne.ics
-share/apps/libical/zoneinfo/America/Cayman.ics
-share/apps/libical/zoneinfo/America/Chicago.ics
-share/apps/libical/zoneinfo/America/Chihuahua.ics
-share/apps/libical/zoneinfo/America/Costa_Rica.ics
-share/apps/libical/zoneinfo/America/Cuiaba.ics
-share/apps/libical/zoneinfo/America/Curacao.ics
-share/apps/libical/zoneinfo/America/Danmarkshavn.ics
-share/apps/libical/zoneinfo/America/Dawson.ics
-share/apps/libical/zoneinfo/America/Dawson_Creek.ics
-share/apps/libical/zoneinfo/America/Denver.ics
-share/apps/libical/zoneinfo/America/Detroit.ics
-share/apps/libical/zoneinfo/America/Dominica.ics
-share/apps/libical/zoneinfo/America/Edmonton.ics
-share/apps/libical/zoneinfo/America/Eirunepe.ics
-share/apps/libical/zoneinfo/America/El_Salvador.ics
-share/apps/libical/zoneinfo/America/Fortaleza.ics
-share/apps/libical/zoneinfo/America/Glace_Bay.ics
-share/apps/libical/zoneinfo/America/Godthab.ics
-share/apps/libical/zoneinfo/America/Goose_Bay.ics
-share/apps/libical/zoneinfo/America/Grand_Turk.ics
-share/apps/libical/zoneinfo/America/Grenada.ics
-share/apps/libical/zoneinfo/America/Guadeloupe.ics
-share/apps/libical/zoneinfo/America/Guatemala.ics
-share/apps/libical/zoneinfo/America/Guayaquil.ics
-share/apps/libical/zoneinfo/America/Guyana.ics
-share/apps/libical/zoneinfo/America/Halifax.ics
-share/apps/libical/zoneinfo/America/Havana.ics
-share/apps/libical/zoneinfo/America/Hermosillo.ics
-share/apps/libical/zoneinfo/America/Indiana/Indianapolis.ics
-share/apps/libical/zoneinfo/America/Indiana/Knox.ics
-share/apps/libical/zoneinfo/America/Indiana/Marengo.ics
-share/apps/libical/zoneinfo/America/Indiana/Petersburg.ics
-share/apps/libical/zoneinfo/America/Indiana/Tell_City.ics
-share/apps/libical/zoneinfo/America/Indiana/Vevay.ics
-share/apps/libical/zoneinfo/America/Indiana/Vincennes.ics
-share/apps/libical/zoneinfo/America/Indiana/Winamac.ics
-share/apps/libical/zoneinfo/America/Inuvik.ics
-share/apps/libical/zoneinfo/America/Iqaluit.ics
-share/apps/libical/zoneinfo/America/Jamaica.ics
-share/apps/libical/zoneinfo/America/Juneau.ics
-share/apps/libical/zoneinfo/America/Kentucky/Louisville.ics
-share/apps/libical/zoneinfo/America/Kentucky/Monticello.ics
-share/apps/libical/zoneinfo/America/La_Paz.ics
-share/apps/libical/zoneinfo/America/Lima.ics
-share/apps/libical/zoneinfo/America/Los_Angeles.ics
-share/apps/libical/zoneinfo/America/Maceio.ics
-share/apps/libical/zoneinfo/America/Managua.ics
-share/apps/libical/zoneinfo/America/Manaus.ics
-share/apps/libical/zoneinfo/America/Marigot.ics
-share/apps/libical/zoneinfo/America/Martinique.ics
-share/apps/libical/zoneinfo/America/Mazatlan.ics
-share/apps/libical/zoneinfo/America/Menominee.ics
-share/apps/libical/zoneinfo/America/Merida.ics
-share/apps/libical/zoneinfo/America/Mexico_City.ics
-share/apps/libical/zoneinfo/America/Miquelon.ics
-share/apps/libical/zoneinfo/America/Moncton.ics
-share/apps/libical/zoneinfo/America/Monterrey.ics
-share/apps/libical/zoneinfo/America/Montevideo.ics
-share/apps/libical/zoneinfo/America/Montreal.ics
-share/apps/libical/zoneinfo/America/Montserrat.ics
-share/apps/libical/zoneinfo/America/Nassau.ics
-share/apps/libical/zoneinfo/America/New_York.ics
-share/apps/libical/zoneinfo/America/Nipigon.ics
-share/apps/libical/zoneinfo/America/Nome.ics
-share/apps/libical/zoneinfo/America/Noronha.ics
-share/apps/libical/zoneinfo/America/Panama.ics
-share/apps/libical/zoneinfo/America/Pangnirtung.ics
-share/apps/libical/zoneinfo/America/Paramaribo.ics
-share/apps/libical/zoneinfo/America/Phoenix.ics
-share/apps/libical/zoneinfo/America/Port-au-Prince.ics
-share/apps/libical/zoneinfo/America/Port_of_Spain.ics
-share/apps/libical/zoneinfo/America/Porto_Velho.ics
-share/apps/libical/zoneinfo/America/Puerto_Rico.ics
-share/apps/libical/zoneinfo/America/Rainy_River.ics
-share/apps/libical/zoneinfo/America/Rankin_Inlet.ics
-share/apps/libical/zoneinfo/America/Recife.ics
-share/apps/libical/zoneinfo/America/Regina.ics
-share/apps/libical/zoneinfo/America/Resolute.ics
-share/apps/libical/zoneinfo/America/Rio_Branco.ics
-share/apps/libical/zoneinfo/America/Santiago.ics
-share/apps/libical/zoneinfo/America/Santo_Domingo.ics
-share/apps/libical/zoneinfo/America/Sao_Paulo.ics
-share/apps/libical/zoneinfo/America/Scoresbysund.ics
-share/apps/libical/zoneinfo/America/Shiprock.ics
-share/apps/libical/zoneinfo/America/St_Barthelemy.ics
-share/apps/libical/zoneinfo/America/St_Johns.ics
-share/apps/libical/zoneinfo/America/St_Kitts.ics
-share/apps/libical/zoneinfo/America/St_Lucia.ics
-share/apps/libical/zoneinfo/America/St_Thomas.ics
-share/apps/libical/zoneinfo/America/St_Vincent.ics
-share/apps/libical/zoneinfo/America/Swift_Current.ics
-share/apps/libical/zoneinfo/America/Tegucigalpa.ics
-share/apps/libical/zoneinfo/America/Thule.ics
-share/apps/libical/zoneinfo/America/Thunder_Bay.ics
-share/apps/libical/zoneinfo/America/Tijuana.ics
-share/apps/libical/zoneinfo/America/Toronto.ics
-share/apps/libical/zoneinfo/America/Tortola.ics
-share/apps/libical/zoneinfo/America/Vancouver.ics
-share/apps/libical/zoneinfo/America/Whitehorse.ics
-share/apps/libical/zoneinfo/America/Winnipeg.ics
-share/apps/libical/zoneinfo/America/Yakutat.ics
-share/apps/libical/zoneinfo/America/Yellowknife.ics
-share/apps/libical/zoneinfo/Antarctica/Casey.ics
-share/apps/libical/zoneinfo/Antarctica/Davis.ics
-share/apps/libical/zoneinfo/Antarctica/DumontDUrville.ics
-share/apps/libical/zoneinfo/Antarctica/Mawson.ics
-share/apps/libical/zoneinfo/Antarctica/McMurdo.ics
-share/apps/libical/zoneinfo/Antarctica/Palmer.ics
-share/apps/libical/zoneinfo/Antarctica/Rothera.ics
-share/apps/libical/zoneinfo/Antarctica/South_Pole.ics
-share/apps/libical/zoneinfo/Antarctica/Syowa.ics
-share/apps/libical/zoneinfo/Antarctica/Vostok.ics
-share/apps/libical/zoneinfo/Arctic/Longyearbyen.ics
-share/apps/libical/zoneinfo/Asia/Aden.ics
-share/apps/libical/zoneinfo/Asia/Almaty.ics
-share/apps/libical/zoneinfo/Asia/Amman.ics
-share/apps/libical/zoneinfo/Asia/Anadyr.ics
-share/apps/libical/zoneinfo/Asia/Aqtau.ics
-share/apps/libical/zoneinfo/Asia/Aqtobe.ics
-share/apps/libical/zoneinfo/Asia/Ashgabat.ics
-share/apps/libical/zoneinfo/Asia/Baghdad.ics
-share/apps/libical/zoneinfo/Asia/Bahrain.ics
-share/apps/libical/zoneinfo/Asia/Baku.ics
-share/apps/libical/zoneinfo/Asia/Bangkok.ics
-share/apps/libical/zoneinfo/Asia/Beirut.ics
-share/apps/libical/zoneinfo/Asia/Bishkek.ics
-share/apps/libical/zoneinfo/Asia/Brunei.ics
-share/apps/libical/zoneinfo/Asia/Calcutta.ics
-share/apps/libical/zoneinfo/Asia/Choibalsan.ics
-share/apps/libical/zoneinfo/Asia/Chongqing.ics
-share/apps/libical/zoneinfo/Asia/Colombo.ics
-share/apps/libical/zoneinfo/Asia/Damascus.ics
-share/apps/libical/zoneinfo/Asia/Dhaka.ics
-share/apps/libical/zoneinfo/Asia/Dili.ics
-share/apps/libical/zoneinfo/Asia/Dubai.ics
-share/apps/libical/zoneinfo/Asia/Dushanbe.ics
-share/apps/libical/zoneinfo/Asia/Gaza.ics
-share/apps/libical/zoneinfo/Asia/Harbin.ics
-share/apps/libical/zoneinfo/Asia/Ho_Chi_Minh.ics
-share/apps/libical/zoneinfo/Asia/Hong_Kong.ics
-share/apps/libical/zoneinfo/Asia/Hovd.ics
-share/apps/libical/zoneinfo/Asia/Irkutsk.ics
-share/apps/libical/zoneinfo/Asia/Istanbul.ics
-share/apps/libical/zoneinfo/Asia/Jakarta.ics
-share/apps/libical/zoneinfo/Asia/Jayapura.ics
-share/apps/libical/zoneinfo/Asia/Jerusalem.ics
-share/apps/libical/zoneinfo/Asia/Kabul.ics
-share/apps/libical/zoneinfo/Asia/Kamchatka.ics
-share/apps/libical/zoneinfo/Asia/Karachi.ics
-share/apps/libical/zoneinfo/Asia/Kashgar.ics
-share/apps/libical/zoneinfo/Asia/Katmandu.ics
-share/apps/libical/zoneinfo/Asia/Kolkata.ics
-share/apps/libical/zoneinfo/Asia/Krasnoyarsk.ics
-share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
-share/apps/libical/zoneinfo/Asia/Kuching.ics
-share/apps/libical/zoneinfo/Asia/Kuwait.ics
-share/apps/libical/zoneinfo/Asia/Macau.ics
-share/apps/libical/zoneinfo/Asia/Magadan.ics
-share/apps/libical/zoneinfo/Asia/Makassar.ics
-share/apps/libical/zoneinfo/Asia/Manila.ics
-share/apps/libical/zoneinfo/Asia/Muscat.ics
-share/apps/libical/zoneinfo/Asia/Nicosia.ics
-share/apps/libical/zoneinfo/Asia/Novosibirsk.ics
-share/apps/libical/zoneinfo/Asia/Omsk.ics
-share/apps/libical/zoneinfo/Asia/Oral.ics
-share/apps/libical/zoneinfo/Asia/Phnom_Penh.ics
-share/apps/libical/zoneinfo/Asia/Pontianak.ics
-share/apps/libical/zoneinfo/Asia/Pyongyang.ics
-share/apps/libical/zoneinfo/Asia/Qatar.ics
-share/apps/libical/zoneinfo/Asia/Qyzylorda.ics
-share/apps/libical/zoneinfo/Asia/Rangoon.ics
-share/apps/libical/zoneinfo/Asia/Riyadh.ics
-share/apps/libical/zoneinfo/Asia/Saigon.ics
-share/apps/libical/zoneinfo/Asia/Sakhalin.ics
-share/apps/libical/zoneinfo/Asia/Samarkand.ics
-share/apps/libical/zoneinfo/Asia/Seoul.ics
-share/apps/libical/zoneinfo/Asia/Shanghai.ics
-share/apps/libical/zoneinfo/Asia/Singapore.ics
-share/apps/libical/zoneinfo/Asia/Taipei.ics
-share/apps/libical/zoneinfo/Asia/Tashkent.ics
-share/apps/libical/zoneinfo/Asia/Tbilisi.ics
-share/apps/libical/zoneinfo/Asia/Tehran.ics
-share/apps/libical/zoneinfo/Asia/Thimphu.ics
-share/apps/libical/zoneinfo/Asia/Tokyo.ics
-share/apps/libical/zoneinfo/Asia/Ulaanbaatar.ics
-share/apps/libical/zoneinfo/Asia/Urumqi.ics
-share/apps/libical/zoneinfo/Asia/Vientiane.ics
-share/apps/libical/zoneinfo/Asia/Vladivostok.ics
-share/apps/libical/zoneinfo/Asia/Yakutsk.ics
-share/apps/libical/zoneinfo/Asia/Yekaterinburg.ics
-share/apps/libical/zoneinfo/Asia/Yerevan.ics
-share/apps/libical/zoneinfo/Atlantic/Azores.ics
-share/apps/libical/zoneinfo/Atlantic/Bermuda.ics
-share/apps/libical/zoneinfo/Atlantic/Canary.ics
-share/apps/libical/zoneinfo/Atlantic/Cape_Verde.ics
-share/apps/libical/zoneinfo/Atlantic/Faroe.ics
-share/apps/libical/zoneinfo/Atlantic/Jan_Mayen.ics
-share/apps/libical/zoneinfo/Atlantic/Madeira.ics
-share/apps/libical/zoneinfo/Atlantic/Reykjavik.ics
-share/apps/libical/zoneinfo/Atlantic/South_Georgia.ics
-share/apps/libical/zoneinfo/Atlantic/St_Helena.ics
-share/apps/libical/zoneinfo/Atlantic/Stanley.ics
-share/apps/libical/zoneinfo/Australia/Adelaide.ics
-share/apps/libical/zoneinfo/Australia/Brisbane.ics
-share/apps/libical/zoneinfo/Australia/Broken_Hill.ics
-share/apps/libical/zoneinfo/Australia/Currie.ics
-share/apps/libical/zoneinfo/Australia/Darwin.ics
-share/apps/libical/zoneinfo/Australia/Eucla.ics
-share/apps/libical/zoneinfo/Australia/Hobart.ics
-share/apps/libical/zoneinfo/Australia/Lindeman.ics
-share/apps/libical/zoneinfo/Australia/Lord_Howe.ics
-share/apps/libical/zoneinfo/Australia/Melbourne.ics
-share/apps/libical/zoneinfo/Australia/Perth.ics
-share/apps/libical/zoneinfo/Australia/Sydney.ics
-share/apps/libical/zoneinfo/Europe/Amsterdam.ics
-share/apps/libical/zoneinfo/Europe/Andorra.ics
-share/apps/libical/zoneinfo/Europe/Athens.ics
-share/apps/libical/zoneinfo/Europe/Belgrade.ics
-share/apps/libical/zoneinfo/Europe/Berlin.ics
-share/apps/libical/zoneinfo/Europe/Bratislava.ics
-share/apps/libical/zoneinfo/Europe/Brussels.ics
-share/apps/libical/zoneinfo/Europe/Bucharest.ics
-share/apps/libical/zoneinfo/Europe/Budapest.ics
-share/apps/libical/zoneinfo/Europe/Chisinau.ics
-share/apps/libical/zoneinfo/Europe/Copenhagen.ics
-share/apps/libical/zoneinfo/Europe/Dublin.ics
-share/apps/libical/zoneinfo/Europe/Gibraltar.ics
-share/apps/libical/zoneinfo/Europe/Guernsey.ics
-share/apps/libical/zoneinfo/Europe/Helsinki.ics
-share/apps/libical/zoneinfo/Europe/Isle_of_Man.ics
-share/apps/libical/zoneinfo/Europe/Istanbul.ics
-share/apps/libical/zoneinfo/Europe/Jersey.ics
-share/apps/libical/zoneinfo/Europe/Kaliningrad.ics
-share/apps/libical/zoneinfo/Europe/Kiev.ics
-share/apps/libical/zoneinfo/Europe/Lisbon.ics
-share/apps/libical/zoneinfo/Europe/Ljubljana.ics
-share/apps/libical/zoneinfo/Europe/London.ics
-share/apps/libical/zoneinfo/Europe/Luxembourg.ics
-share/apps/libical/zoneinfo/Europe/Madrid.ics
-share/apps/libical/zoneinfo/Europe/Malta.ics
-share/apps/libical/zoneinfo/Europe/Mariehamn.ics
-share/apps/libical/zoneinfo/Europe/Minsk.ics
-share/apps/libical/zoneinfo/Europe/Monaco.ics
-share/apps/libical/zoneinfo/Europe/Moscow.ics
-share/apps/libical/zoneinfo/Europe/Nicosia.ics
-share/apps/libical/zoneinfo/Europe/Oslo.ics
-share/apps/libical/zoneinfo/Europe/Paris.ics
-share/apps/libical/zoneinfo/Europe/Podgorica.ics
-share/apps/libical/zoneinfo/Europe/Prague.ics
-share/apps/libical/zoneinfo/Europe/Riga.ics
-share/apps/libical/zoneinfo/Europe/Rome.ics
-share/apps/libical/zoneinfo/Europe/Samara.ics
-share/apps/libical/zoneinfo/Europe/San_Marino.ics
-share/apps/libical/zoneinfo/Europe/Sarajevo.ics
-share/apps/libical/zoneinfo/Europe/Simferopol.ics
-share/apps/libical/zoneinfo/Europe/Skopje.ics
-share/apps/libical/zoneinfo/Europe/Sofia.ics
-share/apps/libical/zoneinfo/Europe/Stockholm.ics
-share/apps/libical/zoneinfo/Europe/Tallinn.ics
-share/apps/libical/zoneinfo/Europe/Tirane.ics
-share/apps/libical/zoneinfo/Europe/Uzhgorod.ics
-share/apps/libical/zoneinfo/Europe/Vaduz.ics
-share/apps/libical/zoneinfo/Europe/Vatican.ics
-share/apps/libical/zoneinfo/Europe/Vienna.ics
-share/apps/libical/zoneinfo/Europe/Vilnius.ics
-share/apps/libical/zoneinfo/Europe/Volgograd.ics
-share/apps/libical/zoneinfo/Europe/Warsaw.ics
-share/apps/libical/zoneinfo/Europe/Zagreb.ics
-share/apps/libical/zoneinfo/Europe/Zaporozhye.ics
-share/apps/libical/zoneinfo/Europe/Zurich.ics
-share/apps/libical/zoneinfo/Indian/Antananarivo.ics
-share/apps/libical/zoneinfo/Indian/Chagos.ics
-share/apps/libical/zoneinfo/Indian/Christmas.ics
-share/apps/libical/zoneinfo/Indian/Cocos.ics
-share/apps/libical/zoneinfo/Indian/Comoro.ics
-share/apps/libical/zoneinfo/Indian/Kerguelen.ics
-share/apps/libical/zoneinfo/Indian/Mahe.ics
-share/apps/libical/zoneinfo/Indian/Maldives.ics
-share/apps/libical/zoneinfo/Indian/Mauritius.ics
-share/apps/libical/zoneinfo/Indian/Mayotte.ics
-share/apps/libical/zoneinfo/Indian/Reunion.ics
-share/apps/libical/zoneinfo/Pacific/Apia.ics
-share/apps/libical/zoneinfo/Pacific/Auckland.ics
-share/apps/libical/zoneinfo/Pacific/Chatham.ics
-share/apps/libical/zoneinfo/Pacific/Easter.ics
-share/apps/libical/zoneinfo/Pacific/Efate.ics
-share/apps/libical/zoneinfo/Pacific/Enderbury.ics
-share/apps/libical/zoneinfo/Pacific/Fakaofo.ics
-share/apps/libical/zoneinfo/Pacific/Fiji.ics
-share/apps/libical/zoneinfo/Pacific/Funafuti.ics
-share/apps/libical/zoneinfo/Pacific/Galapagos.ics
-share/apps/libical/zoneinfo/Pacific/Gambier.ics
-share/apps/libical/zoneinfo/Pacific/Guadalcanal.ics
-share/apps/libical/zoneinfo/Pacific/Guam.ics
-share/apps/libical/zoneinfo/Pacific/Honolulu.ics
-share/apps/libical/zoneinfo/Pacific/Johnston.ics
-share/apps/libical/zoneinfo/Pacific/Kiritimati.ics
-share/apps/libical/zoneinfo/Pacific/Kosrae.ics
-share/apps/libical/zoneinfo/Pacific/Kwajalein.ics
-share/apps/libical/zoneinfo/Pacific/Majuro.ics
-share/apps/libical/zoneinfo/Pacific/Marquesas.ics
-share/apps/libical/zoneinfo/Pacific/Midway.ics
-share/apps/libical/zoneinfo/Pacific/Nauru.ics
-share/apps/libical/zoneinfo/Pacific/Niue.ics
-share/apps/libical/zoneinfo/Pacific/Norfolk.ics
-share/apps/libical/zoneinfo/Pacific/Noumea.ics
-share/apps/libical/zoneinfo/Pacific/Pago_Pago.ics
-share/apps/libical/zoneinfo/Pacific/Palau.ics
-share/apps/libical/zoneinfo/Pacific/Pitcairn.ics
-share/apps/libical/zoneinfo/Pacific/Ponape.ics
-share/apps/libical/zoneinfo/Pacific/Port_Moresby.ics
-share/apps/libical/zoneinfo/Pacific/Rarotonga.ics
-share/apps/libical/zoneinfo/Pacific/Saipan.ics
-share/apps/libical/zoneinfo/Pacific/Tahiti.ics
-share/apps/libical/zoneinfo/Pacific/Tarawa.ics
-share/apps/libical/zoneinfo/Pacific/Tongatapu.ics
-share/apps/libical/zoneinfo/Pacific/Truk.ics
-share/apps/libical/zoneinfo/Pacific/Wake.ics
-share/apps/libical/zoneinfo/Pacific/Wallis.ics
-share/apps/libical/zoneinfo/zones.tab
 share/config.kcfg/mailtransport.kcfg
 share/dbus-1/interfaces/org.kde.KResourcesManager.xml
 share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
+share/doc/HTML/en/kcontrol/kresources/common
+share/doc/HTML/en/kcontrol/kresources/index.cache.bz2
+share/doc/HTML/en/kcontrol/kresources/index.docbook
+share/doc/HTML/en/kioslave/imap/common
+share/doc/HTML/en/kioslave/imap/index.cache.bz2
+share/doc/HTML/en/kioslave/imap/index.docbook
+share/doc/HTML/en/kioslave/ldap/common
+share/doc/HTML/en/kioslave/ldap/index.cache.bz2
+share/doc/HTML/en/kioslave/ldap/index.docbook
+share/doc/HTML/en/kioslave/nntp/common
+share/doc/HTML/en/kioslave/nntp/index.cache.bz2
+share/doc/HTML/en/kioslave/nntp/index.docbook
+share/doc/HTML/en/kioslave/pop3/common
+share/doc/HTML/en/kioslave/pop3/index.cache.bz2
+share/doc/HTML/en/kioslave/pop3/index.docbook
+share/doc/HTML/en/kioslave/smtp/common
+share/doc/HTML/en/kioslave/smtp/index.cache.bz2
+share/doc/HTML/en/kioslave/smtp/index.docbook
 share/kde4/services/imap4.protocol
 share/kde4/services/imaps.protocol
 share/kde4/services/kcm_mailtransport.desktop
@@ -843,32 +475,16 @@ share/kde4/services/smtp.protocol
 share/kde4/services/smtps.protocol
 share/kde4/servicetypes/kresources_manager.desktop
 share/kde4/servicetypes/kresources_plugin.desktop
-@dirrmtry share/kde4/servicetypes
-@dirrmtry share/kde4/services/kresources/kcal
-@dirrmtry share/kde4/services/kresources/kabc
-@dirrmtry share/kde4/services/kresources
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrm share/apps/libical/zoneinfo/Pacific
-@dirrm share/apps/libical/zoneinfo/Indian
-@dirrm share/apps/libical/zoneinfo/Europe
-@dirrm share/apps/libical/zoneinfo/Australia
-@dirrm share/apps/libical/zoneinfo/Atlantic
-@dirrm share/apps/libical/zoneinfo/Asia
-@dirrm share/apps/libical/zoneinfo/Arctic
-@dirrm share/apps/libical/zoneinfo/Antarctica
-@dirrm share/apps/libical/zoneinfo/America/Kentucky
-@dirrm share/apps/libical/zoneinfo/America/Indiana
-@dirrm share/apps/libical/zoneinfo/America/Argentina
-@dirrm share/apps/libical/zoneinfo/America
-@dirrm share/apps/libical/zoneinfo/Africa
-@dirrm share/apps/libical/zoneinfo
-@dirrm share/apps/libical
-@dirrmtry share/apps/kconf_update
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
-@dirrmtry share/apps/akonadi-kde
+@dirrm share/doc/HTML/en/kioslave/smtp
+@dirrm share/doc/HTML/en/kioslave/pop3
+@dirrm share/doc/HTML/en/kioslave/nntp
+@dirrm share/doc/HTML/en/kioslave/ldap
+@dirrm share/doc/HTML/en/kioslave/imap
+@dirrm share/doc/HTML/en/kcontrol/kresources
+@dirrm share/apps/akonadi-kde
 @dirrm lib/gpgmepp
+@dirrm lib/KdepimLibs-%%KDE4_VERSION%%/cmake
+@dirrm lib/KdepimLibs-%%KDE4_VERSION%%
 @dirrm include/syndication/rss2
 @dirrm include/syndication/rdf
 @dirrm include/syndication/atom
@@ -889,5 +505,6 @@ share/kde4/servicetypes/kresources_plugin.desktop
 @dirrm include/gpgme++/interfaces
 @dirrm include/gpgme++
 @dirrmtry include/akonadi/private
-@dirrmtry include/akonadi/kmime
+@dirrm include/akonadi/kmime
+@dirrm include/akonadi/kabc
 @dirrmtry include/akonadi
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 76f395d325be..43f7daa06105 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@freebsd.org
 COMMENT=	Extra plasmoids for KDE4
 
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
@@ -25,4 +25,13 @@ QT_COMPONENTS=	opengl webkit xml network \
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+pre-configure:
+	#respect prefix, don't update mime when installing
+	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
+		-e '/^set/s,DBUS_INTERFACES_INSTALL_DIR,KDE4_DBUS_INTERFACES_DIR,g' \
+		${WRKSRC}/../applets/lancelot/app/src/CMakeLists.txt
+
+post-install:
+	@-update-mime-database ${PREFIX}/share/mime
+
 .include <bsd.port.mk>
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 673153a46568..674febf9ef31 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.1.4.tar.bz2) = 4a0df1a79854539a4022df2308629dc9
-SHA256 (KDE/kdeplasma-addons-4.1.4.tar.bz2) = 6357e3ddb80f59760561a1787e460eba992cf4602917a61a57ea50e97ac3a5d7
-SIZE (KDE/kdeplasma-addons-4.1.4.tar.bz2) = 4074997
+MD5 (KDE/kdeplasma-addons-4.2.0.tar.bz2) = d98f805f4c9b7af7278067f9e544b2ec
+SHA256 (KDE/kdeplasma-addons-4.2.0.tar.bz2) = 8c2d917788873521d0379a060a2b049d1eec4917e9b7c1cb90a632c0bb392d6b
+SIZE (KDE/kdeplasma-addons-4.2.0.tar.bz2) = 4269323
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 9a23bfd90652..780ec760b056 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -1,166 +1,248 @@
-include/plasmaappletdialog.h
-include/plasmaappletdialog_export.h
+bin/lancelot
+include/lancelot/Global.h
+include/lancelot/lancelot.h
+include/lancelot/lancelot_export.h
+include/lancelot/layouts/CardLayout.h
+include/lancelot/layouts/ColumnLayout.h
+include/lancelot/models/ActionListViewModels.h
+include/lancelot/models/PassagewayViewModels.h
+include/lancelot/widgets/ActionListView.h
+include/lancelot/widgets/BasicWidget.h
+include/lancelot/widgets/ExtenderButton.h
+include/lancelot/widgets/HoverIcon.h
+include/lancelot/widgets/Panel.h
+include/lancelot/widgets/PassagewayView.h
+include/lancelot/widgets/ResizeBordersPanel.h
+include/lancelot/widgets/Widget.h
+include/lancelot/widgets/WidgetPositioner.h
+lib/kde4/kcm_krunner_spellcheck.so
+lib/kde4/krunner_browserhistory.so
 lib/kde4/krunner_contacts.so
-lib/kde4/krunner_converterrunner.so
+lib/kde4/krunner_converter.so
+lib/kde4/krunner_katesessions.so
+lib/kde4/krunner_konquerorsessions.so
+lib/kde4/krunner_konsolesessions.so
+lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/plasma_applet_bball.so
 lib/kde4/plasma_applet_binaryclock.so
+lib/kde4/plasma_applet_bluemarble.so
 lib/kde4/plasma_applet_calculator.so
+lib/kde4/plasma_applet_charselect.so
 lib/kde4/plasma_applet_comic.so
 lib/kde4/plasma_applet_dict.so
+lib/kde4/plasma_applet_eyes.so
 lib/kde4/plasma_applet_fifteenPuzzle.so
 lib/kde4/plasma_applet_fileWatcher.so
 lib/kde4/plasma_applet_frame.so
 lib/kde4/plasma_applet_fuzzy_clock.so
+lib/kde4/plasma_applet_incomingmsg.so
 lib/kde4/plasma_applet_kolourpicker.so
 lib/kde4/plasma_applet_konqprofiles.so
 lib/kde4/plasma_applet_konsoleprofiles.so
+lib/kde4/plasma_applet_lancelot_launcher.so
+lib/kde4/plasma_applet_lancelot_part.so
+lib/kde4/plasma_applet_leavenote.so
+lib/kde4/plasma_applet_life.so
 lib/kde4/plasma_applet_luna.so
+lib/kde4/plasma_applet_news.so
 lib/kde4/plasma_applet_notes.so
 lib/kde4/plasma_applet_nowplaying.so
+lib/kde4/plasma_applet_paste.so
+lib/kde4/plasma_applet_pastebin.so
+lib/kde4/plasma_applet_previewer.so
+lib/kde4/plasma_applet_rssnow.so
 lib/kde4/plasma_applet_showdashboard.so
 lib/kde4/plasma_applet_showdesktop.so
+lib/kde4/plasma_applet_timer.so
 lib/kde4/plasma_applet_twitter.so
-lib/kde4/plasma_comic_dilbertprovider.so
-lib/kde4/plasma_comic_garfieldprovider.so
-lib/kde4/plasma_comic_osnewsprovider.so
-lib/kde4/plasma_comic_phdprovider.so
-lib/kde4/plasma_comic_snoopyprovider.so
-lib/kde4/plasma_comic_userfriendlyprovider.so
-lib/kde4/plasma_comic_xkcdprovider.so
+lib/kde4/plasma_applet_weatherstation.so
+lib/kde4/plasma_comic_krossprovider.so
 lib/kde4/plasma_engine_comic.so
 lib/kde4/plasma_engine_twitter.so
-lib/libplasmaappletdialog.so
-lib/libplasmaappletdialog.so.5
-lib/libplasmaappletdialog.so.5.0.0
+lib/kde4/plasma_packagestructure_comic.so
+lib/liblancelot.so
+lib/liblancelot.so.0
+lib/liblancelot.so.0.5.0
 lib/libplasmacomicprovidercore.so
 lib/libplasmacomicprovidercore.so.1
 lib/libplasmacomicprovidercore.so.1.0.0
-share/apps/desktoptheme/Aya/dialogs/background.svg
-share/apps/desktoptheme/Aya/dialogs/krunner.svg
-share/apps/desktoptheme/Aya/dialogs/shutdowndialog.svg
-share/apps/desktoptheme/Aya/metadata.desktop
-share/apps/desktoptheme/Aya/opaque/dialogs/background.svg
-share/apps/desktoptheme/Aya/opaque/widgets/tooltip.svg
-share/apps/desktoptheme/Aya/widgets/analog_meter.svg
-share/apps/desktoptheme/Aya/widgets/background.svg
-share/apps/desktoptheme/Aya/widgets/bar_meter_horizontal.svg
-share/apps/desktoptheme/Aya/widgets/bar_meter_vertical.svg
-share/apps/desktoptheme/Aya/widgets/battery-oxygen.svg
-share/apps/desktoptheme/Aya/widgets/battery.svg
-share/apps/desktoptheme/Aya/widgets/clock.svg
-share/apps/desktoptheme/Aya/widgets/connection-established.svg
-share/apps/desktoptheme/Aya/widgets/iconbutton.svg
-share/apps/desktoptheme/Aya/widgets/pager.svg
-share/apps/desktoptheme/Aya/widgets/panel-background.svg
-share/apps/desktoptheme/Aya/widgets/plot-background.svg
-share/apps/desktoptheme/Aya/widgets/systemtray.svg
-share/apps/desktoptheme/Aya/widgets/tasks.svg
-share/apps/desktoptheme/Aya/widgets/toolbox-button.svg
-share/apps/desktoptheme/Aya/widgets/tooltip.svg
-share/apps/desktoptheme/Aya/widgets/translucentbackground.svg
-share/apps/desktoptheme/Elegance/colors
-share/apps/desktoptheme/Elegance/dialogs/background.svg
-share/apps/desktoptheme/Elegance/dialogs/krunner.svg
-share/apps/desktoptheme/Elegance/dialogs/shutdowndialog.svg
-share/apps/desktoptheme/Elegance/dialogs/shutdowndlg.svg
-share/apps/desktoptheme/Elegance/metadata.desktop
-share/apps/desktoptheme/Elegance/widgets/analog_meter.svg
-share/apps/desktoptheme/Elegance/widgets/background.svg
-share/apps/desktoptheme/Elegance/widgets/battery-oxygen.svg
-share/apps/desktoptheme/Elegance/widgets/containment-controls.svg
-share/apps/desktoptheme/Elegance/widgets/clock.svg
-share/apps/desktoptheme/Elegance/widgets/iconbutton.svg
-share/apps/desktoptheme/Elegance/widgets/panel-background.svg
-share/apps/desktoptheme/Elegance/widgets/plot-background.svg
-share/apps/desktoptheme/Elegance/widgets/systemtray.svg
-share/apps/desktoptheme/Elegance/widgets/tasks.svg
-share/apps/desktoptheme/Elegance/widgets/toolbox-button.svg
-share/apps/desktoptheme/Elegance/widgets/tooltip.svg
-share/apps/desktoptheme/Elegance/widgets/translucentbackground.svg
-share/apps/desktoptheme/Silicon/colors
-share/apps/desktoptheme/Silicon/dialogs/background.svg
-share/apps/desktoptheme/Silicon/dialogs/krunner.svg
-share/apps/desktoptheme/Silicon/metadata.desktop
-share/apps/desktoptheme/Silicon/opaque/dialogs/background.svg
-share/apps/desktoptheme/Silicon/opaque/dialogs/krunner.svg
-share/apps/desktoptheme/Silicon/widgets/background.svg
-share/apps/desktoptheme/Silicon/widgets/clock.svg
-share/apps/desktoptheme/Silicon/widgets/iconbutton.svg
-share/apps/desktoptheme/Silicon/widgets/notes.svg
-share/apps/desktoptheme/Silicon/widgets/pager.svg
-share/apps/desktoptheme/Silicon/widgets/panel-background.svg
-share/apps/desktoptheme/Silicon/widgets/plot-background.svg
-share/apps/desktoptheme/Silicon/widgets/systemtray.svg
-share/apps/desktoptheme/Silicon/widgets/tasks.svg
-share/apps/desktoptheme/Silicon/widgets/tooltip.svg
-share/apps/desktoptheme/default/widgets/luna.svg
-share/apps/desktoptheme/default/widgets/notes.svg
-share/apps/desktoptheme/default/widgets/picture-frame-default.svg
-share/apps/desktoptheme/default/widgets/twitter.svg
-share/apps/desktoptheme/heron/colors
-share/apps/desktoptheme/heron/dialogs/background.svg
-share/apps/desktoptheme/heron/dialogs/shutdowndialog.svg
-share/apps/desktoptheme/heron/metadata.desktop
-share/apps/desktoptheme/heron/opaque/dialogs/background.svg
-share/apps/desktoptheme/heron/opaque/widgets/panel-background.svg
-share/apps/desktoptheme/heron/opaque/widgets/tooltip.svg
-share/apps/desktoptheme/heron/widgets/analog_meter.svg
-share/apps/desktoptheme/heron/widgets/background.svg
-share/apps/desktoptheme/heron/widgets/bar_meter_horizontal.svg
-share/apps/desktoptheme/heron/widgets/bar_meter_vertical.svg
-share/apps/desktoptheme/heron/widgets/clock.svg
-share/apps/desktoptheme/heron/widgets/connection-established.svg
-share/apps/desktoptheme/heron/widgets/iconbutton.svg
-share/apps/desktoptheme/heron/widgets/notes.svg
-share/apps/desktoptheme/heron/widgets/panel-background.svg
-share/apps/desktoptheme/heron/widgets/picture-frame-default.svg
-share/apps/desktoptheme/heron/widgets/plot-background.svg
-share/apps/desktoptheme/heron/widgets/tasks.svg
-share/apps/desktoptheme/heron/widgets/tooltip.svg
-share/apps/desktoptheme/slim-glow/LICENSE
-share/apps/desktoptheme/slim-glow/colors
-share/apps/desktoptheme/slim-glow/dialogs/background.svg
-share/apps/desktoptheme/slim-glow/dialogs/krunner.svg
-share/apps/desktoptheme/slim-glow/dialogs/shutdowndialog.svg
-share/apps/desktoptheme/slim-glow/metadata.desktop
-share/apps/desktoptheme/slim-glow/opaque/dialogs/background.svg
-share/apps/desktoptheme/slim-glow/opaque/widgets/panel-background.svg
-share/apps/desktoptheme/slim-glow/opaque/widgets/tooltip.svg
-share/apps/desktoptheme/slim-glow/widgets/analog_meter.svg
-share/apps/desktoptheme/slim-glow/widgets/background.svg
-share/apps/desktoptheme/slim-glow/widgets/bar_meter_horizontal.svg
-share/apps/desktoptheme/slim-glow/widgets/bar_meter_vertical.svg
-share/apps/desktoptheme/slim-glow/widgets/clock.svg
-share/apps/desktoptheme/slim-glow/widgets/connection-established.svg
-share/apps/desktoptheme/slim-glow/widgets/iconbutton.svg
-share/apps/desktoptheme/slim-glow/widgets/notes.svg
-share/apps/desktoptheme/slim-glow/widgets/panel-background.svg
-share/apps/desktoptheme/slim-glow/widgets/picture-frame-default.svg
-share/apps/desktoptheme/slim-glow/widgets/plot-background.svg
-share/apps/desktoptheme/slim-glow/widgets/tasks.svg
-share/apps/desktoptheme/slim-glow/widgets/toolbox-button.svg
-share/apps/desktoptheme/slim-glow/widgets/tooltip.svg
-share/apps/desktoptheme/slim-glow/widgets/translucentbackground.svg
-share/apps/plasma-comic/plasma_comic_dilbert.png
-share/apps/plasma-comic/plasma_comic_garfield.png
-share/apps/plasma-comic/plasma_comic_osnews.png
-share/apps/plasma-comic/plasma_comic_phd.png
-share/apps/plasma-comic/plasma_comic_snoopy.png
-share/apps/plasma-comic/plasma_comic_userfriendly.png
-share/apps/plasma-comic/plasma_comic_xkcd.png
+lib/libplasmaconverter.so
+lib/libplasmaconverter.so.5
+lib/libplasmaconverter.so.5.0.1
+share/apps/bball/bball.svgz
+share/apps/bball/bounce.ogg
+share/apps/bball/football.svgz
+share/apps/desktoptheme/Aya/lancelot/main-background.svgz
+share/apps/desktoptheme/Aya/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Aya/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Aya/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Aya/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Aya/lancelot/plasma-theme.config
+share/apps/desktoptheme/Aya/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Aya/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Aya/lancelot/theme.config
+share/apps/desktoptheme/Elegance/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/Elegance/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/Elegance/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/Elegance/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/Elegance/lancelot/main-background.svgz
+share/apps/desktoptheme/Elegance/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Elegance/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Elegance/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Elegance/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Elegance/lancelot/plasma-theme.config
+share/apps/desktoptheme/Elegance/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Elegance/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Elegance/lancelot/theme.config
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/Silicon/lancelot/main-background.svgz
+share/apps/desktoptheme/Silicon/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Silicon/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Silicon/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Silicon/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Silicon/lancelot/plasma-theme.config
+share/apps/desktoptheme/Silicon/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Silicon/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Silicon/lancelot/theme.config
+share/apps/desktoptheme/default/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-headers-plasma-applet.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-scroll-down-plasma-applet.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-scroll-down.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-scroll-up-plasma-applet.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-scroll-up.svgz
+share/apps/desktoptheme/default/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/default/lancelot/inner-background.svgz
+share/apps/desktoptheme/default/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/default/lancelot/lancelot-context.svgz
+share/apps/desktoptheme/default/lancelot/main-background.svgz
+share/apps/desktoptheme/default/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/default/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/default/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/default/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/default/lancelot/plasma-theme.config
+share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-down.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-left.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-right.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-up.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-background.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-button-down-icon.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-button-left-icon.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-button-right-icon.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-button-up-icon.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-handle-horizontal.svgz
+share/apps/desktoptheme/default/lancelot/scroll-bar-handle-vertical.svgz
+share/apps/desktoptheme/default/lancelot/section-buttons.svgz
+share/apps/desktoptheme/default/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/default/lancelot/system-buttons.svgz
+share/apps/desktoptheme/default/lancelot/theme.config
+share/apps/desktoptheme/default/rssnow/background.svgz
+share/apps/desktoptheme/default/rssnow/left.svgz
+share/apps/desktoptheme/default/rssnow/right.svgz
+share/apps/desktoptheme/default/rssnow/rssnow.svgz
+share/apps/desktoptheme/default/stylesheets/news.css
+share/apps/desktoptheme/default/weatherstation/lcd.svgz
+share/apps/desktoptheme/default/weatherstation/lcd_panel.svgz
+share/apps/desktoptheme/default/widgets/eyes.svgz
+share/apps/desktoptheme/default/widgets/luna.svgz
+share/apps/desktoptheme/default/widgets/notes.svgz
+share/apps/desktoptheme/default/widgets/picture-frame-default.svgz
+share/apps/desktoptheme/default/widgets/previewer-16.svgz
+share/apps/desktoptheme/default/widgets/previewer-22.svgz
+share/apps/desktoptheme/default/widgets/timer.svgz
+share/apps/desktoptheme/default/widgets/twitter.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/heron/lancelot/main-background.svgz
+share/apps/desktoptheme/heron/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/heron/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/heron/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/heron/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/heron/lancelot/plasma-theme.config
+share/apps/desktoptheme/heron/lancelot/section-buttons.svgz
+share/apps/desktoptheme/heron/lancelot/system-buttons.svgz
+share/apps/desktoptheme/heron/lancelot/theme.config
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/slim-glow/lancelot/main-background.svgz
+share/apps/desktoptheme/slim-glow/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/slim-glow/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/slim-glow/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/slim-glow/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/slim-glow/lancelot/plasma-theme.config
+share/apps/desktoptheme/slim-glow/lancelot/section-buttons.svgz
+share/apps/desktoptheme/slim-glow/lancelot/theme.config
+share/apps/plasma-bluemarble/atmosphere.frag
+share/apps/plasma-bluemarble/atmosphere.vert
+share/apps/plasma-bluemarble/earth-night.png
+share/apps/plasma-bluemarble/earth.frag
+share/apps/plasma-bluemarble/earth.png
+share/apps/plasma-bluemarble/earth.vert
+share/apps/plasma/services/tweet.operations
+share/apps/rssnow/feeds
+share/config/comic.knsrc
+share/dbus-1/services/org.kde.lancelot.service
+share/icons/hicolor/128x128/apps/lancelot-part.png
+share/icons/hicolor/128x128/apps/lancelot.png
+share/icons/hicolor/128x128/apps/previewer.png
+share/icons/hicolor/16x16/apps/lancelot-part.png
+share/icons/hicolor/16x16/apps/lancelot.png
+share/icons/hicolor/16x16/apps/previewer.png
+share/icons/hicolor/22x22/apps/lancelot-part.png
+share/icons/hicolor/22x22/apps/lancelot.png
+share/icons/hicolor/22x22/apps/previewer.png
+share/icons/hicolor/32x32/apps/lancelot-part.png
+share/icons/hicolor/32x32/apps/lancelot.png
+share/icons/hicolor/32x32/apps/previewer.png
+share/icons/hicolor/48x48/apps/lancelot-part.png
+share/icons/hicolor/48x48/apps/lancelot.png
+share/icons/hicolor/48x48/apps/previewer.png
+share/icons/hicolor/64x64/apps/lancelot-part.png
+share/icons/hicolor/64x64/apps/lancelot.png
+share/icons/hicolor/64x64/apps/previewer.png
 share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
-share/kde4/services/dilbertprovider.desktop
-share/kde4/services/garfieldprovider.desktop
-share/kde4/services/osnewsprovider.desktop
-share/kde4/services/phdprovider.desktop
+share/icons/oxygen/scalable/apps/bball.svgz
+share/kde4/services/ServiceMenus/preview.desktop
+share/kde4/services/browserhistory.desktop
+share/kde4/services/katesessions.desktop
+share/kde4/services/konquerorsessions.desktop
+share/kde4/services/konsolesessions.desktop
+share/kde4/services/plasma-applet-bball.desktop
 share/kde4/services/plasma-applet-binaryclock.desktop
+share/kde4/services/plasma-applet-bluemarble.desktop
 share/kde4/services/plasma-applet-calculator.desktop
+share/kde4/services/plasma-applet-charselect.desktop
+share/kde4/services/plasma-applet-eyes.desktop
 share/kde4/services/plasma-applet-fifteenPuzzle.desktop
+share/kde4/services/plasma-applet-incomingmsg.desktop
 share/kde4/services/plasma-applet-konqprofiles.desktop
 share/kde4/services/plasma-applet-konsoleprofiles.desktop
+share/kde4/services/plasma-applet-lancelot-launcher.desktop
+share/kde4/services/plasma-applet-lancelot-part.desktop
+share/kde4/services/plasma-applet-leavenote.desktop
+share/kde4/services/plasma-applet-life.desktop
 share/kde4/services/plasma-applet-luna.desktop
+share/kde4/services/plasma-applet-news.desktop
 share/kde4/services/plasma-applet-nowplaying.desktop
+share/kde4/services/plasma-applet-paste.desktop
+share/kde4/services/plasma-applet-pastebin.desktop
+share/kde4/services/plasma-applet-previewer.desktop
+share/kde4/services/plasma-applet-rssnow.desktop
 share/kde4/services/plasma-applet-showdashboard.desktop
 share/kde4/services/plasma-applet-showdesktop.desktop
+share/kde4/services/plasma-applet-timer.desktop
+share/kde4/services/plasma-applet-weatherstation.desktop
 share/kde4/services/plasma-clock-fuzzy.desktop
 share/kde4/services/plasma-comic-default.desktop
 share/kde4/services/plasma-dataengine-comic.desktop
@@ -170,39 +252,35 @@ share/kde4/services/plasma-fileWatcher-default.desktop
 share/kde4/services/plasma-frame-default.desktop
 share/kde4/services/plasma-kolourpicker-default.desktop
 share/kde4/services/plasma-notes-default.desktop
+share/kde4/services/plasma-packagestructure-comic.desktop
 share/kde4/services/plasma-runner-contacts.desktop
 share/kde4/services/plasma-runner-converter.desktop
+share/kde4/services/plasma-runner-spellchecker.desktop
+share/kde4/services/plasma-runner-spellchecker_config.desktop
 share/kde4/services/plasma-twitter-default.desktop
-share/kde4/services/snoopyprovider.desktop
-share/kde4/services/userfriendlyprovider.desktop
-share/kde4/services/xkcdprovider.desktop
 share/kde4/servicetypes/plasma_comicprovider.desktop
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrm share/apps/plasma-comic
-@dirrm share/apps/desktoptheme/slim-glow/widgets
-@dirrm share/apps/desktoptheme/slim-glow/opaque/widgets
-@dirrm share/apps/desktoptheme/slim-glow/opaque/dialogs
-@dirrm share/apps/desktoptheme/slim-glow/opaque
-@dirrm share/apps/desktoptheme/slim-glow/dialogs
+share/mime/packages/lancelotpart-mime.xml
+share/mime/text/x-lancelotpart.xml
+@dirrm share/apps/rssnow
+@dirrm share/apps/plasma-bluemarble
+@dirrm share/apps/desktoptheme/slim-glow/lancelot
 @dirrm share/apps/desktoptheme/slim-glow
-@dirrm share/apps/desktoptheme/heron/widgets
-@dirrm share/apps/desktoptheme/heron/opaque/widgets
-@dirrm share/apps/desktoptheme/heron/opaque/dialogs
-@dirrm share/apps/desktoptheme/heron/opaque
-@dirrm share/apps/desktoptheme/heron/dialogs
+@dirrm share/apps/desktoptheme/heron/lancelot
 @dirrm share/apps/desktoptheme/heron
-@dirrm share/apps/desktoptheme/Silicon/opaque/dialogs
-@dirrm share/apps/desktoptheme/Silicon/opaque
-@dirrm share/apps/desktoptheme/Silicon/widgets
-@dirrm share/apps/desktoptheme/Silicon/dialogs
+@dirrm share/apps/desktoptheme/default/weatherstation
+@dirrm share/apps/desktoptheme/default/stylesheets
+@dirrm share/apps/desktoptheme/default/rssnow
+@dirrm share/apps/desktoptheme/default/lancelot
+@dirrm share/apps/desktoptheme/Silicon/lancelot
 @dirrm share/apps/desktoptheme/Silicon
-@dirrm share/apps/desktoptheme/Elegance/widgets
-@dirrm share/apps/desktoptheme/Elegance/dialogs
+@dirrm share/apps/desktoptheme/Elegance/lancelot
 @dirrm share/apps/desktoptheme/Elegance
-@dirrm share/apps/desktoptheme/Aya/widgets
-@dirrm share/apps/desktoptheme/Aya/opaque/widgets
-@dirrm share/apps/desktoptheme/Aya/opaque/dialogs
-@dirrm share/apps/desktoptheme/Aya/opaque
-@dirrm share/apps/desktoptheme/Aya/dialogs
+@dirrm share/apps/desktoptheme/Aya/lancelot
 @dirrm share/apps/desktoptheme/Aya
+@dirrm share/apps/bball
+@dirrm include/lancelot/widgets
+@dirrm include/lancelot/models
+@dirrm include/lancelot/layouts
+@dirrm include/lancelot
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile
index b829aa97e00c..0357d38be88e 100644
--- a/deskutils/plasma-applet-panelspacer/Makefile
+++ b/deskutils/plasma-applet-panelspacer/Makefile
@@ -21,6 +21,8 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
+BROKEN=		Does not compile with KDE 4.2
+
 WRKSRC=		${WRKDIR}/plasmaspacer_${PORTVERSION}
 
 PLIST_FILES=	lib/kde4/plasma_applet_panelspacer.so \
diff --git a/deskutils/plasma-applet-quicklauncher/Makefile b/deskutils/plasma-applet-quicklauncher/Makefile
index c4586d13fc70..d44a39dab66e 100644
--- a/deskutils/plasma-applet-quicklauncher/Makefile
+++ b/deskutils/plasma-applet-quicklauncher/Makefile
@@ -21,6 +21,8 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
+BROKEN=		Does not compile with KDE 4.2
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/
 
 PLIST_FILES=	lib/kde4/plasma_applet_quicklauncher.so \
diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile
index 1750d4e973f2..1312ce506abf 100644
--- a/deskutils/plasma-applet-teacooker/Makefile
+++ b/deskutils/plasma-applet-teacooker/Makefile
@@ -21,6 +21,8 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui dbus network opengl svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
+BROKEN=		Does not compile with KDE 4.2
+
 WRKSRC=		${WRKDIR}/TeaCooker
 
 .include <bsd.port.mk>
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index bf0eed332bbe..8e12334d8b1a 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	strigi
-PORTVERSION=	0.5.11
-PORTREVISION=	1
+PORTVERSION=	0.6.3
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+MASTER_SITES=	SF
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Desktop searching program
@@ -21,7 +20,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui dbus moc_build uic_build qmake_build
 USE_BZIP2=	yes
 USE_GNOME=	libxml2 pkgconfig
-USE_FAM=	yes
+# USE_FAM=	yes
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 
@@ -31,7 +30,5 @@ post-patch:
 		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
 		${WRKSRC}/src/streamanalyzer/CMakeLists.txt \
 		${WRKSRC}/src/streams/CMakeLists.txt
-	${REINPLACE_CMD} -e 's,find_package(Qt4),,' \
-		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/deskutils/strigi/distinfo b/deskutils/strigi/distinfo
index f17e4a31d560..eaad360a4348 100644
--- a/deskutils/strigi/distinfo
+++ b/deskutils/strigi/distinfo
@@ -1,3 +1,3 @@
-MD5 (strigi-0.5.11.tar.bz2) = f1fa3488a9c2fe1e8128f4d44088c4ad
-SHA256 (strigi-0.5.11.tar.bz2) = 29c3a1d6151e5b6984897dc89570380b9caa600c34982285d43998dae9479279
-SIZE (strigi-0.5.11.tar.bz2) = 877002
+MD5 (strigi-0.6.3.tar.bz2) = 56088c25dedacf55cfc11f7ba7c18ba7
+SHA256 (strigi-0.6.3.tar.bz2) = 5671cc0b8e98b59ffd809e59390d420f4650d6a298737af19fb2d32c2ad8fd99
+SIZE (strigi-0.6.3.tar.bz2) = 881044
diff --git a/deskutils/strigi/pkg-descr b/deskutils/strigi/pkg-descr
index e5e6e38ad288..ad1a60a25644 100644
--- a/deskutils/strigi/pkg-descr
+++ b/deskutils/strigi/pkg-descr
@@ -1,8 +1,9 @@
-Strigi is a daemon which uses a very fast and efficient crawler that can index
-data on your harddrive. Indexing operations are performed without hammering
-your system, this makes Strigi the fastest and smallest desktop searching
-program.
-Strigi can index different file formats, including the contents of the archive
-files.
+Strigi is a daemon which uses a very fast and efficient crawler
+that can index data on your harddrive. Indexing operations are
+performed without hammering your system, this makes Strigi the
+fastest and smallest desktop searching program.
 
-WWW:	http://www.vandenoever.info/software/strigi/
+Strigi can index different file formats, including the contents of
+the archive files.
+
+WWW:	http://strigi.sourceforge.net/
diff --git a/deskutils/strigi/pkg-plist b/deskutils/strigi/pkg-plist
index b13f1fadc817..a21428c1d0d2 100644
--- a/deskutils/strigi/pkg-plist
+++ b/deskutils/strigi/pkg-plist
@@ -23,6 +23,7 @@ include/strigi/fileinputstream.h
 include/strigi/indexeddocument.h
 include/strigi/indexmanager.h
 include/strigi/indexplugin.h
+include/strigi/indexpluginloader.h
 include/strigi/indexreader.h
 include/strigi/indexwriter.h
 include/strigi/inputstream.h
@@ -54,20 +55,21 @@ include/strigi/textutils.h
 include/strigi/variant.h
 lib/libsearchclient.so
 lib/libsearchclient.so.0
-lib/libsearchclient.so.0.5.11
+lib/libsearchclient.so.0.6.3
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.5.11
+lib/libstreamanalyzer.so.0.6.3
 lib/libstreams.so
 lib/libstreams.so.0
-lib/libstreams.so.0.5.11
+lib/libstreams.so.0.6.3
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.5.11
+lib/libstrigihtmlgui.so.0.6.3
 lib/libstrigiqtdbusclient.so
 lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.5.11
+lib/libstrigiqtdbusclient.so.0.6.3
 lib/strigi/StrigiConfig.cmake
+lib/strigi/strigiea_jpeg.so
 lib/strigi/strigiindex_clucene.so
 lib/strigi/strigila_cpp.so
 lib/strigi/strigila_deb.so
@@ -91,7 +93,7 @@ share/dbus-1/services/vandenoever.strigi.service
 %%DATADIR%%/fieldproperties/strigi.rdfs
 %%DATADIR%%/fieldproperties/xesam-convenience.rdfs
 %%DATADIR%%/fieldproperties/xesam.rdfs
-@dirrm %%DATADIR%%/fieldproperties
+@dirrmtry %%DATADIR%%/fieldproperties
 @dirrmtry %%DATADIR%%
 @dirrmtry lib/strigi
 @dirrmtry include/strigi/qtdbus