Update to KDE 3.5.6

Akregator
* Add session management for browser tabs.
* Fix KhelpCenter entry and start a handbook.
* Fix folder name encoding when RSS feeds are added from the outside.

KAddressBook
* Fix renaming distribution lists.
* Fix adding new categories to addressbook.
* Fix links to online maps at MapQuest.com and Maporama.com.

KAlarm
* Tidy up preferences dialog (Run mode options and sound type options).
* Fix crash when an alarm triggers while the user is answering the
  confirmation prompt when deleting it.
* Fix crash when saving Preferences dialog on some systems (due to
  Terminal for Command Alarms option setting).
* Fix editing of 29th February alarm options for non-leap years.
* Fix Find always using the first search text entered even after
  entering a new one.
* Fix "Start alarm monitoring at login" value shown in preferences
  dialogue.
* Fix deselecting "Start alarm monitoring at login" when daemon not
  running.

KArm
* Session times can be copied to clipboard.

KMail
* Introducing KMail templates: you will be able to build templates for
  new messages, replies, or forwards. The templates can be universal
  or identity-specific or folder-specific. The template language is
  very customizable (similar to The Bat! mailer). There will also be a
  templates folder from which you can store templates and new messages
  can be created from these.
* Added CRM114 support to anti spam wizard.
* Background filtering enhancements.
* Add "Open With..." for attachments view.
* Handle command line parameter --header correctly.
* Various improvements on address completion in composer.
* Do not crash when deleting a message while saving it.
* Fix saving expiry settings.
* Correctly detect a URL that ends with '-' or '_'.
* Get attachment icon from file name if not available from Content-Type.
* Handle multiple To: header lines.
* Some changes to make menubar and popup menus more consistent.
* Add keyboard shortcut Ctrl+S for "Save As" action in reader window.
* Fix wrong checkbox in the layout when adding attachments to the
  composer.
* Fix for attachment display in editor: "sort by size" sorts
  alphanumerically, not by size.
* Fix to update identities with renamed transports.
* Open on double click to attachments.
* Put KDE Wallet dialog on top when KMail requests a password.
* The "Emtpy Trash" action was not always enabled when it should be.
* Disable the shortcut definition if the filter is not going to be
  added to the menu.
* "Exclude important messages from expiry" should also exclude todo
  messages.
* Fix for changing the identity transport when changing an identity.
* Fix mail sorting in POP filter dialog.
* Suppose headers charset from content-type header if headers not
  properly encoded. If content-type charset is "us-ascii", use "utf-8"
  instead. Write maildir and mbox indexes in right encoding.
* Moving messages is faster.

KNotes
* Prevent crashes when *.rc files for KNotes are missing/unreadable.

Kontact
* New Summary menus for appointments and to-dos that allow quick
  access to edit, delete, and mark completed (to-dos only)
* Session management framework for Kontact plugins.
* Fix changing startup view not working.
* Fix lost occurences when recurring events were shown by the
  Summary widget.

KOrganizer
* Add command line options to 1) Open the URLs in a separate window
  (--open, -o) 2) Merge the events of the URLs into the standard
  calendar (--merge, -m) 3) Add the URLs as new resources (--import,
  -i) If no command line option is given, korganizer will ask which of
  these actions should be taken for each URL. If no URL is given, the
  standard resource calendar is displayed.
* Can print individual Event or To-do on a single sheet of paper
* Various improvements on printouts.
* Make calendars in the left sidebar respect the First Day Of Week
  setting, defined in the control center
* Make the reminder dialog somewhat more usable when working with
  they keyboard.
* Show anniversaries of all contacts.
* Brazilian and Greek holidays added.
* Fix applying templates on to-do items.
* Prevent infinite loops with some cases of recurring todos.
* Write proper DTEND data when a time is associated to an event.
* Fix Copy To menu for to-dos, assign date to copy when the original
  did not have a due date.
* Some crashes fixed when opening iCal files from Apple.
* Don't crash when "select resource folder" was cancelled.
* Endless loop fixed in todo editor.
* Do not crash so easily when KOrganizer is embedded inside Konqueror.
* Record completion of recurring todos in journals.
* Fix a bug in Kontact that Ctrl-N did not honor the selection in the
  agend view.
* Fix loading journals from Kolab resources.
* Fix crash when pressing OK in event editor while the resource
  selection dialog is open.

KPilot
* Inclusion of CMake standalone build system.
* Backup options made more granular. Users can choose to always update
  backups or to only do so on demand, instead of being forced to do so
  on every HotSync.
* Raising minimum requirement for kpilot to pilot-link 0.12.0. This
  addresses many long-standing bugs caused by previous versions of
  pilot-link regarding database-size limitations.
* Fixes for data-loss problems for users of all distros that distributed
  kpilot with pilot-link 0.12.
* Fix for "Reminders from outlook invites are set to unknown in exchange
  resources".
* Fix compilation when NDEBUG is on.

9 files changed, 246 insertions, 392 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 912881f9d70..4d33d89ba3e 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,21 +1,13 @@
-# $NetBSD: Makefile,v 1.70 2007/01/17 23:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2007/01/26 03:17:09 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		bison gawk perl:run
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.kdepim
-PKG_SUPPORTED_OPTIONS=	sasl
-PKG_SUGGESTED_OPTIONS=	sasl
-
-.include "../../mk/bsd.options.mk"
-
 BUILDLINK_API_DEPENDS.gpgme+=     gpgme>=0.4.5
 
 REPLACE_PERL+=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
