Update to KDE SC 4.14.3

33 files changed, 531 insertions, 1762 deletions

diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 21a7e0be067..6d592f1bb0b 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.69 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.70 2014/11/13 19:19:08 markd Exp $
 
-#DISTNAME=	kdepim-${_KDE_VERSION}
-DISTNAME=	kdepim-4.4.11.1
+DISTNAME=	kdepim-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-MASTER_SITES=	${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
-PKGREVISION=	38
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
-EXTRACT_SUFX=	.tar.bz2
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
+USE_TOOLS+=	gmake
+
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-CMAKE_ARGS+=-DMAL_BASE:STRING=${BUILDLINK_PREFIX.libmal}
+CMAKE_ARGS+=-DKDEPIM_BUILD_MOBILE=OFF
 
 CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
 		ktimetracker/test/booktime-badduration.sh \
@@ -27,6 +25,7 @@ CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
 REPLACE_BASH+=	kmail/kconf_update/kmail-*.sh
 
 REPLACE_PERL+= \
+	agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
 	kalarm/kalarm-1.2.1-general.pl \
 	kalarm/kalarm-1.9.5-defaults.pl \
 	kalarm/kalarm-2.0.2-general.pl \
@@ -49,7 +48,9 @@ REPLACE_PERL+= \
 	kmail/kconf_update/upgrade-signature.pl \
 	kmail/kconf_update/upgrade-transport.pl \
 	kresources/kolab/upgrade-resourcetype.pl \
-	libkpgp/kpgp-3.1-upgrade-address-data.pl
+	libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
+
+PLIST_SUBST+=		KDE_VERSION=${_KDE_VERSION}
 
 SUBST_CLASSES+=		perlfix
 SUBST_STAGE.perlfix=	pre-configure
@@ -61,15 +62,16 @@ BUILDLINK_DEPMETHOD.qt4-tools=full
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
-.include "../../comms/libmal/buildlink3.mk"
-.include "../../comms/libopensync/buildlink3.mk"
-.include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/grantlee/buildlink3.mk"
+.include "../../devel/libkgapi/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/libassuan2/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
+.include "../../sysutils/baloo/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kde-runtime4/buildlink3.mk"
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index 5870f52d8ea..d02688ec6b9 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,11 +1,18 @@
-@comment $NetBSD: PLIST,v 1.12 2014/02/01 02:20:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/11/13 19:19:08 markd Exp $
+bin/akonadi_archivemail_agent
+bin/akonadi_followupreminder_agent
+bin/akonadi_mailfilter_agent
+bin/akonadi_notes_agent
+bin/akonadi_sendlater_agent
 bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
 bin/blogilo
-bin/groupwarewizard
-bin/groupwisewizard
+bin/calendarjanitor
+bin/contactthemeeditor
+bin/headerthemeeditor
 bin/ical2vcal
+bin/importwizard
 bin/kabc2mutt
 bin/kabcclient
 bin/kaddressbook
@@ -13,6 +20,7 @@ bin/kalarm
 bin/kalarmautostart
 bin/karm
 bin/kgpgconf
+bin/kincidenceeditor
 bin/kjots
 bin/kleopatra
 bin/kmail
@@ -23,38 +31,31 @@ bin/kmail_sav.sh
 bin/kmailcvt
 bin/knode
 bin/knotes
-bin/kolabwizard
 bin/konsolekalendar
 bin/kontact
 bin/korgac
 bin/korganizer
 bin/ksendemail
 bin/ktimetracker
+bin/ktnef
 bin/kwatchgnupg
-bin/sloxwizard
+bin/mboximporter
+bin/pimsettingexporter
+bin/sieveeditor
+bin/storageservicemanager
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
 lib/kde4/akregator_config_advanced.so
 lib/kde4/akregator_config_appearance.so
 lib/kde4/akregator_config_archive.so
 lib/kde4/akregator_config_browser.so
 lib/kde4/akregator_config_general.so
+lib/kde4/akregator_config_sharemicroblog.so
 lib/kde4/akregator_mk4storage_plugin.so
+lib/kde4/akregator_sharemicroblog_plugin.so
 lib/kde4/akregatorpart.so
-lib/kde4/kabc_groupdav.so
-lib/kde4/kabc_groupwise.so
-lib/kde4/kabc_kolab.so
-lib/kde4/kabc_slox.so
 lib/kde4/kaddressbookpart.so
-lib/kde4/kalarm_local.so
-lib/kde4/kalarm_localdir.so
-lib/kde4/kalarm_remote.so
 lib/kde4/kcal_blog.so
-lib/kde4/kcal_groupdav.so
-lib/kde4/kcal_groupwise.so
-lib/kde4/kcal_kabc.so
-lib/kde4/kcal_kolab.so
 lib/kde4/kcal_remote.so
-lib/kde4/kcal_slox.so
 lib/kde4/kcm_apptsummary.so
 lib/kde4/kcm_kjots.so
 lib/kde4/kcm_kleopatra.so
@@ -62,22 +63,18 @@ lib/kde4/kcm_kmail.so
 lib/kde4/kcm_kmailsummary.so
 lib/kde4/kcm_knode.so
 lib/kde4/kcm_knote.so
+lib/kde4/kcm_knotessummary.so
 lib/kde4/kcm_kontact.so
 lib/kde4/kcm_kontactsummary.so
 lib/kde4/kcm_korganizer.so
+lib/kde4/kcm_kpimidentities.so
 lib/kde4/kcm_ktimetracker.so
 lib/kde4/kcm_ldap.so
+lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
-lib/kde4/kio_groupwise.so
 lib/kde4/kjotspart.so
-lib/kde4/kmail_bodypartformatter_application_octetstream.so
-lib/kde4/kmail_bodypartformatter_text_calendar.so
-lib/kde4/kmail_bodypartformatter_text_vcard.so
-lib/kde4/kmail_bodypartformatter_text_xdiff.so
 lib/kde4/kmailpart.so
 lib/kde4/knodepart.so
-lib/kde4/knotes_kolab.so
-lib/kde4/knotes_local.so
 lib/kde4/kontact_akregatorplugin.so
 lib/kde4/kontact_journalplugin.so
 lib/kde4/kontact_kaddressbookplugin.so
@@ -86,149 +83,166 @@ 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_specialdatesplugin.so
 lib/kde4/kontact_summaryplugin.so
 lib/kde4/kontact_todoplugin.so
 lib/kde4/korg_datenums.so
 lib/kde4/korg_hebrew.so
-lib/kde4/korg_journalprint.so
 lib/kde4/korg_picoftheday.so
 lib/kde4/korg_thisdayinhistory.so
-lib/kde4/korg_yearprint.so
 lib/kde4/korganizerpart.so
-lib/kde4/kpartsdesignerplugin.so
 lib/kde4/ktexteditorkabcbridge.so
 lib/kde4/ktimetrackerpart.so
+lib/kde4/libexec/kalarm_helper
+lib/kde4/messageviewer_bodypartformatter_application_mstnef.so
+lib/kde4/messageviewer_bodypartformatter_text_calendar.so
+lib/kde4/messageviewer_bodypartformatter_text_vcard.so
+lib/kde4/messageviewer_bodypartformatter_text_xdiff.so
+lib/kde4/plasma_applet_akonotes_list.so
+lib/kde4/plasma_applet_akonotes_note.so
+lib/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so
 lib/kde4/plugins/designer/kdepimwidgets.so
-lib/libakonadi-kcal_next.so
-lib/libakonadi-kcal_next.so.4
-lib/libakonadi-kcal_next.so.4.11.5
+lib/kde4/plugins/designer/mailcommonwidgets.so
+lib/kde4/plugins/designer/pimcommonwidgets.so
+lib/kde4/plugins/grantlee/0.5/grantlee_messageheaderfilters.so
 lib/libakonadi_next.so
 lib/libakonadi_next.so.4
-lib/libakonadi_next.so.4.11.5
+lib/libakonadi_next.so.${PKGVERSION}
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.4.11.5
+lib/libakregatorinterfaces.so.${PKGVERSION}
 lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.4.11.5
-lib/libgwsoap.so
-lib/libgwsoap.so.4
-lib/libgwsoap.so.4.11.5
-lib/libkabc_groupdav.so
-lib/libkabc_groupdav.so.4
-lib/libkabc_groupdav.so.4.11.5
-lib/libkabc_slox.so
-lib/libkabc_slox.so.4
-lib/libkabc_slox.so.4.11.5
-lib/libkabcgroupwise.so
-lib/libkabcgroupwise.so.4
-lib/libkabcgroupwise.so.4.11.5
-lib/libkabckolab.so
-lib/libkabckolab.so.4
-lib/libkabckolab.so.4.11.5
+lib/libakregatorprivate.so.${PKGVERSION}
+lib/libcalendarsupport.so
+lib/libcalendarsupport.so.4
+lib/libcalendarsupport.so.${PKGVERSION}
+lib/libcomposereditorng.so
+lib/libcomposereditorng.so.4
+lib/libcomposereditorng.so.${PKGVERSION}
+lib/libeventviews.so
+lib/libeventviews.so.4
+lib/libeventviews.so.${PKGVERSION}
+lib/libfollowupreminder.so
+lib/libfollowupreminder.so.4
+lib/libfollowupreminder.so.${PKGVERSION}
+lib/libgrantleetheme.so
+lib/libgrantleetheme.so.4
+lib/libgrantleetheme.so.${PKGVERSION}
+lib/libgrantleethemeeditor.so
+lib/libgrantleethemeeditor.so.4
+lib/libgrantleethemeeditor.so.${PKGVERSION}
+lib/libincidenceeditorsng.so
+lib/libincidenceeditorsng.so.4
+lib/libincidenceeditorsng.so.${PKGVERSION}
+lib/libincidenceeditorsngmobile.so
+lib/libincidenceeditorsngmobile.so.4
+lib/libincidenceeditorsngmobile.so.${PKGVERSION}
+lib/libkaddressbookgrantlee.so.4
+lib/libkaddressbookgrantlee.so.${PKGVERSION}
 lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.4.11.5
-lib/libkalarm_calendar.so
-lib/libkalarm_calendar.so.4
-lib/libkalarm_calendar.so.4.11.5
-lib/libkalarm_resources.so
-lib/libkalarm_resources.so.4
-lib/libkalarm_resources.so.4.11.5
-lib/libkcal_groupdav.so
-lib/libkcal_groupdav.so.4
-lib/libkcal_groupdav.so.4.11.5
+lib/libkaddressbookprivate.so.${PKGVERSION}
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.4.11.5
+lib/libkcal_resourceblog.so.${PKGVERSION}
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.4.11.5
-lib/libkcal_slox.so
-lib/libkcal_slox.so.4
-lib/libkcal_slox.so.4.11.5
-lib/libkcalgroupwise.so
-lib/libkcalgroupwise.so.4
-lib/libkcalgroupwise.so.4.11.5
-lib/libkcalkolab.so
-lib/libkcalkolab.so.4
-lib/libkcalkolab.so.4.11.5
+lib/libkcal_resourceremote.so.${PKGVERSION}
 lib/libkdepim.so
 lib/libkdepim.so.4
-lib/libkdepim.so.4.11.5
-lib/libkgroupwarebase.so
-lib/libkgroupwarebase.so.4
-lib/libkgroupwarebase.so.4.11.5
-lib/libkgroupwaredav.so
-lib/libkgroupwaredav.so.4
-lib/libkgroupwaredav.so.4.11.5
+lib/libkdepim.so.${PKGVERSION}
+lib/libkdepimdbusinterfaces.so
+lib/libkdepimdbusinterfaces.so.4
+lib/libkdepimdbusinterfaces.so.${PKGVERSION}
+lib/libkdgantt2.so
+lib/libkdgantt2.so.0
+lib/libkdgantt2.so.0.1.0
 lib/libkleo.so
 lib/libkleo.so.4
-lib/libkleo.so.4.11.5
+lib/libkleo.so.${PKGVERSION}
 lib/libkleopatraclientcore.so
 lib/libkleopatraclientcore.so.0
-lib/libkleopatraclientcore.so.0.2.1
+lib/libkleopatraclientcore.so.0.3.0
 lib/libkleopatraclientgui.so
 lib/libkleopatraclientgui.so.0
-lib/libkleopatraclientgui.so.0.2.1
+lib/libkleopatraclientgui.so.0.3.0
 lib/libkmailprivate.so.4
-lib/libkmailprivate.so.4.11.5
+lib/libkmailprivate.so.${PKGVERSION}
+lib/libkmanagesieve.so
+lib/libkmanagesieve.so.4
+lib/libkmanagesieve.so.${PKGVERSION}
 lib/libknodecommon.so
 lib/libknodecommon.so.4
-lib/libknodecommon.so.4.11.5
-lib/libknoteskolab.so
-lib/libknoteskolab.so.4
-lib/libknoteskolab.so.4.11.5
+lib/libknodecommon.so.${PKGVERSION}
+lib/libknotesprivate.so.4
+lib/libknotesprivate.so.${PKGVERSION}
 lib/libkontactprivate.so.4
-lib/libkontactprivate.so.4.11.5
-lib/libkorg_stdprinting.so
-lib/libkorg_stdprinting.so.4
-lib/libkorg_stdprinting.so.4.11.5
-lib/libkorganizer_calendar.so
-lib/libkorganizer_calendar.so.4
-lib/libkorganizer_calendar.so.4.11.5
+lib/libkontactprivate.so.${PKGVERSION}
 lib/libkorganizer_core.so
 lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.4.11.5
-lib/libkorganizer_eventviewer.so
-lib/libkorganizer_eventviewer.so.4
-lib/libkorganizer_eventviewer.so.4.11.5
+lib/libkorganizer_core.so.${PKGVERSION}
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.4.11.5
+lib/libkorganizer_interfaces.so.${PKGVERSION}
 lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.4.11.5
+lib/libkorganizerprivate.so.${PKGVERSION}
 lib/libkpgp.so
 lib/libkpgp.so.4
-lib/libkpgp.so.4.11.5
+lib/libkpgp.so.${PKGVERSION}
 lib/libksieve.so
 lib/libksieve.so.4
-lib/libksieve.so.4.11.5
-lib/libkslox.so
-lib/libkslox.so.4
-lib/libkslox.so.4.11.5
+lib/libksieve.so.${PKGVERSION}
+lib/libksieveui.so
+lib/libksieveui.so.4
+lib/libksieveui.so.${PKGVERSION}
+lib/libmailcommon.so
+lib/libmailcommon.so.4
+lib/libmailcommon.so.${PKGVERSION}
+lib/libmailimporter.so
+lib/libmailimporter.so.4
+lib/libmailimporter.so.${PKGVERSION}
+lib/libmessagecomposer.so
+lib/libmessagecomposer.so.4
+lib/libmessagecomposer.so.${PKGVERSION}
 lib/libmessagecore.so
 lib/libmessagecore.so.4
-lib/libmessagecore.so.4.11.5
+lib/libmessagecore.so.${PKGVERSION}
 lib/libmessagelist.so
 lib/libmessagelist.so.4
-lib/libmessagelist.so.4.11.5
+lib/libmessagelist.so.${PKGVERSION}
 lib/libmessageviewer.so
-lib/libmessageviewer.so.0
-lib/libmessageviewer.so.0.1.0
-lib/libmimelib.so
-lib/libmimelib.so.4
-lib/libmimelib.so.4.11.5
-lib/strigi/strigiea_ics.so
-lib/strigi/strigiea_vcf.so
+lib/libmessageviewer.so.4
+lib/libmessageviewer.so.${PKGVERSION}
+lib/libnoteshared.so
+lib/libnoteshared.so.4
+lib/libnoteshared.so.${PKGVERSION}
+lib/libpimcommon.so
+lib/libpimcommon.so.4
+lib/libpimcommon.so.${PKGVERSION}
+lib/libsendlater.so
+lib/libsendlater.so.4
+lib/libsendlater.so.${PKGVERSION}
+lib/libtemplateparser.so
+lib/libtemplateparser.so.4
+lib/libtemplateparser.so.${PKGVERSION}
 man/man1/kabcclient.1
-share/applications/kde4/KMail.desktop
+share/PolicyKit/policy/org.kde.kalarmrtcwake.policy
+share/akonadi/agents/archivemailagent.desktop
+share/akonadi/agents/folderarchiveagent.desktop
+share/akonadi/agents/followupreminder.desktop
+share/akonadi/agents/mailfilteragent.desktop
+share/akonadi/agents/notesagent.desktop
+share/akonadi/agents/sendlateragent.desktop
+share/applications/kde4/KMail2.desktop
 share/applications/kde4/KNode.desktop
 share/applications/kde4/Kjots.desktop
 share/applications/kde4/Kontact.desktop
 share/applications/kde4/akonadiconsole.desktop
 share/applications/kde4/akregator.desktop
 share/applications/kde4/blogilo.desktop
-share/applications/kde4/groupwarewizard.desktop
+share/applications/kde4/contactthemeeditor.desktop
+share/applications/kde4/headerthemeeditor.desktop
+share/applications/kde4/importwizard.desktop
+share/applications/kde4/kaddressbook-importer.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
 share/applications/kde4/kleopatra.desktop
@@ -240,6 +254,11 @@ share/applications/kde4/kontact-admin.desktop
 share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
 share/applications/kde4/ktimetracker.desktop
+share/applications/kde4/ktnef.desktop
+share/applications/kde4/mboximporter.desktop
+share/applications/kde4/pimsettingexporter.desktop
+share/applications/kde4/sieveeditor.desktop
+share/applications/kde4/storageservicemanager.desktop
 share/dbus-1/interfaces/org.kde.KNotes.xml
 share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
 share/dbus-1/interfaces/org.kde.addressbook.service.xml
@@ -247,13 +266,29 @@ share/dbus-1/interfaces/org.kde.akregator.part.xml
 share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml
 share/dbus-1/interfaces/org.kde.kmail.kmail.xml
 share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml
-share/dbus-1/interfaces/org.kde.kmail.mailcomposer.xml
 share/dbus-1/interfaces/org.kde.knode.xml
 share/dbus-1/interfaces/org.kde.kontact.KNotes.xml
 share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml
 share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
 share/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
 share/dbus-1/interfaces/org.kde.mailtransport.service.xml
+share/dbus-1/system-services/org.kde.kalarmrtcwake.service
+share/doc/kde/HTML/en/akonadi_archivemail_agent/add-archive-mail.png
+share/doc/kde/HTML/en/akonadi_archivemail_agent/common
+share/doc/kde/HTML/en/akonadi_archivemail_agent/configure-archive-mail-agent.png
+share/doc/kde/HTML/en/akonadi_archivemail_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_archivemail_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_followupreminder_agent/common
+share/doc/kde/HTML/en/akonadi_followupreminder_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_followupreminder_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_notes_agent/common
+share/doc/kde/HTML/en/akonadi_notes_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_notes_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_sendlater_agent/common
+share/doc/kde/HTML/en/akonadi_sendlater_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_sendlater_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_sendlater_agent/sendlateragent-configure.png
+share/doc/kde/HTML/en/akonadi_sendlater_agent/sendlateragent-dialog.png
 share/doc/kde/HTML/en/akregator/add-feed.png
 share/doc/kde/HTML/en/akregator/add-feed2.png
 share/doc/kde/HTML/en/akregator/add-folder.png
@@ -263,6 +298,7 @@ share/doc/kde/HTML/en/akregator/appearance-tab.png
 share/doc/kde/HTML/en/akregator/archive-tab.png
 share/doc/kde/HTML/en/akregator/browser-tab.png
 share/doc/kde/HTML/en/akregator/common
+share/doc/kde/HTML/en/akregator/feed.png
 share/doc/kde/HTML/en/akregator/general-tab.png
 share/doc/kde/HTML/en/akregator/index.cache.bz2
 share/doc/kde/HTML/en/akregator/index.docbook
@@ -274,7 +310,7 @@ share/doc/kde/HTML/en/akregator/main-window3.png
 share/doc/kde/HTML/en/akregator/main-window4.png
 share/doc/kde/HTML/en/akregator/quick-filter.png
 share/doc/kde/HTML/en/akregator/rss.png
-share/doc/kde/HTML/en/akregator/rss3.png
+share/doc/kde/HTML/en/akregator/share-services-tab.png
 share/doc/kde/HTML/en/blogilo/add-blog-1.png
 share/doc/kde/HTML/en/blogilo/add-blog-2.png
 share/doc/kde/HTML/en/blogilo/common
@@ -286,6 +322,16 @@ share/doc/kde/HTML/en/blogilo/toolbox-1.png
 share/doc/kde/HTML/en/blogilo/toolbox-2.png
 share/doc/kde/HTML/en/blogilo/toolbox-3.png
 share/doc/kde/HTML/en/blogilo/toolbox-4.png
+share/doc/kde/HTML/en/contactthemeeditor/common
+share/doc/kde/HTML/en/contactthemeeditor/index.cache.bz2
+share/doc/kde/HTML/en/contactthemeeditor/index.docbook
+share/doc/kde/HTML/en/headerthemeeditor/common
+share/doc/kde/HTML/en/headerthemeeditor/index.cache.bz2
+share/doc/kde/HTML/en/headerthemeeditor/index.docbook
+share/doc/kde/HTML/en/importwizard/common
+share/doc/kde/HTML/en/importwizard/import-selection.png
+share/doc/kde/HTML/en/importwizard/index.cache.bz2
+share/doc/kde/HTML/en/importwizard/index.docbook
 share/doc/kde/HTML/en/kabcclient/common
 share/doc/kde/HTML/en/kabcclient/index.cache.bz2
 share/doc/kde/HTML/en/kabcclient/index.docbook
@@ -305,20 +351,49 @@ share/doc/kde/HTML/en/kioslave/news/index.docbook
 share/doc/kde/HTML/en/kjots/common
 share/doc/kde/HTML/en/kjots/index.cache.bz2
 share/doc/kde/HTML/en/kjots/index.docbook
+share/doc/kde/HTML/en/kjots/mainwindow.png
 share/doc/kde/HTML/en/kleopatra/common
 share/doc/kde/HTML/en/kleopatra/index.cache.bz2
 share/doc/kde/HTML/en/kleopatra/index.docbook
+share/doc/kde/HTML/en/kmail/accountwizard.png
+share/doc/kde/HTML/en/kmail/aggregationtheme.png
 share/doc/kde/HTML/en/kmail/common
 share/doc/kde/HTML/en/kmail/configure.docbook
+share/doc/kde/HTML/en/kmail/configure.png
 share/doc/kde/HTML/en/kmail/credits-and-licenses.docbook
 share/doc/kde/HTML/en/kmail/faq.docbook
+share/doc/kde/HTML/en/kmail/folder-example.png
+share/doc/kde/HTML/en/kmail/folder-properties.png
+share/doc/kde/HTML/en/kmail/folderarchiveagent.png
 share/doc/kde/HTML/en/kmail/getting-started.docbook
-share/doc/kde/HTML/en/kmail/importing.docbook
+share/doc/kde/HTML/en/kmail/identitiesadvanced.png
+share/doc/kde/HTML/en/kmail/identity.png
+share/doc/kde/HTML/en/kmail/identitycryptography.png
+share/doc/kde/HTML/en/kmail/identitygeneral.png
+share/doc/kde/HTML/en/kmail/identitypicture.png
+share/doc/kde/HTML/en/kmail/identitysignature.png
+share/doc/kde/HTML/en/kmail/identitytemplate.png
 share/doc/kde/HTML/en/kmail/index.cache.bz2
 share/doc/kde/HTML/en/kmail/index.docbook
 share/doc/kde/HTML/en/kmail/intro.docbook
+share/doc/kde/HTML/en/kmail/kmailwelcome.png
+share/doc/kde/HTML/en/kmail/layout.png
+share/doc/kde/HTML/en/kmail/mail-mark-important.png
+share/doc/kde/HTML/en/kmail/mail-mark-read.png
+share/doc/kde/HTML/en/kmail/mail-mark-task.png
+share/doc/kde/HTML/en/kmail/mail-mark-unread.png
+share/doc/kde/HTML/en/kmail/mail-thread-ignored.png
+share/doc/kde/HTML/en/kmail/mail-thread-watch.png
 share/doc/kde/HTML/en/kmail/menus.docbook
+share/doc/kde/HTML/en/kmail/message.png
+share/doc/kde/HTML/en/kmail/messagelisttheme.png
+share/doc/kde/HTML/en/kmail/smile.png
+share/doc/kde/HTML/en/kmail/troubleshooting.docbook
 share/doc/kde/HTML/en/kmail/using-kmail.docbook
+share/doc/kde/HTML/en/kmailcvt/common
+share/doc/kde/HTML/en/kmailcvt/index.cache.bz2
+share/doc/kde/HTML/en/kmailcvt/index.docbook
+share/doc/kde/HTML/en/kmailcvt/kmailcvt.png
 share/doc/kde/HTML/en/knode/commands.docbook
 share/doc/kde/HTML/en/knode/common
 share/doc/kde/HTML/en/knode/credits.docbook
@@ -373,12 +448,9 @@ share/doc/kde/HTML/en/kontact-admin/index.cache.bz2
 share/doc/kde/HTML/en/kontact-admin/index.docbook
 share/doc/kde/HTML/en/kontact/calendar-sidebar-icon.png
 share/doc/kde/HTML/en/kontact/common
-share/doc/kde/HTML/en/kontact/configuration-components.png
 share/doc/kde/HTML/en/kontact/configuration-main.png
-share/doc/kde/HTML/en/kontact/configuration-select-components.png
+share/doc/kde/HTML/en/kontact/configuration-shortcuts.png
 share/doc/kde/HTML/en/kontact/configuration-starting-component.png
-share/doc/kde/HTML/en/kontact/configuration-summary-view-kpilot.png
-share/doc/kde/HTML/en/kontact/configuration-summary-view.png
 share/doc/kde/HTML/en/kontact/index.cache.bz2
 share/doc/kde/HTML/en/kontact/index.docbook
 share/doc/kde/HTML/en/kontact/kaddressbook-sidebar-icon.png
@@ -386,72 +458,59 @@ share/doc/kde/HTML/en/kontact/main-view.png
 share/doc/kde/HTML/en/kontact/menu-bar-kmail.png
 share/doc/kde/HTML/en/kontact/menu-bar-korganizer.png
 share/doc/kde/HTML/en/kontact/menu-bar-summary.png
+share/doc/kde/HTML/en/kontact/navigator-bar-kontact.png
 share/doc/kde/HTML/en/kontact/new-menu.png
 share/doc/kde/HTML/en/kontact/settings-menu-kmail.png
 share/doc/kde/HTML/en/kontact/side-pane.png
+share/doc/kde/HTML/en/kontact/summary-selection.png
 share/doc/kde/HTML/en/kontact/summary-view-calendar.png
-share/doc/kde/HTML/en/kontact/summary-view-contacts.png
-share/doc/kde/HTML/en/kontact/summary-view-kpilot.png
 share/doc/kde/HTML/en/kontact/summary-view-mail.png
-share/doc/kde/HTML/en/kontact/summary-view-newsticker.png
 share/doc/kde/HTML/en/kontact/summary-view-notes.png
 share/doc/kde/HTML/en/kontact/summary-view-repositioning.png
+share/doc/kde/HTML/en/kontact/summary-view-special-dates.png
 share/doc/kde/HTML/en/kontact/summary-view-todos.png
-share/doc/kde/HTML/en/kontact/summary-view-weather.png
 share/doc/kde/HTML/en/kontact/summary-view.png
 share/doc/kde/HTML/en/kontact/todo-list-sidebar-icon.png
+share/doc/kde/HTML/en/korganizer/application-exit.png
+share/doc/kde/HTML/en/korganizer/appointment-new.png
 share/doc/kde/HTML/en/korganizer/common
+share/doc/kde/HTML/en/korganizer/document-open.png
+share/doc/kde/HTML/en/korganizer/document-print-preview.png
+share/doc/kde/HTML/en/korganizer/document-print.png
+share/doc/kde/HTML/en/korganizer/edit-copy.png
+share/doc/kde/HTML/en/korganizer/edit-cut.png
+share/doc/kde/HTML/en/korganizer/edit-delete.png
+share/doc/kde/HTML/en/korganizer/edit-find.png
+share/doc/kde/HTML/en/korganizer/edit-paste.png
+share/doc/kde/HTML/en/korganizer/edit-redo.png
+share/doc/kde/HTML/en/korganizer/edit-undo.png
 share/doc/kde/HTML/en/korganizer/event-attachments.png
 share/doc/kde/HTML/en/korganizer/event-attendees.png
-share/doc/kde/HTML/en/korganizer/event-freebusy.png
 share/doc/kde/HTML/en/korganizer/event-general.png
 share/doc/kde/HTML/en/korganizer/event-recurrence.png
+share/doc/kde/HTML/en/korganizer/go-jump-today.png
+share/doc/kde/HTML/en/korganizer/go-next.png
+share/doc/kde/HTML/en/korganizer/go-previous.png
 share/doc/kde/HTML/en/korganizer/groupevent.png
-share/doc/kde/HTML/en/korganizer/i_actions_newevent.png
-share/doc/kde/HTML/en/korganizer/i_actions_newtodo.png
-share/doc/kde/HTML/en/korganizer/i_copy.png
-share/doc/kde/HTML/en/korganizer/i_cut.png
-share/doc/kde/HTML/en/korganizer/i_edit_delete.png
-share/doc/kde/HTML/en/korganizer/i_edit_find.png
-share/doc/kde/HTML/en/korganizer/i_edit_redo.png
-share/doc/kde/HTML/en/korganizer/i_edit_undo.png
-share/doc/kde/HTML/en/korganizer/i_file_close.png
-share/doc/kde/HTML/en/korganizer/i_file_new.png
-share/doc/kde/HTML/en/korganizer/i_file_open.png
-share/doc/kde/HTML/en/korganizer/i_file_print.png
-share/doc/kde/HTML/en/korganizer/i_file_quit.png
-share/doc/kde/HTML/en/korganizer/i_file_revert.png
-share/doc/kde/HTML/en/korganizer/i_file_save.png
-share/doc/kde/HTML/en/korganizer/i_file_saveas.png
-share/doc/kde/HTML/en/korganizer/i_go_backward.png
-share/doc/kde/HTML/en/korganizer/i_go_forward.png
-share/doc/kde/HTML/en/korganizer/i_go_to_today.png
-share/doc/kde/HTML/en/korganizer/i_paste.png
-share/doc/kde/HTML/en/korganizer/i_settings_prefs.png
-share/doc/kde/HTML/en/korganizer/i_view_day.png
-share/doc/kde/HTML/en/korganizer/i_view_journal.png
-share/doc/kde/HTML/en/korganizer/i_view_list.png
-share/doc/kde/HTML/en/korganizer/i_view_month.png
-share/doc/kde/HTML/en/korganizer/i_view_todo_list.png
-share/doc/kde/HTML/en/korganizer/i_view_week.png
-share/doc/kde/HTML/en/korganizer/i_view_whatsnext.png
-share/doc/kde/HTML/en/korganizer/i_view_work_week.png
-share/doc/kde/HTML/en/korganizer/i_view_xdays.png
 share/doc/kde/HTML/en/korganizer/index.cache.bz2
 share/doc/kde/HTML/en/korganizer/index.docbook
 share/doc/kde/HTML/en/korganizer/korganizer-resource.png
-share/doc/kde/HTML/en/korganizer/o2v_importing1.png
-share/doc/kde/HTML/en/korganizer/o2v_importing2.png
-share/doc/kde/HTML/en/korganizer/o2v_importing3.png
-share/doc/kde/HTML/en/korganizer/o2v_main.png
-share/doc/kde/HTML/en/korganizer/o2v_progress.png
-share/doc/kde/HTML/en/korganizer/o2v_save.png
-share/doc/kde/HTML/en/korganizer/o2v_warning.png
+share/doc/kde/HTML/en/korganizer/list-add.png
 share/doc/kde/HTML/en/korganizer/organizer.png
-share/doc/kde/HTML/en/korganizer/outlook-to-vcalendar.docbook
-share/doc/kde/HTML/en/korganizer/plugins-chapter.docbook
 share/doc/kde/HTML/en/korganizer/remotefile-resource.png
 share/doc/kde/HTML/en/korganizer/todo-general.png
+share/doc/kde/HTML/en/korganizer/view-calendar-agenda.png
+share/doc/kde/HTML/en/korganizer/view-calendar-day.png
+share/doc/kde/HTML/en/korganizer/view-calendar-journal.png
+share/doc/kde/HTML/en/korganizer/view-calendar-list.png
+share/doc/kde/HTML/en/korganizer/view-calendar-month.png
+share/doc/kde/HTML/en/korganizer/view-calendar-tasks.png
+share/doc/kde/HTML/en/korganizer/view-calendar-timeline.png
+share/doc/kde/HTML/en/korganizer/view-calendar-upcoming-days.png
+share/doc/kde/HTML/en/korganizer/view-calendar-upcoming-events.png
+share/doc/kde/HTML/en/korganizer/view-calendar-week.png
+share/doc/kde/HTML/en/korganizer/view-calendar-workweek.png
+share/doc/kde/HTML/en/korganizer/view-task-add.png
 share/doc/kde/HTML/en/ktimetracker/common
 share/doc/kde/HTML/en/ktimetracker/csvexport.png
 share/doc/kde/HTML/en/ktimetracker/idle-detect.png
@@ -459,125 +518,194 @@ share/doc/kde/HTML/en/ktimetracker/index.cache.bz2
 share/doc/kde/HTML/en/ktimetracker/index.docbook
 share/doc/kde/HTML/en/ktimetracker/ktimetracker.png
 share/doc/kde/HTML/en/ktimetracker/systray.png
+share/doc/kde/HTML/en/ktnef/common
+share/doc/kde/HTML/en/ktnef/index.cache.bz2
+share/doc/kde/HTML/en/ktnef/index.docbook
+share/doc/kde/HTML/en/ktnef/mainwindow.png
+share/doc/kde/HTML/en/ktnef/winmail_dat.png
 share/doc/kde/HTML/en/kwatchgnupg/common
 share/doc/kde/HTML/en/kwatchgnupg/index.cache.bz2
 share/doc/kde/HTML/en/kwatchgnupg/index.docbook
+share/doc/kde/HTML/en/pimsettingexporter/common
+share/doc/kde/HTML/en/pimsettingexporter/index.cache.bz2
+share/doc/kde/HTML/en/pimsettingexporter/index.docbook
+share/doc/kde/HTML/en/pimsettingexporter/pimsettingexporter.png
+share/doc/kde/HTML/en/sieveeditor/common
+share/doc/kde/HTML/en/sieveeditor/index.cache.bz2
+share/doc/kde/HTML/en/sieveeditor/index.docbook
+share/examples/kde4-dbus/org.kde.kalarmrtcwake.conf
 share/icons/hicolor/128x128/actions/upload-media.png
+share/icons/hicolor/128x128/apps/akonadiconsole.png
 share/icons/hicolor/128x128/apps/akregator.png
 share/icons/hicolor/128x128/apps/blogilo.png
+share/icons/hicolor/128x128/apps/kaddressbook.png
+share/icons/hicolor/128x128/apps/kalarm.png
 share/icons/hicolor/128x128/apps/kjots.png
+share/icons/hicolor/128x128/apps/kleopatra.png
 share/icons/hicolor/128x128/apps/kmail.png
 share/icons/hicolor/128x128/apps/knode.png
-share/icons/hicolor/128x128/apps/knode2.png
 share/icons/hicolor/128x128/apps/knotes.png
+share/icons/hicolor/128x128/apps/konsolekalendar.png
+share/icons/hicolor/128x128/apps/kontact-import-wizard.png
 share/icons/hicolor/128x128/apps/kontact.png
+share/icons/hicolor/128x128/apps/korg-journal.png
+share/icons/hicolor/128x128/apps/korg-todo.png
 share/icons/hicolor/128x128/apps/korganizer.png
 share/icons/hicolor/128x128/apps/ktimetracker.png
 share/icons/hicolor/16x16/actions/format-text-blockquote.png
 share/icons/hicolor/16x16/actions/format-text-code.png
 share/icons/hicolor/16x16/actions/insert-more-mark.png
+share/icons/hicolor/16x16/actions/knotes_alarm.png
+share/icons/hicolor/16x16/actions/knotes_close.png
+share/icons/hicolor/16x16/actions/knotes_date.png
+share/icons/hicolor/16x16/actions/knotes_delete.png
 share/icons/hicolor/16x16/actions/remove-link.png
 share/icons/hicolor/16x16/actions/upload-media.png
+share/icons/hicolor/16x16/apps/akonadiconsole.png
 share/icons/hicolor/16x16/apps/akregator.png
 share/icons/hicolor/16x16/apps/akregator_empty.png
 share/icons/hicolor/16x16/apps/blogilo.png
 share/icons/hicolor/16x16/apps/kaddressbook.png
 share/icons/hicolor/16x16/apps/kalarm.png
+share/icons/hicolor/16x16/apps/kdepim-dropbox.png
+share/icons/hicolor/16x16/apps/kdepim-googledrive.png
 share/icons/hicolor/16x16/apps/kjots.png
+share/icons/hicolor/16x16/apps/kleopatra.png
 share/icons/hicolor/16x16/apps/kmail.png
+share/icons/hicolor/16x16/apps/kmailcvt.png
 share/icons/hicolor/16x16/apps/knode.png
-share/icons/hicolor/16x16/apps/knode2.png
 share/icons/hicolor/16x16/apps/knotes.png
+share/icons/hicolor/16x16/apps/konsolekalendar.png
 share/icons/hicolor/16x16/apps/kontact.png
+share/icons/hicolor/16x16/apps/korg-journal.png
+share/icons/hicolor/16x16/apps/korg-todo.png
 share/icons/hicolor/16x16/apps/korganizer.png
 share/icons/hicolor/16x16/apps/ktimetracker.png
 share/icons/hicolor/22x22/actions/format-text-blockquote.png
 share/icons/hicolor/22x22/actions/format-text-code.png
 share/icons/hicolor/22x22/actions/insert-more-mark.png
+share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
+share/icons/hicolor/22x22/actions/ktnef_extract_to.png
 share/icons/hicolor/22x22/actions/remove-link.png
 share/icons/hicolor/22x22/actions/upload-media.png
+share/icons/hicolor/22x22/apps/akonadiconsole.png
 share/icons/hicolor/22x22/apps/akregator.png
 share/icons/hicolor/22x22/apps/blogilo.png
 share/icons/hicolor/22x22/apps/kaddressbook.png
+share/icons/hicolor/22x22/apps/kalarm.png
+share/icons/hicolor/22x22/apps/kdepim-dropbox.png
+share/icons/hicolor/22x22/apps/kdepim-googledrive.png
 share/icons/hicolor/22x22/apps/kjots.png
+share/icons/hicolor/22x22/apps/kleopatra.png
 share/icons/hicolor/22x22/apps/kmail.png
+share/icons/hicolor/22x22/apps/knode.png
 share/icons/hicolor/22x22/apps/knotes.png
+share/icons/hicolor/22x22/apps/konsolekalendar.png
 share/icons/hicolor/22x22/apps/kontact.png
+share/icons/hicolor/22x22/apps/korg-journal.png
+share/icons/hicolor/22x22/apps/korg-todo.png
 share/icons/hicolor/22x22/apps/korganizer.png
 share/icons/hicolor/22x22/apps/ktimetracker.png
+share/icons/hicolor/256x256/apps/akonadiconsole.png
+share/icons/hicolor/256x256/apps/akregator.png
+share/icons/hicolor/256x256/apps/kleopatra.png
+share/icons/hicolor/256x256/apps/kontact-import-wizard.png
 share/icons/hicolor/32x32/actions/upload-media.png
+share/icons/hicolor/32x32/apps/akonadiconsole.png
 share/icons/hicolor/32x32/apps/akregator.png
 share/icons/hicolor/32x32/apps/blogilo.png
 share/icons/hicolor/32x32/apps/kaddressbook.png
 share/icons/hicolor/32x32/apps/kalarm.png
+share/icons/hicolor/32x32/apps/kdepim-dropbox.png
+share/icons/hicolor/32x32/apps/kdepim-googledrive.png
 share/icons/hicolor/32x32/apps/kjots.png
+share/icons/hicolor/32x32/apps/kleopatra.png
 share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/kmailcvt.png
 share/icons/hicolor/32x32/apps/knode.png
-share/icons/hicolor/32x32/apps/knode2.png
 share/icons/hicolor/32x32/apps/knotes.png
+share/icons/hicolor/32x32/apps/konsolekalendar.png
 share/icons/hicolor/32x32/apps/kontact.png
+share/icons/hicolor/32x32/apps/korg-journal.png
+share/icons/hicolor/32x32/apps/korg-todo.png
 share/icons/hicolor/32x32/apps/korganizer.png
 share/icons/hicolor/32x32/apps/ktimetracker.png
 share/icons/hicolor/48x48/actions/upload-media.png
+share/icons/hicolor/48x48/apps/akonadiconsole.png
 share/icons/hicolor/48x48/apps/akregator.png
 share/icons/hicolor/48x48/apps/blogilo.png
 share/icons/hicolor/48x48/apps/kaddressbook.png
 share/icons/hicolor/48x48/apps/kalarm.png
+share/icons/hicolor/48x48/apps/kdepim-dropbox.png
+share/icons/hicolor/48x48/apps/kdepim-googledrive.png
 share/icons/hicolor/48x48/apps/kjots.png
+share/icons/hicolor/48x48/apps/kleopatra.png
 share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/kmailcvt.png
 share/icons/hicolor/48x48/apps/knode.png
-share/icons/hicolor/48x48/apps/knode2.png
 share/icons/hicolor/48x48/apps/knotes.png
+share/icons/hicolor/48x48/apps/konsolekalendar.png
 share/icons/hicolor/48x48/apps/kontact.png
+share/icons/hicolor/48x48/apps/korg-journal.png
+share/icons/hicolor/48x48/apps/korg-todo.png
 share/icons/hicolor/48x48/apps/korganizer.png
 share/icons/hicolor/48x48/apps/ktimetracker.png
+share/icons/hicolor/48x48/apps/ktnef.png
 share/icons/hicolor/64x64/actions/upload-media.png
+share/icons/hicolor/64x64/apps/akonadiconsole.png
 share/icons/hicolor/64x64/apps/akregator.png
 share/icons/hicolor/64x64/apps/blogilo.png
+share/icons/hicolor/64x64/apps/kaddressbook.png
+share/icons/hicolor/64x64/apps/kalarm.png
 share/icons/hicolor/64x64/apps/kjots.png
+share/icons/hicolor/64x64/apps/kleopatra.png
 share/icons/hicolor/64x64/apps/kmail.png
 share/icons/hicolor/64x64/apps/knode.png
-share/icons/hicolor/64x64/apps/knode2.png
 share/icons/hicolor/64x64/apps/knotes.png
+share/icons/hicolor/64x64/apps/kontact-import-wizard.png
 share/icons/hicolor/64x64/apps/kontact.png
+share/icons/hicolor/64x64/apps/korg-journal.png
+share/icons/hicolor/64x64/apps/korg-todo.png
 share/icons/hicolor/64x64/apps/korganizer.png
 share/icons/hicolor/64x64/apps/ktimetracker.png
 share/icons/hicolor/scalable/apps/akregator.svgz
+share/icons/hicolor/scalable/apps/kaddressbook.svgz
+share/icons/hicolor/scalable/apps/kalarm.svgz
 share/icons/hicolor/scalable/apps/kjots.svgz
+share/icons/hicolor/scalable/apps/kleopatra.svgz
 share/icons/hicolor/scalable/apps/kmail.svgz
+share/icons/hicolor/scalable/apps/knode.svgz
+share/icons/hicolor/scalable/apps/knotes.svgz
+share/icons/hicolor/scalable/apps/kontact-import-wizard.svgz
+share/icons/hicolor/scalable/apps/kontact.svgz
+share/icons/hicolor/scalable/apps/korg-journal.svgz
+share/icons/hicolor/scalable/apps/korg-todo.svgz
 share/icons/hicolor/scalable/apps/korganizer.svgz
-share/icons/oxygen/128x128/apps/kalarm.png
-share/icons/oxygen/128x128/apps/kleopatra.png
+share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
+share/icons/locolor/16x16/actions/ktnef_extract_to.png
+share/icons/locolor/16x16/apps/ktnef.png
+share/icons/locolor/32x32/apps/ktnef.png
+share/icons/oxygen/128x128/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
 share/icons/oxygen/16x16/actions/smallclock.png
 share/icons/oxygen/16x16/actions/upindicator.png
-share/icons/oxygen/16x16/apps/kalarm.png
-share/icons/oxygen/16x16/apps/kleopatra.png
-share/icons/oxygen/16x16/apps/kmailcvt.png
 share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/22x22/actions/button_fewer.png
-share/icons/oxygen/22x22/actions/button_more.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
-share/icons/oxygen/22x22/apps/kalarm.png
-share/icons/oxygen/22x22/apps/kleopatra.png
 share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
+share/icons/oxygen/256x256/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/apps/kalarm.png
-share/icons/oxygen/32x32/apps/kleopatra.png
-share/icons/oxygen/32x32/apps/kmailcvt.png
 share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/48x48/actions/edit-delete-page.png
-share/icons/oxygen/48x48/apps/kalarm.png
-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/64x64/apps/kalarm.png
-share/icons/oxygen/64x64/apps/kleopatra.png
+share/icons/oxygen/512x512/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/scalable/actions/edit-delete-page.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/kde/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
+share/kde/apps/akonadi_followupreminder_agent/akonadi_followupreminder_agent.notifyrc
+share/kde/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
+share/kde/apps/akonadi_notes_agent/akonadi_notes_agent.notifyrc
+share/kde/apps/akonadi_sendlater_agent/akonadi_sendlater_agent.notifyrc
 share/kde/apps/akonadiconsole/akonadiconsoleui.rc
 share/kde/apps/akregator/about/akregator.css
 share/kde/apps/akregator/about/main.html
@@ -589,21 +717,42 @@ share/kde/apps/akregator/articleviewer.rc
 share/kde/apps/akregator/pageviewer.rc
 share/kde/apps/akregator/pics/kmmsgnew.png
 share/kde/apps/akregator/pics/kmmsgunseen.png
+share/kde/apps/akregator_sharemicroblog_plugin/akregator_sharemicroblog_plugin.rc
 share/kde/apps/blogilo/blogiloui.rc
+share/kde/apps/composereditor/composereditorinitialhtml
+share/kde/apps/contactthemeeditor/contactthemeeditorui.rc
+share/kde/apps/desktoptheme/default/widgets/stickynote.svgz
+share/kde/apps/headerthemeeditor/headerthemeeditorui.rc
 share/kde/apps/kaddressbook/kaddressbookui.rc
+share/kde/apps/kaddressbook/printing/compact-style.png
 share/kde/apps/kaddressbook/printing/detailed-style.png
 share/kde/apps/kaddressbook/printing/mike-style.png
 share/kde/apps/kaddressbook/printing/ringbinder-style.png
+share/kde/apps/kaddressbook/printing/themes/big-theme-example/theme.desktop
+share/kde/apps/kaddressbook/printing/themes/big-theme-example/theme.html
+share/kde/apps/kaddressbook/printing/themes/default/theme.desktop
+share/kde/apps/kaddressbook/printing/themes/default/theme.html
+share/kde/apps/kaddressbook/printing/themes/full/theme.desktop
+share/kde/apps/kaddressbook/printing/themes/full/theme.html
+share/kde/apps/kaddressbook/viewertemplates/default/contact.html
+share/kde/apps/kaddressbook/viewertemplates/default/contact_embedded.html
+share/kde/apps/kaddressbook/viewertemplates/default/contact_row.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup_additionalfieldrow.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup_embedded.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup_memberrow.html
+share/kde/apps/kaddressbook/viewertemplates/default/theme.desktop
 share/kde/apps/kalarm/icons/oxygen/16x16/actions/document-new-from-template.png
 share/kde/apps/kalarm/icons/oxygen/16x16/actions/new-audio-alarm.png
 share/kde/apps/kalarm/icons/oxygen/16x16/actions/new-command-alarm.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/document-new-from-template.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm-disabled.png
+share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm-partdisabled.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/new-audio-alarm.png
 share/kde/apps/kalarm/icons/oxygen/22x22/actions/new-command-alarm.png
-share/kde/apps/kalarm/icons/oxygen/22x22/emblems/partdisabled.png
 share/kde/apps/kalarm/kalarmui.rc
+share/kde/apps/kconf_update/grantleetheme.upd
 share/kde/apps/kconf_update/kalarm-1.2.1-general.pl
 share/kde/apps/kconf_update/kalarm-1.9.5-defaults.pl
 share/kde/apps/kconf_update/kalarm-2.0.2-general.pl
@@ -628,11 +777,13 @@ share/kde/apps/kconf_update/kmail-4.0-misc.pl
 share/kde/apps/kconf_update/kmail-pgpidentity.pl
 share/kde/apps/kconf_update/kmail-upd-identities.pl
 share/kde/apps/kconf_update/kmail.upd
-share/kde/apps/kconf_update/kolab-resource.upd
+share/kde/apps/kconf_update/knode.upd
 share/kde/apps/kconf_update/korganizer.upd
 share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/kde/apps/kconf_update/kpgp.upd
-share/kde/apps/kconf_update/upgrade-resourcetype.pl
+share/kde/apps/kconf_update/mailfilteragent.upd
+share/kde/apps/kconf_update/migrate-kmail-filters.pl
+share/kde/apps/kconf_update/noteglobalsettings.upd
 share/kde/apps/kconf_update/upgrade-signature.pl
 share/kde/apps/kconf_update/upgrade-transport.pl
 share/kde/apps/kdepimwidgets/pics/addresseelineedit.png
@@ -641,6 +792,19 @@ share/kde/apps/kdepimwidgets/pics/kdateedit.png
 share/kde/apps/kdepimwidgets/pics/ktimeedit.png
 share/kde/apps/kjots/kjotspartui.rc
 share/kde/apps/kjots/kjotsui.rc
+share/kde/apps/kjots/themes/default/book_toc_list.html
+share/kde/apps/kjots/themes/default/booktemplate.html
+share/kde/apps/kjots/themes/default/pagetemplate.html
+share/kde/apps/kjots/themes/default/template.html
+share/kde/apps/kjots/themes/other/booktemplate.html
+share/kde/apps/kjots/themes/other/pagetemplate.html
+share/kde/apps/kjots/themes/other/template.html
+share/kde/apps/kjots/themes/plain_text/book_template.txt
+share/kde/apps/kjots/themes/plain_text/page_template.txt
+share/kde/apps/kjots/themes/plain_text/template.txt
+share/kde/apps/kjots/themes/xml_output/booktemplate.xml
+share/kde/apps/kjots/themes/xml_output/pagetemplate.xml
+share/kde/apps/kjots/themes/xml_output/template.xml
 share/kde/apps/kleopatra/kleopatra.rc
 share/kde/apps/kleopatra/pics/gpg4win-compact.png
 share/kde/apps/kleopatra/pics/gpg4win.png
@@ -648,52 +812,24 @@ share/kde/apps/kleopatra/pics/kleopatra_splashscreen.png
 share/kde/apps/kleopatra/pics/kleopatra_splashscreen.svgz
 share/kde/apps/kleopatra/pics/kleopatra_wizard.png
 share/kde/apps/kleopatra/pics/kleopatra_wizard.svgz
-share/kde/apps/kmail/about/kmail.css
-share/kde/apps/kmail/about/main.html
-share/kde/apps/kmail/about/top-left-kmail.png
-share/kde/apps/kmail/kmail.notifyrc
-share/kde/apps/kmail/kmail_part.rc
-share/kde/apps/kmail/kmcomposerui.rc
-share/kde/apps/kmail/kmmainwin.rc
-share/kde/apps/kmail/kmreadermainwin.rc
-share/kde/apps/kmail/pics/enterprise_bottom.png
-share/kde/apps/kmail/pics/enterprise_bottom_left.png
-share/kde/apps/kmail/pics/enterprise_bottom_right.png
-share/kde/apps/kmail/pics/enterprise_icon.png
-share/kde/apps/kmail/pics/enterprise_left.png
-share/kde/apps/kmail/pics/enterprise_right.png
-share/kde/apps/kmail/pics/enterprise_s_left.png
-share/kde/apps/kmail/pics/enterprise_s_right.png
-share/kde/apps/kmail/pics/enterprise_sbar.png
-share/kde/apps/kmail/pics/enterprise_sp_right.png
-share/kde/apps/kmail/pics/enterprise_sw.png
-share/kde/apps/kmail/pics/enterprise_top.png
-share/kde/apps/kmail/pics/enterprise_top_left.png
-share/kde/apps/kmail/pics/enterprise_top_right.png
-share/kde/apps/kmail/pics/enterprise_w.png
-share/kde/apps/kmail/pics/key.png
-share/kde/apps/kmail/pics/key_bad.png
-share/kde/apps/kmail/pics/key_ok.png
-share/kde/apps/kmail/pics/key_unknown.png
-share/kde/apps/kmail/pics/kmwizard.png
-share/kde/apps/kmail/pics/mail-deleted.png
-share/kde/apps/kmail/pics/mail-encrypted-full.png
-share/kde/apps/kmail/pics/mail-encrypted-part.png
-share/kde/apps/kmail/pics/mail-encrypted.png
-share/kde/apps/kmail/pics/mail-horizontal-space.png
-share/kde/apps/kmail/pics/mail-thread-ignored.png
-share/kde/apps/kmail/pics/mail-thread-watch.png
-share/kde/apps/kmail/pics/mail-vertical-separator-line.png
-share/kde/apps/kmail/pics/pgp-keys.png
-share/kde/apps/kmail/pics/quicklistClosed.png
-share/kde/apps/kmail/pics/quicklistOpened.png
-share/kde/apps/kmail/pics/quotecollapse.png
-share/kde/apps/kmail/pics/quoteexpand.png
-share/kde/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
-share/kde/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
-share/kde/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
-share/kde/apps/kmail/plugins/bodypartformatter/text_xdiff.desktop
-share/kde/apps/kmail/tips
+share/kde/apps/kmail2/about/kmail.css
+share/kde/apps/kmail2/about/main.html
+share/kde/apps/kmail2/about/top-left-kmail.png
+share/kde/apps/kmail2/kmail2.notifyrc
+share/kde/apps/kmail2/kmail_part.rc
+share/kde/apps/kmail2/kmcomposerui.rc
+share/kde/apps/kmail2/kmmainwin.rc
+share/kde/apps/kmail2/kmreadermainwin.rc
+share/kde/apps/kmail2/pics/key.png
+share/kde/apps/kmail2/pics/key_bad.png
+share/kde/apps/kmail2/pics/key_ok.png
+share/kde/apps/kmail2/pics/key_unknown.png
+share/kde/apps/kmail2/pics/kmwizard.png
+share/kde/apps/kmail2/pics/mail-deleted.png
+share/kde/apps/kmail2/pics/mail-thread-ignored.png
+share/kde/apps/kmail2/pics/mail-thread-watch.png
+share/kde/apps/kmail2/pics/pgp-keys.png
+share/kde/apps/kmail2/tips
 share/kde/apps/kmailcvt/pics/step1.png
 share/kde/apps/knode/filters/1.fltr
 share/kde/apps/knode/filters/2.fltr
@@ -722,18 +858,15 @@ share/kde/apps/knode/pics/mail.png
 share/kde/apps/knode/pics/newsubs.png
 share/kde/apps/knode/pics/posting.png
 share/kde/apps/knode/pics/snderr.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png
 share/kde/apps/knotes/knotes_part.rc
 share/kde/apps/knotes/knotesappui.rc
 share/kde/apps/knotes/knotesui.rc
-share/kde/apps/konsolekalendar/pics/hi128-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi16-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi22-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi32-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi48-apps-konsolekalendar.png
+share/kde/apps/knotes/print/themes/background-color/theme.desktop
+share/kde/apps/knotes/print/themes/background-color/theme.html
+share/kde/apps/knotes/print/themes/big-title/theme.desktop
+share/kde/apps/knotes/print/themes/big-title/theme.html
+share/kde/apps/knotes/print/themes/default/theme.desktop
+share/kde/apps/knotes/print/themes/default/theme.html
 share/kde/apps/kontact/about/kontact.css
 share/kde/apps/kontact/about/main.html
 share/kde/apps/kontact/about/top-left-kontact.png
@@ -745,10 +878,16 @@ share/kde/apps/kontact/ksettingsdialog/kmail.setdlg
 share/kde/apps/kontact/ksettingsdialog/knode.setdlg
 share/kde/apps/kontact/ksettingsdialog/knotes.setdlg
 share/kde/apps/kontact/ksettingsdialog/korganizer.setdlg
-share/kde/apps/kontact/ksettingsdialog/ktimetracker.setdlg
+share/kde/apps/kontact/ksettingsdialog/specialdates.setdlg
 share/kde/apps/kontact/ksettingsdialog/summary.setdlg
 share/kde/apps/kontactsummary/kontactsummary_part.rc
-share/kde/apps/korgac/icons/hicolor/22x22/actions/korgac.png
+share/kde/apps/korgac/icons/hicolor/128x128/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/16x16/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/22x22/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/256x256/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/32x32/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/64x64/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/scalable/apps/korgac.svgz
 share/kde/apps/korganizer/korganizer_part.rc
 share/kde/apps/korganizer/korganizerui.rc
 share/kde/apps/korganizer/sounds/alert.wav
@@ -757,13 +896,13 @@ share/kde/apps/korganizer/sounds/lightmag.wav
 share/kde/apps/korganizer/sounds/onscreen.wav
 share/kde/apps/korganizer/sounds/spinout.wav
 share/kde/apps/korganizer/tips
-share/kde/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
+share/kde/apps/ktimetracker/icons/hicolor/128x128/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/16x16/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/22x22/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/32x32/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/48x48/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/64x64/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/scalable/actions/subtask-new-ktimetracker.svgz
 share/kde/apps/ktimetracker/ktimetrackerui.rc
 share/kde/apps/ktimetracker/pics/active-icon-0.xpm
 share/kde/apps/ktimetracker/pics/active-icon-1.xpm
@@ -787,32 +926,10 @@ share/kde/apps/ktimetracker/pics/watch-4.xpm
 share/kde/apps/ktimetracker/pics/watch-5.xpm
 share/kde/apps/ktimetracker/pics/watch-6.xpm
 share/kde/apps/ktimetracker/pics/watch-7.xpm
+share/kde/apps/ktnef/ktnefui.rc
 share/kde/apps/kwatchgnupg/kwatchgnupgui.rc
 share/kde/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/kde/apps/kwatchgnupg/pics/kwatchgnupg2.png
-share/kde/apps/libkdepim/about/bar-bottom-left.png
-share/kde/apps/libkdepim/about/bar-bottom-middle.png
-share/kde/apps/libkdepim/about/bar-bottom-right.png
-share/kde/apps/libkdepim/about/bar-middle-left.png
-share/kde/apps/libkdepim/about/bar-middle-right.png
-share/kde/apps/libkdepim/about/bar-top-left.png
-share/kde/apps/libkdepim/about/bar-top-middle.png
-share/kde/apps/libkdepim/about/bar-top-right.png
-share/kde/apps/libkdepim/about/bottom-left.png
-share/kde/apps/libkdepim/about/bottom-middle.png
-share/kde/apps/libkdepim/about/bottom-right.png
-share/kde/apps/libkdepim/about/box-bottom-left.png
-share/kde/apps/libkdepim/about/box-bottom-middle.png
-share/kde/apps/libkdepim/about/box-bottom-right.png
-share/kde/apps/libkdepim/about/box-middle-left.png
-share/kde/apps/libkdepim/about/box-middle-right.png
-share/kde/apps/libkdepim/about/box-top-left.png
-share/kde/apps/libkdepim/about/box-top-middle.png
-share/kde/apps/libkdepim/about/box-top-right.png
-share/kde/apps/libkdepim/about/kde_infopage.css
-share/kde/apps/libkdepim/about/kde_infopage_rtl.css
-share/kde/apps/libkdepim/about/top-left.png
-share/kde/apps/libkdepim/about/top-middle.png
 share/kde/apps/libkleopatra/pics/chiasmus_chi.png
 share/kde/apps/libkleopatra/pics/hi16-app-gpg.png
 share/kde/apps/libkleopatra/pics/hi16-app-gpgsm.png
@@ -825,48 +942,105 @@ share/kde/apps/libkleopatra/pics/key_bad.png
 share/kde/apps/libkleopatra/pics/key_ok.png
 share/kde/apps/libkleopatra/pics/key_unknown.png
 share/kde/apps/libkleopatra/pics/smartcard.xpm
+share/kde/apps/libmessageviewer/pics/enterprise_bottom.png
+share/kde/apps/libmessageviewer/pics/enterprise_bottom_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_bottom_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_icon.png
+share/kde/apps/libmessageviewer/pics/enterprise_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_s_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_s_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_sbar.png
+share/kde/apps/libmessageviewer/pics/enterprise_sp_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_sw.png
+share/kde/apps/libmessageviewer/pics/enterprise_top.png
+share/kde/apps/libmessageviewer/pics/enterprise_top_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_top_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_w.png
+share/kde/apps/libmessageviewer/pics/mobile_bg.png
+share/kde/apps/libmessageviewer/pics/mobile_status_actionitem.png
+share/kde/apps/libmessageviewer/pics/mobile_status_attachment.png
+share/kde/apps/libmessageviewer/pics/mobile_status_encrypted.png
+share/kde/apps/libmessageviewer/pics/mobile_status_forwarded.png
+share/kde/apps/libmessageviewer/pics/mobile_status_important.png
+share/kde/apps/libmessageviewer/pics/mobile_status_replied.png
+share/kde/apps/libmessageviewer/pics/mobile_status_signed.png
+share/kde/apps/libmessageviewer/pics/quicklistClosed.png
+share/kde/apps/libmessageviewer/pics/quicklistOpened.png
+share/kde/apps/libmessageviewer/pics/quotecollapse.png
+share/kde/apps/libmessageviewer/pics/quoteexpand.png
+share/kde/apps/messagelist/pics/mail-deleted.png
+share/kde/apps/messagelist/pics/mail-horizontal-space.png
+share/kde/apps/messagelist/pics/mail-thread-ignored.png
+share/kde/apps/messagelist/pics/mail-thread-watch.png
+share/kde/apps/messagelist/pics/mail-vertical-separator-line.png
+share/kde/apps/messageviewer/about/main_mobile.html
+share/kde/apps/messageviewer/about/messageviewer_mobile.css
+share/kde/apps/messageviewer/longurlServices.json
+share/kde/apps/messageviewer/messageviewer.notifyrc
+share/kde/apps/messageviewer/plugins/bodypartformatter/application_ms-tnef.desktop
+share/kde/apps/messageviewer/plugins/bodypartformatter/text_calendar.desktop
+share/kde/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
+share/kde/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
+share/kde/apps/messageviewer/themes/example/header.desktop
+share/kde/apps/messageviewer/themes/example/header.html
+share/kde/apps/messageviewer/themes/example/header_row.html
+share/kde/apps/messageviewer/themes/example_fancy/header.desktop
+share/kde/apps/messageviewer/themes/example_fancy/header.html
+share/kde/apps/pimsettingexporter/backup-structure.txt
+share/kde/apps/pimsettingexporter/pimsettingexporter.rc
+share/kde/apps/sieve/scripts/copy/template.desktop
+share/kde/apps/sieve/scripts/copy/template.txt
+share/kde/apps/sieveeditor/sieveeditorui.rc
+share/kde/apps/storageservicemanager/storageservicemanager.notifyrc
+share/kde/apps/storageservicemanager/storageservicemanagerui.rc
 share/kde/autostart/kalarm.autostart.desktop
 share/kde/autostart/korgac.desktop
 share/kde/config.kcfg/akregator.kcfg
 share/kde/config.kcfg/blogilo.kcfg
-share/kde/config.kcfg/custommimeheader.kcfg
 share/kde/config.kcfg/customtemplates_kfg.kcfg
-share/kde/config.kcfg/groupwise.kcfg
 share/kde/config.kcfg/kalarmconfig.kcfg
 share/kde/config.kcfg/kjots.kcfg
 share/kde/config.kcfg/kmail.kcfg
-share/kde/config.kcfg/knoteconfig.kcfg
 share/kde/config.kcfg/knotesglobalconfig.kcfg
-share/kde/config.kcfg/kolab.kcfg
 share/kde/config.kcfg/kontact.kcfg
 share/kde/config.kcfg/korganizer.kcfg
-share/kde/config.kcfg/slox.kcfg
 share/kde/config.kcfg/templatesconfiguration_kfg.kcfg
+share/kde/config/kaddressbook_themes.knsrc
 share/kde/config/kmail.antispamrc
 share/kde/config/kmail.antivirusrc
+share/kde/config/knotes_printing_theme.knsrc
 share/kde/config/korganizer.knsrc
+share/kde/config/ksieve_script.knsrc
 share/kde/config/libkleopatrarc
+share/kde/config/messageviewer_header_themes.knsrc
+share/kde4/services/ServiceMenus/kmail_addattachmentservicemenu.desktop
+share/kde4/services/akonotes_list.desktop
+share/kde4/services/akonotes_note.desktop
 share/kde4/services/akregator_config_advanced.desktop
 share/kde4/services/akregator_config_appearance.desktop
 share/kde4/services/akregator_config_archive.desktop
 share/kde4/services/akregator_config_browser.desktop
 share/kde4/services/akregator_config_general.desktop
+share/kde4/services/akregator_config_sharemicroblog.desktop
 share/kde4/services/akregator_mk4storage_plugin.desktop
 share/kde4/services/akregator_part.desktop
+share/kde4/services/akregator_sharemicroblog_plugin.desktop
 share/kde4/services/feed.protocol
-share/kde4/services/groupwise.protocol
-share/kde4/services/groupwises.protocol
 share/kde4/services/kaddressbookpart.desktop
+share/kde4/services/kcm_kpimidentities.desktop
 share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
+share/kde4/services/kcmknotessummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
 share/kde4/services/kcmldap.desktop
+share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
 share/kde4/services/kjots_config_misc.desktop
 share/kde4/services/kjotspart.desktop
 share/kde4/services/kleopatra_config_appear.desktop
+share/kde4/services/kleopatra_config_cryptooperations.desktop
 share/kde4/services/kleopatra_config_dirserv.desktop
-share/kde4/services/kleopatra_config_dnorder.desktop
 share/kde4/services/kleopatra_config_gnupgsystem.desktop
 share/kde4/services/kleopatra_config_smimevalidation.desktop
 share/kde4/services/kleopatra_decryptverifyfiles.desktop
@@ -879,7 +1053,6 @@ share/kde4/services/kmail_config_composer.desktop
 share/kde4/services/kmail_config_identity.desktop
 share/kde4/services/kmail_config_misc.desktop
 share/kde4/services/kmail_config_security.desktop
-share/kde4/services/knewsservice.protocol
 share/kde4/services/knode_config_accounts.desktop
 share/kde4/services/knode_config_appearance.desktop
 share/kde4/services/knode_config_cleanup.desktop
@@ -888,10 +1061,12 @@ share/kde4/services/knode_config_post_news.desktop
 share/kde4/services/knode_config_privacy.desktop
 share/kde4/services/knode_config_read_news.desktop
 share/kde4/services/knote_config_action.desktop
+share/kde4/services/knote_config_collection.desktop
 share/kde4/services/knote_config_display.desktop
 share/kde4/services/knote_config_editor.desktop
+share/kde4/services/knote_config_misc.desktop
 share/kde4/services/knote_config_network.desktop
-share/kde4/services/knote_config_style.desktop
+share/kde4/services/knote_config_print.desktop
 share/kde4/services/kontact/akregatorplugin.desktop
 share/kde4/services/kontact/journalplugin.desktop
 share/kde4/services/kontact/kaddressbookplugin.desktop
@@ -900,16 +1075,14 @@ share/kde4/services/kontact/kmailplugin.desktop
 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/specialdatesplugin.desktop
 share/kde4/services/kontact/summaryplugin.desktop
 share/kde4/services/kontact/todoplugin.desktop
 share/kde4/services/kontactconfig.desktop
 share/kde4/services/korganizer/datenums.desktop
 share/kde4/services/korganizer/hebrew.desktop
-share/kde4/services/korganizer/journalprint.desktop
 share/kde4/services/korganizer/picoftheday.desktop
 share/kde4/services/korganizer/thisdayinhistory.desktop
-share/kde4/services/korganizer/yearprint.desktop
 share/kde4/services/korganizer_configcolorsandfonts.desktop
 share/kde4/services/korganizer_configdesignerfields.desktop
 share/kde4/services/korganizer_configfreebusy.desktop
@@ -919,28 +1092,8 @@ share/kde4/services/korganizer_configplugins.desktop
 share/kde4/services/korganizer_configtime.desktop
 share/kde4/services/korganizer_configviews.desktop
 share/kde4/services/korganizer_part.desktop
-share/kde4/services/kresources/alarms/local.desktop
-share/kde4/services/kresources/alarms/localdir.desktop
-share/kde4/services/kresources/alarms/remote.desktop
-share/kde4/services/kresources/kabc/kabc_groupdav.desktop
-share/kde4/services/kresources/kabc/kabc_groupwise.desktop
-share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
-share/kde4/services/kresources/kabc/kabc_ox.desktop
-share/kde4/services/kresources/kabc/kabc_slox.desktop
-share/kde4/services/kresources/kabc/kolab.desktop
-share/kde4/services/kresources/kalarm_manager.desktop
 share/kde4/services/kresources/kcal/blog.desktop
-share/kde4/services/kresources/kcal/kabc.desktop
-share/kde4/services/kresources/kcal/kcal_groupdav.desktop
-share/kde4/services/kresources/kcal/kcal_groupwise.desktop
-share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
-share/kde4/services/kresources/kcal/kcal_ox.desktop
-share/kde4/services/kresources/kcal/kcal_slox.desktop
-share/kde4/services/kresources/kcal/kolab.desktop
 share/kde4/services/kresources/kcal/remote.desktop
-share/kde4/services/kresources/knotes/kolabresource.desktop
-share/kde4/services/kresources/knotes/local.desktop
-share/kde4/services/kresources/knotes_manager.desktop
 share/kde4/services/ktimetracker_config_behavior.desktop
 share/kde4/services/ktimetracker_config_display.desktop
 share/kde4/services/ktimetracker_config_storage.desktop
@@ -950,7 +1103,4 @@ share/kde4/servicetypes/akregator_plugin.desktop
 share/kde4/servicetypes/calendardecoration.desktop
 share/kde4/servicetypes/calendarplugin.desktop
 share/kde4/servicetypes/dbuscalendar.desktop
-share/kde4/servicetypes/dbusimap.desktop
 share/kde4/servicetypes/dbusmail.desktop
-share/kde4/servicetypes/korganizerpart.desktop
-share/kde4/servicetypes/korgprintplugin.desktop
diff --git a/misc/kdepim4/patches/patch-aa b/misc/kdepim4/patches/patch-aa
deleted file mode 100644
index 9becda7d428..00000000000
--- a/misc/kdepim4/patches/patch-aa
+++ /dev/null
@@ -1,259 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- cmake/modules/FindAssuan2.cmake.orig	2010-08-31 18:25:54.000000000 +0000
-+++ cmake/modules/FindAssuan2.cmake
-@@ -0,0 +1,251 @@
-+# - Try to find the assuan v2 library
-+
-+# Variables set:
-+#  ASSUAN2_{INCLUDES,FOUND,LIBRARIES} will be set for each of the above
-+
-+# do away with crappy condition repetition on else/endfoo
-+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved ${CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS} )
-+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true )
-+
-+#if this is built-in, please replace, if it isn't, export into a MacroToBool.cmake of it's own
-+macro( macro_bool_to_bool FOUND_VAR )
-+  foreach( _current_VAR ${ARGN} )
-+    if ( ${FOUND_VAR} )
-+      set( ${_current_VAR} TRUE )
-+    else()
-+      set( ${_current_VAR} FALSE )
-+    endif()
-+  endforeach()
-+endmacro()
-+
-+include (MacroEnsureVersion)
-+
-+message( STATUS "In FindAssuan2.cmake" )
-+
-+if ( WIN32 )
-+
-+  # On Windows, we don't have a libassuan-config script, so we need to
-+  # look for the stuff ourselves:
-+
-+  # in cmake, AND and OR have the same precedence, there's no
-+  # subexpressions, and expressions are evaluated short-circuit'ed
-+  # IOW: CMake if() suxx.
-+  set( _seem_to_have_cached_assuan2 false )
-+  if ( ASSUAN2_INCLUDES )
-+    if ( ASSUAN2_VANILLA_LIBRARIES )#OR ASSUAN2_QT_LIBRARIES OR ASSUAN2_GLIB_LIBRARIES )
-+      set( _seem_to_have_cached_assuan2 true )
-+    endif()
-+  endif()
-+
-+  if ( _seem_to_have_cached_assuan2 )
-+
-+    macro_bool_to_bool( ASSUAN2_VANILLA_LIBRARIES  ASSUAN2_VANILLA_FOUND )
-+    # this would have been preferred:
-+    #set( ASSUAN2_*_FOUND macro_bool_to_bool(ASSUAN2_*_LIBRARIES) )
-+
-+    if ( ASSUAN2_VANILLA_FOUND ) #OR ASSUAN2_GLIB_FOUND OR ASSUAN2_QT_FOUND )
-+      set( ASSUAN2_FOUND true )
-+    else()
-+      set( ASSUAN2_FOUND false )
-+    endif()
-+
-+  else()
-+
-+    set( ASSUAN2_FOUND         false )
-+    set( ASSUAN2_VANILLA_FOUND false )
-+    #set( ASSUAN2_GLIB_FOUND    false )
-+    #set( ASSUAN2_QT_FOUND      false )
-+
-+    find_path( ASSUAN2_INCLUDES assuan.h
-+      ${CMAKE_INCLUDE_PATH}
-+      ${CMAKE_INSTALL_PREFIX}/include
-+    )
-+
-+    find_library( _assuan2_library NAMES assuan assuan0 assuan2 libassuan libassuan0 libassuan2
-+      PATHS 
-+        ${CMAKE_LIBRARY_PATH}
-+        ${CMAKE_INSTALL_PREFIX}/lib
-+    )
-+
-+    find_library( _gpg_error_library     NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0
-+      PATHS 
-+        ${CMAKE_LIBRARY_PATH}
-+        ${CMAKE_INSTALL_PREFIX}/lib
-+    )
-+
-+    set( ASSUAN2_INCLUDES ${ASSUAN2_INCLUDES} )
-+
-+    if ( _assuan2_library AND _gpg_error_library )
-+      set( ASSUAN2_LIBRARIES ${_assuan2_library} ${_gpg_error_library} ws2_32 )
-+      set( ASSUAN2_FOUND             true )
-+    endif()
-+
-+  endif()
-+
-+  macro_bool_to_01( ASSUAN2_FOUND HAVE_ASSUAN2 )
-+
-+else() # not WIN32
-+
-+  # On *nix, we have the libassuan-config script which can tell us all we
-+  # need to know:
-+
-+  # see WIN32 case for an explanation of what this does:
-+  set( _seem_to_have_cached_assuan2 false )
-+  if ( ASSUAN2_INCLUDES AND ASSUAN2_LIBRARIES )
-+    set( _seem_to_have_cached_assuan2 true )
-+  endif()
-+
-+  if ( _seem_to_have_cached_assuan2 )
-+
-+    set( ASSUAN2_FOUND true )
-+
-+  else()
-+
-+    set( ASSUAN2_FOUND         false )
-+
-+    find_program( _ASSUAN2CONFIG_EXECUTABLE NAMES libassuan-config )
-+
-+    # if libassuan-config has been found
-+    if ( _ASSUAN2CONFIG_EXECUTABLE )
-+      
-+      message( STATUS "Found libassuan-config at ${_ASSUAN2CONFIG_EXECUTABLE}" )
-+
-+      exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE ASSUAN2_VERSION )
-+
-+      set( _ASSUAN2_MIN_VERSION "2.0.0" )
-+      macro_ensure_version( ${_ASSUAN2_MIN_VERSION} ${ASSUAN2_VERSION} _ASSUAN2_INSTALLED_VERSION_OK )
-+
-+      if ( NOT _ASSUAN2_INSTALLED_VERSION_OK )
-+
-+        message( STATUS "The installed version of assuan is too old: ${ASSUAN2_VERSION} (required: >= ${_ASSUAN2_MIN_VERSION})" )
-+
-+      else()
-+
-+        message( STATUS "Found assuan v${ASSUAN2_VERSION}" )
-+
-+        exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _assuan2_config_libs RETURN_VALUE _ret )
-+	if ( _ret )
-+	  set( _assuan2_config_libs )
-+	endif()
-+
-+        # append -lgpg-error to the list of libraries, if necessary
-+        if ( _assuan2_config_libs AND NOT _assuan2_config_libs MATCHES "lgpg-error" )
-+          set( _assuan2_config_libs "${_assuan2_config_libs} -lgpg-error" )
-+        endif()
-+
-+        if ( _assuan2_config_libs )
-+
-+          exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _ASSUAN2_CFLAGS )
-+
-+          if ( _ASSUAN2_CFLAGS )
-+            string( REGEX REPLACE "(\r?\n)+$" " " _ASSUAN2_CFLAGS  "${_ASSUAN2_CFLAGS}" )
-+            string( REGEX REPLACE " *-I"      ";" ASSUAN2_INCLUDES "${_ASSUAN2_CFLAGS}" )
-+          endif()
-+
-+          if ( _assuan2_config_libs )
-+
-+            set( _assuan2_library_dirs )
-+            set( _assuan2_library_names )
-+
-+            string( REGEX REPLACE " +" ";" _assuan2_config_libs "${_assuan2_config_libs}" )
-+
-+            foreach( _flag ${_assuan2_config_libs} )
-+              if ( "${_flag}" MATCHES "^-L" )
-+                string( REGEX REPLACE "^-L" "" _dir "${_flag}" )
-+                file( TO_CMAKE_PATH "${_dir}" _dir )
-+                set( _assuan2_library_dirs ${_assuan2_library_dirs} "${_dir}" )
-+              elseif( "${_flag}" MATCHES "^-l" )
-+                string( REGEX REPLACE "^-l" "" _name "${_flag}" )
-+                set( _assuan2_library_names ${_assuan2_library_names} "${_name}" )
-+              endif()
-+            endforeach()
-+
-+            set( ASSUAN2_FOUND true )
-+
-+            foreach( _name ${_assuan2_library_names} )
-+              set( _assuan2_${_name}_lib )
-+
-+              # if -L options were given, look only there
-+              if ( _assuan2_library_dirs )
-+                find_library( _assuan2_${_name}_lib NAMES ${_name} PATHS ${_assuan2_library_dirs} NO_DEFAULT_PATH )
-+              endif()
-+
-+              # if not found there, look in system directories
-+              if ( NOT _assuan2_${_name}_lib )
-+                find_library( _assuan2_${_name}_lib NAMES ${_name} )
-+              endif()
-+
-+              # if still not found, then the whole flavour isn't found
-+              if ( NOT _assuan2_${_name}_lib )
-+                if ( ASSUAN2_FOUND )
-+                  set( ASSUAN2_FOUND false )
-+                  set( _not_found_reason "dependant library ${_name} wasn't found" )
-+                endif()
-+              endif()
-+
-+              set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} "${_assuan2_${_name}_lib}" )
-+            endforeach()
-+
-+            #check_c_library_exists_explicit( assuan         assuan_check_version "${_ASSUAN2_CFLAGS}" "${ASSUAN2_LIBRARIES}"         ASSUAN2_FOUND         )
-+            if ( ASSUAN2_FOUND )
-+              message( STATUS " Checking whether assuan is usable...yes" )
-+            else()
-+              message( STATUS " Checking whether assuan is usable...no" )
-+              message( STATUS "  (${_not_found_reason})" )
-+            endif()
-+          endif()
-+
-+          # ensure that they are cached
-+          set( ASSUAN2_INCLUDES  ${ASSUAN2_INCLUDES}  )
-+          set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} )
-+
-+        endif()
-+
-+      endif()
-+
-+    endif()
-+
-+  endif()
-+
-+  macro_bool_to_01( ASSUAN2_FOUND         HAVE_ASSUAN2         )
-+
-+endif() # WIN32 | Unix
-+
-+
-+if ( NOT Assuan2_FIND_QUIETLY )
-+
-+  if ( ASSUAN2_FOUND )
-+    message( STATUS "Usable assuan found." )
-+    message( STATUS " Includes:  ${ASSUAN2_INCLUDES}" )
-+    message( STATUS " Libraries: ${ASSUAN2_LIBRARIES}" )
-+  else()
-+    message( STATUS "No usable assuan found." )
-+  endif()
-+
-+  macro_bool_to_bool( Assuan2_FIND_REQUIRED _req )
-+
-+  if ( WIN32 )
-+    set( _assuan2_homepage "http://www.gpg4win.org" )
-+  else()
-+    set( _assuan2_homepage "http://www.gnupg.org/related_software/libassuan" )
-+  endif()
-+
-+  macro_log_feature(
-+    ASSUAN2_FOUND
-+    "assuan2"
-+    "Assuan v2 IPC library"
-+    ${_assuan2_homepage}
-+    ${_req}
-+    "${_ASSUAN2_MIN_VERSION} or greater"
-+    "Needed for Kleopatra to act as the GnuPG UI Server"
-+  )
-+
-+else()
-+
-+  if ( Assuan2_FIND_REQUIRED AND NOT ASSUAN2_FOUND )
-+    message( FATAL_ERROR "" )
-+  endif()
-+
-+endif()
-+
-+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved )
diff --git a/misc/kdepim4/patches/patch-ab b/misc/kdepim4/patches/patch-ab
deleted file mode 100644
index a435bbf8856..00000000000
--- a/misc/kdepim4/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
---- kmail/kconf_update/kmail.upd.orig	2007-08-29 21:55:21.000000000 +1200
-+++ kmail/kconf_update/kmail.upd
-@@ -67,7 +67,7 @@ Id=3.2-update-loop-on-goto-unread-settin
- File=kmailrc
- Group=Behaviour
- Key=LoopOnGotoUnread
--Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,bash
-+Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,sh
- # due to a bug the first identity always had UOID 0, assign another UOID
- Id=3.1.4-dont-use-UOID-0-for-any-identity
- File=kmailrc
-@@ -81,7 +81,7 @@ Id=3.2-misc
- # against being run multiple times.
- ######################################################################
- File=kmailrc
--Script=kmail-3.2-misc.sh,bash
-+Script=kmail-3.2-misc.sh,sh
- #
- # reuse this section to add trivial stuff!
- #
diff --git a/misc/kdepim4/patches/patch-ac b/misc/kdepim4/patches/patch-ac
deleted file mode 100644
index 15f285fd506..00000000000
--- a/misc/kdepim4/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
---- kresources/groupwise/soap/stdsoap2.h.orig	2008-10-18 00:01:10.000000000 +1300
-+++ kresources/groupwise/soap/stdsoap2.h
-@@ -251,7 +251,7 @@ A commercial use license is available fr
- #  define HAVE_LOCALTIME_R
- #  define HAVE_WCTOMB
- #  define HAVE_MBTOWC
--# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__)
-+# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
- #  define HAVE_STRRCHR
- #  define HAVE_STRTOD
- #  define HAVE_SSCANF
diff --git a/misc/kdepim4/patches/patch-ae b/misc/kdepim4/patches/patch-ae
deleted file mode 100644
index 4ef7f609911..00000000000
--- a/misc/kdepim4/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2010/08/31 12:17:44 markd Exp $
-
-fix build with boost-libs 1.44
-
---- kleopatra/crypto/gui/newresultpage.cpp.orig	2010-08-31 11:37:56.000000000 +0000
-+++ kleopatra/crypto/gui/newresultpage.cpp
-@@ -52,6 +52,8 @@
- #include <QVBoxLayout>
- #include <QTimer>
- 
-+#include <boost/mem_fn.hpp>
-+
- #include <cassert>
- 
- static const int ProgressBarHideDelay = 2000; // 2 secs
diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af
deleted file mode 100644
index 1d466d34c39..00000000000
--- a/misc/kdepim4/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.5 2012/03/19 21:01:28 markd Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/CMakeLists.txt.orig	2009-11-02 12:02:09.000000000 +0000
-+++ kleopatra/CMakeLists.txt
-@@ -2,7 +2,7 @@ project(kleopatra)
- 
- include(MacroOptionalAddSubdirectory)
- 
--set( kleopatra_version 2.0.12 )
-+set( kleopatra_version 2.1.0 )
- set( kleopatra_release FALSE )
- 
- if (NOT kleopatra_release)
-@@ -28,7 +28,7 @@ include_directories(
-   ${QGPGME_INCLUDES}
-   ${GPGME_INCLUDES} )
- if (USABLE_ASSUAN_FOUND)
--   include_directories(${ASSUAN_INCLUDES})
-+   include_directories(${ASSUAN2_INCLUDES})
- endif(USABLE_ASSUAN_FOUND)
- add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
- remove_definitions ( -DQT_NO_STL )
-@@ -84,11 +84,7 @@ if ( USABLE_ASSUAN_FOUND )
-     selftest/uiservercheck.cpp
-     )
- 
--  if ( WIN32 )
--    set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} )
--  else ( WIN32 )
--    set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} )
--  endif( WIN32 )
-+  set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} )
- 
-   if ( HAVE_GPG_ERR_SOURCE_KLEO )
-     add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO )
diff --git a/misc/kdepim4/patches/patch-ag b/misc/kdepim4/patches/patch-ag
deleted file mode 100644
index 13d69acf371..00000000000
--- a/misc/kdepim4/patches/patch-ag
+++ /dev/null
@@ -1,154 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/ConfigureChecks.cmake.orig	2008-05-15 18:37:21.000000000 +0000
-+++ kleopatra/ConfigureChecks.cmake
-@@ -1,21 +1,18 @@
- # assuan configure checks
- include(CheckFunctionExists)
- 
--macro_optional_find_package(Assuan)
-+macro_optional_find_package(Assuan2)
- 
- set( USABLE_ASSUAN_FOUND false )
- 
--if ( ASSUAN_FOUND )
-+if ( ASSUAN2_FOUND )
- 
--  set( CMAKE_REQUIRED_INCLUDES ${ASSUAN_INCLUDES} )
-+  set( CMAKE_REQUIRED_INCLUDES ${ASSUAN2_INCLUDES} )
- 
--  if ( WIN32 AND ASSUAN_VANILLA_FOUND )
--    set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_VANILLA_LIBRARIES} )
-+  if ( ASSUAN2_FOUND )
-+    set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN2_LIBRARIES} )
-     set( USABLE_ASSUAN_FOUND true )
--  elseif( NOT WIN32 AND ASSUAN_PTHREAD_FOUND )
--    set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_PTHREAD_LIBRARIES} )
--    set( USABLE_ASSUAN_FOUND true )
--  endif( WIN32 AND ASSUAN_VANILLA_FOUND )
-+  endif( ASSUAN2_FOUND )
- 
-   # TODO: this workaround will be removed as soon as we find better solution
-   if(MINGW)
-@@ -24,7 +21,7 @@ if ( ASSUAN_FOUND )
-     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/msvc)
-   endif(MINGW)
- 
--endif( ASSUAN_FOUND )
-+endif( ASSUAN2_FOUND )
- 
- if ( USABLE_ASSUAN_FOUND )
-   # check if assuan.h can be compiled standalone (it couldn't, on
-@@ -48,40 +45,6 @@ endif( USABLE_ASSUAN_FOUND )
- 
- if ( USABLE_ASSUAN_FOUND )
- 
--  # check if assuan has assuan_fd_t
--  check_cxx_source_compiles("
--        #include <assuan.h>
--        int main() {
--            assuan_fd_t fd = ASSUAN_INVALID_FD;
--            return fd ? 1 : 0 ;
--        }
--        "
--    HAVE_ASSUAN_FD_T )
--
--  if ( WIN32 AND NOT HAVE_ASSUAN_FD_T )
--    set( USABLE_ASSUAN_FOUND false )
--  endif ( WIN32 AND NOT HAVE_ASSUAN_FD_T )
--
--  # check if assuan has assuan_inquire_ext, old style
--  check_function_exists( "assuan_inquire_ext" HAVE_ASSUAN_INQUIRE_EXT )
--
--  if ( NOT HAVE_ASSUAN_INQUIRE_EXT )
--    set( USABLE_ASSUAN_FOUND false )
--  endif( NOT HAVE_ASSUAN_INQUIRE_EXT )
--
--  # check if assuan has new-style assuan_inquire_ext:
--  check_cxx_source_compiles("
--        #include <assuan.h>
--        static int handler( void *, int, unsigned char*, size_t ) { return 0; }
--        int main() {
--            assuan_context_t ctx = 0;
--            const size_t maxSize = 0U;
--            assuan_error_t err = assuan_inquire_ext( ctx, \"FOO\", maxSize, handler, (void*)0 );
--            return err ? 1 : 0 ;
--        }
--        "
--    HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT )
--
-   # check if gpg-error already has GPG_ERR_SOURCE_KLEO
-   check_cxx_source_compiles("
-         #include <gpg-error.h>
-@@ -90,21 +53,6 @@ if ( USABLE_ASSUAN_FOUND )
-         "
-     HAVE_GPG_ERR_SOURCE_KLEO )
- 
--  # check if assuan has assuan_sock_get_nonce (via assuan_sock_nonce_t)
--  # function_exists runs into linking errors - libassuan is static,
--  # and assuan_sock_get_nonce drags in stuff that needs linking
--  # against winsock2.
--  check_cxx_source_compiles("
--        #include <assuan.h>
--        static assuan_sock_nonce_t nonce;
--        int main() { return 0; }
--        "
--    HAVE_ASSUAN_SOCK_GET_NONCE )
--
--  if ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )
--    set( USABLE_ASSUAN_FOUND false )
--  endif ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )  
--
- endif ( USABLE_ASSUAN_FOUND )
- 
- if ( USABLE_ASSUAN_FOUND )
-@@ -113,45 +61,14 @@ else ( USABLE_ASSUAN_FOUND )
-   message( STATUS "NO usable assuan found for Kleopatra" )
- endif ( USABLE_ASSUAN_FOUND )
- 
--#
--# Check that libassuan (which is built statically) can be linked into a DSO
--# (e.g. on amd64, this requires it to be compiled with -fPIC).
--#
--
--set ( ASSUAN_LINKABLE_TO_DSO false )
--
- OPTION( BUILD_libkleopatraclient "Build directory kleopatra/libkleopatraclient" ${USABLE_ASSUAN_FOUND} )
- 
- if ( NOT USABLE_ASSUAN_FOUND )
-   set( BUILD_libkleopatraclient false )
- endif ( NOT USABLE_ASSUAN_FOUND )
- 
--if ( BUILD_libkleopatraclient )
--
--  message( STATUS "Checking whether libassuan can be linked against from DSO's" )
--
--  set ( YUP TRUE )
--  if ( YUP )
--    set ( ASSUAN_LINKABLE_TO_DSO true )
--    message( STATUS "--> Assuming that it can. If compilation of libkleopatraclient fails on AMD64, check that libassuan is compiled with -fPIC and try again. Otherwise, pass -DBUILD_libkleopatraclient=OFF." )
--  else ( YUP )
--  # TODO: make this one executed at configure time, so the check below works:
--  add_library( dso_with_assuan_check SHARED ${CMAKE_SOURCE_DIR}/kleopatra/dso_with_assuan_check.c )
--
--  set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dso_with_assuan_check )
--  check_cxx_source_compiles( "int main() { return 0; }" ASSUAN_LINKABLE_TO_DSO )
--
--  if ( ASSUAN_LINKABLE_TO_DSO )
--    message( STATUS "Usable assuan found for libkleopatraclient" )
--  else ( ASSUAN_LINKABLE_TO_DSO )
--    message( STATUS "NO usable assuan found for libkleopatraclient - if this is AMD64, check that libassuan is compiled with -fPIC" )
--  endif ( ASSUAN_LINKABLE_TO_DSO )
--  endif ( YUP )
--
--endif ( BUILD_libkleopatraclient )
--
- macro_bool_to_01( USABLE_ASSUAN_FOUND  HAVE_USABLE_ASSUAN )
--macro_bool_to_01( ASSUAN_LINKABLE_TO_DSO HAVE_KLEOPATRACLIENT_LIBRARY )
-+macro_bool_to_01( USABLE_ASSUAN_FOUND  HAVE_KLEOPATRACLIENT_LIBRARY )
- 
- set(CMAKE_REQUIRED_INCLUDES)
- set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/misc/kdepim4/patches/patch-ah b/misc/kdepim4/patches/patch-ah
deleted file mode 100644
index ea86e238b16..00000000000
--- a/misc/kdepim4/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/config-kleopatra.h.cmake.orig	2008-07-29 11:51:01.000000000 +0000
-+++ kleopatra/config-kleopatra.h.cmake
-@@ -1,18 +1,6 @@
- /* Define to 1 if you have a recent enough libassuan */
- #cmakedefine HAVE_USABLE_ASSUAN 1
- 
--/* Define to 1 if your libassuan has the assuan_fd_t type  */
--#cmakedefine HAVE_ASSUAN_FD_T 1
--
--/* Define to 1 if your libassuan has the assuan_inquire_ext function */
--#cmakedefine HAVE_ASSUAN_INQUIRE_EXT 1
--
--/* Define to 1 if your assuan_inquire_ext puts the buffer arguments into the callback signature */
--#cmakedefine HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT 1
--
--/* Define to 1 if your libassuan has the assuan_sock_get_nonce function */
--#cmakedefine HAVE_ASSUAN_SOCK_GET_NONCE 1
--
- /* Define to 1 if you build libkleopatraclient */
- #cmakedefine HAVE_KLEOPATRACLIENT_LIBRARY 1
- 
diff --git a/misc/kdepim4/patches/patch-ai b/misc/kdepim4/patches/patch-ai
deleted file mode 100644
index a22db93e489..00000000000
--- a/misc/kdepim4/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/libkleopatraclient/core/CMakeLists.txt.orig	2010-01-19 23:22:25.000000000 +0000
-+++ kleopatra/libkleopatraclient/core/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories( ${ASSUAN_INCLUDES} ${CMAKE_SOURCE_DIR}/kleopatra )
-+include_directories( ${ASSUAN2_INCLUDES} ${CMAKE_SOURCE_DIR}/kleopatra )
- 
- add_definitions( -D_ASSUAN_ONLY_GPG_ERRORS -DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII )
- 
-@@ -27,9 +27,9 @@ set_target_properties( kleopatraclientco
- 
- 
- if ( WIN32 )
--  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN_VANILLA_LIBRARIES} ws2_32 )
-+  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN2_LIBRARIES} ws2_32 )
- else ( WIN32 )
--  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN_PTHREAD_LIBRARIES} )
-+  target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN2_LIBRARIES} )
- endif ( WIN32 )
- 
- install(
diff --git a/misc/kdepim4/patches/patch-aj b/misc/kdepim4/patches/patch-aj
deleted file mode 100644
index 7c4118b8902..00000000000
--- a/misc/kdepim4/patches/patch-aj
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/libkleopatraclient/core/command.cpp.orig	2008-11-19 10:18:55.000000000 +0000
-+++ kleopatra/libkleopatraclient/core/command.cpp
-@@ -283,19 +283,19 @@ typedef shared_ptr< remove_pointer<assua
- namespace {
-     struct AssuanClientContext : AssuanContextBase {
-         AssuanClientContext() : AssuanContextBase() {}
--        explicit AssuanClientContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_disconnect ) {}
--        void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_disconnect ); }
-+        explicit AssuanClientContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_release ) {}
-+        void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_release ); }
-     };
- }
- 
--static assuan_error_t
-+static gpg_error_t
- my_assuan_transact( const AssuanClientContext & ctx,
-                     const char *command,
--                    assuan_error_t (*data_cb)( void *, const void *, size_t )=0,
-+                    gpg_error_t (*data_cb)( void *, const void *, size_t )=0,
-                     void * data_cb_arg=0,
--                    assuan_error_t (*inquire_cb)( void *, const char * )=0,
-+                    gpg_error_t (*inquire_cb)( void *, const char * )=0,
-                     void * inquire_cb_arg=0,
--                    assuan_error_t (*status_cb)( void *, const char * )=0,
-+                    gpg_error_t (*status_cb)( void *, const char * )=0,
-                     void * status_cb_arg=0)
- {
-     return assuan_transact( ctx.get(), command, data_cb, data_cb_arg, inquire_cb, inquire_cb_arg, status_cb, status_cb_arg );
-@@ -337,26 +337,26 @@ static QString start_uiserver() {
-     return Command::tr("start_uiserver: not yet implemented");
- }
- 
--static assuan_error_t getinfo_pid_cb( void * opaque, const void * buffer, size_t length ) {
-+static gpg_error_t getinfo_pid_cb( void * opaque, const void * buffer, size_t length ) {
-     qint64 & pid = *static_cast<qint64*>( opaque );
-     pid = QByteArray( static_cast<const char*>( buffer ), length ).toLongLong();
-     return 0;
- }
- 
--static assuan_error_t command_data_cb( void * opaque, const void * buffer, size_t length ) {
-+static gpg_error_t command_data_cb( void * opaque, const void * buffer, size_t length ) {
-     QByteArray & ba = *static_cast<QByteArray*>( opaque );
-     ba.append( QByteArray( static_cast<const char*>(buffer), length ) );
-     return 0;
- }
- 
--static assuan_error_t send_option( const AssuanClientContext & ctx, const char * name, const QVariant & value ) {
-+static gpg_error_t send_option( const AssuanClientContext & ctx, const char * name, const QVariant & value ) {
-     if ( value.isValid() )
-         return my_assuan_transact( ctx, QString().sprintf( "OPTION %s=%s", name, value.toString().toUtf8().constData() ).toUtf8().constData() );
-     else
-         return my_assuan_transact( ctx, QString().sprintf( "OPTION %s", name ).toUtf8().constData() );
- }
- 
--static assuan_error_t send_file( const AssuanClientContext & ctx, const QString & file ) {
-+static gpg_error_t send_file( const AssuanClientContext & ctx, const QString & file ) {
-     return my_assuan_transact( ctx, QString().sprintf( "FILE %s", hexencode( QFile::encodeName( file ) ).constData() ).toUtf8().constData() );
- }
- 
-@@ -373,21 +373,32 @@ void Command::Private::run() {
- 
-     out.canceled = false;
- 
--    assuan_error_t err = 0;
--
--    assuan_context_t naked_ctx = 0;
--    AssuanClientContext ctx;
--
-     if ( out.serverLocation.isEmpty() )
-         out.serverLocation = default_socket_name();
- 
-+    AssuanClientContext ctx;
-+    gpg_error_t err = 0;
-+
-     const QString socketName = out.serverLocation;
-     if ( socketName.isEmpty() ) {
-         out.errorString = tr("Invalid socket name!");
-         goto leave;
-     }
- 
--    err = assuan_socket_connect( &naked_ctx, QFile::encodeName( socketName ).constData(), -1 );
-+    {
-+        assuan_context_t naked_ctx = 0;
-+        err = assuan_new( &naked_ctx );
-+        if ( err ) {
-+            out.errorString = tr( "Could not allocate resources to connect to Kleopatra UI server at %1: %2" )
-+                .arg( socketName, to_error_string( err ) );
-+            goto leave;
-+        }
-+
-+        ctx.reset( naked_ctx );
-+    }
-+
-+
-+    err = assuan_socket_connect( ctx.get(), QFile::encodeName( socketName ).constData(), -1, 0 );
-     if ( err ) {
-         qDebug( "UI server not running, starting it" );
-         
-@@ -400,7 +411,7 @@ void Command::Private::run() {
-         // give it a bit of time to start up and try a couple of times
-         for ( int i = 0 ; err && i < 20 ; ++i ) {
-             msleep( 500 );
--            err = assuan_socket_connect( &naked_ctx, QFile::encodeName( socketName ).constData(), -1 );
-+            err = assuan_socket_connect( ctx.get(), QFile::encodeName( socketName ).constData(), -1, 0 );
-         }
-     }
- 
-@@ -410,9 +421,6 @@ void Command::Private::run() {
-         goto leave;
-     }
- 
--    ctx.reset( naked_ctx );
--    naked_ctx = 0;
--
-     out.serverPid = -1;
-     err = my_assuan_transact( ctx, "GETINFO pid", &getinfo_pid_cb, &out.serverPid );
-     if ( err || out.serverPid <= 0 ) {
diff --git a/misc/kdepim4/patches/patch-ak b/misc/kdepim4/patches/patch-ak
deleted file mode 100644
index a99314d5e81..00000000000
--- a/misc/kdepim4/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/libkleopatraclient/core/initialization.cpp.orig	2008-07-08 09:56:21.000000000 +0000
-+++ kleopatra/libkleopatraclient/core/initialization.cpp
-@@ -29,7 +29,7 @@
- using namespace KLEOPATRACLIENT_NAMESPACE;
- 
- Initialization::Initialization() {
--    assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
-+    assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
- }
- 
- Initialization::~Initialization() {
diff --git a/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt b/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt
deleted file mode 100644
index 69b954cf433..00000000000
--- a/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-akregator_plugins_mk4storage_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- akregator/plugins/mk4storage/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ akregator/plugins/mk4storage/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories( ${CMAKE_SOURCE_DIR}/akregator/interfaces ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/akregator/plugins/mk4storage/metakit/include ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_BINARY_DIR}/akregator ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIR} )
- 
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- set(libmetakitlocal_SRCS 
-                 metakit/src/column.cpp 
-                 metakit/src/custom.cpp
diff --git a/misc/kdepim4/patches/patch-al b/misc/kdepim4/patches/patch-al
deleted file mode 100644
index 6f0cea206b2..00000000000
--- a/misc/kdepim4/patches/patch-al
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/tests/test_uiserver.cpp.orig	2009-07-17 21:45:43.000000000 +0000
-+++ kleopatra/tests/test_uiserver.cpp
-@@ -89,17 +89,17 @@ static void usage( const std::string & m
-     exit( 1 );
- }
- 
--static assuan_error_t data( void * void_ctx, const void * buffer, size_t len ) {
-+static gpg_error_t data( void * void_ctx, const void * buffer, size_t len ) {
-     (void)void_ctx; (void)buffer; (void)len;
-     return 0; // ### implement me
- }
- 
--static assuan_error_t status( void * void_ctx, const char * line ) {
-+static gpg_error_t status( void * void_ctx, const char * line ) {
-     (void)void_ctx; (void)line;
-     return 0;
- }
- 
--static assuan_error_t inquire( void * void_ctx, const char * keyword ) {
-+static gpg_error_t inquire( void * void_ctx, const char * keyword ) {
-     assuan_context_t ctx = (assuan_context_t)void_ctx;
-     assert( ctx );
-     const std::map<std::string,std::string>::const_iterator it = inquireData.find( keyword );
-@@ -121,7 +121,7 @@ int main( int argc, char * argv[] ) {
- 
-     const Kleo::WSAStarter _wsastarter;
- 
--    assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
-+    assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
- 
-     if ( argc < 3 )
-         usage(); // need socket and command, at least
-@@ -185,7 +185,12 @@ int main( int argc, char * argv[] ) {
- 
-     assuan_context_t ctx = 0;
- 
--    if ( const gpg_error_t err = assuan_socket_connect_ext( &ctx, socket, -1, ASSUAN_CONNECT_FLAGS ) ) {
-+    if ( const gpg_error_t err = assuan_new( &ctx ) ) {
-+        qDebug( "%s", Exception( err, "assuan_new" ).what() );
-+        return 1;
-+    }
-+
-+    if ( const gpg_error_t err = assuan_socket_connect( ctx, socket, -1, ASSUAN_CONNECT_FLAGS ) ) {
-         qDebug( "%s", Exception( err, "assuan_socket_connect_ext" ).what() );
-         return 1;
-     }
-@@ -279,7 +284,7 @@ int main( int argc, char * argv[] ) {
-         return 1;
-     }
- 
--    assuan_disconnect( ctx );
-+    assuan_release( ctx );
- 
-     return 0;
- }
diff --git a/misc/kdepim4/patches/patch-am b/misc/kdepim4/patches/patch-am
deleted file mode 100644
index 008197194d0..00000000000
--- a/misc/kdepim4/patches/patch-am
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/uiserver/assuancommand.h.orig	2009-11-13 10:58:28.000000000 +0000
-+++ kleopatra/uiserver/assuancommand.h
-@@ -39,6 +39,8 @@
- #include <gpgme++/global.h>
- #include <gpgme++/error.h>
- 
-+#include <gpg-error.h>
-+
- #include <kmime/kmime_header_parsing.h>
- 
- #include <qwindowdefs.h> // for WId
-@@ -329,16 +331,16 @@ namespace Kleo {
-         virtual boost::shared_ptr<AssuanCommand> create() const = 0;
-         virtual const char * name() const = 0;
- 
--        typedef int(*_Handler)( assuan_context_s*, char *);
-+        typedef gpg_error_t(*_Handler)( assuan_context_s*, char *);
-         virtual _Handler _handler() const = 0;
-     protected:
--        static int _handle( assuan_context_s*, char *, const char * );
-+        static gpg_error_t _handle( assuan_context_s*, char *, const char * );
-     };
- 
-     template <typename Command>
-     class GenericAssuanCommandFactory : public AssuanCommandFactory {
-         /* reimp */ AssuanCommandFactory::_Handler _handler() const { return &GenericAssuanCommandFactory::_handle; }
--        static int _handle( assuan_context_s* _ctx, char * _line ) {
-+        static gpg_error_t _handle( assuan_context_s* _ctx, char * _line ) {
-             return AssuanCommandFactory::_handle( _ctx, _line, Command::staticName() );
-         }
-         /* reimp */ boost::shared_ptr<AssuanCommand> create() const { return make(); }
diff --git a/misc/kdepim4/patches/patch-an b/misc/kdepim4/patches/patch-an
deleted file mode 100644
index c9dbdba2b32..00000000000
--- a/misc/kdepim4/patches/patch-an
+++ /dev/null
@@ -1,338 +0,0 @@
-$NetBSD: patch-an,v 1.3 2013/06/13 14:29:37 joerg Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
-Work around moc inability to parse a boost macro
-
---- kleopatra/uiserver/assuanserverconnection.cpp.orig	2011-04-20 20:03:31.000000000 +0000
-+++ kleopatra/uiserver/assuanserverconnection.cpp
-@@ -77,11 +77,13 @@
- 
- #include <kleo-assuan.h>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits/remove_pointer.hpp>
- #include <boost/lexical_cast.hpp>
- #include <boost/bind.hpp>
- #include <boost/mem_fn.hpp>
- #include <boost/mpl/if.hpp>
-+#endif
- 
- #include <vector>
- #include <map>
-@@ -91,10 +93,6 @@
- 
- #include <errno.h>
- 
--#ifdef __GNUC__
--# include <ext/algorithm> // for is_sorted
--#endif
--
- #ifdef Q_OS_WIN32
- # include <io.h>
- # include <process.h>
-@@ -116,13 +114,18 @@ static const unsigned int INIT_SOCKET_FL
- static const int FOR_READING = 0;
- static const unsigned int MAX_ACTIVE_FDS = 32;
- 
-+static void my_assuan_release( assuan_context_t ctx ) {
-+    if ( ctx )
-+        assuan_release( ctx );
-+}
-+
- // shared_ptr for assuan_context_t w/ deleter enforced to assuan_deinit_server:
- typedef shared_ptr< remove_pointer<assuan_context_t>::type > AssuanContextBase;
- struct AssuanContext : AssuanContextBase {
-     AssuanContext() : AssuanContextBase() {}
--    explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_deinit_server ) {}
-+    explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &my_assuan_release ) {}
- 
--    void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_deinit_server ); }
-+    void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &my_assuan_release ); }
- };
- 
- static inline gpg_error_t assuan_process_done_msg( assuan_context_t ctx, gpg_error_t err, const char * err_msg ) {
-@@ -240,7 +243,8 @@ Q_SIGNALS:
- public Q_SLOTS:
-     void slotReadActivity( int ) {
-         assert( ctx );
--        if ( const int err = assuan_process_next( ctx.get() ) ) {
-+        int done = false;
-+        if ( const int err = assuan_process_next( ctx.get(), &done ) || done ) {
-             //if ( err == -1 || gpg_err_code(err) == GPG_ERR_EOF ) {
-                 topHalfDeletion();
-                 if ( nohupedCommands.empty() )
-@@ -296,15 +300,17 @@ private:
-     }
- 
- private:
--    static void reset_handler( assuan_context_t ctx_ ) {
-+    static gpg_error_t reset_handler( assuan_context_t ctx_, char * ) {
-         assert( assuan_get_pointer( ctx_ ) );
- 
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-         conn.reset();
-+
-+        return 0;
-     }
- 
--    static int option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
-+    static gpg_error_t option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
-         assert( assuan_get_pointer( ctx_ ) );
- 
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -317,7 +323,7 @@ private:
-         //return gpg_error( GPG_ERR_UNKNOWN_OPTION );
-     }
- 
--    static int session_handler( assuan_context_t ctx_, char * line ) {
-+    static gpg_error_t session_handler( assuan_context_t ctx_, char * line ) {
-         assert( assuan_get_pointer( ctx_ ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-@@ -344,7 +350,7 @@ private:
-         return assuan_process_done( ctx_, 0 );
-     }
- 
--    static int capabilities_handler( assuan_context_t ctx_, char * line ) {
-+    static gpg_error_t capabilities_handler( assuan_context_t ctx_, char * line ) {
-         if ( !QByteArray( line ).trimmed().isEmpty() ) {
-             static const QString errorString = i18n("CAPABILITIES does not take arguments");
-             return assuan_process_done_msg( ctx_, gpg_error( GPG_ERR_ASS_PARAMETER ), errorString );
-@@ -357,7 +363,7 @@ private:
-         return assuan_process_done( ctx_, assuan_send_data( ctx_, capabilities, sizeof capabilities - 1 ) );
-     }
- 
--    static int getinfo_handler( assuan_context_t ctx_, char * line ) {
-+    static gpg_error_t getinfo_handler( assuan_context_t ctx_, char * line ) {
-         assert( assuan_get_pointer( ctx_ ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-@@ -386,7 +392,7 @@ private:
-         return assuan_process_done( ctx_, assuan_send_data( ctx_, ba.constData(), ba.size() ) );
-     }
- 
--    static int start_keymanager_handler( assuan_context_t ctx_, char * line ) {
-+    static gpg_error_t start_keymanager_handler( assuan_context_t ctx_, char * line ) {
-         assert( assuan_get_pointer( ctx_ ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-@@ -400,7 +406,7 @@ private:
-         return assuan_process_done( ctx_, 0 );
-     }
- 
--    static int start_confdialog_handler( assuan_context_t ctx_, char * line ) {
-+    static gpg_error_t start_confdialog_handler( assuan_context_t ctx_, char * line ) {
-         assert( assuan_get_pointer( ctx_ ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-@@ -418,7 +424,7 @@ private:
- 
-     // format: TAG (FD|FD=\d+|FILE=...)
-     template <bool in, typename T_memptr>
--    static int IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
-+    static gpg_error_t IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
-         assert( assuan_get_pointer( ctx_ ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-@@ -498,19 +504,19 @@ private:
- 
-     }
- 
--    static int input_handler( assuan_context_t ctx, char * line ) {
-+    static gpg_error_t input_handler( assuan_context_t ctx, char * line ) {
-         return IO_handler<true>( ctx, line, &Private::inputs );
-     }
- 
--    static int output_handler( assuan_context_t ctx, char * line ) {
-+    static gpg_error_t output_handler( assuan_context_t ctx, char * line ) {
-         return IO_handler<false>( ctx, line, &Private::outputs );
-     }
- 
--    static int message_handler( assuan_context_t ctx, char * line ) {
-+    static gpg_error_t message_handler( assuan_context_t ctx, char * line ) {
-         return IO_handler<true>( ctx, line, &Private::messages );
-     }
- 
--    static int file_handler( assuan_context_t ctx_, char * line ) {
-+    static gpg_error_t file_handler( assuan_context_t ctx_, char * line ) {
-         assert( assuan_get_pointer( ctx_ ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
- 
-@@ -572,7 +578,7 @@ private:
-     }
- 
-     template <typename T_memptr, typename T_memptr2>
--    static int recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
-+    static gpg_error_t recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
-         assert( assuan_get_pointer( ctx ) );
-         AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
- 
-@@ -656,11 +662,11 @@ private:
-         return assuan_process_done( ctx, 0 );
-     }
- 
--    static int recipient_handler( assuan_context_t ctx, char * line ) {
-+    static gpg_error_t recipient_handler( assuan_context_t ctx, char * line ) {
-         return recipient_sender_handler( &Private::recipients, &Private::informativeRecipients, ctx, line );
-     }
- 
--    static int sender_handler( assuan_context_t ctx, char * line ) {
-+    static gpg_error_t sender_handler( assuan_context_t ctx, char * line ) {
-         return recipient_sender_handler( &Private::senders, &Private::informativeSenders, ctx, line, true );
-     }
- 
-@@ -785,18 +791,18 @@ AssuanServerConnection::Private::Private
-       sessionId( 0 ),
-       factories( factories_ )
- {
--#ifdef __GNUC__
--    assert( __gnu_cxx::is_sorted( factories_.begin(), factories_.end(), _detail::ByName<std::less>() ) );
--#endif
--
-     if ( fd == ASSUAN_INVALID_FD )
-         throw Exception( gpg_error( GPG_ERR_INV_ARG ), "pre-assuan_init_socket_server_ext" );
- 
--    assuan_context_t naked_ctx = 0;
--    if ( const gpg_error_t err = assuan_init_socket_server_ext( &naked_ctx, fd, INIT_SOCKET_FLAGS ) )
-+    {
-+        assuan_context_t naked_ctx = 0;
-+        if ( const gpg_error_t err = assuan_new( &naked_ctx ) )
-+            throw Exception( err, "assuan_new" );
-+        ctx.reset( naked_ctx );
-+    }
-+    if ( const gpg_error_t err = assuan_init_socket_server( ctx.get(), fd, INIT_SOCKET_FLAGS ) )
-         throw Exception( err, "assuan_init_socket_server_ext" );
- 
--    ctx.reset( naked_ctx ); naked_ctx = 0;
- 
-     // for callbacks, associate the context with this connection:
-     assuan_set_pointer( ctx.get(), this );
-@@ -824,34 +830,34 @@ AssuanServerConnection::Private::Private
- 
- 
-     // register our INPUT/OUTPUT/MESSGAE/FILE handlers:
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT",  input_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT",  input_handler, "" ) )
-         throw Exception( err, "register \"INPUT\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE",  message_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE",  message_handler, "" ) )
-         throw Exception( err, "register \"MESSAGE\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler, "" ) )
-         throw Exception( err, "register \"OUTPUT\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler, "" ) )
-         throw Exception( err, "register \"FILE\" handler" );
- 
- 
-     // register user-defined commands:
-     Q_FOREACH( shared_ptr<AssuanCommandFactory> fac, factories )
--        if ( const gpg_error_t err = assuan_register_command( ctx.get(), fac->name(), fac->_handler() ) )
-+        if ( const gpg_error_t err = assuan_register_command( ctx.get(), fac->name(), fac->_handler(), "" ) )
-             throw Exception( err, std::string( "register \"" ) + fac->name() + "\" handler" );
- 
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "GETINFO", getinfo_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "GETINFO", getinfo_handler, "" ) )
-         throw Exception( err, "register \"GETINFO\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_KEYMANAGER", start_keymanager_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_KEYMANAGER", start_keymanager_handler, "" ) )
-         throw Exception( err, "register \"START_KEYMANAGER\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_CONFDIALOG", start_confdialog_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_CONFDIALOG", start_confdialog_handler, "" ) )
-         throw Exception( err, "register \"START_CONFDIALOG\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler, "" ) )
-         throw Exception( err, "register \"RECIPIENT\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler, "" ) )
-         throw Exception( err, "register \"SENDER\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler, "" ) )
-         throw Exception( err, "register \"SESSION\" handler" );
--    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler ) )
-+    if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler, "" ) )
-         throw Exception( err, "register \"CAPABILITIES\" handler" );
- 
-     assuan_set_hello_line( ctx.get(), "GPG UI server (Kleopatra/" KLEOPATRA_VERSION_STRING ") ready to serve" );
-@@ -904,20 +910,14 @@ class InquiryHandler : public QObject {
-     Q_OBJECT
- public:
- 
--#ifdef HAVE_ASSUAN_INQUIRE_EXT
-     explicit InquiryHandler( const char * keyword_, QObject * p=0 )
-         : QObject( p ),
--# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
--          buffer( 0 ),
--          buflen( 0 ),
--# endif
-           keyword( keyword_ )
-     {
- 
-     }
- 
--# ifdef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
--    static int handler( void * cb_data, int rc, unsigned char * buffer, size_t buflen )
-+    static gpg_error_t handler( void * cb_data, gpg_error_t rc, unsigned char * buffer, size_t buflen )
-     {
-         assert( cb_data );
-         InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
-@@ -926,26 +926,9 @@ public:
-         delete this_;
-         return 0;
-     }
--# else
--    static int handler( void * cb_data, int rc )
--    {
--        assert( cb_data );
--        InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
--        emit this_->signal( rc, QByteArray::fromRawData( reinterpret_cast<const char*>(this_->buffer), this_->buflen ), this_->keyword );
--        std::free( this_->buffer );
--        delete this_;
--        return 0;
--    }
--# endif
- 
- private:
--# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
--    friend class ::Kleo::AssuanCommand;
--    unsigned char * buffer;
--    size_t buflen;
--# endif
-     const char * keyword;
--#endif // HAVE_ASSUAN_INQUIRE_EXT
- 
- Q_SIGNALS:
-     void signal( int rc, const QByteArray & data, const QByteArray & keyword );
-@@ -1157,20 +1140,13 @@ int AssuanCommand::inquire( const char *
-     if ( d->nohup )
-         return makeError( GPG_ERR_INV_OP );
- 
--#ifdef HAVE_ASSUAN_INQUIRE_EXT
-     std::auto_ptr<InquiryHandler> ih( new InquiryHandler( keyword, receiver ) );
-     receiver->connect( ih.get(), SIGNAL(signal(int,QByteArray,QByteArray)), slot );
-     if ( const gpg_error_t err = assuan_inquire_ext( d->ctx.get(), keyword,
--# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
--                                                     &ih->buffer, &ih->buflen,
--# endif
-                                                      maxSize, InquiryHandler::handler, ih.get() ) )
-          return err;
-     ih.release();
-     return 0;
--#else
--    return makeError( GPG_ERR_NOT_SUPPORTED ); // libassuan too old
--#endif // HAVE_ASSUAN_INQUIRE_EXT
- }
- 
- void AssuanCommand::done( const GpgME::Error& err, const QString & details ) {
-@@ -1262,7 +1238,7 @@ const std::vector<KMime::Types::Mailbox>
-     return d->senders;
- }
- 
--int AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
-+gpg_error_t AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
-     assert( assuan_get_pointer( ctx ) );
-     AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
- 
diff --git a/misc/kdepim4/patches/patch-ao b/misc/kdepim4/patches/patch-ao
deleted file mode 100644
index d58b64b2dd2..00000000000
--- a/misc/kdepim4/patches/patch-ao
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/uiserver/uiserver.cpp.orig	2009-03-10 12:25:10.000000000 +0000
-+++ kleopatra/uiserver/uiserver.cpp
-@@ -73,15 +73,15 @@ UiServer::Private::Private( UiServer * q
-       actualSocketName(),
-       cryptoCommandsEnabled( false )
- {
--    assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
-+    assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
- }
- 
- bool UiServer::Private::isStaleAssuanSocket( const QString& fileName )
- {
-     assuan_context_t ctx = 0;
--    const bool error = assuan_socket_connect_ext( &ctx, QFile::encodeName( fileName ).constData(), -1, 0 );
-+    const bool error = assuan_new( &ctx ) || assuan_socket_connect( ctx, QFile::encodeName( fileName ).constData(), -1, 0 );
-     if ( !error )
--        assuan_disconnect( ctx );
-+        assuan_release( ctx );
-     return error;
- }
- 
-@@ -166,13 +166,11 @@ void UiServer::Private::slotConnectionCl
- void UiServer::Private::incomingConnection( int fd ) {
-     try {
-         qDebug( "UiServer: client connect on fd %d", fd );
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
-         if ( assuan_sock_check_nonce( (assuan_fd_t)fd, &nonce ) ) {
-             qDebug( "UiServer: nonce check failed" );
-             assuan_sock_close( (assuan_fd_t)fd );
-             return;
-         }
--#endif
-         const shared_ptr<AssuanServerConnection> c( new AssuanServerConnection( (assuan_fd_t)fd, factories ) );
-         connect( c.get(), SIGNAL(closed(Kleo::AssuanServerConnection*)),
-                  this, SLOT(slotConnectionClosed(Kleo::AssuanServerConnection*)) );
diff --git a/misc/kdepim4/patches/patch-ap b/misc/kdepim4/patches/patch-ap
deleted file mode 100644
index 6dc4772c9e8..00000000000
--- a/misc/kdepim4/patches/patch-ap
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/uiserver/uiserver_unix.cpp.orig	2009-01-27 23:05:13.000000000 +0000
-+++ kleopatra/uiserver/uiserver_unix.cpp
-@@ -61,11 +61,7 @@ QString UiServer::Private::systemErrorSt
- 
- void UiServer::Private::doMakeListeningSocket( const QByteArray & encodedFileName ) {
-     // Create a Unix Domain Socket:
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
-     const assuan_fd_t sock = assuan_sock_new( AF_UNIX, SOCK_STREAM, 0 );
--#else
--    const assuan_fd_t sock = ::socket( AF_UNIX, SOCK_STREAM, 0 );
--#endif
-     if ( sock == ASSUAN_INVALID_FD )
-         throw_<std::runtime_error>( i18n( "Could not create socket: %1", systemErrorString() ) );
- 
-@@ -75,19 +71,13 @@ void UiServer::Private::doMakeListeningS
-         std::memset( &sa, 0, sizeof(sa) );
-         sa.sun_family = AF_UNIX;
-         std::strncpy( sa.sun_path, encodedFileName.constData(), sizeof( sa.sun_path ) - 1 );
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
-         if ( assuan_sock_bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
--#else
--        if ( ::bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
--#endif
-             throw_<std::runtime_error>( i18n( "Could not bind to socket: %1", systemErrorString() ) );
- 
-         // ### TODO: permissions?
- 
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
-         if ( assuan_sock_get_nonce( (struct sockaddr*)&sa, sizeof( sa ), &nonce ) )
-             throw_<std::runtime_error>( i18n("Could not get socket nonce: %1", systemErrorString() ) );
--#endif
- 
-         // Listen
-         if ( ::listen( sock, SOMAXCONN ) )
diff --git a/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt b/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt
deleted file mode 100644
index 97cc8788760..00000000000
--- a/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-kalarm_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- kalarm/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ kalarm/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(kalarm)
- 
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5950)
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
- 
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp b/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp
deleted file mode 100644
index 302ea4b9296..00000000000
--- a/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-kleopatra_models_keylistmodel.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $
-
---- kleopatra/models/keylistmodel.cpp.orig	2013-06-12 20:30:56.000000000 +0000
-+++ kleopatra/models/keylistmodel.cpp
-@@ -67,10 +67,6 @@
- #include <iterator>
- #include <cassert>
- 
--#ifdef __GNUC__
--#include <ext/algorithm> // for is_sorted
--#endif
--
- using namespace GpgME;
- using namespace Kleo;
- 
-@@ -444,9 +440,6 @@ QModelIndex FlatKeyListModel::doMapFromK
- }
- 
- QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
--    assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
--#endif
-     if ( keys.empty() )
-         return QList<QModelIndex>();
- 
-@@ -701,9 +694,6 @@ static std::vector<Key> topological_sort
- }
- 
- QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
--    assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
--#endif
-     if ( keys.empty() )
-         return QList<QModelIndex>();
- 
diff --git a/misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp b/misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp
new file mode 100644
index 00000000000..6353ed871b4
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+Work around: Parse error at "BOOST_JOIN"
+
+--- kleopatra/newcertificatewizard/newcertificatewizard.cpp.orig	2014-11-06 08:45:47.000000000 +0000
++++ kleopatra/newcertificatewizard/newcertificatewizard.cpp
+@@ -78,7 +78,9 @@
+ #include <QUrl>
+ #include <QDesktopServices>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+ 
+ #include <algorithm>
+ 
diff --git a/misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp b/misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp
new file mode 100644
index 00000000000..1267ab6bf76
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-kleopatra_smartcard_readerstatus.cpp,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+Work around: Parse error at "BOOST_JOIN"
+
+--- kleopatra/smartcard/readerstatus.cpp.orig	2014-11-06 08:45:47.000000000 +0000
++++ kleopatra/smartcard/readerstatus.cpp
+@@ -58,11 +58,13 @@
+ #include <QThread>
+ #include <QPointer>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/algorithm/string/split.hpp>
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/case_conv.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/range.hpp>
++#endif
+ #include <boost/bind.hpp>
+ 
+ #include <vector>
diff --git a/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp b/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp
deleted file mode 100644
index 94191127e16..00000000000
--- a/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-kleopatra_utils_classify.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $
-
---- kleopatra/utils/classify.cpp.orig	2013-06-12 20:27:57.000000000 +0000
-+++ kleopatra/utils/classify.cpp
-@@ -43,10 +43,6 @@
- 
- #include <boost/range.hpp>
- 
--#ifdef __GNUC__
--# include <ext/algorithm>
--#endif
--
- #include <functional>
- 
- using namespace boost;
-@@ -149,10 +145,6 @@ unsigned int Kleo::classify( const QStri
- }
- 
- unsigned int Kleo::classify( const QString & filename ) {
--#ifdef __GNUC__
--    assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
--#endif
--
-     const QFileInfo fi( filename );
- 
-     const _classification * const it = qBinaryFind( begin( classifications ), end( classifications ),
-@@ -175,10 +167,6 @@ unsigned int Kleo::classify( const QStri
- }
- 
- unsigned int Kleo::classifyContent( const QByteArray & data ) {
--#ifdef __GNUC__
--    assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
--#endif
--
-     static const char beginString[] = "-----BEGIN ";
-     static const QByteArrayMatcher beginMatcher( beginString );
-     int pos = beginMatcher.indexIn( data );
diff --git a/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h b/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h
deleted file mode 100644
index 63594e9e52b..00000000000
--- a/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-kleopatra_utils_stl__util.h,v 1.1 2013/06/13 14:29:37 joerg Exp $
-
---- kleopatra/utils/stl_util.h.orig	2013-06-12 20:35:45.000000000 +0000
-+++ kleopatra/utils/stl_util.h
-@@ -347,7 +347,7 @@ namespace kdtools {
-     template <typename O, typename I, typename P>
-     O copy_if( const I & i, P p ) {
-         O o;
--        copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
-+        kdtools::copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
-         return o;
-     }
- 
-@@ -390,7 +390,7 @@ namespace kdtools {
- 
-     template <typename C, typename P>
-     bool none_of( const C & c, P p ) {
--        return none_of( boost::begin( c ), boost::end( c ), p );
-+        return kdtools::none_of( boost::begin( c ), boost::end( c ), p );
-     }
- 
-     template <typename C, typename B>
diff --git a/misc/kdepim4/patches/patch-kmail_imapaccountbase.h b/misc/kdepim4/patches/patch-kmail_imapaccountbase.h
deleted file mode 100644
index e9c311f9cd9..00000000000
--- a/misc/kdepim4/patches/patch-kmail_imapaccountbase.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-kmail_imapaccountbase.h,v 1.1 2012/11/11 22:29:14 joerg Exp $
-
---- kmail/imapaccountbase.h.orig	2012-11-09 14:04:05.000000000 +0000
-+++ kmail/imapaccountbase.h
-@@ -37,7 +37,6 @@
- #include <QByteArray>
- #include "progressmanager.h"
- 
--class AccountManager;
- class KMFolder;
- class KConfigGroup;
- class KMMessagePart;
-@@ -55,6 +54,7 @@ namespace KPIM {
- }
- 
- namespace KMail {
-+  class AccountManager;
-   struct ACLListEntry;
-   class QuotaInfo;
-   typedef QVector<KMail::ACLListEntry> ACLList;
diff --git a/misc/kdepim4/patches/patch-kmail_networkaccount.h b/misc/kdepim4/patches/patch-kmail_networkaccount.h
deleted file mode 100644
index 25fe8950f87..00000000000
--- a/misc/kdepim4/patches/patch-kmail_networkaccount.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-kmail_networkaccount.h,v 1.1 2012/11/11 22:29:14 joerg Exp $
-
---- kmail/networkaccount.h.orig	2012-11-09 14:02:41.000000000 +0000
-+++ kmail/networkaccount.h
-@@ -33,7 +33,6 @@
- 
- #include <QString>
- 
--class AccountManager;
- class KConfig/*Base*/;
- class KUrl;
- namespace KIO {
-@@ -41,6 +40,7 @@ namespace KIO {
- }
- 
- namespace KMail {
-+  class AccountManager;
- 
-   class NetworkAccount : public KMAccount {
-     Q_OBJECT
diff --git a/misc/kdepim4/patches/patch-knode_CMakeLists.txt b/misc/kdepim4/patches/patch-knode_CMakeLists.txt
deleted file mode 100644
index 9a8f901858c..00000000000
--- a/misc/kdepim4/patches/patch-knode_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-knode_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- knode/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ knode/CMakeLists.txt
-@@ -9,6 +9,7 @@ include_directories( ${KDE4_INCLUDE_DIR}
- 
- add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5003 )
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
- 
- ########### next target ###############
- 
diff --git a/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt b/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt
deleted file mode 100644
index 729a40e834a..00000000000
--- a/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-kontact_plugins_akregator_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- kontact/plugins/akregator/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ kontact/plugins/akregator/CMakeLists.txt
-@@ -2,6 +2,8 @@
- include_directories(${CMAKE_SOURCE_DIR}/akregator/src)
- include_directories( ${Boost_INCLUDE_DIRS} )
- 
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- ########### next target ###############
- 
- set(kontact_akregator_PART_SRCS akregator_plugin.cpp)
diff --git a/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt b/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt
deleted file mode 100644
index 33d0a7928eb..00000000000
--- a/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-korganizer_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- korganizer/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ korganizer/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(korganizer)
- 
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- #
- # The following macros can be defined to alter KOrganizer behavior.
- # (if desired, use add_definitions() to define them)
diff --git a/misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h b/misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h
deleted file mode 100644
index 7080fdd7a73..00000000000
--- a/misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libkleo_backends_qgpgme_threadedjobmixin.h,v 1.1 2012/11/11 22:29:14 joerg Exp $
-
---- libkleo/backends/qgpgme/threadedjobmixin.h.orig	2012-11-09 13:05:24.000000000 +0000
-+++ libkleo/backends/qgpgme/threadedjobmixin.h
-@@ -143,7 +143,7 @@ namespace _detail {
- 
-     void lateInitialization() {
-       assert( m_ctx );
--      connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
-+      this->connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
-       m_ctx->setProgressProvider( this );
-     }
- 
diff --git a/misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h b/misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h
new file mode 100644
index 00000000000..e373da5521e
--- /dev/null
+++ b/misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libkleo_kleo_stl_util.h,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+Work around: Parse error at "BOOST_JOIN"
+
+--- libkleo/kleo/stl_util.h.orig	2014-11-12 07:57:34.000000000 +0000
++++ libkleo/kleo/stl_util.h
+@@ -22,7 +22,9 @@
+ #ifndef __KDTOOLSCORE_STL_UTIL_H__
+ #define __KDTOOLSCORE_STL_UTIL_H__
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+ #include <boost/iterator/filter_iterator.hpp>
+ #include <boost/iterator/transform_iterator.hpp>
+ #include <boost/call_traits.hpp>
diff --git a/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt b/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt
deleted file mode 100644
index 43415ddbaf0..00000000000
--- a/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-plugins_kaddressbook_editorpages_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- plugins/kaddressbook/editorpages/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ plugins/kaddressbook/editorpages/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories( ${CMAKE_SOURCE_DIR}/libkleo ${Boost_INCLUDE_DIR} )
- 
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- ########### next target ###############
- 
- set(cryptopageplugin_SRCS cryptopageplugin.cpp )
diff --git a/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt b/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt
deleted file mode 100644
index 1deb6367026..00000000000
--- a/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-plugins_kmail_bodypartformatter_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- plugins/kmail/bodypartformatter/CMakeLists.txt.orig	2011-04-20 20:03:31.000000000 +0000
-+++ plugins/kmail/bodypartformatter/CMakeLists.txt
-@@ -1,6 +1,7 @@
- 
- include_directories( ${CMAKE_SOURCE_DIR}/kmail ${CMAKE_SOURCE_DIR}/libkdepim ${CMAKE_SOURCE_DIR}/mimelib ${KDE4_INCLUDE_DIR} )
- 
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
- 
- ########### next target ###############
-