Update to KDE 2.2.1

With apologies to Al I wouldn't know where to start with a summary of the
changes between 2.1 and 2.2.1 - there are just too many. A couple of
hopefully static URLS that contain useful information are

http://www.kde.org/announcements/changelog2_1to2_2.html
http://www.kde.org/announcements/changelog2_2to2_2_1.html

Support for a.out for kde{libs,base} added by me. The libtool/a.out
combination doesn't like the linking of modules into binaries. A better
way of doing this will appear in future versions of KDE/pkgsrc.

20 files changed, 475 insertions, 787 deletions

diff --git a/misc/kdeadmin2/Makefile b/misc/kdeadmin2/Makefile
index 41eba83e51c..e260be39a22 100644
--- a/misc/kdeadmin2/Makefile
+++ b/misc/kdeadmin2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2001/09/07 14:27:12 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/15 22:46:15 skrll Exp $
 #
 
-DISTNAME=	kdeadmin-2.1
+DISTNAME=	kdeadmin-2.2.1
 CATEGORIES=	misc kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
-DEPENDS+=	kdebase>=2.1:../../x11/kdebase2
+DEPENDS+=	kdebase>=2.2.1:../../x11/kdebase2
 
 .include "../../x11/kde2/Makefile.part2"
 
diff --git a/misc/kdeadmin2/distinfo b/misc/kdeadmin2/distinfo
index 3329d2aead6..a19d027e934 100644
--- a/misc/kdeadmin2/distinfo
+++ b/misc/kdeadmin2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:13 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/15 22:46:15 skrll Exp $
 
-SHA1 (kdeadmin-2.1.tar.bz2) = 1bc28b2dffc480872f74a45869b63276c968a810
-Size (kdeadmin-2.1.tar.bz2) = 987354 bytes
+SHA1 (kdeadmin-2.2.1.tar.bz2) = 869e392a75960604c1f4b612fae0cb392066f37a
+Size (kdeadmin-2.2.1.tar.bz2) = 884361 bytes
diff --git a/misc/kdeadmin2/pkg/PLIST b/misc/kdeadmin2/pkg/PLIST
index 71aa28f1653..6e0d08a8bb0 100644
--- a/misc/kdeadmin2/pkg/PLIST
+++ b/misc/kdeadmin2/pkg/PLIST
@@ -1,221 +1,101 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 16:16:03 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/15 22:46:15 skrll Exp $
 bin/kcron
 bin/kpackage
-bin/kpackage_slack_l
 bin/kuser
 bin/kwuftpd
-bin/printversion
 bin/secpolicy
-lib/libkcm_ksysctrl.a
-lib/libkcm_ksysctrl.la
-lib/libkcm_ksysctrl.so
-share/doc/kde/HTML/en/kcron/.anchors
-share/doc/kde/HTML/en/kcron/commands.html
 share/doc/kde/HTML/en/kcron/common
-share/doc/kde/HTML/en/kcron/compilation.html
-share/doc/kde/HTML/en/kcron/credits.html
-share/doc/kde/HTML/en/kcron/faq.html
+share/doc/kde/HTML/en/kcron/index.cache.bz2
 share/doc/kde/HTML/en/kcron/index.docbook
-share/doc/kde/HTML/en/kcron/index.html
-share/doc/kde/HTML/en/kcron/installation.html
-share/doc/kde/HTML/en/kcron/introduction.html
 share/doc/kde/HTML/en/kcron/kcron.png
 share/doc/kde/HTML/en/kcron/kcronstart.png
-share/doc/kde/HTML/en/kcron/manage-tasks.html
-share/doc/kde/HTML/en/kcron/manage-variables.html
-share/doc/kde/HTML/en/kcron/new-task.html
-share/doc/kde/HTML/en/kcron/new-variable.html
 share/doc/kde/HTML/en/kcron/newtask.png
 share/doc/kde/HTML/en/kcron/newvariable.png
 share/doc/kde/HTML/en/kcron/print.png
-share/doc/kde/HTML/en/kcron/printing-crontab.html
-share/doc/kde/HTML/en/kcron/requirements.html
-share/doc/kde/HTML/en/kcron/saving-crontab.html
-share/doc/kde/HTML/en/kcron/using-kcron.html
-share/doc/kde/HTML/en/kpackage/.anchors
-share/doc/kde/HTML/en/kpackage/cache-menu.html
 share/doc/kde/HTML/en/kpackage/common
-share/doc/kde/HTML/en/kpackage/credits-and-licenses.html
-share/doc/kde/HTML/en/kpackage/help-menu.html
+share/doc/kde/HTML/en/kpackage/index.cache.bz2
 share/doc/kde/HTML/en/kpackage/index.docbook
-share/doc/kde/HTML/en/kpackage/index.html
-share/doc/kde/HTML/en/kpackage/installation.html
-share/doc/kde/HTML/en/kpackage/installing-packages.html
-share/doc/kde/HTML/en/kpackage/integrating-available-packages-in-the-tree.html
-share/doc/kde/HTML/en/kpackage/introduction.html
-share/doc/kde/HTML/en/kpackage/menus.html
-share/doc/kde/HTML/en/kpackage/onscreen-fundamentals.html
-share/doc/kde/HTML/en/kpackage/package-information-panel.html
-share/doc/kde/HTML/en/kpackage/packages-menu.html
-share/doc/kde/HTML/en/kpackage/requirements.html
-share/doc/kde/HTML/en/kpackage/root-access.html
-share/doc/kde/HTML/en/kpackage/settings-menu.html
-share/doc/kde/HTML/en/kpackage/special-menu.html
-share/doc/kde/HTML/en/kpackage/the-package-tree-panel.html
-share/doc/kde/HTML/en/kpackage/toolbar.html
-share/doc/kde/HTML/en/kpackage/uninstalling-packages.html
-share/doc/kde/HTML/en/ksysv/.anchors
-share/doc/kde/HTML/en/ksysv/appendix.html
-share/doc/kde/HTML/en/ksysv/authors.html
 share/doc/kde/HTML/en/ksysv/common
-share/doc/kde/HTML/en/ksysv/configuration.html
-share/doc/kde/HTML/en/ksysv/credits.html
-share/doc/kde/HTML/en/ksysv/index.cvlog
+share/doc/kde/HTML/en/ksysv/index.cache.bz2
 share/doc/kde/HTML/en/ksysv/index.docbook
-share/doc/kde/HTML/en/ksysv/index.html
-share/doc/kde/HTML/en/ksysv/introduction.html
-share/doc/kde/HTML/en/ksysv/keyboard.html
-share/doc/kde/HTML/en/ksysv/license.html
-share/doc/kde/HTML/en/ksysv/onscreenfundamentals.html
-share/doc/kde/HTML/en/ksysv/standard-semantics-of-runlevels.html
-share/doc/kde/HTML/en/ksysv/the-menu-entries.html
-share/doc/kde/HTML/en/kuser/.anchors
-share/doc/kde/HTML/en/kuser/add-user.html
 share/doc/kde/HTML/en/kuser/common
-share/doc/kde/HTML/en/kuser/credits.html
-share/doc/kde/HTML/en/kuser/customizing.html
-share/doc/kde/HTML/en/kuser/group-properties.html
+share/doc/kde/HTML/en/kuser/index.cache.bz2
 share/doc/kde/HTML/en/kuser/index.docbook
-share/doc/kde/HTML/en/kuser/index.html
-share/doc/kde/HTML/en/kuser/start.html
-share/doc/kde/HTML/en/kuser/user-properties.html
-share/doc/kde/HTML/en/kuser/using.html
-share/doc/kde/HTML/en/kwuftpd/.anchors
-share/doc/kde/HTML/en/kwuftpd/about-ftp-accounts.html
-share/doc/kde/HTML/en/kwuftpd/basic-ftp-setup.html
 share/doc/kde/HTML/en/kwuftpd/common
-share/doc/kde/HTML/en/kwuftpd/credits-and-license.html
-share/doc/kde/HTML/en/kwuftpd/directories.html
 share/doc/kde/HTML/en/kwuftpd/directories.png
+share/doc/kde/HTML/en/kwuftpd/index.cache.bz2
 share/doc/kde/HTML/en/kwuftpd/index.docbook
-share/doc/kde/HTML/en/kwuftpd/index.html
-share/doc/kde/HTML/en/kwuftpd/installation.html
-share/doc/kde/HTML/en/kwuftpd/introduction.html
-share/doc/kde/HTML/en/kwuftpd/logging.html
 share/doc/kde/HTML/en/kwuftpd/logging.png
-share/doc/kde/HTML/en/kwuftpd/menuref.html
-share/doc/kde/HTML/en/kwuftpd/messages.html
 share/doc/kde/HTML/en/kwuftpd/messages.png
-share/doc/kde/HTML/en/kwuftpd/ratios.html
 share/doc/kde/HTML/en/kwuftpd/ratios.png
-share/doc/kde/HTML/en/kwuftpd/security.html
 share/doc/kde/HTML/en/kwuftpd/security.png
-share/doc/kde/HTML/en/kwuftpd/uploads.html
 share/doc/kde/HTML/en/kwuftpd/uploads.png
-share/doc/kde/HTML/en/kwuftpd/user-classes.html
 share/doc/kde/HTML/en/kwuftpd/user_classes.png
-share/doc/kde/HTML/en/kwuftpd/using-kwuftpd.html
-share/doc/kde/HTML/en/kwuftpd/virtual-hosts.html
 share/doc/kde/HTML/en/kwuftpd/virtual.png
-share/kde/applnk/Settings/System/ksysctrl.desktop
 share/kde/applnk/System/kcron.desktop
 share/kde/applnk/System/kpackage.desktop
 share/kde/applnk/System/kuser.desktop
 share/kde/applnk/System/kwuftpd.desktop
 share/kde/apps/kpackage/kpackageui.rc
-share/kde/apps/kpackage/pics/bnew.xpm
-share/kde/apps/kpackage/pics/bsd.xpm
-share/kde/apps/kpackage/pics/bupdated.xpm
-share/kde/apps/kpackage/pics/cross.xpm
-share/kde/apps/kpackage/pics/dbad.xpm
-share/kde/apps/kpackage/pics/deb.xpm
-share/kde/apps/kpackage/pics/dnew.xpm
-share/kde/apps/kpackage/pics/dupdated.xpm
-share/kde/apps/kpackage/pics/kiss.xpm
-share/kde/apps/kpackage/pics/knew.xpm
-share/kde/apps/kpackage/pics/kupdated.xpm
-share/kde/apps/kpackage/pics/noball.xpm
-share/kde/apps/kpackage/pics/ptick.xpm
-share/kde/apps/kpackage/pics/question.xpm
-share/kde/apps/kpackage/pics/rnew.xpm
-share/kde/apps/kpackage/pics/rpm.xpm
-share/kde/apps/kpackage/pics/rupdated.xpm
-share/kde/apps/kpackage/pics/slack.xpm
-share/kde/apps/kpackage/pics/snew.xpm
-share/kde/apps/kpackage/pics/supdated.xpm
-share/kde/apps/kpackage/pics/tick.xpm
+share/kde/apps/kpackage/pics/bnew.png
+share/kde/apps/kpackage/pics/bsd.png
+share/kde/apps/kpackage/pics/bupdated.png
+share/kde/apps/kpackage/pics/cross.png
+share/kde/apps/kpackage/pics/dbad.png
+share/kde/apps/kpackage/pics/deb.png
+share/kde/apps/kpackage/pics/dnew.png
+share/kde/apps/kpackage/pics/dupdated.png
+share/kde/apps/kpackage/pics/kiss.png
+share/kde/apps/kpackage/pics/knew.png
+share/kde/apps/kpackage/pics/kupdated.png
+share/kde/apps/kpackage/pics/noball.png
+share/kde/apps/kpackage/pics/ptick.png
+share/kde/apps/kpackage/pics/question.png
+share/kde/apps/kpackage/pics/rnew.png
+share/kde/apps/kpackage/pics/rpm.png
+share/kde/apps/kpackage/pics/rupdated.png
+share/kde/apps/kpackage/pics/slack.png
+share/kde/apps/kpackage/pics/snew.png
+share/kde/apps/kpackage/pics/supdated.png
+share/kde/apps/kpackage/pics/tick.png
 share/kde/apps/kpackage/toolbar/ftin.xpm
 share/kde/apps/kpackage/toolbar/ftout.xpm
