Update to KDE 2.2:

 * All patches except sysutils/kdeadmin/files/patch-rpmMessages.c:
	- Either obsoleted or merged into KDE.
 * All pkg-plists:
	- Huge diffs are due to mass conversion from static HTML pages
	  to XML/XSL versions.
 * audio/kdemultimedia2:
	- aRts + Noatun, etc. now work and play MP3s et al properly,
	  using the mpg123 aRtsplugin.  Remove mpeglib[,_artsplug]
	  from compile.
 * converters/kdesupport2:
	- Obsolete.  No longer used in this version of KDE.
 * deskutils/kdepim:
	- Use autoconf and account for brokenness in the configure
	  script by replacing invocations of INSTALL under libical
	  with the proper incantations.
	- Per David O'Brien's request, move libimap to libkimap;
	  this was performed by Rik Hemsley <rikkus@kde.org>.
 * devel/kdesdk:
	- New module with some helpful tools.  One in particular that
	  seems demanded is ``kbabel'', which, as I've been told, is
	  a translator's wet dream.
	- Workaround dumb problem in kbabel's libgettext (which I could
	  not figure out how to remove) by replacing its error() with
	  errc().  KBabel seems to run fine with this patch.
 * devel/kdevelop:
	- Fix lame check for libkdeui.so.* by replacing it with just
	  a check for libkdeui.so.  It's been/being removed from
	  kdevelop after 2.2.
 * editors/koffice:
	- Fix kivio compile errors by substituting in PTHREAD_LIBS
	  in the correct place.  Compensate for kivio's dependency
	  on pthreads by changing kivio to use LD_PRELOAD=/usr/lib/libc_r.so
	  in kivio.desktop.
 * games/kdegames2:
	- Some new games.
 * graphics/kdegraphics2:
	- Fix link errors in libkscan and kamera where they
	  require gettext (ie: add -lintl).
	- Fix compile error in kamera.cpp which is dependent on a
	  correctly done gphoto2.. of course, this will only help
	  people who've manually installed gphoto2 themselves.
 * net/kdenetwork2:
	- Mimelib was moved here (reason for removal of kdesupport2).
 * misc/kdeaddons:
	- New module to FreeBSD ports; some simple addons for KDE2.
	  Suggested by Lauri Watts <lauri@kde.org>.
 * misc/kdeutils2:
	- Added a couple manpages.
 * x11-clocks/kdetoys2:
	- Some new apps.
 * sysutils/kdeadmin:
	- Remove kuser from compile because it has some problems.  ;\
 * x11/kdelibs2:
	- Add libFAM dependency to help people who run FAM; FAM
	  increases the overall desktop responsiveness.
	  Submitted by Lauri Watts <lauri@kde.org>.
	- Add CUPS dependency to bring in KDE's new print system.
	- Add bzip2/libxml2 dependencies to support the new help kioslave.
	- Disable installation of libltdl stuff to prevent conflicts
	  with other stuff.  Submitted by wjv.
	- Add pkg-req script to avoid conflicts with kdelibs11; add
	  to Makefile too.  Submitted by benno.
	- Be sure to remove the pth header conflicts stuff from the
	  arts/mcop_mt section.
	- Fix problem with configure trying to find -lfam in the
	  wrong place.
	- Remove kspell and api subdirs from doc; we don't need them,
	  and there are problems trying to build/install them.
	  Submitted by Lauri Watts <lauri@kde.org>.
 * x11/kdebase2:
	- Solve link permissions problem by changing the modes on
	  files installed by kdesktop/init/Templates to 644.
	  Submitted by Jim Durham <durham@w2xo.pgh.pa.us>.
 * x11/kde2:
	- Bump version; no other changes.

Special thanks to Lauri Watts <lauri@kde.org> for helping me test
packages generated by these changes on a virgin system.  I believe
that this is the best-tested update I've ever done for KDE, and it
really shines this time around.

I just noticed there are a couple other PRs in the PR db that need
to be addressed.  I will take care of those by tomorrow.  Sorry...

PR:			22735, 28549
Blanket approval by:	demon (kdesdk, kdevelop)

18 files changed, 453 insertions, 1302 deletions

diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile
index 44bfaff93fdf..c12d48213f7f 100644
--- a/sysutils/kdeadmin/Makefile
+++ b/sysutils/kdeadmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeadmin
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -19,4 +19,7 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin/distinfo b/sysutils/kdeadmin/distinfo
index caa15fcbc481..f9e592873ab3 100644
--- a/sysutils/kdeadmin/distinfo
+++ b/sysutils/kdeadmin/distinfo
@@ -1 +1 @@
-MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da
+MD5 (kdeadmin-2.2.tar.bz2) = 13ee99fa898fc177dd65dc2564fefd60
diff --git a/sysutils/kdeadmin/pkg-plist b/sysutils/kdeadmin/pkg-plist
index 180180974f19..0fafa91e4c89 100644
--- a/sysutils/kdeadmin/pkg-plist
+++ b/sysutils/kdeadmin/pkg-plist
@@ -1,182 +1,79 @@
 bin/kcron
 bin/kpackage
