15 files changed, 929 insertions, 1088 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 5e040d99442a..75586b323001 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -18,5 +18,6 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+MAN1=		efax.1 efix.1 fax.1
 
 .include <bsd.port.mk>
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index f18435189a7a..a8863e42ad1e 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
+MD5 (kdeutils-2.2.tar.bz2) = 2ee57c259669232cb301359fb9000d08
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 44b2e28001ba..ae31b3d6f094 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -1,4 +1,7 @@
 bin/ark
+bin/efax
+bin/efix
+bin/fax
 bin/kab
 bin/karm
 bin/kcalc
@@ -14,23 +17,29 @@ bin/kjots
 bin/klaptopdaemon
 bin/kljettool
 bin/klpq
+bin/klprfax
+bin/klprfax_filter
+bin/klprfax_lpd
 bin/knotes
+bin/ktimer
 bin/kwikdisk
-include/knotesdcop.h
+include/KNotesIface.h
 lib/kcalc.la
 lib/kcalc.so
-lib/kedit.la
-lib/kedit.so
-lib/kedit.so.0
+lib/kde2/kedit.la
+lib/kde2/kedit.so
 lib/kfind.la
 lib/kfind.so
+lib/libark.la
+lib/libark.so
+lib/libark.so.1
+lib/libkcharselectapplet.la
+lib/libkcharselectapplet.so
+lib/libkcharselectapplet.so.1
 lib/libkcm_kdf.la
 lib/libkcm_kdf.so
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
-lib/libktimemon.la
-lib/libktimemon.so
-lib/libktimemon.so.1
 share/applnk/Editors/KEdit.desktop
 share/applnk/Kfind.desktop
 share/applnk/Settings/Information/kcmdf.desktop
@@ -52,18 +61,21 @@ share/applnk/Utilities/karm.desktop
 share/applnk/Utilities/kcalc.desktop
 share/applnk/Utilities/kdepasswd.desktop
 share/applnk/Utilities/khexedit.desktop
+share/applnk/Utilities/klprfax.desktop
 share/applnk/Utilities/knotes.desktop
+share/applnk/Utilities/ktimer.desktop
+share/apps/ark/ark_part.rc
 share/apps/ark/arkui.rc
-share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/locolor/22x22/actions/ark_help.png
-share/apps/ark/icons/locolor/22x22/actions/ark_new.png
-share/apps/ark/icons/locolor/22x22/actions/ark_open.png
-share/apps/ark/icons/locolor/22x22/actions/ark_options.png
-share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/locolor/22x22/actions/ark_view.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
 share/apps/kab/htmlexport/templates/index.html
 share/apps/kab/htmlexport/templates/kab_address.html
 share/apps/kab/htmlexport/templates/kab_background.gif
@@ -98,280 +110,120 @@ share/apps/kfloppy/pics/kfloppylogo.png
 share/apps/khexedit/toolbar/hexdrag.png
 share/apps/khexedit/toolbar/hexmask.png
 share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/ktimemon.desktop
+share/apps/kicker/applets/kcharselectapplet.desktop
 share/apps/kjots/pics/filedel.png
-share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
-share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
 share/apps/kljettool/pics/kljetlogo.png
+share/apps/knotes/knotesui.rc
 share/apps/knotes/pics/knotesclose.png
+share/apps/knotes/pics/knotesdelete.png
 share/apps/knotes/pics/knoteslogo.png
+share/apps/konqueror/servicemenus/arkservicemenu.desktop
 share/config/knotesrc
-share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/actionmenu.html
-share/doc/HTML/en/ark/ark-create.html
-share/doc/HTML/en/ark/ark-extract.html
-share/doc/HTML/en/ark/ark-work-files.html
-share/doc/HTML/en/ark/commands.html
 share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/compilation.html
-share/doc/HTML/en/ark/credits.html
-share/doc/HTML/en/ark/editmenu.html
+share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/index.html
-share/doc/HTML/en/ark/installation.html
-share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/settingsmenu.html
-share/doc/HTML/en/ark/using-ark.html
-share/doc/HTML/en/kab/.anchors
-share/doc/HTML/en/kab/commands.html
 share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/credits.html
-share/doc/HTML/en/kab/faq.html
+share/doc/HTML/en/kab/index.cache.bz2
 share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/installation.html
-share/doc/HTML/en/kab/introduction.html
-share/doc/HTML/en/kab/kab-edit.html
 share/doc/HTML/en/kab/kab-edit.png
 share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/karm/.anchors
 share/doc/HTML/en/karm/common
-share/doc/HTML/en/karm/credits.html
-share/doc/HTML/en/karm/general-use.html
+share/doc/HTML/en/karm/index.cache.bz2
 share/doc/HTML/en/karm/index.docbook
-share/doc/HTML/en/karm/index.html
-share/doc/HTML/en/karm/installation.html
-share/doc/HTML/en/karm/interface.html
-share/doc/HTML/en/karm/introduction.html
 share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/menus.html
-share/doc/HTML/en/karm/status-bar.html
-share/doc/HTML/en/karm/tool-bar.html
-share/doc/HTML/en/karm/using-karm.html
-share/doc/HTML/en/kcalc/.anchors
-share/doc/HTML/en/kcalc/and-or-xor.html
-share/doc/HTML/en/kcalc/comments-on-specific-functions.html
 share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/copyright.html
-share/doc/HTML/en/kcalc/enable-long-double-precision.html
+share/doc/HTML/en/kcalc/index.cache.bz2
 share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/index.html
-share/doc/HTML/en/kcalc/installation.html
-share/doc/HTML/en/kcalc/introduction.html
 share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcalc/key-accels.html
-share/doc/HTML/en/kcalc/lsh-rsh.html
-share/doc/HTML/en/kcalc/percent.html
-share/doc/HTML/en/kcalc/questions-and-answers.html
-share/doc/HTML/en/kcalc/trigonometric-mode.html
-share/doc/HTML/en/kcalc/usage.html
-share/doc/HTML/en/kdf/.anchors
 share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/credits.html
+share/doc/HTML/en/kdf/index.cache.bz2
 share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/installation.html
-share/doc/HTML/en/kdf/introduction.html
 share/doc/HTML/en/kdf/kdf.png
 share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kdf/main-window.html
-share/doc/HTML/en/kdf/the-menus.html
-share/doc/HTML/en/kdf/using-kdf.html
-share/doc/HTML/en/kedit/.anchors
-share/doc/HTML/en/kedit/command-line-options.html
 share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/credits.html
-share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/go.html
-share/doc/HTML/en/kedit/help.html
+share/doc/HTML/en/kedit/index.cache.bz2
 share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
-share/doc/HTML/en/kedit/introduction.html
-share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/on-screen-fundamentals.html
-share/doc/HTML/en/kedit/pref-dialog.html
-share/doc/HTML/en/kedit/prefcolors.html
-share/doc/HTML/en/kedit/prefmisc.html
-share/doc/HTML/en/kedit/prefspellchecker.html
-share/doc/HTML/en/kedit/settings.html
-share/doc/HTML/en/kedit/the-menu-entries.html
-share/doc/HTML/en/kedit/tools.html
-share/doc/HTML/en/kfind/.anchors
-share/doc/HTML/en/kfind/authors.html
 share/doc/HTML/en/kfind/common
-share/doc/HTML/en/kfind/compilation-and-installation.html
-share/doc/HTML/en/kfind/configuration.html
-share/doc/HTML/en/kfind/edit.html
-share/doc/HTML/en/kfind/epilog.html
-share/doc/HTML/en/kfind/help.html
+share/doc/HTML/en/kfind/index.cache.bz2
 share/doc/HTML/en/kfind/index.docbook
-share/doc/HTML/en/kfind/index.html
-share/doc/HTML/en/kfind/installation.html
-share/doc/HTML/en/kfind/introduction.html
-share/doc/HTML/en/kfind/onscreenfundamentals.html
-share/doc/HTML/en/kfind/options.html
-share/doc/HTML/en/kfind/requirements.html
-share/doc/HTML/en/kfind/search-parameters-dialog.html
-share/doc/HTML/en/kfind/themenuentries.html
-share/doc/HTML/en/kfind/viewing-area.html
-share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/buttons.html
-share/doc/HTML/en/kfloppy/command-line.html
 share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/credits.html
-share/doc/HTML/en/kfloppy/formatting-options.html
+share/doc/HTML/en/kfloppy/index.cache.bz2
 share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
-share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/usingkfloppy.html
-share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/bookmarks.html
 share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/credits.html
-share/doc/HTML/en/khexedit/document-menu.html
-share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/help-menu.html
+share/doc/HTML/en/khexedit/index.cache.bz2
 share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/installation.html
-share/doc/HTML/en/khexedit/introduction.html
 share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/khexedit/menu-commands.html
-share/doc/HTML/en/khexedit/nutshell.html
-share/doc/HTML/en/khexedit/settings-menu.html
-share/doc/HTML/en/khexedit/starting-khexedit.html
-share/doc/HTML/en/khexedit/toolbar.html
-share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/view-menu.html
-share/doc/HTML/en/kjots/.anchors
-share/doc/HTML/en/kjots/commands.html
 share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/compilation.html
-share/doc/HTML/en/kjots/configuration.html
-share/doc/HTML/en/kjots/credits.html
+share/doc/HTML/en/kjots/index.cache.bz2
 share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kjots/index.html
-share/doc/HTML/en/kjots/installation.html
-share/doc/HTML/en/kjots/introduction.html
-share/doc/HTML/en/kjots/kjots-pages.html
-share/doc/HTML/en/kjots/menu-edit.html
-share/doc/HTML/en/kjots/menu-help.html
-share/doc/HTML/en/kjots/menu-hotlist.html
-share/doc/HTML/en/kjots/menu-options.html
-share/doc/HTML/en/kjots/requirements.html
-share/doc/HTML/en/kjots/using-kjots.html
-share/doc/HTML/en/kljettool/.anchors
 share/doc/HTML/en/kljettool/README
 share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/compilation-and-installation.html
-share/doc/HTML/en/kljettool/credits.html
 share/doc/HTML/en/kljettool/djcdoscommands.txt
 share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
 share/doc/HTML/en/kljettool/hp690c.zip
+share/doc/HTML/en/kljettool/index.cache.bz2
 share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/index.html
-share/doc/HTML/en/kljettool/installation.html
-share/doc/HTML/en/kljettool/introduction.html
 share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/requirements.html
 share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/kljettool/usage.html