-share/kde/apps/ksysctrl/LICENSE
-share/kde/apps/ksysctrl/NEWS
-share/kde/apps/ksysctrl/README
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/audio.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/cdrom.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/conflict.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/connectors.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/display.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/drivectrl.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/ksysctrl.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/network.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/printer.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/res.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/scsi.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/storage.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/system.png
-share/kde/apps/ksysctrl/icons/locolor/16x16/apps/usb.png
-share/kde/apps/ksysctrl/icons/locolor/32x32/apps/ksysctrl.png
-share/kde/apps/ksysctrl/pci.ids
-share/kde/apps/ksysctrl/toolbar/audio.png
-share/kde/apps/ksysctrl/toolbar/cdrom.png
-share/kde/apps/ksysctrl/toolbar/confmark.png
-share/kde/apps/ksysctrl/toolbar/connectors.png
-share/kde/apps/ksysctrl/toolbar/display.png
-share/kde/apps/ksysctrl/toolbar/network.png
-share/kde/apps/ksysctrl/toolbar/printer.png
-share/kde/apps/ksysctrl/toolbar/scanner.png
-share/kde/apps/ksysctrl/toolbar/scsi.png
-share/kde/apps/ksysctrl/toolbar/storage.png
-share/kde/apps/ksysctrl/toolbar/system.png
-share/kde/apps/ksysctrl/toolbar/tuxscreen.png
-share/kde/apps/ksysctrl/toolbar/usb.png
-share/kde/apps/kuser/icons/locolor/22x22/actions/add_group.png
-share/kde/apps/kuser/icons/locolor/22x22/actions/add_user.png
-share/kde/apps/kuser/icons/locolor/22x22/actions/delete_group.png
-share/kde/apps/kuser/icons/locolor/22x22/actions/delete_user.png
-share/kde/apps/kuser/icons/locolor/22x22/actions/edit_group.png
-share/kde/apps/kuser/icons/locolor/22x22/actions/edit_user.png
+share/kde/apps/kuser/icons/hicolor/22x22/actions/add_group.png
+share/kde/apps/kuser/icons/hicolor/22x22/actions/add_user.png
+share/kde/apps/kuser/icons/hicolor/22x22/actions/delete_group.png
+share/kde/apps/kuser/icons/hicolor/22x22/actions/delete_user.png
+share/kde/apps/kuser/icons/hicolor/22x22/actions/edit_group.png
+share/kde/apps/kuser/icons/hicolor/22x22/actions/edit_user.png
 share/kde/apps/kuser/kuserui.rc
 share/kde/apps/kuser/pics/group.png
 share/kde/apps/kuser/pics/user.png
+share/kde/icons/hicolor/16x16/apps/kcron.png
+share/kde/icons/hicolor/16x16/apps/kpackage.png
+share/kde/icons/hicolor/16x16/apps/kuser.png
+share/kde/icons/hicolor/32x32/apps/kcron.png
 share/kde/icons/hicolor/32x32/apps/kpackage.png
 share/kde/icons/hicolor/32x32/apps/kuser.png
 share/kde/icons/hicolor/48x48/apps/kpackage.png
 share/kde/icons/hicolor/48x48/apps/kuser.png
-share/kde/icons/locolor/16x16/apps/kcron.png
-share/kde/icons/locolor/16x16/apps/kpackage.png
-share/kde/icons/locolor/16x16/apps/kuser.png
-share/kde/icons/locolor/32x32/apps/kcron.png
-share/kde/icons/locolor/32x32/apps/kpackage.png
-share/kde/icons/locolor/32x32/apps/kuser.png
-share/kde/mimelnk/application/x-debian-package.kdelnk
-@comment kdelibs:dirrm share/kde/mimelnk/application
-@comment kdelibs:dirrm share/kde/icons/locolor/32x32/apps
-@comment kdelibs:dirrm share/kde/icons/locolor/16x16/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/48x48/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/32x32/apps
+share/kde/mimelnk/application/x-debian-package.desktop
+@comment dirrm share/kde/mimelnk/application
+@comment dirrm share/kde/icons/hicolor/48x48/apps
+@comment dirrm share/kde/icons/hicolor/32x32/apps
+@comment dirrm share/kde/icons/hicolor/16x16/apps
 @dirrm share/kde/apps/kuser/pics
-@dirrm share/kde/apps/kuser/icons/locolor/22x22/actions
-@dirrm share/kde/apps/kuser/icons/locolor/22x22
-@dirrm share/kde/apps/kuser/icons/locolor
+@dirrm share/kde/apps/kuser/icons/hicolor/22x22/actions
+@dirrm share/kde/apps/kuser/icons/hicolor/22x22
+@dirrm share/kde/apps/kuser/icons/hicolor
 @dirrm share/kde/apps/kuser/icons
 @dirrm share/kde/apps/kuser
-@dirrm share/kde/apps/ksysctrl/toolbar
-@dirrm share/kde/apps/ksysctrl/icons/locolor/32x32/apps
-@dirrm share/kde/apps/ksysctrl/icons/locolor/32x32
-@dirrm share/kde/apps/ksysctrl/icons/locolor/16x16/apps
-@dirrm share/kde/apps/ksysctrl/icons/locolor/16x16
-@dirrm share/kde/apps/ksysctrl/icons/locolor
-@dirrm share/kde/apps/ksysctrl/icons
-@dirrm share/kde/apps/ksysctrl
 @dirrm share/kde/apps/kpackage/toolbar
 @dirrm share/kde/apps/kpackage/pics
 @dirrm share/kde/apps/kpackage
-@comment kdelibs:dirrm share/kde/apps
-@comment kdelibs:dirrm share/kde/applnk/System
-@comment kdelibs:dirrm share/kde/applnk/Settings/System
+@comment dirrm share/kde/apps
+@comment dirrm share/kde/applnk/System
 @dirrm share/doc/kde/HTML/en/kwuftpd
 @dirrm share/doc/kde/HTML/en/kuser
 @dirrm share/doc/kde/HTML/en/ksysv
 @dirrm share/doc/kde/HTML/en/kpackage
 @dirrm share/doc/kde/HTML/en/kcron
-@comment kdelibs:dirrm share/doc/kde/HTML/en
+@comment dirrm share/doc/kde/HTML/en
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile
index 4c5245cf461..851d15170a8 100644
--- a/misc/kdepim2/Makefile
+++ b/misc/kdepim2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2001/09/07 14:27:12 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/15 22:46:19 skrll Exp $
 #
 
-DISTNAME=	kdepim-2.1
+DISTNAME=	kdepim-2.2.1
 CATEGORIES=	misc kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Personal Information Management tools for the KDE desktop
 
-DEPENDS+=	kdebase>=2.1:../../x11/kdebase2
+DEPENDS+=	kdebase>=2.2.1:../../x11/kdebase2
 
 .include "../../x11/kde2/Makefile.part2"
 
diff --git a/misc/kdepim2/distinfo b/misc/kdepim2/distinfo
index e588f2546de..355ae494e95 100644
--- a/misc/kdepim2/distinfo
+++ b/misc/kdepim2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/09/04 05:31:10 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/10/15 22:46:19 skrll Exp $
 
-SHA1 (kdepim-2.1.tar.bz2) = 05590938b1c18ee3b41edd40c646f5fbcd7be2ca
-Size (kdepim-2.1.tar.bz2) = 2280237 bytes
-SHA1 (patch-aa) = f44a7264f7fe9641cdab5c089f6d1fdca56b6367
+SHA1 (kdepim-2.2.1.tar.bz2) = 0a5d48c7bcb15ac7408d2f11416b6d9ab99029cd
+Size (kdepim-2.2.1.tar.bz2) = 2401703 bytes
+SHA1 (patch-ab) = 0accad8af75e380feb9b0d059c3a573663342e35
+SHA1 (patch-ac) = 9c750ec5c8d63471ddcffc7e04983d9a2ef725e8
diff --git a/misc/kdepim2/patches/patch-aa b/misc/kdepim2/patches/patch-aa
deleted file mode 100644
index 44f25e1f16a..00000000000
--- a/misc/kdepim2/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/09/04 05:31:10 tron Exp $
-
---- korganizer/Makefile.in.orig	Wed Feb 21 13:13:32 2001
-+++ korganizer/Makefile.in	Tue Sep  4 07:13:40 2001
-@@ -206,7 +206,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--INCLUDES = $(all_includes) 	   -I$(srcdir)/versit            -I$(top_srcdir)/libical/src/libical            -I$(top_srcdir)/libical/src/libicalss 	   -I$(top_builddir)/libical/src/libical 	   -I$(top_builddir)/libical/src/libicalss
-+INCLUDES = -I$(srcdir)/versit            -I$(top_srcdir)/libical/src/libical            -I$(top_srcdir)/libical/src/libicalss 	   -I$(top_builddir)/libical/src/libical 	   -I$(top_builddir)/libical/src/libicalss $(all_includes)
- 
- 
- bin_PROGRAMS = korganizer alarmd
-@@ -835,7 +835,7 @@
- #>- $(srcdir)/parseholiday.c: parseholiday.y
- #>+ 1
- $(srcdir)/parseholiday.c: outgoingdialog_base.h incomingdialog_base.h categoryselectdialog_base.h categoryeditdialog_base.h kofilterview_base.h  parseholiday.y
--	cd $(srcdir) && bison -d -o parseholiday.c parseholiday.y
-+	cd $(srcdir) && yacc -d -o parseholiday.c parseholiday.y
- 
- #>- $(srcdir)/scanholiday.c: scanholiday.lex parseholiday.h
- #>+ 1
diff --git a/misc/kdepim2/patches/patch-ab b/misc/kdepim2/patches/patch-ab
new file mode 100644
index 00000000000..0b60b98440c
--- /dev/null
+++ b/misc/kdepim2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2001/10/15 22:46:20 skrll Exp $
+
+--- libical/src/libical/icallexer.l.orig	Wed Apr 11 16:37:32 2001
++++ libical/src/libical/icallexer.l
+@@ -67,7 +67,7 @@
+ renaming hack applied in icalyacc.y */
+ YY_BUFFER_STATE ical_yy_scan_buffer ( char *base, yy_size_t size );
+ YY_BUFFER_STATE ical_yy_scan_string ( yyconst char *yy_str );
+-YY_BUFFER_STATE ical_yy_scan_bytes ( yyconst char *bytes, int len );
++YY_BUFFER_STATE ical_yy_scan_bytes ( yyconst char *bytes, yy_size_t len );
+ 
+ %}
+ 
diff --git a/misc/kdepim2/patches/patch-ac b/misc/kdepim2/patches/patch-ac
new file mode 100644
index 00000000000..af0a4fc4442
--- /dev/null
+++ b/misc/kdepim2/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2001/10/15 22:46:20 skrll Exp $
+
+--- libkcal/Makefile.in.orig	Sat Sep  8 01:48:15 2001
++++ libkcal/Makefile.in
+@@ -598,10 +598,10 @@
+ 
+ 
+ $(srcdir)/parseholiday.c: parseholiday.y
+-	cd $(srcdir) && bison -p kcal -d -o parseholiday.c parseholiday.y
++	cd $(srcdir) && yacc -p kcal -d -o parseholiday.c parseholiday.y
+ 
+ $(srcdir)/parseholiday.h: parseholiday.y
+-	cd $(srcdir) && bison -p kcal -d -o parseholiday.c parseholiday.y
++	cd $(srcdir) && yacc -p kcal -d -o parseholiday.c parseholiday.y
+ 
+ $(srcdir)/scanholiday.c: scanholiday.lex parseholiday.h
+ 	cd $(srcdir) && flex -Pkcal -B -oscanholiday.c scanholiday.lex
diff --git a/misc/kdepim2/pkg/PLIST b/misc/kdepim2/pkg/PLIST
index 72e3f2ed8a3..2dbe17d7d2c 100644
--- a/misc/kdepim2/pkg/PLIST
+++ b/misc/kdepim2/pkg/PLIST
@@ -1,8 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 16:15:16 skrll Exp $
-bin/abbrowser
+@comment $NetBSD: PLIST,v 1.2 2001/10/15 22:46:20 skrll Exp $
 bin/alarmd
 bin/ical2vcal