-bin/kpackage_slack_l
-bin/printversion
-bin/kuser
 bin/kwuftpd
 bin/secpolicy
-lib/libkcm_ksysctrl.so
-lib/libkcm_ksysctrl.la
-share/doc/HTML/en/kcron/.anchors
-share/doc/HTML/en/kcron/commands.html
-share/doc/HTML/en/kcron/compilation.html
-share/doc/HTML/en/kcron/credits.html
-share/doc/HTML/en/kcron/faq.html
-share/doc/HTML/en/kcron/index.html
-share/doc/HTML/en/kcron/installation.html
-share/doc/HTML/en/kcron/introduction.html
-share/doc/HTML/en/kcron/manage-tasks.html
-share/doc/HTML/en/kcron/manage-variables.html
-share/doc/HTML/en/kcron/new-task.html
-share/doc/HTML/en/kcron/new-variable.html
-share/doc/HTML/en/kcron/printing-crontab.html
-share/doc/HTML/en/kcron/requirements.html
-share/doc/HTML/en/kcron/saving-crontab.html
-share/doc/HTML/en/kcron/using-kcron.html
+share/applnk/System/kcron.desktop
+share/applnk/System/kpackage.desktop
+share/applnk/System/kwuftpd.desktop
+share/apps/kpackage/kpackageui.rc
+share/apps/kpackage/pics/bnew.png
+share/apps/kpackage/pics/bsd.png
+share/apps/kpackage/pics/bupdated.png
+share/apps/kpackage/pics/cross.png
+share/apps/kpackage/pics/dbad.png
+share/apps/kpackage/pics/deb.png
+share/apps/kpackage/pics/dnew.png
+share/apps/kpackage/pics/dupdated.png
+share/apps/kpackage/pics/kiss.png
+share/apps/kpackage/pics/knew.png
+share/apps/kpackage/pics/kupdated.png
+share/apps/kpackage/pics/noball.png
+share/apps/kpackage/pics/ptick.png
+share/apps/kpackage/pics/question.png
+share/apps/kpackage/pics/rnew.png
+share/apps/kpackage/pics/rpm.png
+share/apps/kpackage/pics/rupdated.png
+share/apps/kpackage/pics/slack.png
+share/apps/kpackage/pics/snew.png
+share/apps/kpackage/pics/supdated.png
+share/apps/kpackage/pics/tick.png
+share/apps/kpackage/toolbar/ftin.xpm
+share/apps/kpackage/toolbar/ftout.xpm
 share/doc/HTML/en/kcron/common
+share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
 share/doc/HTML/en/kcron/kcron.png
 share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
-share/doc/HTML/en/kpackage/.anchors
-share/doc/HTML/en/kpackage/cache-menu.html
-share/doc/HTML/en/kpackage/credits-and-licenses.html
-share/doc/HTML/en/kpackage/help-menu.html
-share/doc/HTML/en/kpackage/index.html
-share/doc/HTML/en/kpackage/installation.html
-share/doc/HTML/en/kpackage/installing-packages.html
-share/doc/HTML/en/kpackage/integrating-available-packages-in-the-tree.html
-share/doc/HTML/en/kpackage/introduction.html
-share/doc/HTML/en/kpackage/menus.html
-share/doc/HTML/en/kpackage/onscreen-fundamentals.html
-share/doc/HTML/en/kpackage/package-information-panel.html
-share/doc/HTML/en/kpackage/packages-menu.html
-share/doc/HTML/en/kpackage/requirements.html
-share/doc/HTML/en/kpackage/root-access.html
-share/doc/HTML/en/kpackage/settings-menu.html
-share/doc/HTML/en/kpackage/special-menu.html
-share/doc/HTML/en/kpackage/the-package-tree-panel.html
-share/doc/HTML/en/kpackage/toolbar.html
-share/doc/HTML/en/kpackage/uninstalling-packages.html
 share/doc/HTML/en/kpackage/common
+share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
-share/doc/HTML/en/ksysv/.anchors
-share/doc/HTML/en/ksysv/appendix.html
-share/doc/HTML/en/ksysv/authors.html
-share/doc/HTML/en/ksysv/configuration.html
-share/doc/HTML/en/ksysv/credits.html
-share/doc/HTML/en/ksysv/index.html
-share/doc/HTML/en/ksysv/introduction.html
-share/doc/HTML/en/ksysv/keyboard.html
-share/doc/HTML/en/ksysv/license.html
-share/doc/HTML/en/ksysv/onscreenfundamentals.html
-share/doc/HTML/en/ksysv/standard-semantics-of-runlevels.html
-share/doc/HTML/en/ksysv/the-menu-entries.html
 share/doc/HTML/en/ksysv/common
-share/doc/HTML/en/ksysv/index.cvlog
+share/doc/HTML/en/ksysv/index.cache.bz2
 share/doc/HTML/en/ksysv/index.docbook
