Update KDE to 3.1.

Many bugfixes and functionality enhancements including:

kdeaddons

 NEW IN KDE: Noatun plugin to search for lyrics of the current song.

kdeadmin

 kcmlinuz: is now a standalone application
 kcmlinuz: Added capability to search for configuration options


kdeedu

 NEW IN KDE: Kiten, a Japanese Reference Tool.
 NEW IN KDE: FlashKard, a vocabulary tool. Is able to read KVTML files which
 were written by KVocTrain.
 NEW IN KDE: started a libkdeedu, which allows interopability and code
 sharing between KDE Educational applications.


kdepim

 libkabc
   Plugin interface for resources and formats.
   Control module for configuring multiple resources.
   Optional directory resource which stores each entry as own file.
   LDAP resource.
   Optional binary storage format for better performance with large
   addressbooks.
   Completed support for vCard entities: sound, geo, key and some more.
   vCard 2.1 import.
   LDAP aware mail address input field.
 KAddressbook
   New card and icon views.
   Multiple configurable views.
   "kab-style" details view for selected entry.
   Customizable view filters.
   Customizable categories for addressbook entries.
   Support for transparently accessing multiple addressbooks.
   Redesigned entry editor widget.
   Printing option supporting two different styles.
   Optional embedded entry and ditribution list editor.
   "Jump bar" for quick alphabetical access of entries.
   Fetch addresses from LDAP servers, including support for multiple servers.
   Importing of vCard 2.1 files.
   Improved CSV import (including template for import from Outlook 2000).
   vCard export.
 KAlarm
   Added option to execute commands in alarms.
   Implemented daily, weekly, monthly and annual recurrences.
   Optionally play audio notification when an alarm triggers.
 KPilot
   Added time conduit
   VCal conduits (TODO and Calendar) have been improved to function properly.
   Addressbook conduit has been ported to use libkabc.
 KOrganizer
   General
     User definable templates for events and TODOs.
     Alarms for TODOs.
     Added support for automatic HTML export on save of a calendar file.
     Time table print view.
     New "location" attribute for events.
     Experimental "Get Hot New Stuff" button for downloading and uploading
     calendar files of common interest.
   Views
     Added new "Next 3 days" view.
     Added selection of time span for a new event in day and week views.
     Direct manipulation of priority, completion status and categories of
     TODOs by context menus added.
     Deletion of individual instances of recurring events.
     Rewritten month view.
     Coloring of events in month view based on categories.
     Coloring of due and overdue todos.
     Improved "What's Next" view.
     Configurable cell height in week and day views
   Group scheduling
     iMIP group scheduling functions for TODOs.
     Publishing of Free/Busy information by iMIP conformant email.
     Improved automatisation of group scheduling.
   Interopability and integration
     Support for "webcal" URLs in Konqueror (known from Apple iCal).
     Support for iCalendar based drag&drop.
     KOrganizer now shares the dialogs for categories with KAddressBook.
     Improved iCalendar conformance.
     Improved right-to-left languages support.
     Bug fixes for non-latin1 encodings.
   Plugins
     New plugin for importing Birthdays of contacts in the KDE address book.
     New plugin for accessing calendar data stored on an Exchange 2000 server.


kdeutils

 Partially ACPI support in KLaptop.

12 files changed, 343 insertions, 471 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 59013e86b95..312f50ea8ae 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/01/02 09:12:28 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/11 13:22:25 markd Exp $
 
-DISTNAME=	kdepim-3.0.5a
+DISTNAME=	kdepim-3.1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index ae972bb299e..89de6dd4740 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/20 10:03:54 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/03/11 13:22:25 markd Exp $
 bin/ical2vcal
-bin/kabcfrontend
+bin/kabc2mutt
+bin/kaddressbook
 bin/kalarm
-bin/kalarmautostart
 bin/kalarmd
 bin/kandy
 bin/kandy_client
@@ -14,9 +14,13 @@ bin/korganizer
 bin/korganizerIn
 bin/kpilot
 bin/kpilotDaemon
+bin/ksync
 include/KNotesIface.h
 include/calendar/calendardecoration.h
 include/calendar/plugin.h
+include/kdepim/exchangeaccount.h
+include/kdepim/exchangecalendar.h
+include/kdepim/exchangeclient.h
 include/kgantt/KGantt.h
 include/kgantt/KGanttBarConfig.h
 include/kgantt/KGanttItem.h
@@ -37,22 +41,28 @@ include/kpilot/pilotSerialDatabase.h
 include/kpilot/plugin.h
 include/kpilot/syncAction.h
 include/kpilot/uiDialog.h
-lib/kde3/libabbrowserconduit.la
-lib/kde3/libabbrowserconduit.so
-lib/kde3/libabbrowserconduit.so.0
-lib/kde3/libabbrowserconduit.so.0.0
+lib/kde3/kfile_vcf.la
+lib/kde3/kfile_vcf.so
+lib/kde3/libaddressconduit.la
+lib/kde3/libaddressconduit.so
+lib/kde3/libaddressconduit.so.0
+lib/kde3/libaddressconduit.so.0.0
 lib/kde3/libexpenseconduit.la
 lib/kde3/libexpenseconduit.so
 lib/kde3/libexpenseconduit.so.0
 lib/kde3/libexpenseconduit.so.0.0
-lib/kde3/libkcm_alarmdaemonctrl.la
-lib/kde3/libkcm_alarmdaemonctrl.so
+lib/kde3/libkaddressbookpart.la
+lib/kde3/libkaddressbookpart.so
 lib/kde3/libknotesconduit.la
 lib/kde3/libknotesconduit.so
 lib/kde3/libknotesconduit.so.0
 lib/kde3/libknotesconduit.so.0.0
+lib/kde3/libkorg_birthdays.la
+lib/kde3/libkorg_birthdays.so
 lib/kde3/libkorg_datenums.la
 lib/kde3/libkorg_datenums.so
+lib/kde3/libkorg_exchange.la
+lib/kde3/libkorg_exchange.so
 lib/kde3/libkorg_holidays.la
 lib/kde3/libkorg_holidays.so
 lib/kde3/libkorg_projectview.la
@@ -67,6 +77,10 @@ lib/kde3/libpopmailconduit.la
 lib/kde3/libpopmailconduit.so
 lib/kde3/libpopmailconduit.so.0
 lib/kde3/libpopmailconduit.so.0.0
