Update to kde 3.3.2

Changes:
* kalarm: fix KAlarm button on message windows to make it always
  display the main window
* kmail: remember the size of the separate message window instead of
  using a fixed window size
* kmail: gracefully handle broken connections when checking for new
  mail with IMAP
* kmail: don't clear the readerwindow when new mail arrives in an imap
  folder
* kmail: fix aegypten issue39 by only using the body itself as a text
  part if there are no body parts and we didn't get any other text so
  far, such as for smime opaque encrypted mails
* kmail: fix the "folders not visible" problem after starting KMail
  when the intro is shown
* kmail: fix searching when the header field in question is the first
  one of a message
* kmail: disable wordwrap in the composer for all inline invitation
  mails, not just for those sent with autosending enabled
* kmail: don't translate the "local" folder prefix; this fixes problems
  with KMail's summary plugin
* kmail: fix adding attachments to inline-forwarded messages
* kmail: remember the selected crypto format when saving a message as
  draft
* kmail: hide filter actions from "Configure Toolbars" dialog; fixes
  crashes
* kmail: fix missing filter actions after switching to the Mail
  component in Kontact
* kmail: remove BCC coming from identity on ical invitations
* kmail: grab the signature only once
* kmail: fix problem with disappearing dimap folders
* kmail: don't kill running mailchecks when cancelling the subscription
  dialog
* kmail: add missing tooltip to the BCC [...] button
* kmail: make sure that no signature is appended to inline invitation
  replies, Outlook chokes on them
* kmail: don't sign or encrypt inline invitations or invitation replies
* kmail: fix PGP/MIME encrypting messages which are BCC'ed
* kmail: make sure that all changes in the folder properties are saved
* kmail: fix uncontrolled checkboxes in the composer's attachment list
* kmail: improved performance when dragging mails over the folder list
* kmail: provide all reply methods and all forward methods in the
  separate message window
* kmail: fix minor bugs in the antispam wizard
* kmail: correctly end new-mail-check when an IMAP folder reports an
  error
* kmail: fix 'kstart --iconify --windowclass kmail kmail' which allows
  starting KMail in the system tray
* kmail: fix broken order of folders in the folder selection dropdown
  box
* kmail: notice a manual change of the external editor command line
* kmail: adjust antispam wizard to changes in bogofilter 0.93
* kmail: don't look up recipient keys during autosave
* kmail: fix "Folder Menu not updated after enabling Expiration for
  a Folder
* kmail: add support for additional antispam tools
* kmail: various speed improvements
* kontact: don't show empty tip of the day on startup

5 files changed, 152 insertions, 83 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 9c2b5fc1ebc..3137ae2b0fd 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2004/12/06 13:12:04 gavan Exp $
+# $NetBSD: Makefile,v 1.37 2004/12/10 06:17:28 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index cf49e713419..a2b8fbd78cb 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/11/18 11:48:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/12/10 06:17:28 markd Exp $
 bin/egroupwarewizard
 bin/groupwarewizard
 bin/ical2vcal
@@ -33,6 +33,7 @@ bin/ksync
 bin/ktnef
 bin/kwatchgnupg
 bin/sloxwizard
+include/KNotesAppIface.h
 include/KNotesIface.h
 include/calendar/calendardecoration.h
 include/calendar/plugin.h
@@ -169,6 +170,7 @@ include/libkcal/icaldrag.h
 include/libkcal/icalformat.h
 include/libkcal/incidence.h
 include/libkcal/incidencebase.h
+include/libkcal/incidenceformatter.h
 include/libkcal/journal.h
 include/libkcal/kcalversion.h
 include/libkcal/listbase.h
@@ -813,6 +815,7 @@ share/kde/apps/knotes/icons/crystalsvg/16x16/actions/knotes_delete.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/text_sub.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/text_super.png
 share/kde/apps/knotes/knotes_part.rc
+share/kde/apps/knotes/knotesappui.rc
 share/kde/apps/knotes/knotesui.rc
 share/kde/apps/kontact/kontact.setdlg
 share/kde/apps/kontact/kontactui.rc