+bin/kandy
+bin/kandy_client
 bin/korganizer
+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/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -46,11 +55,21 @@ include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
-lib/libimap.a
-lib/libimap.la
-lib/libimap.so
-lib/libimap.so.0
-lib/libimap.so.0.0
+lib/libkcal.a
+lib/libkcal.la
+lib/libkcal.so
+lib/libkcal.so.1
+lib/libkcal.so.1.0
+lib/libkgantt.a
+lib/libkgantt.la
+lib/libkgantt.so
+lib/libkgantt.so.0
+lib/libkgantt.so.0.2
+lib/libkimap.a
+lib/libkimap.la
+lib/libkimap.so
+lib/libkimap.so.0
+lib/libkimap.so.0.0
 lib/libkorganizer.a
 lib/libkorganizer.la
 lib/libkorganizer.so
@@ -66,36 +85,13 @@ lib/libvcard.la
 lib/libvcard.so
 lib/libvcard.so.0
 lib/libvcard.so.0.0
-share/doc/kde/HTML/en/abbrowser/.anchors
-share/doc/kde/HTML/en/abbrowser/common
-share/doc/kde/HTML/en/abbrowser/compilation-and-installation.html
-share/doc/kde/HTML/en/abbrowser/index.cvlog
-share/doc/kde/HTML/en/abbrowser/index.docbook
-share/doc/kde/HTML/en/abbrowser/index.html
-share/doc/kde/HTML/en/abbrowser/installation.html
-share/doc/kde/HTML/en/abbrowser/introduction.html
-share/doc/kde/HTML/en/abbrowser/questions-answers-and-tips.html
-share/doc/kde/HTML/en/abbrowser/requirements.html
-share/doc/kde/HTML/en/abbrowser/using-pab.html
-share/doc/kde/HTML/en/korganizer/.anchors
+share/autostart/alarmd.desktop
+share/doc/kde/HTML/en/kandy/common
+share/doc/kde/HTML/en/kandy/index.cache.bz2
+share/doc/kde/HTML/en/kandy/index.docbook
 share/doc/kde/HTML/en/korganizer/alarmd-panel.png
 share/doc/kde/HTML/en/korganizer/common
-share/doc/kde/HTML/en/korganizer/compilation.html
-share/doc/kde/HTML/en/korganizer/config.html
-share/doc/kde/HTML/en/korganizer/course-conclusion.html
-share/doc/kde/HTML/en/korganizer/course-entering-todos.html
-share/doc/kde/HTML/en/korganizer/course-event-types.html
-share/doc/kde/HTML/en/korganizer/course-rescheduling-events.html
-share/doc/kde/HTML/en/korganizer/course-rescheduling-todos.html
-share/doc/kde/HTML/en/korganizer/credits.html
 share/doc/kde/HTML/en/korganizer/datenavigator.png
-share/doc/kde/HTML/en/korganizer/entering-data-required-fields.html
-share/doc/kde/HTML/en/korganizer/entering-data-to-do.html
-share/doc/kde/HTML/en/korganizer/entering-data.html
-share/doc/kde/HTML/en/korganizer/examples.html
-share/doc/kde/HTML/en/korganizer/faq.html
-share/doc/kde/HTML/en/korganizer/five-minute-course.html
-share/doc/kde/HTML/en/korganizer/glossary.html
 share/doc/kde/HTML/en/korganizer/i_actions_new_event.png
 share/doc/kde/HTML/en/korganizer/i_copy.png
 share/doc/kde/HTML/en/korganizer/i_cut.png
@@ -119,28 +115,13 @@ share/doc/kde/HTML/en/korganizer/i_view_month.png
 share/doc/kde/HTML/en/korganizer/i_view_todo_list.png
 share/doc/kde/HTML/en/korganizer/i_view_week.png
 share/doc/kde/HTML/en/korganizer/i_view_work_week.png
+share/doc/kde/HTML/en/korganizer/index.cache.bz2
 share/doc/kde/HTML/en/korganizer/index.docbook
-share/doc/kde/HTML/en/korganizer/index.html
-share/doc/kde/HTML/en/korganizer/installation.html
-share/doc/kde/HTML/en/korganizer/introduction.html
 share/doc/kde/HTML/en/korganizer/kagenda-appointment.png
-share/doc/kde/HTML/en/korganizer/other-features-drag-and-drop.html
-share/doc/kde/HTML/en/korganizer/other-features-import.html
-share/doc/kde/HTML/en/korganizer/other-features-konqueror-interaction.html
-share/doc/kde/HTML/en/korganizer/other-features-merging-data.html
-share/doc/kde/HTML/en/korganizer/other-features-palm-sync.html
-share/doc/kde/HTML/en/korganizer/other-features.html
-share/doc/kde/HTML/en/korganizer/reference-action-buttons.html
-share/doc/kde/HTML/en/korganizer/reference-hotkey.html
-share/doc/kde/HTML/en/korganizer/reference-menus.html
-share/doc/kde/HTML/en/korganizer/reference.html
-share/doc/kde/HTML/en/korganizer/requirements.html
-share/doc/kde/HTML/en/korganizer/vcalendar-format.html
-share/doc/kde/HTML/en/kpilot/.anchors
 share/doc/kde/HTML/en/kpilot/address-app.png
-share/doc/kde/HTML/en/kpilot/builtin.html
 share/doc/kde/HTML/en/kpilot/common
 share/doc/kde/HTML/en/kpilot/conduit-knotes.png
+share/doc/kde/HTML/en/kpilot/conduit-popmail-kmail.png
 share/doc/kde/HTML/en/kpilot/conduit-popmail-recv-method.png
 share/doc/kde/HTML/en/kpilot/conduit-popmail-recv-pop.png
 share/doc/kde/HTML/en/kpilot/conduit-popmail-recv-unix.png
@@ -150,16 +131,9 @@ share/doc/kde/HTML/en/kpilot/conduit-popmail-sendmail.png
 share/doc/kde/HTML/en/kpilot/conduit-popmail-smtp.png
 share/doc/kde/HTML/en/kpilot/conduit-popmail-top.png
 share/doc/kde/HTML/en/kpilot/conduit-vcal.png
-share/doc/kde/HTML/en/kpilot/conduits.html
-share/doc/kde/HTML/en/kpilot/credits.html
-share/doc/kde/HTML/en/kpilot/database.html
-share/doc/kde/HTML/en/kpilot/faq.html
 share/doc/kde/HTML/en/kpilot/file-app.png
-share/doc/kde/HTML/en/kpilot/hotsync.html
+share/doc/kde/HTML/en/kpilot/index.cache.bz2
 share/doc/kde/HTML/en/kpilot/index.docbook
-share/doc/kde/HTML/en/kpilot/index.html
-share/doc/kde/HTML/en/kpilot/introduction.html
-share/doc/kde/HTML/en/kpilot/kpilot-main.html
 share/doc/kde/HTML/en/kpilot/main-app.png
 share/doc/kde/HTML/en/kpilot/memo-app.png
 share/doc/kde/HTML/en/kpilot/setup-address.png
@@ -169,17 +143,21 @@ share/doc/kde/HTML/en/kpilot/setup-general.png
 share/doc/kde/HTML/en/kpilot/setup-sync.png
 share/doc/kde/HTML/en/kpilot/toolbar.png
 share/doc/kde/HTML/en/kpilot/toolbar_backup.png
-share/doc/kde/HTML/en/kpilot/using-kpilot.html
+share/doc/kde/HTML/en/kpilot/toolbar_hotsync.png
 share/kde/applnk/Applications/korganizer.desktop
-share/kde/applnk/Utilities/abbrowser.desktop
-share/kde/apps/abbrowser/pics/abentry.xpm
-share/kde/apps/abbrowser/pics/delete.xpm
-share/kde/apps/abbrowser/pics/down.xpm
-share/kde/apps/abbrowser/pics/filemail.xpm
-share/kde/apps/abbrowser/pics/find.xpm
-share/kde/apps/abbrowser/pics/group.xpm
-share/kde/apps/abbrowser/pics/page.xpm
-share/kde/apps/abbrowser/pics/up.xpm
+share/kde/applnk/Utilities/kandy.desktop
+share/kde/apps/kandy/default.kandy
+share/kde/apps/kandy/kandymobileui.rc
+share/kde/apps/kandy/kandyui.rc
+share/kde/apps/kgantt/icons/hicolor/16x16/actions/ganttSelect.png
+share/kde/apps/kgantt/icons/hicolor/16x16/actions/ganttSelecttask.png
+share/kde/apps/kgantt/icons/hicolor/16x16/actions/ganttUnselecttask.png
+share/kde/apps/kgantt/icons/hicolor/22x22/actions/ganttSelect.png
+share/kde/apps/kgantt/icons/hicolor/22x22/actions/ganttSelecttask.png
+share/kde/apps/kgantt/icons/hicolor/22x22/actions/ganttUnselecttask.png
+share/kde/apps/kgantt/icons/hicolor/32x32/actions/ganttSelect.png
+share/kde/apps/kgantt/icons/hicolor/32x32/actions/ganttSelecttask.png
+share/kde/apps/kgantt/icons/hicolor/32x32/actions/ganttUnselecttask.png
 share/kde/apps/korganizer/holiday_at
 share/kde/apps/korganizer/holiday_au
 share/kde/apps/korganizer/holiday_bavarian
@@ -196,6 +174,7 @@ share/kde/apps/korganizer/holiday_fr
 share/kde/apps/korganizer/holiday_frswiss
 share/kde/apps/korganizer/holiday_gb
 share/kde/apps/korganizer/holiday_hu
+share/kde/apps/korganizer/holiday_il
 share/kde/apps/korganizer/holiday_is
 share/kde/apps/korganizer/holiday_it
 share/kde/apps/korganizer/holiday_ja
@@ -211,6 +190,36 @@ share/kde/apps/korganizer/holiday_se
 share/kde/apps/korganizer/holiday_si
 share/kde/apps/korganizer/holiday_th
 share/kde/apps/korganizer/holiday_us
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/1day.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/1downarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/1leftarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/1rightarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/1uparrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/2downarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/2leftarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/2rightarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/2uparrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/3downarrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/3uparrow.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/5days.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/7days.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/appointment.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/bell.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/dayview.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/findf.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/inverse_recur.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/list.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/mailappt.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/month.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/nomailappt.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/playsound.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/readonlyevent.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/recur.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/runprog.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/smallcal.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/smallclock.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/today.png
+share/kde/apps/korganizer/icons/hicolor/16x16/actions/todo.png
 share/kde/apps/korganizer/icons/hicolor/22x22/actions/1day.png
 share/kde/apps/korganizer/icons/hicolor/22x22/actions/3leftarrow.png
 share/kde/apps/korganizer/icons/hicolor/22x22/actions/3rightarrow.png
