Update KDE to 3.5.7

Akregator
* Disable java and javascript in the article viewer.
* Partially fix "javascript:" links in the browser tabs.

KAddressBook
* Add support to search in custom fields.
* Don't deselect all previous selected items on a RMB click, otherwise
  it's impossible to send all selected contacts via mail or delete them
  at once.
* Changed the category editor to use an inline editing, that makes the
  usage a lot more userfriendly and less confusing.
* Fix crash when importing addresses from Konqueror twice.
* Export Home Address and Business Address when exporting to CSV.
* Fix importing some fields from CSV.
* Change non-modal dialogs into modal ones to prevent the user from
  closing the contact editor dialog before the category editor dialog.
* Fix crash when adding picture to contact.
* Move the IM Address field into the IM section, so it's shown when you
  enable the 'Show IM Addresses' option.
* Always select the first entry of the view on startup.
* Use proper encoding for URLs in contact data.
* Add the formatted name according to the KAddressbook settings.

KAlarm
* Add test play button to sound file selection dialog.
* Show Simple Repetition and Special Action statuses by means of button
  states, in alarm edit dialog.
* Prevent pre-alarm actions being executed multiple times when the alarm
  is triggered.
* Only execute pre-alarm actions when the main alarm is initially
  triggered, and post-alarm actions when the alarm is finally
  acknowledged (after any deferrals).
* Display advance reminders for each occurrence of recurring alarms.
* Prevent repetitions triggering again if KAlarm is restarted.
* Prevent recurring alarms being triggered on exception days.
* Fix start-of-day time being ignored for date-only alarms.
* Fix failure to save "Execute in terminal window" option in Preferences
  dialog.
* Fix Undo of deletion of active alarms.
* Fix attachments not being sent with scheduled emails when using KMail
  as email client.
* Ensure up-to-date menus are displayed if user has a customised toolbar.
* Make the alarm times shown in the system tray tooltip take account of
  alarm repetitions.
* Disable Defer button in new message window when deferral limit has been
  reached.

KArm
* In case of stale lock files, do not start timing, but warn.

Kitchensync
* The OpenSync based Kitchensync is being used now.

Korn
* Make it possible to disable TLS.

KMail
* IMAP Quota feature.
* All folders can be copyied or moved now.
* Drag 'n drop of one or multiple folders.
* Copy/cut/paste actions for one or multiple folders.
* Drag 'n drop of messages from the search result window to the folder
  tree.
* Copy/cut/paste actions for messages (in the header view and search
  result window).
* IMAP: exclude some folders from syncing, allowing you to use online
  and disconnected IMAP on the same account for a disjoint set of folders.
* Inline-viewing of TNEF attachments.
* kmail --view can also handle *.mbox files (such as the ones saved by kmail)
* Adds support for accepting image drags to the composer window and also
  now accepts pasting images with Ctrl+V so that it does not write a
  temporary file.
* Add icons for context menu on address in reader window.
* Show the User-Agent or X-Mailer value in fancy headers if so configured.
* Show preferred email addresses first in auto completion.
* Allow the user to cancel kmail connection attempts when the account
  settings are incorrect.
* Many crashes were fixed regarding IMAP.
* Fix pasting in addressee fields.
* Do not ask to store the SMTP password outside KWallet everytime you
  want to send a mail.
* Typo in the antispam wizard definitions, which caused CRM114 to be
  always displayed as available.
* Fix crash after creating a disconnected IMAP account.
* Make sure that a corrupted .ids file does not allocate huge amount of
  memory by checking consistency of file length vs. number of items
  expected.
* Copying messages is faster.
* Honor umask of the user when saving attachments
* Fix "deleting maildir does not delete associated .index.ids file"
* Updates of libgpg-error and gpgme in order to fix serious security
  issues.
* Don't allow base64 or qp encoding for message attachements, such as
  when forwarding.
* Make sure attached emails are never encoded in anything but 7 or 8 bit.
* Don't base64 encode forwarded messages.
* Special characters are not lost if the HTML message was saved in the
  drafts folder and opened again.
* Prevent that the local folder contents changed while the IMAP search
  was working.
* Don't crash when deleting an account while jobs for that account are
  still pending.
* Disallow closing the composer window whilst performing a sign operation,
  this causes a crash when using the non-gpg-agent PGP backend.
* Fixing Outlook compatibility with attachments that have umlauts in the
  filename.
* Fix crash when opening KMail's configuration while another Kontact
  component is active at that time.
* Prevent crash when moving mail to an IMAP folder with a filter.
* Fix kmail crash when creating index
* Remember the SMTP password.
* Send MDN when this is requested.
* Fix "attendee in CC-field are missing from an invitation if the own
  email address could not be found".
* Fix for "MultiPart message plain/text body encoding" bug.
* Fix sending invitations to Outlook users.
* Give original style answers about meeting attendance.

KNode
* More tolerant parsing of broken headers.

KOrganizer
* Add holiday file for South Africa.
* Ukrainian national holidays added.
* Support Pascha (Orthodox Easter) in holidays files.
* When there are too many entries in the journal, make a scrollbar appear.
* Don't write out empty, invalid or superfluous fields in the calendar.
* Fix newlines in calendar files to comply to RFC 2445.
* When loading any URL/URI make sure we load it as UTF8 and not as Latin1.
* Fix issue that journal title was not shown when searching for journals.
* Properly sort list view when using AM/PM notation.
* Disable time and date edits when no due date is given, and set the due
  date to someting sensible (not in 200000 years).
* Fix 'spurious reminders from korgac'
* Make "Edit Categories" button open the editor again.
* Bugfixes regarding recurring events in combination with timezones.
* Save resources upon modifications, in order to fix reliability problems
  with KPilot.
* Fix "Working days views won't follow the configured work days".

KPilot
* Cleanups in memofile conduit; using new OS5 database if it's present,
  otherwise falling back to legacy one.
* As a first step to combatting the "kpilot ate my future" e-mails (read:
  data loss), we now use a CUDCounter (Create/Update/Delete). Step 1 is
  to track these and report on them to the user in their sync log.
* Bug fix in popconduit... making sure we always have a sent date
* Bug fixing in vcalconduit... long-time bug that existed in libkcal
  that caused every calendar resource save to mark every calendar event
  as modified. Now kpilot won't have to sync every record every time.
* Changing KPilotDeviceLink to use a separate thread, dedicated to doing
  device communication. This is much better design as a start, but fixes
  the problems kpilot was having (and widely talked about) where kpilot
  would hang and crash if our user was using "usb:" or "net:any" devices
  because of how these new "device"s operated (allowed immediate opening,
  even though there is no physical device connected, and then hung
  indefinitely until the real device connected).
* Icon naming bug fix.

