Update to KDE 3.4

Highlights at a glance

* Text-to-speech system with support built into Konqueror, Kate, KPDF
  and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
  PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
  GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
  integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
  on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
  CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
  third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
  websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
  disable ones that are not used. This does not include Netscape-style
  plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
  plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
  documentation added or changed

11 files changed, 499 insertions, 193 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 3b7e429fe7c..59b664a1c96 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2004/12/23 12:54:29 markd Exp $
+# $NetBSD: Makefile,v 1.39 2005/03/23 22:07:07 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
@@ -24,15 +23,18 @@ REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.3b1-misc.pl \
 		kmail/kmail-pgpidentity.pl \
 		kmail/kmail-upd-identities.pl \
+		kmail/kmail-3.4-misc.pl \
 		kmail/upgrade-signature.pl \
 		kmail/upgrade-transport.pl \
-		libkdenetwork/kpgp-3.1-upgrade-address-data.pl
+		libkdenetwork/kpgp-3.1-upgrade-address-data.pl \
+		libkpgp/kpgp-3.1-upgrade-address-data.pl
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 BUILDLINK_DEPMETHOD.qt3-tools=	full
 
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../security/cyrus-sasl2/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 a2b8fbd78cb..64b8e195274 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.16 2004/12/10 06:17:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/03/23 22:07:07 markd Exp $
+bin/akregator
 bin/egroupwarewizard
+bin/exchangewizard
 bin/groupwarewizard
+bin/groupwisewizard
 bin/ical2vcal
 bin/kabc2mutt
 bin/kaddressbook
@@ -19,6 +22,7 @@ bin/kmail_sav.sh
 bin/kmailcvt
 bin/knode
 bin/knotes
+bin/kode
 bin/kolabwizard
 bin/konsolekalendar
 bin/kontact
@@ -32,6 +36,9 @@ bin/kpilotDaemon
 bin/ksync
 bin/ktnef
 bin/kwatchgnupg
+bin/kxml_compiler
+bin/multisynk
+bin/networkstatustestservice
 bin/sloxwizard
 include/KNotesAppIface.h
 include/KNotesIface.h
@@ -64,6 +71,7 @@ include/kaddressbook/extensionwidget.h
 include/kaddressbook/xxport.h
 include/kdepim/exchangeaccount.h
 include/kdepim/exchangeclient.h
+include/kdepimmacros.h
 include/kgantt/KGantt.h
 include/kgantt/KGanttBarConfig.h
 include/kgantt/KGanttItem.h
@@ -73,11 +81,38 @@ include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
 include/kitchensync/actionpart.h
-include/kitchensync/konnectorview.h
-include/kitchensync/mainwindow.h
-include/kitchensync/partbar.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
@@ -125,17 +160,22 @@ include/kontact/plugin.h
 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/pilotDatabase.h
 include/kpilot/pilotLocalDatabase.h
 include/kpilot/pilotRecord.h
 include/kpilot/pilotSerialDatabase.h
 include/kpilot/plugin.h
+include/kpilot/recordConduit.h
 include/kpilot/syncAction.h
 include/kpilot/uiDialog.h
-include/ksharedfile.h
 include/ksieve/error.h
 include/ksieve/lexer.h
 include/ksieve/parser.h
@@ -147,6 +187,7 @@ include/ktnef/ktnefparser.h
 include/ktnef/ktnefproperty.h
 include/ktnef/ktnefpropertyset.h
 include/ktnef/ktnefwriter.h
+include/libemailfunctions/idmapper.h
 include/libkcal/alarm.h
 include/libkcal/attachment.h
 include/libkcal/attendee.h
@@ -157,7 +198,6 @@ include/libkcal/calendarresources.h
 include/libkcal/calfilter.h
 include/libkcal/calformat.h
 include/libkcal/calstorage.h
-include/libkcal/compat.h
 include/libkcal/customproperties.h
 include/libkcal/dndfactory.h
 include/libkcal/duration.h
@@ -166,6 +206,7 @@ include/libkcal/exceptions.h
 include/libkcal/filestorage.h
 include/libkcal/freebusy.h
 include/libkcal/htmlexport.h
+include/libkcal/htmlexportsettings.h
 include/libkcal/icaldrag.h
 include/libkcal/icalformat.h
 include/libkcal/incidence.h
@@ -173,6 +214,7 @@ include/libkcal/incidencebase.h
 include/libkcal/incidenceformatter.h
 include/libkcal/journal.h
 include/libkcal/kcalversion.h
+include/libkcal/libkcal_export.h
 include/libkcal/listbase.h
 include/libkcal/period.h
 include/libkcal/person.h
@@ -218,7 +260,6 @@ include/mimelib/nntp.h
 include/mimelib/param.h
 include/mimelib/pop.h
 include/mimelib/protocol.h
-include/mimelib/smtp.h
 include/mimelib/string.h
 include/mimelib/text.h
 include/mimelib/token.h
@@ -226,23 +267,34 @@ include/mimelib/utility.h
 include/mimelib/uuencode.h
 include/qgpgme/dataprovider.h
 include/qgpgme/eventloopinteractor.h
+lib/kconf_update_bin/korn-3-4-config_change
 lib/kde3/conduit_address.la
 lib/kde3/conduit_doc.la
 lib/kde3/conduit_knotes.la
 lib/kde3/conduit_mal.la
+lib/kde3/conduit_memofile.la
+lib/kde3/conduit_notepad.la
 lib/kde3/conduit_popmail.la
 lib/kde3/conduit_sysinfo.la
 lib/kde3/conduit_time.la
 lib/kde3/conduit_todo.la
 lib/kde3/conduit_vcal.la
-lib/kde3/kabc_imap.la
+lib/kde3/kabc_groupdav.la
+lib/kde3/kabc_groupwise.la
+lib/kde3/kabc_kolab.la
+lib/kde3/kabc_newexchange.la
 lib/kde3/kabc_slox.la
 lib/kde3/kabc_xmlrpc.la
-lib/kde3/kcal_imap.la
+lib/kde3/kcal_blogging.la
+lib/kde3/kcal_groupdav.la
+lib/kde3/kcal_groupwise.la
 lib/kde3/kcal_kabc.la
+lib/kde3/kcal_kolab.la
 lib/kde3/kcal_local.la
 lib/kde3/kcal_localdir.la
+lib/kde3/kcal_newexchange.la
 lib/kde3/kcal_remote.la
+lib/kde3/kcal_resourcefeatureplan.la
 lib/kde3/kcal_slox.la
 lib/kde3/kcal_xmlrpc.la
 lib/kde3/kcm_kabconfig.la
@@ -259,15 +311,23 @@ lib/kde3/kcm_kontactsummary.la
 lib/kde3/kcm_korganizer.la
 lib/kde3/kcm_korgsummary.la
 lib/kde3/kcm_kpilot.la
+lib/kde3/kcm_sdsummary.la
+lib/kde3/kded_networkstatus.la
+lib/kde3/kfile_ics.la
 lib/kde3/kfile_palm.la
 lib/kde3/kfile_vcf.la
-lib/kde3/kio_newimap4.la
+lib/kde3/kio_groupwise.la
+lib/kde3/kio_imap4.la
+lib/kde3/kio_mbox.la
 lib/kde3/kio_sieve.la
-lib/kde3/knotes_imap.la
+lib/kde3/knotes_kolab.la
 lib/kde3/knotes_local.la
 lib/kde3/knotes_xmlrpc.la
 lib/kde3/ldifvcardthumbnail.la