@@ -234,6 +243,7 @@ share/kde/apps/korganizer/icons/hicolor/22x22/actions/search.png
 share/kde/apps/korganizer/icons/hicolor/22x22/actions/send.png
 share/kde/apps/korganizer/icons/hicolor/22x22/actions/today.png
 share/kde/apps/korganizer/icons/hicolor/22x22/actions/todo.png
+share/kde/apps/korganizer/icons/hicolor/22x22/actions/whatsnext.png
 share/kde/apps/korganizer/icons/hicolor/32x32/actions/1day.png
 share/kde/apps/korganizer/icons/hicolor/32x32/actions/5days.png
 share/kde/apps/korganizer/icons/hicolor/32x32/actions/7days.png
@@ -242,36 +252,6 @@ share/kde/apps/korganizer/icons/hicolor/32x32/actions/list.png
 share/kde/apps/korganizer/icons/hicolor/32x32/actions/month.png
 share/kde/apps/korganizer/icons/hicolor/32x32/actions/today.png
 share/kde/apps/korganizer/icons/hicolor/32x32/actions/todo.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/1day.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/1downarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/1leftarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/1rightarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/1uparrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/2downarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/2leftarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/2rightarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/2uparrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/3downarrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/3uparrow.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/5days.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/7days.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/appointment.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/bell.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/dayview.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/findf.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/inverse_recur.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/list.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/mailappt.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/month.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/nomailappt.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/playsound.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/readonlyevent.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/recur.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/runprog.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/smallcal.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/smallclock.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/today.png
-share/kde/apps/korganizer/icons/locolor/16x16/actions/todo.png
 share/kde/apps/korganizer/korganizer_part.rc
 share/kde/apps/korganizer/korganizergsui.rc
 share/kde/apps/korganizer/korganizerui.rc
@@ -280,38 +260,46 @@ share/kde/apps/korganizer/sounds/icemag.wav
 share/kde/apps/korganizer/sounds/lightmag.wav
 share/kde/apps/korganizer/sounds/onscreen.wav
 share/kde/apps/korganizer/sounds/spinout.wav
+share/kde/apps/korganizer/tips
 share/kde/config/korganizerrc
-share/kde/icons/hicolor/32x32/apps/abbrowser.png
+share/kde/icons/hicolor/16x16/apps/kandy.png
+share/kde/icons/hicolor/16x16/apps/korganizer.png
+share/kde/icons/hicolor/32x32/apps/kandy.png
 share/kde/icons/hicolor/32x32/apps/korganizer.png
 share/kde/icons/hicolor/48x48/apps/korganizer.png
-share/kde/icons/locolor/16x16/apps/abbrowser.png
-share/kde/icons/locolor/16x16/apps/korganizer.png
-share/kde/icons/locolor/32x32/apps/korganizer.png
-@comment kdelibs:dirrm share/kde/icons/locolor/32x32/apps
-@comment kdelibs:dirrm share/kde/icons/locolor/16x16/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/48x48/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/32x32/apps
-@comment kdelibs:dirrm share/kde/config
+@comment dirrm share/kde/icons/hicolor/48x48/apps
+@comment dirrm share/kde/icons/hicolor/32x32/apps
+@comment dirrm share/kde/icons/hicolor/16x16/apps
+@comment dirrm share/kde/config
 @dirrm share/kde/apps/korganizer/sounds
-@dirrm share/kde/apps/korganizer/icons/locolor/16x16/actions
-@dirrm share/kde/apps/korganizer/icons/locolor/16x16
-@dirrm share/kde/apps/korganizer/icons/locolor
 @dirrm share/kde/apps/korganizer/icons/hicolor/32x32/actions
 @dirrm share/kde/apps/korganizer/icons/hicolor/32x32
 @dirrm share/kde/apps/korganizer/icons/hicolor/22x22/actions/emptybox
 @dirrm share/kde/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
 @dirrm share/kde/apps/korganizer/icons/hicolor/22x22/actions
 @dirrm share/kde/apps/korganizer/icons/hicolor/22x22
+@dirrm share/kde/apps/korganizer/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/korganizer/icons/hicolor/16x16
 @dirrm share/kde/apps/korganizer/icons/hicolor
 @dirrm share/kde/apps/korganizer/icons
 @dirrm share/kde/apps/korganizer
-@dirrm share/kde/apps/abbrowser/pics
-@dirrm share/kde/apps/abbrowser
-@comment kdebase:dirrm share/kde/apps
-@comment kdebase:dirrm share/kde/applnk/Utilities
-@comment kdebase:dirrm share/kde/applnk/Applications
+@dirrm share/kde/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/kde/apps/kgantt/icons/hicolor/32x32
+@dirrm share/kde/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/kde/apps/kgantt/icons/hicolor/22x22
+@dirrm share/kde/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/kgantt/icons/hicolor/16x16
+@dirrm share/kde/apps/kgantt/icons/hicolor
+@dirrm share/kde/apps/kgantt/icons
+@dirrm share/kde/apps/kgantt
+@dirrm share/kde/apps/kandy
+@comment dirrm share/kde/apps
+@comment dirrm share/kde/applnk/Utilities
+@comment dirrm share/kde/applnk/Applications
 @dirrm share/doc/kde/HTML/en/kpilot
 @dirrm share/doc/kde/HTML/en/korganizer
-@dirrm share/doc/kde/HTML/en/abbrowser
-@comment kdelibs:dirrm share/doc/kde/HTML/en
+@dirrm share/doc/kde/HTML/en/kandy
+@comment dirrm share/doc/kde/HTML/en
+@comment dirrm share/autostart
 @dirrm include/rmm
+@dirrm include/kgantt
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 65e108b3711..54b923312a3 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2001/09/07 14:27:12 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/15 22:45:58 skrll Exp $
 #
 
-DISTNAME=	kdeutils-2.1
+DISTNAME=	kdeutils-2.2.1
 CATEGORIES=	misc kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
-DEPENDS+=	kdebase>=2.1:../../x11/kdebase2
+DEPENDS+=	kdebase>=2.2.1:../../x11/kdebase2
 
 .include "../../x11/kde2/Makefile.part2"
 
diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 19b208a6af6..569b129bb78 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.4 2001/07/29 05:51:50 tron Exp $
+$NetBSD: distinfo,v 1.5 2001/10/15 22:45:58 skrll Exp $
 
-SHA1 (kdeutils-2.1.tar.bz2) = 99b9fec70c619c41a3878391ca277ab2a9e88275
-Size (kdeutils-2.1.tar.bz2) = 1210641 bytes
-SHA1 (patch-aa) = 7fa3b66189e92496b5f54ff0464569039becc436
-SHA1 (patch-ab) = 4a021a96abd230bc391cd097fd8cafa26a89023b
-SHA1 (patch-ac) = 79bd1891001bf6bab438a3a28e6beb6cc36a28ea
-SHA1 (patch-ad) = 2f44bcb04de116789b2f380388a09deb5560720b
-SHA1 (patch-ae) = 0176cdb16b8933e5c3ca713242c4c432d636e38d
-SHA1 (patch-af) = 99d187f91a773aa85a99ff9b0778ff701626a45e
-SHA1 (patch-ag) = af3aa6f6e0eed4dc321d1ac4de3a868209ce1336
-SHA1 (patch-ah) = 148525fad0faee112a925f0bb5b2b1c812acc473
+SHA1 (kdeutils-2.2.1.tar.bz2) = 0a61b862c47417adafa93f123a6eaab9086f19f1
+Size (kdeutils-2.2.1.tar.bz2) = 1454038 bytes
+SHA1 (patch-aa) = 212bc33ee7419b0339c7f2fd299d0433e5a8b145
+SHA1 (patch-ab) = cde257af59b4202deda897de04cd3d4f603bafab
+SHA1 (patch-ac) = 7fa3b66189e92496b5f54ff0464569039becc436
+SHA1 (patch-ad) = 4a021a96abd230bc391cd097fd8cafa26a89023b
+SHA1 (patch-ae) = 8c5fc5eb276d79ef96b373ee8f014e586416fc3d
+SHA1 (patch-af) = 75cf91c960fe26cc977e47ba5292609ba0d7aac0
+SHA1 (patch-ag) = d494f9459b903cb1a49633741643b705ae15386a
 SHA1 (patch-ai) = a0845618f0657043aa466105d70f6277b69ecfd9
diff --git a/misc/kdeutils2/patches/patch-aa b/misc/kdeutils2/patches/patch-aa
index 703df836e6a..a15a88a4ceb 100644
--- a/misc/kdeutils2/patches/patch-aa
+++ b/misc/kdeutils2/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:05:49 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2001/10/15 22:45:58 skrll Exp $
 
---- khexedit/chartabledialog.cc.orig	Mon Jul 10 19:41:46 2000
-+++ khexedit/chartabledialog.cc
-@@ -18,7 +18,7 @@
-  *
-  */
- 
--#include <values.h>
-+#include <limits.h>
- 
- #include <qlabel.h>
- #include <qframe.h>
-@@ -75,7 +75,7 @@
- 
-   mInputCountSpin = new QSpinBox( plainPage(), "spin" );
-   mInputCountSpin->setMinimumWidth( fontMetrics().maxWidth()*7 );
--  mInputCountSpin->setRange( 1, MAXINT );
-+  mInputCountSpin->setRange( 1, INT_MAX );
-   mInputCountSpin->setValue( 1 );
-   hbox->addWidget( mInputCountSpin );
- 
+--- kdf/kwikdisk.h.orig	Sat Dec 23 14:29:09 2000
++++ kdf/kwikdisk.h
+@@ -106,7 +106,7 @@
+     void updateDF( void );
+     void updateDFDone( void );
+     void setUpdateFrequency( int frequency );
+-    void sysCallError(DiskEntry *disk, int errno);
++    void sysCallError(DiskEntry *disk, int err_no);
+ 
+   protected:
+     void mousePressEvent(QMouseEvent *);
diff --git a/misc/kdeutils2/patches/patch-ab b/misc/kdeutils2/patches/patch-ab
index 22c039fa432..5f4d531d0b6 100644
--- a/misc/kdeutils2/patches/patch-ab
+++ b/misc/kdeutils2/patches/patch-ab
@@ -1,48 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 16:05:49 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2001/10/15 22:45:58 skrll Exp $
 