10 files changed, 259 insertions, 265 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index fddccf72e92..42d9bdf0555 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2007/03/23 23:03:01 abs Exp $
+# $NetBSD: Makefile,v 1.75 2007/05/23 13:24:58 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
@@ -44,6 +43,7 @@ CHECK_PORTABILITY_SKIP+=karm/test/booktime-baddate.sh \
 BUILDLINK_DEPMETHOD.qt3-tools=	full
 
 .include "../../comms/libmal/buildlink3.mk"
+.include "../../comms/libopensync/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 1e50611ed1c..80907bd577f 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2007/01/26 03:17:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.28 2007/05/23 13:24:58 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -33,11 +33,9 @@ bin/korn
 bin/kpalmdoc
 bin/kpilot
 bin/kpilotDaemon
-bin/ksync
 bin/ktnef
 bin/kwatchgnupg
 bin/kxml_compiler
-bin/multisynk
 bin/networkstatustestservice
 bin/sloxwizard
 include/KNotesAppIface.h
@@ -90,39 +88,6 @@ include/kgantt/xQGanttBarView.h
 include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
-include/kitchensync/actionpart.h
-include/kitchensync/actionpartservice.h
-include/kitchensync/addressbookmerger.h
-include/kitchensync/addressbooksyncee.h
-include/kitchensync/bookmarksyncee.h
-include/kitchensync/calendarmerger.h
-include/kitchensync/calendarsyncee.h
-include/kitchensync/conflictdialog.h
-include/kitchensync/core.h
-include/kitchensync/filter.h
-include/kitchensync/idhelper.h
-include/kitchensync/konnector.h
-include/kitchensync/konnectorinfo.h
-include/kitchensync/konnectormanager.h
-include/kitchensync/kontainer.h
-include/kitchensync/merger.h
-include/kitchensync/opiedesktopsyncee.h
-include/kitchensync/profile.h
-include/kitchensync/profilecheckitem.h
-include/kitchensync/profileitem.h
-include/kitchensync/standardsync.h
-include/kitchensync/syncalgorithm.h
-include/kitchensync/syncconfig.h
-include/kitchensync/syncee.h
-include/kitchensync/synceelist.h
-include/kitchensync/syncentry.h
-include/kitchensync/syncer.h
-include/kitchensync/synchistory.h
-include/kitchensync/syncui.h
-include/kitchensync/syncuikde.h
-include/kitchensync/syncuikdeplugin.h
-include/kitchensync/systemtray.h
-include/kitchensync/unknownsyncee.h
 include/kleo/backendconfigwidget.h
 include/kleo/cryptobackend.h
 include/kleo/cryptobackendfactory.h
@@ -177,7 +142,9 @@ include/korganizer/corehelper.h
 include/korganizer/mainwindow.h
 include/korganizer/part.h
 include/korganizer/printplugin.h
+include/kpilot/kpilotdevicelink.h
 include/kpilot/kpilotlink.h
+include/kpilot/kpilotlocallink.h
 include/kpilot/pilot.h
 include/kpilot/pilotDatabase.h
 include/kpilot/pilotLinkVersion.h
@@ -187,7 +154,6 @@ include/kpilot/pilotSerialDatabase.h
 include/kpilot/plugin.h
 include/kpilot/pluginfactory.h
 include/kpilot/syncAction.h
-include/kpilot/uiDialog.h
 include/ksieve/error.h
 include/ksieve/lexer.h
 include/ksieve/parser.h
@@ -375,7 +341,6 @@ lib/kde3/libkontact_knodeplugin.la
 lib/kde3/libkontact_knotesplugin.la
 lib/kde3/libkontact_korganizerplugin.la
 lib/kde3/libkontact_kpilotplugin.la
-lib/kde3/libkontact_multisynk.la
 lib/kde3/libkontact_newstickerplugin.la
 lib/kde3/libkontact_specialdatesplugin.la
 lib/kde3/libkontact_summaryplugin.la
@@ -387,16 +352,6 @@ 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
-lib/kde3/libksync_backup.la
-lib/kde3/libksync_debugger.la
-lib/kde3/libksync_pluckerpart.la
-lib/kde3/libksync_restore.la
-lib/kde3/libksync_syncerpart.la
-lib/kde3/libksync_viewer.la
-lib/kde3/libmultisynkpart.la
-lib/kde3/liboverviewpart.la
 lib/kde3/libsloxwizard.la
 lib/kde3/plugins/designer/kdepimwidgets.la
 lib/kde3/plugins/designer/kpartsdesignerplugin.la
@@ -410,7 +365,6 @@ lib/libkabc_newexchange.la
 lib/libkabc_slox.la
 lib/libkabc_xmlrpc.la
 lib/libkabckolab.la
-lib/libkabckonnector.la
 lib/libkabinterfaces.la
 lib/libkaddressbook.la
 lib/libkcal.la
@@ -422,13 +376,12 @@ lib/libkcal_resourceremote.la
 lib/libkcal_slox.la
 lib/libkcal_xmlrpc.la
 lib/libkcalkolab.la
-lib/libkcalkonnector.la
 lib/libkdepim.la
 lib/libkgantt.la
 lib/libkgroupwarebase.la
 lib/libkgroupwaredav.la
 lib/libkholidays.la
-lib/libkitchensyncui.la
+lib/libkitchensync.la
 lib/libkleopatra.la
 lib/libkmailprivate.la
 lib/libkmime.la
@@ -437,7 +390,6 @@ lib/libknotes_xmlrpc.la
 lib/libknoteskolab.la
 lib/libkocorehelper.la
 lib/libkode.la
-lib/libkonnector.la
 lib/libkontact.la
 lib/libkorg_stdprinting.la
 lib/libkorganizer.la
@@ -450,15 +402,10 @@ lib/libkpimidentities.la
 lib/libkpinterfaces.la
 lib/libksieve.la
 lib/libkslox.la
-lib/libksync.la
-lib/libksync2.la
 lib/libktnef.la
-lib/liblocalkonnector.la
 lib/libmimelib.la
-lib/libmultisynk.la
 lib/libqgpgme.la
-lib/libqtopiakonnector.la
-lib/libremotekonnector.la
+lib/libqopensync.la
 share/applications/kde/KMail.desktop
 share/applications/kde/KNode.desktop
 share/applications/kde/KOrn.desktop
@@ -469,6 +416,7 @@ share/applications/kde/kaddressbook.desktop
 share/applications/kde/kalarm.desktop
 share/applications/kde/kandy.desktop
 share/applications/kde/karm.desktop
+share/applications/kde/kitchensync.desktop
 share/applications/kde/kleopatra_import.desktop
 share/applications/kde/kmail_view.desktop
 share/applications/kde/knotes.desktop
@@ -478,7 +426,6 @@ 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
@@ -722,20 +669,6 @@ share/doc/kde/HTML/en/ktnef/index.docbook
 share/doc/kde/HTML/en/kwatchgnupg/common
 share/doc/kde/HTML/en/kwatchgnupg/index.cache.bz2
 share/doc/kde/HTML/en/kwatchgnupg/index.docbook