+lib/kde3/libtimeconduit.la
+lib/kde3/libtimeconduit.so
+lib/kde3/libtimeconduit.so.0
+lib/kde3/libtimeconduit.so.0.0
 lib/kde3/libtodoconduit.la
 lib/kde3/libtodoconduit.so
 lib/kde3/libtodoconduit.so.0
@@ -83,10 +97,22 @@ lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.2
 lib/libkcal.so.2.0
+lib/libkcalsystem.la
+lib/libkcalsystem.so
+lib/libkcalsystem.so.0
+lib/libkcalsystem.so.0.1
+lib/libkdepim.la
+lib/libkdepim.so
+lib/libkdepim.so.1
+lib/libkdepim.so.1.0
 lib/libkgantt.la
 lib/libkgantt.so
 lib/libkgantt.so.0
 lib/libkgantt.so.0.2
+lib/libknewstuff.la
+lib/libknewstuff.so
+lib/libknewstuff.so.1
+lib/libknewstuff.so.1.0
 lib/libkorganizer.la
 lib/libkorganizer.so
 lib/libkorganizer.so.1
@@ -95,9 +121,20 @@ lib/libkpilot.la
 lib/libkpilot.so
 lib/libkpilot.so.0
 lib/libkpilot.so.0.0
+lib/libkpimexchange.la
+lib/libkpimexchange.so
+lib/libkpimexchange.so.1
+lib/libkpimexchange.so.1.0
+lib/libksync.la
+lib/libksync.so
+lib/libksync.so.1
+lib/libksync.so.1.0
 share/autostart/kalarm.tray.desktop
 share/autostart/kalarmd.autostart.desktop
 share/autostart/korgac.desktop
+share/doc/kde/HTML/en/kaddressbook/common
+share/doc/kde/HTML/en/kaddressbook/index.cache.bz2
+share/doc/kde/HTML/en/kaddressbook/index.docbook
 share/doc/kde/HTML/en/kalarm/alarmmessage.png
 share/doc/kde/HTML/en/kalarm/common
 share/doc/kde/HTML/en/kalarm/editwindow.png
@@ -111,6 +148,10 @@ share/doc/kde/HTML/en/karm/common
 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/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/knotes/common
 share/doc/kde/HTML/en/knotes/index.cache.bz2
 share/doc/kde/HTML/en/knotes/index.docbook
@@ -160,30 +201,55 @@ share/doc/kde/HTML/en/kpilot/setup-general.png
 share/doc/kde/HTML/en/kpilot/setup-sync.png
 share/doc/kde/HTML/en/kpilot/toolbar_backup.png
 share/doc/kde/HTML/en/kpilot/toolbar_hotsync.png
+share/kde/applnk/.hidden/kalarmd.desktop
 share/kde/applnk/Applications/kalarm.desktop
 share/kde/applnk/Applications/korganizer.desktop
-share/kde/applnk/Settings/System/alarmdaemonctrl.desktop
+share/kde/applnk/Utilities/More/kalarm.desktop
+share/kde/applnk/Utilities/More/kandy.desktop
+share/kde/applnk/Utilities/More/karm.desktop
+share/kde/applnk/Utilities/kaddressbook.desktop
 share/kde/applnk/Utilities/kandy.desktop
 share/kde/applnk/Utilities/karm.desktop
 share/kde/applnk/Utilities/knotes.desktop
 share/kde/applnk/Utilities/kpilot.desktop
 share/kde/applnk/Utilities/kpilotdaemon.desktop
-share/kde/apps/kalarm/icons/hicolor/16x16/actions/eventdelete.png
-share/kde/apps/kalarm/icons/hicolor/16x16/actions/eventnew.png
-share/kde/apps/kalarm/icons/hicolor/16x16/actions/kalarm.png
-share/kde/apps/kalarm/icons/hicolor/16x16/apps/kalarm.png
-share/kde/apps/kalarm/icons/hicolor/22x22/actions/kalarm.png
-share/kde/apps/kalarm/icons/hicolor/22x22/actions/kalarm_disabled.png
-share/kde/apps/kalarm/icons/hicolor/32x32/apps/kalarm.png
-share/kde/apps/kalarm/icons/hicolor/48x48/apps/kalarm.png
-share/kde/apps/kalarm/icons/locolor/16x16/apps/kalarm.png
-share/kde/apps/kalarm/icons/locolor/32x32/apps/kalarm.png
-share/kde/apps/kalarmdgui/icons/hicolor/22x22/actions/kalarmdgui.png
-share/kde/apps/kalarmdgui/icons/hicolor/22x22/actions/kalarmdgui_disabled.png
+share/kde/apps/kaddressbook/csv-templates/kaddressbook.desktop
+share/kde/apps/kaddressbook/csv-templates/outlook2000.desktop
+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/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
+share/kde/apps/kaddressbook/icons/locolor/16x16/actions/group.png
+share/kde/apps/kaddressbook/icons/locolor/16x16/actions/up.png
+share/kde/apps/kaddressbook/icons/locolor/22x22/actions/page.png
+share/kde/apps/kaddressbook/kaddressbook_part.rc
+share/kde/apps/kaddressbook/kaddressbookui.rc
+share/kde/apps/kaddressbook/printing/detailed-style.png
+share/kde/apps/kaddressbook/printing/mike-style.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/eventdelete.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/eventnew.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/file.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/kalarm.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/message.png
+share/kde/apps/kalarm/icons/crystalsvg/16x16/actions/playsound.png
+share/kde/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm.png
+share/kde/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm_disabled.png
+share/kde/apps/kalarmdgui/icons/crystalsvg/22x22/actions/kalarmdgui.png
+share/kde/apps/kalarmdgui/icons/crystalsvg/22x22/actions/kalarmdgui_disabled.png
 share/kde/apps/kandy/default.kandy
 share/kde/apps/kandy/kandymobileui.rc
 share/kde/apps/kandy/kandyui.rc
 share/kde/apps/karm/karmui.rc
+share/kde/apps/karm/pics/active-icon-0.xpm
+share/kde/apps/karm/pics/active-icon-1.xpm
+share/kde/apps/karm/pics/active-icon-2.xpm
+share/kde/apps/karm/pics/active-icon-3.xpm
+share/kde/apps/karm/pics/active-icon-4.xpm
+share/kde/apps/karm/pics/active-icon-5.xpm
+share/kde/apps/karm/pics/active-icon-6.xpm
+share/kde/apps/karm/pics/active-icon-7.xpm
 share/kde/apps/karm/pics/clock.xpm
 share/kde/apps/karm/pics/clockedit.xpm
 share/kde/apps/karm/pics/empty-watch.xpm