-share/doc/HTML/en/kuser/.anchors
-share/doc/HTML/en/kuser/add-user.html
-share/doc/HTML/en/kuser/credits.html
-share/doc/HTML/en/kuser/customizing.html
-share/doc/HTML/en/kuser/group-properties.html
-share/doc/HTML/en/kuser/index.html
-share/doc/HTML/en/kuser/start.html
-share/doc/HTML/en/kuser/user-properties.html
-share/doc/HTML/en/kuser/using.html
 share/doc/HTML/en/kuser/common
+share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
-share/doc/HTML/en/kwuftpd/.anchors
-share/doc/HTML/en/kwuftpd/about-ftp-accounts.html
-share/doc/HTML/en/kwuftpd/basic-ftp-setup.html
-share/doc/HTML/en/kwuftpd/credits-and-license.html
-share/doc/HTML/en/kwuftpd/directories.html
-share/doc/HTML/en/kwuftpd/index.html
-share/doc/HTML/en/kwuftpd/installation.html
-share/doc/HTML/en/kwuftpd/introduction.html
-share/doc/HTML/en/kwuftpd/logging.html
-share/doc/HTML/en/kwuftpd/menuref.html
-share/doc/HTML/en/kwuftpd/messages.html
-share/doc/HTML/en/kwuftpd/ratios.html
-share/doc/HTML/en/kwuftpd/security.html
-share/doc/HTML/en/kwuftpd/uploads.html
-share/doc/HTML/en/kwuftpd/user-classes.html
-share/doc/HTML/en/kwuftpd/using-kwuftpd.html
-share/doc/HTML/en/kwuftpd/virtual-hosts.html
 share/doc/HTML/en/kwuftpd/common
-share/doc/HTML/en/kwuftpd/logging.png
-share/doc/HTML/en/kwuftpd/index.docbook
 share/doc/HTML/en/kwuftpd/directories.png
+share/doc/HTML/en/kwuftpd/index.cache.bz2
+share/doc/HTML/en/kwuftpd/index.docbook
+share/doc/HTML/en/kwuftpd/logging.png
 share/doc/HTML/en/kwuftpd/messages.png
 share/doc/HTML/en/kwuftpd/ratios.png
 share/doc/HTML/en/kwuftpd/security.png
 share/doc/HTML/en/kwuftpd/uploads.png
 share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
-share/apps/kpackage/pics/cross.xpm
-share/apps/kpackage/pics/dbad.xpm
-share/apps/kpackage/pics/deb.xpm
-share/apps/kpackage/pics/dnew.xpm
-share/apps/kpackage/pics/dupdated.xpm
-share/apps/kpackage/pics/ptick.xpm
-share/apps/kpackage/pics/question.xpm
-share/apps/kpackage/pics/rnew.xpm
-share/apps/kpackage/pics/rpm.xpm
-share/apps/kpackage/pics/rupdated.xpm
-share/apps/kpackage/pics/kiss.xpm
-share/apps/kpackage/pics/knew.xpm
-share/apps/kpackage/pics/kupdated.xpm
-share/apps/kpackage/pics/slack.xpm
-share/apps/kpackage/pics/snew.xpm
-share/apps/kpackage/pics/supdated.xpm
-share/apps/kpackage/pics/bsd.xpm
-share/apps/kpackage/pics/bnew.xpm
-share/apps/kpackage/pics/bupdated.xpm
-share/apps/kpackage/pics/tick.xpm
-share/apps/kpackage/pics/noball.xpm
-share/apps/kpackage/toolbar/ftin.xpm
-share/apps/kpackage/toolbar/ftout.xpm
-share/apps/kpackage/kpackageui.rc
-share/apps/ksysctrl/pci.ids
-share/apps/ksysctrl/README
-share/apps/ksysctrl/NEWS
-share/apps/ksysctrl/LICENSE
-share/apps/kuser/pics/group.png
-share/apps/kuser/pics/user.png
-share/apps/kuser/icons/locolor/22x22/actions/add_group.png
-share/apps/kuser/icons/locolor/22x22/actions/add_user.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_group.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_user.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_group.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_user.png
-share/apps/kuser/kuserui.rc
-share/mimelnk/application/x-debian-package.kdelnk
-share/icons/locolor/16x16/apps/kcron.png
-share/icons/locolor/16x16/apps/kuser.png
-share/icons/locolor/16x16/apps/kpackage.png
-share/icons/locolor/32x32/apps/kcron.png
-share/icons/locolor/32x32/apps/kpackage.png
-share/icons/locolor/32x32/apps/kuser.png
+share/icons/hicolor/16x16/apps/kcron.png
+share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/kpackage.png
-share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kpackage.png
-share/icons/hicolor/48x48/apps/kuser.png
-share/applnk/System/kcron.desktop
-share/applnk/System/kpackage.desktop
-share/applnk/System/kuser.desktop
-share/applnk/System/kwuftpd.desktop
-share/applnk/Settings/System/ksysctrl.desktop
-@dirrm share/doc/HTML/en/kcron
-@dirrm share/doc/HTML/en/kpackage
-@dirrm share/doc/HTML/en/ksysv
-@dirrm share/doc/HTML/en/kuser
+share/mimelnk/application/x-debian-package.desktop
+@dirrm share/mimelnk/application
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kwuftpd
-@dirrm share/apps/kpackage/pics
+@dirrm share/doc/HTML/en/kuser
+@dirrm share/doc/HTML/en/ksysv
+@dirrm share/doc/HTML/en/kpackage
+@dirrm share/doc/HTML/en/kcron
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kpackage/toolbar
+@dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
-@dirrm share/apps/ksysctrl/toolbar
-@dirrm share/apps/ksysctrl/icons/locolor/16x16/apps
-@dirrm share/apps/ksysctrl/icons/locolor/16x16
-@dirrm share/apps/ksysctrl/icons/locolor/32x32/apps
-@dirrm share/apps/ksysctrl/icons/locolor/32x32
-@dirrm share/apps/ksysctrl/icons/locolor
-@dirrm share/apps/ksysctrl/icons
-@dirrm share/apps/ksysctrl
-@dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/locolor/22x22/actions
-@dirrm share/apps/kuser/icons/locolor/22x22
-@dirrm share/apps/kuser/icons/locolor
-@dirrm share/apps/kuser/icons
-@dirrm share/apps/kuser
+@dirrm share/applnk/System
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index 44bfaff93fdf..c12d48213f7f 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeadmin
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -19,4 +19,7 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index caa15fcbc481..f9e592873ab3 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1 +1 @@
-MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da
+MD5 (kdeadmin-2.2.tar.bz2) = 13ee99fa898fc177dd65dc2564fefd60
diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist
index 180180974f19..0fafa91e4c89 100644
--- a/sysutils/kdeadmin3/pkg-plist
+++ b/sysutils/kdeadmin3/pkg-plist
@@ -1,182 +1,79 @@
 bin/kcron
 bin/kpackage