-share/doc/kde/HTML/en/multisynk/common
-share/doc/kde/HTML/en/multisynk/editdialog-conflicts.png
-share/doc/kde/HTML/en/multisynk/editdialog.png
-share/doc/kde/HTML/en/multisynk/index.cache.bz2
-share/doc/kde/HTML/en/multisynk/index.docbook
-share/doc/kde/HTML/en/multisynk/konnector-addressbook.png
-share/doc/kde/HTML/en/multisynk/konnector-calendar.png
-share/doc/kde/HTML/en/multisynk/konnector-local.png
-share/doc/kde/HTML/en/multisynk/konnector-qtopia.png
-share/doc/kde/HTML/en/multisynk/konnector-remote.png
-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
@@ -826,6 +759,7 @@ 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/kitchensync.png
 share/icons/hicolor/16x16/apps/kmail.png
 share/icons/hicolor/16x16/apps/knode.png
 share/icons/hicolor/16x16/apps/knode2.png
@@ -834,18 +768,18 @@ 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/kitchensync.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/kitchensync.png
 share/icons/hicolor/32x32/apps/kmail.png
 share/icons/hicolor/32x32/apps/knode.png
 share/icons/hicolor/32x32/apps/knode2.png
@@ -854,11 +788,11 @@ 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/kitchensync.png
 share/icons/hicolor/48x48/apps/kmail.png
 share/icons/hicolor/48x48/apps/knode.png
 share/icons/hicolor/48x48/apps/knode2.png
@@ -868,7 +802,6 @@ 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
@@ -1036,9 +969,20 @@ share/kde/apps/kgantt/icons/crystalsvg/22x22/actions/ganttUnselecttask.png
 share/kde/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelect.png
 share/kde/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelecttask.png
 share/kde/apps/kgantt/icons/crystalsvg/32x32/actions/ganttUnselecttask.png
-share/kde/apps/kitchensync/ksyncgui.rc
-share/kde/apps/kitchensync/pics/kitchensync.png
-share/kde/apps/kitchensync/pics/opie.png
+share/kde/apps/kitchensync/about/kitchensync.css
+share/kde/apps/kitchensync/about/main.html
+share/kde/apps/kitchensync/about/top-right-kitchensync.png
+share/kde/apps/kitchensync/icons/crystalsvg/128x128/apps/mobile_phone.png
+share/kde/apps/kitchensync/icons/crystalsvg/16x16/actions/hotsync.png
+share/kde/apps/kitchensync/icons/crystalsvg/16x16/apps/mobile_phone.png
+share/kde/apps/kitchensync/icons/crystalsvg/22x22/actions/hotsync.png
+share/kde/apps/kitchensync/icons/crystalsvg/32x32/actions/hotsync.png
+share/kde/apps/kitchensync/icons/crystalsvg/32x32/apps/mobile_phone.png
+share/kde/apps/kitchensync/icons/crystalsvg/48x48/actions/hotsync.png
+share/kde/apps/kitchensync/icons/crystalsvg/48x48/apps/mobile_phone.png
+share/kde/apps/kitchensync/icons/crystalsvg/64x64/apps/mobile_phone.png
+share/kde/apps/kitchensync/kitchensync_part.rc
+share/kde/apps/kitchensync/kitchensyncui.rc
 share/kde/apps/kleopatra/kleopatraui.rc
 share/kde/apps/kmail/about/kmail.css
 share/kde/apps/kmail/about/main.html
@@ -1172,8 +1116,6 @@ 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/konqueror/servicemenus/kitchensync-pluck-rdf.desktop
-share/kde/apps/konqueror/servicemenus/kitchensync-pluck.desktop
 share/kde/apps/kontact/about/kontact.css
 share/kde/apps/kontact/about/main.html
 share/kde/apps/kontact/about/top-right-kontact.png
@@ -1270,7 +1212,6 @@ share/kde/apps/kpilot/kpilotui.rc
 share/kde/apps/kpilot/pics/kpilot-splash.png
 share/kde/apps/kpilot/sysinfoconduit/Template.html
 share/kde/apps/kpilot/sysinfoconduit/Template.txt
-share/kde/apps/ksync/ksyncui.rc
 share/kde/apps/ktnef/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
 share/kde/apps/ktnef/icons/hicolor/22x22/actions/ktnef_extract_to.png
 share/kde/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_all_to.png
@@ -1283,7 +1224,7 @@ share/kde/apps/libical/zoneinfo/Africa/Abidjan.ics
 share/kde/apps/libical/zoneinfo/Africa/Accra.ics
 share/kde/apps/libical/zoneinfo/Africa/Addis_Ababa.ics
 share/kde/apps/libical/zoneinfo/Africa/Algiers.ics
-share/kde/apps/libical/zoneinfo/Africa/Asmera.ics
+share/kde/apps/libical/zoneinfo/Africa/Asmara.ics
 share/kde/apps/libical/zoneinfo/Africa/Bamako.ics
 share/kde/apps/libical/zoneinfo/Africa/Bangui.ics
 share/kde/apps/libical/zoneinfo/Africa/Banjul.ics
@@ -1327,7 +1268,6 @@ share/kde/apps/libical/zoneinfo/Africa/Nouakchott.ics
 share/kde/apps/libical/zoneinfo/Africa/Ouagadougou.ics
 share/kde/apps/libical/zoneinfo/Africa/Porto-Novo.ics
 share/kde/apps/libical/zoneinfo/Africa/Sao_Tome.ics
-share/kde/apps/libical/zoneinfo/Africa/Timbuktu.ics
 share/kde/apps/libical/zoneinfo/Africa/Tripoli.ics
 share/kde/apps/libical/zoneinfo/Africa/Tunis.ics
 share/kde/apps/libical/zoneinfo/Africa/Windhoek.ics
@@ -1336,24 +1276,35 @@ share/kde/apps/libical/zoneinfo/America/Anchorage.ics
 share/kde/apps/libical/zoneinfo/America/Anguilla.ics
 share/kde/apps/libical/zoneinfo/America/Antigua.ics
 share/kde/apps/libical/zoneinfo/America/Araguaina.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Buenos_Aires.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Catamarca.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Cordoba.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Jujuy.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/La_Rioja.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Mendoza.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/San_Juan.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Tucuman.ics
+share/kde/apps/libical/zoneinfo/America/Argentina/Ushuaia.ics
 share/kde/apps/libical/zoneinfo/America/Aruba.ics
 share/kde/apps/libical/zoneinfo/America/Asuncion.ics
+share/kde/apps/libical/zoneinfo/America/Atikokan.ics
+share/kde/apps/libical/zoneinfo/America/Bahia.ics
 share/kde/apps/libical/zoneinfo/America/Barbados.ics
 share/kde/apps/libical/zoneinfo/America/Belem.ics
 share/kde/apps/libical/zoneinfo/America/Belize.ics