@@ -1272,52 +1275,65 @@ share/kde/servicetypes/konnector.desktop
 share/kde/servicetypes/kontactplugin.desktop
 share/kde/servicetypes/korganizerpart.desktop
 share/kde/servicetypes/kpilotconduit.desktop
-@comment dirrm share/kde/servicetypes
+@comment in kde: @dirrm share/kde/servicetypes
 @dirrm share/kde/services/kresources/konnector
 @dirrm share/kde/services/kresources/knotes
 @dirrm share/kde/services/kresources/kcal
-@comment dirrm share/kde/services/kresources/kabc
+@comment in kde: @dirrm share/kde/services/kresources/kabc
+@comment in kde: @dirrm share/kde/services/kresources
 @dirrm share/kde/services/korganizer
 @dirrm share/kde/services/kontact
 @dirrm share/kde/services/kitchensync
-@comment dirrm share/kde/services/kded
-@dirrm share/kde/services/kaddressbook
-@comment dirrm share/kde/services
-@comment dirrm share/kde/mimelnk/kdedevice
-@comment dirrm share/kde/mimelnk/application
-@comment dirrm share/kde/icons/locolor/32x32/apps
-@comment dirrm share/kde/icons/locolor/16x16/apps
-@comment dirrm share/kde/icons/hicolor/48x48/apps
-@comment dirrm share/kde/icons/crystalsvg/64x64/apps
-@comment dirrm share/kde/icons/crystalsvg/64x64/actions
-@comment dirrm share/kde/icons/crystalsvg/48x48/apps
-@comment dirrm share/kde/icons/crystalsvg/48x48/actions
-@comment dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment dirrm share/kde/icons/crystalsvg/32x32/actions
-@comment dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment dirrm share/kde/icons/crystalsvg/22x22/actions
-@comment dirrm share/kde/icons/crystalsvg/16x16/apps
-@comment dirrm share/kde/icons/crystalsvg/16x16/actions
-@comment dirrm share/kde/icons/crystalsvg/128x128/apps
-@comment dirrm share/kde/config.kcfg
-@comment dirrm share/kde/config
-@comment dirrm share/kde/autostart
+@comment in kde: @dirrm share/kde/services/kded
+@comment in kde: @dirrm share/kde/services/kaddressbook
+@comment in kde: @dirrm share/kde/services
+@comment in kde: @dirrm share/kde/mimelnk/kdedevice
+@comment in kde: @dirrm share/kde/mimelnk/application
+@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
+@comment in kde: @dirrm share/kde/config.kcfg
+@comment in kde: @dirrm share/kde/config
+@comment in kde: @dirrm share/kde/autostart
 @dirrm share/kde/apps/libkleopatra/pics
+@dirrm share/kde/apps/libkleopatra
 @dirrm share/kde/apps/kwatchgnupg/pics
 @dirrm share/kde/apps/kwatchgnupg
 @dirrm share/kde/apps/ktnef/icons/locolor/16x16/actions
+@dirrm share/kde/apps/ktnef/icons/locolor/16x16
+@dirrm share/kde/apps/ktnef/icons/locolor
 @dirrm share/kde/apps/ktnef/icons/hicolor/22x22/actions
+@dirrm share/kde/apps/ktnef/icons/hicolor/22x22
+@dirrm share/kde/apps/ktnef/icons/hicolor
+@dirrm share/kde/apps/ktnef/icons
 @dirrm share/kde/apps/ktnef
 @dirrm share/kde/apps/ksync
 @dirrm share/kde/apps/kpilot/sysinfoconduit
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48/apps
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48/actions
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/32x32/apps
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/32x32
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/22x22/apps
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/22x22
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/16x16/apps
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kpilot/icons/crystalsvg
+@dirrm share/kde/apps/kpilot/icons
 @dirrm share/kde/apps/kpilot
 @dirrm share/kde/apps/korganizer/sounds
 @dirrm share/kde/apps/korganizer/plugins
@@ -1340,49 +1356,82 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kontact/pics
 @dirrm share/kde/apps/kontact
 @dirrm share/kde/apps/knotes/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/knotes/icons/crystalsvg/16x16