-bin/kpackage_slack_l
-bin/printversion
-bin/kuser
 bin/kwuftpd
 bin/secpolicy
-lib/libkcm_ksysctrl.so
-lib/libkcm_ksysctrl.la
-share/doc/HTML/en/kcron/.anchors
-share/doc/HTML/en/kcron/commands.html
-share/doc/HTML/en/kcron/compilation.html
-share/doc/HTML/en/kcron/credits.html
-share/doc/HTML/en/kcron/faq.html
-share/doc/HTML/en/kcron/index.html
-share/doc/HTML/en/kcron/installation.html
-share/doc/HTML/en/kcron/introduction.html
-share/doc/HTML/en/kcron/manage-tasks.html
-share/doc/HTML/en/kcron/manage-variables.html
-share/doc/HTML/en/kcron/new-task.html
-share/doc/HTML/en/kcron/new-variable.html
-share/doc/HTML/en/kcron/printing-crontab.html
-share/doc/HTML/en/kcron/requirements.html
-share/doc/HTML/en/kcron/saving-crontab.html
-share/doc/HTML/en/kcron/using-kcron.html
+share/applnk/System/kcron.desktop
+share/applnk/System/kpackage.desktop
+share/applnk/System/kwuftpd.desktop
+share/apps/kpackage/kpackageui.rc
+share/apps/kpackage/pics/bnew.png
+share/apps/kpackage/pics/bsd.png
+share/apps/kpackage/pics/bupdated.png
+share/apps/kpackage/pics/cross.png
+share/apps/kpackage/pics/dbad.png
+share/apps/kpackage/pics/deb.png
+share/apps/kpackage/pics/dnew.png
+share/apps/kpackage/pics/dupdated.png
+share/apps/kpackage/pics/kiss.png
+share/apps/kpackage/pics/knew.png
+share/apps/kpackage/pics/kupdated.png
+share/apps/kpackage/pics/noball.png
+share/apps/kpackage/pics/ptick.png
+share/apps/kpackage/pics/question.png
+share/apps/kpackage/pics/rnew.png
+share/apps/kpackage/pics/rpm.png
+share/apps/kpackage/pics/rupdated.png
+share/apps/kpackage/pics/slack.png
+share/apps/kpackage/pics/snew.png
+share/apps/kpackage/pics/supdated.png
+share/apps/kpackage/pics/tick.png
+share/apps/kpackage/toolbar/ftin.xpm
+share/apps/kpackage/toolbar/ftout.xpm
 share/doc/HTML/en/kcron/common
+share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
 share/doc/HTML/en/kcron/kcron.png
 share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
-share/doc/HTML/en/kpackage/.anchors
-share/doc/HTML/en/kpackage/cache-menu.html
-share/doc/HTML/en/kpackage/credits-and-licenses.html
-share/doc/HTML/en/kpackage/help-menu.html
-share/doc/HTML/en/kpackage/index.html
-share/doc/HTML/en/kpackage/installation.html
-share/doc/HTML/en/kpackage/installing-packages.html
-share/doc/HTML/en/kpackage/integrating-available-packages-in-the-tree.html
-share/doc/HTML/en/kpackage/introduction.html
-share/doc/HTML/en/kpackage/menus.html
-share/doc/HTML/en/kpackage/onscreen-fundamentals.html
-share/doc/HTML/en/kpackage/package-information-panel.html
-share/doc/HTML/en/kpackage/packages-menu.html
-share/doc/HTML/en/kpackage/requirements.html
-share/doc/HTML/en/kpackage/root-access.html
-share/doc/HTML/en/kpackage/settings-menu.html
-share/doc/HTML/en/kpackage/special-menu.html
-share/doc/HTML/en/kpackage/the-package-tree-panel.html
-share/doc/HTML/en/kpackage/toolbar.html
-share/doc/HTML/en/kpackage/uninstalling-packages.html
 share/doc/HTML/en/kpackage/common
