6 files changed, 320 insertions, 218 deletions

diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 8d8eceeee2cd..225f3b082518 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -17,12 +17,15 @@ MAINTAINER=	kde@FreeBSD.org
 LIB_DEPENDS=	pisock:${PORTSDIR}/palm/pilot-link
 
 USE_KDELIBS_VER=3
-USE_BISON=	yes
+PREFIX=		${KDE_PREFIX}
+
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
+USE_BISON=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 4f8f6f051bfa..777b3288b1f1 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.0.4.tar.bz2) = 0455afeec058386049a46e7ea5ec9363
+MD5 (KDE/kdepim-3.1.tar.bz2) = 9a416238193107ed2d937a3f5b02f579
diff --git a/deskutils/kdepim3/files/patch-icaltime.c b/deskutils/kdepim3/files/patch-icaltime.c
deleted file mode 100644
index 859eb2d66820..000000000000
--- a/deskutils/kdepim3/files/patch-icaltime.c
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libical/src/libical/icaltime.c
-===================================================================
-RCS file: /home/kde/kdepim/libical/src/libical/icaltime.c,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -3 -p -r1.5 -r1.6
---- libical/src/libical/icaltime.c	2001/06/26 12:22:20	1.5
-+++ libical/src/libical/icaltime.c	2002/09/27 18:49:07	1.6
-@@ -3,7 +3,7 @@
-   FILE: icaltime.c
-   CREATOR: eric 02 June 2000
-   
--  $Id: icaltime.c,v 1.5 2001/06/26 12:22:20 cschumac Exp $
-+  $Id: icaltime.c,v 1.6 2002/09/27 18:49:07 adridg Exp $
-   $Locker:  $
-     
-  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-@@ -141,7 +141,11 @@ void unset_tz(struct set_tz_save savetz)
- 
- 	free(orig_tzid);
-     } else {
-+#ifdef __FreeBSD__
-+	unsetenv("TZ");
-+#else
- 	putenv("TZ"); /* Delete from environment */
-+#endif
-     } 
- 
-     if(savetz.new_env_str != 0){
diff --git a/deskutils/kdepim3/files/patch-vcc.y b/deskutils/kdepim3/files/patch-vcc.y
deleted file mode 100644
index e94c1bd66c02..000000000000
--- a/deskutils/kdepim3/files/patch-vcc.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- libical/src/libicalvcal/vcc.y	Mon Jan  1 16:49:58 2001
-+++ libical/src/libicalvcal/vcc.y.new	Sun Jun  2 12:42:57 2002
-@@ -107,7 +107,7 @@
- #endif
- 
- #include <string.h>
--#ifndef __MWERKS__
-+#if !defined(__MWERKS__) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- #include <stdio.h>
diff --git a/deskutils/kdepim3/files/patch-vobject.c b/deskutils/kdepim3/files/patch-vobject.c
deleted file mode 100644
index 4b5467f84837..000000000000
--- a/deskutils/kdepim3/files/patch-vobject.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libical/src/libicalvcal/vobject.c	Mon Jan  1 16:37:08 2001
-+++ libical/src/libicalvcal/vobject.c.new	Mon Jun  3 02:49:58 2002
-@@ -42,7 +42,7 @@
-  * vobject, and convert a vobject into its textual representation.
-  */
- 
--#ifndef	 MWERKS
-+#if !defined(MWERKS) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- 
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index a00c935ec1f3..01543ddae236 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -1,7 +1,7 @@
 bin/ical2vcal
-bin/kabcfrontend
+bin/kabc2mutt
+bin/kaddressbook
 bin/kalarm
-bin/kalarmautostart
 bin/kalarmd
 bin/kandy
 bin/kandy_client
@@ -13,9 +13,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
@@ -36,19 +40,25 @@ 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/kfile_vcf.la
+lib/kde3/kfile_vcf.so
+lib/kde3/libaddressconduit.la
+lib/kde3/libaddressconduit.so
+lib/kde3/libaddressconduit.so.0
 lib/kde3/libexpenseconduit.la
 lib/kde3/libexpenseconduit.so
 lib/kde3/libexpenseconduit.so.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/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
@@ -61,6 +71,9 @@ lib/kde3/libnullconduit.so.0
 lib/kde3/libpopmailconduit.la
 lib/kde3/libpopmailconduit.so
 lib/kde3/libpopmailconduit.so.0
+lib/kde3/libtimeconduit.la
+lib/kde3/libtimeconduit.so
+lib/kde3/libtimeconduit.so.0
 lib/kde3/libtodoconduit.la
 lib/kde3/libtodoconduit.so
 lib/kde3/libtodoconduit.so.0
@@ -73,39 +86,79 @@ lib/libkalarmd.so.0
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.2
+lib/libkcalsystem.la
+lib/libkcalsystem.so
+lib/libkcalsystem.so.0
+lib/libkdepim.la
+lib/libkdepim.so
+lib/libkdepim.so.1
 lib/libkgantt.la
 lib/libkgantt.so
 lib/libkgantt.so.0
+lib/libknewstuff.la
+lib/libknewstuff.so
+lib/libknewstuff.so.1
 lib/libkorganizer.la
 lib/libkorganizer.so
 lib/libkorganizer.so.1
 lib/libkpilot.la
 lib/libkpilot.so
 lib/libkpilot.so.0
+lib/libkpimexchange.la
+lib/libkpimexchange.so
+lib/libkpimexchange.so.1
+lib/libksync.la
+lib/libksync.so
+lib/libksync.so.1
+share/applnk/.hidden/kalarmd.desktop
 share/applnk/Applications/kalarm.desktop
 share/applnk/Applications/korganizer.desktop
-share/applnk/Settings/System/alarmdaemonctrl.desktop
+share/applnk/Utilities/More/kalarm.desktop
+share/applnk/Utilities/More/kandy.desktop
+share/applnk/Utilities/More/karm.desktop
+share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kandy.desktop
 share/applnk/Utilities/karm.desktop
 share/applnk/Utilities/knotes.desktop
 share/applnk/Utilities/kpilot.desktop
 share/applnk/Utilities/kpilotdaemon.desktop
-share/apps/kalarm/icons/hicolor/16x16/actions/eventdelete.png
-share/apps/kalarm/icons/hicolor/16x16/actions/eventnew.png
-share/apps/kalarm/icons/hicolor/16x16/actions/kalarm.png
-share/apps/kalarm/icons/hicolor/16x16/apps/kalarm.png
-share/apps/kalarm/icons/hicolor/22x22/actions/kalarm.png
-share/apps/kalarm/icons/hicolor/22x22/actions/kalarm_disabled.png
-share/apps/kalarm/icons/hicolor/32x32/apps/kalarm.png
-share/apps/kalarm/icons/hicolor/48x48/apps/kalarm.png
-share/apps/kalarm/icons/locolor/16x16/apps/kalarm.png
-share/apps/kalarm/icons/locolor/32x32/apps/kalarm.png
-share/apps/kalarmdgui/icons/hicolor/22x22/actions/kalarmdgui.png
-share/apps/kalarmdgui/icons/hicolor/22x22/actions/kalarmdgui_disabled.png
+share/apps/kaddressbook/csv-templates/kaddressbook.desktop
+share/apps/kaddressbook/csv-templates/outlook2000.desktop
+share/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
+share/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
+share/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
+share/apps/kaddressbook/icons/crystalsvg/32x32/actions/homepage.png
+share/apps/kaddressbook/icons/locolor/16x16/actions/contact.png
+share/apps/kaddressbook/icons/locolor/16x16/actions/down.png
+share/apps/kaddressbook/icons/locolor/16x16/actions/group.png
+share/apps/kaddressbook/icons/locolor/16x16/actions/up.png
+share/apps/kaddressbook/icons/locolor/22x22/actions/page.png
+share/apps/kaddressbook/kaddressbook_part.rc
+share/apps/kaddressbook/kaddressbookui.rc
+share/apps/kaddressbook/printing/detailed-style.png
+share/apps/kaddressbook/printing/mike-style.png
+share/apps/kalarm/icons/crystalsvg/16x16/actions/eventdelete.png
+share/apps/kalarm/icons/crystalsvg/16x16/actions/eventnew.png
+share/apps/kalarm/icons/crystalsvg/16x16/actions/file.png
+share/apps/kalarm/icons/crystalsvg/16x16/actions/kalarm.png
+share/apps/kalarm/icons/crystalsvg/16x16/actions/message.png
+share/apps/kalarm/icons/crystalsvg/16x16/actions/playsound.png
+share/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm.png
+share/apps/kalarm/icons/crystalsvg/22x22/actions/kalarm_disabled.png
+share/apps/kalarmdgui/icons/crystalsvg/22x22/actions/kalarmdgui.png
+share/apps/kalarmdgui/icons/crystalsvg/22x22/actions/kalarmdgui_disabled.png
 share/apps/kandy/default.kandy
 share/apps/kandy/kandymobileui.rc
 share/apps/kandy/kandyui.rc
 share/apps/karm/karmui.rc
+share/apps/karm/pics/active-icon-0.xpm
+share/apps/karm/pics/active-icon-1.xpm
+share/apps/karm/pics/active-icon-2.xpm
+share/apps/karm/pics/active-icon-3.xpm
+share/apps/karm/pics/active-icon-4.xpm
+share/apps/karm/pics/active-icon-5.xpm
+share/apps/karm/pics/active-icon-6.xpm
+share/apps/karm/pics/active-icon-7.xpm
 share/apps/karm/pics/clock.xpm
 share/apps/karm/pics/clockedit.xpm
 share/apps/karm/pics/empty-watch.xpm
@@ -118,17 +171,18 @@ share/apps/karm/pics/watch-4.xpm
 share/apps/karm/pics/watch-5.xpm
 share/apps/karm/pics/watch-6.xpm
 share/apps/karm/pics/watch-7.xpm
-share/apps/kgantt/icons/hicolor/16x16/actions/ganttSelect.png
-share/apps/kgantt/icons/hicolor/16x16/actions/ganttSelecttask.png
-share/apps/kgantt/icons/hicolor/16x16/actions/ganttUnselecttask.png
-share/apps/kgantt/icons/hicolor/22x22/actions/ganttSelect.png
-share/apps/kgantt/icons/hicolor/22x22/actions/ganttSelecttask.png
-share/apps/kgantt/icons/hicolor/22x22/actions/ganttUnselecttask.png
-share/apps/kgantt/icons/hicolor/32x32/actions/ganttSelect.png
-share/apps/kgantt/icons/hicolor/32x32/actions/ganttSelecttask.png
-share/apps/kgantt/icons/hicolor/32x32/actions/ganttUnselecttask.png
+share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelect.png
+share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttSelecttask.png
+share/apps/kgantt/icons/crystalsvg/16x16/actions/ganttUnselecttask.png
+share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttSelect.png
+share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttSelecttask.png
+share/apps/kgantt/icons/crystalsvg/22x22/actions/ganttUnselecttask.png
+share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelect.png
+share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelecttask.png
+share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttUnselecttask.png
 share/apps/knotes/knotesui.rc
 share/apps/knotes/pics/knotesclose.png
+share/apps/knotes/pics/knotesdate.png
 share/apps/knotes/pics/knotesdelete.png
 share/apps/knotes/pics/knoteslogo.png
 share/apps/korganizer/holiday_at
@@ -165,76 +219,80 @@ share/apps/korganizer/holiday_se
 share/apps/korganizer/holiday_si
 share/apps/korganizer/holiday_th
 share/apps/korganizer/holiday_us
-share/apps/korganizer/icons/hicolor/16x16/actions/1day.png
-share/apps/korganizer/icons/hicolor/16x16/actions/1downarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/1leftarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/1rightarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/1uparrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/2downarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/2leftarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/2rightarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/2uparrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/3downarrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/3uparrow.png
-share/apps/korganizer/icons/hicolor/16x16/actions/5days.png
-share/apps/korganizer/icons/hicolor/16x16/actions/7days.png
-share/apps/korganizer/icons/hicolor/16x16/actions/appointment.png
-share/apps/korganizer/icons/hicolor/16x16/actions/bell.png
-share/apps/korganizer/icons/hicolor/16x16/actions/dayview.png
-share/apps/korganizer/icons/hicolor/16x16/actions/findf.png
-share/apps/korganizer/icons/hicolor/16x16/actions/groupevent.png
-share/apps/korganizer/icons/hicolor/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/hicolor/16x16/actions/list.png
-share/apps/korganizer/icons/hicolor/16x16/actions/mailappt.png
-share/apps/korganizer/icons/hicolor/16x16/actions/month.png
-share/apps/korganizer/icons/hicolor/16x16/actions/nomailappt.png
-share/apps/korganizer/icons/hicolor/16x16/actions/organizer.png
-share/apps/korganizer/icons/hicolor/16x16/actions/playsound.png
-share/apps/korganizer/icons/hicolor/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/hicolor/16x16/actions/recur.png
-share/apps/korganizer/icons/hicolor/16x16/actions/runprog.png
-share/apps/korganizer/icons/hicolor/16x16/actions/smallcal.png
-share/apps/korganizer/icons/hicolor/16x16/actions/smallclock.png
-share/apps/korganizer/icons/hicolor/16x16/actions/today.png
-share/apps/korganizer/icons/hicolor/16x16/actions/todo.png
-share/apps/korganizer/icons/hicolor/16x16/actions/webexport.png
-share/apps/korganizer/icons/hicolor/16x16/actions/whatsnext.png
-share/apps/korganizer/icons/hicolor/22x22/actions/1day.png
-share/apps/korganizer/icons/hicolor/22x22/actions/3leftarrow.png
-share/apps/korganizer/icons/hicolor/22x22/actions/3rightarrow.png
-share/apps/korganizer/icons/hicolor/22x22/actions/5days.png
-share/apps/korganizer/icons/hicolor/22x22/actions/7days.png
-share/apps/korganizer/icons/hicolor/22x22/actions/agenda.png
-share/apps/korganizer/icons/hicolor/22x22/actions/appointment.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedclipboard.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkmark.png
-share/apps/korganizer/icons/hicolor/22x22/actions/delete.png
-share/apps/korganizer/icons/hicolor/22x22/actions/emptybox.png
-share/apps/korganizer/icons/hicolor/22x22/actions/emptybox/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/list.png
-share/apps/korganizer/icons/hicolor/22x22/actions/month.png
-share/apps/korganizer/icons/hicolor/22x22/actions/newrecurevent.png
-share/apps/korganizer/icons/hicolor/22x22/actions/newtodo.png
-share/apps/korganizer/icons/hicolor/22x22/actions/search.png
-share/apps/korganizer/icons/hicolor/22x22/actions/send.png
-share/apps/korganizer/icons/hicolor/22x22/actions/timespan.png
-share/apps/korganizer/icons/hicolor/22x22/actions/today.png
-share/apps/korganizer/icons/hicolor/22x22/actions/todo.png
-share/apps/korganizer/icons/hicolor/22x22/actions/webexport.png
-share/apps/korganizer/icons/hicolor/22x22/actions/whatsnext.png
-share/apps/korganizer/icons/hicolor/32x32/actions/1day.png
-share/apps/korganizer/icons/hicolor/32x32/actions/5days.png
-share/apps/korganizer/icons/hicolor/32x32/actions/7days.png
-share/apps/korganizer/icons/hicolor/32x32/actions/appointment.png
-share/apps/korganizer/icons/hicolor/32x32/actions/list.png
-share/apps/korganizer/icons/hicolor/32x32/actions/month.png
-share/apps/korganizer/icons/hicolor/32x32/actions/today.png
-share/apps/korganizer/icons/hicolor/32x32/actions/todo.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/1downarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/1leftarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/1rightarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/1uparrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/2downarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/2leftarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/2rightarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/2uparrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/3downarrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/3uparrow.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/today.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
+share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/3leftarrow.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/3rightarrow.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/timespan.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/today.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
+share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/today.png
+share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/apps/korganizer/korganizer_part.rc
 share/apps/korganizer/korganizergsui.rc
 share/apps/korganizer/korganizerui.rc
+share/apps/korganizer/plugins/birthdaysui.rc
+share/apps/korganizer/plugins/exchangeui.rc
 share/apps/korganizer/plugins/projectviewui.rc
 share/apps/korganizer/plugins/webexportui.rc
 share/apps/korganizer/sounds/alert.wav
@@ -243,21 +301,25 @@ share/apps/korganizer/sounds/lightmag.wav
 share/apps/korganizer/sounds/onscreen.wav
 share/apps/korganizer/sounds/spinout.wav
 share/apps/korganizer/tips
-share/apps/kpilot/icons/hicolor/16x16/actions/backup.png
-share/apps/kpilot/icons/hicolor/16x16/actions/busysync.png
-share/apps/kpilot/icons/hicolor/16x16/actions/fastsync.png
-share/apps/kpilot/icons/hicolor/16x16/actions/hotsync.png
-share/apps/kpilot/icons/hicolor/16x16/actions/restore.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/backup.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/busysync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/restore.png
 share/apps/kpilot/kpilot-address.png
 share/apps/kpilot/kpilot-fileinstaller.png
 share/apps/kpilot/kpilot-hotsync.png
 share/apps/kpilot/kpilot-knotes.png
 share/apps/kpilot/kpilot-splash.png
 share/apps/kpilot/kpilotui.rc
+share/apps/ksync/ksyncui.rc
 share/autostart/kalarm.tray.desktop
 share/autostart/kalarmd.autostart.desktop
 share/autostart/korgac.desktop
 share/config/knotesrc
+share/doc/HTML/en/kaddressbook/common
+share/doc/HTML/en/kaddressbook/index.cache.bz2
+share/doc/HTML/en/kaddressbook/index.docbook
 share/doc/HTML/en/kalarm/alarmmessage.png
 share/doc/HTML/en/kalarm/common
 share/doc/HTML/en/kalarm/editwindow.png
@@ -271,6 +333,10 @@ share/doc/HTML/en/karm/common
 share/doc/HTML/en/karm/index.cache.bz2
 share/doc/HTML/en/karm/index.docbook
 share/doc/HTML/en/karm/karm.png
+share/doc/HTML/en/kcontrol/kalarmd/common
+share/doc/HTML/en/kcontrol/kalarmd/index.cache.bz2
+share/doc/HTML/en/kcontrol/kalarmd/index.docbook
+share/doc/HTML/en/kdepim-apidocs/common
 share/doc/HTML/en/knotes/common
 share/doc/HTML/en/knotes/index.cache.bz2
 share/doc/HTML/en/knotes/index.docbook
@@ -320,119 +386,203 @@ share/doc/HTML/en/kpilot/setup-general.png
 share/doc/HTML/en/kpilot/setup-sync.png
 share/doc/HTML/en/kpilot/toolbar_backup.png
 share/doc/HTML/en/kpilot/toolbar_hotsync.png
-share/icons/hicolor/16x16/actions/kalarm.png
-share/icons/hicolor/16x16/apps/kalarm.png
-share/icons/hicolor/16x16/apps/karm.png
-share/icons/hicolor/16x16/apps/knotes.png
-share/icons/hicolor/16x16/apps/korganizer.png
-share/icons/hicolor/16x16/apps/kpilot.png
-share/icons/hicolor/16x16/apps/kpilotDaemon.png
-share/icons/hicolor/22x22/actions/kalarm.png
-share/icons/hicolor/22x22/apps/kpilot.png
-share/icons/hicolor/32x32/apps/kalarm.png
-share/icons/hicolor/32x32/apps/karm.png
-share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/korganizer.png
-share/icons/hicolor/32x32/apps/kpilot.png
-share/icons/hicolor/48x48/apps/kalarm.png
-share/icons/hicolor/48x48/apps/karm.png
-share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/korganizer.png
-share/icons/hicolor/48x48/apps/kpilot.png
-share/icons/hicolor/48x48/apps/kpilotDaemon.png
+share/icons/crystalsvg/16x16/actions/kalarm.png
+share/icons/crystalsvg/16x16/apps/kaddressbook.png
+share/icons/crystalsvg/16x16/apps/kalarm.png
+share/icons/crystalsvg/16x16/apps/karm.png
+share/icons/crystalsvg/16x16/apps/knotes.png
+share/icons/crystalsvg/16x16/apps/korganizer.png
+share/icons/crystalsvg/16x16/apps/kpilot.png
+share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
+share/icons/crystalsvg/22x22/actions/kalarm.png
+share/icons/crystalsvg/22x22/apps/kpilot.png
+share/icons/crystalsvg/32x32/apps/kaddressbook.png
+share/icons/crystalsvg/32x32/apps/kalarm.png
+share/icons/crystalsvg/32x32/apps/karm.png
+share/icons/crystalsvg/32x32/apps/knotes.png
+share/icons/crystalsvg/32x32/apps/korganizer.png
+share/icons/crystalsvg/32x32/apps/kpilot.png
+share/icons/crystalsvg/48x48/apps/kaddressbook.png
+share/icons/crystalsvg/48x48/apps/kalarm.png
+share/icons/crystalsvg/48x48/apps/karm.png
+share/icons/crystalsvg/48x48/apps/knotes.png
+share/icons/crystalsvg/48x48/apps/korganizer.png
+share/icons/crystalsvg/48x48/apps/kpilot.png
+share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
 share/icons/locolor/16x16/apps/kalarm.png
 share/icons/locolor/16x16/apps/kpilot.png
 share/icons/locolor/32x32/apps/kalarm.png
 share/services/abbrowser_conduit.desktop
 share/services/expense-conduit.desktop
+share/services/kfile_vcf.desktop
 share/services/knotes-conduit.desktop
+share/services/korganizer/birthdays.desktop
 share/services/korganizer/datenums.desktop
+share/services/korganizer/exchange.desktop
 share/services/korganizer/holidays.desktop
 share/services/korganizer/projectview.desktop
 share/services/korganizer/webexport.desktop
 share/services/null-conduit.desktop
 share/services/popmail-conduit.desktop
+share/services/time_conduit.desktop
 share/services/todo-conduit.desktop
 share/services/vcal-conduit.desktop
+share/services/webcal.protocol
 share/servicetypes/calendardecoration.desktop
 share/servicetypes/calendarplugin.desktop
 share/servicetypes/korganizerpart.desktop
 share/servicetypes/kpilotconduit.desktop
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/knotes/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/ksync/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkpimexchange/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkdepim/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/libkcal/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/ksync/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kpilot/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/konsolekalendar/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/knotes/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kfile-plugins/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kandy/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarmd/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdepim-apidocs/calendarsystem/html || true
+@dirrm share/servicetypes
 @dirrm share/services/korganizer
+@dirrm share/services
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/22x22/actions
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16/actions
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kpilot
 @dirrm share/doc/HTML/en/korganizer
 @dirrm share/doc/HTML/en/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkpimexchange
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkdepim
+@dirrm share/doc/HTML/en/kdepim-apidocs/libkcal
+@dirrm share/doc/HTML/en/kdepim-apidocs/ksync
+@dirrm share/doc/HTML/en/kdepim-apidocs/kpilot
+@dirrm share/doc/HTML/en/kdepim-apidocs/korganizer
+@dirrm share/doc/HTML/en/kdepim-apidocs/konsolekalendar
+@dirrm share/doc/HTML/en/kdepim-apidocs/knotes
+@dirrm share/doc/HTML/en/kdepim-apidocs/kgantt
+@dirrm share/doc/HTML/en/kdepim-apidocs/kfile-plugins
+@dirrm share/doc/HTML/en/kdepim-apidocs/kandy
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarmd
+@dirrm share/doc/HTML/en/kdepim-apidocs/kalarm
+@dirrm share/doc/HTML/en/kdepim-apidocs/kaddressbook
+@dirrm share/doc/HTML/en/kdepim-apidocs/kabc/kabc2mutt
+@dirrm share/doc/HTML/en/kdepim-apidocs/kabc
+@dirrm share/doc/HTML/en/kdepim-apidocs/calendarsystem
+@dirrm share/doc/HTML/en/kdepim-apidocs
+@dirrm share/doc/HTML/en/kcontrol/kalarmd
+@dirrm share/doc/HTML/en/kcontrol
 @dirrm share/doc/HTML/en/karm
 @dirrm share/doc/HTML/en/kandy
 @dirrm share/doc/HTML/en/kalarm
-@dirrm share/apps/kpilot/icons/hicolor/16x16/actions
-@dirrm share/apps/kpilot/icons/hicolor/16x16
-@dirrm share/apps/kpilot/icons/hicolor
+@dirrm share/doc/HTML/en/kaddressbook
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/ksync
+@dirrm share/apps/kpilot/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kpilot/icons/crystalsvg/16x16
+@dirrm share/apps/kpilot/icons/crystalsvg
 @dirrm share/apps/kpilot/icons
 @dirrm share/apps/kpilot
 @dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer/plugins
-@dirrm share/apps/korganizer/icons/hicolor/32x32/actions
-@dirrm share/apps/korganizer/icons/hicolor/32x32
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions
-@dirrm share/apps/korganizer/icons/hicolor/22x22
-@dirrm share/apps/korganizer/icons/hicolor/16x16/actions
-@dirrm share/apps/korganizer/icons/hicolor/16x16
-@dirrm share/apps/korganizer/icons/hicolor
+@dirrm share/apps/korganizer/icons/crystalsvg/32x32/actions
+@dirrm share/apps/korganizer/icons/crystalsvg/32x32
+@dirrm share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox
+@dirrm share/apps/korganizer/icons/crystalsvg/22x22/actions
+@dirrm share/apps/korganizer/icons/crystalsvg/22x22
+@dirrm share/apps/korganizer/icons/crystalsvg/16x16/actions
+@dirrm share/apps/korganizer/icons/crystalsvg/16x16
+@dirrm share/apps/korganizer/icons/crystalsvg
 @dirrm share/apps/korganizer/icons
 @dirrm share/apps/korganizer
 @dirrm share/apps/knotes/pics
 @dirrm share/apps/knotes
-@dirrm share/apps/kgantt/icons/hicolor/32x32/actions
-@dirrm share/apps/kgantt/icons/hicolor/32x32
-@dirrm share/apps/kgantt/icons/hicolor/22x22/actions
-@dirrm share/apps/kgantt/icons/hicolor/22x22
-@dirrm share/apps/kgantt/icons/hicolor/16x16/actions
-@dirrm share/apps/kgantt/icons/hicolor/16x16
-@dirrm share/apps/kgantt/icons/hicolor
+@dirrm share/apps/kgantt/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kgantt/icons/crystalsvg/32x32
+@dirrm share/apps/kgantt/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kgantt/icons/crystalsvg/22x22
+@dirrm share/apps/kgantt/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kgantt/icons/crystalsvg/16x16
+@dirrm share/apps/kgantt/icons/crystalsvg
 @dirrm share/apps/kgantt/icons
 @dirrm share/apps/kgantt
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kandy
-@dirrm share/apps/kalarmdgui/icons/hicolor/22x22/actions
-@dirrm share/apps/kalarmdgui/icons/hicolor/22x22
-@dirrm share/apps/kalarmdgui/icons/hicolor
+@dirrm share/apps/kalarmdgui/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kalarmdgui/icons/crystalsvg/22x22
+@dirrm share/apps/kalarmdgui/icons/crystalsvg
 @dirrm share/apps/kalarmdgui/icons
 @dirrm share/apps/kalarmdgui
-@dirrm share/apps/kalarm/icons/locolor/32x32/apps
-@dirrm share/apps/kalarm/icons/locolor/32x32
-@dirrm share/apps/kalarm/icons/locolor/16x16/apps
-@dirrm share/apps/kalarm/icons/locolor/16x16
-@dirrm share/apps/kalarm/icons/locolor
-@dirrm share/apps/kalarm/icons/hicolor/48x48/apps
-@dirrm share/apps/kalarm/icons/hicolor/48x48
-@dirrm share/apps/kalarm/icons/hicolor/32x32/apps
-@dirrm share/apps/kalarm/icons/hicolor/32x32
-@dirrm share/apps/kalarm/icons/hicolor/22x22/actions
-@dirrm share/apps/kalarm/icons/hicolor/22x22
-@dirrm share/apps/kalarm/icons/hicolor/16x16/apps
-@dirrm share/apps/kalarm/icons/hicolor/16x16/actions
-@dirrm share/apps/kalarm/icons/hicolor/16x16
-@dirrm share/apps/kalarm/icons/hicolor
+@dirrm share/apps/kalarm/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kalarm/icons/crystalsvg/22x22
+@dirrm share/apps/kalarm/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kalarm/icons/crystalsvg/16x16
+@dirrm share/apps/kalarm/icons/crystalsvg
 @dirrm share/apps/kalarm/icons
 @dirrm share/apps/kalarm
+@dirrm share/apps/kaddressbook/printing
+@dirrm share/apps/kaddressbook/icons/locolor/22x22/actions
+@dirrm share/apps/kaddressbook/icons/locolor/22x22
+@dirrm share/apps/kaddressbook/icons/locolor/16x16/actions
+@dirrm share/apps/kaddressbook/icons/locolor/16x16
+@dirrm share/apps/kaddressbook/icons/locolor
+@dirrm share/apps/kaddressbook/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kaddressbook/icons/crystalsvg/32x32
+@dirrm share/apps/kaddressbook/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kaddressbook/icons/crystalsvg/16x16
+@dirrm share/apps/kaddressbook/icons/crystalsvg
+@dirrm share/apps/kaddressbook/icons
+@dirrm share/apps/kaddressbook/csv-templates
+@dirrm share/apps/kaddressbook
+@dirrm share/apps
+@dirrm share/applnk/Utilities/More
 @dirrm share/applnk/Utilities
-@dirrm share/applnk/Settings/System
-@dirrm share/applnk/Settings
 @dirrm share/applnk/Applications
+@dirrm share/applnk/.hidden
 @dirrm share/applnk
+@dirrm lib/kde3
 @dirrm include/kpilot
 @dirrm include/korganizer
 @dirrm include/kgantt
+@dirrm include/kdepim
 @dirrm include/calendar