+share/kde/apps/libical/zoneinfo/America/Blanc-Sablon.ics
 share/kde/apps/libical/zoneinfo/America/Boa_Vista.ics
 share/kde/apps/libical/zoneinfo/America/Bogota.ics
 share/kde/apps/libical/zoneinfo/America/Boise.ics
-share/kde/apps/libical/zoneinfo/America/Buenos_Aires.ics
 share/kde/apps/libical/zoneinfo/America/Cambridge_Bay.ics
+share/kde/apps/libical/zoneinfo/America/Campo_Grande.ics
 share/kde/apps/libical/zoneinfo/America/Cancun.ics
 share/kde/apps/libical/zoneinfo/America/Caracas.ics
-share/kde/apps/libical/zoneinfo/America/Catamarca.ics
 share/kde/apps/libical/zoneinfo/America/Cayenne.ics
 share/kde/apps/libical/zoneinfo/America/Cayman.ics
 share/kde/apps/libical/zoneinfo/America/Chicago.ics
 share/kde/apps/libical/zoneinfo/America/Chihuahua.ics
-share/kde/apps/libical/zoneinfo/America/Cordoba.ics
 share/kde/apps/libical/zoneinfo/America/Costa_Rica.ics
 share/kde/apps/libical/zoneinfo/America/Cuiaba.ics
 share/kde/apps/libical/zoneinfo/America/Curacao.ics
@@ -1382,29 +1333,29 @@ share/kde/apps/libical/zoneinfo/America/Hermosillo.ics
 share/kde/apps/libical/zoneinfo/America/Indiana/Indianapolis.ics
 share/kde/apps/libical/zoneinfo/America/Indiana/Knox.ics
 share/kde/apps/libical/zoneinfo/America/Indiana/Marengo.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Petersburg.ics
 share/kde/apps/libical/zoneinfo/America/Indiana/Vevay.ics
-share/kde/apps/libical/zoneinfo/America/Indianapolis.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Vincennes.ics
+share/kde/apps/libical/zoneinfo/America/Indiana/Winamac.ics
 share/kde/apps/libical/zoneinfo/America/Inuvik.ics
 share/kde/apps/libical/zoneinfo/America/Iqaluit.ics
 share/kde/apps/libical/zoneinfo/America/Jamaica.ics
-share/kde/apps/libical/zoneinfo/America/Jujuy.ics
 share/kde/apps/libical/zoneinfo/America/Juneau.ics
 share/kde/apps/libical/zoneinfo/America/Kentucky/Louisville.ics
 share/kde/apps/libical/zoneinfo/America/Kentucky/Monticello.ics
 share/kde/apps/libical/zoneinfo/America/La_Paz.ics
 share/kde/apps/libical/zoneinfo/America/Lima.ics
 share/kde/apps/libical/zoneinfo/America/Los_Angeles.ics
-share/kde/apps/libical/zoneinfo/America/Louisville.ics
 share/kde/apps/libical/zoneinfo/America/Maceio.ics
 share/kde/apps/libical/zoneinfo/America/Managua.ics
 share/kde/apps/libical/zoneinfo/America/Manaus.ics
 share/kde/apps/libical/zoneinfo/America/Martinique.ics
 share/kde/apps/libical/zoneinfo/America/Mazatlan.ics
-share/kde/apps/libical/zoneinfo/America/Mendoza.ics
 share/kde/apps/libical/zoneinfo/America/Menominee.ics
 share/kde/apps/libical/zoneinfo/America/Merida.ics
 share/kde/apps/libical/zoneinfo/America/Mexico_City.ics
 share/kde/apps/libical/zoneinfo/America/Miquelon.ics
+share/kde/apps/libical/zoneinfo/America/Moncton.ics
 share/kde/apps/libical/zoneinfo/America/Monterrey.ics
 share/kde/apps/libical/zoneinfo/America/Montevideo.ics
 share/kde/apps/libical/zoneinfo/America/Montreal.ics
@@ -1415,6 +1366,7 @@ share/kde/apps/libical/zoneinfo/America/Nipigon.ics
 share/kde/apps/libical/zoneinfo/America/Nome.ics
 share/kde/apps/libical/zoneinfo/America/Noronha.ics
 share/kde/apps/libical/zoneinfo/America/North_Dakota/Center.ics
+share/kde/apps/libical/zoneinfo/America/North_Dakota/New_Salem.ics
 share/kde/apps/libical/zoneinfo/America/Panama.ics
 share/kde/apps/libical/zoneinfo/America/Pangnirtung.ics
 share/kde/apps/libical/zoneinfo/America/Paramaribo.ics
@@ -1427,8 +1379,8 @@ share/kde/apps/libical/zoneinfo/America/Rainy_River.ics
 share/kde/apps/libical/zoneinfo/America/Rankin_Inlet.ics
 share/kde/apps/libical/zoneinfo/America/Recife.ics
 share/kde/apps/libical/zoneinfo/America/Regina.ics
+share/kde/apps/libical/zoneinfo/America/Resolute.ics
 share/kde/apps/libical/zoneinfo/America/Rio_Branco.ics
-share/kde/apps/libical/zoneinfo/America/Rosario.ics
 share/kde/apps/libical/zoneinfo/America/Santiago.ics
 share/kde/apps/libical/zoneinfo/America/Santo_Domingo.ics
 share/kde/apps/libical/zoneinfo/America/Sao_Paulo.ics
@@ -1457,6 +1409,7 @@ share/kde/apps/libical/zoneinfo/Antarctica/DumontDUrville.ics
 share/kde/apps/libical/zoneinfo/Antarctica/Mawson.ics
 share/kde/apps/libical/zoneinfo/Antarctica/McMurdo.ics
 share/kde/apps/libical/zoneinfo/Antarctica/Palmer.ics
+share/kde/apps/libical/zoneinfo/Antarctica/Rothera.ics
 share/kde/apps/libical/zoneinfo/Antarctica/South_Pole.ics
 share/kde/apps/libical/zoneinfo/Antarctica/Syowa.ics
 share/kde/apps/libical/zoneinfo/Antarctica/Vostok.ics
@@ -1478,7 +1431,6 @@ share/kde/apps/libical/zoneinfo/Asia/Brunei.ics
 share/kde/apps/libical/zoneinfo/Asia/Calcutta.ics
 share/kde/apps/libical/zoneinfo/Asia/Choibalsan.ics
 share/kde/apps/libical/zoneinfo/Asia/Chongqing.ics
-share/kde/apps/libical/zoneinfo/Asia/Chungking.ics
 share/kde/apps/libical/zoneinfo/Asia/Colombo.ics
 share/kde/apps/libical/zoneinfo/Asia/Damascus.ics
 share/kde/apps/libical/zoneinfo/Asia/Dhaka.ics
@@ -1503,18 +1455,20 @@ share/kde/apps/libical/zoneinfo/Asia/Krasnoyarsk.ics
 share/kde/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
 share/kde/apps/libical/zoneinfo/Asia/Kuching.ics
 share/kde/apps/libical/zoneinfo/Asia/Kuwait.ics