---- khexedit/dialog.cc.orig	Tue Aug  1 17:06:40 2000
-+++ khexedit/dialog.cc
-@@ -1,6 +1,6 @@
- /*
-  *   khexedit - Versatile hex editor
-- *   Copyright (C) 1999  Espen Sand, espensa@online.no
-+ *   Copyright (C) 1999  Eepen Sand, espensa@online.no
-  *
-  *   This program is free software; you can redistribute it and/or modify
-  *   it under the terms of the GNU General Public License as published by
-@@ -20,7 +20,7 @@
+--- kfind/pics/Makefile.in.orig	Sat Sep  8 01:46:33 2001
++++ kfind/pics/Makefile.in
+@@ -349,14 +349,6 @@
  
- #include <ctype.h>
- #include <iostream.h>
--#include <values.h>
-+#include <limits.h>
+ #>+ 19
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/locolor/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(datadir)/locolor/22x22/actions/archive.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-delete.png $(DESTDIR)$(datadir)/locolor/22x22/actions/delete.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(datadir)/locolor/22x22/actions/idea.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(datadir)/locolor/22x22/actions/info.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(datadir)/locolor/22x22/actions/openfile.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(datadir)/locolor/22x22/actions/save.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(datadir)/locolor/22x22/actions/search.png
  
- #include <qbuttongroup.h> 
- #include <qfileinfo.h> 
-@@ -940,7 +940,7 @@
-   mGroupSpin = new QSpinBox( page );
-   if( mGroupSpin == 0 ) { return; }
-   mGroupSpin->setMinimumWidth( fontMetrics().width("M")*20 );
--  mGroupSpin->setRange(1, MAXINT );  
-+  mGroupSpin->setRange(1, INT_MAX );  
- 
-   text = i18n("&Group size [bytes]");
-   QLabel *label = new QLabel( mGroupSpin, text, page );
-@@ -952,7 +952,7 @@
-   mBitSpin = new QSpinBox( page );
-   if( mBitSpin == 0 ) { return; }
-   mBitSpin->setMinimumWidth( fontMetrics().width("M")*20 );
--  mBitSpin->setRange(-MAXINT, MAXINT);
-+  mBitSpin->setRange(INT_MIN, INT_MAX);
- 
-   text = i18n("S&hift size [bits]");
-   label = new QLabel( mBitSpin, text, page );
-@@ -1098,7 +1098,7 @@
-   mSizeBox = new QSpinBox( plainPage() );
-   if( mSizeBox == 0 ) { return; }
-   mSizeBox->setMinimumWidth( fontMetrics().maxWidth()*17 );
--  mSizeBox->setRange( 1, MAXINT );
-+  mSizeBox->setRange( 1, INT_MAX );
-   mSizeBox->setValue( 1 );
-   
-   QLabel *label = new QLabel( mSizeBox, i18n("&Size"), plainPage() );
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(datadir)/locolor/22x22/actions/archive.png
diff --git a/misc/kdeutils2/patches/patch-ac b/misc/kdeutils2/patches/patch-ac
index 157f101baf8..fd7db64b8df 100644
--- a/misc/kdeutils2/patches/patch-ac
+++ b/misc/kdeutils2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 16:05:49 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2001/10/15 22:45:58 skrll Exp $
 
---- khexedit/exportdialog.cc.orig	Wed Dec 13 18:28:03 2000
-+++ khexedit/exportdialog.cc
+--- khexedit/chartabledialog.cc.orig	Mon Jul 10 19:41:46 2000
++++ khexedit/chartabledialog.cc
 @@ -18,7 +18,7 @@
   *
   */
@@ -9,23 +9,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/14 16:05:49 skrll Exp $
 -#include <values.h>
 +#include <limits.h>
  
- #include <qbuttongroup.h>
- #include <qcombobox.h>
-@@ -321,7 +321,7 @@
+ #include <qlabel.h>
+ #include <qframe.h>
+@@ -75,7 +75,7 @@
+ 
+   mInputCountSpin = new QSpinBox( plainPage(), "spin" );
+   mInputCountSpin->setMinimumWidth( fontMetrics().maxWidth()*7 );
+-  mInputCountSpin->setRange( 1, MAXINT );
++  mInputCountSpin->setRange( 1, INT_MAX );
+   mInputCountSpin->setValue( 1 );
+   hbox->addWidget( mInputCountSpin );
  
-   mHtml.lineSpin = new QSpinBox( frame );
-   mHtml.lineSpin->setMinimumWidth( fontMetrics().maxWidth()*10 );
--  mHtml.lineSpin->setRange( 5, MAXINT );
-+  mHtml.lineSpin->setRange( 5, INT_MAX );
-   gbox->addWidget( mHtml.lineSpin, 0, 1 );
-   
-   text = i18n("&Lines per table");
-@@ -432,7 +432,7 @@
-   
-   mArray.lineSizeSpin = new QSpinBox( page );
-   mArray.lineSizeSpin->setMinimumWidth( fontMetrics().maxWidth()*10 );
--  mArray.lineSizeSpin->setRange( 1, MAXINT );
-+  mArray.lineSizeSpin->setRange( 1, INT_MAX );
-   gbox->addWidget( mArray.lineSizeSpin, 2, 1 );
-   text = i18n("Elements per line:"); 
-   label = new QLabel( mArray.lineSizeSpin, text, page );
diff --git a/misc/kdeutils2/patches/patch-ad b/misc/kdeutils2/patches/patch-ad
index 57af6652da8..3c1e2f0527d 100644
--- a/misc/kdeutils2/patches/patch-ad
+++ b/misc/kdeutils2/patches/patch-ad
@@ -1,22 +1,48 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/14 16:05:48 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2001/10/15 22:45:58 skrll Exp $
 
---- khexedit/optiondialog.cc.orig	Wed Dec 13 18:28:04 2000
-+++ khexedit/optiondialog.cc
-@@ -24,7 +24,7 @@
- #include <qvbuttongroup.h> 
- 
+--- khexedit/dialog.cc.orig	Tue Aug  1 17:06:40 2000
++++ khexedit/dialog.cc
+@@ -1,6 +1,6 @@
+ /*
+  *   khexedit - Versatile hex editor
+- *   Copyright (C) 1999  Espen Sand, espensa@online.no
++ *   Copyright (C) 1999  Eepen Sand, espensa@online.no
+  *
+  *   This program is free software; you can redistribute it and/or modify
+  *   it under the terms of the GNU General Public License as published by
+@@ -20,7 +20,7 @@
  
+ #include <ctype.h>
+ #include <iostream.h>
 -#include <values.h>
 +#include <limits.h>
  
- #include <qbuttongroup.h>
- #include <qcheckbox.h>
-@@ -495,7 +495,7 @@
+ #include <qbuttongroup.h> 
+ #include <qfileinfo.h> 
+@@ -940,7 +940,7 @@
+   mGroupSpin = new QSpinBox( page );
+   if( mGroupSpin == 0 ) { return; }
+   mGroupSpin->setMinimumWidth( fontMetrics().width("M")*20 );
+-  mGroupSpin->setRange(1, MAXINT );  
++  mGroupSpin->setRange(1, INT_MAX );  
  
-   mMisc.thresholdSpin = new QSpinBox( page );
-   mMisc.thresholdSpin->setMinimumWidth( fontMetrics().width("M") * 10 );
--  mMisc.thresholdSpin->setRange( 5, MAXINT );
-+  mMisc.thresholdSpin->setRange( 5, INT_MAX );
-   mMisc.thresholdSpin->setSteps( 5, 5 );
-   mMisc.thresholdSpin->setValue( 5 );
+   text = i18n("&Group size [bytes]");
+   QLabel *label = new QLabel( mGroupSpin, text, page );
+@@ -952,7 +952,7 @@
+   mBitSpin = new QSpinBox( page );
+   if( mBitSpin == 0 ) { return; }
+   mBitSpin->setMinimumWidth( fontMetrics().width("M")*20 );
+-  mBitSpin->setRange(-MAXINT, MAXINT);
++  mBitSpin->setRange(INT_MIN, INT_MAX);
  
+   text = i18n("S&hift size [bits]");
+   label = new QLabel( mBitSpin, text, page );
+@@ -1098,7 +1098,7 @@
+   mSizeBox = new QSpinBox( plainPage() );
+   if( mSizeBox == 0 ) { return; }
+   mSizeBox->setMinimumWidth( fontMetrics().maxWidth()*17 );
+-  mSizeBox->setRange( 1, MAXINT );
++  mSizeBox->setRange( 1, INT_MAX );
+   mSizeBox->setValue( 1 );
+   
+   QLabel *label = new QLabel( mSizeBox, i18n("&Size"), plainPage() );
diff --git a/misc/kdeutils2/patches/patch-ae b/misc/kdeutils2/patches/patch-ae
index bae4e8ba66a..34d7071f59e 100644
--- a/misc/kdeutils2/patches/patch-ae
+++ b/misc/kdeutils2/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/14 16:05:48 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2001/10/15 22:45:58 skrll Exp $
 
---- khexedit/printerdialog.cc.orig	Sun Oct  1 13:14:02 2000
-+++ khexedit/printerdialog.cc
+--- khexedit/exportdialog.cc.orig	Sun Nov 26 11:37:15 2000
++++ khexedit/exportdialog.cc
 @@ -18,7 +18,7 @@
   *
   */
@@ -11,21 +11,21 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/14 16:05:48 skrll Exp $
  
  #include <qbuttongroup.h>
  #include <qcombobox.h>
-@@ -590,7 +590,7 @@
-   mOption.pageSpin->setFixedHeight( mOption.pageSpin->sizeHint().height() );
-   mOption.pageSpin->setMinimumWidth( 
-     mOption.pageSpin->fontMetrics().width("M")*10 );
--  mOption.pageSpin->setRange( 1, MAXINT );
-+  mOption.pageSpin->setRange( 1, INT_MAX );
+@@ -321,7 +321,7 @@
  
-   text = i18n("&Number of copies");
-   QLabel *pageLabel = new QLabel( mOption.pageSpin, text, page );
-@@ -707,7 +707,7 @@
-       mLayout.marginSpin[i]->sizeHint().height() );
-     mLayout.marginSpin[i]->setMinimumWidth( 
-       mLayout.marginSpin[i]->fontMetrics().width("M")*10 );
--    mLayout.marginSpin[i]->setRange( 0, MAXINT );
-+    mLayout.marginSpin[i]->setRange( 0, INT_MAX );
- 
-     QLabel *label = new QLabel( mLayout.marginSpin[i], name[i], group );
-     label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() );
+   mHtml.lineSpin = new QSpinBox( frame );
+   mHtml.lineSpin->setMinimumWidth( fontMetrics().maxWidth()*10 );
+-  mHtml.lineSpin->setRange( 5, MAXINT );
++  mHtml.lineSpin->setRange( 5, INT_MAX );
+   gbox->addWidget( mHtml.lineSpin, 0, 1 );
+   
+   text = i18n("&Lines per table");
+@@ -432,7 +432,7 @@
+   
+   mArray.lineSizeSpin = new QSpinBox( page );
+   mArray.lineSizeSpin->setMinimumWidth( fontMetrics().maxWidth()*10 );
+-  mArray.lineSizeSpin->setRange( 1, MAXINT );
++  mArray.lineSizeSpin->setRange( 1, INT_MAX );
+   gbox->addWidget( mArray.lineSizeSpin, 2, 1 );
+   text = i18n("Elements per line:"); 
+   label = new QLabel( mArray.lineSizeSpin, text, page );
diff --git a/misc/kdeutils2/patches/patch-af b/misc/kdeutils2/patches/patch-af
index c21a2a1157b..ed10dcbc9ef 100644
--- a/misc/kdeutils2/patches/patch-af
+++ b/misc/kdeutils2/patches/patch-af
@@ -1,13 +1,22 @@
-$NetBSD: patch-af,v 1.1 2001/03/22 14:02:24 tron Exp $
+$NetBSD: patch-af,v 1.2 2001/10/15 22:45:58 skrll Exp $
 