+@dirrm share/kde/apps/knotes/icons/crystalsvg
+@dirrm share/kde/apps/knotes/icons
 @dirrm share/kde/apps/knotes
 @dirrm share/kde/apps/knode/pics
 @dirrm share/kde/apps/knode/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/knode/icons/crystalsvg/32x32
 @dirrm share/kde/apps/knode/icons/crystalsvg/22x22/actions
+@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/knode/icons/crystalsvg
+@dirrm share/kde/apps/knode/icons
 @dirrm share/kde/apps/knode/filters
 @dirrm share/kde/apps/knode
 @dirrm share/kde/apps/kmailcvt/pics
+@dirrm share/kde/apps/kmailcvt
 @dirrm share/kde/apps/kmail/plugins/bodypartformatter
+@dirrm share/kde/apps/kmail/plugins
 @dirrm share/kde/apps/kmail/pics
 @dirrm share/kde/apps/kmail/icons/crystalsvg/48x48/actions
+@dirrm share/kde/apps/kmail/icons/crystalsvg/48x48
 @dirrm share/kde/apps/kmail/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kmail/icons/crystalsvg/32x32
 @dirrm share/kde/apps/kmail/icons/crystalsvg/22x22/actions
+@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
+@dirrm share/kde/apps/kmail/icons
 @dirrm share/kde/apps/kmail/about
 @dirrm share/kde/apps/kmail
 @dirrm share/kde/apps/kleopatra
 @dirrm share/kde/apps/kitchensync/pics
 @dirrm share/kde/apps/kitchensync
 @dirrm share/kde/apps/kgantt/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/32x32
 @dirrm share/kde/apps/kgantt/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/22x22
 @dirrm share/kde/apps/kgantt/icons/crystalsvg/16x16/actions
-@comment dirrm share/kde/apps/kconf_update
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kgantt/icons/crystalsvg
+@dirrm share/kde/apps/kgantt/icons
+@dirrm share/kde/apps/kgantt
+@comment in kde: @dirrm share/kde/apps/kconf_update
 @dirrm share/kde/apps/karm/pics
 @dirrm share/kde/apps/karm
 @dirrm share/kde/apps/kandy
 @dirrm share/kde/apps/kalarm/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kalarm/icons/crystalsvg/22x22
 @dirrm share/kde/apps/kalarm/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kalarm/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kalarm/icons/crystalsvg
+@dirrm share/kde/apps/kalarm/icons
 @dirrm share/kde/apps/kalarm
 @dirrm share/kde/apps/kaddressbook/printing
 @dirrm share/kde/apps/kaddressbook/pics
 @dirrm share/kde/apps/kaddressbook/icons/locolor/22x22/actions
+@dirrm share/kde/apps/kaddressbook/icons/locolor/22x22
 @dirrm share/kde/apps/kaddressbook/icons/locolor/16x16/actions
+@dirrm share/kde/apps/kaddressbook/icons/locolor/16x16
+@dirrm share/kde/apps/kaddressbook/icons/locolor
 @dirrm share/kde/apps/kaddressbook/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg/32x32
 @dirrm share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps
 @dirrm share/kde/apps/kaddressbook/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg
+@dirrm share/kde/apps/kaddressbook/icons
 @dirrm share/kde/apps/kaddressbook/csv-templates
 @dirrm share/kde/apps/kaddressbook/contacteditorpages
-@dirrm share/kde/apps/kaddressbook
-@comment dirrm share/kde/apps
-@comment dirrm share/kde/applnk/Utilities
-@comment dirrm share/kde/applnk/Applications
-@comment dirrm share/kde/applnk/.hidden
+@comment in kde: @dirrm share/kde/apps/kaddressbook
+@comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/kde/applnk/Utilities
+@comment in kde: @dirrm share/kde/applnk/Applications
+@comment in kde: @dirrm share/kde/applnk/.hidden
 @dirrm share/doc/kde/HTML/en/kwatchgnupg
 @dirrm share/doc/kde/HTML/en/ktnef
 @dirrm share/doc/kde/HTML/en/kpilot
@@ -1394,26 +1443,87 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/doc/kde/HTML/en/knode
 @dirrm share/doc/kde/HTML/en/kmail
 @dirrm share/doc/kde/HTML/en/kleopatra
