Lo and behold, welcome KDE 2.1 to our ports tree. As a direct result of

the KDE team's excellent work, I am initiating burn sequence for KDE
1.x.  All base KDE1 ports are hereby nuked.  I am also reluctantly
reassuming maintainership of the KDE2 ports.  Official KDE 2.1 packages
built for FreeBSD 4.2-STABLE w/ XFree86 4.0.2 are available on KDE's
official ftp mirrors now.  Enjoy!

Note:  It seems that the KDE people rerolled their kdelibs and kdebase
packages, and a quick examination of diffs reveal minor changes, but the
port should still work.  I'll fix the packaging problems that bento runs
into.

Approved by:	kevlo

16 files changed, 225 insertions, 770 deletions

diff --git a/misc/Makefile b/misc/Makefile
index a02ddbe9b9eb..edc108b31703 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -74,7 +74,6 @@
     SUBDIR += jargon
     SUBDIR += jive
     SUBDIR += kcd
-    SUBDIR += kdeutils11
     SUBDIR += kdeutils2
     SUBDIR += kdirstat
     SUBDIR += khotkeys
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
deleted file mode 100644
index ad9013b1bdf1..000000000000
--- a/misc/kdeutils11/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:   kdeutils
-# Date created:        28 October 1997
-# Whom:                Stefan Eßer <se@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdeutils
-PORTVERSION=	1.1.2
-PORTREVISION=	1
-CATEGORIES=	misc kde
-MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= Attic/old/1.1.2/distribution/tar/generic/source/bz2
-
-PATCH_SITES=	http://www.kde.gr.jp/~asaki/KDE-1.1.2/SOURCES/
-PATCHFILES=	kdeutils-ja.19991117.diff.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	will@FreeBSD.org
-
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-
-NO_LATEST_LINK=	yes
-USE_BZIP2=	yes
-USE_QT=		yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-extra-includes=$(PREFIX)/include \
-		--with-qt-includes=${QTDIR}/include/X11/qt
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \
-		QTDIR=${QTDIR}
-USE_GMAKE=	yes
-
-.if defined(PREFIX)
-QTDIR?=		${PREFIX}
-.else
-QTDIR?=		${X11BASE}
-.endif
-
-.include <bsd.port.mk>
diff --git a/misc/kdeutils11/distinfo b/misc/kdeutils11/distinfo
deleted file mode 100644
index 9e88f366fba9..000000000000
--- a/misc/kdeutils11/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (kdeutils-1.1.2.tar.bz2) = 43ca9fcd2c9f3842201f4d5848cd32d9
-MD5 (kdeutils-ja.19991117.diff.gz) = d952e8348efe986540166a2e79f3a337
diff --git a/misc/kdeutils11/files/patch-ab b/misc/kdeutils11/files/patch-ab
deleted file mode 100644
index 9e9001c6022f..000000000000
--- a/misc/kdeutils11/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Wed Sep  8 00:25:21 1999
-+++ configure	Tue Feb 15 01:44:40 2000
-@@ -4379,6 +4379,7 @@
-     fi
- 
- 
-+if false; then
- echo $ac_n "checking for giflib""... $ac_c" 1>&6
- echo "configure:4384: checking for giflib" >&5
- if eval "test \"`echo '$''{'ac_cv_lib_gif'+set}'`\" = set"; then
-@@ -4425,6 +4426,7 @@
- 
- else
-   { echo "configure: error: You need giflib30. Please install the kdesupport package" 1>&2; exit 1; }
-+fi
- fi
- 
- echo $ac_n "checking for jpeglib""... $ac_c" 1>&6
diff --git a/misc/kdeutils11/pkg-comment b/misc/kdeutils11/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/misc/kdeutils11/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/misc/kdeutils11/pkg-descr b/misc/kdeutils11/pkg-descr
deleted file mode 100644
index 90ae45773bea..000000000000
--- a/misc/kdeutils11/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/misc/kdeutils11/pkg-plist b/misc/kdeutils11/pkg-plist
deleted file mode 100644
index fd1a00cbd533..000000000000
--- a/misc/kdeutils11/pkg-plist
+++ /dev/null
@@ -1,576 +0,0 @@
-bin/ark
-bin/kab
-bin/kabapi_test
-bin/karm
-bin/kcalc
-bin/kedit
-bin/khexdit
-bin/kjots
-bin/klipper
-bin/kljettool
-bin/klpq
-bin/knotes
-bin/kwrite
-share/applnk/Applications/KEdit.kdelnk
-share/applnk/Applications/kwrite.kdelnk
-share/applnk/Utilities/KArm.kdelnk
-share/applnk/Utilities/KLJetTool.kdelnk
-share/applnk/Utilities/KLpq.kdelnk
-share/applnk/Utilities/Kjots.kdelnk
-share/applnk/Utilities/ark.kdelnk
-share/applnk/Utilities/kab.kdelnk
-share/applnk/Utilities/kcalc.kdelnk
-share/applnk/Utilities/khexdit.kdelnk
-share/applnk/Utilities/klipper.kdelnk
-share/applnk/Utilities/knotes.kdelnk
-share/apps/kab/pics/addressbook_logo.jpg
-share/apps/kcalc/pics/kcalclogo.xpm
-share/apps/kedit/pics/keditlogo.xpm
-share/apps/kedit/toolbar/filenew2.xpm
-share/apps/kedit/toolbar/send.xpm
-share/apps/kjots/pics/OpenBook.xpm
-share/apps/kjots/pics/filedel.xpm
-share/apps/knotes/pics/knotesclose.xpm
-share/apps/knotes/pics/knoteslogo.xpm
-share/doc/HTML/de/kab/fehler.gif
-share/doc/HTML/de/kab/index.html
-share/doc/HTML/de/kcalc/index-1.html
-share/doc/HTML/de/kcalc/index-2.html
-share/doc/HTML/de/kcalc/index-3.html
-share/doc/HTML/de/kcalc/index-4.html
-share/doc/HTML/de/kcalc/index-5.html
-share/doc/HTML/de/kcalc/index-6.html
-share/doc/HTML/de/kcalc/index-7.html
-share/doc/HTML/de/kcalc/index-8.html
-share/doc/HTML/de/kcalc/index-9.html
-share/doc/HTML/de/kcalc/index.html
-share/doc/HTML/de/kcalc/logotp3.gif
-share/doc/HTML/en/ark/index-1.html
-share/doc/HTML/en/ark/index-2.html
-share/doc/HTML/en/ark/index-3.html
-share/doc/HTML/en/ark/index-4.html
-share/doc/HTML/en/ark/index.html
-share/doc/HTML/en/ark/logotp3.gif
-share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/karm/index-1.html
-share/doc/HTML/en/karm/index-2.html
-share/doc/HTML/en/karm/index-3.html
-share/doc/HTML/en/karm/index-4.html
-share/doc/HTML/en/karm/index.html
-share/doc/HTML/en/karm/index.sgml
-share/doc/HTML/en/karm/karm.gif
-share/doc/HTML/en/karm/logotp3.gif
-share/doc/HTML/en/karm/scrn.html
-share/doc/HTML/en/kcalc/index-1.html
-share/doc/HTML/en/kcalc/index-2.html
-share/doc/HTML/en/kcalc/index-3.html
-share/doc/HTML/en/kcalc/index-4.html
-share/doc/HTML/en/kcalc/index-5.html
-share/doc/HTML/en/kcalc/index-6.html
-share/doc/HTML/en/kcalc/index-7.html
-share/doc/HTML/en/kcalc/index-8.html
-share/doc/HTML/en/kcalc/index-9.html
-share/doc/HTML/en/kcalc/index.html
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcalc/logotp3.gif
-share/doc/HTML/en/kedit/index-1.html
-share/doc/HTML/en/kedit/index-2.html
-share/doc/HTML/en/kedit/index-3.html
-share/doc/HTML/en/kedit/index-4.html
-share/doc/HTML/en/kedit/index-5.html
-share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/logotp3.gif
-share/doc/HTML/en/khexdit/index.html
-share/doc/HTML/en/kjots/index-1.html
-share/doc/HTML/en/kjots/index-2.html
-share/doc/HTML/en/kjots/index-3.html
-share/doc/HTML/en/kjots/index.html
-share/doc/HTML/en/kjots/logotp3.gif
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/kljettool-1.html
-share/doc/HTML/en/kljettool/kljettool-2.html
-share/doc/HTML/en/kljettool/kljettool-3.html
-share/doc/HTML/en/kljettool/kljettool-4.html
-share/doc/HTML/en/kljettool/kljettool-5.html
-share/doc/HTML/en/kljettool/kljettool-6.html
-share/doc/HTML/en/kljettool/kljettool.html
-share/doc/HTML/en/kljettool/kljettool.nif
-share/doc/HTML/en/kljettool/kljettool.sgml
-share/doc/HTML/en/kljettool/logotp3.gif
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/klpq/index-1.html
-share/doc/HTML/en/klpq/index-2.html
-share/doc/HTML/en/klpq/index-3.html
-share/doc/HTML/en/klpq/index-4.html
-share/doc/HTML/en/klpq/index-5.html
-share/doc/HTML/en/klpq/index-6.html
-share/doc/HTML/en/klpq/index-7.html
-share/doc/HTML/en/klpq/index.html
-share/doc/HTML/en/klpq/logotp3.gif
-share/doc/HTML/en/knotes/index-1.html
-share/doc/HTML/en/knotes/index-2.html
-share/doc/HTML/en/knotes/index-3.html
-share/doc/HTML/en/knotes/index-4.html
-share/doc/HTML/en/knotes/index-5.html
-share/doc/HTML/en/knotes/index.html
-share/doc/HTML/en/knotes/logotp3.gif
-share/doc/HTML/en/kwrite/index-1.html
-share/doc/HTML/en/kwrite/index-2.html
-share/doc/HTML/en/kwrite/index-3.html
-share/doc/HTML/en/kwrite/index-4.html
-share/doc/HTML/en/kwrite/index-5.html
-share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/logotp3.gif
-share/doc/HTML/it/khexdit/index.html
-share/icons/ark.xpm
-share/icons/kab.xpm
-share/icons/karm.xpm
-share/icons/kcalc.xpm
-share/icons/kedit.xpm
-share/icons/khexdit.xpm
-share/icons/kjots.xpm
-share/icons/klipper.xpm
-share/icons/kljetlogo.xpm
-share/icons/klpq.xpm
-share/icons/knotes.xpm
-share/icons/kwrite.xpm
-share/icons/large/ark.xpm
-share/icons/large/kab.xpm
-share/icons/large/karm.xpm
-share/icons/large/kcalc.xpm
-share/icons/large/kedit.xpm
-share/icons/large/khexdit.xpm
-share/icons/large/kjots.xpm
-share/icons/large/klipper.xpm
-share/icons/large/kljettool.xpm
-share/icons/large/klpq.xpm
-share/icons/large/knotes.xpm
-share/icons/large/kwrite.xpm
-share/icons/mini/ark.xpm
-share/icons/mini/kab.xpm
-share/icons/mini/karm.xpm
-share/icons/mini/kcalc.xpm
-share/icons/mini/kedit.xpm
-share/icons/mini/khexdit.xpm
-share/icons/mini/kjots.xpm
-share/icons/mini/klipper.xpm
-share/icons/mini/kljettool.xpm
-share/icons/mini/klpq.xpm
-share/icons/mini/knotes.xpm
-share/icons/mini/kwrite.xpm
-share/icons/redo.xpm
-share/icons/undo.xpm
-share/locale/br/LC_MESSAGES/ark.mo
-share/locale/br/LC_MESSAGES/kab.mo
-share/locale/br/LC_MESSAGES/karm.mo
-share/locale/br/LC_MESSAGES/kcalc.mo
-share/locale/br/LC_MESSAGES/kedit.mo
-share/locale/br/LC_MESSAGES/kfloppy.mo
-share/locale/br/LC_MESSAGES/khexdit.mo
-share/locale/br/LC_MESSAGES/kjots.mo
-share/locale/br/LC_MESSAGES/klipper.mo
-share/locale/br/LC_MESSAGES/kljettool.mo
-share/locale/br/LC_MESSAGES/klpq.mo
-share/locale/br/LC_MESSAGES/knotes.mo
-share/locale/br/LC_MESSAGES/kpm.mo
-share/locale/br/LC_MESSAGES/ktop.mo
-share/locale/br/LC_MESSAGES/kwrite.mo
-share/locale/ca/LC_MESSAGES/ark.mo
-share/locale/ca/LC_MESSAGES/kab.mo
-share/locale/ca/LC_MESSAGES/karm.mo
-share/locale/ca/LC_MESSAGES/kcalc.mo
-share/locale/ca/LC_MESSAGES/kedit.mo
-share/locale/ca/LC_MESSAGES/kfloppy.mo
-share/locale/ca/LC_MESSAGES/khexdit.mo
-share/locale/ca/LC_MESSAGES/kjots.mo
-share/locale/ca/LC_MESSAGES/klipper.mo
-share/locale/ca/LC_MESSAGES/kljettool.mo
-share/locale/ca/LC_MESSAGES/klpq.mo
-share/locale/ca/LC_MESSAGES/knotes.mo
-share/locale/ca/LC_MESSAGES/kpm.mo
-share/locale/ca/LC_MESSAGES/kwrite.mo
-share/locale/cs/LC_MESSAGES/ark.mo
-share/locale/cs/LC_MESSAGES/kab.mo
-share/locale/cs/LC_MESSAGES/karm.mo
-share/locale/cs/LC_MESSAGES/kcalc.mo
-share/locale/cs/LC_MESSAGES/kedit.mo
-share/locale/cs/LC_MESSAGES/kfloppy.mo
-share/locale/cs/LC_MESSAGES/khexdit.mo
-share/locale/cs/LC_MESSAGES/kjots.mo
-share/locale/cs/LC_MESSAGES/klipper.mo
-share/locale/cs/LC_MESSAGES/kljettool.mo
-share/locale/cs/LC_MESSAGES/klpq.mo
-share/locale/cs/LC_MESSAGES/knotes.mo
-share/locale/cs/LC_MESSAGES/kpm.mo
-share/locale/cs/LC_MESSAGES/ktop.mo
-share/locale/cs/LC_MESSAGES/kwrite.mo
-share/locale/da/LC_MESSAGES/ark.mo
-share/locale/da/LC_MESSAGES/kab.mo
-share/locale/da/LC_MESSAGES/karm.mo
-share/locale/da/LC_MESSAGES/kcalc.mo
-share/locale/da/LC_MESSAGES/kedit.mo
-share/locale/da/LC_MESSAGES/kfloppy.mo
-share/locale/da/LC_MESSAGES/khexdit.mo
-share/locale/da/LC_MESSAGES/kjots.mo
-share/locale/da/LC_MESSAGES/klipper.mo
-share/locale/da/LC_MESSAGES/kljettool.mo
-share/locale/da/LC_MESSAGES/klpq.mo
-share/locale/da/LC_MESSAGES/knotes.mo
-share/locale/da/LC_MESSAGES/kpm.mo
-share/locale/da/LC_MESSAGES/ktop.mo
-share/locale/da/LC_MESSAGES/kwrite.mo
-share/locale/de/LC_MESSAGES/ark.mo
-share/locale/de/LC_MESSAGES/kab.mo
-share/locale/de/LC_MESSAGES/karm.mo
-share/locale/de/LC_MESSAGES/kcalc.mo
-share/locale/de/LC_MESSAGES/kedit.mo
-share/locale/de/LC_MESSAGES/kfloppy.mo
-share/locale/de/LC_MESSAGES/khexdit.mo
-share/locale/de/LC_MESSAGES/kjots.mo
-share/locale/de/LC_MESSAGES/klipper.mo
-share/locale/de/LC_MESSAGES/kljettool.mo
-share/locale/de/LC_MESSAGES/klpq.mo
-share/locale/de/LC_MESSAGES/knotes.mo
-share/locale/de/LC_MESSAGES/kpm.mo
-share/locale/de/LC_MESSAGES/ktop.mo
-share/locale/de/LC_MESSAGES/kwrite.mo
-share/locale/el/LC_MESSAGES/karm.mo
-share/locale/el/LC_MESSAGES/kcalc.mo
-share/locale/el/LC_MESSAGES/kedit.mo
-share/locale/el/LC_MESSAGES/kfloppy.mo
-share/locale/el/LC_MESSAGES/khexdit.mo
-share/locale/el/LC_MESSAGES/knotes.mo
-share/locale/el/LC_MESSAGES/kzip.mo
-share/locale/eo/LC_MESSAGES/ark.mo
-share/locale/eo/LC_MESSAGES/karm.mo
-share/locale/eo/LC_MESSAGES/kcalc.mo
-share/locale/eo/LC_MESSAGES/kedit.mo
-share/locale/eo/LC_MESSAGES/kfloppy.mo
-share/locale/eo/LC_MESSAGES/khexdit.mo
-share/locale/eo/LC_MESSAGES/kljettool.mo
-share/locale/eo/LC_MESSAGES/knotes.mo
-share/locale/es/LC_MESSAGES/ark.mo
-share/locale/es/LC_MESSAGES/kab.mo
-share/locale/es/LC_MESSAGES/karm.mo
-share/locale/es/LC_MESSAGES/kcalc.mo
-share/locale/es/LC_MESSAGES/kedit.mo
-share/locale/es/LC_MESSAGES/kfloppy.mo
-share/locale/es/LC_MESSAGES/khexdit.mo
-share/locale/es/LC_MESSAGES/kjots.mo
-share/locale/es/LC_MESSAGES/klipper.mo
-share/locale/es/LC_MESSAGES/kljettool.mo
-share/locale/es/LC_MESSAGES/klpq.mo
-share/locale/es/LC_MESSAGES/knotes.mo
-share/locale/es/LC_MESSAGES/kpm.mo
-share/locale/es/LC_MESSAGES/ktop.mo
-share/locale/es/LC_MESSAGES/kwrite.mo
-share/locale/et/LC_MESSAGES/ark.mo
-share/locale/et/LC_MESSAGES/kab.mo
-share/locale/et/LC_MESSAGES/karm.mo
-share/locale/et/LC_MESSAGES/kcalc.mo
-share/locale/et/LC_MESSAGES/kedit.mo
-share/locale/et/LC_MESSAGES/kfloppy.mo
-share/locale/et/LC_MESSAGES/khexdit.mo
-share/locale/et/LC_MESSAGES/kjots.mo
-share/locale/et/LC_MESSAGES/klipper.mo
-share/locale/et/LC_MESSAGES/kljettool.mo
-share/locale/et/LC_MESSAGES/klpq.mo
-share/locale/et/LC_MESSAGES/knotes.mo
-share/locale/et/LC_MESSAGES/kwrite.mo
-share/locale/fi/LC_MESSAGES/ark.mo
-share/locale/fi/LC_MESSAGES/kab.mo
-share/locale/fi/LC_MESSAGES/karm.mo
-share/locale/fi/LC_MESSAGES/kcalc.mo
-share/locale/fi/LC_MESSAGES/kedit.mo
-share/locale/fi/LC_MESSAGES/kfloppy.mo
-share/locale/fi/LC_MESSAGES/khexdit.mo
-share/locale/fi/LC_MESSAGES/kjots.mo
-share/locale/fi/LC_MESSAGES/klipper.mo
-share/locale/fi/LC_MESSAGES/kljettool.mo
-share/locale/fi/LC_MESSAGES/klpq.mo
-share/locale/fi/LC_MESSAGES/knotes.mo
-share/locale/fi/LC_MESSAGES/kpm.mo
-share/locale/fi/LC_MESSAGES/kwrite.mo
-share/locale/fr/LC_MESSAGES/ark.mo
-share/locale/fr/LC_MESSAGES/kab.mo
-share/locale/fr/LC_MESSAGES/karm.mo
-share/locale/fr/LC_MESSAGES/kcalc.mo
-share/locale/fr/LC_MESSAGES/kedit.mo
-share/locale/fr/LC_MESSAGES/kfloppy.mo
-share/locale/fr/LC_MESSAGES/khexdit.mo
-share/locale/fr/LC_MESSAGES/kjots.mo
-share/locale/fr/LC_MESSAGES/klipper.mo
-share/locale/fr/LC_MESSAGES/kljettool.mo
-share/locale/fr/LC_MESSAGES/klpq.mo
-share/locale/fr/LC_MESSAGES/knotes.mo
-share/locale/fr/LC_MESSAGES/kpm.mo
-share/locale/fr/LC_MESSAGES/ktop.mo
-share/locale/fr/LC_MESSAGES/kwrite.mo
-share/locale/he/LC_MESSAGES/kedit.mo
-share/locale/hr/LC_MESSAGES/ark.mo
-share/locale/hr/LC_MESSAGES/kab.mo
-share/locale/hr/LC_MESSAGES/karm.mo
-share/locale/hr/LC_MESSAGES/kcalc.mo
-share/locale/hr/LC_MESSAGES/kedit.mo
-share/locale/hr/LC_MESSAGES/kfloppy.mo
-share/locale/hr/LC_MESSAGES/khexdit.mo
-share/locale/hr/LC_MESSAGES/kljettool.mo
-share/locale/hr/LC_MESSAGES/klpq.mo
-share/locale/hr/LC_MESSAGES/knotes.mo
-share/locale/hr/LC_MESSAGES/kpm.mo
-share/locale/hr/LC_MESSAGES/ktop.mo
-share/locale/hs/LC_MESSAGES/kfloppy.mo
-share/locale/hu/LC_MESSAGES/ark.mo
-share/locale/hu/LC_MESSAGES/kab.mo
-share/locale/hu/LC_MESSAGES/kedit.mo
-share/locale/hu/LC_MESSAGES/khexdit.mo
-share/locale/hu/LC_MESSAGES/klipper.mo
-share/locale/hu/LC_MESSAGES/knotes.mo
-share/locale/hu/LC_MESSAGES/ktop.mo
-share/locale/hu/LC_MESSAGES/kwrite.mo
-share/locale/is/LC_MESSAGES/ark.mo
-share/locale/is/LC_MESSAGES/kab.mo
-share/locale/is/LC_MESSAGES/karm.mo
-share/locale/is/LC_MESSAGES/kcalc.mo
-share/locale/is/LC_MESSAGES/kedit.mo
-share/locale/is/LC_MESSAGES/kfloppy.mo
-share/locale/is/LC_MESSAGES/khexdit.mo
-share/locale/is/LC_MESSAGES/kjots.mo
-share/locale/is/LC_MESSAGES/klipper.mo
-share/locale/is/LC_MESSAGES/kljettool.mo
-share/locale/is/LC_MESSAGES/klpq.mo
-share/locale/is/LC_MESSAGES/knotes.mo
-share/locale/is/LC_MESSAGES/kpm.mo
-share/locale/is/LC_MESSAGES/kwrite.mo
-share/locale/it/LC_MESSAGES/ark.mo
-share/locale/it/LC_MESSAGES/kab.mo
-share/locale/it/LC_MESSAGES/karm.mo
-share/locale/it/LC_MESSAGES/kcalc.mo
-share/locale/it/LC_MESSAGES/kedit.mo
-share/locale/it/LC_MESSAGES/kfloppy.mo
-share/locale/it/LC_MESSAGES/khexdit.mo
-share/locale/it/LC_MESSAGES/kjots.mo
-share/locale/it/LC_MESSAGES/klipper.mo
-share/locale/it/LC_MESSAGES/kljettool.mo
-share/locale/it/LC_MESSAGES/klpq.mo
-share/locale/it/LC_MESSAGES/knotes.mo
-share/locale/it/LC_MESSAGES/kpm.mo
-share/locale/it/LC_MESSAGES/ktop.mo
-share/locale/it/LC_MESSAGES/kwrite.mo
-share/locale/ja/LC_MESSAGES/ark.mo
-share/locale/ja/LC_MESSAGES/kab.mo
-share/locale/ja/LC_MESSAGES/karm.mo
-share/locale/ja/LC_MESSAGES/kcalc.mo
-share/locale/ja/LC_MESSAGES/kedit.mo
-share/locale/ja/LC_MESSAGES/kfloppy.mo
-share/locale/ja/LC_MESSAGES/khexdit.mo
-share/locale/ja/LC_MESSAGES/kjots.mo
-share/locale/ja/LC_MESSAGES/klipper.mo
-share/locale/ja/LC_MESSAGES/kljettool.mo
-share/locale/ja/LC_MESSAGES/klpq.mo
-share/locale/ja/LC_MESSAGES/knotes.mo
-share/locale/ja/LC_MESSAGES/kpm.mo
-share/locale/ja/LC_MESSAGES/ktop.mo
-share/locale/ja/LC_MESSAGES/kwrite.mo
-share/locale/ko/LC_MESSAGES/ark.mo
-share/locale/ko/LC_MESSAGES/karm.mo
-share/locale/ko/LC_MESSAGES/kcalc.mo
-share/locale/ko/LC_MESSAGES/kedit.mo
-share/locale/ko/LC_MESSAGES/kfloppy.mo
-share/locale/ko/LC_MESSAGES/khexdit.mo
-share/locale/ko/LC_MESSAGES/kljettool.mo
-share/locale/ko/LC_MESSAGES/knotes.mo
-share/locale/mk/LC_MESSAGES/kedit.mo
-share/locale/mk/LC_MESSAGES/khexdit.mo
-share/locale/nl/LC_MESSAGES/ark.mo
-share/locale/nl/LC_MESSAGES/karm.mo
-share/locale/nl/LC_MESSAGES/kcalc.mo
-share/locale/nl/LC_MESSAGES/kedit.mo
-share/locale/nl/LC_MESSAGES/kfloppy.mo
-share/locale/nl/LC_MESSAGES/khexdit.mo
-share/locale/nl/LC_MESSAGES/kljettool.mo
-share/locale/nl/LC_MESSAGES/klpq.mo
-share/locale/nl/LC_MESSAGES/knotes.mo
-share/locale/nl/LC_MESSAGES/ktop.mo
-share/locale/no/LC_MESSAGES/ark.mo
-share/locale/no/LC_MESSAGES/kab.mo
-share/locale/no/LC_MESSAGES/karm.mo
-share/locale/no/LC_MESSAGES/kcalc.mo
-share/locale/no/LC_MESSAGES/kedit.mo
-share/locale/no/LC_MESSAGES/kfloppy.mo
-share/locale/no/LC_MESSAGES/khexdit.mo
-share/locale/no/LC_MESSAGES/kjots.mo
-share/locale/no/LC_MESSAGES/klipper.mo
-share/locale/no/LC_MESSAGES/kljettool.mo
-share/locale/no/LC_MESSAGES/klpq.mo
-share/locale/no/LC_MESSAGES/knotes.mo
-share/locale/no/LC_MESSAGES/kpm.mo
-share/locale/no/LC_MESSAGES/ktop.mo
-share/locale/no/LC_MESSAGES/kwrite.mo
-share/locale/pl/LC_MESSAGES/ark.mo
-share/locale/pl/LC_MESSAGES/kab.mo
-share/locale/pl/LC_MESSAGES/karm.mo
-share/locale/pl/LC_MESSAGES/kcalc.mo
-share/locale/pl/LC_MESSAGES/kedit.mo
-share/locale/pl/LC_MESSAGES/kfloppy.mo
-share/locale/pl/LC_MESSAGES/khexdit.mo
-share/locale/pl/LC_MESSAGES/kjots.mo
-share/locale/pl/LC_MESSAGES/klipper.mo
-share/locale/pl/LC_MESSAGES/kljettool.mo
-share/locale/pl/LC_MESSAGES/klpq.mo
-share/locale/pl/LC_MESSAGES/knotes.mo
-share/locale/pl/LC_MESSAGES/kpm.mo
-share/locale/pl/LC_MESSAGES/ktop.mo
-share/locale/pl/LC_MESSAGES/kwrite.mo
-share/locale/pt/LC_MESSAGES/ark.mo
-share/locale/pt/LC_MESSAGES/kab.mo
-share/locale/pt/LC_MESSAGES/karm.mo
-share/locale/pt/LC_MESSAGES/kcalc.mo
-share/locale/pt/LC_MESSAGES/kedit.mo
-share/locale/pt/LC_MESSAGES/kfloppy.mo
-share/locale/pt/LC_MESSAGES/khexdit.mo
-share/locale/pt/LC_MESSAGES/kjots.mo
-share/locale/pt/LC_MESSAGES/klipper.mo
-share/locale/pt/LC_MESSAGES/kljettool.mo
-share/locale/pt/LC_MESSAGES/klpq.mo
-share/locale/pt/LC_MESSAGES/knotes.mo
-share/locale/pt/LC_MESSAGES/kpm.mo
-share/locale/pt/LC_MESSAGES/ktop.mo
-share/locale/pt/LC_MESSAGES/kwrite.mo
-share/locale/pt_BR/LC_MESSAGES/ark.mo
-share/locale/pt_BR/LC_MESSAGES/kab.mo
-share/locale/pt_BR/LC_MESSAGES/karm.mo
-share/locale/pt_BR/LC_MESSAGES/kcalc.mo
-share/locale/pt_BR/LC_MESSAGES/kclock.mo
-share/locale/pt_BR/LC_MESSAGES/kcmail.mo
-share/locale/pt_BR/LC_MESSAGES/kedit.mo
-share/locale/pt_BR/LC_MESSAGES/kexpress.mo
-share/locale/pt_BR/LC_MESSAGES/kfloppy.mo
-share/locale/pt_BR/LC_MESSAGES/khexdit.mo
-share/locale/pt_BR/LC_MESSAGES/kjots.mo
-share/locale/pt_BR/LC_MESSAGES/kjoy.mo
-share/locale/pt_BR/LC_MESSAGES/kless.mo
-share/locale/pt_BR/LC_MESSAGES/klipper.mo
-share/locale/pt_BR/LC_MESSAGES/kljettool.mo
-share/locale/pt_BR/LC_MESSAGES/klpq.mo
-share/locale/pt_BR/LC_MESSAGES/knotes.mo
-share/locale/pt_BR/LC_MESSAGES/kpm.mo
-share/locale/pt_BR/LC_MESSAGES/kray.mo
-share/locale/pt_BR/LC_MESSAGES/ksamba.mo
-share/locale/pt_BR/LC_MESSAGES/ktop.mo
-share/locale/pt_BR/LC_MESSAGES/kuickshow.mo
-share/locale/pt_BR/LC_MESSAGES/kwrite.mo
-share/locale/ro/LC_MESSAGES/ark.mo
-share/locale/ro/LC_MESSAGES/karm.mo
-share/locale/ro/LC_MESSAGES/kcalc.mo
-share/locale/ro/LC_MESSAGES/kfloppy.mo
-share/locale/ro/LC_MESSAGES/khexdit.mo
-share/locale/ro/LC_MESSAGES/kljettool.mo
-share/locale/ru/LC_MESSAGES/ark.mo
-share/locale/ru/LC_MESSAGES/kab.mo
-share/locale/ru/LC_MESSAGES/karm.mo
-share/locale/ru/LC_MESSAGES/kcalc.mo
-share/locale/ru/LC_MESSAGES/kedit.mo
-share/locale/ru/LC_MESSAGES/kfloppy.mo
-share/locale/ru/LC_MESSAGES/khexdit.mo
-share/locale/ru/LC_MESSAGES/kjots.mo
-share/locale/ru/LC_MESSAGES/klipper.mo
-share/locale/ru/LC_MESSAGES/kljettool.mo
-share/locale/ru/LC_MESSAGES/klpq.mo
-share/locale/ru/LC_MESSAGES/knotes.mo
-share/locale/ru/LC_MESSAGES/kpm.mo
-share/locale/ru/LC_MESSAGES/kwrite.mo
-share/locale/sk/LC_MESSAGES/ark.mo
-share/locale/sk/LC_MESSAGES/kab.mo
-share/locale/sk/LC_MESSAGES/karm.mo
-share/locale/sk/LC_MESSAGES/kcalc.mo
-share/locale/sk/LC_MESSAGES/kedit.mo
-share/locale/sk/LC_MESSAGES/kfloppy.mo
-share/locale/sk/LC_MESSAGES/khexdit.mo
-share/locale/sk/LC_MESSAGES/kjots.mo
-share/locale/sk/LC_MESSAGES/klipper.mo
-share/locale/sk/LC_MESSAGES/kljettool.mo
-share/locale/sk/LC_MESSAGES/klpq.mo
-share/locale/sk/LC_MESSAGES/knotes.mo
-share/locale/sk/LC_MESSAGES/kpm.mo
-share/locale/sk/LC_MESSAGES/ktop.mo
-share/locale/sk/LC_MESSAGES/kwrite.mo
-share/locale/sl/LC_MESSAGES/ark.mo
-share/locale/sl/LC_MESSAGES/kab.mo
-share/locale/sl/LC_MESSAGES/karm.mo
-share/locale/sl/LC_MESSAGES/kcalc.mo
-share/locale/sl/LC_MESSAGES/kedit.mo
-share/locale/sl/LC_MESSAGES/kfloppy.mo
-share/locale/sl/LC_MESSAGES/khexdit.mo
-share/locale/sl/LC_MESSAGES/kjots.mo
-share/locale/sl/LC_MESSAGES/klipper.mo
-share/locale/sl/LC_MESSAGES/kljettool.mo
-share/locale/sl/LC_MESSAGES/klpq.mo
-share/locale/sl/LC_MESSAGES/knotes.mo
-share/locale/sl/LC_MESSAGES/kpm.mo
-share/locale/sl/LC_MESSAGES/ktop.mo
-share/locale/sl/LC_MESSAGES/kwrite.mo
-share/locale/sv/LC_MESSAGES/ark.mo
-share/locale/sv/LC_MESSAGES/kab.mo
-share/locale/sv/LC_MESSAGES/karm.mo
-share/locale/sv/LC_MESSAGES/kcalc.mo
-share/locale/sv/LC_MESSAGES/kedit.mo
-share/locale/sv/LC_MESSAGES/kfloppy.mo
-share/locale/sv/LC_MESSAGES/khexdit.mo
-share/locale/sv/LC_MESSAGES/kjots.mo
-share/locale/sv/LC_MESSAGES/klipper.mo
-share/locale/sv/LC_MESSAGES/kljettool.mo
-share/locale/sv/LC_MESSAGES/klpq.mo
-share/locale/sv/LC_MESSAGES/knotes.mo
-share/locale/sv/LC_MESSAGES/kpm.mo
-share/locale/sv/LC_MESSAGES/kwrite.mo
-share/locale/tr/LC_MESSAGES/ark.mo
-share/locale/tr/LC_MESSAGES/karm.mo
-share/locale/tr/LC_MESSAGES/kcalc.mo
-share/locale/tr/LC_MESSAGES/kedit.mo
-share/locale/tr/LC_MESSAGES/kfloppy.mo
-share/locale/tr/LC_MESSAGES/khexdit.mo
-share/locale/tr/LC_MESSAGES/kljettool.mo
-share/locale/tr/LC_MESSAGES/knotes.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/ark.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/karm.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kcalc.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kedit.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kfloppy.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/khexdit.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kljettool.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/klpq.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/knotes.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/ktop.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/ark.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/karm.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kcalc.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kedit.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/khexdit.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/knotes.mo
-share/toolbar/filedel.xpm
-@dirrm share/doc/HTML/it/khexdit
-@dirrm share/doc/HTML/en/kwrite
-@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexdit
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/karm
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/de/kcalc
-@dirrm share/doc/HTML/de/kab
-@dirrm share/apps/knotes/pics
-@dirrm share/apps/knotes
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kedit/toolbar
-@dirrm share/apps/kedit/pics
-@dirrm share/apps/kedit
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index a89cae3b2cfc..6387bd1efbd7 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 58298438be3f..8151479aa10b 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
+MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
diff --git a/misc/kdeutils2/pkg-plist b/misc/kdeutils2/pkg-plist
index c2b264fe2f3c..44b2e28001ba 100644
--- a/misc/kdeutils2/pkg-plist
+++ b/misc/kdeutils2/pkg-plist
@@ -5,6 +5,7 @@ bin/kcalc
 bin/kcharselect
 bin/kdepasswd
 bin/kdessh
