10 files changed, 105 insertions, 112 deletions

diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 43353e82860c..6b42d9207d66 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	kdepim-runtime
-PORTVERSION=	${KDE4_VERSION}
+PORTVERSION=	${KDE4_KDELIBS_VERSION}
 CATEGORIES=	deskutils kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index 01b6ffe79fc8..2bbd0c324897 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/kdepim-runtime-4.14.3.tar.xz) = 2d8fe881c86b74015e3aa44df042110f8fc21156b5e596f93229435e58aab50f
-SIZE (KDE/4.14.3/kdepim-runtime-4.14.3.tar.xz) = 1168856
+TIMESTAMP = 1465935706
+SHA256 (KDE/4.14.10/kdepim-runtime-4.14.10.tar.xz) = d68d1e3278646c3e82c7913dd443b5e10c887fb983fad7d24b26916ed4afcd52
+SIZE (KDE/4.14.10/kdepim-runtime-4.14.10.tar.xz) = 1175432
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index b2c4f2e2ba61..ba4d840365dc 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -83,19 +83,19 @@ lib/kde4/kcm_akonadi_server.so
 lib/kde4/kio_akonadi.so
 lib/libakonadi-filestore.so
 lib/libakonadi-filestore.so.4
-lib/libakonadi-filestore.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-filestore.so.%%KDE4_KDELIBS_VERSION%%
 lib/libfolderarchivesettings.so
 lib/libfolderarchivesettings.so.4
-lib/libfolderarchivesettings.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libfolderarchivesettings.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkdepim-copy.so
 lib/libkdepim-copy.so.4
-lib/libkdepim-copy.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkdepim-copy.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkmindexreader.so
 lib/libkmindexreader.so.4
-lib/libkmindexreader.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmindexreader.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmaildir.so
 lib/libmaildir.so.4
-lib/libmaildir.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmaildir.so.%%KDE4_KDELIBS_VERSION%%
 share/akonadi/agents/akonadinepomukfeederagent.desktop
 share/akonadi/agents/akonotesresource.desktop
 share/akonadi/agents/birthdaysresource.desktop
@@ -161,6 +161,7 @@ share/apps/akonadi/accountwizard/vcard/vcardwizard.ui
 share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.desktop
 share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.es
 share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.ui
+share/apps/akonadi/firstrun/birthdaycalendar
 share/apps/akonadi/firstrun/defaultaddressbook
 share/apps/akonadi/firstrun/defaultcalendar
 share/apps/akonadi/firstrun/defaultnotebook
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index f61c194f9d11..30bd3bff84d2 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	kdepim
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTVERSION=	${KDE4_KDELIBS_VERSION}
 CATEGORIES=	deskutils kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -25,7 +24,7 @@ CONFLICTS_INSTALL=	kdepim44-4.*
 USE_GNOME=	libxml2 libxslt:build
 USE_KDE4=	kdelibs pimlibs kactivities \
 		akonadi automoc4 soprano nepomuk-widgets baloo
