Update KDE to 3.5.2

* Akregator
  o Feed archive: Move feed limit up to 500 feeds instead of 384
    (due to file limit a process can have opened at a time)
  o Feed archive: Lock feed archive to prevent multiple write
    access which can corrupt feed archives and cause crashes on
    startup
  o Feed fetching: Do not use Konqueror cache settings, but use
    "refresh" mode by default (Check with server if the cached
    file is up-to-date, reload if not)
  o Feed parser: read feed description and homepage link for Atom
    feeds
  o Feed parser: Improve parsing of Atom content (especially for
    0.3 feeds), do not strip HTML markup for types like "text/html"
  o Feed parser: ignore unknown or invalid version attribute value
    in the <rss> tag and just assume RSS 2.0.
* KAddressBook
  o Sometimes KAddressBook lost all data. This is now fixed.
  o Wait for complete loading of all addressbook resources before
    execution of commandline and DCOP commands (e.g. "Open in
    Addressbook" by KMail)
* KAlarm
  o Fix kalarmd hang when triggering late alarm and KAlarm run
    mode is on-demand
  o Prevent defunct kalarm processes when run mode is on-demand
  o Fix column widths when main window is resized, if columns have
    been reordered
  o Add Select All and Deselect actions & shortcuts for alarm and
    template lists

4 files changed, 15 insertions, 38 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index d5e220175a7..440c10a295f 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2006/02/05 23:10:10 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2006/03/30 02:52:17 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
@@ -18,7 +17,7 @@ PKG_SUGGESTED_OPTIONS=	sasl
 
 BUILDLINK_DEPENDS.gpgme+=     gpgme>=0.4.5
 
-REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
+REPLACE_PERL+=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.1-use-UOID-for-identities.pl \
 		kmail/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl \
 		kmail/kmail-3.3-aegypten.pl \
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 7b72b9f3aea..ea44c103220 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/12/11 11:40:02 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2006/03/30 02:52:17 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -298,7 +298,6 @@ lib/kde3/kabc_kolab.la
 lib/kde3/kabc_newexchange.la
 lib/kde3/kabc_slox.la
 lib/kde3/kabc_xmlrpc.la
-lib/kde3/kcal_blogging.la
 lib/kde3/kcal_groupdav.la
 lib/kde3/kcal_groupwise.la
 lib/kde3/kcal_kabc.la
@@ -367,8 +366,8 @@ lib/kde3/libknodepart.la
 lib/kde3/libkolabwizard.la
 lib/kde3/libkontact_akregator.la
 lib/kde3/libkontact_journalplugin.la
-lib/kde3/libkontact_karm.la
 lib/kde3/libkontact_kaddressbookplugin.la
+lib/kde3/libkontact_karm.la
 lib/kde3/libkontact_kmailplugin.la
 lib/kde3/libkontact_knodeplugin.la
 lib/kde3/libkontact_knotesplugin.la
@@ -412,7 +411,6 @@ lib/libkabckonnector.la
 lib/libkabinterfaces.la
 lib/libkaddressbook.la
 lib/libkcal.la
-lib/libkcal_blogging.la
 lib/libkcal_groupdav.la
 lib/libkcal_groupwise.la
 lib/libkcal_newexchange.la
@@ -1856,7 +1854,6 @@ share/kde/services/kresources/kabc/kabc_ox.desktop
 share/kde/services/kresources/kabc/kabc_slox.desktop
 share/kde/services/kresources/kabc/kabc_xmlrpc.desktop
 share/kde/services/kresources/kabc/kolab.desktop
-share/kde/services/kresources/kcal/blogging.desktop
 share/kde/services/kresources/kcal/exchange.desktop
 share/kde/services/kresources/kcal/imap.desktop
 share/kde/services/kresources/kcal/kabc.desktop
@@ -2049,8 +2046,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/knode/icons/crystalsvg/22x22
 @dirrm share/kde/apps/knode/icons/crystalsvg/16x16/actions
 @dirrm share/kde/apps/knode/icons/crystalsvg/16x16
-@dirrm share/kde/apps/kmail/icons/crystalsvg/128x128/actions
-@dirrm share/kde/apps/kmail/icons/crystalsvg/128x128
 @dirrm share/kde/apps/knode/icons/crystalsvg
 @dirrm share/kde/apps/knode/icons
 @dirrm share/kde/apps/knode/filters
@@ -2070,6 +2065,8 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kmail/icons/crystalsvg/22x22
 @dirrm share/kde/apps/kmail/icons/crystalsvg/16x16/actions
 @dirrm share/kde/apps/kmail/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kmail/icons/crystalsvg/128x128/actions
+@dirrm share/kde/apps/kmail/icons/crystalsvg/128x128
 @dirrm share/kde/apps/kmail/icons/crystalsvg
 @dirrm share/kde/apps/kmail/icons
 @dirrm share/kde/apps/kmail/about
@@ -2140,9 +2137,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpgp/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpgp/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpgp
@@ -2155,12 +2149,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdepim
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkcal/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkcal/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkcal
@@ -2179,9 +2167,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer
@@ -2212,9 +2197,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kdgantt/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kdgantt/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kdgantt
@@ -2233,10 +2215,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 44c4d91f72d..de3f9fcb1cd 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2006/02/07 10:10:42 markd Exp $
+$NetBSD: distinfo,v 1.41 2006/03/30 02:52:17 markd Exp $
 
-SHA1 (kdepim-3.5.1.tar.bz2) = 746a46e909c973175c134f040c5d137e60b64777
-RMD160 (kdepim-3.5.1.tar.bz2) = 9270aea41b18ffe3465ccafccb4283fdd5c8a2b2
-Size (kdepim-3.5.1.tar.bz2) = 12885355 bytes
+SHA1 (kdepim-3.5.2.tar.bz2) = 1907bc219d2dd51a376a99d0f7e6b9af97d5adf7
+RMD160 (kdepim-3.5.2.tar.bz2) = 8e6571d14bbf6b3370c4fdb108a1a79625e87365
+Size (kdepim-3.5.2.tar.bz2) = 12887336 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
 SHA1 (patch-ac) = 2ead8593be03d780cf5b4e333dc4ead1d29b8073
-SHA1 (patch-ai) = e323770b352d0a3876f8380bb31aa30615866dd4
+SHA1 (patch-ai) = e6c95db696e5daad82c72a5a742771d2a5665aa2
 SHA1 (patch-aj) = 1fd187c4c9ddb4f6380265853feb7eb04cf4b740
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
diff --git a/misc/kdepim3/patches/patch-ai b/misc/kdepim3/patches/patch-ai
index 0a0b0c86b5c..70523bb7de5 100644
--- a/misc/kdepim3/patches/patch-ai
+++ b/misc/kdepim3/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.11 2005/12/18 01:29:09 markd Exp $
+$NetBSD: patch-ai,v 1.12 2006/03/30 02:52:17 markd Exp $
 
---- kresources/groupwise/soap/stdsoap2.h.orig	2005-09-10 20:23:46.000000000 +1200
+--- kresources/groupwise/soap/stdsoap2.h.orig	2006-03-17 23:15:53.000000000 +1300
 +++ kresources/groupwise/soap/stdsoap2.h
-@@ -551,7 +551,7 @@ extern "C" {
+@@ -545,7 +545,7 @@ extern "C" {
  /* Portability: define SOAP_SOCKLEN_T */
  #if defined(SOCKLEN_T)
  # define SOAP_SOCKLEN_T SOCKLEN_T
 -#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX)
 +#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
  # define SOAP_SOCKLEN_T socklen_t
- #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
+ #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS)
  # define SOAP_SOCKLEN_T int