-share/kde/apps/libical/zoneinfo/Asia/Macao.ics
 share/kde/apps/libical/zoneinfo/Asia/Macau.ics
 share/kde/apps/libical/zoneinfo/Asia/Magadan.ics
+share/kde/apps/libical/zoneinfo/Asia/Makassar.ics
 share/kde/apps/libical/zoneinfo/Asia/Manila.ics
 share/kde/apps/libical/zoneinfo/Asia/Muscat.ics
 share/kde/apps/libical/zoneinfo/Asia/Nicosia.ics
 share/kde/apps/libical/zoneinfo/Asia/Novosibirsk.ics
 share/kde/apps/libical/zoneinfo/Asia/Omsk.ics
+share/kde/apps/libical/zoneinfo/Asia/Oral.ics
 share/kde/apps/libical/zoneinfo/Asia/Phnom_Penh.ics
 share/kde/apps/libical/zoneinfo/Asia/Pontianak.ics
 share/kde/apps/libical/zoneinfo/Asia/Pyongyang.ics
 share/kde/apps/libical/zoneinfo/Asia/Qatar.ics
+share/kde/apps/libical/zoneinfo/Asia/Qyzylorda.ics
 share/kde/apps/libical/zoneinfo/Asia/Rangoon.ics
 share/kde/apps/libical/zoneinfo/Asia/Riyadh.ics
 share/kde/apps/libical/zoneinfo/Asia/Saigon.ics
@@ -1529,7 +1483,6 @@ share/kde/apps/libical/zoneinfo/Asia/Tbilisi.ics
 share/kde/apps/libical/zoneinfo/Asia/Tehran.ics
 share/kde/apps/libical/zoneinfo/Asia/Thimphu.ics
 share/kde/apps/libical/zoneinfo/Asia/Tokyo.ics
-share/kde/apps/libical/zoneinfo/Asia/Ujung_Pandang.ics
 share/kde/apps/libical/zoneinfo/Asia/Ulaanbaatar.ics
 share/kde/apps/libical/zoneinfo/Asia/Urumqi.ics
 share/kde/apps/libical/zoneinfo/Asia/Vientiane.ics
@@ -1541,7 +1494,7 @@ share/kde/apps/libical/zoneinfo/Atlantic/Azores.ics
 share/kde/apps/libical/zoneinfo/Atlantic/Bermuda.ics
 share/kde/apps/libical/zoneinfo/Atlantic/Canary.ics
 share/kde/apps/libical/zoneinfo/Atlantic/Cape_Verde.ics
-share/kde/apps/libical/zoneinfo/Atlantic/Faeroe.ics
+share/kde/apps/libical/zoneinfo/Atlantic/Faroe.ics
 share/kde/apps/libical/zoneinfo/Atlantic/Jan_Mayen.ics
 share/kde/apps/libical/zoneinfo/Atlantic/Madeira.ics
 share/kde/apps/libical/zoneinfo/Atlantic/Reykjavik.ics
@@ -1551,7 +1504,9 @@ share/kde/apps/libical/zoneinfo/Atlantic/Stanley.ics
 share/kde/apps/libical/zoneinfo/Australia/Adelaide.ics
 share/kde/apps/libical/zoneinfo/Australia/Brisbane.ics
 share/kde/apps/libical/zoneinfo/Australia/Broken_Hill.ics
+share/kde/apps/libical/zoneinfo/Australia/Currie.ics
 share/kde/apps/libical/zoneinfo/Australia/Darwin.ics
+share/kde/apps/libical/zoneinfo/Australia/Eucla.ics
 share/kde/apps/libical/zoneinfo/Australia/Hobart.ics
 share/kde/apps/libical/zoneinfo/Australia/Lindeman.ics
 share/kde/apps/libical/zoneinfo/Australia/Lord_Howe.ics
@@ -1561,7 +1516,6 @@ share/kde/apps/libical/zoneinfo/Australia/Sydney.ics
 share/kde/apps/libical/zoneinfo/Europe/Amsterdam.ics
 share/kde/apps/libical/zoneinfo/Europe/Andorra.ics
 share/kde/apps/libical/zoneinfo/Europe/Athens.ics
-share/kde/apps/libical/zoneinfo/Europe/Belfast.ics
 share/kde/apps/libical/zoneinfo/Europe/Belgrade.ics
 share/kde/apps/libical/zoneinfo/Europe/Berlin.ics
 share/kde/apps/libical/zoneinfo/Europe/Bratislava.ics
@@ -1572,8 +1526,11 @@ share/kde/apps/libical/zoneinfo/Europe/Chisinau.ics
 share/kde/apps/libical/zoneinfo/Europe/Copenhagen.ics
 share/kde/apps/libical/zoneinfo/Europe/Dublin.ics
 share/kde/apps/libical/zoneinfo/Europe/Gibraltar.ics
+share/kde/apps/libical/zoneinfo/Europe/Guernsey.ics
 share/kde/apps/libical/zoneinfo/Europe/Helsinki.ics
+share/kde/apps/libical/zoneinfo/Europe/Isle_of_Man.ics
 share/kde/apps/libical/zoneinfo/Europe/Istanbul.ics
+share/kde/apps/libical/zoneinfo/Europe/Jersey.ics
 share/kde/apps/libical/zoneinfo/Europe/Kaliningrad.ics
 share/kde/apps/libical/zoneinfo/Europe/Kiev.ics
 share/kde/apps/libical/zoneinfo/Europe/Lisbon.ics
@@ -1582,12 +1539,14 @@ share/kde/apps/libical/zoneinfo/Europe/London.ics
 share/kde/apps/libical/zoneinfo/Europe/Luxembourg.ics
 share/kde/apps/libical/zoneinfo/Europe/Madrid.ics
 share/kde/apps/libical/zoneinfo/Europe/Malta.ics
+share/kde/apps/libical/zoneinfo/Europe/Mariehamn.ics
 share/kde/apps/libical/zoneinfo/Europe/Minsk.ics
 share/kde/apps/libical/zoneinfo/Europe/Monaco.ics
 share/kde/apps/libical/zoneinfo/Europe/Moscow.ics
 share/kde/apps/libical/zoneinfo/Europe/Nicosia.ics
 share/kde/apps/libical/zoneinfo/Europe/Oslo.ics
 share/kde/apps/libical/zoneinfo/Europe/Paris.ics
+share/kde/apps/libical/zoneinfo/Europe/Podgorica.ics
 share/kde/apps/libical/zoneinfo/Europe/Prague.ics
 share/kde/apps/libical/zoneinfo/Europe/Riga.ics
 share/kde/apps/libical/zoneinfo/Europe/Rome.ics