@@ -43,20 +35,16 @@ CHECK_PORTABILITY_SKIP+=karm/test/booktime-baddate.sh \
 		karm/test/refresh_on_change.sh \
 		karm/test/version.sh
 
+.include "options.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 BUILDLINK_DEPMETHOD.qt3-tools=	full
 
-.if !empty(PKG_OPTIONS:Msasl)
-.include "../../security/cyrus-sasl/buildlink3.mk"
-PLIST_SUBST+=	HAVE_SASL=""
-.else
-PLIST_SUBST+=	HAVE_SASL="@comment "
-.endif
-
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index e7d0ca044e8..1e50611ed1c 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2006/11/20 10:57:43 markd Exp $
+@comment $NetBSD: PLIST,v 1.27 2007/01/26 03:17:09 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -172,13 +172,13 @@ include/kontact/summary.h
 include/korganizer/baseview.h
 include/korganizer/calendarviewbase.h
 include/korganizer/calprinter.h
-include/korganizer/calprinthelper.h
 include/korganizer/calprintpluginbase.h
 include/korganizer/corehelper.h
 include/korganizer/mainwindow.h
 include/korganizer/part.h
 include/korganizer/printplugin.h
 include/kpilot/kpilotlink.h
+include/kpilot/pilot.h
 include/kpilot/pilotDatabase.h
 include/kpilot/pilotLinkVersion.h
 include/kpilot/pilotLocalDatabase.h
@@ -385,6 +385,7 @@ lib/kde3/libkorg_datenums.la
 lib/kde3/libkorg_exchange.la
 lib/kde3/libkorg_hebrew.la
 lib/kde3/libkorg_journalprint.la
+lib/kde3/libkorg_yearlyprint.la
 lib/kde3/libkorganizerpart.la
 lib/kde3/libksfilter_addressbook.la
 lib/kde3/libksfilter_calendar.la
@@ -473,15 +474,32 @@ share/applications/kde/kmail_view.desktop
 share/applications/kde/knotes.desktop
 share/applications/kde/konsolekalendar.desktop
 share/applications/kde/korganizer.desktop
-share/applications/kde/korganizer-import.desktop
 share/applications/kde/kpalmdoc.desktop
 share/applications/kde/kpilot.desktop
 share/applications/kde/kpilotdaemon.desktop
 share/applications/kde/ktnef.desktop
 share/applications/kde/multisynk.desktop
+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
+share/doc/kde/HTML/en/akregator/add-folder2.png
+share/doc/kde/HTML/en/akregator/advanced-tab.png
+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/general-tab.png
 share/doc/kde/HTML/en/akregator/index.cache.bz2
 share/doc/kde/HTML/en/akregator/index.docbook
+share/doc/kde/HTML/en/akregator/konq.png
+share/doc/kde/HTML/en/akregator/konq2.png
+share/doc/kde/HTML/en/akregator/main-window.png
+share/doc/kde/HTML/en/akregator/main-window2.png
+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/kaddressbook/addhost.png
 share/doc/kde/HTML/en/kaddressbook/common
 share/doc/kde/HTML/en/kaddressbook/conf.png
@@ -718,6 +736,153 @@ share/doc/kde/HTML/en/multisynk/konnectors-chapter.docbook
 share/doc/kde/HTML/en/multisynk/logdialog.png
 share/doc/kde/HTML/en/multisynk/mainwin-filled.png
 share/doc/kde/HTML/en/multisynk/mainwin.png