-share/doc/HTML/en/klpq/.anchors
-share/doc/HTML/en/klpq/author.html
 share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/compilation-and-installation.html
+share/doc/HTML/en/klpq/index.cache.bz2
 share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klpq/index.html
-share/doc/HTML/en/klpq/installation.html
-share/doc/HTML/en/klpq/introduction.html
-share/doc/HTML/en/klpq/mainwindow.html
-share/doc/HTML/en/klpq/requirements.html
-share/doc/HTML/en/klpq/spooler-dialog.html
-share/doc/HTML/en/klpq/todo.html
-share/doc/HTML/en/klpq/usage.html
-share/doc/HTML/en/knotes/.anchors
+share/doc/HTML/en/klprfax/common
+share/doc/HTML/en/klprfax/index.cache.bz2
+share/doc/HTML/en/klprfax/index.docbook
 share/doc/HTML/en/knotes/common
-share/doc/HTML/en/knotes/compilation.html
-share/doc/HTML/en/knotes/configuration.html
-share/doc/HTML/en/knotes/configuring-actions.html
-share/doc/HTML/en/knotes/configuring-editor.html
-share/doc/HTML/en/knotes/credits.html
-share/doc/HTML/en/knotes/customizing-actions.html
-share/doc/HTML/en/knotes/customizing-display.html
-share/doc/HTML/en/knotes/customizing-editor.html
-share/doc/HTML/en/knotes/deleting-a-note.html
-share/doc/HTML/en/knotes/desktop-functions.html
-share/doc/HTML/en/knotes/displaying-notes.html
-share/doc/HTML/en/knotes/hiding-a-note.html
+share/doc/HTML/en/knotes/index.cache.bz2
 share/doc/HTML/en/knotes/index.docbook
-share/doc/HTML/en/knotes/index.html
-share/doc/HTML/en/knotes/inserting-the-date.html
-share/doc/HTML/en/knotes/installation.html
-share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/mailing-a-note.html
-share/doc/HTML/en/knotes/printing-a-note.html
-share/doc/HTML/en/knotes/quit-knotes.html
-share/doc/HTML/en/knotes/renaming-a-note.html
-share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/typing-the-note.html
-share/doc/HTML/en/knotes/using-knotes.html
-share/doc/HTML/en/kpm/.anchors
-share/doc/HTML/en/kpm/commands.html
 share/doc/HTML/en/kpm/common
-share/doc/HTML/en/kpm/compilation.html
-share/doc/HTML/en/kpm/credits.html
-share/doc/HTML/en/kpm/faq.html
+share/doc/HTML/en/kpm/index.cache.bz2
 share/doc/HTML/en/kpm/index.docbook
-share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/installation.html
-share/doc/HTML/en/kpm/introduction.html
 share/doc/HTML/en/kpm/kpmjobs.png
 share/doc/HTML/en/kpm/kpmmemory.png
 share/doc/HTML/en/kpm/kpmstart.png
 share/doc/HTML/en/kpm/kpmtext.png
-share/doc/HTML/en/kpm/managing-processes.html
-share/doc/HTML/en/kpm/monitoring-processes.html
-share/doc/HTML/en/kpm/monitoring-resources.html
-share/doc/HTML/en/kpm/other-signals.html
 share/doc/HTML/en/kpm/qps.1
-share/doc/HTML/en/kpm/requirements.html
-share/doc/HTML/en/kpm/signals.html
-share/doc/HTML/en/kpm/using-kpm.html
-share/doc/HTML/en/ktimemon/.anchors
-share/doc/HTML/en/ktimemon/autoscaling.html
-share/doc/HTML/en/ktimemon/common
-share/doc/HTML/en/ktimemon/config.html
-share/doc/HTML/en/ktimemon/fund.html
-share/doc/HTML/en/ktimemon/index.docbook
-share/doc/HTML/en/ktimemon/index.html
-share/doc/HTML/en/ktimemon/installation.html
-share/doc/HTML/en/ktimemon/introduction.html
-share/doc/HTML/en/ktimemon/menu.html
-share/doc/HTML/en/ktimemon/revisionhistory.html
-share/doc/HTML/en/ktimemon/thanksandacknowledgements.html
+share/icons/hicolor/16x16/apps/ark.png
+share/icons/hicolor/16x16/apps/kab.png
+share/icons/hicolor/16x16/apps/karm.png
+share/icons/hicolor/16x16/apps/kcalc.png
+share/icons/hicolor/16x16/apps/kcharselect.png
+share/icons/hicolor/16x16/apps/kcmdf.png
+share/icons/hicolor/16x16/apps/kdf.png
+share/icons/hicolor/16x16/apps/kedit.png
 share/icons/hicolor/16x16/apps/kfind.png
+share/icons/hicolor/16x16/apps/kfloppy.png
+share/icons/hicolor/16x16/apps/khexedit.png
+share/icons/hicolor/16x16/apps/kjots.png
+share/icons/hicolor/16x16/apps/klaptopdaemon.png
+share/icons/hicolor/16x16/apps/kljettool.png
+share/icons/hicolor/16x16/apps/klpq.png
+share/icons/hicolor/16x16/apps/klprfax.png
+share/icons/hicolor/16x16/apps/knotes.png
+share/icons/hicolor/16x16/apps/kwikdisk.png
+share/icons/hicolor/16x16/apps/laptop_battery.png
+share/icons/hicolor/16x16/apps/laptop_pcmcia.png
 share/icons/hicolor/32x32/apps/ark.png
 share/icons/hicolor/32x32/apps/kab.png
 share/icons/hicolor/32x32/apps/karm.png
 share/icons/hicolor/32x32/apps/kcalc.png
+share/icons/hicolor/32x32/apps/kcmdf.png
+share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kedit.png
 share/icons/hicolor/32x32/apps/kfind.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/khexedit.png
 share/icons/hicolor/32x32/apps/kjots.png
+share/icons/hicolor/32x32/apps/kljettool.png
 share/icons/hicolor/32x32/apps/klpq.png
+share/icons/hicolor/32x32/apps/klprfax.png
 share/icons/hicolor/32x32/apps/knotes.png
+share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/laptop_battery.png
 share/icons/hicolor/32x32/apps/laptop_pcmcia.png
 share/icons/hicolor/48x48/apps/ark.png
@@ -389,53 +241,17 @@ share/icons/hicolor/48x48/apps/klpq.png
 share/icons/hicolor/48x48/apps/knotes.png
 share/icons/hicolor/48x48/apps/laptop_battery.png
 share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/ark.png
-share/icons/locolor/16x16/apps/kab.png
-share/icons/locolor/16x16/apps/karm.png
-share/icons/locolor/16x16/apps/kcalc.png
-share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
-share/icons/locolor/16x16/apps/kedit.png
-share/icons/locolor/16x16/apps/kfind.png
-share/icons/locolor/16x16/apps/kfloppy.png
-share/icons/locolor/16x16/apps/khexedit.png
-share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klaptopdaemon.png
-share/icons/locolor/16x16/apps/kljettool.png
-share/icons/locolor/16x16/apps/klpq.png
-share/icons/locolor/16x16/apps/knotes.png
-share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/32x32/apps/ark.png
-share/icons/locolor/32x32/apps/kab.png
-share/icons/locolor/32x32/apps/karm.png
-share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcharselect.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
-share/icons/locolor/32x32/apps/kedit.png
-share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfloppy.png
-share/icons/locolor/32x32/apps/khexedit.png
-share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/kljettool.png
-share/icons/locolor/32x32/apps/klpq.png
-share/icons/locolor/32x32/apps/knotes.png
-share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_pcmcia.png
+share/icons/locolor/16x16/apps/klprfax.png
+share/icons/locolor/32x32/apps/klprfax.png
+share/services/arkpart.desktop
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/16x16/apps
-@dirrm share/doc/HTML/en/ktimemon
 @dirrm share/doc/HTML/en/kpm
 @dirrm share/doc/HTML/en/knotes
+@dirrm share/doc/HTML/en/klprfax
 @dirrm share/doc/HTML/en/klpq
 @dirrm share/doc/HTML/en/kljettool
 @dirrm share/doc/HTML/en/kjots
@@ -448,17 +264,17 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/doc/HTML/en/karm
 @dirrm share/doc/HTML/en/kab
 @dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en
-@dirrm share/config
+@dirrm share/apps/konqueror/servicemenus
+@dirrm share/apps/konqueror
 @dirrm share/apps/knotes/pics
 @dirrm share/apps/knotes
 @dirrm share/apps/kljettool/pics
 @dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/locolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/locolor
+@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
+@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
+@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
+@dirrm share/apps/klaptopdaemon/icons/hicolor
 @dirrm share/apps/klaptopdaemon/icons
 @dirrm share/apps/klaptopdaemon
 @dirrm share/apps/kjots/pics
@@ -479,10 +295,9 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/kab/pics
 @dirrm share/apps/kab/htmlexport/templates
 @dirrm share/apps/kab/htmlexport
-@dirrm share/apps/kab
-@dirrm share/apps/ark/icons/locolor/22x22/actions
-@dirrm share/apps/ark/icons/locolor/22x22
-@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons/hicolor/22x22/actions
+@dirrm share/apps/ark/icons/hicolor/22x22
+@dirrm share/apps/ark/icons/hicolor
 @dirrm share/apps/ark/icons
 @dirrm share/apps/ark
 @dirrm share/apps
@@ -492,3 +307,4 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/applnk/Settings/Information
 @dirrm share/applnk/Editors
 @dirrm share/applnk
+@dirrm lib/kde2
diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile
index b4a66e40cfcc..e109201f1e57 100644
--- a/deskutils/kdepim/Makefile
+++ b/deskutils/kdepim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -17,7 +17,11 @@ USE_KDELIBS_VER=2
 USE_BISON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