+lib/kde3/libakregatorpart.la
 lib/kde3/libegroupwarewizard.la
+lib/kde3/libexchangewizard.la
+lib/kde3/libgroupwisewizard.la
 lib/kde3/libkaddrbk_bookmark_xxport.la
 lib/kde3/libkaddrbk_cardview.la
 lib/kde3/libkaddrbk_cryptosettings.la
@@ -275,7 +335,6 @@ lib/kde3/libkaddrbk_csv_xxport.la
 lib/kde3/libkaddrbk_distributionlist.la
 lib/kde3/libkaddrbk_eudora_xxport.la
 lib/kde3/libkaddrbk_iconview.la
-lib/kde3/libkaddrbk_instantmessaging.la
 lib/kde3/libkaddrbk_kde2_xxport.la
 lib/kde3/libkaddrbk_ldif_xxport.la
 lib/kde3/libkaddrbk_opera_xxport.la
@@ -284,73 +343,92 @@ lib/kde3/libkaddrbk_resourceselection.la
 lib/kde3/libkaddrbk_tableview.la
 lib/kde3/libkaddrbk_vcard_xxport.la
 lib/kde3/libkaddressbookpart.la
-lib/kde3/libkded_ksharedfile.la
 lib/kde3/libkitchensyncpart.la
 lib/kde3/libkmail_bodypartformatter_application_octetstream.la
 lib/kde3/libkmail_bodypartformatter_text_calendar.la
 lib/kde3/libkmail_bodypartformatter_text_vcard.la
+lib/kde3/libkmail_bodypartformatter_text_xdiff.la
 lib/kde3/libkmailpart.la
 lib/kde3/libknodepart.la
 lib/kde3/libkolabwizard.la
+lib/kde3/libkontact_akregator.la
+lib/kde3/libkontact_journalplugin.la
 lib/kde3/libkontact_kaddressbookplugin.la
 lib/kde3/libkontact_kmailplugin.la
 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
 lib/kde3/libkontact_todoplugin.la
 lib/kde3/libkontact_weatherplugin.la
 lib/kde3/libkorg_datenums.la
 lib/kde3/libkorg_exchange.la
 lib/kde3/libkorg_hebrew.la
-lib/kde3/libkorg_holidays.la
-lib/kde3/libkorg_projectview.la
-lib/kde3/libkorg_webexport.la
+lib/kde3/libkorg_journalprint.la
 lib/kde3/libkorganizerpart.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
 lib/kde3/resourcecalendarexchange.la
-lib/libdummykonnector.la
+lib/libakregatorprivate.la
 lib/libgpgme++.la
-lib/libkabc_imap.la
+lib/libkabc_groupdav.la
+lib/libkabc_groupwise.la
+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/libkalarmd.la
 lib/libkcal.la
-lib/libkcal_imap.la
+lib/libkcal_blogging.la
+lib/libkcal_groupdav.la
+lib/libkcal_groupwise.la
+lib/libkcal_newexchange.la
+lib/libkcal_resourcefeatureplan.la
 lib/libkcal_resourceremote.la
 lib/libkcal_slox.la
 lib/libkcal_xmlrpc.la
+lib/libkcalkolab.la
 lib/libkcalkonnector.la
-lib/libkdenetwork.la
 lib/libkdepim.la
 lib/libkgantt.la
+lib/libkgroupwarebase.la
+lib/libkgroupwaredav.la
+lib/libkholidays.la
 lib/libkitchensyncui.la
 lib/libkleopatra.la
 lib/libkmailprivate.la
+lib/libkmime.la
 lib/libknodecommon.la
-lib/libknotes_imap.la
 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
 lib/libkorganizer_calendar.la
 lib/libkorganizer_eventviewer.la
+lib/libkpgp.la
 lib/libkpilot.la
 lib/libkpimexchange.la
 lib/libkpimidentities.la
 lib/libkpinterfaces.la
-lib/libksharedfile.la
 lib/libksieve.la
 lib/libkslox.la
 lib/libksync.la
@@ -358,6 +436,7 @@ lib/libksync2.la
 lib/libktnef.la
 lib/liblocalkonnector.la
 lib/libmimelib.la
+lib/libmultisynk.la
 lib/libqgpgme.la
 lib/libqtopiakonnector.la
 lib/libremotekonnector.la
@@ -378,9 +457,15 @@ 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/common
+share/doc/kde/HTML/en/akregator/index.cache.bz2
+share/doc/kde/HTML/en/akregator/index.docbook
+share/doc/kde/HTML/en/kaddressbook/addhost.png
 share/doc/kde/HTML/en/kaddressbook/common
 share/doc/kde/HTML/en/kaddressbook/conf.png
 share/doc/kde/HTML/en/kaddressbook/contactdlg.png
+share/doc/kde/HTML/en/kaddressbook/edit_instant_messenging.png
 share/doc/kde/HTML/en/kaddressbook/exportdlg.png
 share/doc/kde/HTML/en/kaddressbook/extension.png
 share/doc/kde/HTML/en/kaddressbook/filtereditdlg.png
@@ -388,6 +473,7 @@ share/doc/kde/HTML/en/kaddressbook/index.cache.bz2
 share/doc/kde/HTML/en/kaddressbook/index.docbook
 share/doc/kde/HTML/en/kaddressbook/mainwin.png
 share/doc/kde/HTML/en/kaddressbook/resourcedlg.png
+share/doc/kde/HTML/en/kaddressbook/resourcesdlg.png
 share/doc/kde/HTML/en/kaddressbook/vieweditdlg.png
 share/doc/kde/HTML/en/kalarm/alarmmessage.png
 share/doc/kde/HTML/en/kalarm/common
@@ -409,9 +495,6 @@ share/doc/kde/HTML/en/karm/index.cache.bz2
 share/doc/kde/HTML/en/karm/index.docbook
 share/doc/kde/HTML/en/karm/karm.png
 share/doc/kde/HTML/en/karm/systray.png
-share/doc/kde/HTML/en/kcontrol/kalarmd/common
-share/doc/kde/HTML/en/kcontrol/kalarmd/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kalarmd/index.docbook
 share/doc/kde/HTML/en/kdepim-apidocs/common
 share/doc/kde/HTML/en/kleopatra/common
 share/doc/kde/HTML/en/kleopatra/index.cache.bz2
@@ -480,6 +563,7 @@ share/doc/kde/HTML/en/kontact/common
 share/doc/kde/HTML/en/kontact/configuration-components.png
 share/doc/kde/HTML/en/kontact/configuration-main.png
 share/doc/kde/HTML/en/kontact/configuration-select-components.png
+share/doc/kde/HTML/en/kontact/configuration-starting-component.png
 share/doc/kde/HTML/en/kontact/configuration-summary-view-kpilot.png
 share/doc/kde/HTML/en/kontact/configuration-summary-view.png
 share/doc/kde/HTML/en/kontact/index.cache.bz2
@@ -496,7 +580,9 @@ share/doc/kde/HTML/en/kontact/summary-view-calendar.png
 share/doc/kde/HTML/en/kontact/summary-view-contacts.png
 share/doc/kde/HTML/en/kontact/summary-view-kpilot.png
 share/doc/kde/HTML/en/kontact/summary-view-mail.png
+share/doc/kde/HTML/en/kontact/summary-view-newsticker.png
 share/doc/kde/HTML/en/kontact/summary-view-notes.png