+share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
-share/doc/HTML/en/ksysv/.anchors
-share/doc/HTML/en/ksysv/appendix.html
-share/doc/HTML/en/ksysv/authors.html
-share/doc/HTML/en/ksysv/configuration.html
-share/doc/HTML/en/ksysv/credits.html
-share/doc/HTML/en/ksysv/index.html
-share/doc/HTML/en/ksysv/introduction.html
-share/doc/HTML/en/ksysv/keyboard.html
-share/doc/HTML/en/ksysv/license.html
-share/doc/HTML/en/ksysv/onscreenfundamentals.html
-share/doc/HTML/en/ksysv/standard-semantics-of-runlevels.html
-share/doc/HTML/en/ksysv/the-menu-entries.html
 share/doc/HTML/en/ksysv/common
-share/doc/HTML/en/ksysv/index.cvlog
+share/doc/HTML/en/ksysv/index.cache.bz2
 share/doc/HTML/en/ksysv/index.docbook
-share/doc/HTML/en/kuser/.anchors
-share/doc/HTML/en/kuser/add-user.html
-share/doc/HTML/en/kuser/credits.html
-share/doc/HTML/en/kuser/customizing.html
-share/doc/HTML/en/kuser/group-properties.html
-share/doc/HTML/en/kuser/index.html
-share/doc/HTML/en/kuser/start.html
-share/doc/HTML/en/kuser/user-properties.html
-share/doc/HTML/en/kuser/using.html
 share/doc/HTML/en/kuser/common
+share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
-share/doc/HTML/en/kwuftpd/.anchors
-share/doc/HTML/en/kwuftpd/about-ftp-accounts.html
-share/doc/HTML/en/kwuftpd/basic-ftp-setup.html
-share/doc/HTML/en/kwuftpd/credits-and-license.html
-share/doc/HTML/en/kwuftpd/directories.html
-share/doc/HTML/en/kwuftpd/index.html
-share/doc/HTML/en/kwuftpd/installation.html
-share/doc/HTML/en/kwuftpd/introduction.html
-share/doc/HTML/en/kwuftpd/logging.html
-share/doc/HTML/en/kwuftpd/menuref.html
-share/doc/HTML/en/kwuftpd/messages.html
-share/doc/HTML/en/kwuftpd/ratios.html
-share/doc/HTML/en/kwuftpd/security.html
-share/doc/HTML/en/kwuftpd/uploads.html
-share/doc/HTML/en/kwuftpd/user-classes.html
-share/doc/HTML/en/kwuftpd/using-kwuftpd.html
-share/doc/HTML/en/kwuftpd/virtual-hosts.html
 share/doc/HTML/en/kwuftpd/common
-share/doc/HTML/en/kwuftpd/logging.png
-share/doc/HTML/en/kwuftpd/index.docbook
 share/doc/HTML/en/kwuftpd/directories.png
+share/doc/HTML/en/kwuftpd/index.cache.bz2
+share/doc/HTML/en/kwuftpd/index.docbook
+share/doc/HTML/en/kwuftpd/logging.png
 share/doc/HTML/en/kwuftpd/messages.png
 share/doc/HTML/en/kwuftpd/ratios.png
 share/doc/HTML/en/kwuftpd/security.png
 share/doc/HTML/en/kwuftpd/uploads.png
 share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