+@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/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/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/kioslaves/imap4/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves
+@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
+@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
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/knotes
+@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/ksync/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/ksync/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/ksync
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarmd/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarmd/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarmd
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kitchensync
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/karm/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/karm/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/karm
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kandy
+@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/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/kmail/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kmail
 @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
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs
 @dirrm share/doc/kde/HTML/en/kcontrol/kalarmd
+@comment in kde: @dirrm share/doc/kde/HTML/en/kcontrol
 @dirrm share/doc/kde/HTML/en/karm
 @dirrm share/doc/kde/HTML/en/kandy
 @dirrm share/doc/kde/HTML/en/kalarm
 @dirrm share/doc/kde/HTML/en/kaddressbook
-@comment dirrm share/applications/kde
-@comment dirrm lib/kde3
+@comment in kde: @dirrm share/doc/kde/HTML/en
+@comment in kde: @dirrm share/applications/kde
+@comment in kde: @dirrm lib/kde3
 @dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal
@@ -1423,12 +1533,13 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm include/korganizer
 @dirrm include/kontact
 @dirrm include/kmail/interfaces
+@dirrm include/kmail
 @dirrm include/kleo
 @dirrm include/kitchensync
 @dirrm include/kgantt
 @dirrm include/kdepim
 @dirrm include/kaddressbook
-@comment dirrm include/kabc
+@comment in kde: @dirrm include/kabc
 @dirrm include/gpgme++/interfaces
 @dirrm include/gpgme++
 @dirrm include/calendar
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 4f26169b982..07df1f6c944 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.25 2004/11/28 18:35:48 kleink Exp $
+$NetBSD: distinfo,v 1.26 2004/12/10 06:17:28 markd Exp $
 
-SHA1 (kdepim-3.3.1.tar.bz2) = b9928e5bceda7f871d02d861a589fdc133649565
-Size (kdepim-3.3.1.tar.bz2) = 10007944 bytes
+SHA1 (kdepim-3.3.2.tar.bz2) = 2d55115ef82280b208df7b501aecd2b3ea2e07be
+Size (kdepim-3.3.2.tar.bz2) = 9994033 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
-SHA1 (patch-ab) = 47280379fa8c570720dd1801f5da2e5c93685423
-SHA1 (patch-ac) = b89b09f13d22a3c7225dc8f458534df1e3a5e7a5
 SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
 SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
 SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
diff --git a/misc/kdepim3/patches/patch-ab b/misc/kdepim3/patches/patch-ab
deleted file mode 100644
index 2284053bb4d..00000000000
--- a/misc/kdepim3/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2004/10/13 12:29:05 markd Exp $
-
---- kresources/slox/webdavhandler.cpp.orig	2004-10-03 20:44:46.000000000 +1300
-+++ kresources/slox/webdavhandler.cpp
-@@ -20,7 +20,7 @@
- 
- #include "webdavhandler.h"
- 
--#include <values.h>
-+#include <limits.h>
- 
- #include <libkdepim/kpimprefs.h>
- 
-@@ -150,9 +150,9 @@ QDateTime WebdavHandler::sloxToQDateTime
- 
-   if (preEpoch) {
-     dt.setTime_t( 0, Qt::UTC );
--    if (ticks > MAXINT) {
--      dt = dt.addSecs(-MAXINT);
--      ticks -= MAXINT;
-+    if (ticks > INT_MAX) {
-+      dt = dt.addSecs(-INT_MAX);
-+      ticks -= INT_MAX;
-     }
-     dt = dt.addSecs(-((long) ticks));
-   }
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
deleted file mode 100644
index 2dfa9a7eee5..00000000000
--- a/misc/kdepim3/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/11/28 18:35:48 kleink Exp $
-
---- korganizer/plugins/holidays/holidays.cpp	2004/07/23 16:32:44	1.12
-+++ korganizer/plugins/holidays/holidays.cpp	2004/10/03 18:33:19	1.12.2.1
-@@ -91,7 +91,7 @@
-   //static int lastYear = 0;
-   int lastYear = 0;
- 
--  if (mHolidayFile.isEmpty()) return QString::null;
-+  if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
- 
-   //if ((lastYear == 0) || (qd.year() != lastYear)) {
-   if ((yearLast == 0) || (qd.year() != yearLast)) {