---- kdf/kwikdisk.h.orig	Mon Jan 22 13:16:47 2001
-+++ kdf/kwikdisk.h	Thu Mar 22 14:30:36 2001
-@@ -106,7 +106,7 @@
-     void updateDF( void );
-     void updateDFDone( void );
-     void setUpdateFrequency( int frequency );
--    void sysCallError(DiskEntry *disk, int errno);
-+    void sysCallError(DiskEntry *disk, int err_no);
- 
-   protected:
-     void mousePressEvent(QMouseEvent *);
+--- khexedit/optiondialog.cc.orig	Mon Dec 11 23:32:34 2000
++++ khexedit/optiondialog.cc
+@@ -24,7 +24,7 @@
+ #include <qvbuttongroup.h> 
+ 
+ 
+-#include <values.h>
++#include <limits.h>
+ 
+ #include <qbuttongroup.h>
+ #include <qcheckbox.h>
+@@ -495,7 +495,7 @@
+ 
+   mMisc.thresholdSpin = new QSpinBox( page );
+   mMisc.thresholdSpin->setMinimumWidth( fontMetrics().width("M") * 10 );
+-  mMisc.thresholdSpin->setRange( 5, MAXINT );
++  mMisc.thresholdSpin->setRange( 5, INT_MAX );
+   mMisc.thresholdSpin->setSteps( 5, 5 );
+   mMisc.thresholdSpin->setValue( 5 );
+ 
diff --git a/misc/kdeutils2/patches/patch-ag b/misc/kdeutils2/patches/patch-ag
index c51db7b3d98..bea246ecc42 100644
--- a/misc/kdeutils2/patches/patch-ag
+++ b/misc/kdeutils2/patches/patch-ag
@@ -1,16 +1,31 @@
-$NetBSD: patch-ag,v 1.2 2001/03/28 22:06:05 wennmach Exp $
+$NetBSD: patch-ag,v 1.3 2001/10/15 22:45:58 skrll Exp $
 
---- kdf/kwikdisk.cpp.orig	Mon Jan 22 13:16:47 2001
-+++ kdf/kwikdisk.cpp	Thu Mar 22 14:32:51 2001
-@@ -287,9 +287,9 @@
- }
+--- khexedit/printerdialog.cc.orig	Wed May 16 03:38:29 2001
++++ khexedit/printerdialog.cc
+@@ -18,7 +18,7 @@
+  *
+  */
  
+-#include <values.h>
++#include <limits.h>
  
--void DockWidget::sysCallError( DiskEntry *disk, int errno )
-+void DockWidget::sysCallError( DiskEntry *disk, int err_no )
- { 
--  if( errno != 0 )
-+  if( err_no != 0 )
-   {
-     KMessageBox::sorry( this, disk->lastSysError() );
-   }
+ #include <qbuttongroup.h>
+ #include <qcombobox.h>
+@@ -590,7 +590,7 @@
+   mOption.pageSpin->setFixedHeight( mOption.pageSpin->sizeHint().height() );
+   mOption.pageSpin->setMinimumWidth( 
+     mOption.pageSpin->fontMetrics().width("M")*10 );
+-  mOption.pageSpin->setRange( 1, MAXINT );
++  mOption.pageSpin->setRange( 1, INT_MAX );
+ 
+   text = i18n("&Number of copies");
+   QLabel *pageLabel = new QLabel( mOption.pageSpin, text, page );
+@@ -707,7 +707,7 @@
+       mLayout.marginSpin[i]->sizeHint().height() );
+     mLayout.marginSpin[i]->setMinimumWidth( 
+       mLayout.marginSpin[i]->fontMetrics().width("M")*10 );
+-    mLayout.marginSpin[i]->setRange( 0, MAXINT );
++    mLayout.marginSpin[i]->setRange( 0, INT_MAX );
+ 
+     QLabel *label = new QLabel( mLayout.marginSpin[i], name[i], group );
+     label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() );
diff --git a/misc/kdeutils2/patches/patch-ah b/misc/kdeutils2/patches/patch-ah
deleted file mode 100644
index e850c23340c..00000000000
--- a/misc/kdeutils2/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/03/22 14:02:24 tron Exp $
-
---- kdf/disks.h.orig	Mon Jul 31 21:33:42 2000
-+++ kdf/disks.h	Thu Mar 22 14:43:50 2001
-@@ -82,7 +82,7 @@
-   float percentFull() const;
- 
- signals:
--  void sysCallError(DiskEntry *disk, int errno);
-+  void sysCallError(DiskEntry *disk, int err_no);
-   void deviceNameChanged();
-   void mountPointChanged();
-   void mountOptionsChanged();
diff --git a/misc/kdeutils2/pkg/PLIST b/misc/kdeutils2/pkg/PLIST
index 1c6b1769143..afd046c98be 100644
--- a/misc/kdeutils2/pkg/PLIST
+++ b/misc/kdeutils2/pkg/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 16:05:48 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/15 22:45:59 skrll Exp $
 bin/ark
+bin/efax
+bin/efix
+bin/fax
 bin/kab
 bin/karm
 bin/kcalc
@@ -15,279 +18,105 @@ 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.a
 lib/kcalc.la
 lib/kcalc.so
-lib/kedit.a
-lib/kedit.la
-lib/kedit.so
-lib/kedit.so.0
-lib/kedit.so.0.0
+lib/kde2/kedit.a
+lib/kde2/kedit.la
+lib/kde2/kedit.so
 lib/kfind.a
 lib/kfind.la
 lib/kfind.so
+lib/libark.a
+lib/libark.la
+lib/libark.so
+lib/libark.so.1
+lib/libark.so.1.0
+lib/libkcharselectapplet.a
+lib/libkcharselectapplet.la
+lib/libkcharselectapplet.so
+lib/libkcharselectapplet.so.1
+lib/libkcharselectapplet.so.1.0
 lib/libkcm_kdf.a
 lib/libkcm_kdf.la
 lib/libkcm_kdf.so
 lib/libkcm_laptop.a
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
-lib/libktimemon.a
-lib/libktimemon.la
-lib/libktimemon.so
-lib/libktimemon.so.1
-lib/libktimemon.so.1.0
-share/doc/kde/HTML/en/ark/.anchors
-share/doc/kde/HTML/en/ark/actionmenu.html
-share/doc/kde/HTML/en/ark/ark-create.html
-share/doc/kde/HTML/en/ark/ark-extract.html
-share/doc/kde/HTML/en/ark/ark-work-files.html
-share/doc/kde/HTML/en/ark/commands.html
+man/man1/efax.1
+man/man1/efix.1
+man/man1/fax.1
 share/doc/kde/HTML/en/ark/common
-share/doc/kde/HTML/en/ark/compilation.html
-share/doc/kde/HTML/en/ark/credits.html
-share/doc/kde/HTML/en/ark/editmenu.html
+share/doc/kde/HTML/en/ark/index.cache.bz2
 share/doc/kde/HTML/en/ark/index.docbook
-share/doc/kde/HTML/en/ark/index.html
-share/doc/kde/HTML/en/ark/installation.html
-share/doc/kde/HTML/en/ark/introduction.html
-share/doc/kde/HTML/en/ark/requirements.html
-share/doc/kde/HTML/en/ark/settingsmenu.html
-share/doc/kde/HTML/en/ark/using-ark.html
-share/doc/kde/HTML/en/kab/.anchors
-share/doc/kde/HTML/en/kab/commands.html
 share/doc/kde/HTML/en/kab/common
-share/doc/kde/HTML/en/kab/credits.html
-share/doc/kde/HTML/en/kab/faq.html
+share/doc/kde/HTML/en/kab/index.cache.bz2
 share/doc/kde/HTML/en/kab/index.docbook
-share/doc/kde/HTML/en/kab/index.html
-share/doc/kde/HTML/en/kab/installation.html
-share/doc/kde/HTML/en/kab/introduction.html
-share/doc/kde/HTML/en/kab/kab-edit.html
 share/doc/kde/HTML/en/kab/kab-edit.png
 share/doc/kde/HTML/en/kab/kab-using.png
-share/doc/kde/HTML/en/karm/.anchors
 share/doc/kde/HTML/en/karm/common
-share/doc/kde/HTML/en/karm/credits.html
-share/doc/kde/HTML/en/karm/general-use.html
+share/doc/kde/HTML/en/karm/index.cache.bz2
 share/doc/kde/HTML/en/karm/index.docbook
-share/doc/kde/HTML/en/karm/index.html
-share/doc/kde/HTML/en/karm/installation.html
-share/doc/kde/HTML/en/karm/interface.html
-share/doc/kde/HTML/en/karm/introduction.html
 share/doc/kde/HTML/en/karm/karm.png
-share/doc/kde/HTML/en/karm/menus.html
-share/doc/kde/HTML/en/karm/status-bar.html
-share/doc/kde/HTML/en/karm/tool-bar.html
-share/doc/kde/HTML/en/karm/using-karm.html
-share/doc/kde/HTML/en/kcalc/.anchors
-share/doc/kde/HTML/en/kcalc/and-or-xor.html
-share/doc/kde/HTML/en/kcalc/comments-on-specific-functions.html
 share/doc/kde/HTML/en/kcalc/common
-share/doc/kde/HTML/en/kcalc/copyright.html
-share/doc/kde/HTML/en/kcalc/enable-long-double-precision.html
+share/doc/kde/HTML/en/kcalc/index.cache.bz2
 share/doc/kde/HTML/en/kcalc/index.docbook
-share/doc/kde/HTML/en/kcalc/index.html
-share/doc/kde/HTML/en/kcalc/installation.html
-share/doc/kde/HTML/en/kcalc/introduction.html
 share/doc/kde/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/kde/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/kde/HTML/en/kcalc/key-accels.html
-share/doc/kde/HTML/en/kcalc/lsh-rsh.html
-share/doc/kde/HTML/en/kcalc/percent.html
-share/doc/kde/HTML/en/kcalc/questions-and-answers.html
-share/doc/kde/HTML/en/kcalc/trigonometric-mode.html
-share/doc/kde/HTML/en/kcalc/usage.html
-share/doc/kde/HTML/en/kdf/.anchors
 share/doc/kde/HTML/en/kdf/common
-share/doc/kde/HTML/en/kdf/credits.html
+share/doc/kde/HTML/en/kdf/index.cache.bz2
 share/doc/kde/HTML/en/kdf/index.docbook
-share/doc/kde/HTML/en/kdf/index.html
-share/doc/kde/HTML/en/kdf/installation.html
-share/doc/kde/HTML/en/kdf/introduction.html
 share/doc/kde/HTML/en/kdf/kdf.png
 share/doc/kde/HTML/en/kdf/kdf_config.png
-share/doc/kde/HTML/en/kdf/main-window.html
-share/doc/kde/HTML/en/kdf/the-menus.html
-share/doc/kde/HTML/en/kdf/using-kdf.html
-share/doc/kde/HTML/en/kedit/.anchors
-share/doc/kde/HTML/en/kedit/command-line-options.html
 share/doc/kde/HTML/en/kedit/common
-share/doc/kde/HTML/en/kedit/credits.html
-share/doc/kde/HTML/en/kedit/edit.html
-share/doc/kde/HTML/en/kedit/go.html
-share/doc/kde/HTML/en/kedit/help.html
+share/doc/kde/HTML/en/kedit/index.cache.bz2
 share/doc/kde/HTML/en/kedit/index.docbook
-share/doc/kde/HTML/en/kedit/index.html
-share/doc/kde/HTML/en/kedit/installation.html
-share/doc/kde/HTML/en/kedit/introduction.html
-share/doc/kde/HTML/en/kedit/keybindings.html
-share/doc/kde/HTML/en/kedit/on-screen-fundamentals.html
-share/doc/kde/HTML/en/kedit/pref-dialog.html
-share/doc/kde/HTML/en/kedit/prefcolors.html
-share/doc/kde/HTML/en/kedit/prefmisc.html
-share/doc/kde/HTML/en/kedit/prefspellchecker.html
-share/doc/kde/HTML/en/kedit/settings.html
-share/doc/kde/HTML/en/kedit/the-menu-entries.html
-share/doc/kde/HTML/en/kedit/tools.html
-share/doc/kde/HTML/en/kfind/.anchors
-share/doc/kde/HTML/en/kfind/authors.html
 share/doc/kde/HTML/en/kfind/common