+share/icons/crystalsvg/16x16/actions/kalarm.png
+share/icons/crystalsvg/16x16/actions/kontact_contacts.png
+share/icons/crystalsvg/16x16/actions/kontact_date.png
+share/icons/crystalsvg/16x16/actions/kontact_journal.png
+share/icons/crystalsvg/16x16/actions/kontact_mail.png
+share/icons/crystalsvg/16x16/actions/kontact_news.png
+share/icons/crystalsvg/16x16/actions/kontact_notes.png
+share/icons/crystalsvg/16x16/actions/kontact_summary.png
+share/icons/crystalsvg/16x16/actions/kontact_summary_green.png
+share/icons/crystalsvg/16x16/actions/kontact_todo.png
+share/icons/crystalsvg/16x16/actions/rss_tag.png
+share/icons/crystalsvg/16x16/apps/akregator_empty.png
+share/icons/crystalsvg/16x16/apps/gpg.png
+share/icons/crystalsvg/16x16/apps/gpgsm.png
+share/icons/crystalsvg/16x16/apps/kmailcvt.png
+share/icons/crystalsvg/16x16/apps/konsolekalendar.png
+share/icons/crystalsvg/16x16/apps/kpalmdoc.png
+share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
+share/icons/crystalsvg/22x22/actions/button_fewer.png
+share/icons/crystalsvg/22x22/actions/button_more.png
+share/icons/crystalsvg/22x22/actions/kalarm.png
+share/icons/crystalsvg/22x22/actions/kontact_contacts.png
+share/icons/crystalsvg/22x22/actions/kontact_date.png
+share/icons/crystalsvg/22x22/actions/kontact_journal.png
+share/icons/crystalsvg/22x22/actions/kontact_mail.png
+share/icons/crystalsvg/22x22/actions/kontact_news.png
+share/icons/crystalsvg/22x22/actions/kontact_notes.png
+share/icons/crystalsvg/22x22/actions/kontact_summary.png
+share/icons/crystalsvg/22x22/actions/kontact_summary_green.png
+share/icons/crystalsvg/22x22/actions/kontact_todo.png
+share/icons/crystalsvg/22x22/actions/rss_tag.png
+share/icons/crystalsvg/22x22/apps/gpg.png
+share/icons/crystalsvg/22x22/apps/gpgsm.png
+share/icons/crystalsvg/22x22/apps/kmaillight.png
+share/icons/crystalsvg/22x22/apps/konsolekalendar.png
+share/icons/crystalsvg/22x22/apps/kpalmdoc.png
+share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
+share/icons/crystalsvg/32x32/actions/kontact_contacts.png
+share/icons/crystalsvg/32x32/actions/kontact_date.png
+share/icons/crystalsvg/32x32/actions/kontact_journal.png
+share/icons/crystalsvg/32x32/actions/kontact_mail.png
+share/icons/crystalsvg/32x32/actions/kontact_news.png
+share/icons/crystalsvg/32x32/actions/kontact_notes.png
+share/icons/crystalsvg/32x32/actions/kontact_summary.png
+share/icons/crystalsvg/32x32/actions/kontact_summary_green.png
+share/icons/crystalsvg/32x32/actions/kontact_todo.png
+share/icons/crystalsvg/32x32/actions/rss_tag.png
+share/icons/crystalsvg/32x32/apps/gpg.png
+share/icons/crystalsvg/32x32/apps/gpgsm.png
+share/icons/crystalsvg/32x32/apps/kmailcvt.png
+share/icons/crystalsvg/32x32/apps/kmaillight.png
+share/icons/crystalsvg/32x32/apps/konsolekalendar.png
+share/icons/crystalsvg/32x32/apps/kpalmdoc.png
+share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
+share/icons/crystalsvg/48x48/actions/kontact_contacts.png
+share/icons/crystalsvg/48x48/actions/kontact_date.png
+share/icons/crystalsvg/48x48/actions/kontact_journal.png
+share/icons/crystalsvg/48x48/actions/kontact_mail.png
+share/icons/crystalsvg/48x48/actions/kontact_news.png
+share/icons/crystalsvg/48x48/actions/kontact_notes.png
+share/icons/crystalsvg/48x48/actions/kontact_summary.png
+share/icons/crystalsvg/48x48/actions/kontact_summary_green.png
+share/icons/crystalsvg/48x48/actions/kontact_todo.png
+share/icons/crystalsvg/48x48/actions/rss_tag.png
+share/icons/crystalsvg/48x48/apps/kmailcvt.png
+share/icons/crystalsvg/48x48/apps/kpalmdoc.png
+share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
+share/icons/crystalsvg/64x64/actions/kontact_contacts.png
+share/icons/crystalsvg/64x64/actions/kontact_date.png
+share/icons/crystalsvg/64x64/actions/kontact_journal.png
+share/icons/crystalsvg/64x64/actions/kontact_mail.png
+share/icons/crystalsvg/64x64/actions/kontact_news.png
+share/icons/crystalsvg/64x64/actions/kontact_notes.png
+share/icons/crystalsvg/64x64/actions/kontact_summary.png
+share/icons/crystalsvg/64x64/actions/kontact_summary_green.png
+share/icons/crystalsvg/64x64/actions/kontact_todo.png
+share/icons/crystalsvg/64x64/actions/rss_tag.png
+share/icons/hicolor/128x128/apps/akregator.png
+share/icons/hicolor/128x128/apps/kaddressbook.png
+share/icons/hicolor/128x128/apps/karm.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/kontact.png
+share/icons/hicolor/128x128/apps/korganizer.png
+share/icons/hicolor/16x16/apps/akregator.png
+share/icons/hicolor/16x16/apps/kaddressbook.png
+share/icons/hicolor/16x16/apps/kalarm.png
+share/icons/hicolor/16x16/apps/karm.png
+share/icons/hicolor/16x16/apps/kmail.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/kontact.png
+share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/16x16/apps/korn.png
+share/icons/hicolor/16x16/apps/kpilot.png
+share/icons/hicolor/16x16/apps/multisynk.png
+share/icons/hicolor/22x22/apps/akregator.png
+share/icons/hicolor/22x22/apps/karm.png
+share/icons/hicolor/22x22/apps/kmail.png
+share/icons/hicolor/22x22/apps/knotes.png
+share/icons/hicolor/22x22/apps/kontact.png
+share/icons/hicolor/22x22/apps/kpilot.png
+share/icons/hicolor/22x22/apps/multisynk.png
+share/icons/hicolor/32x32/apps/akregator.png
+share/icons/hicolor/32x32/apps/kaddressbook.png
+share/icons/hicolor/32x32/apps/kalarm.png
+share/icons/hicolor/32x32/apps/karm.png
+share/icons/hicolor/32x32/apps/kmail.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/kontact.png
+share/icons/hicolor/32x32/apps/korganizer.png
+share/icons/hicolor/32x32/apps/korn.png
+share/icons/hicolor/32x32/apps/kpilot.png
+share/icons/hicolor/32x32/apps/multisynk.png
+share/icons/hicolor/48x48/apps/akregator.png
+share/icons/hicolor/48x48/apps/kaddressbook.png
+share/icons/hicolor/48x48/apps/kalarm.png
+share/icons/hicolor/48x48/apps/karm.png
+share/icons/hicolor/48x48/apps/kmail.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/kontact.png
+share/icons/hicolor/48x48/apps/korganizer.png
+share/icons/hicolor/48x48/apps/korn.png
+share/icons/hicolor/48x48/apps/kpilot.png
+share/icons/hicolor/48x48/apps/ktnef.png
+share/icons/hicolor/48x48/apps/multisynk.png
+share/icons/hicolor/64x64/apps/akregator.png
+share/icons/hicolor/64x64/apps/kaddressbook.png
+share/icons/hicolor/64x64/apps/karm.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.png
+share/icons/hicolor/64x64/apps/korganizer.png
+share/icons/hicolor/scalable/apps/akregator.svgz
+share/icons/hicolor/scalable/apps/kmail.svgz
+share/icons/locolor/16x16/apps/kpilot.png
+share/icons/locolor/16x16/apps/ktnef.png
+share/icons/locolor/32x32/apps/ktnef.png
 share/kde/applnk/.hidden/kalarmd.desktop
 share/kde/applnk/Applications/kalarm.desktop
 share/kde/applnk/Utilities/kandy.desktop