@@ -196,17 +262,18 @@ share/kde/apps/karm/pics/watch-4.xpm
 share/kde/apps/karm/pics/watch-5.xpm
 share/kde/apps/karm/pics/watch-6.xpm
 share/kde/apps/karm/pics/watch-7.xpm
-share/kde/apps/kgantt/icons/hicolor/16x16/actions/ganttSelect.png
-share/kde/apps/kgantt/icons/hicolor/16x16/actions/ganttSelecttask.png
-share/kde/apps/kgantt/icons/hicolor/16x16/actions/ganttUnselecttask.png
-share/kde/apps/kgantt/icons/hicolor/22x22/actions/ganttSelect.png
-share/kde/apps/kgantt/icons/hicolor/22x22/actions/ganttSelecttask.png
-share/kde/apps/kgantt/icons/hicolor/22x22/actions/ganttUnselecttask.png
-share/kde/apps/kgantt/icons/hicolor/32x32/actions/ganttSelect.png
-share/kde/apps/kgantt/icons/hicolor/32x32/actions/ganttSelecttask.png
-share/kde/apps/kgantt/icons/hicolor/32x32/actions/ganttUnselecttask.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
+share/kde/apps/kgantt/icons/crystalsvg/22x22/actions/ganttSelect.png
+share/kde/apps/kgantt/icons/crystalsvg/22x22/actions/ganttSelecttask.png
+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/knotes/knotesui.rc
 share/kde/apps/knotes/pics/knotesclose.png
+share/kde/apps/knotes/pics/knotesdate.png
 share/kde/apps/knotes/pics/knotesdelete.png
 share/kde/apps/knotes/pics/knoteslogo.png
 share/kde/apps/korganizer/holiday_at
@@ -243,76 +310,80 @@ 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/hicolor/16x16/actions/1day.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/1downarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/1leftarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/1rightarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/1uparrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/2downarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/2leftarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/2rightarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/2uparrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/3downarrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/3uparrow.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/5days.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/7days.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/appointment.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/bell.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/dayview.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/findf.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/groupevent.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/inverse_recur.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/list.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/mailappt.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/month.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/nomailappt.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/organizer.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/playsound.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/readonlyevent.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/recur.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/runprog.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/smallcal.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/smallclock.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/today.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/todo.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/webexport.png
-share/kde/apps/korganizer/icons/hicolor/16x16/actions/whatsnext.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/1day.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/3leftarrow.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/3rightarrow.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/5days.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/7days.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/agenda.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/appointment.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/checkedbox.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/checkedbox/mask.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/checkedclipboard.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/checkmark.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/delete.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/emptybox.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/emptybox/mask.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/list.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/month.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/newrecurevent.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/newtodo.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/search.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/send.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/timespan.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/today.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/todo.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/webexport.png
-share/kde/apps/korganizer/icons/hicolor/22x22/actions/whatsnext.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/1day.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/5days.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/7days.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/appointment.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/list.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/month.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/today.png
-share/kde/apps/korganizer/icons/hicolor/32x32/actions/todo.png
+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/findf.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.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
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
+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/today.png
+share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/todo.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/3leftarrow.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/3rightarrow.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
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
+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/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/today.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
+share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
+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/list.png
+share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
+share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/today.png
+share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/kde/apps/korganizer/korganizer_part.rc
 share/kde/apps/korganizer/korganizergsui.rc
 share/kde/apps/korganizer/korganizerui.rc
+share/kde/apps/korganizer/plugins/birthdaysui.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
@@ -321,52 +392,61 @@ share/kde/apps/korganizer/sounds/lightmag.wav
 share/kde/apps/korganizer/sounds/onscreen.wav
 share/kde/apps/korganizer/sounds/spinout.wav
 share/kde/apps/korganizer/tips
-share/kde/apps/kpilot/icons/hicolor/16x16/actions/backup.png
-share/kde/apps/kpilot/icons/hicolor/16x16/actions/busysync.png
-share/kde/apps/kpilot/icons/hicolor/16x16/actions/fastsync.png
-share/kde/apps/kpilot/icons/hicolor/16x16/actions/hotsync.png
-share/kde/apps/kpilot/icons/hicolor/16x16/actions/restore.png
+share/kde/apps/kpilot/icons/crystalsvg/16x16/actions/backup.png
+share/kde/apps/kpilot/icons/crystalsvg/16x16/actions/busysync.png
+share/kde/apps/kpilot/icons/crystalsvg/16x16/actions/fastsync.png
+share/kde/apps/kpilot/icons/crystalsvg/16x16/actions/hotsync.png
+share/kde/apps/kpilot/icons/crystalsvg/16x16/actions/restore.png
 share/kde/apps/kpilot/kpilot-address.png
 share/kde/apps/kpilot/kpilot-fileinstaller.png
 share/kde/apps/kpilot/kpilot-hotsync.png
 share/kde/apps/kpilot/kpilot-knotes.png
 share/kde/apps/kpilot/kpilot-splash.png
 share/kde/apps/kpilot/kpilotui.rc
+share/kde/apps/ksync/ksyncui.rc
 share/kde/config/knotesrc