+bin/kdf
 bin/kedit
 bin/kfind
 bin/kfloppy
@@ -14,11 +15,17 @@ bin/klaptopdaemon
 bin/kljettool
 bin/klpq
 bin/knotes
+bin/kwikdisk
+include/knotesdcop.h
+lib/kcalc.la
+lib/kcalc.so
 lib/kedit.la
 lib/kedit.so
 lib/kedit.so.0
 lib/kfind.la
 lib/kfind.so
+lib/libkcm_kdf.la
+lib/libkcm_kdf.so
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
 lib/libktimemon.la
@@ -26,11 +33,14 @@ lib/libktimemon.so
 lib/libktimemon.so.1
 share/applnk/Editors/KEdit.desktop
 share/applnk/Kfind.desktop
+share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/Settings/Information/pcmcia.desktop
 share/applnk/Settings/PowerControl/battery.desktop
 share/applnk/Settings/PowerControl/bwarning.desktop
 share/applnk/Settings/PowerControl/cwarning.desktop
 share/applnk/Settings/PowerControl/power.desktop
+share/applnk/System/kdf.desktop
+share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
 share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
@@ -54,6 +64,11 @@ 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/kab/htmlexport/templates/index.html
+share/apps/kab/htmlexport/templates/kab_address.html
+share/apps/kab/htmlexport/templates/kab_background.gif
+share/apps/kab/htmlexport/templates/kab_entrylist.html
+share/apps/kab/htmlexport/templates/kab_person.html
 share/apps/kab/pics/addressbook_logo.png
 share/apps/karm/karmui.rc
 share/apps/karm/pics/clock.xpm