-share/doc/kde/HTML/en/kfind/compilation-and-installation.html
-share/doc/kde/HTML/en/kfind/configuration.html
-share/doc/kde/HTML/en/kfind/edit.html
-share/doc/kde/HTML/en/kfind/epilog.html
-share/doc/kde/HTML/en/kfind/help.html
+share/doc/kde/HTML/en/kfind/index.cache.bz2
 share/doc/kde/HTML/en/kfind/index.docbook
-share/doc/kde/HTML/en/kfind/index.html
-share/doc/kde/HTML/en/kfind/installation.html
-share/doc/kde/HTML/en/kfind/introduction.html
-share/doc/kde/HTML/en/kfind/onscreenfundamentals.html
-share/doc/kde/HTML/en/kfind/options.html
-share/doc/kde/HTML/en/kfind/requirements.html
-share/doc/kde/HTML/en/kfind/search-parameters-dialog.html
-share/doc/kde/HTML/en/kfind/themenuentries.html
-share/doc/kde/HTML/en/kfind/viewing-area.html
-share/doc/kde/HTML/en/kfloppy/.anchors
-share/doc/kde/HTML/en/kfloppy/buttons.html
-share/doc/kde/HTML/en/kfloppy/command-line.html
 share/doc/kde/HTML/en/kfloppy/common
-share/doc/kde/HTML/en/kfloppy/credits.html
-share/doc/kde/HTML/en/kfloppy/formatting-options.html
+share/doc/kde/HTML/en/kfloppy/index.cache.bz2
 share/doc/kde/HTML/en/kfloppy/index.docbook
-share/doc/kde/HTML/en/kfloppy/index.html
-share/doc/kde/HTML/en/kfloppy/installation.html
-share/doc/kde/HTML/en/kfloppy/introduction.html
-share/doc/kde/HTML/en/kfloppy/usingkfloppy.html
-share/doc/kde/HTML/en/khexedit/.anchors
-share/doc/kde/HTML/en/khexedit/bookmarks.html
 share/doc/kde/HTML/en/khexedit/common
-share/doc/kde/HTML/en/khexedit/credits.html
-share/doc/kde/HTML/en/khexedit/document-menu.html
-share/doc/kde/HTML/en/khexedit/edit-menu.html
-share/doc/kde/HTML/en/khexedit/help-menu.html
+share/doc/kde/HTML/en/khexedit/index.cache.bz2
 share/doc/kde/HTML/en/khexedit/index.docbook
-share/doc/kde/HTML/en/khexedit/index.html
-share/doc/kde/HTML/en/khexedit/installation.html
-share/doc/kde/HTML/en/khexedit/introduction.html
 share/doc/kde/HTML/en/khexedit/khexedit1.png
-share/doc/kde/HTML/en/khexedit/menu-commands.html
-share/doc/kde/HTML/en/khexedit/nutshell.html
-share/doc/kde/HTML/en/khexedit/settings-menu.html
-share/doc/kde/HTML/en/khexedit/starting-khexedit.html
-share/doc/kde/HTML/en/khexedit/toolbar.html
-share/doc/kde/HTML/en/khexedit/tools-menu.html
-share/doc/kde/HTML/en/khexedit/view-menu.html
-share/doc/kde/HTML/en/kjots/.anchors
-share/doc/kde/HTML/en/kjots/commands.html
 share/doc/kde/HTML/en/kjots/common
-share/doc/kde/HTML/en/kjots/compilation.html
-share/doc/kde/HTML/en/kjots/configuration.html
-share/doc/kde/HTML/en/kjots/credits.html
+share/doc/kde/HTML/en/kjots/index.cache.bz2
 share/doc/kde/HTML/en/kjots/index.docbook
-share/doc/kde/HTML/en/kjots/index.html
-share/doc/kde/HTML/en/kjots/installation.html
-share/doc/kde/HTML/en/kjots/introduction.html
-share/doc/kde/HTML/en/kjots/kjots-pages.html
-share/doc/kde/HTML/en/kjots/menu-edit.html
-share/doc/kde/HTML/en/kjots/menu-help.html
-share/doc/kde/HTML/en/kjots/menu-hotlist.html
-share/doc/kde/HTML/en/kjots/menu-options.html
-share/doc/kde/HTML/en/kjots/requirements.html
-share/doc/kde/HTML/en/kjots/using-kjots.html
-share/doc/kde/HTML/en/kljettool/.anchors
 share/doc/kde/HTML/en/kljettool/README
 share/doc/kde/HTML/en/kljettool/common
-share/doc/kde/HTML/en/kljettool/compilation-and-installation.html
-share/doc/kde/HTML/en/kljettool/credits.html
 share/doc/kde/HTML/en/kljettool/djcdoscommands.txt
 share/doc/kde/HTML/en/kljettool/filter
-share/doc/kde/HTML/en/kljettool/getting-kljettool-to-work.html
 share/doc/kde/HTML/en/kljettool/hp690c.zip
+share/doc/kde/HTML/en/kljettool/index.cache.bz2
 share/doc/kde/HTML/en/kljettool/index.docbook
-share/doc/kde/HTML/en/kljettool/index.html
-share/doc/kde/HTML/en/kljettool/installation.html
-share/doc/kde/HTML/en/kljettool/introduction.html
 share/doc/kde/HTML/en/kljettool/magic
-share/doc/kde/HTML/en/kljettool/requirements.html
 share/doc/kde/HTML/en/kljettool/screenshot.png
-share/doc/kde/HTML/en/kljettool/usage.html
-share/doc/kde/HTML/en/klpq/.anchors
-share/doc/kde/HTML/en/klpq/author.html
 share/doc/kde/HTML/en/klpq/common
-share/doc/kde/HTML/en/klpq/compilation-and-installation.html
+share/doc/kde/HTML/en/klpq/index.cache.bz2
 share/doc/kde/HTML/en/klpq/index.docbook
-share/doc/kde/HTML/en/klpq/index.html
-share/doc/kde/HTML/en/klpq/installation.html
-share/doc/kde/HTML/en/klpq/introduction.html
-share/doc/kde/HTML/en/klpq/mainwindow.html
-share/doc/kde/HTML/en/klpq/requirements.html
-share/doc/kde/HTML/en/klpq/spooler-dialog.html
-share/doc/kde/HTML/en/klpq/todo.html
-share/doc/kde/HTML/en/klpq/usage.html
-share/doc/kde/HTML/en/knotes/.anchors
+share/doc/kde/HTML/en/klprfax/common
+share/doc/kde/HTML/en/klprfax/index.cache.bz2
+share/doc/kde/HTML/en/klprfax/index.docbook
 share/doc/kde/HTML/en/knotes/common
-share/doc/kde/HTML/en/knotes/compilation.html
-share/doc/kde/HTML/en/knotes/configuration.html
-share/doc/kde/HTML/en/knotes/configuring-actions.html
-share/doc/kde/HTML/en/knotes/configuring-editor.html
-share/doc/kde/HTML/en/knotes/credits.html
-share/doc/kde/HTML/en/knotes/customizing-actions.html
-share/doc/kde/HTML/en/knotes/customizing-display.html
-share/doc/kde/HTML/en/knotes/customizing-editor.html
-share/doc/kde/HTML/en/knotes/deleting-a-note.html
-share/doc/kde/HTML/en/knotes/desktop-functions.html
-share/doc/kde/HTML/en/knotes/displaying-notes.html
-share/doc/kde/HTML/en/knotes/hiding-a-note.html
+share/doc/kde/HTML/en/knotes/index.cache.bz2
 share/doc/kde/HTML/en/knotes/index.docbook
-share/doc/kde/HTML/en/knotes/index.html
-share/doc/kde/HTML/en/knotes/inserting-the-date.html
-share/doc/kde/HTML/en/knotes/installation.html
-share/doc/kde/HTML/en/knotes/introduction.html
-share/doc/kde/HTML/en/knotes/mailing-a-note.html
-share/doc/kde/HTML/en/knotes/printing-a-note.html
-share/doc/kde/HTML/en/knotes/quit-knotes.html
-share/doc/kde/HTML/en/knotes/renaming-a-note.html
-share/doc/kde/HTML/en/knotes/requirements.html
-share/doc/kde/HTML/en/knotes/typing-the-note.html
-share/doc/kde/HTML/en/knotes/using-knotes.html
-share/doc/kde/HTML/en/kpm/.anchors
-share/doc/kde/HTML/en/kpm/commands.html
 share/doc/kde/HTML/en/kpm/common
-share/doc/kde/HTML/en/kpm/compilation.html
-share/doc/kde/HTML/en/kpm/credits.html
-share/doc/kde/HTML/en/kpm/faq.html
+share/doc/kde/HTML/en/kpm/index.cache.bz2
 share/doc/kde/HTML/en/kpm/index.docbook
-share/doc/kde/HTML/en/kpm/index.html
-share/doc/kde/HTML/en/kpm/installation.html
-share/doc/kde/HTML/en/kpm/introduction.html
 share/doc/kde/HTML/en/kpm/kpmjobs.png
 share/doc/kde/HTML/en/kpm/kpmmemory.png
 share/doc/kde/HTML/en/kpm/kpmstart.png
 share/doc/kde/HTML/en/kpm/kpmtext.png
-share/doc/kde/HTML/en/kpm/managing-processes.html
-share/doc/kde/HTML/en/kpm/monitoring-processes.html
-share/doc/kde/HTML/en/kpm/monitoring-resources.html
-share/doc/kde/HTML/en/kpm/other-signals.html
 share/doc/kde/HTML/en/kpm/qps.1
-share/doc/kde/HTML/en/kpm/requirements.html
-share/doc/kde/HTML/en/kpm/signals.html
-share/doc/kde/HTML/en/kpm/using-kpm.html
-share/doc/kde/HTML/en/ktimemon/.anchors
-share/doc/kde/HTML/en/ktimemon/autoscaling.html
-share/doc/kde/HTML/en/ktimemon/common
-share/doc/kde/HTML/en/ktimemon/config.html
-share/doc/kde/HTML/en/ktimemon/fund.html
-share/doc/kde/HTML/en/ktimemon/index.docbook
-share/doc/kde/HTML/en/ktimemon/index.html
-share/doc/kde/HTML/en/ktimemon/installation.html
-share/doc/kde/HTML/en/ktimemon/introduction.html
-share/doc/kde/HTML/en/ktimemon/menu.html
-share/doc/kde/HTML/en/ktimemon/revisionhistory.html
-share/doc/kde/HTML/en/ktimemon/thanksandacknowledgements.html
 share/kde/applnk/Editors/KEdit.desktop
 share/kde/applnk/Kfind.desktop
 share/kde/applnk/Settings/Information/kcmdf.desktop
@@ -309,18 +138,21 @@ share/kde/applnk/Utilities/karm.desktop
 share/kde/applnk/Utilities/kcalc.desktop
 share/kde/applnk/Utilities/kdepasswd.desktop
 share/kde/applnk/Utilities/khexedit.desktop
+share/kde/applnk/Utilities/klprfax.desktop
 share/kde/applnk/Utilities/knotes.desktop
+share/kde/applnk/Utilities/ktimer.desktop
+share/kde/apps/ark/ark_part.rc
 share/kde/apps/ark/arkui.rc
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_delete.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_extract.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_help.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_new.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_open.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_options.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
-share/kde/apps/ark/icons/locolor/22x22/actions/ark_view.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_help.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_new.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_open.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_options.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
+share/kde/apps/ark/icons/hicolor/22x22/actions/ark_view.png
 share/kde/apps/kab/htmlexport/templates/index.html
 share/kde/apps/kab/htmlexport/templates/kab_address.html
 share/kde/apps/kab/htmlexport/templates/kab_background.gif