-share/kde/icons/hicolor/16x16/actions/kalarm.png
-share/kde/icons/hicolor/16x16/apps/kalarm.png
-share/kde/icons/hicolor/16x16/apps/karm.png
-share/kde/icons/hicolor/16x16/apps/knotes.png
-share/kde/icons/hicolor/16x16/apps/korganizer.png
-share/kde/icons/hicolor/16x16/apps/kpilot.png
-share/kde/icons/hicolor/16x16/apps/kpilotDaemon.png
-share/kde/icons/hicolor/22x22/actions/kalarm.png
-share/kde/icons/hicolor/22x22/apps/kpilot.png
-share/kde/icons/hicolor/32x32/apps/kalarm.png
-share/kde/icons/hicolor/32x32/apps/karm.png
-share/kde/icons/hicolor/32x32/apps/knotes.png
-share/kde/icons/hicolor/32x32/apps/korganizer.png
-share/kde/icons/hicolor/32x32/apps/kpilot.png
-share/kde/icons/hicolor/48x48/apps/kalarm.png
-share/kde/icons/hicolor/48x48/apps/karm.png
-share/kde/icons/hicolor/48x48/apps/knotes.png
-share/kde/icons/hicolor/48x48/apps/korganizer.png
-share/kde/icons/hicolor/48x48/apps/kpilot.png
-share/kde/icons/hicolor/48x48/apps/kpilotDaemon.png
+share/kde/icons/crystalsvg/16x16/actions/kalarm.png
+share/kde/icons/crystalsvg/16x16/apps/kaddressbook.png
+share/kde/icons/crystalsvg/16x16/apps/kalarm.png
+share/kde/icons/crystalsvg/16x16/apps/karm.png
+share/kde/icons/crystalsvg/16x16/apps/knotes.png
+share/kde/icons/crystalsvg/16x16/apps/korganizer.png
+share/kde/icons/crystalsvg/16x16/apps/kpilot.png
+share/kde/icons/crystalsvg/16x16/apps/kpilotDaemon.png
+share/kde/icons/crystalsvg/22x22/actions/kalarm.png
+share/kde/icons/crystalsvg/22x22/apps/kpilot.png
+share/kde/icons/crystalsvg/32x32/apps/kaddressbook.png
+share/kde/icons/crystalsvg/32x32/apps/kalarm.png
+share/kde/icons/crystalsvg/32x32/apps/karm.png
+share/kde/icons/crystalsvg/32x32/apps/knotes.png
+share/kde/icons/crystalsvg/32x32/apps/korganizer.png
+share/kde/icons/crystalsvg/32x32/apps/kpilot.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
+share/kde/icons/crystalsvg/48x48/apps/knotes.png
+share/kde/icons/crystalsvg/48x48/apps/korganizer.png
+share/kde/icons/crystalsvg/48x48/apps/kpilot.png
+share/kde/icons/crystalsvg/48x48/apps/kpilotDaemon.png
 share/kde/icons/locolor/16x16/apps/kalarm.png
 share/kde/icons/locolor/16x16/apps/kpilot.png
 share/kde/icons/locolor/32x32/apps/kalarm.png
 share/kde/services/abbrowser_conduit.desktop
 share/kde/services/expense-conduit.desktop
+share/kde/services/kfile_vcf.desktop
 share/kde/services/knotes-conduit.desktop
+share/kde/services/korganizer/birthdays.desktop
 share/kde/services/korganizer/datenums.desktop
+share/kde/services/korganizer/exchange.desktop
 share/kde/services/korganizer/holidays.desktop
 share/kde/services/korganizer/projectview.desktop
 share/kde/services/korganizer/webexport.desktop
 share/kde/services/null-conduit.desktop
 share/kde/services/popmail-conduit.desktop
+share/kde/services/time_conduit.desktop
 share/kde/services/todo-conduit.desktop
 share/kde/services/vcal-conduit.desktop
+share/kde/services/webcal.protocol
 share/kde/servicetypes/calendardecoration.desktop
 share/kde/servicetypes/calendarplugin.desktop
 share/kde/servicetypes/korganizerpart.desktop
@@ -376,77 +456,140 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment dirrm share/kde/services
 @comment dirrm share/kde/icons/locolor/32x32/apps
 @comment dirrm share/kde/icons/locolor/16x16/apps
-@comment dirrm share/kde/icons/hicolor/48x48/apps
-@comment dirrm share/kde/icons/hicolor/32x32/apps
-@comment dirrm share/kde/icons/hicolor/22x22/apps
-@comment dirrm share/kde/icons/hicolor/22x22/actions
-@comment dirrm share/kde/icons/hicolor/16x16/apps
-@comment dirrm share/kde/icons/hicolor/16x16/actions
+@comment dirrm share/kde/icons/crystalsvg/48x48/apps
+@comment dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment dirrm share/kde/icons/crystalsvg/22x22/apps
+@comment dirrm share/kde/icons/crystalsvg/22x22/actions
+@comment dirrm share/kde/icons/crystalsvg/16x16/apps
+@comment dirrm share/kde/icons/crystalsvg/16x16/actions
 @comment dirrm share/kde/config
-@dirrm share/kde/apps/kpilot/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/kpilot/icons/hicolor/16x16
-@dirrm share/kde/apps/kpilot/icons/hicolor
+@dirrm share/kde/apps/ksync
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kpilot/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kpilot/icons/crystalsvg
 @dirrm share/kde/apps/kpilot/icons
 @dirrm share/kde/apps/kpilot
 @dirrm share/kde/apps/korganizer/sounds
 @dirrm share/kde/apps/korganizer/plugins
-@dirrm share/kde/apps/korganizer/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/korganizer/icons/hicolor/32x32
-@dirrm share/kde/apps/korganizer/icons/hicolor/22x22/actions/emptybox
-@dirrm share/kde/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
-@dirrm share/kde/apps/korganizer/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/korganizer/icons/hicolor/22x22
-@dirrm share/kde/apps/korganizer/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/korganizer/icons/hicolor/16x16
-@dirrm share/kde/apps/korganizer/icons/hicolor
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/32x32
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/22x22
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/korganizer/icons/crystalsvg/16x16
+@dirrm share/kde/apps/korganizer/icons/crystalsvg
 @dirrm share/kde/apps/korganizer/icons
 @dirrm share/kde/apps/korganizer
 @dirrm share/kde/apps/knotes/pics
 @dirrm share/kde/apps/knotes
-@dirrm share/kde/apps/kgantt/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/kgantt/icons/hicolor/32x32
-@dirrm share/kde/apps/kgantt/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/kgantt/icons/hicolor/22x22
-@dirrm share/kde/apps/kgantt/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/kgantt/icons/hicolor/16x16
-@dirrm share/kde/apps/kgantt/icons/hicolor
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/32x32
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kgantt/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kgantt/icons/crystalsvg
 @dirrm share/kde/apps/kgantt/icons
 @dirrm share/kde/apps/kgantt
 @dirrm share/kde/apps/karm/pics
 @dirrm share/kde/apps/karm
 @dirrm share/kde/apps/kandy