@@ -69,12 +84,9 @@ share/apps/karm/pics/watch-5.xpm
 share/apps/karm/pics/watch-6.xpm
 share/apps/karm/pics/watch-7.xpm
 share/apps/kcalc/pics/kcalclogo.png
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
 share/apps/kedit/keditui.rc
-share/apps/kedit/pics/colors.png
-share/apps/kedit/pics/fonts.png
-share/apps/kedit/pics/keditlogo.png
-share/apps/kedit/pics/misc.png
-share/apps/kedit/toolbar/filenew2.png
 share/apps/kfind/icons/locolor/22x22/actions/archive.png
 share/apps/kfind/icons/locolor/22x22/actions/delete.png
 share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -128,9 +140,7 @@ 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-toolbar.html
 share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/kab/using-kab.html
 share/doc/HTML/en/karm/.anchors
 share/doc/HTML/en/karm/common
 share/doc/HTML/en/karm/credits.html
@@ -140,39 +150,29 @@ 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/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/commentsonspecificfunctions.html
+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/compilationandinstallation.html
 share/doc/HTML/en/kcalc/copyright.html
-share/doc/HTML/en/kcalc/cutandpaste.html
-share/doc/HTML/en/kcalc/fixedprecision.html
-share/doc/HTML/en/kcalc/howdoigetetheeulernumber.html
-share/doc/HTML/en/kcalc/howdoigettwofixeddigitsaftertheperiod.html
-share/doc/HTML/en/kcalc/index.cvlog
+share/doc/HTML/en/kcalc/enable-long-double-precision.html
 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/invmod.html
 share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcalc/keyaccels.html