@@ -1605,6 +1564,7 @@ share/kde/apps/libical/zoneinfo/Europe/Vaduz.ics
 share/kde/apps/libical/zoneinfo/Europe/Vatican.ics
 share/kde/apps/libical/zoneinfo/Europe/Vienna.ics
 share/kde/apps/libical/zoneinfo/Europe/Vilnius.ics
+share/kde/apps/libical/zoneinfo/Europe/Volgograd.ics
 share/kde/apps/libical/zoneinfo/Europe/Warsaw.ics
 share/kde/apps/libical/zoneinfo/Europe/Zagreb.ics
 share/kde/apps/libical/zoneinfo/Europe/Zaporozhye.ics
@@ -1658,7 +1618,6 @@ share/kde/apps/libical/zoneinfo/Pacific/Tongatapu.ics
 share/kde/apps/libical/zoneinfo/Pacific/Truk.ics
 share/kde/apps/libical/zoneinfo/Pacific/Wake.ics
 share/kde/apps/libical/zoneinfo/Pacific/Wallis.ics
-share/kde/apps/libical/zoneinfo/Pacific/Yap.ics
 share/kde/apps/libical/zoneinfo/zones.tab
 share/kde/apps/libkdepim/about/bar-bottom-left.png
 share/kde/apps/libkdepim/about/bar-bottom-middle.png
@@ -1724,19 +1683,15 @@ share/kde/apps/libkholidays/holiday_ru
 share/kde/apps/libkholidays/holiday_se
 share/kde/apps/libkholidays/holiday_si
 share/kde/apps/libkholidays/holiday_th
+share/kde/apps/libkholidays/holiday_ua
 share/kde/apps/libkholidays/holiday_us
 share/kde/apps/libkholidays/holiday_uy
+share/kde/apps/libkholidays/holiday_za
 share/kde/apps/libkleopatra/pics/chiasmus_chi.png
 share/kde/apps/libkleopatra/pics/key.png
 share/kde/apps/libkleopatra/pics/key_bad.png
 share/kde/apps/libkleopatra/pics/key_ok.png
 share/kde/apps/libkleopatra/pics/key_unknown.png
-share/kde/apps/multisynk/icons/crystalsvg/16x16/actions/hotsync.png
-share/kde/apps/multisynk/icons/crystalsvg/22x22/actions/hotsync.png
-share/kde/apps/multisynk/icons/crystalsvg/32x32/actions/hotsync.png
-share/kde/apps/multisynk/icons/crystalsvg/48x48/actions/hotsync.png
-share/kde/apps/multisynk/multisynk_part.rc
-share/kde/apps/multisynk/multisynkui.rc
 share/kde/autostart/kalarm.tray.desktop
 share/kde/autostart/kalarmd.autostart.desktop
 share/kde/autostart/korgac.desktop
@@ -1821,14 +1776,6 @@ share/kde/services/kded/networkstatus.desktop
 share/kde/services/kfile_ics.desktop
 share/kde/services/kfile_palm.desktop
 share/kde/services/kfile_vcf.desktop
-share/kde/services/kitchensync/backup.desktop
-share/kde/services/kitchensync/debugger.desktop
-share/kde/services/kitchensync/filter/addressbookfilter.desktop
-share/kde/services/kitchensync/filter/calendarfilter.desktop
-share/kde/services/kitchensync/plucker.desktop
-share/kde/services/kitchensync/restore.desktop
-share/kde/services/kitchensync/syncerpart.desktop
-share/kde/services/kitchensync/viewer.desktop
 share/kde/services/kleopatra_config_appear.desktop
 share/kde/services/kleopatra_config_dirserv.desktop
 share/kde/services/kleopatra_config_dnorder.desktop
@@ -1857,7 +1804,6 @@ share/kde/services/kontact/knodeplugin.desktop
 share/kde/services/kontact/knotesplugin.desktop
 share/kde/services/kontact/korganizerplugin.desktop
 share/kde/services/kontact/kpilotplugin.desktop
-share/kde/services/kontact/multisynk.desktop
 share/kde/services/kontact/newstickerplugin.desktop
 share/kde/services/kontact/specialdatesplugin.desktop
 share/kde/services/kontact/summaryplugin.desktop
@@ -1912,18 +1858,11 @@ share/kde/services/kresources/knotes/knotes_xmlrpc.desktop
 share/kde/services/kresources/knotes/kolabresource.desktop
 share/kde/services/kresources/knotes/local.desktop
 share/kde/services/kresources/knotes_manager.desktop
-share/kde/services/kresources/konnector/kabckonnector.desktop
-share/kde/services/kresources/konnector/kcalkonnector.desktop
-share/kde/services/kresources/konnector/localkonnector.desktop
-share/kde/services/kresources/konnector/qtopia.desktop
-share/kde/services/kresources/konnector/remotekonnector.desktop
-share/kde/services/kresources/konnector_manager.desktop
 share/kde/services/ldifvcardthumbnail.desktop
 share/kde/services/mal_conduit.desktop
 share/kde/services/mbox.protocol
 share/kde/services/memofile-conduit.desktop
 share/kde/services/notepad-conduit.desktop
-share/kde/services/overview.desktop
 share/kde/services/popmail-conduit.desktop
 ${HAVE_SASL}share/kde/services/sieve.protocol
 share/kde/services/sysinfo_conduit.desktop
@@ -1938,28 +1877,22 @@ share/kde/servicetypes/dcopaddressbook.desktop
 share/kde/servicetypes/dcopcalendar.desktop
 share/kde/servicetypes/dcopimap.desktop
 share/kde/servicetypes/dcopmail.desktop
-share/kde/servicetypes/filter.desktop
 share/kde/servicetypes/kaddressbook_contacteditorwidget.desktop
 share/kde/servicetypes/kaddressbook_extension.desktop
 share/kde/servicetypes/kaddressbook_view.desktop
 share/kde/servicetypes/kaddressbook_xxport.desktop
 share/kde/servicetypes/kaddressbookimprotocol.desktop
-share/kde/servicetypes/kitchensync.desktop
-share/kde/servicetypes/konnector.desktop
 share/kde/servicetypes/kontactplugin.desktop
 share/kde/servicetypes/korganizerpart.desktop
 share/kde/servicetypes/korgprintplugin.desktop
 share/kde/servicetypes/kpilotconduit.desktop
 @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 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/filter
-@dirrm share/kde/services/kitchensync
 @comment in kde: @dirrm share/kde/services/kded
 @comment in kde: @dirrm share/kde/services/kaddressbook
 @comment in kde: @dirrm share/kde/services
@@ -1967,17 +1900,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @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/multisynk/icons/crystalsvg/48x48/actions
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/48x48
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/32x32/actions
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/32x32
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/22x22
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/multisynk/icons/crystalsvg/16x16
-@dirrm share/kde/apps/multisynk/icons/crystalsvg
-@dirrm share/kde/apps/multisynk/icons
-@dirrm share/kde/apps/multisynk
 @dirrm share/kde/apps/libkleopatra/pics
 @dirrm share/kde/apps/libkleopatra
 @dirrm share/kde/apps/libkholidays
@@ -1994,6 +1916,7 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/libical/zoneinfo/America/North_Dakota
 @dirrm share/kde/apps/libical/zoneinfo/America/Kentucky
 @dirrm share/kde/apps/libical/zoneinfo/America/Indiana
+@dirrm share/kde/apps/libical/zoneinfo/America/Argentina
 @dirrm share/kde/apps/libical/zoneinfo/America
 @dirrm share/kde/apps/libical/zoneinfo/Africa
 @dirrm share/kde/apps/libical/zoneinfo
@@ -2008,7 +1931,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @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/pics
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/64x64/actions
@@ -2089,7 +2011,24 @@ share/kde/servicetypes/kpilotconduit.desktop
 @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/icons/crystalsvg/64x64/apps
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/64x64
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/48x48/apps
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/48x48/actions
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/48x48
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/32x32/apps
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/32x32
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/16x16/apps
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/128x128/apps
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg/128x128
+@dirrm share/kde/apps/kitchensync/icons/crystalsvg
+@dirrm share/kde/apps/kitchensync/icons
+@dirrm share/kde/apps/kitchensync/about
 @dirrm share/kde/apps/kitchensync
 @dirrm share/kde/apps/kgantt/icons/crystalsvg/32x32/actions
 @dirrm share/kde/apps/kgantt/icons/crystalsvg/32x32
@@ -2165,7 +2104,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @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
 @dirrm share/doc/kde/HTML/en/kpilot
@@ -2198,9 +2136,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libemailfunctions/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libemailfunctions/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libemailfunctions
-@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/kpilot/lib/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib
@@ -2296,7 +2231,6 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm include/kmail/interfaces
 @dirrm include/kmail
 @dirrm include/kleo
-@dirrm include/kitchensync
 @dirrm include/kgantt
 @dirrm include/kdepim
 @dirrm include/kaddressbook
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index dbb50151a4f..6cb61660be6 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.53 2007/03/23 23:03:02 abs Exp $
+$NetBSD: distinfo,v 1.54 2007/05/23 13:24:59 markd Exp $
 
-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 (kdepim-3.5.7.tar.bz2) = 25401568625f6a616542802c7018c49420609a8b
+RMD160 (kdepim-3.5.7.tar.bz2) = 14c05d4620abf1eb5421ad434dc63f037069e930
+Size (kdepim-3.5.7.tar.bz2) = 14166061 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
-SHA1 (patch-ac) = 3f29a28a022e7e691f3cd1f5d2cee37c6407323c
-SHA1 (patch-ad) = cca7ee6fc88170e0277883532a6a607ec4e5efa0
-SHA1 (patch-ae) = 74a9321776c2b8dc9c76571e1d22b83355ec3d25
-SHA1 (patch-af) = c5affd94a24f6e1498ec865792cdfe19442f73e9
-SHA1 (patch-ag) = a42e45e3fb237963e06b1d2b2a29cadcebef7fc3
 SHA1 (patch-ai) = 401c9b7dcb49fd7ee3c03e400e52edc421649692
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
 SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a
 SHA1 (patch-am) = 29066a35ac983764a8cfa9392b9d67df581b35d3
 SHA1 (patch-an) = cb4cacc1e8ad1f3c5e4103149243829047ce94fe
 SHA1 (patch-ao) = f3760617e77fe74d80733613a18905971ee4c5f9