@@ -348,32 +180,56 @@ share/kde/apps/kfloppy/pics/kfloppylogo.png
 share/kde/apps/khexedit/toolbar/hexdrag.png
 share/kde/apps/khexedit/toolbar/hexmask.png
 share/kde/apps/khexedit/toolbar/hexwrite.png
-share/kde/apps/kicker/applets/ktimemon.desktop
+share/kde/apps/kicker/applets/kcharselectapplet.desktop
 share/kde/apps/kjots/pics/filedel.png
-share/kde/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
-share/kde/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
-share/kde/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
-share/kde/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
-share/kde/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
-share/kde/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
-share/kde/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
-share/kde/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
+share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
+share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
+share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
+share/kde/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
 share/kde/apps/kljettool/pics/kljetlogo.png
+share/kde/apps/knotes/knotesui.rc
 share/kde/apps/knotes/pics/knotesclose.png
+share/kde/apps/knotes/pics/knotesdelete.png
 share/kde/apps/knotes/pics/knoteslogo.png
+share/kde/apps/konqueror/servicemenus/arkservicemenu.desktop
 share/kde/config/knotesrc
+share/kde/icons/hicolor/16x16/apps/ark.png
+share/kde/icons/hicolor/16x16/apps/kab.png
+share/kde/icons/hicolor/16x16/apps/karm.png
+share/kde/icons/hicolor/16x16/apps/kcalc.png
+share/kde/icons/hicolor/16x16/apps/kcharselect.png
+share/kde/icons/hicolor/16x16/apps/kcmdf.png
+share/kde/icons/hicolor/16x16/apps/kdf.png
+share/kde/icons/hicolor/16x16/apps/kedit.png
 share/kde/icons/hicolor/16x16/apps/kfind.png
+share/kde/icons/hicolor/16x16/apps/kfloppy.png
+share/kde/icons/hicolor/16x16/apps/khexedit.png
+share/kde/icons/hicolor/16x16/apps/kjots.png
+share/kde/icons/hicolor/16x16/apps/klaptopdaemon.png
+share/kde/icons/hicolor/16x16/apps/kljettool.png
+share/kde/icons/hicolor/16x16/apps/klpq.png
+share/kde/icons/hicolor/16x16/apps/klprfax.png
+share/kde/icons/hicolor/16x16/apps/knotes.png
+share/kde/icons/hicolor/16x16/apps/kwikdisk.png
+share/kde/icons/hicolor/16x16/apps/laptop_battery.png
+share/kde/icons/hicolor/16x16/apps/laptop_pcmcia.png
 share/kde/icons/hicolor/32x32/apps/ark.png
 share/kde/icons/hicolor/32x32/apps/kab.png
 share/kde/icons/hicolor/32x32/apps/karm.png
 share/kde/icons/hicolor/32x32/apps/kcalc.png
+share/kde/icons/hicolor/32x32/apps/kcmdf.png
+share/kde/icons/hicolor/32x32/apps/kdf.png
 share/kde/icons/hicolor/32x32/apps/kedit.png
 share/kde/icons/hicolor/32x32/apps/kfind.png
 share/kde/icons/hicolor/32x32/apps/kfloppy.png
 share/kde/icons/hicolor/32x32/apps/khexedit.png
 share/kde/icons/hicolor/32x32/apps/kjots.png
+share/kde/icons/hicolor/32x32/apps/kljettool.png
 share/kde/icons/hicolor/32x32/apps/klpq.png
+share/kde/icons/hicolor/32x32/apps/klprfax.png
 share/kde/icons/hicolor/32x32/apps/knotes.png
+share/kde/icons/hicolor/32x32/apps/kwikdisk.png
 share/kde/icons/hicolor/32x32/apps/laptop_battery.png
 share/kde/icons/hicolor/32x32/apps/laptop_pcmcia.png
 share/kde/icons/hicolor/48x48/apps/ark.png
@@ -391,65 +247,31 @@ share/kde/icons/hicolor/48x48/apps/klpq.png
 share/kde/icons/hicolor/48x48/apps/knotes.png
 share/kde/icons/hicolor/48x48/apps/laptop_battery.png
 share/kde/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/kde/icons/locolor/16x16/apps/ark.png
-share/kde/icons/locolor/16x16/apps/kab.png
-share/kde/icons/locolor/16x16/apps/karm.png
-share/kde/icons/locolor/16x16/apps/kcalc.png
-share/kde/icons/locolor/16x16/apps/kcharselect.png
-share/kde/icons/locolor/16x16/apps/kcmdf.png
-share/kde/icons/locolor/16x16/apps/kdf.png
-share/kde/icons/locolor/16x16/apps/kedit.png
-share/kde/icons/locolor/16x16/apps/kfind.png
-share/kde/icons/locolor/16x16/apps/kfloppy.png
-share/kde/icons/locolor/16x16/apps/khexedit.png
-share/kde/icons/locolor/16x16/apps/kjots.png
-share/kde/icons/locolor/16x16/apps/klaptopdaemon.png
-share/kde/icons/locolor/16x16/apps/kljettool.png
-share/kde/icons/locolor/16x16/apps/klpq.png
-share/kde/icons/locolor/16x16/apps/knotes.png
-share/kde/icons/locolor/16x16/apps/ktimemon.png
-share/kde/icons/locolor/16x16/apps/kwikdisk.png
-share/kde/icons/locolor/16x16/apps/laptop_battery.png
-share/kde/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/kde/icons/locolor/32x32/apps/ark.png
-share/kde/icons/locolor/32x32/apps/kab.png
-share/kde/icons/locolor/32x32/apps/karm.png
-share/kde/icons/locolor/32x32/apps/kcalc.png
-share/kde/icons/locolor/32x32/apps/kcharselect.png
-share/kde/icons/locolor/32x32/apps/kcmdf.png
-share/kde/icons/locolor/32x32/apps/kdf.png
-share/kde/icons/locolor/32x32/apps/kedit.png
-share/kde/icons/locolor/32x32/apps/kfind.png
-share/kde/icons/locolor/32x32/apps/kfloppy.png
-share/kde/icons/locolor/32x32/apps/khexedit.png
-share/kde/icons/locolor/32x32/apps/kjots.png
-share/kde/icons/locolor/32x32/apps/kljettool.png
-share/kde/icons/locolor/32x32/apps/klpq.png
-share/kde/icons/locolor/32x32/apps/knotes.png
-share/kde/icons/locolor/32x32/apps/ktimemon.png
-share/kde/icons/locolor/32x32/apps/kwikdisk.png
-share/kde/icons/locolor/32x32/apps/laptop_battery.png
-share/kde/icons/locolor/32x32/apps/laptop_pcmcia.png
+share/kde/icons/locolor/16x16/apps/klprfax.png
+share/kde/icons/locolor/32x32/apps/klprfax.png
+share/kde/services/arkpart.desktop
 @comment kdebase:dirrm share/kde/icons/locolor/32x32/apps
 @comment kdebase:dirrm share/kde/icons/locolor/16x16/apps
 @comment kdebase:dirrm share/kde/icons/hicolor/48x48/apps
 @comment kdebase:dirrm share/kde/icons/hicolor/32x32/apps
 @comment kdebase:dirrm share/kde/icons/hicolor/16x16/apps
 @comment kdelibs:dirrm share/kde/config
+@dirrm share/kde/apps/konqueror/servicemenus
+@comment kdexxxx:dirrm share/kde/apps/konqueror
 @dirrm share/kde/apps/knotes/pics
 @dirrm share/kde/apps/knotes
 @dirrm share/kde/apps/kljettool/pics
 @dirrm share/kde/apps/kljettool
-@dirrm share/kde/apps/klaptopdaemon/icons/locolor/32x32/actions
-@dirrm share/kde/apps/klaptopdaemon/icons/locolor/32x32
-@dirrm share/kde/apps/klaptopdaemon/icons/locolor/16x16/actions
-@dirrm share/kde/apps/klaptopdaemon/icons/locolor/16x16
-@dirrm share/kde/apps/klaptopdaemon/icons/locolor
+@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/32x32/actions
+@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/32x32
+@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/16x16
+@dirrm share/kde/apps/klaptopdaemon/icons/hicolor
 @dirrm share/kde/apps/klaptopdaemon/icons
 @dirrm share/kde/apps/klaptopdaemon
 @dirrm share/kde/apps/kjots/pics
 @dirrm share/kde/apps/kjots
-@comment kdebase:dirrm share/kde/apps/kicker/applets
+@comment kdexxxx:dirrm share/kde/apps/kicker/applets
 @dirrm share/kde/apps/khexedit/toolbar
 @dirrm share/kde/apps/khexedit
 @dirrm share/kde/apps/kfloppy/pics
@@ -461,25 +283,24 @@ share/kde/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/kde/apps/kcalc
 @dirrm share/kde/apps/karm/pics
 @dirrm share/kde/apps/karm
-@comment kdelibs:dirrm share/kde/apps/kab/pics
 @dirrm share/kde/apps/kab/htmlexport/templates
 @dirrm share/kde/apps/kab/htmlexport
-@comment kdelibs:dirrm share/kde/apps/kab
-@dirrm share/kde/apps/ark/icons/locolor/22x22/actions
-@dirrm share/kde/apps/ark/icons/locolor/22x22
-@dirrm share/kde/apps/ark/icons/locolor
+@comment kdexxxx:dirrm share/kde/apps/kab
+@dirrm share/kde/apps/ark/icons/hicolor/22x22/actions
+@dirrm share/kde/apps/ark/icons/hicolor/22x22
+@dirrm share/kde/apps/ark/icons/hicolor
 @dirrm share/kde/apps/ark/icons
 @dirrm share/kde/apps/ark
-@comment kdelibs:dirrm share/kde/apps
-@comment kdebase:dirrm share/kde/applnk/Utilities
-@comment kdebase:dirrm share/kde/applnk/System
-@comment kdebase:dirrm share/kde/applnk/Settings/PowerControl
-@comment kdebase:dirrm share/kde/applnk/Settings/Information
-@comment kdebase:dirrm share/kde/applnk/Editors
-@comment kdebase:dirrm share/kde/applnk
-@dirrm share/doc/kde/HTML/en/ktimemon
+@comment kdexxxx:dirrm share/kde/apps
+@comment kdexxxx:dirrm share/kde/applnk/Utilities
+@comment kdexxxx:dirrm share/kde/applnk/System
+@comment kdexxxx:dirrm share/kde/applnk/Settings/PowerControl
+@comment kdexxxx:dirrm share/kde/applnk/Settings/Information
+@comment kdexxxx:dirrm share/kde/applnk/Editors
+@comment kdexxxx:dirrm share/kde/applnk
 @dirrm share/doc/kde/HTML/en/kpm
 @dirrm share/doc/kde/HTML/en/knotes
+@dirrm share/doc/kde/HTML/en/klprfax
 @dirrm share/doc/kde/HTML/en/klpq
 @dirrm share/doc/kde/HTML/en/kljettool
 @dirrm share/doc/kde/HTML/en/kjots
@@ -492,4 +313,5 @@ share/kde/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/doc/kde/HTML/en/karm
 @dirrm share/doc/kde/HTML/en/kab
 @dirrm share/doc/kde/HTML/en/ark
-@comment kdelibs:dirrm share/doc/kde/HTML/en
+@comment kdexxxx:dirrm share/doc/kde/HTML/en
+@comment kdexxxx:dirrm lib/kde2