-share/apps/kpackage/pics/cross.xpm
-share/apps/kpackage/pics/dbad.xpm
-share/apps/kpackage/pics/deb.xpm
-share/apps/kpackage/pics/dnew.xpm
-share/apps/kpackage/pics/dupdated.xpm
-share/apps/kpackage/pics/ptick.xpm
-share/apps/kpackage/pics/question.xpm
-share/apps/kpackage/pics/rnew.xpm
-share/apps/kpackage/pics/rpm.xpm
-share/apps/kpackage/pics/rupdated.xpm
-share/apps/kpackage/pics/kiss.xpm
-share/apps/kpackage/pics/knew.xpm
-share/apps/kpackage/pics/kupdated.xpm
-share/apps/kpackage/pics/slack.xpm
-share/apps/kpackage/pics/snew.xpm
-share/apps/kpackage/pics/supdated.xpm
-share/apps/kpackage/pics/bsd.xpm
-share/apps/kpackage/pics/bnew.xpm
-share/apps/kpackage/pics/bupdated.xpm
-share/apps/kpackage/pics/tick.xpm
-share/apps/kpackage/pics/noball.xpm
-share/apps/kpackage/toolbar/ftin.xpm
-share/apps/kpackage/toolbar/ftout.xpm
-share/apps/kpackage/kpackageui.rc
-share/apps/ksysctrl/pci.ids
-share/apps/ksysctrl/README
-share/apps/ksysctrl/NEWS
-share/apps/ksysctrl/LICENSE
-share/apps/kuser/pics/group.png
-share/apps/kuser/pics/user.png
-share/apps/kuser/icons/locolor/22x22/actions/add_group.png
-share/apps/kuser/icons/locolor/22x22/actions/add_user.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_group.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_user.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_group.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_user.png
-share/apps/kuser/kuserui.rc
-share/mimelnk/application/x-debian-package.kdelnk
-share/icons/locolor/16x16/apps/kcron.png
-share/icons/locolor/16x16/apps/kuser.png
-share/icons/locolor/16x16/apps/kpackage.png
-share/icons/locolor/32x32/apps/kcron.png
-share/icons/locolor/32x32/apps/kpackage.png
-share/icons/locolor/32x32/apps/kuser.png
+share/icons/hicolor/16x16/apps/kcron.png
+share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/kpackage.png
-share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kpackage.png
-share/icons/hicolor/48x48/apps/kuser.png
-share/applnk/System/kcron.desktop
-share/applnk/System/kpackage.desktop
-share/applnk/System/kuser.desktop
-share/applnk/System/kwuftpd.desktop
-share/applnk/Settings/System/ksysctrl.desktop
-@dirrm share/doc/HTML/en/kcron
-@dirrm share/doc/HTML/en/kpackage
-@dirrm share/doc/HTML/en/ksysv
-@dirrm share/doc/HTML/en/kuser
+share/mimelnk/application/x-debian-package.desktop
+@dirrm share/mimelnk/application
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kwuftpd
-@dirrm share/apps/kpackage/pics
+@dirrm share/doc/HTML/en/kuser
+@dirrm share/doc/HTML/en/ksysv
+@dirrm share/doc/HTML/en/kpackage
+@dirrm share/doc/HTML/en/kcron
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kpackage/toolbar
+@dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
-@dirrm share/apps/ksysctrl/toolbar
-@dirrm share/apps/ksysctrl/icons/locolor/16x16/apps
-@dirrm share/apps/ksysctrl/icons/locolor/16x16
-@dirrm share/apps/ksysctrl/icons/locolor/32x32/apps
-@dirrm share/apps/ksysctrl/icons/locolor/32x32
-@dirrm share/apps/ksysctrl/icons/locolor
-@dirrm share/apps/ksysctrl/icons
-@dirrm share/apps/ksysctrl
-@dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/locolor/22x22/actions
-@dirrm share/apps/kuser/icons/locolor/22x22
-@dirrm share/apps/kuser/icons/locolor
-@dirrm share/apps/kuser/icons
-@dirrm share/apps/kuser
+@dirrm share/applnk/System
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 44bfaff93fdf..c12d48213f7f 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeadmin
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -19,4 +19,7 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index caa15fcbc481..f9e592873ab3 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1 +1 @@
-MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da
+MD5 (kdeadmin-2.2.tar.bz2) = 13ee99fa898fc177dd65dc2564fefd60
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 180180974f19..0fafa91e4c89 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -1,182 +1,79 @@
 bin/kcron
 bin/kpackage
-bin/kpackage_slack_l
-bin/printversion
-bin/kuser
 bin/kwuftpd
 bin/secpolicy
-lib/libkcm_ksysctrl.so
-lib/libkcm_ksysctrl.la
-share/doc/HTML/en/kcron/.anchors
-share/doc/HTML/en/kcron/commands.html
-share/doc/HTML/en/kcron/compilation.html
-share/doc/HTML/en/kcron/credits.html
-share/doc/HTML/en/kcron/faq.html
-share/doc/HTML/en/kcron/index.html
-share/doc/HTML/en/kcron/installation.html
-share/doc/HTML/en/kcron/introduction.html
-share/doc/HTML/en/kcron/manage-tasks.html
-share/doc/HTML/en/kcron/manage-variables.html
-share/doc/HTML/en/kcron/new-task.html
-share/doc/HTML/en/kcron/new-variable.html
-share/doc/HTML/en/kcron/printing-crontab.html
-share/doc/HTML/en/kcron/requirements.html
-share/doc/HTML/en/kcron/saving-crontab.html
-share/doc/HTML/en/kcron/using-kcron.html
+share/applnk/System/kcron.desktop
+share/applnk/System/kpackage.desktop
+share/applnk/System/kwuftpd.desktop
+share/apps/kpackage/kpackageui.rc
+share/apps/kpackage/pics/bnew.png
+share/apps/kpackage/pics/bsd.png
+share/apps/kpackage/pics/bupdated.png
+share/apps/kpackage/pics/cross.png
+share/apps/kpackage/pics/dbad.png
+share/apps/kpackage/pics/deb.png
+share/apps/kpackage/pics/dnew.png
+share/apps/kpackage/pics/dupdated.png
+share/apps/kpackage/pics/kiss.png
+share/apps/kpackage/pics/knew.png
+share/apps/kpackage/pics/kupdated.png
+share/apps/kpackage/pics/noball.png
+share/apps/kpackage/pics/ptick.png
+share/apps/kpackage/pics/question.png
+share/apps/kpackage/pics/rnew.png
+share/apps/kpackage/pics/rpm.png
+share/apps/kpackage/pics/rupdated.png
+share/apps/kpackage/pics/slack.png
+share/apps/kpackage/pics/snew.png
+share/apps/kpackage/pics/supdated.png
+share/apps/kpackage/pics/tick.png
+share/apps/kpackage/toolbar/ftin.xpm
+share/apps/kpackage/toolbar/ftout.xpm
 share/doc/HTML/en/kcron/common