-share/doc/HTML/en/kcalc/lshrsh.html
-share/doc/HTML/en/kcalc/modes.html
+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/percentfunction.html
-share/doc/HTML/en/kcalc/questionsandanswers.html
-share/doc/HTML/en/kcalc/requirements.html
-share/doc/HTML/en/kcalc/tipsandtricks.html
-share/doc/HTML/en/kcalc/trigonometricmode.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/kcalc/whataboutprecision.html
 share/doc/HTML/en/kdf/.anchors
 share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/credits.html
@@ -194,6 +194,7 @@ share/doc/HTML/en/kedit/go.html
 share/doc/HTML/en/kedit/help.html
 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
@@ -230,6 +231,7 @@ share/doc/HTML/en/kfloppy/credits.html
 share/doc/HTML/en/kfloppy/formatting-options.html
 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
@@ -252,15 +254,22 @@ 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/index.cvlog
+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.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/keyboardshortcuts.html
-share/doc/HTML/en/kjots/subjectlist.html
-share/doc/HTML/en/kjots/todo.html
-share/doc/HTML/en/kjots/usage.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
@@ -295,10 +304,12 @@ share/doc/HTML/en/knotes/.anchors
 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/customizingactions.html
-share/doc/HTML/en/knotes/customizingdisplay.html
-share/doc/HTML/en/knotes/customizingeditor.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
@@ -321,7 +332,6 @@ 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.cvlog
 share/doc/HTML/en/kpm/index.docbook
 share/doc/HTML/en/kpm/index.html
 share/doc/HTML/en/kpm/installation.html