-USES=		cmake:outsource gmake shebangfix tar:xz
+USES=		cmake:outsource gmake iconv shebangfix tar:xz
 SHEBANG_FILES=	agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
 		kalarm/*.pl kmail/kconf_update/*.pl \
 		libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 368a7dabb85d..b039a96b1ada 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/kdepim-4.14.3.tar.xz) = a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944
-SIZE (KDE/4.14.3/kdepim-4.14.3.tar.xz) = 14483432
+TIMESTAMP = 1465935710
+SHA256 (KDE/4.14.10/kdepim-4.14.10.tar.xz) = edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2
+SIZE (KDE/4.14.10/kdepim-4.14.10.tar.xz) = 14585020
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index cb243d70272e..4210fd11ddf1 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -161,58 +161,61 @@ lib/kde4/plugins/designer/pimcommonwidgets.so
 lib/kde4/plugins/grantlee/%%GRANTLEE_VER%%/grantlee_messageheaderfilters.so
 lib/libakonadi_next.so
 lib/libakonadi_next.so.4
-lib/libakonadi_next.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi_next.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakregatorinterfaces.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakregatorprivate.so.%%KDE4_KDELIBS_VERSION%%
+lib/libcalendarsupportcollectionpage.so
+lib/libcalendarsupportcollectionpage.so.4
+lib/libcalendarsupportcollectionpage.so.%%KDE4_KDELIBS_VERSION%%
 lib/libcalendarsupport.so
 lib/libcalendarsupport.so.4
-lib/libcalendarsupport.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libcalendarsupport.so.%%KDE4_KDELIBS_VERSION%%
 lib/libcomposereditorng.so
 lib/libcomposereditorng.so.4
-lib/libcomposereditorng.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libcomposereditorng.so.%%KDE4_KDELIBS_VERSION%%
 lib/libeventviews.so
 lib/libeventviews.so.4
-lib/libeventviews.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libeventviews.so.%%KDE4_KDELIBS_VERSION%%
 lib/libfollowupreminder.so
 lib/libfollowupreminder.so.4
-lib/libfollowupreminder.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libfollowupreminder.so.%%KDE4_KDELIBS_VERSION%%
 lib/libgrantleetheme.so
 lib/libgrantleetheme.so.4
-lib/libgrantleetheme.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libgrantleetheme.so.%%KDE4_KDELIBS_VERSION%%
 lib/libgrantleethemeeditor.so
 lib/libgrantleethemeeditor.so.4
-lib/libgrantleethemeeditor.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libgrantleethemeeditor.so.%%KDE4_KDELIBS_VERSION%%
 lib/libincidenceeditorsng.so
 lib/libincidenceeditorsng.so.4
-lib/libincidenceeditorsng.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libincidenceeditorsng.so.%%KDE4_KDELIBS_VERSION%%
 lib/libincidenceeditorsngmobile.so
 lib/libincidenceeditorsngmobile.so.4
-lib/libincidenceeditorsngmobile.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libincidenceeditorsngmobile.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkaddressbookgrantlee.so.4
-lib/libkaddressbookgrantlee.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkaddressbookgrantlee.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkaddressbookprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkcal_resourceblog.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkcal_resourceremote.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkdepim.so
 lib/libkdepim.so.4
-lib/libkdepim.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkdepim.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkdepimdbusinterfaces.so
 lib/libkdepimdbusinterfaces.so.4
-lib/libkdepimdbusinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkdepimdbusinterfaces.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkdgantt2.so
 lib/libkdgantt2.so.0
 lib/libkdgantt2.so.0.1.0
 lib/libkleo.so
 lib/libkleo.so.4
-lib/libkleo.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkleo.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkleopatraclientcore.so
 lib/libkleopatraclientcore.so.0
 lib/libkleopatraclientcore.so.0.3.0
@@ -220,64 +223,66 @@ lib/libkleopatraclientgui.so
 lib/libkleopatraclientgui.so.0
 lib/libkleopatraclientgui.so.0.3.0
 lib/libkmailprivate.so.4
-lib/libkmailprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmailprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkmanagesieve.so
 lib/libkmanagesieve.so.4
-lib/libkmanagesieve.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmanagesieve.so.%%KDE4_KDELIBS_VERSION%%
 lib/libknodecommon.so
 lib/libknodecommon.so.4
-lib/libknodecommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknodecommon.so.%%KDE4_KDELIBS_VERSION%%
 lib/libknotesprivate.so.4
-lib/libknotesprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknotesprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkontactprivate.so.4
-lib/libkontactprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkontactprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkorganizer_core.so
 lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkorganizer_core.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkorganizer_interfaces.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkorganizerprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkpgp.so
 lib/libkpgp.so.4
-lib/libkpgp.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkpgp.so.%%KDE4_KDELIBS_VERSION%%
 lib/libksieve.so
 lib/libksieve.so.4
-lib/libksieve.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libksieve.so.%%KDE4_KDELIBS_VERSION%%
 lib/libksieveui.so
 lib/libksieveui.so.4
-lib/libksieveui.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libksieveui.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmailcommon.so
 lib/libmailcommon.so.4
-lib/libmailcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmailcommon.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmailimporter.so
 lib/libmailimporter.so.4
-lib/libmailimporter.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmailimporter.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmessagecomposer.so
 lib/libmessagecomposer.so.4
-lib/libmessagecomposer.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmessagecomposer.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmessagecore.so
 lib/libmessagecore.so.4
-lib/libmessagecore.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmessagecore.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmessagelist.so
 lib/libmessagelist.so.4
-lib/libmessagelist.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmessagelist.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmessageviewer.so
 lib/libmessageviewer.so.4
-lib/libmessageviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmessageviewer.so.%%KDE4_KDELIBS_VERSION%%
 lib/libnoteshared.so
 lib/libnoteshared.so.4
-lib/libnoteshared.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libnoteshared.so.%%KDE4_KDELIBS_VERSION%%
 lib/libpimcommon.so
 lib/libpimcommon.so.4
-lib/libpimcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libpimcommon.so.%%KDE4_KDELIBS_VERSION%%
+lib/libpimsettingexporterprivate.so.4
+lib/libpimsettingexporterprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libsendlater.so
 lib/libsendlater.so.4
-lib/libsendlater.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libsendlater.so.%%KDE4_KDELIBS_VERSION%%
 lib/libtemplateparser.so
 lib/libtemplateparser.so.4
-lib/libtemplateparser.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libtemplateparser.so.%%KDE4_KDELIBS_VERSION%%
 man/man1/kabcclient.1.gz
 share/akonadi/agents/archivemailagent.desktop
 share/akonadi/agents/folderarchiveagent.desktop
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index b8ee06d91c4f..d9dbb22dfe6a 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	kdepimlibs
-PORTVERSION=	${KDE4_VERSION}
+PORTVERSION=	${KDE4_KDELIBS_VERSION}
 PORTREVISION=	2
 CATEGORIES=	deskutils kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 7edca4dd2579..7eb162ea63c1 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/kdepimlibs-4.14.3.tar.xz) = 65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7
-SIZE (KDE/4.14.3/kdepimlibs-4.14.3.tar.xz) = 2790888
+TIMESTAMP = 1465935711
+SHA256 (KDE/4.14.10/kdepimlibs-4.14.10.tar.xz) = c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2
+SIZE (KDE/4.14.10/kdepimlibs-4.14.10.tar.xz) = 2831160
diff --git a/deskutils/kdepimlibs4/files/patch-git_8d49c611 b/deskutils/kdepimlibs4/files/patch-git_8d49c611
deleted file mode 100644
index 1c1301e3391c..000000000000
--- a/deskutils/kdepimlibs4/files/patch-git_8d49c611
+++ /dev/null
@@ -1,24 +0,0 @@
-Avoid errors on FreeBSD 9.3:
-
-/usr/local/include/kde4/akonadi/resourcebase.h:784: error: extra ';'
-/usr/local/include/kde4/akonadi/resourcebase.h:785: error: extra ';'
-
-commit 8d49c611948364aa9e7594b4e130e26ccd72da5e
-Author: Sergio Martins <iamsergio@gmail.com>
-Date:   Sun May 3 00:18:51 2015 +0100
-
-    Remove uneeded semi-colon from Q_PRIVATE_SLOT
-
---- akonadi/resourcebase.h.orig	2014-11-04 21:19:27 UTC
-+++ akonadi/resourcebase.h
-@@ -781,8 +781,8 @@ private:
-     Q_PRIVATE_SLOT(d_func(), void slotSessionReconnected())
-     Q_PRIVATE_SLOT(d_func(), void slotRecursiveMoveReplay(RecursiveMover *))
-     Q_PRIVATE_SLOT(d_func(), void slotRecursiveMoveReplayResult(KJob *))
--    Q_PRIVATE_SLOT(d_func(), void slotItemRetrievalCollectionFetchDone(KJob *));
--    Q_PRIVATE_SLOT(d_func(), void slotAttributeRetrievalCollectionFetchDone(KJob *));
-+    Q_PRIVATE_SLOT(d_func(), void slotItemRetrievalCollectionFetchDone(KJob *))
-+    Q_PRIVATE_SLOT(d_func(), void slotAttributeRetrievalCollectionFetchDone(KJob *))
- };
- 
- }
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index 814ee7c2168b..134e03723f62 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -162,11 +162,13 @@ include/kde4/KDE/KABC/ContactGroup
 include/kde4/KDE/KABC/ContactGroupTool
 include/kde4/KDE/KABC/DistributionList
 include/kde4/KDE/KABC/DistributionListDialog
+include/kde4/KDE/KABC/Email
 include/kde4/KDE/KABC/EmailSelectDialog
 include/kde4/KDE/KABC/ErrorHandler
 include/kde4/KDE/KABC/Field
 include/kde4/KDE/KABC/Format
 include/kde4/KDE/KABC/FormatFactory
+include/kde4/KDE/KABC/Gender
 include/kde4/KDE/KABC/Geo
 include/kde4/KDE/KABC/Key
 include/kde4/KDE/KABC/LDIFConverter
@@ -632,12 +634,14 @@ include/kde4/akonadi/tag.h
 include/kde4/akonadi/tagattribute.h
 include/kde4/akonadi/tagcreatejob.h
 include/kde4/akonadi/tagdeletejob.h
+include/kde4/akonadi/tageditwidget.h
 include/kde4/akonadi/tagfetchjob.h
 include/kde4/akonadi/tagfetchscope.h
 include/kde4/akonadi/tagmanagementdialog.h
 include/kde4/akonadi/tagmodel.h
 include/kde4/akonadi/tagmodifyjob.h
 include/kde4/akonadi/tagselectiondialog.h
+include/kde4/akonadi/tagselectwidget.h
 include/kde4/akonadi/tagwidget.h
 include/kde4/akonadi/transactionjobs.h
 include/kde4/akonadi/transactionsequence.h
@@ -693,18 +697,23 @@ include/kde4/kabc/addressee.h
 include/kde4/kabc/addresseedialog.h
 include/kde4/kabc/addresseelist.h
 include/kde4/kabc/addresslineedit.h
+include/kde4/kabc/calendarurl.h
 include/kde4/kabc/contactgroup.h
 include/kde4/kabc/contactgrouptool.h
 include/kde4/kabc/distributionlist.h
 include/kde4/kabc/distributionlistdialog.h
+include/kde4/kabc/email.h
 include/kde4/kabc/emailselectdialog.h
 include/kde4/kabc/errorhandler.h
 include/kde4/kabc/field.h
 include/kde4/kabc/format.h
 include/kde4/kabc/formatfactory.h
+include/kde4/kabc/gender.h
 include/kde4/kabc/geo.h
+include/kde4/kabc/impp.h
 include/kde4/kabc/kabc_export.h
 include/kde4/kabc/key.h
+include/kde4/kabc/lang.h
 include/kde4/kabc/ldifconverter.h
 include/kde4/kabc/lock.h
 include/kde4/kabc/locknull.h
@@ -1106,31 +1115,31 @@ lib/kde4/plugins/designer/akonadiwidgets.so
 lib/kde4/plugins/designer/kholidayswidgets.so
 lib/libakonadi-calendar.so
 lib/libakonadi-calendar.so.4
-lib/libakonadi-calendar.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-calendar.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-contact.so
 lib/libakonadi-contact.so.4
-lib/libakonadi-contact.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-contact.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-kabc.so
 lib/libakonadi-kabc.so.4
-lib/libakonadi-kabc.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-kabc.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-kcal.so
 lib/libakonadi-kcal.so.4
-lib/libakonadi-kcal.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-kcal.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-kde.so
 lib/libakonadi-kde.so.4
-lib/libakonadi-kde.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-kde.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-kmime.so
 lib/libakonadi-kmime.so.4
-lib/libakonadi-kmime.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-kmime.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-notes.so
 lib/libakonadi-notes.so.4
-lib/libakonadi-notes.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-notes.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-socialutils.so
 lib/libakonadi-socialutils.so.4
-lib/libakonadi-socialutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-socialutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libakonadi-xml.so
 lib/libakonadi-xml.so.4
-lib/libakonadi-xml.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-xml.so.%%KDE4_KDELIBS_VERSION%%
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
 lib/libgpgme++-pthread.so.2.8.0
@@ -1139,73 +1148,73 @@ lib/libgpgme++.so.2
 lib/libgpgme++.so.2.8.0
 lib/libkabc.so
 lib/libkabc.so.4
-lib/libkabc.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkabc.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkabc_file_core.so
 lib/libkabc_file_core.so.4
-lib/libkabc_file_core.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkabc_file_core.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkalarmcal.so
 lib/libkalarmcal.so.2
 lib/libkalarmcal.so.2.7.0
 lib/libkblog.so
 lib/libkblog.so.4
-lib/libkblog.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkblog.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkcal.so
 lib/libkcal.so.4
-lib/libkcal.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkcal.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkcalcore.so
 lib/libkcalcore.so.4
-lib/libkcalcore.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkcalcore.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkcalutils.so
 lib/libkcalutils.so.4
-lib/libkcalutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkcalutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkholidays.so
 lib/libkholidays.so.4
-lib/libkholidays.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkholidays.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkimap.so
 lib/libkimap.so.4
-lib/libkimap.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkimap.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkldap.so
 lib/libkldap.so.4
-lib/libkldap.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkldap.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkmbox.so
 lib/libkmbox.so.4
-lib/libkmbox.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmbox.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkmime.so
 lib/libkmime.so.4
-lib/libkmime.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmime.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkontactinterface.so
 lib/libkontactinterface.so.4
-lib/libkontactinterface.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkontactinterface.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkpimidentities.so
 lib/libkpimidentities.so.4
-lib/libkpimidentities.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkpimidentities.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkpimtextedit.so
 lib/libkpimtextedit.so.4
-lib/libkpimtextedit.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkpimtextedit.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkpimutils.so
 lib/libkpimutils.so.4
-lib/libkpimutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkpimutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkresources.so
 lib/libkresources.so.4
-lib/libkresources.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkresources.so.%%KDE4_KDELIBS_VERSION%%
 lib/libktnef.so
 lib/libktnef.so.4
-lib/libktnef.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libktnef.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkxmlrpcclient.so
 lib/libkxmlrpcclient.so.4
-lib/libkxmlrpcclient.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkxmlrpcclient.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmailtransport.so
 lib/libmailtransport.so.4
-lib/libmailtransport.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmailtransport.so.%%KDE4_KDELIBS_VERSION%%
 lib/libmicroblog.so
 lib/libmicroblog.so.4
-lib/libmicroblog.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libmicroblog.so.%%KDE4_KDELIBS_VERSION%%
 lib/libqgpgme.so
 lib/libqgpgme.so.1
 lib/libqgpgme.so.1.0.1
 lib/libsyndication.so
 lib/libsyndication.so.4
-lib/libsyndication.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libsyndication.so.%%KDE4_KDELIBS_VERSION%%
 share/akonadi/agents/knutresource.desktop
 share/apps/akonadi-kde/kcfg2dbus.xsl
 share/apps/akonadi/akonadi-xml.xsd