@@ -1537,6 +1702,7 @@ share/kde/apps/libkholidays/holiday_fi
 share/kde/apps/libkholidays/holiday_fr
 share/kde/apps/libkholidays/holiday_frswiss
 share/kde/apps/libkholidays/holiday_gb
+share/kde/apps/libkholidays/holiday_gr
 share/kde/apps/libkholidays/holiday_gt
 share/kde/apps/libkholidays/holiday_hu
 share/kde/apps/libkholidays/holiday_ie
@@ -1577,6 +1743,7 @@ share/kde/autostart/korgac.desktop
 share/kde/config.kcfg/abbrowserconduit.kcfg
 share/kde/config.kcfg/akregator.kcfg
 share/kde/config.kcfg/custommimeheader.kcfg
+share/kde/config.kcfg/customtemplates_kfg.kcfg
 share/kde/config.kcfg/docconduit.kcfg
 share/kde/config.kcfg/egroupware.kcfg
 share/kde/config.kcfg/groupwise.kcfg
@@ -1599,158 +1766,12 @@ share/kde/config.kcfg/popmail.kcfg
 share/kde/config.kcfg/replyphrases.kcfg
 share/kde/config.kcfg/slox.kcfg
 share/kde/config.kcfg/sysinfoconduit.kcfg
+share/kde/config.kcfg/templatesconfiguration_kfg.kcfg
 share/kde/config.kcfg/timeconduit.kcfg
 share/kde/config.kcfg/vcalconduitbase.kcfg
 share/kde/config/kmail.antispamrc
 share/kde/config/kmail.antivirusrc
 share/kde/config/libkleopatrarc