-@dirrm share/kde/apps/kalarmdgui/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/kalarm/icons/locolor/32x32/apps
-@dirrm share/kde/apps/kalarm/icons/locolor/32x32
-@dirrm share/kde/apps/kalarm/icons/locolor/16x16/apps
-@dirrm share/kde/apps/kalarm/icons/locolor/16x16
-@dirrm share/kde/apps/kalarm/icons/locolor
-@dirrm share/kde/apps/kalarm/icons/hicolor/48x48/apps
-@dirrm share/kde/apps/kalarm/icons/hicolor/48x48
-@dirrm share/kde/apps/kalarm/icons/hicolor/32x32/apps
-@dirrm share/kde/apps/kalarm/icons/hicolor/32x32
-@dirrm share/kde/apps/kalarm/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/kalarm/icons/hicolor/22x22
-@dirrm share/kde/apps/kalarm/icons/hicolor/16x16/apps
-@dirrm share/kde/apps/kalarm/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/kalarm/icons/hicolor/16x16
-@dirrm share/kde/apps/kalarm/icons/hicolor
+@dirrm share/kde/apps/kalarmdgui/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kalarmdgui/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kalarmdgui/icons/crystalsvg
+@dirrm share/kde/apps/kalarmdgui/icons
+@dirrm share/kde/apps/kalarmdgui
+@dirrm share/kde/apps/kalarm/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kalarm/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kalarm/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kalarm/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kalarm/icons/crystalsvg
 @dirrm share/kde/apps/kalarm/icons
 @dirrm share/kde/apps/kalarm
+@dirrm share/kde/apps/kaddressbook/printing
+@dirrm share/kde/apps/kaddressbook/icons/locolor/22x22/actions
+@dirrm share/kde/apps/kaddressbook/icons/locolor/22x22
+@dirrm share/kde/apps/kaddressbook/icons/locolor/16x16/actions
+@dirrm share/kde/apps/kaddressbook/icons/locolor/16x16
+@dirrm share/kde/apps/kaddressbook/icons/locolor
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg/32x32
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kaddressbook/icons/crystalsvg
+@dirrm share/kde/apps/kaddressbook/icons
+@dirrm share/kde/apps/kaddressbook/csv-templates
+@dirrm share/kde/apps/kaddressbook
 @comment dirrm share/kde/apps
+@comment dirrm share/kde/applnk/Utilities/More
 @comment dirrm share/kde/applnk/Utilities
-@comment dirrm share/kde/applnk/Settings/System
 @comment dirrm share/kde/applnk/Applications
+@comment dirrm share/kde/applnk/.hidden
 @dirrm share/doc/kde/HTML/en/kpilot
 @dirrm share/doc/kde/HTML/en/korganizer
 @dirrm share/doc/kde/HTML/en/knotes
+@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/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/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/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/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/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/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/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/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/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/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/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/calendarsystem/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/calendarsystem/html
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs/calendarsystem
+@dirrm share/doc/kde/HTML/en/kdepim-apidocs
+@dirrm share/doc/kde/HTML/en/kcontrol/kalarmd
+@dirrm share/doc/kde/HTML/en/kcontrol
 @dirrm share/doc/kde/HTML/en/karm
 @dirrm share/doc/kde/HTML/en/kandy
 @dirrm share/doc/kde/HTML/en/kalarm
+@dirrm share/doc/kde/HTML/en/kaddressbook
 @comment dirrm share/doc/kde/HTML/en
 @comment dirrm share/autostart
 @comment dirrm lib/kde3
 @dirrm include/kpilot
 @dirrm include/korganizer
 @dirrm include/kgantt
+@dirrm include/kdepim
 @dirrm include/calendar
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 33b701e0709..a1908a68e36 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/02/27 01:03:29 dmcmahill Exp $
+$NetBSD: distinfo,v 1.9 2003/03/11 13:22:25 markd Exp $
 
