Update to 4.4.11.1 (to use with KDE SC 4.8.0)

14 files changed, 164 insertions, 84 deletions

diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile
index 9abb9007a8e..b898e205986 100644
--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.23 2012/03/03 00:13:36 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2012/03/19 21:01:28 markd Exp $
 
 #DISTNAME=	kdepim-runtime-${_KDE_VERSION}
-DISTNAME=	kdepim-runtime-4.4.9
-MASTER_SITES=	${MASTER_SITE_KDE:=kdepim-4.4.9/src/}
-PKGREVISION=	8
+DISTNAME=	kdepim-runtime-4.4.11.1
+PKGNAME=	${DISTNAME:S/-4/4-4/}
+MASTER_SITES=	${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
 CATEGORIES=	misc
 COMMENT=	Runtime requirements for the KDE PIM tools
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
+# tar: Invalid header, starting valid header search.
+EXTRACT_USING=	gtar
+
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/misc/kdepim-runtime4/PLIST b/misc/kdepim-runtime4/PLIST
index 74b29dcf9b0..91f317315e3 100644
--- a/misc/kdepim-runtime4/PLIST
+++ b/misc/kdepim-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/10/25 20:55:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/03/19 21:01:28 markd Exp $
 bin/akonadi2xml
 bin/akonadi_birthdays_resource
 bin/akonadi_contacts_resource
@@ -30,6 +30,7 @@ lib/kde4/akonadi_serializer_addressee.so
 lib/kde4/akonadi_serializer_bookmark.so
 lib/kde4/akonadi_serializer_contactgroup.so
 lib/kde4/akonadi_serializer_kcal.so
+lib/kde4/akonadi_serializer_kcalcore.so
 lib/kde4/akonadi_serializer_mail.so
 lib/kde4/akonadi_serializer_microblog.so
 lib/kde4/kabc_akonadi.so
@@ -40,16 +41,16 @@ lib/kde4/kcm_akonadi_server.so
 lib/kde4/kio_akonadi.so
 lib/libakonadi-xml.so
 lib/libakonadi-xml.so.4
-lib/libakonadi-xml.so.4.5.0
+lib/libakonadi-xml.so.4.8.0
 lib/libkdepim-copy.so
 lib/libkdepim-copy.so.4
-lib/libkdepim-copy.so.4.5.0
+lib/libkdepim-copy.so.4.8.0
 lib/libmaildir.so
 lib/libmaildir.so.4
-lib/libmaildir.so.4.5.0
+lib/libmaildir.so.4.8.0
 lib/libmbox.so
 lib/libmbox.so.4
-lib/libmbox.so.4.5.0
+lib/libmbox.so.4.8.0
 share/akonadi/agents/birthdaysresource.desktop
 share/akonadi/agents/contactsresource.desktop
 share/akonadi/agents/icalresource.desktop
@@ -82,6 +83,7 @@ share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
 share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
 share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
 share/kde/apps/akonadi_knut_resource/knut-template.xml
diff --git a/misc/kdepim-runtime4/distinfo b/misc/kdepim-runtime4/distinfo
index 600bc26ffe4..15cd72670fd 100644
--- a/misc/kdepim-runtime4/distinfo
+++ b/misc/kdepim-runtime4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2011/01/23 07:55:14 markd Exp $
+$NetBSD: distinfo,v 1.13 2012/03/19 21:01:28 markd Exp $
 
-SHA1 (kdepim-runtime-4.4.9.tar.bz2) = ca50c82b4375d42ea2e02957df76e7a3b968cf47
-RMD160 (kdepim-runtime-4.4.9.tar.bz2) = 51fb45eb374d467bed409bece89314f12d599266
-Size (kdepim-runtime-4.4.9.tar.bz2) = 626607 bytes
+SHA1 (kdepim-runtime-4.4.11.1.tar.bz2) = e3105eb99ab0de47c617f8491774b2e3ee4cdd4a
+RMD160 (kdepim-runtime-4.4.11.1.tar.bz2) = dbc1120ab3f70c0073f6e9f389edba89bf80bee6
+Size (kdepim-runtime-4.4.11.1.tar.bz2) = 619924 bytes
diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 55472dce44a..bcabfb3db1f 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2012/03/03 00:13:36 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/03/19 21:01:28 markd Exp $
 
 #DISTNAME=	kdepim-${_KDE_VERSION}
-DISTNAME=	kdepim-4.4.9
-MASTER_SITES=	${MASTER_SITE_KDE:=kdepim-4.4.9/src/}
-PKGREVISION=	12
+DISTNAME=	kdepim-4.4.11.1
+PKGNAME=	${DISTNAME:S/-4/4-4/}
+MASTER_SITES=	${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
@@ -23,7 +23,6 @@ CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
 		ktimetracker/test/version.sh
 
 REPLACE_BASH+=	kmail/kconf_update/kmail-*.sh
-USE_TOOLS+=	bash:run
 
 REPLACE_PERL+= \
 	kalarm/kalarm-1.2.1-general.pl \
@@ -70,8 +69,8 @@ BUILDLINK_DEPMETHOD.qt4-tools=full
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdebase-runtime4/buildlink3.mk"
-.include "../../x11/kdebase-workspace4/buildlink3.mk"
+.include "../../x11/kde-runtime4/buildlink3.mk"
+.include "../../x11/kde-workspace4/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index 2646b20ebd7..8f24a784838 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2011/05/01 16:50:59 abs Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/03/19 21:01:28 markd Exp $
 bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
@@ -67,8 +67,6 @@ lib/kde4/kcm_kontactsummary.so
 lib/kde4/kcm_korganizer.so
 lib/kde4/kcm_ktimetracker.so
 lib/kde4/kcm_ldap.so
-lib/kde4/kcm_planner.so
-lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
 lib/kde4/kio_groupwise.so
 lib/kde4/kjotspart.so
@@ -89,8 +87,6 @@ lib/kde4/kontact_knodeplugin.so
 lib/kde4/kontact_knotesplugin.so
 lib/kde4/kontact_korganizerplugin.so
 lib/kde4/kontact_ktimetrackerplugin.so
-lib/kde4/kontact_plannerplugin.so
-lib/kde4/kontact_specialdatesplugin.so
 lib/kde4/kontact_summaryplugin.so
 lib/kde4/kontact_todoplugin.so
 lib/kde4/korg_datenums.so
@@ -106,68 +102,68 @@ lib/kde4/ktimetrackerpart.so
 lib/kde4/plugins/designer/kdepimwidgets.so
 lib/libakonadi-kcal_next.so
 lib/libakonadi-kcal_next.so.4
-lib/libakonadi-kcal_next.so.4.5.0
+lib/libakonadi-kcal_next.so.4.8.0
 lib/libakonadi_next.so
 lib/libakonadi_next.so.4
-lib/libakonadi_next.so.4.5.0
+lib/libakonadi_next.so.4.8.0
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.4.5.0
+lib/libakregatorinterfaces.so.4.8.0
 lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.4.5.0
+lib/libakregatorprivate.so.4.8.0
 lib/libgwsoap.so
 lib/libgwsoap.so.4
-lib/libgwsoap.so.4.5.0
+lib/libgwsoap.so.4.8.0
 lib/libkabc_groupdav.so
 lib/libkabc_groupdav.so.4
-lib/libkabc_groupdav.so.4.5.0
+lib/libkabc_groupdav.so.4.8.0
 lib/libkabc_slox.so
 lib/libkabc_slox.so.4
-lib/libkabc_slox.so.4.5.0
+lib/libkabc_slox.so.4.8.0
 lib/libkabcgroupwise.so
 lib/libkabcgroupwise.so.4
-lib/libkabcgroupwise.so.4.5.0
+lib/libkabcgroupwise.so.4.8.0
 lib/libkabckolab.so
 lib/libkabckolab.so.4
-lib/libkabckolab.so.4.5.0
+lib/libkabckolab.so.4.8.0
 lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.4.5.0
+lib/libkaddressbookprivate.so.4.8.0
 lib/libkalarm_calendar.so
 lib/libkalarm_calendar.so.4
-lib/libkalarm_calendar.so.4.5.0
+lib/libkalarm_calendar.so.4.8.0
 lib/libkalarm_resources.so
 lib/libkalarm_resources.so.4
-lib/libkalarm_resources.so.4.5.0
+lib/libkalarm_resources.so.4.8.0
 lib/libkcal_groupdav.so
 lib/libkcal_groupdav.so.4
-lib/libkcal_groupdav.so.4.5.0
+lib/libkcal_groupdav.so.4.8.0
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.4.5.0
+lib/libkcal_resourceblog.so.4.8.0
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.4.5.0
+lib/libkcal_resourceremote.so.4.8.0
 lib/libkcal_slox.so
 lib/libkcal_slox.so.4
-lib/libkcal_slox.so.4.5.0
+lib/libkcal_slox.so.4.8.0
 lib/libkcalgroupwise.so
 lib/libkcalgroupwise.so.4
-lib/libkcalgroupwise.so.4.5.0
+lib/libkcalgroupwise.so.4.8.0
 lib/libkcalkolab.so
 lib/libkcalkolab.so.4
-lib/libkcalkolab.so.4.5.0
+lib/libkcalkolab.so.4.8.0
 lib/libkdepim.so
 lib/libkdepim.so.4
-lib/libkdepim.so.4.5.0
+lib/libkdepim.so.4.8.0
 lib/libkgroupwarebase.so
 lib/libkgroupwarebase.so.4
-lib/libkgroupwarebase.so.4.5.0
+lib/libkgroupwarebase.so.4.8.0
 lib/libkgroupwaredav.so
 lib/libkgroupwaredav.so.4
-lib/libkgroupwaredav.so.4.5.0
+lib/libkgroupwaredav.so.4.8.0
 lib/libkleo.so
 lib/libkleo.so.4
-lib/libkleo.so.4.5.0
+lib/libkleo.so.4.8.0
 lib/libkleopatraclientcore.so
 lib/libkleopatraclientcore.so.0
 lib/libkleopatraclientcore.so.0.2.1
@@ -175,53 +171,53 @@ lib/libkleopatraclientgui.so
 lib/libkleopatraclientgui.so.0
 lib/libkleopatraclientgui.so.0.2.1
 lib/libkmailprivate.so.4
-lib/libkmailprivate.so.4.5.0
+lib/libkmailprivate.so.4.8.0
 lib/libknodecommon.so
 lib/libknodecommon.so.4
-lib/libknodecommon.so.4.5.0
+lib/libknodecommon.so.4.8.0
 lib/libknoteskolab.so
 lib/libknoteskolab.so.4
-lib/libknoteskolab.so.4.5.0
+lib/libknoteskolab.so.4.8.0
 lib/libkontactprivate.so.4
-lib/libkontactprivate.so.4.5.0
+lib/libkontactprivate.so.4.8.0
 lib/libkorg_stdprinting.so
 lib/libkorg_stdprinting.so.4
-lib/libkorg_stdprinting.so.4.5.0
+lib/libkorg_stdprinting.so.4.8.0
 lib/libkorganizer_calendar.so
 lib/libkorganizer_calendar.so.4
-lib/libkorganizer_calendar.so.4.5.0
+lib/libkorganizer_calendar.so.4.8.0
 lib/libkorganizer_core.so
 lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.4.5.0
+lib/libkorganizer_core.so.4.8.0
 lib/libkorganizer_eventviewer.so
 lib/libkorganizer_eventviewer.so.4
-lib/libkorganizer_eventviewer.so.4.5.0
+lib/libkorganizer_eventviewer.so.4.8.0
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.4.5.0
+lib/libkorganizer_interfaces.so.4.8.0
 lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.4.5.0
+lib/libkorganizerprivate.so.4.8.0
 lib/libkpgp.so
 lib/libkpgp.so.4
-lib/libkpgp.so.4.5.0
+lib/libkpgp.so.4.8.0
 lib/libksieve.so
 lib/libksieve.so.4
-lib/libksieve.so.4.5.0
+lib/libksieve.so.4.8.0
 lib/libkslox.so
 lib/libkslox.so.4
-lib/libkslox.so.4.5.0
+lib/libkslox.so.4.8.0
 lib/libmessagecore.so
 lib/libmessagecore.so.4
-lib/libmessagecore.so.4.5.0
+lib/libmessagecore.so.4.8.0
 lib/libmessagelist.so
 lib/libmessagelist.so.4
-lib/libmessagelist.so.4.5.0
+lib/libmessagelist.so.4.8.0
 lib/libmessageviewer.so
 lib/libmessageviewer.so.0
 lib/libmessageviewer.so.0.1.0
 lib/libmimelib.so
 lib/libmimelib.so.4
-lib/libmimelib.so.4.5.0
+lib/libmimelib.so.4.8.0
 lib/strigi/strigiea_ics.so
 lib/strigi/strigiea_vcf.so
 man/man1/kabcclient.1
@@ -750,8 +746,6 @@ 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/planner.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
@@ -867,8 +861,6 @@ share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
 share/kde4/services/kcmldap.desktop
-share/kde4/services/kcmplanner.desktop
-share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
 share/kde4/services/kjots_config_misc.desktop
 share/kde4/services/kjotspart.desktop
@@ -909,8 +901,6 @@ share/kde4/services/kontact/knodeplugin.desktop
 share/kde4/services/kontact/knotesplugin.desktop
 share/kde4/services/kontact/korganizerplugin.desktop
 share/kde4/services/kontact/ktimetracker_plugin.desktop
-share/kde4/services/kontact/plannerplugin.desktop
-share/kde4/services/kontact/specialdatesplugin.desktop
 share/kde4/services/kontact/summaryplugin.desktop
 share/kde4/services/kontact/todoplugin.desktop
 share/kde4/services/kontactconfig.desktop
diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index cc5703b9448..2a7c07f9ddb 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,21 +1,28 @@
-$NetBSD: distinfo,v 1.15 2011/10/02 04:35:03 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/03/19 21:01:28 markd Exp $
 
-SHA1 (kdepim-4.4.9.tar.bz2) = efe91c4309fb09f49c816a6557a157170c8f0360
-RMD160 (kdepim-4.4.9.tar.bz2) = d11b5090bdf27c3ffd4558d9c3e6cd30aa6a7e88
-Size (kdepim-4.4.9.tar.bz2) = 9084259 bytes
+SHA1 (kdepim-4.4.11.1.tar.bz2) = 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2
+RMD160 (kdepim-4.4.11.1.tar.bz2) = 51394b9dcb3aecc4f108e87de37c21e3af820ee1
+Size (kdepim-4.4.11.1.tar.bz2) = 8964708 bytes
 SHA1 (patch-aa) = 19bc087365f31f2ab5f62238530185646e3826fb
 SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
 SHA1 (patch-ae) = d45948eb8a083cb2cf900bc946f0f346e1f56d73
-SHA1 (patch-af) = b13488ced72f4b6e617e9a4dee52c124602d680e
+SHA1 (patch-af) = 2a4341c4ae9e1a7aab20fee9c9d27b4cfaa63e1c
 SHA1 (patch-ag) = 45a094af644835a0859f354db0c880fc891aa977
 SHA1 (patch-ah) = 5b5235666c568de23fc79ef461df6b8f66a67ce6
 SHA1 (patch-ai) = 304ddaf381ae4cb217d033268868366760c2d071
 SHA1 (patch-aj) = 26285317562f55e1bee4740286069d4c2213d2fa
 SHA1 (patch-ak) = ba5152d71810759b4bcbe526f7d05eeb8ed8944b
+SHA1 (patch-akregator_plugins_mk4storage_CMakeLists.txt) = 804c66cd07ae0d5f71c4e6ff05be65e6c438e4cb
 SHA1 (patch-al) = 55c77b3ad49e97e304778f56379cabb62af95e07
 SHA1 (patch-am) = 862ed0d6c699146945bb6c5aff8aaec8030ce101
 SHA1 (patch-an) = 0644fda1025698dcb6833672ca88656931cd73dd
 SHA1 (patch-ao) = e8c93353d3d73662a55589dc71ceb8d7e03426bd
 SHA1 (patch-ap) = cf6854d683345d51c6d9f19286d73fea693a241a
+SHA1 (patch-kalarm_CMakeLists.txt) = 6799c123f626c50b8bef7ca3e720f899938accdc
+SHA1 (patch-knode_CMakeLists.txt) = 0f3fcf56b46ff0b82fbadb3602947b6235db5234
+SHA1 (patch-kontact_plugins_akregator_CMakeLists.txt) = d148f3adad4fd2889dbd5e80402904322a4721c4
+SHA1 (patch-korganizer_CMakeLists.txt) = 3beb3f01c7e77cb4551dfe359ee4dddbca035840
+SHA1 (patch-plugins_kaddressbook_editorpages_CMakeLists.txt) = 106a99f984eb1991065f920d120b03a5095f6688
+SHA1 (patch-plugins_kmail_bodypartformatter_CMakeLists.txt) = 63b88d4afdbb9901c7b0344559d41a21b733c57f
diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af
index c4e5a7fa37f..1d466d34c39 100644
--- a/misc/kdepim4/patches/patch-af
+++ b/misc/kdepim4/patches/patch-af
@@ -1,11 +1,9 @@
-$NetBSD: patch-af,v 1.4 2011/10/02 04:35:03 markd Exp $
+$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
 
--DBOOST_NO_0X_HDR_INITIALIZER_LIST for gcc45 and recent boost
-
---- kleopatra/CMakeLists.txt.orig	2010-12-22 17:51:56.000000000 +0000
+--- kleopatra/CMakeLists.txt.orig	2009-11-02 12:02:09.000000000 +0000
 +++ kleopatra/CMakeLists.txt
 @@ -2,7 +2,7 @@ project(kleopatra)
  
@@ -16,7 +14,7 @@ http://websvn.kde.org/?view=revision&revision=1078528
  set( kleopatra_release FALSE )
  
  if (NOT kleopatra_release)
-@@ -28,10 +28,11 @@ include_directories(
+@@ -28,7 +28,7 @@ include_directories(
    ${QGPGME_INCLUDES}
    ${GPGME_INCLUDES} )
  if (USABLE_ASSUAN_FOUND)
@@ -25,11 +23,7 @@ http://websvn.kde.org/?view=revision&revision=1078528
  endif(USABLE_ASSUAN_FOUND)
  add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
  remove_definitions ( -DQT_NO_STL )
-+add_definitions( -DBOOST_NO_0X_HDR_INITIALIZER_LIST )
- 
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
- 
-@@ -84,11 +85,7 @@ if ( USABLE_ASSUAN_FOUND )
+@@ -84,11 +84,7 @@ if ( USABLE_ASSUAN_FOUND )
      selftest/uiservercheck.cpp
      )
  
diff --git a/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt b/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt
new file mode 100644
index 00000000000..69b954cf433
--- /dev/null
+++ b/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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-kalarm_CMakeLists.txt b/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt
new file mode 100644
index 00000000000..97cc8788760
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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-knode_CMakeLists.txt b/misc/kdepim4/patches/patch-knode_CMakeLists.txt
new file mode 100644
index 00000000000..9a8f901858c
--- /dev/null
+++ b/misc/kdepim4/patches/patch-knode_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..729a40e834a
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..33d0a7928eb
--- /dev/null
+++ b/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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-plugins_kaddressbook_editorpages_CMakeLists.txt b/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt
new file mode 100644
index 00000000000..43415ddbaf0
--- /dev/null
+++ b/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..1deb6367026
--- /dev/null
+++ b/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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 ###############
+