-share/kde/icons/crystalsvg/16x16/actions/kalarm.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_contacts.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_date.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_journal.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_mail.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_news.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_notes.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_summary.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_summary_green.png
-share/kde/icons/crystalsvg/16x16/actions/kontact_todo.png
-share/kde/icons/crystalsvg/16x16/actions/rss_tag.png
-share/kde/icons/crystalsvg/16x16/apps/akregator_empty.png
-share/kde/icons/crystalsvg/16x16/apps/gpg.png
-share/kde/icons/crystalsvg/16x16/apps/gpgsm.png
-share/kde/icons/crystalsvg/16x16/apps/kmailcvt.png
-share/kde/icons/crystalsvg/16x16/apps/konsolekalendar.png
-share/kde/icons/crystalsvg/16x16/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/16x16/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/22x22/actions/button_fewer.png
-share/kde/icons/crystalsvg/22x22/actions/button_more.png
-share/kde/icons/crystalsvg/22x22/actions/kalarm.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_contacts.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_date.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_journal.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_mail.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_news.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_notes.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_summary.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_summary_green.png
-share/kde/icons/crystalsvg/22x22/actions/kontact_todo.png
-share/kde/icons/crystalsvg/22x22/actions/rss_tag.png
-share/kde/icons/crystalsvg/22x22/apps/gpg.png
-share/kde/icons/crystalsvg/22x22/apps/gpgsm.png
-share/kde/icons/crystalsvg/22x22/apps/kmaillight.png
-share/kde/icons/crystalsvg/22x22/apps/konsolekalendar.png
-share/kde/icons/crystalsvg/22x22/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/22x22/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_contacts.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_date.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_journal.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_mail.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_news.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_notes.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_summary.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_summary_green.png
-share/kde/icons/crystalsvg/32x32/actions/kontact_todo.png
-share/kde/icons/crystalsvg/32x32/actions/rss_tag.png
-share/kde/icons/crystalsvg/32x32/apps/gpg.png
-share/kde/icons/crystalsvg/32x32/apps/gpgsm.png
-share/kde/icons/crystalsvg/32x32/apps/kmailcvt.png
-share/kde/icons/crystalsvg/32x32/apps/kmaillight.png
-share/kde/icons/crystalsvg/32x32/apps/konsolekalendar.png
-share/kde/icons/crystalsvg/32x32/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/32x32/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_contacts.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_date.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_journal.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_mail.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_news.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_notes.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_summary.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_summary_green.png
-share/kde/icons/crystalsvg/48x48/actions/kontact_todo.png
-share/kde/icons/crystalsvg/48x48/actions/rss_tag.png
-share/kde/icons/crystalsvg/48x48/apps/kmailcvt.png
-share/kde/icons/crystalsvg/48x48/apps/kpalmdoc.png
-share/kde/icons/crystalsvg/48x48/apps/kpilotDaemon.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_contacts.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_date.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_journal.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_mail.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_news.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_notes.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_summary.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_summary_green.png
-share/kde/icons/crystalsvg/64x64/actions/kontact_todo.png
-share/kde/icons/crystalsvg/64x64/actions/rss_tag.png
-share/kde/icons/hicolor/128x128/apps/akregator.png
-share/kde/icons/hicolor/128x128/apps/kaddressbook.png
-share/kde/icons/hicolor/128x128/apps/karm.png
-share/kde/icons/hicolor/128x128/apps/kmail.png
-share/kde/icons/hicolor/128x128/apps/knode.png
-share/kde/icons/hicolor/128x128/apps/knode2.png
-share/kde/icons/hicolor/128x128/apps/knotes.png
-share/kde/icons/hicolor/128x128/apps/kontact.png
-share/kde/icons/hicolor/128x128/apps/korganizer.png
-share/kde/icons/hicolor/16x16/apps/akregator.png
-share/kde/icons/hicolor/16x16/apps/kaddressbook.png
-share/kde/icons/hicolor/16x16/apps/kalarm.png
-share/kde/icons/hicolor/16x16/apps/karm.png
-share/kde/icons/hicolor/16x16/apps/kmail.png
-share/kde/icons/hicolor/16x16/apps/knode.png
-share/kde/icons/hicolor/16x16/apps/knode2.png
-share/kde/icons/hicolor/16x16/apps/knotes.png
-share/kde/icons/hicolor/16x16/apps/kontact.png
-share/kde/icons/hicolor/16x16/apps/korganizer.png
-share/kde/icons/hicolor/16x16/apps/korn.png
-share/kde/icons/hicolor/16x16/apps/kpilot.png
-share/kde/icons/hicolor/16x16/apps/multisynk.png
-share/kde/icons/hicolor/22x22/apps/akregator.png
-share/kde/icons/hicolor/22x22/apps/karm.png
-share/kde/icons/hicolor/22x22/apps/kmail.png
-share/kde/icons/hicolor/22x22/apps/knotes.png
-share/kde/icons/hicolor/22x22/apps/kontact.png
-share/kde/icons/hicolor/22x22/apps/kpilot.png
-share/kde/icons/hicolor/22x22/apps/multisynk.png
-share/kde/icons/hicolor/32x32/apps/akregator.png
-share/kde/icons/hicolor/32x32/apps/kaddressbook.png
-share/kde/icons/hicolor/32x32/apps/kalarm.png
-share/kde/icons/hicolor/32x32/apps/karm.png
-share/kde/icons/hicolor/32x32/apps/kmail.png
-share/kde/icons/hicolor/32x32/apps/knode.png
-share/kde/icons/hicolor/32x32/apps/knode2.png
-share/kde/icons/hicolor/32x32/apps/knotes.png
-share/kde/icons/hicolor/32x32/apps/kontact.png
-share/kde/icons/hicolor/32x32/apps/korganizer.png
-share/kde/icons/hicolor/32x32/apps/korn.png
-share/kde/icons/hicolor/32x32/apps/kpilot.png
-share/kde/icons/hicolor/32x32/apps/multisynk.png
-share/kde/icons/hicolor/48x48/apps/akregator.png
-share/kde/icons/hicolor/48x48/apps/kaddressbook.png
-share/kde/icons/hicolor/48x48/apps/kalarm.png
-share/kde/icons/hicolor/48x48/apps/karm.png
-share/kde/icons/hicolor/48x48/apps/kmail.png
-share/kde/icons/hicolor/48x48/apps/knode.png
-share/kde/icons/hicolor/48x48/apps/knode2.png
-share/kde/icons/hicolor/48x48/apps/knotes.png
-share/kde/icons/hicolor/48x48/apps/kontact.png
-share/kde/icons/hicolor/48x48/apps/korganizer.png
-share/kde/icons/hicolor/48x48/apps/korn.png
-share/kde/icons/hicolor/48x48/apps/kpilot.png
-share/kde/icons/hicolor/48x48/apps/ktnef.png
-share/kde/icons/hicolor/48x48/apps/multisynk.png
-share/kde/icons/hicolor/64x64/apps/akregator.png
-share/kde/icons/hicolor/64x64/apps/kaddressbook.png
-share/kde/icons/hicolor/64x64/apps/karm.png
-share/kde/icons/hicolor/64x64/apps/kmail.png
-share/kde/icons/hicolor/64x64/apps/knode.png
-share/kde/icons/hicolor/64x64/apps/knode2.png
-share/kde/icons/hicolor/64x64/apps/knotes.png
-share/kde/icons/hicolor/64x64/apps/kontact.png
-share/kde/icons/hicolor/64x64/apps/korganizer.png
-share/kde/icons/hicolor/scalable/apps/akregator.svgz
-share/kde/icons/hicolor/scalable/apps/kmail.svgz
-share/kde/icons/locolor/16x16/apps/kpilot.png
-share/kde/icons/locolor/16x16/apps/ktnef.png
-share/kde/icons/locolor/32x32/apps/ktnef.png
 share/kde/mimelnk/application/ms-tnef.desktop
 share/kde/services/abbrowser_conduit.desktop
 share/kde/services/akregator_mk4storage_plugin.desktop
@@ -1849,6 +1870,7 @@ share/kde/services/korganizer/hebrew.desktop
 share/kde/services/korganizer/holidays.desktop
 share/kde/services/korganizer/journalprint.desktop
 share/kde/services/korganizer/webexport.desktop