+share/doc/kde/HTML/en/kontact/summary-view-repositioning.png
 share/doc/kde/HTML/en/kontact/summary-view-todos.png
 share/doc/kde/HTML/en/kontact/summary-view-weather.png
 share/doc/kde/HTML/en/kontact/summary-view.png
@@ -558,6 +644,7 @@ share/doc/kde/HTML/en/korganizer/o2v_progress.png
 share/doc/kde/HTML/en/korganizer/o2v_save.png
 share/doc/kde/HTML/en/korganizer/o2v_warning.png
 share/doc/kde/HTML/en/korganizer/outlook-to-vcalendar.docbook
+share/doc/kde/HTML/en/korganizer/plugins-chapter.docbook
 share/doc/kde/HTML/en/korn/common
 share/doc/kde/HTML/en/korn/index.cache.bz2
 share/doc/kde/HTML/en/korn/index.docbook
@@ -602,11 +689,35 @@ 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/kde/applnk/.hidden/kalarmd.desktop
 share/kde/applnk/Applications/kalarm.desktop
+share/kde/applnk/Internet/akregator.desktop
 share/kde/applnk/Utilities/kandy.desktop
 share/kde/applnk/Utilities/karm.desktop
 share/kde/applnk/Utilities/kmailcvt.desktop
+share/kde/apps/akregator/about/akregator.css
+share/kde/apps/akregator/about/main.html
+share/kde/apps/akregator/about/top-right-akregator.png
+share/kde/apps/akregator/akregator_part.rc
+share/kde/apps/akregator/akregator_shell.rc
+share/kde/apps/akregator/articleviewer.rc
+share/kde/apps/akregator/eventsrc
+share/kde/apps/akregator/pageviewer.rc
+share/kde/apps/akregator/pics/akregator_flag.png
 share/kde/apps/kaddressbook/bookmark_xxportui.rc
 share/kde/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
 share/kde/apps/kaddressbook/csv-templates/kaddressbook.desktop
@@ -618,13 +729,14 @@ share/kde/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/aim_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/gadu_protocol.png
+share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/groupwise_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/icq_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/irc_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/jabber_protocol.png
+share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/meanwhile_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/msn_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/sms_protocol.png
 share/kde/apps/kaddressbook/icons/crystalsvg/16x16/apps/yahoo_protocol.png
-share/kde/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
 share/kde/apps/kaddressbook/icons/crystalsvg/32x32/actions/homepage.png
 share/kde/apps/kaddressbook/icons/locolor/16x16/actions/contact.png
 share/kde/apps/kaddressbook/icons/locolor/16x16/actions/down.png
@@ -685,15 +797,22 @@ share/kde/apps/kconf_update/kmail-3.3-move-identities.pl
 share/kde/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
 share/kde/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
 share/kde/apps/kconf_update/kmail-3.3b1-misc.pl
+share/kde/apps/kconf_update/kmail-3.4-misc.pl
 share/kde/apps/kconf_update/kmail-pgpidentity.pl
 share/kde/apps/kconf_update/kmail-upd-identities.pl
 share/kde/apps/kconf_update/kmail.upd
+share/kde/apps/kconf_update/korganizer.upd
+share/kde/apps/kconf_update/korn-3-4-config_change.upd
 share/kde/apps/kconf_update/kpalmdoc.upd
 share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/kde/apps/kconf_update/kpgp.upd
 share/kde/apps/kconf_update/kpilot.upd
 share/kde/apps/kconf_update/upgrade-signature.pl
 share/kde/apps/kconf_update/upgrade-transport.pl
+share/kde/apps/kdepimwidgets/pics/addresseelineedit.png
+share/kde/apps/kdepimwidgets/pics/clicklineedit.png
+share/kde/apps/kdepimwidgets/pics/kdateedit.png
+share/kde/apps/kdepimwidgets/pics/ktimeedit.png
 share/kde/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelect.png
 share/kde/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelecttask.png
 share/kde/apps/kgantt/icons/crystalsvg/16x16/actions/ganttUnselecttask.png
@@ -704,18 +823,12 @@ 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/kleopatra/kleopatraui.rc
-share/kde/apps/kmail/about/background.png
-share/kde/apps/kmail/about/bgtable.png
-share/kde/apps/kmail/about/kdelogo2.png
-share/kde/apps/kmail/about/kmail.png
-share/kde/apps/kmail/about/konq.css
-share/kde/apps/kmail/about/lines.png
-share/kde/apps/kmail/about/lines2.png
+share/kde/apps/kmail/about/kmail.css
 share/kde/apps/kmail/about/main.html
-share/kde/apps/kmail/about/pointers.png
-share/kde/apps/kmail/about/shadow1.png
+share/kde/apps/kmail/about/top-right-kmail.png
 share/kde/apps/kmail/eventsrc
 share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mark_as_ham.png
 share/kde/apps/kmail/icons/crystalsvg/16x16/actions/mark_as_spam.png
@@ -749,9 +862,13 @@ share/kde/apps/kmail/pics/kmmsgpartiallyencrypted.png
 share/kde/apps/kmail/pics/kmmsgpartiallysigned.png
 share/kde/apps/kmail/pics/kmmsgqueued.png
 share/kde/apps/kmail/pics/kmmsgread.png
+share/kde/apps/kmail/pics/kmmsgread_fwd.png
+share/kde/apps/kmail/pics/kmmsgread_fwd_replied.png
+share/kde/apps/kmail/pics/kmmsgread_replied.png
 share/kde/apps/kmail/pics/kmmsgreplied.png
 share/kde/apps/kmail/pics/kmmsgsent.png
 share/kde/apps/kmail/pics/kmmsgspam.png
+share/kde/apps/kmail/pics/kmmsgtodo.png
 share/kde/apps/kmail/pics/kmmsgundefinedencrypted.png
 share/kde/apps/kmail/pics/kmmsgundefinedsigned.png
 share/kde/apps/kmail/pics/kmmsgunseen.png
@@ -760,6 +877,7 @@ share/kde/apps/kmail/pics/pgp-keys.png
 share/kde/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
 share/kde/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
 share/kde/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
+share/kde/apps/kmail/plugins/bodypartformatter/text_xdiff.desktop
 share/kde/apps/kmail/profile-default-rc
 share/kde/apps/kmail/profile-high-contrast-rc
 share/kde/apps/kmail/profile-html-rc
@@ -767,7 +885,6 @@ share/kde/apps/kmail/profile-purist-rc
 share/kde/apps/kmail/profile-secure-rc
 share/kde/apps/kmail/tips
 share/kde/apps/kmailcvt/pics/step1.png
-share/kde/apps/kmailcvt/pics/step2.png
 share/kde/apps/knode/filters/1.fltr
 share/kde/apps/knode/filters/2.fltr
 share/kde/apps/knode/filters/3.fltr
@@ -784,6 +901,7 @@ share/kde/apps/knode/icons/crystalsvg/32x32/actions/message_reply.png
 share/kde/apps/knode/kncomposerui.rc
 share/kde/apps/knode/knodeui.rc
 share/kde/apps/knode/knreaderui.rc
+share/kde/apps/knode/pics/article.png
 share/kde/apps/knode/pics/ctlart.png
 share/kde/apps/knode/pics/eyes.png
 share/kde/apps/knode/pics/greyball.png
@@ -799,8 +917,6 @@ share/kde/apps/knode/pics/mail.png
 share/kde/apps/knode/pics/newsubs.png
 share/kde/apps/knode/pics/pgp-keys.png
 share/kde/apps/knode/pics/posting.png