@@ -343,7 +353,6 @@ 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.cvlog
 share/doc/HTML/en/ktimemon/index.docbook
 share/doc/HTML/en/ktimemon/index.html
 share/doc/HTML/en/ktimemon/installation.html
@@ -351,6 +360,7 @@ 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/kfind.png
 share/icons/hicolor/32x32/apps/ark.png
 share/icons/hicolor/32x32/apps/kab.png
 share/icons/hicolor/32x32/apps/karm.png
@@ -384,15 +394,19 @@ 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
@@ -400,6 +414,8 @@ 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
@@ -409,8 +425,14 @@ 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
+@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
@@ -426,6 +448,8 @@ 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/knotes/pics
 @dirrm share/apps/knotes
 @dirrm share/apps/kljettool/pics
@@ -439,25 +463,32 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/klaptopdaemon
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
 @dirrm share/apps/khexedit/toolbar
 @dirrm share/apps/khexedit
 @dirrm share/apps/kfloppy/pics
 @dirrm share/apps/kfloppy
 @dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
-@dirrm share/apps/kedit/toolbar
-@dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
 @dirrm share/apps/kcalc/pics
 @dirrm share/apps/kcalc
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @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
 @dirrm share/apps/ark
+@dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System
+@dirrm share/applnk/Settings/PowerControl
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Editors
+@dirrm share/applnk
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index a89cae3b2cfc..6387bd1efbd7 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 58298438be3f..8151479aa10b 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
+MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist
index c2b264fe2f3c..44b2e28001ba 100644
--- a/misc/kdeutils3/pkg-plist
+++ b/misc/kdeutils3/pkg-plist
@@ -5,6 +5,7 @@ bin/kcalc
 bin/kcharselect
 bin/kdepasswd
 bin/kdessh