+share/kde/services/korganizer/yearprint.desktop
 share/kde/services/korganizer_configcolors.desktop
 share/kde/services/korganizer_configdesignerfields.desktop
 share/kde/services/korganizer_configfonts.desktop
@@ -1942,24 +1964,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment in kde: @dirrm share/kde/services/kaddressbook
 @comment in kde: @dirrm share/kde/services
 @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/scalable/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/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/config.kcfg
 @comment in kde: @dirrm share/kde/config
 @comment in kde: @dirrm share/kde/autostart
@@ -2143,6 +2147,24 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment in kde: @dirrm share/kde/applnk/Utilities
 @comment in kde: @dirrm share/kde/applnk/Applications
 @comment in kde: @dirrm share/kde/applnk/.hidden
+@comment in kde: @dirrm share/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/icons/locolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/actions
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/actions
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/apps
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/actions
 @dirrm share/doc/kde/HTML/en/multisynk
 @dirrm share/doc/kde/HTML/en/kwatchgnupg
 @dirrm share/doc/kde/HTML/en/ktnef
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index f543a7aef76..8a566a4b812 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.50 2006/11/20 10:57:43 markd Exp $
+$NetBSD: distinfo,v 1.51 2007/01/26 03:17:09 markd Exp $
 
-SHA1 (kdepim-3.5.5.tar.bz2) = 612f34307c5fac9279c85a4efb1488db4b438f12
-RMD160 (kdepim-3.5.5.tar.bz2) = 5bdcf98909f450ce3839fa72a404571f6cde22f6
-Size (kdepim-3.5.5.tar.bz2) = 12908968 bytes
+SHA1 (kdepim-3.5.6.tar.bz2) = a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4
+RMD160 (kdepim-3.5.6.tar.bz2) = 85f64349d8eedb531895a3591f6fee07c68bf1eb
+Size (kdepim-3.5.6.tar.bz2) = 13643798 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
-SHA1 (patch-ac) = 2ead8593be03d780cf5b4e333dc4ead1d29b8073
-SHA1 (patch-ad) = 7e88fc9312e390a9767e8bab85135de39c48826b
-SHA1 (patch-ae) = 02dd4696aab404372e457090b5cb0fc422143660
-SHA1 (patch-af) = 6bf619c1f6a76df8395821a0eb8af6edeb6600a4
+SHA1 (patch-ac) = 3f29a28a022e7e691f3cd1f5d2cee37c6407323c
+SHA1 (patch-ad) = cca7ee6fc88170e0277883532a6a607ec4e5efa0
 SHA1 (patch-ai) = 401c9b7dcb49fd7ee3c03e400e52edc421649692
-SHA1 (patch-aj) = 1fd187c4c9ddb4f6380265853feb7eb04cf4b740
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
 SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a
 SHA1 (patch-am) = 29066a35ac983764a8cfa9392b9d67df581b35d3
diff --git a/misc/kdepim3/options.mk b/misc/kdepim3/options.mk
new file mode 100644
index 00000000000..35649c6e962
--- /dev/null
+++ b/misc/kdepim3/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2007/01/26 03:17:09 markd Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdepim
+PKG_SUPPORTED_OPTIONS=	sasl
+PKG_SUGGESTED_OPTIONS=	sasl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msasl)
+.include "../../security/cyrus-sasl/buildlink3.mk"
+PLIST_SUBST+=	HAVE_SASL=""
+.else
+PLIST_SUBST+=	HAVE_SASL="@comment "
+.endif
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
index aa271fb9788..4e7f552e7a3 100644
--- a/misc/kdepim3/patches/patch-ac
+++ b/misc/kdepim3/patches/patch-ac
@@ -1,14 +1,23 @@
-$NetBSD: patch-ac,v 1.11 2006/02/07 10:10:42 markd Exp $
+$NetBSD: patch-ac,v 1.12 2007/01/26 03:17:09 markd Exp $
 