+share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
 share/doc/HTML/en/kcron/kcron.png
 share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
-share/doc/HTML/en/kpackage/.anchors
-share/doc/HTML/en/kpackage/cache-menu.html
-share/doc/HTML/en/kpackage/credits-and-licenses.html
-share/doc/HTML/en/kpackage/help-menu.html
-share/doc/HTML/en/kpackage/index.html
-share/doc/HTML/en/kpackage/installation.html
-share/doc/HTML/en/kpackage/installing-packages.html
-share/doc/HTML/en/kpackage/integrating-available-packages-in-the-tree.html
-share/doc/HTML/en/kpackage/introduction.html
-share/doc/HTML/en/kpackage/menus.html
-share/doc/HTML/en/kpackage/onscreen-fundamentals.html
-share/doc/HTML/en/kpackage/package-information-panel.html
-share/doc/HTML/en/kpackage/packages-menu.html
-share/doc/HTML/en/kpackage/requirements.html
-share/doc/HTML/en/kpackage/root-access.html
-share/doc/HTML/en/kpackage/settings-menu.html
-share/doc/HTML/en/kpackage/special-menu.html
-share/doc/HTML/en/kpackage/the-package-tree-panel.html
-share/doc/HTML/en/kpackage/toolbar.html
-share/doc/HTML/en/kpackage/uninstalling-packages.html
 share/doc/HTML/en/kpackage/common
+share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
-share/doc/HTML/en/ksysv/.anchors
-share/doc/HTML/en/ksysv/appendix.html
-share/doc/HTML/en/ksysv/authors.html
-share/doc/HTML/en/ksysv/configuration.html
-share/doc/HTML/en/ksysv/credits.html
-share/doc/HTML/en/ksysv/index.html
-share/doc/HTML/en/ksysv/introduction.html
-share/doc/HTML/en/ksysv/keyboard.html
-share/doc/HTML/en/ksysv/license.html
-share/doc/HTML/en/ksysv/onscreenfundamentals.html
-share/doc/HTML/en/ksysv/standard-semantics-of-runlevels.html
-share/doc/HTML/en/ksysv/the-menu-entries.html
 share/doc/HTML/en/ksysv/common
-share/doc/HTML/en/ksysv/index.cvlog
+share/doc/HTML/en/ksysv/index.cache.bz2
 share/doc/HTML/en/ksysv/index.docbook
-share/doc/HTML/en/kuser/.anchors
-share/doc/HTML/en/kuser/add-user.html
-share/doc/HTML/en/kuser/credits.html
-share/doc/HTML/en/kuser/customizing.html
-share/doc/HTML/en/kuser/group-properties.html
-share/doc/HTML/en/kuser/index.html
-share/doc/HTML/en/kuser/start.html
-share/doc/HTML/en/kuser/user-properties.html
-share/doc/HTML/en/kuser/using.html
 share/doc/HTML/en/kuser/common
+share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
-share/doc/HTML/en/kwuftpd/.anchors
-share/doc/HTML/en/kwuftpd/about-ftp-accounts.html
-share/doc/HTML/en/kwuftpd/basic-ftp-setup.html
-share/doc/HTML/en/kwuftpd/credits-and-license.html
-share/doc/HTML/en/kwuftpd/directories.html
-share/doc/HTML/en/kwuftpd/index.html
-share/doc/HTML/en/kwuftpd/installation.html
-share/doc/HTML/en/kwuftpd/introduction.html
-share/doc/HTML/en/kwuftpd/logging.html
-share/doc/HTML/en/kwuftpd/menuref.html
-share/doc/HTML/en/kwuftpd/messages.html
-share/doc/HTML/en/kwuftpd/ratios.html
-share/doc/HTML/en/kwuftpd/security.html
-share/doc/HTML/en/kwuftpd/uploads.html
-share/doc/HTML/en/kwuftpd/user-classes.html
-share/doc/HTML/en/kwuftpd/using-kwuftpd.html
-share/doc/HTML/en/kwuftpd/virtual-hosts.html
 share/doc/HTML/en/kwuftpd/common
-share/doc/HTML/en/kwuftpd/logging.png
-share/doc/HTML/en/kwuftpd/index.docbook
 share/doc/HTML/en/kwuftpd/directories.png
+share/doc/HTML/en/kwuftpd/index.cache.bz2
+share/doc/HTML/en/kwuftpd/index.docbook
+share/doc/HTML/en/kwuftpd/logging.png
 share/doc/HTML/en/kwuftpd/messages.png
 share/doc/HTML/en/kwuftpd/ratios.png
 share/doc/HTML/en/kwuftpd/security.png
 share/doc/HTML/en/kwuftpd/uploads.png
 share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