+bin/kdf
 bin/kedit
 bin/kfind
 bin/kfloppy
@@ -14,11 +15,17 @@ bin/klaptopdaemon
 bin/kljettool
 bin/klpq
 bin/knotes
+bin/kwikdisk
+include/knotesdcop.h
+lib/kcalc.la
+lib/kcalc.so
 lib/kedit.la
 lib/kedit.so
 lib/kedit.so.0
 lib/kfind.la
 lib/kfind.so
+lib/libkcm_kdf.la
+lib/libkcm_kdf.so
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
 lib/libktimemon.la
@@ -26,11 +33,14 @@ lib/libktimemon.so
 lib/libktimemon.so.1
 share/applnk/Editors/KEdit.desktop
 share/applnk/Kfind.desktop
+share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/Settings/Information/pcmcia.desktop
 share/applnk/Settings/PowerControl/battery.desktop
 share/applnk/Settings/PowerControl/bwarning.desktop
 share/applnk/Settings/PowerControl/cwarning.desktop
 share/applnk/Settings/PowerControl/power.desktop
+share/applnk/System/kdf.desktop
+share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
 share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
@@ -54,6 +64,11 @@ 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/kab/htmlexport/templates/index.html
+share/apps/kab/htmlexport/templates/kab_address.html
+share/apps/kab/htmlexport/templates/kab_background.gif
+share/apps/kab/htmlexport/templates/kab_entrylist.html
+share/apps/kab/htmlexport/templates/kab_person.html
 share/apps/kab/pics/addressbook_logo.png
 share/apps/karm/karmui.rc
 share/apps/karm/pics/clock.xpm