---- kpilot/lib/options.cc.orig	2005-09-10 20:24:40.000000000 +1200
-+++ kpilot/lib/options.cc
-@@ -90,7 +90,9 @@ struct tm writeTm(const QDateTime &dt)
-   t.tm_wday = 0; // unimplemented
-   t.tm_yday = 0; // unimplemented
-   t.tm_isdst = 0; // unimplemented
-+#ifndef Q_OS_SOLARIS
-   t.tm_zone = 0; // unimplemented
-+#endif
+kde svn 624745 and 624937
+
+--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig	2007-01-16 00:29:05.000000000 +1300
++++ kpilot/conduits/vcalconduit/vcalRecord.cc
+@@ -584,7 +584,7 @@ void VCalRecord::setCategory(PilotDateEn
+ 	if (eventCategories.size() < 1)
+ 	{
+ 		// This event has no categories.
+-		de->setCategory(Pilot::Unfiled);
++		((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ 		return;
+ 	}
+ 
+@@ -623,6 +623,6 @@ void VCalRecord::setCategory(PilotDateEn
+ 		}
+ 	}
+ 
+-	de->setCategory(Pilot::Unfiled);
++	((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ }
  
-   t.tm_year = dt.date().year() - 1900;
-   t.tm_mon = dt.date().month() - 1;
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
index 51a07ba43fb..f542c16832f 100644
--- a/misc/kdepim3/patches/patch-ad
+++ b/misc/kdepim3/patches/patch-ad
@@ -1,13 +1,12 @@
-$NetBSD: patch-ad,v 1.9 2006/11/20 10:57:43 markd Exp $
+$NetBSD: patch-ad,v 1.10 2007/01/26 03:17:09 markd Exp $
 
---- korganizer/Makefile.in.orig	2006-10-03 07:54:21.000000000 +1300
-+++ korganizer/Makefile.in
-@@ -841,7 +841,7 @@ part_DATA = korganizer_part.rc
- kde_servicetypes_DATA = dcopcalendar.desktop
- KDE_ICON = AUTO
- #>- META_INCLUDES = $(srcdir)/interfaces/korganizer
--xdg_apps_DATA = korganizer.desktop
-+xdg_apps_DATA = korganizer.desktop korganizer-import.desktop
- kde_kcfg_DATA = korganizer.kcfg
- kde_services_DATA = korganizer_configmain.desktop \
-                     korganizer_configtime.desktop \
+--- kpilot/conduits/Makefile.in.orig	2007-01-22 15:48:40.000000000 +1300
++++ kpilot/conduits/Makefile.in
+@@ -471,6 +471,7 @@ SUBDIRS = \
+ 	  abbrowserconduit \
+ 	  docconduit \
+ 	  knotes \
++	  $(MAL_SUBDIR) \
+ 	  memofileconduit \
+ 	  notepadconduit \
+ 	  popmail \
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
deleted file mode 100644
index ff482c61afd..00000000000
--- a/misc/kdepim3/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2006/11/20 10:57:43 markd Exp $
-
---- korganizer/korganizer.desktop.orig	2006-10-02 06:30:39.000000000 +1300
-+++ korganizer/korganizer.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Encoding=UTF-8
--MimeType=text/calendar;text/x-vcalendar;
- Comment=Calendar and Scheduling Program
- Comment[af]=Kalender en Skedulering Program
- Comment[ar]=برنامج الجدولة والتقويم
-@@ -61,7 +60,7 @@ Comment[xh]=Ikhalenda no Dweliso lwenkqu
- Comment[zh_CN]=日历和日程安排程序
- Comment[zh_TW]=行事曆與排程軟體
- Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
--Exec=korganizer --import %u
-+Exec=korganizer
- Icon=korganizer
- Path=
- DocPath=korganizer/index.html
diff --git a/misc/kdepim3/patches/patch-af b/misc/kdepim3/patches/patch-af
deleted file mode 100644
index 0ff47c02abe..00000000000
--- a/misc/kdepim3/patches/patch-af
+++ /dev/null
@@ -1,142 +0,0 @@
-$NetBSD: patch-af,v 1.5 2006/11/20 10:57:43 markd Exp $
-
---- /dev/null	2006-11-20 23:04:58.000000000 +1300
-+++ korganizer/korganizer-import.desktop
-@@ -0,0 +1,137 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+MimeType=text/calendar;text/x-vcalendar;
-+Comment=Calendar and Scheduling Program
-+Comment[af]=Kalender en Skedulering Program
-+Comment[ar]=برنامج الجدولة والتقويم
-+Comment[bg]=Програма за календар и разписание
-+Comment[bs]=Kalendar i rokovnik
-+Comment[ca]=Un programa de calendari i planificació
-+Comment[cs]=Kalendářový a plánovací program
-+Comment[cy]=Rhaglen Galendr a Drefnlennu
-+Comment[da]=Kalender- og planlægningsprogram
-+Comment[de]=Ein Kalender und Zeitplaner
-+Comment[el]=Πρόγραμμα ημερολογίου και προγραμματισμού
-+Comment[eo]=Kalendara kaj plana programo
-+Comment[es]=Calendario y planificador
-+Comment[et]=Kalendri ja ajakava haldamise rakendus
-+Comment[eu]=Egutegi eta antolaketa progrmaa
-+Comment[fa]=تقویم و برنامۀ زمان‌بندی
-+Comment[fi]=Kalenteri ja ajanhallintaohjelma
-+Comment[fr]=Calendrier et agenda personnel
-+Comment[gl]=Programa de Calendario e Axenda
-+Comment[he]=תוכניות לוח שנה ותזמון משימות
-+Comment[hi]=कैलेन्डर तथा समय-सारणी प्रोग्राम
-+Comment[hr]=Kalendar i rokovnik
-+Comment[hu]=Határidőnapló és eseményszervező
-+Comment[is]=Dagbók og skipulag
-+Comment[it]=Programma di calendario e di agenda
-+Comment[ja]=カレンダーとスケジュール管理プログラム
-+Comment[km]=កម្មវិធី​ប្រតិទិន និង កាលវិភាគ
-+Comment[lt]=Kalendoriaus ir planavimo programa
-+Comment[lv]=Kalendāra un Plānošanas Programma
-+Comment[mk]=Календар и роковник
-+Comment[ms]=Kalendar dan Program Penjadualan 
-+Comment[mt]=Programm b' kalendarju w skeda
-+Comment[nb]=Et kalender- og tidsplanleggingsprogram
-+Comment[nds]=Kalenner un Tietplaner
-+Comment[nl]=Agenda- en afsprakenprogramma
-+Comment[nn]=Kalender- og planleggingsprogram
-+Comment[nso]=Lenaneo la Peakanyo ya Tshupamabaka
-+Comment[pl]=Kalendarz i terminarz
-+Comment[pt]=Calendário e Programa de Escalonamento
-+Comment[pt_BR]=Programa de Calendário e Agenda
-+Comment[ro]=Program de planificare şi calendar
-+Comment[ru]=Календарь и личное расписание
-+Comment[se]=Kaleandar- ja plánenprográmma
-+Comment[sk]=Kalendár a plánovací program
-+Comment[sl]=Program za koledar in razporejanje
-+Comment[sr]=Календарски и планерски програм
-+Comment[sr@Latn]=Kalendarski i planerski program
-+Comment[sv]=Kalender- och schemaläggningsprogram
-+Comment[ta]=நாள்காட்டி மற்றும் திட்ட நிரல்
-+Comment[tg]=Тақвимот ва ҷадвали шахсӣ
-+Comment[th]=โปรแกรมจัดการปฏิทินและตารางการนัดหมาย
-+Comment[tr]=Takvim ve Zamanlama Programı
-+Comment[uk]=Програма календаря та розкладу
-+Comment[uz]=Календар ва режалаштириш дастури
-+Comment[ven]=Khalenda na mbekanyamushumo ya u shedula
-+Comment[vi]=Chương trình lịch và kế hoạch
-+Comment[xh]=Ikhalenda no Dweliso lwenkqubo Yokucwangcisa
-+Comment[zh_CN]=日历和日程安排程序
-+Comment[zh_TW]=行事曆與排程軟體
-+Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
-+Exec=korganizer --import %u
-+Icon=korganizer
-+Path=
-+DocPath=korganizer/index.html
-+Type=Application
-+Terminal=false
-+Name=KOrganizer
-+Name[af]=Korganizer
-+Name[ar]=منظم كيدي
-+Name[be]=K Арганізатар
-+Name[cy]=KTrefnydd
-+Name[eo]=Organizilo
-+Name[hi]=के-आर्गेनाइज़र
-+Name[lv]=KOrganaizers
-+Name[mk]=Организатор
-+Name[nso]=KMokopanyi
-+Name[pl]=Organizator
-+Name[sv]=Korganizer
-+Name[ta]=கேஅமைப்பாளர்
-+Name[ven]=Mulugisi wa K
-+Name[zh_TW]=KOrganizer 行事曆
-+GenericName=Personal Organizer
-+GenericName[be]=Пэрсанальны арганізатар
-+GenericName[bg]=Организатор
-+GenericName[bs]=Lični organizer
-+GenericName[ca]=Organitzador personal
-+GenericName[cs]=Osobní organizér
-+GenericName[cy]=Trefnydd Personol
-+GenericName[da]=Personlig organisering
-+GenericName[de]=Persönliche Daten organisieren
-+GenericName[el]=Προσωπικός οργανωτής
-+GenericName[en_GB]=Personal Organiser
-+GenericName[es]=Organizador personal
-+GenericName[et]=Personaalne ajaarvestus
-+GenericName[eu]=Antolatzaile pertsonala
-+GenericName[fa]=سازمان‌دهندۀ شخصی‌
-+GenericName[fi]=Henkilökohtainen ajanhallintaohjelma
-+GenericName[fr]=Organiseur personnel
-+GenericName[gl]=Organizador Persoal
-+GenericName[he]=מנהל זמן אישי
-+GenericName[hi]=निजी प्रबंधक
-+GenericName[hu]=Határidőnapló
-+GenericName[is]=Persónuleg skipulagsbók
-+GenericName[it]=Organizzatore personale
-+GenericName[ja]=個人向けスケジュール管理
-+GenericName[km]=កម្មវិធី​រៀបចំ​ផ្ទាល់​ខ្លួន
-+GenericName[lt]=Asmeninės informacijos tvarkyklė
-+GenericName[ms]=Penyusun Peribadi
-+GenericName[nb]=Personlig planlegger
-+GenericName[nds]=Persöönlich Mötenkalenner
-+GenericName[nl]=Persoonlijke organizer
-+GenericName[nn]=Personleg organiserar
-+GenericName[pl]=Osobisty organizator
-+GenericName[pt]=Organizador Pessoal
-+GenericName[pt_BR]=Organizador Pessoal
-+GenericName[ro]=Organizator personal
-+GenericName[ru]=Персональный органайзер
-+GenericName[sk]=Osobný plánovač
-+GenericName[sl]=Osebni organizator
-+GenericName[sr]=Лични планер
-+GenericName[sr@Latn]=Lični planer
-+GenericName[sv]=Filofax
-+GenericName[ta]=தனிப்பயன் அமைப்பாளர்
-+GenericName[tg]=Органайзери инфиродӣ
-+GenericName[tr]=Kişisel Bilgi Yöneticisi
-+GenericName[uk]=Персональний тижневик
-+GenericName[uz]=Шахсий органайзер
-+GenericName[zh_CN]=个人日程安排
-+GenericName[zh_TW]=個人行程組織軟體
-+ServiceTypes=Browser/View,DCOP/Organizer
-+X-KDE-Library=libkorganizerpart
-+X-KDE-StartupNotify=true
-+X-DCOP-ServiceType=Unique
-+X-DCOP-ServiceName=korganizer
diff --git a/misc/kdepim3/patches/patch-aj b/misc/kdepim3/patches/patch-aj
deleted file mode 100644
index 5839fb2e6ce..00000000000
--- a/misc/kdepim3/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/12/18 13:46:58 joerg Exp $
-
---- libkcal/libical/src/libicalss/icalfileset.c.orig	2005-12-17 15:19:32.000000000 +0000
-+++ libkcal/libical/src/libicalss/icalfileset.c
-@@ -56,8 +56,6 @@
- #define S_ISREG(mode)    _S_ISTYPE((mode), _S_IFREG)
- #endif
- 
--extern int errno;
--
- /** Default options used when NULL is passed to icalset_new() **/
- icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0, 0};
-