-share/kde/apps/knode/pics/server.png
-share/kde/apps/knode/pics/server_big.png
 share/kde/apps/knode/pics/snderr.png
 share/kde/apps/knode/pics/stat_cncl.png
 share/kde/apps/knode/pics/stat_edit.png
@@ -809,6 +925,7 @@ share/kde/apps/knode/pics/stat_sent.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/enum_list.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/format_decreaseindent.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/format_increaseindent.png
+share/kde/apps/knotes/icons/crystalsvg/16x16/actions/knotes_alarm.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/knotes_close.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/knotes_date.png
 share/kde/apps/knotes/icons/crystalsvg/16x16/actions/knotes_delete.png
@@ -817,68 +934,28 @@ 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
 share/kde/apps/kontact/kontact.setdlg
 share/kde/apps/kontact/kontactui.rc
-share/kde/apps/kontact/pics/splash.png
 share/kde/apps/kontactsummary/kontactsummary_part.rc
 share/kde/apps/korgac/icons/crystalsvg/22x22/actions/korgac.png
 share/kde/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
-share/kde/apps/korganizer/holiday_Suedtirol
-share/kde/apps/korganizer/holiday_at
-share/kde/apps/korganizer/holiday_au
-share/kde/apps/korganizer/holiday_bavarian
-share/kde/apps/korganizer/holiday_be
-share/kde/apps/korganizer/holiday_ca
-share/kde/apps/korganizer/holiday_catalan
-share/kde/apps/korganizer/holiday_ch
-share/kde/apps/korganizer/holiday_co
-share/kde/apps/korganizer/holiday_cz
-share/kde/apps/korganizer/holiday_de
-share/kde/apps/korganizer/holiday_dk
-share/kde/apps/korganizer/holiday_es
-share/kde/apps/korganizer/holiday_fi
-share/kde/apps/korganizer/holiday_fr
-share/kde/apps/korganizer/holiday_frswiss
-share/kde/apps/korganizer/holiday_gb
-share/kde/apps/korganizer/holiday_gt
-share/kde/apps/korganizer/holiday_hu
-share/kde/apps/korganizer/holiday_ie
-share/kde/apps/korganizer/holiday_il
-share/kde/apps/korganizer/holiday_is
-share/kde/apps/korganizer/holiday_it
-share/kde/apps/korganizer/holiday_ja
-share/kde/apps/korganizer/holiday_mx
-share/kde/apps/korganizer/holiday_nl
-share/kde/apps/korganizer/holiday_no
-share/kde/apps/korganizer/holiday_nz
-share/kde/apps/korganizer/holiday_pl
-share/kde/apps/korganizer/holiday_pt
-share/kde/apps/korganizer/holiday_py
-share/kde/apps/korganizer/holiday_quebec
-share/kde/apps/korganizer/holiday_ro
-share/kde/apps/korganizer/holiday_se
-share/kde/apps/korganizer/holiday_si
-share/kde/apps/korganizer/holiday_th
-share/kde/apps/korganizer/holiday_us
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/1downarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/1leftarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/1rightarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/1uparrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/2downarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/2leftarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/2rightarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/2uparrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/3downarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/3uparrow.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
@@ -891,21 +968,10 @@ share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/1downarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/1leftarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/1rightarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/1uparrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/2downarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/2leftarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/2rightarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/2uparrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/3downarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/3leftarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/3rightarrow.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/3uparrow.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
@@ -920,11 +986,11 @@ share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/timespan.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
@@ -933,14 +999,13 @@ share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
+share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/kde/apps/korganizer/korganizer_part.rc
 share/kde/apps/korganizer/korganizerui.rc
 share/kde/apps/korganizer/plugins/exchangeui.rc
-share/kde/apps/korganizer/plugins/projectviewui.rc
-share/kde/apps/korganizer/plugins/webexportui.rc
 share/kde/apps/korganizer/sounds/alert.wav
 share/kde/apps/korganizer/sounds/icemag.wav
 share/kde/apps/korganizer/sounds/lightmag.wav
@@ -975,15 +1040,15 @@ share/kde/apps/kpilot/icons/crystalsvg/48x48/actions/fullsync.png
 share/kde/apps/kpilot/icons/crystalsvg/48x48/actions/hotsync.png
 share/kde/apps/kpilot/icons/crystalsvg/48x48/actions/listsync.png
 share/kde/apps/kpilot/icons/crystalsvg/48x48/apps/kpalmdoc.png
-share/kde/apps/kpilot/kpilot-address.png
-share/kde/apps/kpilot/kpilot-bhotsync.png
-share/kde/apps/kpilot/kpilot-calendar.png
-share/kde/apps/kpilot/kpilot-db.png
-share/kde/apps/kpilot/kpilot-fileinstaller.png
-share/kde/apps/kpilot/kpilot-knotes.png
-share/kde/apps/kpilot/kpilot-splash.png
-share/kde/apps/kpilot/kpilot-todo.png
+share/kde/apps/kpilot/icons/kpilot-address.png
+share/kde/apps/kpilot/icons/kpilot-bhotsync.png
+share/kde/apps/kpilot/icons/kpilot-calendar.png
+share/kde/apps/kpilot/icons/kpilot-db.png
+share/kde/apps/kpilot/icons/kpilot-fileinstaller.png
+share/kde/apps/kpilot/icons/kpilot-knotes.png
+share/kde/apps/kpilot/icons/kpilot-todo.png
 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
@@ -995,16 +1060,85 @@ share/kde/apps/ktnef/ktnefui.rc
 share/kde/apps/kwatchgnupg/kwatchgnupgui.rc
 share/kde/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/kde/apps/kwatchgnupg/pics/kwatchgnupg2.png
+share/kde/apps/libkdepim/about/bar-bottom-left.png
+share/kde/apps/libkdepim/about/bar-bottom-middle.png
+share/kde/apps/libkdepim/about/bar-bottom-right.png
+share/kde/apps/libkdepim/about/bar-middle-left.png
+share/kde/apps/libkdepim/about/bar-middle-right.png
+share/kde/apps/libkdepim/about/bar-top-left.png
+share/kde/apps/libkdepim/about/bar-top-middle.png
+share/kde/apps/libkdepim/about/bar-top-right.png
+share/kde/apps/libkdepim/about/bottom-left.png
+share/kde/apps/libkdepim/about/bottom-middle.png
+share/kde/apps/libkdepim/about/bottom-right.png
+share/kde/apps/libkdepim/about/box-bottom-left.png
+share/kde/apps/libkdepim/about/box-bottom-middle.png
+share/kde/apps/libkdepim/about/box-bottom-right.png
+share/kde/apps/libkdepim/about/box-middle-left.png
+share/kde/apps/libkdepim/about/box-middle-right.png
+share/kde/apps/libkdepim/about/box-top-left.png
+share/kde/apps/libkdepim/about/box-top-middle.png
+share/kde/apps/libkdepim/about/box-top-right.png
+share/kde/apps/libkdepim/about/kde_infopage.css
+share/kde/apps/libkdepim/about/kde_infopage_rtl.css
+share/kde/apps/libkdepim/about/top-left.png
+share/kde/apps/libkdepim/about/top-middle.png
+share/kde/apps/libkholidays/holiday_Suedtirol
+share/kde/apps/libkholidays/holiday_at
+share/kde/apps/libkholidays/holiday_au
+share/kde/apps/libkholidays/holiday_bavarian
+share/kde/apps/libkholidays/holiday_be
+share/kde/apps/libkholidays/holiday_ca
+share/kde/apps/libkholidays/holiday_catalan
+share/kde/apps/libkholidays/holiday_ch
+share/kde/apps/libkholidays/holiday_co
+share/kde/apps/libkholidays/holiday_cz
+share/kde/apps/libkholidays/holiday_de
+share/kde/apps/libkholidays/holiday_dk
+share/kde/apps/libkholidays/holiday_es
+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_gt
+share/kde/apps/libkholidays/holiday_hu
+share/kde/apps/libkholidays/holiday_ie
+share/kde/apps/libkholidays/holiday_il
+share/kde/apps/libkholidays/holiday_is
+share/kde/apps/libkholidays/holiday_it
+share/kde/apps/libkholidays/holiday_ja
+share/kde/apps/libkholidays/holiday_mx
+share/kde/apps/libkholidays/holiday_nl
+share/kde/apps/libkholidays/holiday_no
+share/kde/apps/libkholidays/holiday_nz
+share/kde/apps/libkholidays/holiday_pl
+share/kde/apps/libkholidays/holiday_pt
+share/kde/apps/libkholidays/holiday_py
+share/kde/apps/libkholidays/holiday_quebec
+share/kde/apps/libkholidays/holiday_ro
+share/kde/apps/libkholidays/holiday_se
+share/kde/apps/libkholidays/holiday_si
+share/kde/apps/libkholidays/holiday_th
+share/kde/apps/libkholidays/holiday_us
 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
 share/kde/config.kcfg/abbrowserconduit.kcfg