@@ -69,12 +84,9 @@ share/apps/karm/pics/watch-5.xpm
 share/apps/karm/pics/watch-6.xpm
 share/apps/karm/pics/watch-7.xpm
 share/apps/kcalc/pics/kcalclogo.png
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
 share/apps/kedit/keditui.rc
-share/apps/kedit/pics/colors.png
-share/apps/kedit/pics/fonts.png
-share/apps/kedit/pics/keditlogo.png
-share/apps/kedit/pics/misc.png
-share/apps/kedit/toolbar/filenew2.png
 share/apps/kfind/icons/locolor/22x22/actions/archive.png
 share/apps/kfind/icons/locolor/22x22/actions/delete.png
 share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -128,9 +140,7 @@ 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-toolbar.html
 share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/kab/using-kab.html
 share/doc/HTML/en/karm/.anchors
 share/doc/HTML/en/karm/common
 share/doc/HTML/en/karm/credits.html
@@ -140,39 +150,29 @@ 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/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/commentsonspecificfunctions.html
+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/compilationandinstallation.html
 share/doc/HTML/en/kcalc/copyright.html
-share/doc/HTML/en/kcalc/cutandpaste.html
-share/doc/HTML/en/kcalc/fixedprecision.html
-share/doc/HTML/en/kcalc/howdoigetetheeulernumber.html
-share/doc/HTML/en/kcalc/howdoigettwofixeddigitsaftertheperiod.html
-share/doc/HTML/en/kcalc/index.cvlog
+share/doc/HTML/en/kcalc/enable-long-double-precision.html
 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/invmod.html
 share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcalc/keyaccels.html
-share/doc/HTML/en/kcalc/lshrsh.html
-share/doc/HTML/en/kcalc/modes.html
+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/percentfunction.html
-share/doc/HTML/en/kcalc/questionsandanswers.html
-share/doc/HTML/en/kcalc/requirements.html
-share/doc/HTML/en/kcalc/tipsandtricks.html
-share/doc/HTML/en/kcalc/trigonometricmode.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/kcalc/whataboutprecision.html
 share/doc/HTML/en/kdf/.anchors
 share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/credits.html
@@ -194,6 +194,7 @@ share/doc/HTML/en/kedit/go.html
 share/doc/HTML/en/kedit/help.html
 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
@@ -230,6 +231,7 @@ share/doc/HTML/en/kfloppy/credits.html
 share/doc/HTML/en/kfloppy/formatting-options.html
 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
@@ -252,15 +254,22 @@ 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/index.cvlog
+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.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/keyboardshortcuts.html
-share/doc/HTML/en/kjots/subjectlist.html
-share/doc/HTML/en/kjots/todo.html
-share/doc/HTML/en/kjots/usage.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
@@ -295,10 +304,12 @@ share/doc/HTML/en/knotes/.anchors
 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/customizingactions.html
-share/doc/HTML/en/knotes/customizingdisplay.html
-share/doc/HTML/en/knotes/customizingeditor.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
@@ -321,7 +332,6 @@ 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.cvlog
 share/doc/HTML/en/kpm/index.docbook
 share/doc/HTML/en/kpm/index.html
 share/doc/HTML/en/kpm/installation.html
@@ -343,7 +353,6 @@ 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.cvlog
 share/doc/HTML/en/ktimemon/index.docbook
 share/doc/HTML/en/ktimemon/index.html
 share/doc/HTML/en/ktimemon/installation.html
@@ -351,6 +360,7 @@ 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/kfind.png
 share/icons/hicolor/32x32/apps/ark.png
 share/icons/hicolor/32x32/apps/kab.png
 share/icons/hicolor/32x32/apps/karm.png
@@ -384,15 +394,19 @@ 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
@@ -400,6 +414,8 @@ 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
@@ -409,8 +425,14 @@ 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
+@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
@@ -426,6 +448,8 @@ 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/knotes/pics
 @dirrm share/apps/knotes
 @dirrm share/apps/kljettool/pics