+SHA1 (patch-ap) = 2038ab56c26e624da338f678df84e55316cae57b
+SHA1 (patch-aq) = 4688c2c47e0ac3891bd97c9757863ccd1d12c156
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
deleted file mode 100644
index 4e7f552e7a3..00000000000
--- a/misc/kdepim3/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2007/01/26 03:17:09 markd Exp $
-
-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);
- }
- 
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
deleted file mode 100644
index f542c16832f..00000000000
--- a/misc/kdepim3/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2007/01/26 03:17:09 markd Exp $
-
---- 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 f7d5c55f4bc..00000000000
--- a/misc/kdepim3/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2007/02/03 01:52:55 markd Exp $
-
-kde svn 627548 and 627641.
-
---- kmail/kmfolder.cpp.orig	2007-01-16 00:28:47.000000000 +1300
-+++ kmail/kmfolder.cpp
-@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage
- 
- int KMFolder::find( const KMMsgBase* msg ) const
- {
--  return mStorage->find( msg );
-+  return mStorage ? mStorage->find( msg ) : 0;
- }
- 
- int KMFolder::find( const KMMessage* msg ) const
- {
--  return mStorage->find( msg );
-+  return mStorage ? mStorage->find( msg ) : 0;
- }
- 
- int KMFolder::count( bool cache ) const
-@@ -631,11 +631,13 @@ void KMFolder::setUserWhoField( const QS
-         mWhoField = "From";
-       if ( this == kmkernel->outboxFolder() ||
-            this == kmkernel->sentFolder() ||
--           this == kmkernel->draftsFolder() )
-+           this == kmkernel->draftsFolder() ||
-+           this == kmkernel->templatesFolder() )
-         mWhoField = "To";
--    } else if ( identity.drafts() == idString()
--                || identity.fcc() == idString() )
--      // drafts or sent of the identity
-+    } else if ( identity.drafts() == idString() ||
-+                identity.templates() == idString() ||
-+                identity.fcc() == idString() )
-+      // drafts, templates or sent of the identity
-       mWhoField = "To";
-     else
-       mWhoField = "From";
diff --git a/misc/kdepim3/patches/patch-af b/misc/kdepim3/patches/patch-af
deleted file mode 100644
index 19b01530fa1..00000000000
--- a/misc/kdepim3/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.7 2007/03/23 23:03:02 abs Exp $
-# From http://websvn.kde.org/?view=rev&revision=633614
-
---- kpilot/lib/pilotAppInfo.h.orig	2007-01-15 11:29:07.000000000 +0000
-+++ kpilot/lib/pilotAppInfo.h
-@@ -136,8 +136,15 @@ protected:
- * (again, from pilot-link).
- */
- template <typename appinfo,
-+#if PILOT_LINK_IS(0,12,2)
-+	/* There are additional consts introduced in 0.12.2 */
-+	int(*unpack)(appinfo *, const unsigned char *, PI_SIZE_T),
-+	int(*pack)(const appinfo *, unsigned char *, PI_SIZE_T)
-+#else
- 	int(*unpack)(appinfo *, unsigned char *, PI_SIZE_T),
--	int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)>
-+	int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)
-+#endif
-+	>
- class PilotAppInfo : public PilotAppInfoBase
- {
- public:
diff --git a/misc/kdepim3/patches/patch-ag b/misc/kdepim3/patches/patch-ag
deleted file mode 100644
index a35b59e8fa1..00000000000
--- a/misc/kdepim3/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2007/03/23 23:03:02 abs Exp $
-# From http://websvn.kde.org/?view=rev&revision=633614
-
---- kpilot/lib/pilotMemo.h.orig	2007-01-15 11:29:07.000000000 +0000
-+++ kpilot/lib/pilotMemo.h
-@@ -98,6 +98,6 @@ private:
- 	QString fText;
- };
- 
--typedef PilotAppInfo<MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
-+typedef PilotAppInfo<struct MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
- 
- #endif
diff --git a/misc/kdepim3/patches/patch-ap b/misc/kdepim3/patches/patch-ap
new file mode 100644
index 00000000000..99aeff9f0b2
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ap
@@ -0,0 +1,86 @@
+$NetBSD: patch-ap,v 1.5 2007/05/23 13:25:00 markd Exp $
+
+from tzdata2007f
+
+--- libkcal/libical/zoneinfo/Pacific/Auckland.ics.orig	2007-05-14 19:54:50.000000000 +1200
++++ libkcal/libical/zoneinfo/Pacific/Auckland.ics
+@@ -4,21 +4,21 @@ VERSION:2.0
+ BEGIN:VTIMEZONE
+ TZID:/kde.org/Olson_20070327_1/Pacific/Auckland
+ X-LIC-LOCATION:Pacific/Auckland
+-BEGIN:STANDARD
+-TZOFFSETFROM:+1300
+-TZOFFSETTO:+1200
+-TZNAME:NZST
+-DTSTART:19900318T030000
+-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
+-END:STANDARD
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1200
+ TZOFFSETTO:+1300
+ TZNAME:NZDT
+-DTSTART:19901007T020000
+-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++DTSTART:20070930T020000
++RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+ END:DAYLIGHT
+ BEGIN:STANDARD
++TZOFFSETFROM:+1300
++TZOFFSETTO:+1200
++TZNAME:NZST
++DTSTART:20080406T030000
++RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
++END:STANDARD
++BEGIN:STANDARD
+ TZOFFSETFROM:+113904
+ TZOFFSETTO:+1130
+ TZNAME:NZMT
+@@ -104,6 +104,23 @@ RDATE:19861026T020000
+ RDATE:19871025T020000
+ RDATE:19881030T020000
+ RDATE:19891008T020000
++RDATE:19901007T020000
++RDATE:19911006T020000
++RDATE:19921004T020000
++RDATE:19931003T020000
++RDATE:19941002T020000
++RDATE:19951001T020000
++RDATE:19961006T020000
++RDATE:19971005T020000
++RDATE:19981004T020000
++RDATE:19991003T020000
++RDATE:20001001T020000
++RDATE:20011007T020000
++RDATE:20021006T020000
++RDATE:20031005T020000
++RDATE:20041003T020000
++RDATE:20051002T020000
++RDATE:20061001T020000
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1300
+@@ -125,6 +142,24 @@ RDATE:19860302T030000
+ RDATE:19870301T030000
+ RDATE:19880306T030000
+ RDATE:19890305T030000
++RDATE:19900318T030000
++RDATE:19910317T030000
++RDATE:19920315T030000
++RDATE:19930321T030000
++RDATE:19940320T030000
++RDATE:19950319T030000
++RDATE:19960317T030000
++RDATE:19970316T030000
++RDATE:19980315T030000
++RDATE:19990321T030000
++RDATE:20000319T030000
++RDATE:20010318T030000
++RDATE:20020317T030000
++RDATE:20030316T030000
++RDATE:20040321T030000
++RDATE:20050320T030000
++RDATE:20060319T030000
++RDATE:20070318T030000
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR
diff --git a/misc/kdepim3/patches/patch-aq b/misc/kdepim3/patches/patch-aq
new file mode 100644
index 00000000000..e4c43d87add
--- /dev/null
+++ b/misc/kdepim3/patches/patch-aq
@@ -0,0 +1,86 @@
+$NetBSD: patch-aq,v 1.3 2007/05/23 13:25:01 markd Exp $
+
+from tzdata2007f
+
+--- libkcal/libical/zoneinfo/Pacific/Chatham.ics.orig	2007-05-14 19:54:50.000000000 +1200
++++ libkcal/libical/zoneinfo/Pacific/Chatham.ics
+@@ -4,21 +4,21 @@ VERSION:2.0
+ BEGIN:VTIMEZONE
+ TZID:/kde.org/Olson_20070327_1/Pacific/Chatham
+ X-LIC-LOCATION:Pacific/Chatham
+-BEGIN:STANDARD
+-TZOFFSETFROM:+1345
+-TZOFFSETTO:+1245
+-TZNAME:CHAST
+-DTSTART:19900318T034500
+-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
+-END:STANDARD
+ BEGIN:DAYLIGHT
+ TZOFFSETFROM:+1245
+ TZOFFSETTO:+1345
+ TZNAME:CHADT
+-DTSTART:19901007T024500
+-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
++DTSTART:20070930T024500
++RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+ END:DAYLIGHT
+ BEGIN:STANDARD
++TZOFFSETFROM:+1345
++TZOFFSETTO:+1245
++TZNAME:CHAST
++DTSTART:20080406T034500
++RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
++END:STANDARD
++BEGIN:STANDARD
+ TZOFFSETFROM:+121348
+ TZOFFSETTO:+1245
+ TZNAME:CHAST
+@@ -46,6 +46,23 @@ RDATE:19861026T024500
+ RDATE:19871025T024500
+ RDATE:19881030T024500
+ RDATE:19891008T024500
++RDATE:19901007T024500
++RDATE:19911006T024500
++RDATE:19921004T024500
++RDATE:19931003T024500
++RDATE:19941002T024500
++RDATE:19951001T024500
++RDATE:19961006T024500
++RDATE:19971005T024500
++RDATE:19981004T024500
++RDATE:19991003T024500
++RDATE:20001001T024500
++RDATE:20011007T024500
++RDATE:20021006T024500
++RDATE:20031005T024500
++RDATE:20041003T024500
++RDATE:20051002T024500
++RDATE:20061001T024500
+ END:DAYLIGHT
+ BEGIN:STANDARD
+ TZOFFSETFROM:+1345
+@@ -67,6 +84,24 @@ RDATE:19860302T034500
+ RDATE:19870301T034500
+ RDATE:19880306T034500
+ RDATE:19890305T034500
++RDATE:19900318T034500
++RDATE:19910317T034500
++RDATE:19920315T034500
++RDATE:19930321T034500
++RDATE:19940320T034500
++RDATE:19950319T034500
++RDATE:19960317T034500
++RDATE:19970316T034500
++RDATE:19980315T034500
++RDATE:19990321T034500
++RDATE:20000319T034500
++RDATE:20010318T034500
++RDATE:20020317T034500
++RDATE:20030316T034500
++RDATE:20040321T034500
++RDATE:20050320T034500
++RDATE:20060319T034500
++RDATE:20070318T034500
+ END:STANDARD
+ END:VTIMEZONE
+ END:VCALENDAR