+share/kde/config.kcfg/akregator.kcfg
+share/kde/config.kcfg/custommimeheader.kcfg
 share/kde/config.kcfg/docconduit.kcfg
 share/kde/config.kcfg/egroupware.kcfg
+share/kde/config.kcfg/groupwise.kcfg
 share/kde/config.kcfg/kandy.kcfg
 share/kde/config.kcfg/kmail.kcfg
 share/kde/config.kcfg/knoteconfig.kcfg
@@ -1017,7 +1151,10 @@ share/kde/config.kcfg/kpalmdoc.kcfg
 share/kde/config.kcfg/kpilot.kcfg
 share/kde/config.kcfg/kpilotlib.kcfg
 share/kde/config.kcfg/malconduit.kcfg
+share/kde/config.kcfg/memofileconduit.kcfg
+share/kde/config.kcfg/pimemoticons.kcfg
 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/timeconduit.kcfg
@@ -1025,6 +1162,7 @@ share/kde/config.kcfg/vcalconduitbase.kcfg
 share/kde/config/kmail.antispamrc
 share/kde/config/kmail.antivirusrc
 share/kde/config/libkleopatrarc
+share/kde/icons/crystalsvg/128x128/apps/akregator.png
 share/kde/icons/crystalsvg/128x128/apps/kaddressbook.png
 share/kde/icons/crystalsvg/128x128/apps/karm.png
 share/kde/icons/crystalsvg/128x128/apps/kmail.png
@@ -1036,12 +1174,15 @@ share/kde/icons/crystalsvg/128x128/apps/korganizer.png
 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/apps/akregator.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/kaddressbook.png
@@ -1059,24 +1200,39 @@ share/kde/icons/crystalsvg/16x16/apps/korn.png
 share/kde/icons/crystalsvg/16x16/apps/kpalmdoc.png
 share/kde/icons/crystalsvg/16x16/apps/kpilot.png
 share/kde/icons/crystalsvg/16x16/apps/kpilotDaemon.png
+share/kde/icons/crystalsvg/16x16/apps/multisynk.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/apps/akregator.png
 share/kde/icons/crystalsvg/22x22/apps/gpg.png
 share/kde/icons/crystalsvg/22x22/apps/gpgsm.png
 share/kde/icons/crystalsvg/22x22/apps/kmail.png
 share/kde/icons/crystalsvg/22x22/apps/kmaillight.png
 share/kde/icons/crystalsvg/22x22/apps/knotes.png
 share/kde/icons/crystalsvg/22x22/apps/konsolekalendar.png
+share/kde/icons/crystalsvg/22x22/apps/kontact.png
 share/kde/icons/crystalsvg/22x22/apps/kpalmdoc.png
 share/kde/icons/crystalsvg/22x22/apps/kpilot.png
 share/kde/icons/crystalsvg/22x22/apps/kpilotDaemon.png
+share/kde/icons/crystalsvg/22x22/apps/multisynk.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/apps/akregator.png
 share/kde/icons/crystalsvg/32x32/apps/gpg.png
 share/kde/icons/crystalsvg/32x32/apps/gpgsm.png
 share/kde/icons/crystalsvg/32x32/apps/kaddressbook.png
@@ -1095,14 +1251,17 @@ share/kde/icons/crystalsvg/32x32/apps/korn.png
 share/kde/icons/crystalsvg/32x32/apps/kpalmdoc.png
 share/kde/icons/crystalsvg/32x32/apps/kpilot.png
 share/kde/icons/crystalsvg/32x32/apps/kpilotDaemon.png
+share/kde/icons/crystalsvg/32x32/apps/multisynk.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/apps/akregator.png
 share/kde/icons/crystalsvg/48x48/apps/kaddressbook.png
 share/kde/icons/crystalsvg/48x48/apps/kalarm.png
 share/kde/icons/crystalsvg/48x48/apps/karm.png
@@ -1118,14 +1277,17 @@ share/kde/icons/crystalsvg/48x48/apps/korn.png
 share/kde/icons/crystalsvg/48x48/apps/kpalmdoc.png
 share/kde/icons/crystalsvg/48x48/apps/kpilot.png
 share/kde/icons/crystalsvg/48x48/apps/kpilotDaemon.png
+share/kde/icons/crystalsvg/48x48/apps/multisynk.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/apps/akregator.png
 share/kde/icons/crystalsvg/64x64/apps/kaddressbook.png
 share/kde/icons/crystalsvg/64x64/apps/karm.png
 share/kde/icons/crystalsvg/64x64/apps/kmail.png
@@ -1134,15 +1296,21 @@ share/kde/icons/crystalsvg/64x64/apps/knode2.png
 share/kde/icons/crystalsvg/64x64/apps/knotes.png
 share/kde/icons/crystalsvg/64x64/apps/kontact.png
 share/kde/icons/crystalsvg/64x64/apps/korganizer.png
+share/kde/icons/crystalsvg/scalable/apps/akregator.svgz
+share/kde/icons/crystalsvg/scalable/apps/kmail.svgz
 share/kde/icons/hicolor/48x48/apps/ktnef.png
 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/mimelnk/kdedevice/cellphone.desktop
-share/kde/mimelnk/kdedevice/pda.desktop
 share/kde/services/abbrowser_conduit.desktop
+share/kde/services/akregator_part.desktop
 share/kde/services/doc_conduit.desktop
+share/kde/services/feed.protocol
+share/kde/services/groupwise.protocol
+share/kde/services/groupwises.protocol
+share/kde/services/imap4.protocol
+share/kde/services/imaps.protocol
 share/kde/services/kabconfig.desktop
 share/kde/services/kabcustomfields.desktop
 share/kde/services/kabldapconfig.desktop