+		"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
+
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim/distinfo b/deskutils/kdepim/distinfo
index ff7c6366b946..d8e0e664d7c5 100644
--- a/deskutils/kdepim/distinfo
+++ b/deskutils/kdepim/distinfo
@@ -1 +1 @@
-MD5 (kdepim-2.1.1.tar.bz2) = eb4245afe441f37a2337875d75e0b4a1
+MD5 (kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
diff --git a/deskutils/kdepim/pkg-plist b/deskutils/kdepim/pkg-plist
index 2ecd9a7ecfa7..2018b1d43fc7 100644
--- a/deskutils/kdepim/pkg-plist
+++ b/deskutils/kdepim/pkg-plist
@@ -1,7 +1,23 @@
-bin/abbrowser
-bin/korganizer
 bin/alarmd
 bin/ical2vcal
+bin/kandy
+bin/kandy_client
+bin/korganizer
+include/ical.h
+include/icalss.h
+include/kgantt/KGantt.h
+include/kgantt/KGanttBarConfig.h
+include/kgantt/KGanttItem.h
+include/kgantt/KGanttRelation.h
+include/kgantt/xQGanttBarView.h
+include/kgantt/xQGanttBarViewPort.h
+include/kgantt/xQGanttListView.h
+include/kgantt/xQGanttListViewPort.h
+include/libicalvcal/icalvcal.h
+include/libicalvcal/port.h
+include/libicalvcal/vcaltmp.h
+include/libicalvcal/vcc.h
+include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -31,76 +47,174 @@ include/rmm/Mailbox_generated.h
 include/rmm/Mechanism.h
 include/rmm/Mechanism_generated.h
 include/rmm/Message.h
-include/rmm/Message_generated.h
 include/rmm/MessageComponent.h
 include/rmm/MessageID.h
 include/rmm/MessageID_generated.h
+include/rmm/Message_generated.h
 include/rmm/MimeType.h
 include/rmm/MimeType_generated.h
 include/rmm/Parameter.h
 include/rmm/ParameterList.h
 include/rmm/ParameterList_generated.h
-include/rmm/Text.h
 include/rmm/Parameter_generated.h
+include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
+lib/libical.a
+lib/libical.la
+lib/libical.so
+lib/libical.so.0
+lib/libicalss.a
+lib/libicalss.la
+lib/libicalss.so
+lib/libicalss.so.0
+lib/libicalvcal.a
+lib/libicalvcal.la
+lib/libicalvcal.so
+lib/libicalvcal.so.0
+lib/libkcal.la
+lib/libkcal.so
+lib/libkcal.so.1
+lib/libkgantt.la
+lib/libkgantt.so
+lib/libkgantt.so.0
+lib/libkimap.la
+lib/libkimap.so
+lib/libkimap.so.0
+lib/libkorganizer.la
+lib/libkorganizer.so
+lib/libkorganizer.so.1
+lib/librmm.la
 lib/librmm.so
-lib/libvcard.so.0
-lib/libvcard.so
-lib/libvcard.la
-lib/libimap.so.0
-lib/libimap.so
-lib/libimap.la
 lib/librmm.so.1
-lib/librmm.la
-lib/libkorganizer.so.1
-lib/libkorganizer.so
-lib/libkorganizer.la
-share/doc/HTML/en/abbrowser/.anchors
-share/doc/HTML/en/abbrowser/compilation-and-installation.html
-share/doc/HTML/en/abbrowser/index.html
-share/doc/HTML/en/abbrowser/installation.html
-share/doc/HTML/en/abbrowser/introduction.html
-share/doc/HTML/en/abbrowser/questions-answers-and-tips.html
-share/doc/HTML/en/abbrowser/requirements.html
-share/doc/HTML/en/abbrowser/using-pab.html
-share/doc/HTML/en/abbrowser/common
-share/doc/HTML/en/abbrowser/index.cvlog
-share/doc/HTML/en/abbrowser/index.docbook
-share/doc/HTML/en/korganizer/.anchors
-share/doc/HTML/en/korganizer/compilation.html
-share/doc/HTML/en/korganizer/config.html
-share/doc/HTML/en/korganizer/course-conclusion.html
-share/doc/HTML/en/korganizer/course-entering-todos.html
-share/doc/HTML/en/korganizer/course-event-types.html
-share/doc/HTML/en/korganizer/course-rescheduling-events.html
-share/doc/HTML/en/korganizer/course-rescheduling-todos.html
-share/doc/HTML/en/korganizer/credits.html
-share/doc/HTML/en/korganizer/entering-data-required-fields.html
-share/doc/HTML/en/korganizer/entering-data-to-do.html
-share/doc/HTML/en/korganizer/entering-data.html
-share/doc/HTML/en/korganizer/examples.html
-share/doc/HTML/en/korganizer/faq.html
-share/doc/HTML/en/korganizer/five-minute-course.html
-share/doc/HTML/en/korganizer/glossary.html
-share/doc/HTML/en/korganizer/index.html
-share/doc/HTML/en/korganizer/installation.html
-share/doc/HTML/en/korganizer/introduction.html
-share/doc/HTML/en/korganizer/other-features-drag-and-drop.html
-share/doc/HTML/en/korganizer/other-features-import.html
-share/doc/HTML/en/korganizer/other-features-konqueror-interaction.html
-share/doc/HTML/en/korganizer/other-features-merging-data.html
-share/doc/HTML/en/korganizer/other-features-palm-sync.html
-share/doc/HTML/en/korganizer/other-features.html
-share/doc/HTML/en/korganizer/reference-action-buttons.html
-share/doc/HTML/en/korganizer/reference-hotkey.html
-share/doc/HTML/en/korganizer/reference-menus.html
-share/doc/HTML/en/korganizer/reference.html
-share/doc/HTML/en/korganizer/requirements.html
-share/doc/HTML/en/korganizer/vcalendar-format.html
-share/doc/HTML/en/korganizer/common
+lib/libvcard.la
+lib/libvcard.so
+lib/libvcard.so.0
+share/applnk/Applications/korganizer.desktop
+share/applnk/Utilities/kandy.desktop
+share/apps/kandy/default.kandy
+share/apps/kandy/kandymobileui.rc
+share/apps/kandy/kandyui.rc
+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/korganizer/holiday_at
+share/apps/korganizer/holiday_au
+share/apps/korganizer/holiday_bavarian
+share/apps/korganizer/holiday_be
+share/apps/korganizer/holiday_ca
+share/apps/korganizer/holiday_catalan
+share/apps/korganizer/holiday_ch
+share/apps/korganizer/holiday_cz
+share/apps/korganizer/holiday_de
+share/apps/korganizer/holiday_dk
+share/apps/korganizer/holiday_es
+share/apps/korganizer/holiday_fi
+share/apps/korganizer/holiday_fr
+share/apps/korganizer/holiday_frswiss
+share/apps/korganizer/holiday_gb
+share/apps/korganizer/holiday_hu
+share/apps/korganizer/holiday_il
+share/apps/korganizer/holiday_is
+share/apps/korganizer/holiday_it
+share/apps/korganizer/holiday_ja
+share/apps/korganizer/holiday_mx
+share/apps/korganizer/holiday_nl
+share/apps/korganizer/holiday_no
+share/apps/korganizer/holiday_nz
+share/apps/korganizer/holiday_pl
+share/apps/korganizer/holiday_pt
+share/apps/korganizer/holiday_quebec
+share/apps/korganizer/holiday_ro
+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/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/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/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/alarmd.png
+share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.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/search.png
+share/apps/korganizer/icons/hicolor/22x22/actions/send.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/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/korganizer_part.rc
+share/apps/korganizer/korganizergsui.rc
+share/apps/korganizer/korganizerui.rc
+share/apps/korganizer/sounds/alert.wav
+share/apps/korganizer/sounds/icemag.wav
+share/apps/korganizer/sounds/lightmag.wav
+share/apps/korganizer/sounds/onscreen.wav
+share/apps/korganizer/sounds/spinout.wav
+share/apps/korganizer/tips
+share/autostart/alarmd.desktop
+share/config/korganizerrc
+share/doc/HTML/en/kandy/common
+share/doc/HTML/en/kandy/index.cache.bz2
+share/doc/HTML/en/kandy/index.docbook
 share/doc/HTML/en/korganizer/alarmd-panel.png
+share/doc/HTML/en/korganizer/common
 share/doc/HTML/en/korganizer/datenavigator.png
 share/doc/HTML/en/korganizer/i_actions_new_event.png
 share/doc/HTML/en/korganizer/i_copy.png
@@ -118,29 +232,20 @@ share/doc/HTML/en/korganizer/i_go_forward.png
 share/doc/HTML/en/korganizer/i_go_to_today.png
 share/doc/HTML/en/korganizer/i_help_contents.png
 share/doc/HTML/en/korganizer/i_paste.png
-share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_settings_prefs.png
+share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_view_list.png
 share/doc/HTML/en/korganizer/i_view_month.png
 share/doc/HTML/en/korganizer/i_view_todo_list.png
 share/doc/HTML/en/korganizer/i_view_week.png
 share/doc/HTML/en/korganizer/i_view_work_week.png
+share/doc/HTML/en/korganizer/index.cache.bz2
 share/doc/HTML/en/korganizer/index.docbook
 share/doc/HTML/en/korganizer/kagenda-appointment.png
-share/doc/HTML/en/kpilot/.anchors
-share/doc/HTML/en/kpilot/builtin.html
-share/doc/HTML/en/kpilot/conduits.html
-share/doc/HTML/en/kpilot/credits.html
-share/doc/HTML/en/kpilot/database.html
-share/doc/HTML/en/kpilot/faq.html
-share/doc/HTML/en/kpilot/hotsync.html
-share/doc/HTML/en/kpilot/index.html
-share/doc/HTML/en/kpilot/introduction.html
-share/doc/HTML/en/kpilot/kpilot-main.html
-share/doc/HTML/en/kpilot/using-kpilot.html
-share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-method.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-pop.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-unix.png
@@ -151,6 +256,7 @@ share/doc/HTML/en/kpilot/conduit-popmail-smtp.png
 share/doc/HTML/en/kpilot/conduit-popmail-top.png
 share/doc/HTML/en/kpilot/conduit-vcal.png
 share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
 share/doc/HTML/en/kpilot/index.docbook
 share/doc/HTML/en/kpilot/main-app.png
 share/doc/HTML/en/kpilot/memo-app.png
@@ -161,139 +267,35 @@ share/doc/HTML/en/kpilot/setup-general.png
 share/doc/HTML/en/kpilot/setup-sync.png
 share/doc/HTML/en/kpilot/toolbar.png
 share/doc/HTML/en/kpilot/toolbar_backup.png
-share/config/korganizerrc
-share/apps/abbrowser/pics/abentry.xpm
-share/apps/abbrowser/pics/delete.xpm
-share/apps/abbrowser/pics/down.xpm
-share/apps/abbrowser/pics/filemail.xpm
-share/apps/abbrowser/pics/find.xpm
-share/apps/abbrowser/pics/group.xpm
-share/apps/abbrowser/pics/page.xpm
-share/apps/abbrowser/pics/up.xpm
-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/alarmd.png
-share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.png
-share/apps/korganizer/icons/hicolor/22x22/actions/appointment.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox.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/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/emptybox.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/search.png
-share/apps/korganizer/icons/hicolor/22x22/actions/send.png
-share/apps/korganizer/icons/hicolor/22x22/actions/today.png
-share/apps/korganizer/icons/hicolor/22x22/actions/todo.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/locolor/16x16/actions/1day.png
-share/apps/korganizer/icons/locolor/16x16/actions/1downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/5days.png
-share/apps/korganizer/icons/locolor/16x16/actions/7days.png
-share/apps/korganizer/icons/locolor/16x16/actions/appointment.png
-share/apps/korganizer/icons/locolor/16x16/actions/bell.png
-share/apps/korganizer/icons/locolor/16x16/actions/dayview.png
-share/apps/korganizer/icons/locolor/16x16/actions/findf.png
-share/apps/korganizer/icons/locolor/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/list.png
-share/apps/korganizer/icons/locolor/16x16/actions/mailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/month.png
-share/apps/korganizer/icons/locolor/16x16/actions/nomailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/playsound.png
-share/apps/korganizer/icons/locolor/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/locolor/16x16/actions/recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/runprog.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallcal.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallclock.png
-share/apps/korganizer/icons/locolor/16x16/actions/today.png
-share/apps/korganizer/icons/locolor/16x16/actions/todo.png
-share/apps/korganizer/holiday_at
-share/apps/korganizer/holiday_au
-share/apps/korganizer/holiday_bavarian
-share/apps/korganizer/holiday_be
-share/apps/korganizer/holiday_ca
-share/apps/korganizer/holiday_catalan
-share/apps/korganizer/holiday_ch
-share/apps/korganizer/holiday_cz
-share/apps/korganizer/holiday_de
-share/apps/korganizer/holiday_dk
-share/apps/korganizer/holiday_es
-share/apps/korganizer/holiday_fi
-share/apps/korganizer/holiday_fr
-share/apps/korganizer/holiday_frswiss
-share/apps/korganizer/holiday_gb
-share/apps/korganizer/holiday_hu
-share/apps/korganizer/holiday_is
-share/apps/korganizer/holiday_it
-share/apps/korganizer/holiday_ja
-share/apps/korganizer/holiday_mx
-share/apps/korganizer/holiday_nl
-share/apps/korganizer/holiday_no
-share/apps/korganizer/sounds/alert.wav
-share/apps/korganizer/sounds/icemag.wav
-share/apps/korganizer/sounds/lightmag.wav
-share/apps/korganizer/sounds/onscreen.wav
-share/apps/korganizer/sounds/spinout.wav
-share/apps/korganizer/holiday_nz
-share/apps/korganizer/holiday_pl
-share/apps/korganizer/holiday_pt
-share/apps/korganizer/holiday_quebec
-share/apps/korganizer/holiday_ro
-share/apps/korganizer/holiday_se
-share/apps/korganizer/holiday_si
-share/apps/korganizer/holiday_th
-share/apps/korganizer/holiday_us
-share/apps/korganizer/korganizer_part.rc
-share/apps/korganizer/korganizerui.rc
-share/apps/korganizer/korganizergsui.rc
-share/icons/locolor/16x16/apps/abbrowser.png
-share/icons/locolor/16x16/apps/korganizer.png
-share/icons/locolor/32x32/apps/korganizer.png
-share/icons/hicolor/32x32/apps/abbrowser.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/icons/hicolor/16x16/apps/kandy.png
+share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/32x32/apps/kandy.png
 share/icons/hicolor/32x32/apps/korganizer.png
 share/icons/hicolor/48x48/apps/korganizer.png
-share/applnk/Applications/korganizer.desktop
-share/applnk/Utilities/abbrowser.desktop
-@dirrm include/rmm
-@dirrm share/doc/HTML/en/abbrowser
-@dirrm share/doc/HTML/en/korganizer
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kpilot
-@dirrm share/apps/abbrowser/pics
-@dirrm share/apps/abbrowser
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions
-@dirrm share/apps/korganizer/icons/hicolor/22x22
+@dirrm share/doc/HTML/en/korganizer
+@dirrm share/doc/HTML/en/kandy
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/korganizer/sounds
 @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/16x16/actions
 @dirrm share/apps/korganizer/icons/hicolor
-@dirrm share/apps/korganizer/icons/locolor/16x16/actions
-@dirrm share/apps/korganizer/icons/locolor/16x16
-@dirrm share/apps/korganizer/icons/locolor
-@dirrm share/apps/korganizer/icons
-@dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer
+@dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kandy
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Applications
+@dirrm include/rmm
+@dirrm include/libicalvcal
+@dirrm include/kgantt
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index b4a66e40cfcc..e109201f1e57 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -17,7 +17,11 @@ USE_KDELIBS_VER=2
 USE_BISON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
+		"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
+
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index ff7c6366b946..d8e0e664d7c5 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1 +1 @@
-MD5 (kdepim-2.1.1.tar.bz2) = eb4245afe441f37a2337875d75e0b4a1
+MD5 (kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 2ecd9a7ecfa7..2018b1d43fc7 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -1,7 +1,23 @@
-bin/abbrowser
-bin/korganizer
 bin/alarmd
 bin/ical2vcal
+bin/kandy
+bin/kandy_client
+bin/korganizer
+include/ical.h
+include/icalss.h
+include/kgantt/KGantt.h
+include/kgantt/KGanttBarConfig.h
+include/kgantt/KGanttItem.h
+include/kgantt/KGanttRelation.h
+include/kgantt/xQGanttBarView.h
+include/kgantt/xQGanttBarViewPort.h
+include/kgantt/xQGanttListView.h
+include/kgantt/xQGanttListViewPort.h
+include/libicalvcal/icalvcal.h
+include/libicalvcal/port.h
+include/libicalvcal/vcaltmp.h
+include/libicalvcal/vcc.h
+include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -31,76 +47,174 @@ include/rmm/Mailbox_generated.h
 include/rmm/Mechanism.h
 include/rmm/Mechanism_generated.h
 include/rmm/Message.h
-include/rmm/Message_generated.h
 include/rmm/MessageComponent.h
 include/rmm/MessageID.h
 include/rmm/MessageID_generated.h
+include/rmm/Message_generated.h
 include/rmm/MimeType.h
 include/rmm/MimeType_generated.h
 include/rmm/Parameter.h
 include/rmm/ParameterList.h
 include/rmm/ParameterList_generated.h
-include/rmm/Text.h
 include/rmm/Parameter_generated.h
+include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
+lib/libical.a
+lib/libical.la
+lib/libical.so
+lib/libical.so.0
+lib/libicalss.a
+lib/libicalss.la
+lib/libicalss.so
+lib/libicalss.so.0
+lib/libicalvcal.a
+lib/libicalvcal.la
+lib/libicalvcal.so
+lib/libicalvcal.so.0
+lib/libkcal.la
+lib/libkcal.so
+lib/libkcal.so.1
+lib/libkgantt.la
+lib/libkgantt.so
+lib/libkgantt.so.0
+lib/libkimap.la
+lib/libkimap.so
+lib/libkimap.so.0
+lib/libkorganizer.la
+lib/libkorganizer.so
+lib/libkorganizer.so.1
+lib/librmm.la
 lib/librmm.so
-lib/libvcard.so.0
-lib/libvcard.so
-lib/libvcard.la
-lib/libimap.so.0
-lib/libimap.so
-lib/libimap.la
 lib/librmm.so.1
-lib/librmm.la
-lib/libkorganizer.so.1
-lib/libkorganizer.so
-lib/libkorganizer.la
-share/doc/HTML/en/abbrowser/.anchors
-share/doc/HTML/en/abbrowser/compilation-and-installation.html
-share/doc/HTML/en/abbrowser/index.html
-share/doc/HTML/en/abbrowser/installation.html
-share/doc/HTML/en/abbrowser/introduction.html
-share/doc/HTML/en/abbrowser/questions-answers-and-tips.html
-share/doc/HTML/en/abbrowser/requirements.html
-share/doc/HTML/en/abbrowser/using-pab.html
-share/doc/HTML/en/abbrowser/common
-share/doc/HTML/en/abbrowser/index.cvlog
-share/doc/HTML/en/abbrowser/index.docbook
-share/doc/HTML/en/korganizer/.anchors
-share/doc/HTML/en/korganizer/compilation.html
-share/doc/HTML/en/korganizer/config.html
-share/doc/HTML/en/korganizer/course-conclusion.html
-share/doc/HTML/en/korganizer/course-entering-todos.html
-share/doc/HTML/en/korganizer/course-event-types.html
-share/doc/HTML/en/korganizer/course-rescheduling-events.html
-share/doc/HTML/en/korganizer/course-rescheduling-todos.html
-share/doc/HTML/en/korganizer/credits.html
-share/doc/HTML/en/korganizer/entering-data-required-fields.html
-share/doc/HTML/en/korganizer/entering-data-to-do.html
-share/doc/HTML/en/korganizer/entering-data.html
-share/doc/HTML/en/korganizer/examples.html
-share/doc/HTML/en/korganizer/faq.html
-share/doc/HTML/en/korganizer/five-minute-course.html
-share/doc/HTML/en/korganizer/glossary.html
-share/doc/HTML/en/korganizer/index.html
-share/doc/HTML/en/korganizer/installation.html
-share/doc/HTML/en/korganizer/introduction.html
-share/doc/HTML/en/korganizer/other-features-drag-and-drop.html
-share/doc/HTML/en/korganizer/other-features-import.html
-share/doc/HTML/en/korganizer/other-features-konqueror-interaction.html
-share/doc/HTML/en/korganizer/other-features-merging-data.html
-share/doc/HTML/en/korganizer/other-features-palm-sync.html
-share/doc/HTML/en/korganizer/other-features.html
-share/doc/HTML/en/korganizer/reference-action-buttons.html
-share/doc/HTML/en/korganizer/reference-hotkey.html
-share/doc/HTML/en/korganizer/reference-menus.html
-share/doc/HTML/en/korganizer/reference.html
-share/doc/HTML/en/korganizer/requirements.html
-share/doc/HTML/en/korganizer/vcalendar-format.html
-share/doc/HTML/en/korganizer/common
+lib/libvcard.la
+lib/libvcard.so
+lib/libvcard.so.0
+share/applnk/Applications/korganizer.desktop
+share/applnk/Utilities/kandy.desktop
+share/apps/kandy/default.kandy
+share/apps/kandy/kandymobileui.rc
+share/apps/kandy/kandyui.rc
+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/korganizer/holiday_at
+share/apps/korganizer/holiday_au
+share/apps/korganizer/holiday_bavarian
+share/apps/korganizer/holiday_be
+share/apps/korganizer/holiday_ca
+share/apps/korganizer/holiday_catalan
+share/apps/korganizer/holiday_ch
+share/apps/korganizer/holiday_cz
+share/apps/korganizer/holiday_de
+share/apps/korganizer/holiday_dk
+share/apps/korganizer/holiday_es
+share/apps/korganizer/holiday_fi
+share/apps/korganizer/holiday_fr
+share/apps/korganizer/holiday_frswiss
+share/apps/korganizer/holiday_gb
+share/apps/korganizer/holiday_hu
+share/apps/korganizer/holiday_il
+share/apps/korganizer/holiday_is
+share/apps/korganizer/holiday_it
+share/apps/korganizer/holiday_ja
+share/apps/korganizer/holiday_mx
+share/apps/korganizer/holiday_nl
+share/apps/korganizer/holiday_no
+share/apps/korganizer/holiday_nz
+share/apps/korganizer/holiday_pl
+share/apps/korganizer/holiday_pt
+share/apps/korganizer/holiday_quebec
+share/apps/korganizer/holiday_ro
+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/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/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/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/alarmd.png
+share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.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/search.png
+share/apps/korganizer/icons/hicolor/22x22/actions/send.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/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/korganizer_part.rc
+share/apps/korganizer/korganizergsui.rc
+share/apps/korganizer/korganizerui.rc
+share/apps/korganizer/sounds/alert.wav
+share/apps/korganizer/sounds/icemag.wav
+share/apps/korganizer/sounds/lightmag.wav
+share/apps/korganizer/sounds/onscreen.wav
+share/apps/korganizer/sounds/spinout.wav
+share/apps/korganizer/tips
+share/autostart/alarmd.desktop
+share/config/korganizerrc
+share/doc/HTML/en/kandy/common
+share/doc/HTML/en/kandy/index.cache.bz2
+share/doc/HTML/en/kandy/index.docbook
 share/doc/HTML/en/korganizer/alarmd-panel.png
+share/doc/HTML/en/korganizer/common
 share/doc/HTML/en/korganizer/datenavigator.png
 share/doc/HTML/en/korganizer/i_actions_new_event.png
 share/doc/HTML/en/korganizer/i_copy.png
@@ -118,29 +232,20 @@ share/doc/HTML/en/korganizer/i_go_forward.png
 share/doc/HTML/en/korganizer/i_go_to_today.png
 share/doc/HTML/en/korganizer/i_help_contents.png
 share/doc/HTML/en/korganizer/i_paste.png
-share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_settings_prefs.png
+share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_view_list.png
 share/doc/HTML/en/korganizer/i_view_month.png
 share/doc/HTML/en/korganizer/i_view_todo_list.png
 share/doc/HTML/en/korganizer/i_view_week.png
 share/doc/HTML/en/korganizer/i_view_work_week.png
+share/doc/HTML/en/korganizer/index.cache.bz2
 share/doc/HTML/en/korganizer/index.docbook
 share/doc/HTML/en/korganizer/kagenda-appointment.png
-share/doc/HTML/en/kpilot/.anchors
-share/doc/HTML/en/kpilot/builtin.html
-share/doc/HTML/en/kpilot/conduits.html
-share/doc/HTML/en/kpilot/credits.html
-share/doc/HTML/en/kpilot/database.html
-share/doc/HTML/en/kpilot/faq.html
-share/doc/HTML/en/kpilot/hotsync.html
-share/doc/HTML/en/kpilot/index.html
-share/doc/HTML/en/kpilot/introduction.html
-share/doc/HTML/en/kpilot/kpilot-main.html
-share/doc/HTML/en/kpilot/using-kpilot.html
-share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-method.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-pop.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-unix.png
@@ -151,6 +256,7 @@ share/doc/HTML/en/kpilot/conduit-popmail-smtp.png
 share/doc/HTML/en/kpilot/conduit-popmail-top.png
 share/doc/HTML/en/kpilot/conduit-vcal.png
 share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
 share/doc/HTML/en/kpilot/index.docbook
 share/doc/HTML/en/kpilot/main-app.png
 share/doc/HTML/en/kpilot/memo-app.png
@@ -161,139 +267,35 @@ share/doc/HTML/en/kpilot/setup-general.png
 share/doc/HTML/en/kpilot/setup-sync.png
 share/doc/HTML/en/kpilot/toolbar.png
 share/doc/HTML/en/kpilot/toolbar_backup.png
-share/config/korganizerrc
-share/apps/abbrowser/pics/abentry.xpm
-share/apps/abbrowser/pics/delete.xpm
-share/apps/abbrowser/pics/down.xpm
-share/apps/abbrowser/pics/filemail.xpm
-share/apps/abbrowser/pics/find.xpm
-share/apps/abbrowser/pics/group.xpm
-share/apps/abbrowser/pics/page.xpm
-share/apps/abbrowser/pics/up.xpm
-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/alarmd.png
-share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.png
-share/apps/korganizer/icons/hicolor/22x22/actions/appointment.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox.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/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/emptybox.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/search.png
-share/apps/korganizer/icons/hicolor/22x22/actions/send.png
-share/apps/korganizer/icons/hicolor/22x22/actions/today.png
-share/apps/korganizer/icons/hicolor/22x22/actions/todo.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/locolor/16x16/actions/1day.png
-share/apps/korganizer/icons/locolor/16x16/actions/1downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/5days.png
-share/apps/korganizer/icons/locolor/16x16/actions/7days.png
-share/apps/korganizer/icons/locolor/16x16/actions/appointment.png
-share/apps/korganizer/icons/locolor/16x16/actions/bell.png
-share/apps/korganizer/icons/locolor/16x16/actions/dayview.png
-share/apps/korganizer/icons/locolor/16x16/actions/findf.png
-share/apps/korganizer/icons/locolor/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/list.png
-share/apps/korganizer/icons/locolor/16x16/actions/mailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/month.png
-share/apps/korganizer/icons/locolor/16x16/actions/nomailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/playsound.png
-share/apps/korganizer/icons/locolor/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/locolor/16x16/actions/recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/runprog.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallcal.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallclock.png
-share/apps/korganizer/icons/locolor/16x16/actions/today.png
-share/apps/korganizer/icons/locolor/16x16/actions/todo.png
-share/apps/korganizer/holiday_at
-share/apps/korganizer/holiday_au
-share/apps/korganizer/holiday_bavarian
-share/apps/korganizer/holiday_be
-share/apps/korganizer/holiday_ca
-share/apps/korganizer/holiday_catalan
-share/apps/korganizer/holiday_ch
-share/apps/korganizer/holiday_cz
-share/apps/korganizer/holiday_de
-share/apps/korganizer/holiday_dk
-share/apps/korganizer/holiday_es
-share/apps/korganizer/holiday_fi
-share/apps/korganizer/holiday_fr
-share/apps/korganizer/holiday_frswiss
-share/apps/korganizer/holiday_gb
-share/apps/korganizer/holiday_hu
-share/apps/korganizer/holiday_is
-share/apps/korganizer/holiday_it
-share/apps/korganizer/holiday_ja
-share/apps/korganizer/holiday_mx
-share/apps/korganizer/holiday_nl
-share/apps/korganizer/holiday_no
-share/apps/korganizer/sounds/alert.wav
-share/apps/korganizer/sounds/icemag.wav
-share/apps/korganizer/sounds/lightmag.wav
-share/apps/korganizer/sounds/onscreen.wav
-share/apps/korganizer/sounds/spinout.wav
-share/apps/korganizer/holiday_nz
-share/apps/korganizer/holiday_pl
-share/apps/korganizer/holiday_pt
-share/apps/korganizer/holiday_quebec
-share/apps/korganizer/holiday_ro
-share/apps/korganizer/holiday_se
-share/apps/korganizer/holiday_si
-share/apps/korganizer/holiday_th
-share/apps/korganizer/holiday_us
-share/apps/korganizer/korganizer_part.rc
-share/apps/korganizer/korganizerui.rc
-share/apps/korganizer/korganizergsui.rc
-share/icons/locolor/16x16/apps/abbrowser.png
-share/icons/locolor/16x16/apps/korganizer.png
-share/icons/locolor/32x32/apps/korganizer.png
-share/icons/hicolor/32x32/apps/abbrowser.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/icons/hicolor/16x16/apps/kandy.png
+share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/32x32/apps/kandy.png
 share/icons/hicolor/32x32/apps/korganizer.png
 share/icons/hicolor/48x48/apps/korganizer.png
-share/applnk/Applications/korganizer.desktop
-share/applnk/Utilities/abbrowser.desktop
-@dirrm include/rmm
-@dirrm share/doc/HTML/en/abbrowser
-@dirrm share/doc/HTML/en/korganizer
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kpilot
-@dirrm share/apps/abbrowser/pics
-@dirrm share/apps/abbrowser
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions
-@dirrm share/apps/korganizer/icons/hicolor/22x22
+@dirrm share/doc/HTML/en/korganizer
+@dirrm share/doc/HTML/en/kandy
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/korganizer/sounds
 @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/16x16/actions
 @dirrm share/apps/korganizer/icons/hicolor
-@dirrm share/apps/korganizer/icons/locolor/16x16/actions
-@dirrm share/apps/korganizer/icons/locolor/16x16
-@dirrm share/apps/korganizer/icons/locolor
-@dirrm share/apps/korganizer/icons
-@dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer
+@dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kandy
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Applications
+@dirrm include/rmm
+@dirrm include/libicalvcal
+@dirrm include/kgantt
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index b4a66e40cfcc..e109201f1e57 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -17,7 +17,11 @@ USE_KDELIBS_VER=2
 USE_BISON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
+		"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
+
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index ff7c6366b946..d8e0e664d7c5 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1 +1 @@
-MD5 (kdepim-2.1.1.tar.bz2) = eb4245afe441f37a2337875d75e0b4a1
+MD5 (kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 2ecd9a7ecfa7..2018b1d43fc7 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,7 +1,23 @@
-bin/abbrowser
-bin/korganizer
 bin/alarmd
 bin/ical2vcal
+bin/kandy
+bin/kandy_client
+bin/korganizer
+include/ical.h
+include/icalss.h
+include/kgantt/KGantt.h
+include/kgantt/KGanttBarConfig.h
+include/kgantt/KGanttItem.h
+include/kgantt/KGanttRelation.h
+include/kgantt/xQGanttBarView.h
+include/kgantt/xQGanttBarViewPort.h
+include/kgantt/xQGanttListView.h
+include/kgantt/xQGanttListViewPort.h
+include/libicalvcal/icalvcal.h
+include/libicalvcal/port.h
+include/libicalvcal/vcaltmp.h
+include/libicalvcal/vcc.h
+include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -31,76 +47,174 @@ include/rmm/Mailbox_generated.h
 include/rmm/Mechanism.h
 include/rmm/Mechanism_generated.h
 include/rmm/Message.h
-include/rmm/Message_generated.h
 include/rmm/MessageComponent.h
 include/rmm/MessageID.h
 include/rmm/MessageID_generated.h
+include/rmm/Message_generated.h
 include/rmm/MimeType.h
 include/rmm/MimeType_generated.h
 include/rmm/Parameter.h
 include/rmm/ParameterList.h
 include/rmm/ParameterList_generated.h
-include/rmm/Text.h
 include/rmm/Parameter_generated.h
+include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
+lib/libical.a
+lib/libical.la
+lib/libical.so
+lib/libical.so.0
+lib/libicalss.a
+lib/libicalss.la
+lib/libicalss.so
+lib/libicalss.so.0
+lib/libicalvcal.a
+lib/libicalvcal.la
+lib/libicalvcal.so
+lib/libicalvcal.so.0
+lib/libkcal.la
+lib/libkcal.so
+lib/libkcal.so.1
+lib/libkgantt.la
+lib/libkgantt.so
+lib/libkgantt.so.0
+lib/libkimap.la
+lib/libkimap.so
+lib/libkimap.so.0
+lib/libkorganizer.la
+lib/libkorganizer.so
+lib/libkorganizer.so.1
+lib/librmm.la
 lib/librmm.so
-lib/libvcard.so.0
-lib/libvcard.so
-lib/libvcard.la
-lib/libimap.so.0
-lib/libimap.so
-lib/libimap.la
 lib/librmm.so.1
-lib/librmm.la
-lib/libkorganizer.so.1
-lib/libkorganizer.so
-lib/libkorganizer.la
-share/doc/HTML/en/abbrowser/.anchors
-share/doc/HTML/en/abbrowser/compilation-and-installation.html
-share/doc/HTML/en/abbrowser/index.html
-share/doc/HTML/en/abbrowser/installation.html
-share/doc/HTML/en/abbrowser/introduction.html
-share/doc/HTML/en/abbrowser/questions-answers-and-tips.html
-share/doc/HTML/en/abbrowser/requirements.html
-share/doc/HTML/en/abbrowser/using-pab.html
-share/doc/HTML/en/abbrowser/common
-share/doc/HTML/en/abbrowser/index.cvlog
-share/doc/HTML/en/abbrowser/index.docbook
-share/doc/HTML/en/korganizer/.anchors
-share/doc/HTML/en/korganizer/compilation.html
-share/doc/HTML/en/korganizer/config.html
-share/doc/HTML/en/korganizer/course-conclusion.html
-share/doc/HTML/en/korganizer/course-entering-todos.html
-share/doc/HTML/en/korganizer/course-event-types.html
-share/doc/HTML/en/korganizer/course-rescheduling-events.html
-share/doc/HTML/en/korganizer/course-rescheduling-todos.html
-share/doc/HTML/en/korganizer/credits.html
-share/doc/HTML/en/korganizer/entering-data-required-fields.html
-share/doc/HTML/en/korganizer/entering-data-to-do.html
-share/doc/HTML/en/korganizer/entering-data.html
-share/doc/HTML/en/korganizer/examples.html
-share/doc/HTML/en/korganizer/faq.html
-share/doc/HTML/en/korganizer/five-minute-course.html
-share/doc/HTML/en/korganizer/glossary.html
-share/doc/HTML/en/korganizer/index.html
-share/doc/HTML/en/korganizer/installation.html
-share/doc/HTML/en/korganizer/introduction.html
-share/doc/HTML/en/korganizer/other-features-drag-and-drop.html
-share/doc/HTML/en/korganizer/other-features-import.html
-share/doc/HTML/en/korganizer/other-features-konqueror-interaction.html
-share/doc/HTML/en/korganizer/other-features-merging-data.html
-share/doc/HTML/en/korganizer/other-features-palm-sync.html
-share/doc/HTML/en/korganizer/other-features.html
-share/doc/HTML/en/korganizer/reference-action-buttons.html
-share/doc/HTML/en/korganizer/reference-hotkey.html
-share/doc/HTML/en/korganizer/reference-menus.html
-share/doc/HTML/en/korganizer/reference.html
-share/doc/HTML/en/korganizer/requirements.html
-share/doc/HTML/en/korganizer/vcalendar-format.html
-share/doc/HTML/en/korganizer/common
+lib/libvcard.la
+lib/libvcard.so
+lib/libvcard.so.0
+share/applnk/Applications/korganizer.desktop
+share/applnk/Utilities/kandy.desktop
+share/apps/kandy/default.kandy
+share/apps/kandy/kandymobileui.rc
+share/apps/kandy/kandyui.rc
+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/korganizer/holiday_at
+share/apps/korganizer/holiday_au
+share/apps/korganizer/holiday_bavarian
+share/apps/korganizer/holiday_be
+share/apps/korganizer/holiday_ca
+share/apps/korganizer/holiday_catalan
+share/apps/korganizer/holiday_ch
+share/apps/korganizer/holiday_cz
+share/apps/korganizer/holiday_de
+share/apps/korganizer/holiday_dk
+share/apps/korganizer/holiday_es
+share/apps/korganizer/holiday_fi
+share/apps/korganizer/holiday_fr
+share/apps/korganizer/holiday_frswiss
+share/apps/korganizer/holiday_gb
+share/apps/korganizer/holiday_hu
+share/apps/korganizer/holiday_il
+share/apps/korganizer/holiday_is
+share/apps/korganizer/holiday_it
+share/apps/korganizer/holiday_ja
+share/apps/korganizer/holiday_mx
+share/apps/korganizer/holiday_nl
+share/apps/korganizer/holiday_no
+share/apps/korganizer/holiday_nz
+share/apps/korganizer/holiday_pl
+share/apps/korganizer/holiday_pt
+share/apps/korganizer/holiday_quebec
+share/apps/korganizer/holiday_ro
+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/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/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/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/alarmd.png
+share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.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/search.png
+share/apps/korganizer/icons/hicolor/22x22/actions/send.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/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/korganizer_part.rc
+share/apps/korganizer/korganizergsui.rc
+share/apps/korganizer/korganizerui.rc
+share/apps/korganizer/sounds/alert.wav
+share/apps/korganizer/sounds/icemag.wav
+share/apps/korganizer/sounds/lightmag.wav
+share/apps/korganizer/sounds/onscreen.wav
+share/apps/korganizer/sounds/spinout.wav
+share/apps/korganizer/tips
+share/autostart/alarmd.desktop
+share/config/korganizerrc
+share/doc/HTML/en/kandy/common
+share/doc/HTML/en/kandy/index.cache.bz2
+share/doc/HTML/en/kandy/index.docbook
 share/doc/HTML/en/korganizer/alarmd-panel.png
+share/doc/HTML/en/korganizer/common
 share/doc/HTML/en/korganizer/datenavigator.png
 share/doc/HTML/en/korganizer/i_actions_new_event.png
 share/doc/HTML/en/korganizer/i_copy.png
@@ -118,29 +232,20 @@ share/doc/HTML/en/korganizer/i_go_forward.png
 share/doc/HTML/en/korganizer/i_go_to_today.png
 share/doc/HTML/en/korganizer/i_help_contents.png
 share/doc/HTML/en/korganizer/i_paste.png
-share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_settings_prefs.png
+share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_view_list.png
 share/doc/HTML/en/korganizer/i_view_month.png
 share/doc/HTML/en/korganizer/i_view_todo_list.png
 share/doc/HTML/en/korganizer/i_view_week.png
 share/doc/HTML/en/korganizer/i_view_work_week.png
+share/doc/HTML/en/korganizer/index.cache.bz2
 share/doc/HTML/en/korganizer/index.docbook
 share/doc/HTML/en/korganizer/kagenda-appointment.png
-share/doc/HTML/en/kpilot/.anchors
-share/doc/HTML/en/kpilot/builtin.html
-share/doc/HTML/en/kpilot/conduits.html
-share/doc/HTML/en/kpilot/credits.html
-share/doc/HTML/en/kpilot/database.html
-share/doc/HTML/en/kpilot/faq.html
-share/doc/HTML/en/kpilot/hotsync.html
-share/doc/HTML/en/kpilot/index.html
-share/doc/HTML/en/kpilot/introduction.html
-share/doc/HTML/en/kpilot/kpilot-main.html
-share/doc/HTML/en/kpilot/using-kpilot.html
-share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-method.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-pop.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-unix.png
@@ -151,6 +256,7 @@ share/doc/HTML/en/kpilot/conduit-popmail-smtp.png
 share/doc/HTML/en/kpilot/conduit-popmail-top.png
 share/doc/HTML/en/kpilot/conduit-vcal.png
 share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
 share/doc/HTML/en/kpilot/index.docbook
 share/doc/HTML/en/kpilot/main-app.png
 share/doc/HTML/en/kpilot/memo-app.png
@@ -161,139 +267,35 @@ share/doc/HTML/en/kpilot/setup-general.png
 share/doc/HTML/en/kpilot/setup-sync.png
 share/doc/HTML/en/kpilot/toolbar.png
 share/doc/HTML/en/kpilot/toolbar_backup.png
-share/config/korganizerrc
-share/apps/abbrowser/pics/abentry.xpm
-share/apps/abbrowser/pics/delete.xpm
-share/apps/abbrowser/pics/down.xpm
-share/apps/abbrowser/pics/filemail.xpm
-share/apps/abbrowser/pics/find.xpm
-share/apps/abbrowser/pics/group.xpm
-share/apps/abbrowser/pics/page.xpm
-share/apps/abbrowser/pics/up.xpm
-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/alarmd.png
-share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.png
-share/apps/korganizer/icons/hicolor/22x22/actions/appointment.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox.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/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/emptybox.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/search.png
-share/apps/korganizer/icons/hicolor/22x22/actions/send.png
-share/apps/korganizer/icons/hicolor/22x22/actions/today.png
-share/apps/korganizer/icons/hicolor/22x22/actions/todo.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/locolor/16x16/actions/1day.png
-share/apps/korganizer/icons/locolor/16x16/actions/1downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/5days.png
-share/apps/korganizer/icons/locolor/16x16/actions/7days.png
-share/apps/korganizer/icons/locolor/16x16/actions/appointment.png
-share/apps/korganizer/icons/locolor/16x16/actions/bell.png
-share/apps/korganizer/icons/locolor/16x16/actions/dayview.png
-share/apps/korganizer/icons/locolor/16x16/actions/findf.png
-share/apps/korganizer/icons/locolor/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/list.png
-share/apps/korganizer/icons/locolor/16x16/actions/mailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/month.png
-share/apps/korganizer/icons/locolor/16x16/actions/nomailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/playsound.png
-share/apps/korganizer/icons/locolor/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/locolor/16x16/actions/recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/runprog.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallcal.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallclock.png
-share/apps/korganizer/icons/locolor/16x16/actions/today.png
-share/apps/korganizer/icons/locolor/16x16/actions/todo.png
-share/apps/korganizer/holiday_at
-share/apps/korganizer/holiday_au
-share/apps/korganizer/holiday_bavarian
-share/apps/korganizer/holiday_be
-share/apps/korganizer/holiday_ca
-share/apps/korganizer/holiday_catalan
-share/apps/korganizer/holiday_ch
-share/apps/korganizer/holiday_cz
-share/apps/korganizer/holiday_de
-share/apps/korganizer/holiday_dk
-share/apps/korganizer/holiday_es
-share/apps/korganizer/holiday_fi
-share/apps/korganizer/holiday_fr
-share/apps/korganizer/holiday_frswiss
-share/apps/korganizer/holiday_gb
-share/apps/korganizer/holiday_hu
-share/apps/korganizer/holiday_is
-share/apps/korganizer/holiday_it
-share/apps/korganizer/holiday_ja
-share/apps/korganizer/holiday_mx
-share/apps/korganizer/holiday_nl
-share/apps/korganizer/holiday_no
-share/apps/korganizer/sounds/alert.wav
-share/apps/korganizer/sounds/icemag.wav
-share/apps/korganizer/sounds/lightmag.wav
-share/apps/korganizer/sounds/onscreen.wav
-share/apps/korganizer/sounds/spinout.wav
-share/apps/korganizer/holiday_nz
-share/apps/korganizer/holiday_pl
-share/apps/korganizer/holiday_pt
-share/apps/korganizer/holiday_quebec
-share/apps/korganizer/holiday_ro
-share/apps/korganizer/holiday_se
-share/apps/korganizer/holiday_si
-share/apps/korganizer/holiday_th
-share/apps/korganizer/holiday_us
-share/apps/korganizer/korganizer_part.rc
-share/apps/korganizer/korganizerui.rc
-share/apps/korganizer/korganizergsui.rc
-share/icons/locolor/16x16/apps/abbrowser.png
-share/icons/locolor/16x16/apps/korganizer.png
-share/icons/locolor/32x32/apps/korganizer.png
-share/icons/hicolor/32x32/apps/abbrowser.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/icons/hicolor/16x16/apps/kandy.png
+share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/32x32/apps/kandy.png
 share/icons/hicolor/32x32/apps/korganizer.png
 share/icons/hicolor/48x48/apps/korganizer.png
-share/applnk/Applications/korganizer.desktop
-share/applnk/Utilities/abbrowser.desktop
-@dirrm include/rmm
-@dirrm share/doc/HTML/en/abbrowser
-@dirrm share/doc/HTML/en/korganizer
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kpilot
-@dirrm share/apps/abbrowser/pics
-@dirrm share/apps/abbrowser
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions
-@dirrm share/apps/korganizer/icons/hicolor/22x22
+@dirrm share/doc/HTML/en/korganizer
+@dirrm share/doc/HTML/en/kandy
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/korganizer/sounds
 @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/16x16/actions
 @dirrm share/apps/korganizer/icons/hicolor
-@dirrm share/apps/korganizer/icons/locolor/16x16/actions
-@dirrm share/apps/korganizer/icons/locolor/16x16
-@dirrm share/apps/korganizer/icons/locolor
-@dirrm share/apps/korganizer/icons
-@dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer
+@dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kandy
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Applications
+@dirrm include/rmm
+@dirrm include/libicalvcal
+@dirrm include/kgantt
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index b4a66e40cfcc..e109201f1e57 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -17,7 +17,11 @@ USE_KDELIBS_VER=2
 USE_BISON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
+		"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
+
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index ff7c6366b946..d8e0e664d7c5 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1 +1 @@
-MD5 (kdepim-2.1.1.tar.bz2) = eb4245afe441f37a2337875d75e0b4a1
+MD5 (kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 2ecd9a7ecfa7..2018b1d43fc7 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -1,7 +1,23 @@
-bin/abbrowser
-bin/korganizer
 bin/alarmd
 bin/ical2vcal
+bin/kandy
+bin/kandy_client
+bin/korganizer
+include/ical.h
+include/icalss.h
+include/kgantt/KGantt.h
+include/kgantt/KGanttBarConfig.h
+include/kgantt/KGanttItem.h
+include/kgantt/KGanttRelation.h
+include/kgantt/xQGanttBarView.h
+include/kgantt/xQGanttBarViewPort.h
+include/kgantt/xQGanttListView.h
+include/kgantt/xQGanttListViewPort.h
+include/libicalvcal/icalvcal.h
+include/libicalvcal/port.h
+include/libicalvcal/vcaltmp.h
+include/libicalvcal/vcc.h
+include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -31,76 +47,174 @@ include/rmm/Mailbox_generated.h
 include/rmm/Mechanism.h
 include/rmm/Mechanism_generated.h
 include/rmm/Message.h
-include/rmm/Message_generated.h
 include/rmm/MessageComponent.h
 include/rmm/MessageID.h
 include/rmm/MessageID_generated.h
+include/rmm/Message_generated.h
 include/rmm/MimeType.h
 include/rmm/MimeType_generated.h
 include/rmm/Parameter.h
 include/rmm/ParameterList.h
 include/rmm/ParameterList_generated.h
-include/rmm/Text.h
 include/rmm/Parameter_generated.h
+include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
+lib/libical.a
+lib/libical.la
+lib/libical.so
+lib/libical.so.0
+lib/libicalss.a
+lib/libicalss.la
+lib/libicalss.so
+lib/libicalss.so.0
+lib/libicalvcal.a
+lib/libicalvcal.la
+lib/libicalvcal.so
+lib/libicalvcal.so.0
+lib/libkcal.la
+lib/libkcal.so
+lib/libkcal.so.1
+lib/libkgantt.la
+lib/libkgantt.so
+lib/libkgantt.so.0
+lib/libkimap.la
+lib/libkimap.so
+lib/libkimap.so.0
+lib/libkorganizer.la
+lib/libkorganizer.so
+lib/libkorganizer.so.1
+lib/librmm.la
 lib/librmm.so
-lib/libvcard.so.0
-lib/libvcard.so
-lib/libvcard.la
-lib/libimap.so.0
-lib/libimap.so
-lib/libimap.la
 lib/librmm.so.1
-lib/librmm.la
-lib/libkorganizer.so.1
-lib/libkorganizer.so
-lib/libkorganizer.la
-share/doc/HTML/en/abbrowser/.anchors
-share/doc/HTML/en/abbrowser/compilation-and-installation.html
-share/doc/HTML/en/abbrowser/index.html
-share/doc/HTML/en/abbrowser/installation.html
-share/doc/HTML/en/abbrowser/introduction.html
-share/doc/HTML/en/abbrowser/questions-answers-and-tips.html
-share/doc/HTML/en/abbrowser/requirements.html
-share/doc/HTML/en/abbrowser/using-pab.html
-share/doc/HTML/en/abbrowser/common
-share/doc/HTML/en/abbrowser/index.cvlog
-share/doc/HTML/en/abbrowser/index.docbook
-share/doc/HTML/en/korganizer/.anchors
-share/doc/HTML/en/korganizer/compilation.html
-share/doc/HTML/en/korganizer/config.html
-share/doc/HTML/en/korganizer/course-conclusion.html
-share/doc/HTML/en/korganizer/course-entering-todos.html
-share/doc/HTML/en/korganizer/course-event-types.html
-share/doc/HTML/en/korganizer/course-rescheduling-events.html
-share/doc/HTML/en/korganizer/course-rescheduling-todos.html
-share/doc/HTML/en/korganizer/credits.html
-share/doc/HTML/en/korganizer/entering-data-required-fields.html
-share/doc/HTML/en/korganizer/entering-data-to-do.html
-share/doc/HTML/en/korganizer/entering-data.html
-share/doc/HTML/en/korganizer/examples.html
-share/doc/HTML/en/korganizer/faq.html
-share/doc/HTML/en/korganizer/five-minute-course.html
-share/doc/HTML/en/korganizer/glossary.html
-share/doc/HTML/en/korganizer/index.html
-share/doc/HTML/en/korganizer/installation.html
-share/doc/HTML/en/korganizer/introduction.html
-share/doc/HTML/en/korganizer/other-features-drag-and-drop.html
-share/doc/HTML/en/korganizer/other-features-import.html
-share/doc/HTML/en/korganizer/other-features-konqueror-interaction.html
-share/doc/HTML/en/korganizer/other-features-merging-data.html
-share/doc/HTML/en/korganizer/other-features-palm-sync.html
-share/doc/HTML/en/korganizer/other-features.html
-share/doc/HTML/en/korganizer/reference-action-buttons.html
-share/doc/HTML/en/korganizer/reference-hotkey.html
-share/doc/HTML/en/korganizer/reference-menus.html
-share/doc/HTML/en/korganizer/reference.html
-share/doc/HTML/en/korganizer/requirements.html
-share/doc/HTML/en/korganizer/vcalendar-format.html
-share/doc/HTML/en/korganizer/common
+lib/libvcard.la
+lib/libvcard.so
+lib/libvcard.so.0
+share/applnk/Applications/korganizer.desktop
+share/applnk/Utilities/kandy.desktop
+share/apps/kandy/default.kandy
+share/apps/kandy/kandymobileui.rc
+share/apps/kandy/kandyui.rc
+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/korganizer/holiday_at
+share/apps/korganizer/holiday_au
+share/apps/korganizer/holiday_bavarian
+share/apps/korganizer/holiday_be
+share/apps/korganizer/holiday_ca
+share/apps/korganizer/holiday_catalan
+share/apps/korganizer/holiday_ch
+share/apps/korganizer/holiday_cz
+share/apps/korganizer/holiday_de
+share/apps/korganizer/holiday_dk
+share/apps/korganizer/holiday_es
+share/apps/korganizer/holiday_fi
+share/apps/korganizer/holiday_fr
+share/apps/korganizer/holiday_frswiss
+share/apps/korganizer/holiday_gb
+share/apps/korganizer/holiday_hu
+share/apps/korganizer/holiday_il
+share/apps/korganizer/holiday_is
+share/apps/korganizer/holiday_it
+share/apps/korganizer/holiday_ja
+share/apps/korganizer/holiday_mx
+share/apps/korganizer/holiday_nl
+share/apps/korganizer/holiday_no
+share/apps/korganizer/holiday_nz
+share/apps/korganizer/holiday_pl
+share/apps/korganizer/holiday_pt
+share/apps/korganizer/holiday_quebec
+share/apps/korganizer/holiday_ro
+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/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/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/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/alarmd.png
+share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.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/search.png
+share/apps/korganizer/icons/hicolor/22x22/actions/send.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/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/korganizer_part.rc
+share/apps/korganizer/korganizergsui.rc
+share/apps/korganizer/korganizerui.rc
+share/apps/korganizer/sounds/alert.wav
+share/apps/korganizer/sounds/icemag.wav
+share/apps/korganizer/sounds/lightmag.wav
+share/apps/korganizer/sounds/onscreen.wav
+share/apps/korganizer/sounds/spinout.wav
+share/apps/korganizer/tips
+share/autostart/alarmd.desktop
+share/config/korganizerrc
+share/doc/HTML/en/kandy/common
+share/doc/HTML/en/kandy/index.cache.bz2
+share/doc/HTML/en/kandy/index.docbook
 share/doc/HTML/en/korganizer/alarmd-panel.png
+share/doc/HTML/en/korganizer/common
 share/doc/HTML/en/korganizer/datenavigator.png
 share/doc/HTML/en/korganizer/i_actions_new_event.png
 share/doc/HTML/en/korganizer/i_copy.png
@@ -118,29 +232,20 @@ share/doc/HTML/en/korganizer/i_go_forward.png
 share/doc/HTML/en/korganizer/i_go_to_today.png
 share/doc/HTML/en/korganizer/i_help_contents.png
 share/doc/HTML/en/korganizer/i_paste.png
-share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_settings_prefs.png
+share/doc/HTML/en/korganizer/i_view_day.png
 share/doc/HTML/en/korganizer/i_view_list.png
 share/doc/HTML/en/korganizer/i_view_month.png
 share/doc/HTML/en/korganizer/i_view_todo_list.png
 share/doc/HTML/en/korganizer/i_view_week.png
 share/doc/HTML/en/korganizer/i_view_work_week.png
+share/doc/HTML/en/korganizer/index.cache.bz2
 share/doc/HTML/en/korganizer/index.docbook
 share/doc/HTML/en/korganizer/kagenda-appointment.png
-share/doc/HTML/en/kpilot/.anchors
-share/doc/HTML/en/kpilot/builtin.html
-share/doc/HTML/en/kpilot/conduits.html
-share/doc/HTML/en/kpilot/credits.html
-share/doc/HTML/en/kpilot/database.html
-share/doc/HTML/en/kpilot/faq.html
-share/doc/HTML/en/kpilot/hotsync.html
-share/doc/HTML/en/kpilot/index.html
-share/doc/HTML/en/kpilot/introduction.html
-share/doc/HTML/en/kpilot/kpilot-main.html
-share/doc/HTML/en/kpilot/using-kpilot.html
-share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/address-app.png
+share/doc/HTML/en/kpilot/common
 share/doc/HTML/en/kpilot/conduit-knotes.png
+share/doc/HTML/en/kpilot/conduit-popmail-kmail.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-method.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-pop.png
 share/doc/HTML/en/kpilot/conduit-popmail-recv-unix.png
@@ -151,6 +256,7 @@ share/doc/HTML/en/kpilot/conduit-popmail-smtp.png
 share/doc/HTML/en/kpilot/conduit-popmail-top.png
 share/doc/HTML/en/kpilot/conduit-vcal.png
 share/doc/HTML/en/kpilot/file-app.png
+share/doc/HTML/en/kpilot/index.cache.bz2
 share/doc/HTML/en/kpilot/index.docbook
 share/doc/HTML/en/kpilot/main-app.png
 share/doc/HTML/en/kpilot/memo-app.png
@@ -161,139 +267,35 @@ share/doc/HTML/en/kpilot/setup-general.png
 share/doc/HTML/en/kpilot/setup-sync.png
 share/doc/HTML/en/kpilot/toolbar.png
 share/doc/HTML/en/kpilot/toolbar_backup.png
-share/config/korganizerrc
-share/apps/abbrowser/pics/abentry.xpm
-share/apps/abbrowser/pics/delete.xpm
-share/apps/abbrowser/pics/down.xpm
-share/apps/abbrowser/pics/filemail.xpm
-share/apps/abbrowser/pics/find.xpm
-share/apps/abbrowser/pics/group.xpm
-share/apps/abbrowser/pics/page.xpm
-share/apps/abbrowser/pics/up.xpm
-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/alarmd.png
-share/apps/korganizer/icons/hicolor/22x22/actions/alarmd_disabled.png
-share/apps/korganizer/icons/hicolor/22x22/actions/appointment.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox.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/mask.png
-share/apps/korganizer/icons/hicolor/22x22/actions/emptybox.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/search.png
-share/apps/korganizer/icons/hicolor/22x22/actions/send.png
-share/apps/korganizer/icons/hicolor/22x22/actions/today.png
-share/apps/korganizer/icons/hicolor/22x22/actions/todo.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/locolor/16x16/actions/1day.png
-share/apps/korganizer/icons/locolor/16x16/actions/1downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/1uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2leftarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2rightarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/2uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3downarrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/3uparrow.png
-share/apps/korganizer/icons/locolor/16x16/actions/5days.png
-share/apps/korganizer/icons/locolor/16x16/actions/7days.png
-share/apps/korganizer/icons/locolor/16x16/actions/appointment.png
-share/apps/korganizer/icons/locolor/16x16/actions/bell.png
-share/apps/korganizer/icons/locolor/16x16/actions/dayview.png
-share/apps/korganizer/icons/locolor/16x16/actions/findf.png
-share/apps/korganizer/icons/locolor/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/list.png
-share/apps/korganizer/icons/locolor/16x16/actions/mailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/month.png
-share/apps/korganizer/icons/locolor/16x16/actions/nomailappt.png
-share/apps/korganizer/icons/locolor/16x16/actions/playsound.png
-share/apps/korganizer/icons/locolor/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/locolor/16x16/actions/recur.png
-share/apps/korganizer/icons/locolor/16x16/actions/runprog.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallcal.png
-share/apps/korganizer/icons/locolor/16x16/actions/smallclock.png
-share/apps/korganizer/icons/locolor/16x16/actions/today.png
-share/apps/korganizer/icons/locolor/16x16/actions/todo.png
-share/apps/korganizer/holiday_at
-share/apps/korganizer/holiday_au
-share/apps/korganizer/holiday_bavarian
-share/apps/korganizer/holiday_be
-share/apps/korganizer/holiday_ca
-share/apps/korganizer/holiday_catalan
-share/apps/korganizer/holiday_ch
-share/apps/korganizer/holiday_cz
-share/apps/korganizer/holiday_de
-share/apps/korganizer/holiday_dk
-share/apps/korganizer/holiday_es
-share/apps/korganizer/holiday_fi
-share/apps/korganizer/holiday_fr
-share/apps/korganizer/holiday_frswiss
-share/apps/korganizer/holiday_gb
-share/apps/korganizer/holiday_hu
-share/apps/korganizer/holiday_is
-share/apps/korganizer/holiday_it
-share/apps/korganizer/holiday_ja
-share/apps/korganizer/holiday_mx
-share/apps/korganizer/holiday_nl
-share/apps/korganizer/holiday_no
-share/apps/korganizer/sounds/alert.wav
-share/apps/korganizer/sounds/icemag.wav
-share/apps/korganizer/sounds/lightmag.wav
-share/apps/korganizer/sounds/onscreen.wav
-share/apps/korganizer/sounds/spinout.wav
-share/apps/korganizer/holiday_nz
-share/apps/korganizer/holiday_pl
-share/apps/korganizer/holiday_pt
-share/apps/korganizer/holiday_quebec
-share/apps/korganizer/holiday_ro
-share/apps/korganizer/holiday_se
-share/apps/korganizer/holiday_si
-share/apps/korganizer/holiday_th
-share/apps/korganizer/holiday_us
-share/apps/korganizer/korganizer_part.rc
-share/apps/korganizer/korganizerui.rc
-share/apps/korganizer/korganizergsui.rc
-share/icons/locolor/16x16/apps/abbrowser.png
-share/icons/locolor/16x16/apps/korganizer.png
-share/icons/locolor/32x32/apps/korganizer.png
-share/icons/hicolor/32x32/apps/abbrowser.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
+share/icons/hicolor/16x16/apps/kandy.png
+share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/32x32/apps/kandy.png
 share/icons/hicolor/32x32/apps/korganizer.png
 share/icons/hicolor/48x48/apps/korganizer.png
-share/applnk/Applications/korganizer.desktop
-share/applnk/Utilities/abbrowser.desktop
-@dirrm include/rmm
-@dirrm share/doc/HTML/en/abbrowser
-@dirrm share/doc/HTML/en/korganizer
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kpilot
-@dirrm share/apps/abbrowser/pics
-@dirrm share/apps/abbrowser
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
-@dirrm share/apps/korganizer/icons/hicolor/22x22/actions
-@dirrm share/apps/korganizer/icons/hicolor/22x22
+@dirrm share/doc/HTML/en/korganizer
+@dirrm share/doc/HTML/en/kandy
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/korganizer/sounds
 @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/16x16/actions
 @dirrm share/apps/korganizer/icons/hicolor
-@dirrm share/apps/korganizer/icons/locolor/16x16/actions
-@dirrm share/apps/korganizer/icons/locolor/16x16
-@dirrm share/apps/korganizer/icons/locolor
-@dirrm share/apps/korganizer/icons
-@dirrm share/apps/korganizer/sounds
 @dirrm share/apps/korganizer
+@dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kandy
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Applications
+@dirrm include/rmm
+@dirrm include/libicalvcal
+@dirrm include/kgantt