@@ -439,25 +463,32 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/klaptopdaemon
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
 @dirrm share/apps/khexedit/toolbar
 @dirrm share/apps/khexedit
 @dirrm share/apps/kfloppy/pics
 @dirrm share/apps/kfloppy
 @dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
-@dirrm share/apps/kedit/toolbar
-@dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
 @dirrm share/apps/kcalc/pics
 @dirrm share/apps/kcalc
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @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
 @dirrm share/apps/ark
+@dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System
+@dirrm share/applnk/Settings/PowerControl
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Editors
+@dirrm share/applnk
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index a89cae3b2cfc..6387bd1efbd7 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 58298438be3f..8151479aa10b 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
+MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index c2b264fe2f3c..44b2e28001ba 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/pkg-plist
@@ -5,6 +5,7 @@ bin/kcalc
 bin/kcharselect
 bin/kdepasswd
 bin/kdessh
+bin/kdf
 bin/kedit
 bin/kfind
 bin/kfloppy
@@ -14,11 +15,17 @@ bin/klaptopdaemon
 bin/kljettool
 bin/klpq
 bin/knotes
+bin/kwikdisk
+include/knotesdcop.h
+lib/kcalc.la
+lib/kcalc.so
 lib/kedit.la
 lib/kedit.so
 lib/kedit.so.0
 lib/kfind.la
 lib/kfind.so
+lib/libkcm_kdf.la
+lib/libkcm_kdf.so
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
 lib/libktimemon.la
@@ -26,11 +33,14 @@ lib/libktimemon.so
 lib/libktimemon.so.1
 share/applnk/Editors/KEdit.desktop
 share/applnk/Kfind.desktop
+share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/Settings/Information/pcmcia.desktop
 share/applnk/Settings/PowerControl/battery.desktop
 share/applnk/Settings/PowerControl/bwarning.desktop
 share/applnk/Settings/PowerControl/cwarning.desktop
 share/applnk/Settings/PowerControl/power.desktop
+share/applnk/System/kdf.desktop
+share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
 share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
@@ -54,6 +64,11 @@ 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/kab/htmlexport/templates/index.html
+share/apps/kab/htmlexport/templates/kab_address.html
+share/apps/kab/htmlexport/templates/kab_background.gif
+share/apps/kab/htmlexport/templates/kab_entrylist.html
+share/apps/kab/htmlexport/templates/kab_person.html
 share/apps/kab/pics/addressbook_logo.png
 share/apps/karm/karmui.rc
 share/apps/karm/pics/clock.xpm
@@ -69,12 +84,9 @@ share/apps/karm/pics/watch-5.xpm
 share/apps/karm/pics/watch-6.xpm
 share/apps/karm/pics/watch-7.xpm
 share/apps/kcalc/pics/kcalclogo.png
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
 share/apps/kedit/keditui.rc
-share/apps/kedit/pics/colors.png
-share/apps/kedit/pics/fonts.png
-share/apps/kedit/pics/keditlogo.png
-share/apps/kedit/pics/misc.png
-share/apps/kedit/toolbar/filenew2.png
 share/apps/kfind/icons/locolor/22x22/actions/archive.png
 share/apps/kfind/icons/locolor/22x22/actions/delete.png
 share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -128,9 +140,7 @@ 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-toolbar.html
 share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/kab/using-kab.html
 share/doc/HTML/en/karm/.anchors
 share/doc/HTML/en/karm/common
 share/doc/HTML/en/karm/credits.html
@@ -140,39 +150,29 @@ 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/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/commentsonspecificfunctions.html
+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/compilationandinstallation.html
 share/doc/HTML/en/kcalc/copyright.html
-share/doc/HTML/en/kcalc/cutandpaste.html
-share/doc/HTML/en/kcalc/fixedprecision.html
-share/doc/HTML/en/kcalc/howdoigetetheeulernumber.html
-share/doc/HTML/en/kcalc/howdoigettwofixeddigitsaftertheperiod.html
-share/doc/HTML/en/kcalc/index.cvlog
+share/doc/HTML/en/kcalc/enable-long-double-precision.html
 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/invmod.html
 share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcalc/keyaccels.html
-share/doc/HTML/en/kcalc/lshrsh.html
-share/doc/HTML/en/kcalc/modes.html
+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/percentfunction.html
-share/doc/HTML/en/kcalc/questionsandanswers.html
-share/doc/HTML/en/kcalc/requirements.html
-share/doc/HTML/en/kcalc/tipsandtricks.html
-share/doc/HTML/en/kcalc/trigonometricmode.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/kcalc/whataboutprecision.html
 share/doc/HTML/en/kdf/.anchors
 share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/credits.html
@@ -194,6 +194,7 @@ share/doc/HTML/en/kedit/go.html
 share/doc/HTML/en/kedit/help.html
 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
@@ -230,6 +231,7 @@ share/doc/HTML/en/kfloppy/credits.html
 share/doc/HTML/en/kfloppy/formatting-options.html
 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
@@ -252,15 +254,22 @@ 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/index.cvlog
+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.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/keyboardshortcuts.html
-share/doc/HTML/en/kjots/subjectlist.html
-share/doc/HTML/en/kjots/todo.html
-share/doc/HTML/en/kjots/usage.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
@@ -295,10 +304,12 @@ share/doc/HTML/en/knotes/.anchors
 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/customizingactions.html
-share/doc/HTML/en/knotes/customizingdisplay.html
-share/doc/HTML/en/knotes/customizingeditor.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
@@ -321,7 +332,6 @@ 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.cvlog
 share/doc/HTML/en/kpm/index.docbook
 share/doc/HTML/en/kpm/index.html
 share/doc/HTML/en/kpm/installation.html
@@ -343,7 +353,6 @@ 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.cvlog
 share/doc/HTML/en/ktimemon/index.docbook
 share/doc/HTML/en/ktimemon/index.html
 share/doc/HTML/en/ktimemon/installation.html
@@ -351,6 +360,7 @@ 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/kfind.png
 share/icons/hicolor/32x32/apps/ark.png
 share/icons/hicolor/32x32/apps/kab.png
 share/icons/hicolor/32x32/apps/karm.png
@@ -384,15 +394,19 @@ 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
@@ -400,6 +414,8 @@ 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
@@ -409,8 +425,14 @@ 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
+@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
@@ -426,6 +448,8 @@ 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/knotes/pics
 @dirrm share/apps/knotes
 @dirrm share/apps/kljettool/pics
@@ -439,25 +463,32 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/klaptopdaemon
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
 @dirrm share/apps/khexedit/toolbar
 @dirrm share/apps/khexedit
 @dirrm share/apps/kfloppy/pics
 @dirrm share/apps/kfloppy
 @dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
-@dirrm share/apps/kedit/toolbar
-@dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
 @dirrm share/apps/kcalc/pics
 @dirrm share/apps/kcalc
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @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
 @dirrm share/apps/ark
+@dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System
+@dirrm share/applnk/Settings/PowerControl
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Editors
+@dirrm share/applnk