@@ -1155,13 +1323,14 @@ share/kde/services/kaddressbook/distributionlist.desktop
 share/kde/services/kaddressbook/eudora_xxport.desktop
 share/kde/services/kaddressbook/gaduprotocol.desktop
 share/kde/services/kaddressbook/gnokii_xxport.desktop
+share/kde/services/kaddressbook/groupwiseprotocol.desktop
 share/kde/services/kaddressbook/iconview.desktop
 share/kde/services/kaddressbook/icqprotocol.desktop
-share/kde/services/kaddressbook/imaddresseditor.desktop
 share/kde/services/kaddressbook/ircprotocol.desktop
 share/kde/services/kaddressbook/jabberprotocol.desktop
 share/kde/services/kaddressbook/kde2_xxport.desktop
 share/kde/services/kaddressbook/ldif_xxport.desktop
+share/kde/services/kaddressbook/meanwhileprotocol.desktop
 share/kde/services/kaddressbook/msnprotocol.desktop
 share/kde/services/kaddressbook/opera_xxport.desktop
 share/kde/services/kaddressbook/pab_xxport.desktop
@@ -1175,22 +1344,25 @@ share/kde/services/kcmkmailsummary.desktop
 share/kde/services/kcmkontactknt.desktop
 share/kde/services/kcmkontactsummary.desktop
 share/kde/services/kcmkorgsummary.desktop
-share/kde/services/kded/ksharedfile.desktop
+share/kde/services/kcmsdsummary.desktop
+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/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
+share/kde/services/kmail_config_accounts.desktop
 share/kde/services/kmail_config_appearance.desktop
 share/kde/services/kmail_config_composer.desktop
 share/kde/services/kmail_config_identity.desktop
 share/kde/services/kmail_config_misc.desktop
-share/kde/services/kmail_config_network.desktop
 share/kde/services/kmail_config_security.desktop
 share/kde/services/knewsservice.protocol
 share/kde/services/knode_config_accounts.desktop
@@ -1201,13 +1373,18 @@ share/kde/services/knode_config_post_news.desktop
 share/kde/services/knode_config_privacy.desktop
 share/kde/services/knode_config_read_news.desktop
 share/kde/services/knotes-conduit.desktop
+share/kde/services/kontact/akregatorplugin.desktop
+share/kde/services/kontact/akregatorplugin3.2.desktop
+share/kde/services/kontact/journalplugin.desktop
 share/kde/services/kontact/kaddressbookplugin.desktop
 share/kde/services/kontact/kmailplugin.desktop
 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
 share/kde/services/kontact/todoplugin.desktop
 share/kde/services/kontact/weatherplugin.desktop
@@ -1216,41 +1393,59 @@ share/kde/services/korganizer/datenums.desktop
 share/kde/services/korganizer/exchange.desktop
 share/kde/services/korganizer/hebrew.desktop
 share/kde/services/korganizer/holidays.desktop
-share/kde/services/korganizer/projectview.desktop
+share/kde/services/korganizer/journalprint.desktop
 share/kde/services/korganizer/webexport.desktop
 share/kde/services/korganizer_configcolors.desktop
+share/kde/services/korganizer_configdesignerfields.desktop
 share/kde/services/korganizer_configfonts.desktop
 share/kde/services/korganizer_configfreebusy.desktop
 share/kde/services/korganizer_configgroupautomation.desktop
 share/kde/services/korganizer_configgroupscheduling.desktop
 share/kde/services/korganizer_configmain.desktop
+share/kde/services/korganizer_configplugins.desktop
 share/kde/services/korganizer_configtime.desktop
 share/kde/services/korganizer_configviews.desktop
 share/kde/services/kpilot_config.desktop
 share/kde/services/kresources/kabc/imap.desktop
+share/kde/services/kresources/kabc/kabc_groupdav.desktop
+share/kde/services/kresources/kabc/kabc_groupwise.desktop
+share/kde/services/kresources/kabc/kabc_newexchange.desktop
+share/kde/services/kresources/kabc/kabc_opengroupware.desktop
 share/kde/services/kresources/kabc/kabc_slox.desktop
 share/kde/services/kresources/kabc/kabc_xmlrpc.desktop
+share/kde/services/kresources/kabc/kolab.desktop
+share/kde/services/kresources/kcal/blogging.desktop
 share/kde/services/kresources/kcal/exchange.desktop
 share/kde/services/kresources/kcal/imap.desktop
 share/kde/services/kresources/kcal/kabc.desktop
+share/kde/services/kresources/kcal/kcal_groupdav.desktop
+share/kde/services/kresources/kcal/kcal_groupwise.desktop
+share/kde/services/kresources/kcal/kcal_newexchange.desktop
+share/kde/services/kresources/kcal/kcal_opengroupware.desktop
+share/kde/services/kresources/kcal/kcal_resourcefeatureplan.desktop
 share/kde/services/kresources/kcal/kcal_slox.desktop
 share/kde/services/kresources/kcal/kcal_xmlrpc.desktop
+share/kde/services/kresources/kcal/kolab.desktop
 share/kde/services/kresources/kcal/local.desktop
 share/kde/services/kresources/kcal/localdir.desktop
 share/kde/services/kresources/kcal/remote.desktop
+share/kde/services/kresources/kcal_manager.desktop
 share/kde/services/kresources/knotes/imap.desktop
 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/konnector/dummykonnector.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/newimap4.protocol
-share/kde/services/newimaps.protocol
+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
 share/kde/services/sieve.protocol
@@ -1265,6 +1460,7 @@ 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
@@ -1274,6 +1470,7 @@ 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
@@ -1287,11 +1484,11 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment in kde: @dirrm share/kde/services/kded
 @comment in kde: @dirrm share/kde/services/kaddressbook
 @comment in kde: @dirrm share/kde/services
-@comment in kde: @dirrm share/kde/mimelnk/kdedevice
 @comment in kde: @dirrm share/kde/mimelnk/application
 @comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
 @comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
 @comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions
 @comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
@@ -1306,8 +1503,22 @@ 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
+@dirrm share/kde/apps/libkdepim/about
+@dirrm share/kde/apps/libkdepim
 @dirrm share/kde/apps/kwatchgnupg/pics
 @dirrm share/kde/apps/kwatchgnupg
 @dirrm share/kde/apps/ktnef/icons/locolor/16x16/actions
@@ -1320,6 +1531,7 @@ share/kde/servicetypes/kpilotconduit.desktop
 @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/48x48/apps
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48/actions
 @dirrm share/kde/apps/kpilot/icons/crystalsvg/48x48
@@ -1353,8 +1565,9 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/korgac/icons
 @dirrm share/kde/apps/korgac
 @dirrm share/kde/apps/kontactsummary
-@dirrm share/kde/apps/kontact/pics
+@dirrm share/kde/apps/kontact/about
 @dirrm share/kde/apps/kontact
+@comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
 @dirrm share/kde/apps/knotes/icons/crystalsvg/16x16/actions
 @dirrm share/kde/apps/knotes/icons/crystalsvg/16x16
 @dirrm share/kde/apps/knotes/icons/crystalsvg
@@ -1400,6 +1613,8 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kgantt/icons/crystalsvg
 @dirrm share/kde/apps/kgantt/icons
 @dirrm share/kde/apps/kgantt
+@dirrm share/kde/apps/kdepimwidgets/pics
+@dirrm share/kde/apps/kdepimwidgets
 @comment in kde: @dirrm share/kde/apps/kconf_update
 @dirrm share/kde/apps/karm/pics
 @dirrm share/kde/apps/karm