-SHA1 (kdepim-3.0.5a.tar.bz2) = b25d27ef2cef2b375307775410daab80b5bf686d
-Size (kdepim-3.0.5a.tar.bz2) = 3192923 bytes
-SHA1 (patch-aa) = 28d07a7e4063df62a055a40129338f9831b61c49
-SHA1 (patch-ab) = 24a1da2c4ef1c7625e750a8bee958abe15bea717
-SHA1 (patch-ac) = 86ab25fdb17ce974668946dcaab5417df33d8f96
-SHA1 (patch-ad) = 636a472961d9869bf0792b6eea0e02ddadbd99fe
-SHA1 (patch-ae) = 04a75a4a00012fc9a03ae25755abb8580f166e98
-SHA1 (patch-af) = 5e9e463878c145f4d0b21fe98eb2e16e83e51904
-SHA1 (patch-ag) = 9d53fcf4f5b14cd979bc1c416951dec6796fc4c2
-SHA1 (patch-ah) = f41a62dc725f5f65509d021f7dc14a3e323aeaff
-SHA1 (patch-ai) = d44e8cc57ed2a9173dbafd64e9eedc6f6c0b618a
+SHA1 (kdepim-3.1.tar.bz2) = 8981cdf5e5b354063411778a90178e0f7e9b73bf
+Size (kdepim-3.1.tar.bz2) = 3230184 bytes
+SHA1 (patch-ai) = bf8830cc013ffd5e28c3e888ef0a1c6f4f87ea89
diff --git a/misc/kdepim3/patches/patch-aa b/misc/kdepim3/patches/patch-aa
deleted file mode 100644
index f80574d8593..00000000000
--- a/misc/kdepim3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/10/03 12:08:46 markd Exp $
-
---- kpilot/conduits/expense/Makefile.am.orig	Tue Jun 25 00:07:11 2002
-+++ kpilot/conduits/expense/Makefile.am	Thu Oct  3 15:23:42 2002
-@@ -14,7 +14,7 @@
- libexpenseconduit_la_SOURCES = expenseConduit.ui setupDialog.cc \
- 	expense.cc expense-factory.cc
- libexpenseconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
--libexpenseconduit_la_LIBADD  =  -lkpilot
-+libexpenseconduit_la_LIBADD  =  ../../lib/libkpilot.la
- 
- # this option you can leave out. Just, if you use "make dist", you need it
- noinst_HEADERS = expense.h setupDialog.h 
diff --git a/misc/kdepim3/patches/patch-ab b/misc/kdepim3/patches/patch-ab
deleted file mode 100644
index e77b811a2a0..00000000000
--- a/misc/kdepim3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/10/03 12:08:46 markd Exp $
-
---- kpilot/conduits/expense/Makefile.in.orig	Thu Aug  8 06:10:08 2002
-+++ kpilot/conduits/expense/Makefile.in	Thu Oct  3 15:24:03 2002
-@@ -250,7 +250,7 @@
- 	expense.cc expense-factory.cc expenseConduit.cc
- 
- libexpenseconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
--libexpenseconduit_la_LIBADD = -lkpilot
-+libexpenseconduit_la_LIBADD = ../../lib/libkpilot.la
- 
- # this option you can leave out. Just, if you use "make dist", you need it
- noinst_HEADERS = expense.h setupDialog.h 
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
deleted file mode 100644
index a8e2e538d75..00000000000
--- a/misc/kdepim3/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/10/03 12:08:46 markd Exp $
-
---- kpilot/conduits/null/Makefile.am.orig	Tue Jun 25 00:07:11 2002
-+++ kpilot/conduits/null/Makefile.am	Thu Oct  3 15:24:26 2002
-@@ -10,5 +10,5 @@
- 
- libnullconduit_la_SOURCES = setup_base.ui null-conduit.cc null-factory.cc
- libnullconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
--libnullconduit_la_LIBADD = -lkpilot
-+libnullconduit_la_LIBADD = ../../lib/libkpilot.la
- 
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
deleted file mode 100644
index add8cc7a368..00000000000
--- a/misc/kdepim3/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/10/03 12:08:46 markd Exp $
-
---- kpilot/conduits/null/Makefile.in.orig	Thu Aug  8 06:10:08 2002
-+++ kpilot/conduits/null/Makefile.in	Thu Oct  3 15:24:39 2002
-@@ -244,7 +244,7 @@
- #>+ 1
- libnullconduit_la_SOURCES= null-conduit.cc null-factory.cc setup_base.cc
- libnullconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
--libnullconduit_la_LIBADD = -lkpilot
-+libnullconduit_la_LIBADD = ../../lib/libkpilot.la
- subdir = kpilot/conduits/null
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
deleted file mode 100644
index d380cda1233..00000000000
--- a/misc/kdepim3/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/10/03 12:08:47 markd Exp $
-
---- kpilot/conduits/popmail/Makefile.am.orig	Tue Jun 25 00:07:11 2002
-+++ kpilot/conduits/popmail/Makefile.am	Thu Oct  3 15:25:02 2002
-@@ -17,7 +17,7 @@
- libpopmailconduit_la_SOURCES = popmail-factory.cc setupDialog.cc \
- 	passworddialog.cc popmail-conduit.cc parsedate.c
- libpopmailconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
--libpopmailconduit_la_LIBADD   =  -lkpilot
-+libpopmailconduit_la_LIBADD   =  ../../lib/libkpilot.la
- 
- # this option you can leave out. Just, if you use "make dist", you need it
- noinst_HEADERS = popmail-conduit.h passworddialog.h setupDialog.h
diff --git a/misc/kdepim3/patches/patch-af b/misc/kdepim3/patches/patch-af
deleted file mode 100644
index 55a74378bfa..00000000000
--- a/misc/kdepim3/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/10/03 12:08:47 markd Exp $
-
---- kpilot/conduits/popmail/Makefile.in.orig	Thu Aug  8 06:10:09 2002
-+++ kpilot/conduits/popmail/Makefile.in	Thu Oct  3 15:25:17 2002
-@@ -251,7 +251,7 @@
- 	passworddialog.cc popmail-conduit.cc parsedate.c
- 
- libpopmailconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
--libpopmailconduit_la_LIBADD = -lkpilot
-+libpopmailconduit_la_LIBADD = ../../lib/libkpilot.la
- 
- # this option you can leave out. Just, if you use "make dist", you need it
- noinst_HEADERS = popmail-conduit.h passworddialog.h setupDialog.h
diff --git a/misc/kdepim3/patches/patch-ag b/misc/kdepim3/patches/patch-ag
deleted file mode 100644
index 7746d281c22..00000000000
--- a/misc/kdepim3/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/10/03 12:08:47 markd Exp $
-
---- kpilot/conduits/vcalconduit/Makefile.am.orig	Tue Jun 25 00:07:11 2002
-+++ kpilot/conduits/vcalconduit/Makefile.am	Thu Oct  3 15:27:06 2002
-@@ -17,10 +17,10 @@
- libvcalconduit_la_SOURCES = korganizerConduit.ui vcal-factorybase.cc vcal-factory.cc  \
- 	vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc
- libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
--libvcalconduit_la_LIBADD = -lkpilot -lkcal
-+libvcalconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
- 
- libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc  \
- 	todo-setup.cc vcal-conduitbase.cc todo-conduit.cc
- libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
--libtodoconduit_la_LIBADD = -lkpilot -lkcal
-+libtodoconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
- 
diff --git a/misc/kdepim3/patches/patch-ah b/misc/kdepim3/patches/patch-ah
deleted file mode 100644
index f08c9bf005e..00000000000
--- a/misc/kdepim3/patches/patch-ah
+++ /dev/null
@@ -1,169 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/01/02 09:12:28 skrll Exp $
-
---- kpilot/conduits/vcalconduit/Makefile.in.orig	Mon Dec 30 16:23:28 2002
-+++ kpilot/conduits/vcalconduit/Makefile.in
-@@ -254,7 +254,7 @@ libvcalconduit_la_SOURCES= vcal-factoryb
- 	vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc korganizerConduit.cc
- 
- libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
--libvcalconduit_la_LIBADD = -lkpilot -lkcal
-+libvcalconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
- 
- #>- libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc  \
- #>- 	todo-setup.cc vcal-conduitbase.cc todo-conduit.cc
-@@ -263,14 +263,15 @@ libtodoconduit_la_SOURCES= vcal-factoryb
- 	todo-setup.cc vcal-conduitbase.cc todo-conduit.cc korganizertodoConduit.cc
- 
- libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
--libtodoconduit_la_LIBADD = -lkpilot -lkcal
-+libtodoconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
- subdir = kpilot/conduits/vcalconduit
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- 
--libtodoconduit_la_DEPENDENCIES =
-+libtodoconduit_la_DEPENDENCIES = ../../lib/libkpilot.la \
-+	../../../libkcal/libkcal.la
- am_libtodoconduit_la_OBJECTS = vcal-factorybase.lo todo-factory.lo \
- 	todo-setup.lo vcal-conduitbase.lo todo-conduit.lo
- #>- libtodoconduit_la_OBJECTS = $(am_libtodoconduit_la_OBJECTS)
-@@ -280,7 +281,8 @@ libtodoconduit_la_nofinal_OBJECTS = vcal
- 	todo-setup.lo vcal-conduitbase.lo todo-conduit.lo korganizertodoConduit.lo
- @KDE_USE_FINAL_FALSE@libtodoconduit_la_OBJECTS = $(libtodoconduit_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE@libtodoconduit_la_OBJECTS = $(libtodoconduit_la_final_OBJECTS)
--libvcalconduit_la_DEPENDENCIES =
-+libvcalconduit_la_DEPENDENCIES = ../../lib/libkpilot.la \
-+	../../../libkcal/libkcal.la
- am_libvcalconduit_la_OBJECTS = vcal-factorybase.lo vcal-factory.lo \
- 	vcal-setup.lo vcal-conduitbase.lo vcal-conduit.lo
- #>- libvcalconduit_la_OBJECTS = $(am_libvcalconduit_la_OBJECTS)
-@@ -484,7 +486,7 @@ distclean-tags:
- 
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=todo-conduit.h vcal-conduit.desktop todo-factory.h vcal-conduitbase.h vcal-factory.h vcal-conduitbase.cc vcal-conduit.h todo-setup.cc vcal-setup.cc vcal-conduit.cc vcal-setup.h todo-conduit.cc todo-conduit.desktop korganizertodoConduit.ui korganizerConduit.ui todo-setup.h vcal-factorybase.h 
-+KDE_DIST=todo-setup.h todo-conduit.cc vcal-conduitbase.cc vcal-factory.h todo-setup.cc vcal-factorybase.h todo-factory.h vcal-conduit.cc vcal-conduitbase.h vcal-setup.cc vcal-conduit.h korganizerConduit.ui todo-conduit.h vcal-conduit.desktop vcal-setup.h todo-conduit.desktop korganizertodoConduit.ui 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -620,36 +622,36 @@ korganizertodoConduit.moc: korganizertod
- 	$(MOC) korganizertodoConduit.h -o korganizertodoConduit.moc
- 
- #>+ 3
--vcal-conduit.moc: $(srcdir)/vcal-conduit.h
--	$(MOC) $(srcdir)/vcal-conduit.h -o vcal-conduit.moc
-+vcal-setup.moc: $(srcdir)/vcal-setup.h
-+	$(MOC) $(srcdir)/vcal-setup.h -o vcal-setup.moc
- 
- #>+ 3
--vcal-factorybase.moc: $(srcdir)/vcal-factorybase.h
--	$(MOC) $(srcdir)/vcal-factorybase.h -o vcal-factorybase.moc
-+todo-factory.moc: $(srcdir)/todo-factory.h
-+	$(MOC) $(srcdir)/todo-factory.h -o todo-factory.moc
- 
- #>+ 3
- todo-conduit.moc: $(srcdir)/todo-conduit.h
- 	$(MOC) $(srcdir)/todo-conduit.h -o todo-conduit.moc
- 
- #>+ 3
--todo-factory.moc: $(srcdir)/todo-factory.h
--	$(MOC) $(srcdir)/todo-factory.h -o todo-factory.moc
-+vcal-factorybase.moc: $(srcdir)/vcal-factorybase.h
-+	$(MOC) $(srcdir)/vcal-factorybase.h -o vcal-factorybase.moc
- 
- #>+ 3
- vcal-conduitbase.moc: $(srcdir)/vcal-conduitbase.h
- 	$(MOC) $(srcdir)/vcal-conduitbase.h -o vcal-conduitbase.moc
- 
- #>+ 3
--vcal-setup.moc: $(srcdir)/vcal-setup.h
--	$(MOC) $(srcdir)/vcal-setup.h -o vcal-setup.moc
-+vcal-factory.moc: $(srcdir)/vcal-factory.h
-+	$(MOC) $(srcdir)/vcal-factory.h -o vcal-factory.moc
- 
- #>+ 3
- todo-setup.moc: $(srcdir)/todo-setup.h
- 	$(MOC) $(srcdir)/todo-setup.h -o todo-setup.moc
- 
- #>+ 3
--vcal-factory.moc: $(srcdir)/vcal-factory.h
--	$(MOC) $(srcdir)/vcal-factory.h -o vcal-factory.moc
-+vcal-conduit.moc: $(srcdir)/vcal-conduit.h
-+	$(MOC) $(srcdir)/vcal-conduit.h -o vcal-conduit.moc
- 
- #>+ 14
- korganizerConduit.cc: $(srcdir)/korganizerConduit.ui korganizerConduit.h korganizerConduit.moc
-@@ -668,7 +670,7 @@ korganizerConduit.moc: korganizerConduit
- 
- #>+ 3
- clean-metasources:
--	-rm -f  vcal-conduit.moc vcal-factorybase.moc todo-conduit.moc todo-factory.moc vcal-conduitbase.moc vcal-setup.moc todo-setup.moc vcal-factory.moc
-+	-rm -f  vcal-setup.moc todo-factory.moc todo-conduit.moc vcal-factorybase.moc vcal-conduitbase.moc vcal-factory.moc todo-setup.moc vcal-conduit.moc
- 
- #>+ 5
- clean-ui:
-@@ -687,7 +689,7 @@ force-reedit:
- 
- 
- #>+ 11
--libtodoconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/todo-factory.cc $(srcdir)/todo-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/todo-conduit.cc korganizertodoConduit.cc  todo-conduit.moc vcal-factorybase.moc todo-setup.moc todo-factory.moc vcal-conduitbase.moc
-+libtodoconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/todo-factory.cc $(srcdir)/todo-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/todo-conduit.cc korganizertodoConduit.cc  vcal-factorybase.moc todo-factory.moc todo-conduit.moc vcal-conduitbase.moc todo-setup.moc
- 	@echo 'creating libtodoconduit_la.all_cc.cc ...'; \
- 	rm -f libtodoconduit_la.all_cc.files libtodoconduit_la.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libtodoconduit_la.all_cc.final; \
-@@ -699,7 +701,7 @@ libtodoconduit_la.all_cc.cc: $(srcdir)/M
- 	rm -f libtodoconduit_la.all_cc.final libtodoconduit_la.all_cc.files
- 
- #>+ 11
--libvcalconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/vcal-factory.cc $(srcdir)/vcal-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/vcal-conduit.cc korganizerConduit.cc  vcal-factorybase.moc vcal-setup.moc vcal-conduit.moc vcal-conduitbase.moc vcal-factory.moc
-+libvcalconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/vcal-factory.cc $(srcdir)/vcal-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/vcal-conduit.cc korganizerConduit.cc  vcal-factorybase.moc vcal-factory.moc vcal-conduit.moc vcal-setup.moc vcal-conduitbase.moc
- 	@echo 'creating libvcalconduit_la.all_cc.cc ...'; \
- 	rm -f libvcalconduit_la.all_cc.files libvcalconduit_la.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libvcalconduit_la.all_cc.final; \
-@@ -735,27 +737,27 @@ kde-rpo-clean:
- 	-rm -f *.rpo
- 
- #>+ 25
--todo-factory.o: todo-factory.moc 
--todo-conduit.o: todo-conduit.moc 
--vcal-conduit.lo: vcal-conduit.moc 
--todo-setup.lo: todo-setup.moc 
--$(srcdir)/vcal-factorybase.cc: korganizertodoConduit.h korganizerConduit.h 
--$(srcdir)/todo-setup.cc: korganizertodoConduit.h 
--vcal-conduitbase.lo: vcal-conduitbase.moc 
- $(srcdir)/vcal-setup.cc: korganizerConduit.h 
--$(srcdir)/vcal-conduitbase.cc: korganizertodoConduit.h korganizerConduit.h 
--vcal-factory.o: vcal-factory.moc 
- vcal-factory.lo: vcal-factory.moc 
--$(srcdir)/todo-factory.cc: korganizertodoConduit.h 
--vcal-conduit.o: vcal-conduit.moc 
- vcal-factorybase.lo: vcal-factorybase.moc 
--vcal-setup.lo: vcal-setup.moc 
--$(srcdir)/vcal-conduit.cc: korganizerConduit.h 
-+todo-conduit.lo: todo-conduit.moc 
-+vcal-setup.o: vcal-setup.moc 
-+vcal-conduitbase.lo: vcal-conduitbase.moc 
-+todo-setup.lo: todo-setup.moc 
- $(srcdir)/vcal-factory.cc: korganizerConduit.h 
-+$(srcdir)/todo-conduit.cc: korganizertodoConduit.h 
- todo-setup.o: todo-setup.moc 
-+vcal-conduit.lo: vcal-conduit.moc 
-+vcal-factory.o: vcal-factory.moc 
-+vcal-setup.lo: vcal-setup.moc 
-+todo-factory.o: todo-factory.moc 
-+vcal-factorybase.o: vcal-factorybase.moc 
-+$(srcdir)/vcal-conduit.cc: korganizerConduit.h 
-+$(srcdir)/vcal-factorybase.cc: korganizertodoConduit.h korganizerConduit.h 
-+$(srcdir)/todo-setup.cc: korganizertodoConduit.h 
-+$(srcdir)/vcal-conduitbase.cc: korganizertodoConduit.h korganizerConduit.h 
- todo-factory.lo: todo-factory.moc 
- vcal-conduitbase.o: vcal-conduitbase.moc 
--vcal-factorybase.o: vcal-factorybase.moc 
--$(srcdir)/todo-conduit.cc: korganizertodoConduit.h 
--todo-conduit.lo: todo-conduit.moc 
--vcal-setup.o: vcal-setup.moc 
-+vcal-conduit.o: vcal-conduit.moc 
-+$(srcdir)/todo-factory.cc: korganizertodoConduit.h 
-+todo-conduit.o: todo-conduit.moc 
diff --git a/misc/kdepim3/patches/patch-ai b/misc/kdepim3/patches/patch-ai
index 2d08568719f..6e475a64036 100644
--- a/misc/kdepim3/patches/patch-ai
+++ b/misc/kdepim3/patches/patch-ai
@@ -1,32 +1,28 @@
-$NetBSD: patch-ai,v 1.2 2003/02/27 01:03:29 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.3 2003/03/11 13:22:30 markd Exp $
 
---- configure.orig	Sat Dec 21 01:44:21 2002
+--- configure.orig	Fri Jan 17 08:54:05 2003
 +++ configure
-@@ -21496,7 +21496,7 @@ main ()
+@@ -25661,65 +25661,6 @@ _ACEOF
  
-  char buf[20];
-   buf[0]='\0';
--  strlat(buf, "KDE function test", sizeof(buf));
-+  strlcat(buf, "KDE function test", sizeof(buf));
  
-   ;
-   return 0;
-@@ -22108,57 +22108,6 @@ echo "${ECHO_T}$ac_cv_sizeof_unsigned_in
- cat >>confdefs.h <<EOF
- #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
- EOF
--
--  echo "$as_me:22112: checking sizeof(size_t) == sizeof(unsigned int)" >&5
--echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned int)... $ECHO_C" >&6
+ 
+-  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
+-echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
--#line 22115 "configure"
+-#line $LINENO "configure"
 -#include "confdefs.h"
 -
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
 -int
 -main ()
 -{
 -
--    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT
+-    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
 -       choke me
 -    #endif
 -
@@ -35,37 +31,40 @@ $NetBSD: patch-ai,v 1.2 2003/02/27 01:03:29 dmcmahill Exp $
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22131: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
--  echo "$as_me:22134: \$? = $ac_status" >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
--  echo "$as_me:22140: \$? = $ac_status" >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  echo "$as_me:22142: result: yes" >&5
+-  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
 -else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -
--      echo "$as_me:22148: result: no" >&5
+-      echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--      { { echo "$as_me:22150: error:
--      Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int)
+-      { { echo "$as_me:$LINENO: error:
+-       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
 -       does not apply. Please mail kde-devel@kde.org with a description of your system!
 -      " >&5
 -echo "$as_me: error:
--      Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int)
+-       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
 -       does not apply. Please mail kde-devel@kde.org with a description of your system!
 -      " >&2;}
 -   { (exit 1); exit 1; }; }
 -
 -fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
- 
- for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h
- do
+-
+-
+-
+ echo "$as_me:$LINENO: checking for Qt docs" >&5
+ echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
+ kde_qtdir=