-share/apps/kpackage/pics/cross.xpm
-share/apps/kpackage/pics/dbad.xpm
-share/apps/kpackage/pics/deb.xpm
-share/apps/kpackage/pics/dnew.xpm
-share/apps/kpackage/pics/dupdated.xpm
-share/apps/kpackage/pics/ptick.xpm
-share/apps/kpackage/pics/question.xpm
-share/apps/kpackage/pics/rnew.xpm
-share/apps/kpackage/pics/rpm.xpm
-share/apps/kpackage/pics/rupdated.xpm
-share/apps/kpackage/pics/kiss.xpm
-share/apps/kpackage/pics/knew.xpm
-share/apps/kpackage/pics/kupdated.xpm
-share/apps/kpackage/pics/slack.xpm
-share/apps/kpackage/pics/snew.xpm
-share/apps/kpackage/pics/supdated.xpm
-share/apps/kpackage/pics/bsd.xpm
-share/apps/kpackage/pics/bnew.xpm
-share/apps/kpackage/pics/bupdated.xpm
-share/apps/kpackage/pics/tick.xpm
-share/apps/kpackage/pics/noball.xpm
-share/apps/kpackage/toolbar/ftin.xpm
-share/apps/kpackage/toolbar/ftout.xpm
-share/apps/kpackage/kpackageui.rc
-share/apps/ksysctrl/pci.ids
-share/apps/ksysctrl/README
-share/apps/ksysctrl/NEWS
-share/apps/ksysctrl/LICENSE
-share/apps/kuser/pics/group.png
-share/apps/kuser/pics/user.png
-share/apps/kuser/icons/locolor/22x22/actions/add_group.png
-share/apps/kuser/icons/locolor/22x22/actions/add_user.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_group.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_user.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_group.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_user.png
-share/apps/kuser/kuserui.rc
-share/mimelnk/application/x-debian-package.kdelnk
-share/icons/locolor/16x16/apps/kcron.png
-share/icons/locolor/16x16/apps/kuser.png
-share/icons/locolor/16x16/apps/kpackage.png
-share/icons/locolor/32x32/apps/kcron.png
-share/icons/locolor/32x32/apps/kpackage.png
-share/icons/locolor/32x32/apps/kuser.png
+share/icons/hicolor/16x16/apps/kcron.png
+share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/kpackage.png
-share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kpackage.png
-share/icons/hicolor/48x48/apps/kuser.png
-share/applnk/System/kcron.desktop
-share/applnk/System/kpackage.desktop
-share/applnk/System/kuser.desktop
-share/applnk/System/kwuftpd.desktop
-share/applnk/Settings/System/ksysctrl.desktop
-@dirrm share/doc/HTML/en/kcron
-@dirrm share/doc/HTML/en/kpackage
-@dirrm share/doc/HTML/en/ksysv
-@dirrm share/doc/HTML/en/kuser
+share/mimelnk/application/x-debian-package.desktop
+@dirrm share/mimelnk/application
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kwuftpd
-@dirrm share/apps/kpackage/pics
+@dirrm share/doc/HTML/en/kuser
+@dirrm share/doc/HTML/en/ksysv
+@dirrm share/doc/HTML/en/kpackage
+@dirrm share/doc/HTML/en/kcron
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kpackage/toolbar
+@dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
-@dirrm share/apps/ksysctrl/toolbar
-@dirrm share/apps/ksysctrl/icons/locolor/16x16/apps
-@dirrm share/apps/ksysctrl/icons/locolor/16x16
-@dirrm share/apps/ksysctrl/icons/locolor/32x32/apps
-@dirrm share/apps/ksysctrl/icons/locolor/32x32
-@dirrm share/apps/ksysctrl/icons/locolor
-@dirrm share/apps/ksysctrl/icons
-@dirrm share/apps/ksysctrl
-@dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/locolor/22x22/actions
-@dirrm share/apps/kuser/icons/locolor/22x22
-@dirrm share/apps/kuser/icons/locolor
-@dirrm share/apps/kuser/icons
-@dirrm share/apps/kuser
+@dirrm share/applnk/System
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 5e040d99442a..75586b323001 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/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/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index f18435189a7a..a8863e42ad1e 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
+MD5 (kdeutils-2.2.tar.bz2) = 2ee57c259669232cb301359fb9000d08
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 44b2e28001ba..ae31b3d6f094 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/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/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 5e040d99442a..75586b323001 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/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/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index f18435189a7a..a8863e42ad1e 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
+MD5 (kdeutils-2.2.tar.bz2) = 2ee57c259669232cb301359fb9000d08
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 44b2e28001ba..ae31b3d6f094 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/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/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 5e040d99442a..75586b323001 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/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/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index f18435189a7a..a8863e42ad1e 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
+MD5 (kdeutils-2.2.tar.bz2) = 2ee57c259669232cb301359fb9000d08
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index 44b2e28001ba..ae31b3d6f094 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/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