@@ -1428,10 +1643,15 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kaddressbook/csv-templates
 @dirrm share/kde/apps/kaddressbook/contacteditorpages
 @comment in kde: @dirrm share/kde/apps/kaddressbook
+@dirrm share/kde/apps/akregator/pics
+@dirrm share/kde/apps/akregator/about
+@dirrm share/kde/apps/akregator
 @comment in kde: @dirrm share/kde/apps
 @comment in kde: @dirrm share/kde/applnk/Utilities
+@comment in kde: @dirrm share/kde/applnk/Internet
 @comment in kde: @dirrm share/kde/applnk/Applications
 @comment in kde: @dirrm share/kde/applnk/.hidden
+@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
@@ -1443,20 +1663,24 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/doc/kde/HTML/en/knode
 @dirrm share/doc/kde/HTML/en/kmail
 @dirrm share/doc/kde/HTML/en/kleopatra
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpgp/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpgp/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpgp
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkmime/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkmime/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkmime
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkholidays/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkholidays/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkholidays
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdepim
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdenetwork/qgpgme
@@ -1466,67 +1690,93 @@ share/kde/servicetypes/kpilotconduit.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkcal/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkcal/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkcal
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/knotes
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkdepim
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/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/kalarmd/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarmd/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarmd
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/kpilot/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/kpilot/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/kpilot
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kpilot
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/knotes
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kmail
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kitchensync
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kioslaves
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kgantt
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kfile-plugins
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/karm/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/karm/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/karm
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kandy
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/kalarmd/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/kalarmd/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/kalarmd
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kalarm
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook/html
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/libkpimexchange
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kmail
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/korgac
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/korganizer
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
-@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kontact
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc/kabc2mutt
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/kabc
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/certmanager
 @dirrm share/doc/kde/HTML/en/kdepim-apidocs
-@dirrm share/doc/kde/HTML/en/kcontrol/kalarmd
 @comment in kde: @dirrm share/doc/kde/HTML/en/kcontrol
 @dirrm share/doc/kde/HTML/en/karm
 @dirrm share/doc/kde/HTML/en/kandy
 @dirrm share/doc/kde/HTML/en/kalarm
 @dirrm share/doc/kde/HTML/en/kaddressbook
+@dirrm share/doc/kde/HTML/en/akregator
 @comment in kde: @dirrm share/doc/kde/HTML/en
 @comment in kde: @dirrm share/applications/kde
+@comment in kde: @dirrm lib/kde3/plugins/designer
 @comment in kde: @dirrm lib/kde3
+@comment in kde: @dirrm lib/kconf_update_bin
 @dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal
+@dirrm include/libemailfunctions
 @dirrm include/ktnef
 @dirrm include/ksieve
 @dirrm include/kpilot
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 9312b9eeea6..45804d2aff2 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:12:59 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 22:07:07 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	kdepim
 
 .if !empty(KDEPIM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdepim+=	kdepim>=3.2.2
-BUILDLINK_RECOMMENDED.kdepim+=	kdepim>=3.3.0nb1
+BUILDLINK_RECOMMENDED.kdepim+=	kdepim>=3.4.0
 BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3
 .endif	# KDEPIM_BUILDLINK3_MK
 
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index db8f406c3eb..f45ff2ac7f3 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.28 2005/02/24 11:02:53 agc Exp $
+$NetBSD: distinfo,v 1.29 2005/03/23 22:07:07 markd Exp $
 
-SHA1 (kdepim-3.3.2.tar.bz2) = 2d55115ef82280b208df7b501aecd2b3ea2e07be
-RMD160 (kdepim-3.3.2.tar.bz2) = 2f582c168cf15656fb93758e817504ae4da7ca92
-Size (kdepim-3.3.2.tar.bz2) = 9994033 bytes
+SHA1 (kdepim-3.4.0.tar.bz2) = a74877524c281bf7534d885dbc3bdb8d5bc82072
+RMD160 (kdepim-3.4.0.tar.bz2) = abc3794c45f12e29b3dc8ce3c4b570e980beb8c3
+Size (kdepim-3.4.0.tar.bz2) = 11441545 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
+SHA1 (patch-ac) = 04e40a64a131ba3505c2e1dd59792626e107a404
+SHA1 (patch-ad) = 1716e281cd2a54af8c8923881dfe0fd59e706a57
+SHA1 (patch-ae) = 44dbda64cacaabb74e1b46999b6b66e6e8ba80fa
 SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
 SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
 SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
-SHA1 (patch-bd) = 1d8b147e2fdf78132bfcb4b002bff7dd5c74bd99
+SHA1 (patch-bd) = 7b72ab4fe60f5a4b46b8a60def67ffe4c7befe9f
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
new file mode 100644
index 00000000000..1254c221b86
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2005/03/23 22:07:08 markd Exp $
+
+--- kresources/kolab/kabc/resourcekolab.cpp.orig	2005-02-04 12:12:14.000000000 +1300
++++ kresources/kolab/kabc/resourcekolab.cpp
+@@ -80,7 +80,7 @@ KABC::ResourceKolab::ResourceKolab( cons
+     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
+     mCachedSubresource( QString::null ), mLocked( false )
+ {
+-  setType( "kolab" );
++  setType( "imap" );
+ }
+ 
+ KABC::ResourceKolab::~ResourceKolab()
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
new file mode 100644
index 00000000000..7c64a175627
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2005/03/23 22:07:08 markd Exp $
+
+--- kresources/kolab/kcal/resourcekolab.cpp.orig	2005-02-04 12:12:14.000000000 +1300
++++ kresources/kolab/kcal/resourcekolab.cpp
+@@ -68,7 +68,7 @@ ResourceKolab::ResourceKolab( const KCon
+   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
+     mOpen( false )
+ {
+-  setType( "kolab" );
++  setType( "imap" );
+   connect( &mResourceChangedTimer, SIGNAL( timeout() ),
+            this, SLOT( slotEmitResourceChanged() ) );
+ }
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
new file mode 100644
index 00000000000..c65442aed68
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2005/03/23 22:07:08 markd Exp $
+
+--- kresources/kolab/knotes/resourcekolab.cpp.orig	2005-02-24 00:09:07.000000000 +1300
++++ kresources/kolab/knotes/resourcekolab.cpp
+@@ -52,7 +52,7 @@ static const char* inlineMimeType = "tex
+ ResourceKolab::ResourceKolab( const KConfig *config )
+   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" )
+ {
+-  setType( "kolab" );
++  setType( "imap" );
+ }
+ 
+ ResourceKolab::~ResourceKolab()
diff --git a/misc/kdepim3/patches/patch-bd b/misc/kdepim3/patches/patch-bd
index f2591b83517..78017afd83e 100644
--- a/misc/kdepim3/patches/patch-bd
+++ b/misc/kdepim3/patches/patch-bd
@@ -1,13 +1,13 @@
-$NetBSD: patch-bd,v 1.1 2004/11/08 23:53:20 shannonjr Exp $
+$NetBSD: patch-bd,v 1.2 2005/03/23 22:07:08 markd Exp $
 
---- configure.orig	2004-10-04 02:21:15.000000000 -0600
+--- configure.orig	2005-03-05 01:59:53.000000000 +1300
 +++ configure
-@@ -31936,7 +31936,7 @@ fi
+@@ -32683,7 +32683,7 @@ fi
  
  
  
--for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h
-+for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h rfuncs.h
+-for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h
++for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h rfuncs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 7dbddc57a0c..4bf6d65a1d1 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2005/02/16 21:00:22 seb Exp $
+# $NetBSD: Makefile,v 1.43 2005/03/23 22:02:35 markd Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
-PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index f182f0a0408..890ec712532 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/01/18 03:35:08 minskim Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/03/23 22:02:35 markd Exp $
 bin/ark
 bin/irkick
 bin/kcalc
@@ -43,6 +43,7 @@ lib/kde3/kcm_thinkpad.la
 lib/kde3/kded_klaptopdaemon.la
 lib/kde3/kded_kmilod.la
 lib/kde3/kedit.la
+lib/kde3/kmilo_asus.la
 lib/kde3/kmilo_generic.la
 lib/kde3/kmilo_thinkpad.la
 lib/kde3/ksim_cpu.la
@@ -53,12 +54,14 @@ lib/kde3/ksim_panelextension.la
 lib/kde3/ksim_sensors.la
 lib/kde3/libarkpart.la
 lib/kde3/libkbyteseditwidget.la
+lib/kde3/libkhexedit2part.la
 lib/kde3/libkregexpeditorgui.la
 lib/libkcmlaptop.la
 lib/libkdeinit_ark.la
 lib/libkdeinit_irkick.la
 lib/libkdeinit_kcalc.la
 lib/libkdeinit_kedit.la
+lib/libkhexeditcommon.la
 lib/libkmilo.la
 lib/libkregexpeditorcommon.la
 lib/libksimcore.la
@@ -78,6 +81,7 @@ share/applications/kde/kregexpeditor.desktop
 share/applications/kde/ksim.desktop
 share/applications/kde/ktimer.desktop
 share/applications/kde/kwalletconfig.desktop
+share/applications/kde/kwalletmanager-kwalletd.desktop
 share/applications/kde/kwalletmanager.desktop
 share/applications/kde/kwikdisk.desktop
 share/applications/kde/laptop.desktop
@@ -215,6 +219,7 @@ share/kde/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
 share/kde/apps/irkick/icons/hicolor/32x32/actions/ledred.png
 share/kde/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
 share/kde/apps/kcalc/kcalcui.rc
+share/kde/apps/kcharselect/kcharselectui.rc
 share/kde/apps/kconf_update/kcalcrc.upd
 share/kde/apps/kconf_update/kcharselect.upd
 share/kde/apps/kdf/kdfui.rc
@@ -247,6 +252,7 @@ share/kde/apps/khexedit/khexeditui.rc
 share/kde/apps/khexedit/pics/hexdrag.png
 share/kde/apps/khexedit/pics/hexmask.png
 share/kde/apps/khexedit/pics/hexwrite.png
+share/kde/apps/khexedit2part/khexedit2partui.rc
 share/kde/apps/kicker/applets/kcharselectapplet.desktop
 share/kde/apps/kicker/extensions/ksim.desktop
 share/kde/apps/kjots/kjotsui.rc
@@ -354,7 +360,6 @@ share/kde/icons/crystalsvg/16x16/apps/kfloppy.png
 share/kde/icons/crystalsvg/16x16/apps/kgpg.png
 share/kde/icons/crystalsvg/16x16/apps/khexedit.png
 share/kde/icons/crystalsvg/16x16/apps/kjots.png
-share/kde/icons/crystalsvg/16x16/apps/klaptopdaemon.png
 share/kde/icons/crystalsvg/16x16/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/16x16/apps/ksim.png
 share/kde/icons/crystalsvg/16x16/apps/ktimer.png
@@ -365,6 +370,7 @@ share/kde/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
 share/kde/icons/crystalsvg/16x16/devices/ksim_cpu.png
 share/kde/icons/crystalsvg/22x22/apps/kgpg.png
 share/kde/icons/crystalsvg/22x22/apps/kwalletmanager.png
+share/kde/icons/crystalsvg/22x22/apps/kwikdisk.png
 share/kde/icons/crystalsvg/32x32/apps/ark.png
 share/kde/icons/crystalsvg/32x32/apps/kcalc.png
 share/kde/icons/crystalsvg/32x32/apps/kcmdf.png
@@ -407,6 +413,9 @@ share/kde/icons/crystalsvg/64x64/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/64x64/apps/kwalletmanager.png
 share/kde/icons/crystalsvg/64x64/apps/kwikdisk.png
 share/kde/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/kde/icons/crystalsvg/scalable/apps/ark.svgz
+share/kde/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/kde/icons/crystalsvg/scalable/apps/laptop_battery.svgz
 share/kde/icons/hicolor/16x16/apps/irkick.png
 share/kde/icons/hicolor/22x22/apps/irkick.png
 share/kde/icons/hicolor/32x32/apps/irkick.png
@@ -416,6 +425,8 @@ share/kde/services/ark_part.desktop
 share/kde/services/kbyteseditwidget.desktop
 share/kde/services/kded/klaptopdaemon.desktop
 share/kde/services/kded/kmilod.desktop
+share/kde/services/khexedit2part.desktop
+share/kde/services/kmilo/kmilo_asus.desktop
 share/kde/services/kmilo/kmilo_generic.desktop
 share/kde/services/kmilo/kmilo_thinkpad.desktop
 share/kde/services/kregexpeditorgui.desktop
@@ -432,6 +443,7 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @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/crystalsvg/scalable/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
@@ -462,7 +474,6 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/kregexpeditor/pics
 @dirrm share/kde/apps/kregexpeditor
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
-@comment in kde: @dirrm share/kde/apps/konqueror
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
@@ -476,6 +487,7 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/kjots
 @comment in kde: @dirrm share/kde/apps/kicker/extensions
 @comment in kde: @dirrm share/kde/apps/kicker/applets
+@dirrm share/kde/apps/khexedit2part
 @dirrm share/kde/apps/khexedit/pics
 @dirrm share/kde/apps/khexedit
 @dirrm share/kde/apps/kgpg/pics
@@ -490,6 +502,7 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/kdf/pics
 @dirrm share/kde/apps/kdf
 @comment in kde: @dirrm share/kde/apps/kconf_update
+@dirrm share/kde/apps/kcharselect
 @dirrm share/kde/apps/kcalc
 @dirrm share/kde/apps/irkick/icons/hicolor/32x32/actions
 @dirrm share/kde/apps/irkick/icons/hicolor/32x32
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index db108dd8698..0a5ac405357 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2005/02/24 11:02:54 agc Exp $
+$NetBSD: distinfo,v 1.30 2005/03/23 22:02:35 markd Exp $
 
-SHA1 (kdeutils-3.3.2.tar.bz2) = 2dcadca3709e44a5480e0610072f22b1b1c372d4
-RMD160 (kdeutils-3.3.2.tar.bz2) = 88daf1b0c959733b183cb67ff0d6762c3ed28abd
-Size (kdeutils-3.3.2.tar.bz2) = 2211668 bytes
+SHA1 (kdeutils-3.4.0.tar.bz2) = 380aabb8fcc41e98f141a888e3263d7b570eca36
+RMD160 (kdeutils-3.4.0.tar.bz2) = df5d97f577671f5c6bb7f38b5c4fd0963c2e40ad
+Size (kdeutils-3.4.0.tar.bz2) = 2328791 bytes
 SHA1 (patch-ac) = c1d962b36bbc3ee3f63155c3d98aa9f92117ecf0
 SHA1 (patch-ad) = ad4fcdda6f9fc1b91e1f125421800e412e2ee0aa
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb