Upgrade to 2.0.1

143 files changed, 3002 insertions, 558 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index aa7c91ef0f1e..6baca2110f50 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-BUILD_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -40,10 +37,10 @@ post-install:
 	@${ECHO_MSG} " % ${CHMOD} 666 <cdrom_device>"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "to link and give permission to access the CD-ROM device."
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 	@${ECHO_MSG} "For example(IDE CD-ROM device):"
 	@${ECHO_MSG} " % ${LN} -sf /dev/racd0c /dev/cdrom"
 	@${ECHO_MSG} " % ${CHMOD} 666 /dev/racd0c"
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo
index 6f6dbcdf4e2c..bdbc1915f697 100644
--- a/audio/kdemultimedia2/distinfo
+++ b/audio/kdemultimedia2/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-2.0.tar.bz2) = a56ed60810c222a6a2714f261ba1e809
+MD5 (kdemultimedia-2.0.1.tar.bz2) = f339c91b07f142220ed347ca80919bcc
diff --git a/audio/kdemultimedia2/pkg-plist b/audio/kdemultimedia2/pkg-plist
index ff5bbf615d25..ef219c2a83ef 100644
--- a/audio/kdemultimedia2/pkg-plist
+++ b/audio/kdemultimedia2/pkg-plist
@@ -11,30 +11,38 @@ bin/midisend
 bin/sf2cfg
 bin/timidity
 bin/workman2cddb.pl
-lib/Arts/StructureBuilder.mcopclass
-lib/Arts/StructureDesc.mcopclass
-lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
-lib/Arts/Synth_MIDI_TEST.mcopclass
-lib/Arts/Synth_NOISE.mcopclass
-lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
-lib/Arts/Synth_WAVE_TRI.mcopclass
-lib/Arts/Synth_XFADE.mcopclass
-lib/artsmodules.mcopclass
-lib/artsmodules.mcoptype
 lib/kmixctrl.la
 lib/kmixctrl.so
 lib/libaktion.la
+lib/libaktion.so
 lib/libaktion.so.1
 lib/libartsbuilder.la
+lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsmodules.la
+lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libkcm_kmix.la
 lib/libkcm_kmix.so
 lib/libkmidpart.la
+lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmixapplet.la
+lib/libkmixapplet.so
 lib/libkmixapplet.so.1
+lib/libworkman.la
+lib/libworkman.so
+lib/libworkman.so.5
+lib/mcop/Arts/StructureBuilder.mcopclass
+lib/mcop/Arts/StructureDesc.mcopclass
+lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
+lib/mcop/Arts/Synth_NOISE.mcopclass
+lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
+lib/mcop/Arts/Synth_XFADE.mcopclass
+lib/mcop/artsmodules.mcopclass
+lib/mcop/artsmodules.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -269,6 +277,7 @@ share/apps/kscd/pics/cdsmall.xpm
 share/apps/kscd/pics/kscdlogo.xpm
 share/config/aktionrc
 share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
 share/doc/HTML/en/artsbuilder/index.docbook
 share/doc/HTML/en/artsbuilder/index.html
 share/doc/HTML/en/artsbuilder/insidearts.html
@@ -279,6 +288,7 @@ share/doc/HTML/en/kmid/abouttheauthor.html
 share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
 share/doc/HTML/en/kmid/advancedfeatures.html
 share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/compilationandinstallation.html
 share/doc/HTML/en/kmid/creatingamidimap.html
 share/doc/HTML/en/kmid/deletingacollection.html
@@ -306,6 +316,7 @@ share/doc/HTML/en/kmid/usingmidimaps.html
 share/doc/HTML/en/kmidi/.anchors
 share/doc/HTML/en/kmidi/FAQ
 share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
 share/doc/HTML/en/kmidi/compilationandinstallation.html
 share/doc/HTML/en/kmidi/computationissues.html
 share/doc/HTML/en/kmidi/configuring.html
@@ -331,6 +342,7 @@ share/doc/HTML/en/kmidi/synthesismodel.html
 share/doc/HTML/en/kmidi/usage.html
 share/doc/HTML/en/kmidi/volume.html
 share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/common
 share/doc/HTML/en/kmix/compilation.html
 share/doc/HTML/en/kmix/configuration-options.html
 share/doc/HTML/en/kmix/control-panel.html
@@ -348,6 +360,7 @@ share/doc/HTML/en/kscd/cddb-editor.html
 share/doc/HTML/en/kscd/cddb-support.html
 share/doc/HTML/en/kscd/cddb-tab.html
 share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
 share/doc/HTML/en/kscd/configuring-kscd.html
 share/doc/HTML/en/kscd/credits-and-license.html
 share/doc/HTML/en/kscd/index.docbook
@@ -444,7 +457,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
-@dirrm share/apps/kicker/applets
 @dirrm share/apps/kaiman/Skins/k9
 @dirrm share/apps/kaiman/Skins/circle
 @dirrm share/apps/kaiman/Skins/car-preset
@@ -452,6 +464,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kaiman
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
+@dirrm share/apps/artsbuilder
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm lib/Arts
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index aa7c91ef0f1e..6baca2110f50 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-BUILD_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -40,10 +37,10 @@ post-install:
 	@${ECHO_MSG} " % ${CHMOD} 666 <cdrom_device>"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "to link and give permission to access the CD-ROM device."
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 	@${ECHO_MSG} "For example(IDE CD-ROM device):"
 	@${ECHO_MSG} " % ${LN} -sf /dev/racd0c /dev/cdrom"
 	@${ECHO_MSG} " % ${CHMOD} 666 /dev/racd0c"
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index 6f6dbcdf4e2c..bdbc1915f697 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-2.0.tar.bz2) = a56ed60810c222a6a2714f261ba1e809
+MD5 (kdemultimedia-2.0.1.tar.bz2) = f339c91b07f142220ed347ca80919bcc
diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist
index ff5bbf615d25..ef219c2a83ef 100644
--- a/audio/kdemultimedia3/pkg-plist
+++ b/audio/kdemultimedia3/pkg-plist
@@ -11,30 +11,38 @@ bin/midisend
 bin/sf2cfg
 bin/timidity
 bin/workman2cddb.pl
-lib/Arts/StructureBuilder.mcopclass
-lib/Arts/StructureDesc.mcopclass
-lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
-lib/Arts/Synth_MIDI_TEST.mcopclass
-lib/Arts/Synth_NOISE.mcopclass
-lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
-lib/Arts/Synth_WAVE_TRI.mcopclass
-lib/Arts/Synth_XFADE.mcopclass
-lib/artsmodules.mcopclass
-lib/artsmodules.mcoptype
 lib/kmixctrl.la
 lib/kmixctrl.so
 lib/libaktion.la
+lib/libaktion.so
 lib/libaktion.so.1
 lib/libartsbuilder.la
+lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsmodules.la
+lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libkcm_kmix.la
 lib/libkcm_kmix.so
 lib/libkmidpart.la
+lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmixapplet.la
+lib/libkmixapplet.so
 lib/libkmixapplet.so.1
+lib/libworkman.la
+lib/libworkman.so
+lib/libworkman.so.5
+lib/mcop/Arts/StructureBuilder.mcopclass
+lib/mcop/Arts/StructureDesc.mcopclass
+lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
+lib/mcop/Arts/Synth_NOISE.mcopclass
+lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
+lib/mcop/Arts/Synth_XFADE.mcopclass
+lib/mcop/artsmodules.mcopclass
+lib/mcop/artsmodules.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -269,6 +277,7 @@ share/apps/kscd/pics/cdsmall.xpm
 share/apps/kscd/pics/kscdlogo.xpm
 share/config/aktionrc
 share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
 share/doc/HTML/en/artsbuilder/index.docbook
 share/doc/HTML/en/artsbuilder/index.html
 share/doc/HTML/en/artsbuilder/insidearts.html
@@ -279,6 +288,7 @@ share/doc/HTML/en/kmid/abouttheauthor.html
 share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
 share/doc/HTML/en/kmid/advancedfeatures.html
 share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/compilationandinstallation.html
 share/doc/HTML/en/kmid/creatingamidimap.html
 share/doc/HTML/en/kmid/deletingacollection.html
@@ -306,6 +316,7 @@ share/doc/HTML/en/kmid/usingmidimaps.html
 share/doc/HTML/en/kmidi/.anchors
 share/doc/HTML/en/kmidi/FAQ
 share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
 share/doc/HTML/en/kmidi/compilationandinstallation.html
 share/doc/HTML/en/kmidi/computationissues.html
 share/doc/HTML/en/kmidi/configuring.html
@@ -331,6 +342,7 @@ share/doc/HTML/en/kmidi/synthesismodel.html
 share/doc/HTML/en/kmidi/usage.html
 share/doc/HTML/en/kmidi/volume.html
 share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/common
 share/doc/HTML/en/kmix/compilation.html
 share/doc/HTML/en/kmix/configuration-options.html
 share/doc/HTML/en/kmix/control-panel.html
@@ -348,6 +360,7 @@ share/doc/HTML/en/kscd/cddb-editor.html
 share/doc/HTML/en/kscd/cddb-support.html
 share/doc/HTML/en/kscd/cddb-tab.html
 share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
 share/doc/HTML/en/kscd/configuring-kscd.html
 share/doc/HTML/en/kscd/credits-and-license.html
 share/doc/HTML/en/kscd/index.docbook
@@ -444,7 +457,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
-@dirrm share/apps/kicker/applets
 @dirrm share/apps/kaiman/Skins/k9
 @dirrm share/apps/kaiman/Skins/circle
 @dirrm share/apps/kaiman/Skins/car-preset
@@ -452,6 +464,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kaiman
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
+@dirrm share/apps/artsbuilder
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm lib/Arts
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 23119b4a9e7c..e542bf5d22cf 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -6,36 +6,30 @@
 #
 
 PORTNAME=	kdesupport
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	converters kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-BUILD_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
-		${PREFIX}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_QT2=	yes
 MOC=		${X11BASE}/bin/moc2
-SOMAJOR=	8
-SOMINOR=	0
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
-		--without-libjpeg --without-libgif \
-		--without-libgdbm --without-libuulib \
-		--without-odbc --without-audiofile \
-		--with-extra-libs=${LOCALBASE}/lib
+		--with-extra-libs=${LOCALBASE}/lib \
+		--without-audiofile
 CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
-PLIST_SUB+=	LIBVER="${SOMAJOR}"
 
 pre-configure:
 	${PERL} -pi -e "s@TOPSUBDIRS libaps@TOPSUBDIRS@g" ${WRKSRC}/configure
diff --git a/converters/kdesupport2/distinfo b/converters/kdesupport2/distinfo
index 56d5b733aaa7..72795b5e1854 100644
--- a/converters/kdesupport2/distinfo
+++ b/converters/kdesupport2/distinfo
@@ -1 +1 @@
-MD5 (kdesupport-2.0.tar.bz2) = b9bf4d1e0e96921379e55cc386f1e336
+MD5 (kdesupport-2.0.1.tar.bz2) = 9921bc925e3be706eed7f7ce64307997
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index c67e0934cd1a..7c4d886debbc 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,8 +22,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 66b6d1f12eed..94e1ca16ac7a 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1 +1 @@
-MD5 (koffice-2.0.tar.bz2) = 649e9ef550b36817c44961bc860c2c76
+MD5 (koffice-2.0.1.tar.bz2) = 77e6f47ba41d610793bcfc768dc3441e
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index e3792d6b7238..e33269d20e2e 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -77,20 +77,27 @@ lib/libhtmlimport.so
 lib/libkchartpart.la
 lib/libkchartpart.so
 lib/libkformula.la
+lib/libkformula.so
 lib/libkformula.so.3
 lib/libkillustratorpart.la
 lib/libkillustratorpart.so
 lib/libkochart.la
+lib/libkochart.so
 lib/libkochart.so.1
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so
 lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
+lib/libkofficecore.so
 lib/libkofficecore.so.1
 lib/libkofficeui.la
+lib/libkofficeui.so
 lib/libkofficeui.so.1
 lib/libkoml.la
+lib/libkoml.so
 lib/libkoml.so.1
 lib/libkoscript.la
+lib/libkoscript.so
 lib/libkoscript.so.1
 lib/libkpresenterpart.la
 lib/libkpresenterpart.so
@@ -101,6 +108,7 @@ lib/libkspreadcalc.so
 lib/libkspreadpart.la
 lib/libkspreadpart.so
 lib/libkstore.la
+lib/libkstore.so
 lib/libkstore.so.1
 lib/libkwordpart.la
 lib/libkwordpart.so
@@ -603,6 +611,7 @@ share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
 share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/common
 share/doc/HTML/en/killustrator/compilation-and-installation.html
 share/doc/HTML/en/killustrator/copyright.html
 share/doc/HTML/en/killustrator/drawing-2d-primitives.html
@@ -644,6 +653,7 @@ share/doc/HTML/en/killustrator/working-with-files.html
 share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
 share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/compilingproblems.html
 share/doc/HTML/en/koffice/customgui.html
 share/doc/HTML/en/koffice/customization.html
@@ -669,6 +679,7 @@ share/doc/HTML/en/koffice/whoreads.html
 share/doc/HTML/en/kpresenter/.anchors
 share/doc/HTML/en/kpresenter/addshadow.html
 share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/common
 share/doc/HTML/en/kpresenter/credits.html
 share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
@@ -685,6 +696,7 @@ share/doc/HTML/en/kpresenter/todo.html
 share/doc/HTML/en/kpresenter/tutorial.html
 share/doc/HTML/en/kspread/.anchors
 share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/common
 share/doc/HTML/en/kspread/compilingproblems.html
 share/doc/HTML/en/kspread/credits.html
 share/doc/HTML/en/kspread/dragdrop.html
@@ -776,6 +788,7 @@ share/doc/HTML/en/kword/close.png
 share/doc/HTML/en/kword/colin.png
 share/doc/HTML/en/kword/colout.png
 share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/common
 share/doc/HTML/en/kword/conventions.html
 share/doc/HTML/en/kword/credits.html
 share/doc/HTML/en/kword/ctab.png
@@ -1096,6 +1109,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/koffice
 @dirrm share/doc/HTML/en/killustrator
+@dirrm share/doc/HTML/en/doc
 @dirrm share/apps/kword/templates/Publishing/.source
 @dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
@@ -1105,6 +1119,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kword/templates
 @dirrm share/apps/kword/icons/locolor/22x22/actions
 @dirrm share/apps/kword/icons/locolor/22x22
+@dirrm share/apps/kword/icons/locolor
+@dirrm share/apps/kword/icons
 @dirrm share/apps/kword/dtd
 @dirrm share/apps/kword
 @dirrm share/apps/kspread/tablestyles
@@ -1112,6 +1128,9 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kspread/icons/locolor/22x22/actions
 @dirrm share/apps/kspread/icons/locolor/22x22
 @dirrm share/apps/kspread/icons/locolor/16x16/actions
+@dirrm share/apps/kspread/icons/locolor/16x16
+@dirrm share/apps/kspread/icons/locolor
+@dirrm share/apps/kspread/icons
 @dirrm share/apps/kspread/extensions
 @dirrm share/apps/kspread/dtd
 @dirrm share/apps/kspread
@@ -1126,6 +1145,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kpresenter/pics
 @dirrm share/apps/kpresenter/icons/locolor/22x22/actions
 @dirrm share/apps/kpresenter/icons/locolor/22x22
+@dirrm share/apps/kpresenter/icons/locolor
+@dirrm share/apps/kpresenter/icons
 @dirrm share/apps/kpresenter/dtd
 @dirrm share/apps/kpresenter/autoforms/Connections
 @dirrm share/apps/kpresenter/autoforms/Arrows
@@ -1137,10 +1158,13 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/koffice/icons/locolor/22x22
 @dirrm share/apps/koffice/icons/locolor/16x16/actions
 @dirrm share/apps/koffice/icons/locolor/16x16
+@dirrm share/apps/koffice/icons/locolor
 @dirrm share/apps/koffice/icons/hicolor/32x32/actions
 @dirrm share/apps/koffice/icons/hicolor/32x32
 @dirrm share/apps/koffice/icons/hicolor/22x22/actions
 @dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
+@dirrm share/apps/koffice/icons
 @dirrm share/apps/koffice
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
@@ -1152,4 +1176,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor/16x16/actions
+@dirrm share/apps/kchart/icons/locolor/16x16
+@dirrm share/apps/kchart/icons/locolor
+@dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index c67e0934cd1a..7c4d886debbc 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,8 +22,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo
index 66b6d1f12eed..94e1ca16ac7a 100644
--- a/editors/koffice-kde3/distinfo
+++ b/editors/koffice-kde3/distinfo
@@ -1 +1 @@
-MD5 (koffice-2.0.tar.bz2) = 649e9ef550b36817c44961bc860c2c76
+MD5 (koffice-2.0.1.tar.bz2) = 77e6f47ba41d610793bcfc768dc3441e
diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist
index e3792d6b7238..e33269d20e2e 100644
--- a/editors/koffice-kde3/pkg-plist
+++ b/editors/koffice-kde3/pkg-plist
@@ -77,20 +77,27 @@ lib/libhtmlimport.so
 lib/libkchartpart.la
 lib/libkchartpart.so
 lib/libkformula.la
+lib/libkformula.so
 lib/libkformula.so.3
 lib/libkillustratorpart.la
 lib/libkillustratorpart.so
 lib/libkochart.la
+lib/libkochart.so
 lib/libkochart.so.1
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so
 lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
+lib/libkofficecore.so
 lib/libkofficecore.so.1
 lib/libkofficeui.la
+lib/libkofficeui.so
 lib/libkofficeui.so.1
 lib/libkoml.la
+lib/libkoml.so
 lib/libkoml.so.1
 lib/libkoscript.la
+lib/libkoscript.so
 lib/libkoscript.so.1
 lib/libkpresenterpart.la
 lib/libkpresenterpart.so
@@ -101,6 +108,7 @@ lib/libkspreadcalc.so
 lib/libkspreadpart.la
 lib/libkspreadpart.so
 lib/libkstore.la
+lib/libkstore.so
 lib/libkstore.so.1
 lib/libkwordpart.la
 lib/libkwordpart.so
@@ -603,6 +611,7 @@ share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
 share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/common
 share/doc/HTML/en/killustrator/compilation-and-installation.html
 share/doc/HTML/en/killustrator/copyright.html
 share/doc/HTML/en/killustrator/drawing-2d-primitives.html
@@ -644,6 +653,7 @@ share/doc/HTML/en/killustrator/working-with-files.html
 share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
 share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/compilingproblems.html
 share/doc/HTML/en/koffice/customgui.html
 share/doc/HTML/en/koffice/customization.html
@@ -669,6 +679,7 @@ share/doc/HTML/en/koffice/whoreads.html
 share/doc/HTML/en/kpresenter/.anchors
 share/doc/HTML/en/kpresenter/addshadow.html
 share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/common
 share/doc/HTML/en/kpresenter/credits.html
 share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
@@ -685,6 +696,7 @@ share/doc/HTML/en/kpresenter/todo.html
 share/doc/HTML/en/kpresenter/tutorial.html
 share/doc/HTML/en/kspread/.anchors
 share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/common
 share/doc/HTML/en/kspread/compilingproblems.html
 share/doc/HTML/en/kspread/credits.html
 share/doc/HTML/en/kspread/dragdrop.html
@@ -776,6 +788,7 @@ share/doc/HTML/en/kword/close.png
 share/doc/HTML/en/kword/colin.png
 share/doc/HTML/en/kword/colout.png
 share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/common
 share/doc/HTML/en/kword/conventions.html
 share/doc/HTML/en/kword/credits.html
 share/doc/HTML/en/kword/ctab.png
@@ -1096,6 +1109,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/koffice
 @dirrm share/doc/HTML/en/killustrator
+@dirrm share/doc/HTML/en/doc
 @dirrm share/apps/kword/templates/Publishing/.source
 @dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
@@ -1105,6 +1119,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kword/templates
 @dirrm share/apps/kword/icons/locolor/22x22/actions
 @dirrm share/apps/kword/icons/locolor/22x22
+@dirrm share/apps/kword/icons/locolor
+@dirrm share/apps/kword/icons
 @dirrm share/apps/kword/dtd
 @dirrm share/apps/kword
 @dirrm share/apps/kspread/tablestyles
@@ -1112,6 +1128,9 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kspread/icons/locolor/22x22/actions
 @dirrm share/apps/kspread/icons/locolor/22x22
 @dirrm share/apps/kspread/icons/locolor/16x16/actions
+@dirrm share/apps/kspread/icons/locolor/16x16
+@dirrm share/apps/kspread/icons/locolor
+@dirrm share/apps/kspread/icons
 @dirrm share/apps/kspread/extensions
 @dirrm share/apps/kspread/dtd
 @dirrm share/apps/kspread
@@ -1126,6 +1145,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kpresenter/pics
 @dirrm share/apps/kpresenter/icons/locolor/22x22/actions
 @dirrm share/apps/kpresenter/icons/locolor/22x22
+@dirrm share/apps/kpresenter/icons/locolor
+@dirrm share/apps/kpresenter/icons
 @dirrm share/apps/kpresenter/dtd
 @dirrm share/apps/kpresenter/autoforms/Connections
 @dirrm share/apps/kpresenter/autoforms/Arrows
@@ -1137,10 +1158,13 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/koffice/icons/locolor/22x22
 @dirrm share/apps/koffice/icons/locolor/16x16/actions
 @dirrm share/apps/koffice/icons/locolor/16x16
+@dirrm share/apps/koffice/icons/locolor
 @dirrm share/apps/koffice/icons/hicolor/32x32/actions
 @dirrm share/apps/koffice/icons/hicolor/32x32
 @dirrm share/apps/koffice/icons/hicolor/22x22/actions
 @dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
+@dirrm share/apps/koffice/icons
 @dirrm share/apps/koffice
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
@@ -1152,4 +1176,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor/16x16/actions
+@dirrm share/apps/kchart/icons/locolor/16x16
+@dirrm share/apps/kchart/icons/locolor
+@dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index c67e0934cd1a..7c4d886debbc 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,8 +22,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 66b6d1f12eed..94e1ca16ac7a 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1 +1 @@
-MD5 (koffice-2.0.tar.bz2) = 649e9ef550b36817c44961bc860c2c76
+MD5 (koffice-2.0.1.tar.bz2) = 77e6f47ba41d610793bcfc768dc3441e
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index e3792d6b7238..e33269d20e2e 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -77,20 +77,27 @@ lib/libhtmlimport.so
 lib/libkchartpart.la
 lib/libkchartpart.so
 lib/libkformula.la
+lib/libkformula.so
 lib/libkformula.so.3
 lib/libkillustratorpart.la
 lib/libkillustratorpart.so
 lib/libkochart.la
+lib/libkochart.so
 lib/libkochart.so.1
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so
 lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
+lib/libkofficecore.so
 lib/libkofficecore.so.1
 lib/libkofficeui.la
+lib/libkofficeui.so
 lib/libkofficeui.so.1
 lib/libkoml.la
+lib/libkoml.so
 lib/libkoml.so.1
 lib/libkoscript.la
+lib/libkoscript.so
 lib/libkoscript.so.1
 lib/libkpresenterpart.la
 lib/libkpresenterpart.so
@@ -101,6 +108,7 @@ lib/libkspreadcalc.so
 lib/libkspreadpart.la
 lib/libkspreadpart.so
 lib/libkstore.la
+lib/libkstore.so
 lib/libkstore.so.1
 lib/libkwordpart.la
 lib/libkwordpart.so
@@ -603,6 +611,7 @@ share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
 share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/common
 share/doc/HTML/en/killustrator/compilation-and-installation.html
 share/doc/HTML/en/killustrator/copyright.html
 share/doc/HTML/en/killustrator/drawing-2d-primitives.html
@@ -644,6 +653,7 @@ share/doc/HTML/en/killustrator/working-with-files.html
 share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
 share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/compilingproblems.html
 share/doc/HTML/en/koffice/customgui.html
 share/doc/HTML/en/koffice/customization.html
@@ -669,6 +679,7 @@ share/doc/HTML/en/koffice/whoreads.html
 share/doc/HTML/en/kpresenter/.anchors
 share/doc/HTML/en/kpresenter/addshadow.html
 share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/common
 share/doc/HTML/en/kpresenter/credits.html
 share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
@@ -685,6 +696,7 @@ share/doc/HTML/en/kpresenter/todo.html
 share/doc/HTML/en/kpresenter/tutorial.html
 share/doc/HTML/en/kspread/.anchors
 share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/common
 share/doc/HTML/en/kspread/compilingproblems.html
 share/doc/HTML/en/kspread/credits.html
 share/doc/HTML/en/kspread/dragdrop.html
@@ -776,6 +788,7 @@ share/doc/HTML/en/kword/close.png
 share/doc/HTML/en/kword/colin.png
 share/doc/HTML/en/kword/colout.png
 share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/common
 share/doc/HTML/en/kword/conventions.html
 share/doc/HTML/en/kword/credits.html
 share/doc/HTML/en/kword/ctab.png
@@ -1096,6 +1109,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/koffice
 @dirrm share/doc/HTML/en/killustrator
+@dirrm share/doc/HTML/en/doc
 @dirrm share/apps/kword/templates/Publishing/.source
 @dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
@@ -1105,6 +1119,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kword/templates
 @dirrm share/apps/kword/icons/locolor/22x22/actions
 @dirrm share/apps/kword/icons/locolor/22x22
+@dirrm share/apps/kword/icons/locolor
+@dirrm share/apps/kword/icons
 @dirrm share/apps/kword/dtd
 @dirrm share/apps/kword
 @dirrm share/apps/kspread/tablestyles
@@ -1112,6 +1128,9 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kspread/icons/locolor/22x22/actions
 @dirrm share/apps/kspread/icons/locolor/22x22
 @dirrm share/apps/kspread/icons/locolor/16x16/actions
+@dirrm share/apps/kspread/icons/locolor/16x16
+@dirrm share/apps/kspread/icons/locolor
+@dirrm share/apps/kspread/icons
 @dirrm share/apps/kspread/extensions
 @dirrm share/apps/kspread/dtd
 @dirrm share/apps/kspread
@@ -1126,6 +1145,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kpresenter/pics
 @dirrm share/apps/kpresenter/icons/locolor/22x22/actions
 @dirrm share/apps/kpresenter/icons/locolor/22x22
+@dirrm share/apps/kpresenter/icons/locolor
+@dirrm share/apps/kpresenter/icons
 @dirrm share/apps/kpresenter/dtd
 @dirrm share/apps/kpresenter/autoforms/Connections
 @dirrm share/apps/kpresenter/autoforms/Arrows
@@ -1137,10 +1158,13 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/koffice/icons/locolor/22x22
 @dirrm share/apps/koffice/icons/locolor/16x16/actions
 @dirrm share/apps/koffice/icons/locolor/16x16
+@dirrm share/apps/koffice/icons/locolor
 @dirrm share/apps/koffice/icons/hicolor/32x32/actions
 @dirrm share/apps/koffice/icons/hicolor/32x32
 @dirrm share/apps/koffice/icons/hicolor/22x22/actions
 @dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
+@dirrm share/apps/koffice/icons
 @dirrm share/apps/koffice
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
@@ -1152,4 +1176,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor/16x16/actions
+@dirrm share/apps/kchart/icons/locolor/16x16
+@dirrm share/apps/kchart/icons/locolor
+@dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index c67e0934cd1a..7c4d886debbc 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,8 +22,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/editors/koffice/distinfo b/editors/koffice/distinfo
index 66b6d1f12eed..94e1ca16ac7a 100644
--- a/editors/koffice/distinfo
+++ b/editors/koffice/distinfo
@@ -1 +1 @@
-MD5 (koffice-2.0.tar.bz2) = 649e9ef550b36817c44961bc860c2c76
+MD5 (koffice-2.0.1.tar.bz2) = 77e6f47ba41d610793bcfc768dc3441e
diff --git a/editors/koffice/pkg-plist b/editors/koffice/pkg-plist
index e3792d6b7238..e33269d20e2e 100644
--- a/editors/koffice/pkg-plist
+++ b/editors/koffice/pkg-plist
@@ -77,20 +77,27 @@ lib/libhtmlimport.so
 lib/libkchartpart.la
 lib/libkchartpart.so
 lib/libkformula.la
+lib/libkformula.so
 lib/libkformula.so.3
 lib/libkillustratorpart.la
 lib/libkillustratorpart.so
 lib/libkochart.la
+lib/libkochart.so
 lib/libkochart.so.1
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so
 lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
+lib/libkofficecore.so
 lib/libkofficecore.so.1
 lib/libkofficeui.la
+lib/libkofficeui.so
 lib/libkofficeui.so.1
 lib/libkoml.la
+lib/libkoml.so
 lib/libkoml.so.1
 lib/libkoscript.la
+lib/libkoscript.so
 lib/libkoscript.so.1
 lib/libkpresenterpart.la
 lib/libkpresenterpart.so
@@ -101,6 +108,7 @@ lib/libkspreadcalc.so
 lib/libkspreadpart.la
 lib/libkspreadpart.so
 lib/libkstore.la
+lib/libkstore.so
 lib/libkstore.so.1
 lib/libkwordpart.la
 lib/libkwordpart.so
@@ -603,6 +611,7 @@ share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
 share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/common
 share/doc/HTML/en/killustrator/compilation-and-installation.html
 share/doc/HTML/en/killustrator/copyright.html
 share/doc/HTML/en/killustrator/drawing-2d-primitives.html
@@ -644,6 +653,7 @@ share/doc/HTML/en/killustrator/working-with-files.html
 share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
 share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/compilingproblems.html
 share/doc/HTML/en/koffice/customgui.html
 share/doc/HTML/en/koffice/customization.html
@@ -669,6 +679,7 @@ share/doc/HTML/en/koffice/whoreads.html
 share/doc/HTML/en/kpresenter/.anchors
 share/doc/HTML/en/kpresenter/addshadow.html
 share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/common
 share/doc/HTML/en/kpresenter/credits.html
 share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
@@ -685,6 +696,7 @@ share/doc/HTML/en/kpresenter/todo.html
 share/doc/HTML/en/kpresenter/tutorial.html
 share/doc/HTML/en/kspread/.anchors
 share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/common
 share/doc/HTML/en/kspread/compilingproblems.html
 share/doc/HTML/en/kspread/credits.html
 share/doc/HTML/en/kspread/dragdrop.html
@@ -776,6 +788,7 @@ share/doc/HTML/en/kword/close.png
 share/doc/HTML/en/kword/colin.png
 share/doc/HTML/en/kword/colout.png
 share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/common
 share/doc/HTML/en/kword/conventions.html
 share/doc/HTML/en/kword/credits.html
 share/doc/HTML/en/kword/ctab.png
@@ -1096,6 +1109,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/koffice
 @dirrm share/doc/HTML/en/killustrator
+@dirrm share/doc/HTML/en/doc
 @dirrm share/apps/kword/templates/Publishing/.source
 @dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
@@ -1105,6 +1119,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kword/templates
 @dirrm share/apps/kword/icons/locolor/22x22/actions
 @dirrm share/apps/kword/icons/locolor/22x22
+@dirrm share/apps/kword/icons/locolor
+@dirrm share/apps/kword/icons
 @dirrm share/apps/kword/dtd
 @dirrm share/apps/kword
 @dirrm share/apps/kspread/tablestyles
@@ -1112,6 +1128,9 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kspread/icons/locolor/22x22/actions
 @dirrm share/apps/kspread/icons/locolor/22x22
 @dirrm share/apps/kspread/icons/locolor/16x16/actions
+@dirrm share/apps/kspread/icons/locolor/16x16
+@dirrm share/apps/kspread/icons/locolor
+@dirrm share/apps/kspread/icons
 @dirrm share/apps/kspread/extensions
 @dirrm share/apps/kspread/dtd
 @dirrm share/apps/kspread
@@ -1126,6 +1145,8 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kpresenter/pics
 @dirrm share/apps/kpresenter/icons/locolor/22x22/actions
 @dirrm share/apps/kpresenter/icons/locolor/22x22
+@dirrm share/apps/kpresenter/icons/locolor
+@dirrm share/apps/kpresenter/icons
 @dirrm share/apps/kpresenter/dtd
 @dirrm share/apps/kpresenter/autoforms/Connections
 @dirrm share/apps/kpresenter/autoforms/Arrows
@@ -1137,10 +1158,13 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/koffice/icons/locolor/22x22
 @dirrm share/apps/koffice/icons/locolor/16x16/actions
 @dirrm share/apps/koffice/icons/locolor/16x16
+@dirrm share/apps/koffice/icons/locolor
 @dirrm share/apps/koffice/icons/hicolor/32x32/actions
 @dirrm share/apps/koffice/icons/hicolor/32x32
 @dirrm share/apps/koffice/icons/hicolor/22x22/actions
 @dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
+@dirrm share/apps/koffice/icons
 @dirrm share/apps/koffice
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
@@ -1152,4 +1176,7 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor/16x16/actions
+@dirrm share/apps/kchart/icons/locolor/16x16
+@dirrm share/apps/kchart/icons/locolor
+@dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index f401a3551902..5b9f06e1928b 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdegames
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -20,8 +20,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
diff --git a/games/kdegames2/distinfo b/games/kdegames2/distinfo
index b15ea7406e4c..90910ab70042 100644
--- a/games/kdegames2/distinfo
+++ b/games/kdegames2/distinfo
@@ -1 +1 @@
-MD5 (kdegames-2.0.tar.bz2) = bc7e15bf60705038f4ed7e3d6a1a3f28
+MD5 (kdegames-2.0.1.tar.bz2) = 4f62555ba74ed3d0c40f989d1a0b697e
diff --git a/games/kdegames2/pkg-plist b/games/kdegames2/pkg-plist
index 3375d50b6db1..d4981631bca2 100644
--- a/games/kdegames2/pkg-plist
+++ b/games/kdegames2/pkg-plist
@@ -1076,6 +1076,7 @@ share/apps/lskat/grafix/type2.png
 share/apps/lskat/grafix/type3.png
 share/doc/HTML/en/kabalone/.anchors
 share/doc/HTML/en/kabalone/command-line-options.html
+share/doc/HTML/en/kabalone/common
 share/doc/HTML/en/kabalone/credits-and-licenses.html
 share/doc/HTML/en/kabalone/edit-menu.html
 share/doc/HTML/en/kabalone/index.cvlog
@@ -1088,6 +1089,7 @@ share/doc/HTML/en/kabalone/settings-menu.html
 share/doc/HTML/en/kabalone/the-user-interface.html
 share/doc/HTML/en/kasteroids/.anchors
 share/doc/HTML/en/kasteroids/authors.html
+share/doc/HTML/en/kasteroids/common
 share/doc/HTML/en/kasteroids/controls.html
 share/doc/HTML/en/kasteroids/epilogue.html
 share/doc/HTML/en/kasteroids/index.cvlog
@@ -1098,6 +1100,7 @@ share/doc/HTML/en/kasteroids/ship.html
 share/doc/HTML/en/kasteroids/tips.html
 share/doc/HTML/en/kasteroids/upgrades.html
 share/doc/HTML/en/katomic/.anchors
+share/doc/HTML/en/katomic/common
 share/doc/HTML/en/katomic/compilation.html
 share/doc/HTML/en/katomic/configuration.html
 share/doc/HTML/en/katomic/credits.html
@@ -1111,6 +1114,7 @@ share/doc/HTML/en/katomic/optmenu.html
 share/doc/HTML/en/katomic/playingkatomic.html
 share/doc/HTML/en/katomic/requirements.html
 share/doc/HTML/en/kblackbox/.anchors
+share/doc/HTML/en/kblackbox/common
 share/doc/HTML/en/kblackbox/credits-and-license.html
 share/doc/HTML/en/kblackbox/game-description.html
 share/doc/HTML/en/kblackbox/game-rules.html
@@ -1124,10 +1128,21 @@ share/doc/HTML/en/kblackbox/toolbar.html
 share/doc/HTML/en/kblackbox/user-interaction.html
 share/doc/HTML/en/kblackbox/what-is-kblackbox.html
 share/doc/HTML/en/kfouleggs/.anchors
+share/doc/HTML/en/kfouleggs/aim-of-the-game.html
+share/doc/HTML/en/kfouleggs/commands.html
+share/doc/HTML/en/kfouleggs/common
+share/doc/HTML/en/kfouleggs/credits.html
+share/doc/HTML/en/kfouleggs/default-keybindings.html
+share/doc/HTML/en/kfouleggs/gameplay.html
 share/doc/HTML/en/kfouleggs/index.docbook
 share/doc/HTML/en/kfouleggs/index.html
+share/doc/HTML/en/kfouleggs/installation.html
 share/doc/HTML/en/kfouleggs/introduction.html
+share/doc/HTML/en/kfouleggs/multiplayer-and-network-play.html
+share/doc/HTML/en/kfouleggs/playing-the-game.html
+share/doc/HTML/en/kfouleggs/preferences.html
 share/doc/HTML/en/kjumpingcube/.anchors
+share/doc/HTML/en/kjumpingcube/common
 share/doc/HTML/en/kjumpingcube/compilation.html
 share/doc/HTML/en/kjumpingcube/credits.html
 share/doc/HTML/en/kjumpingcube/index.docbook
@@ -1140,6 +1155,7 @@ share/doc/HTML/en/kjumpingcube/questions-answers-tips.html
 share/doc/HTML/en/kjumpingcube/requirements.html
 share/doc/HTML/en/kjumpingcube/toolbars.html
 share/doc/HTML/en/kmahjongg/.anchors
+share/doc/HTML/en/kmahjongg/common
 share/doc/HTML/en/kmahjongg/epilogue.html
 share/doc/HTML/en/kmahjongg/index.cvlog
 share/doc/HTML/en/kmahjongg/index.docbook
@@ -1147,6 +1163,7 @@ share/doc/HTML/en/kmahjongg/index.html
 share/doc/HTML/en/kmahjongg/introduction.html
 share/doc/HTML/en/kmines/.anchors
 share/doc/HTML/en/kmines/command.html
+share/doc/HTML/en/kmines/common
 share/doc/HTML/en/kmines/compilation.html
 share/doc/HTML/en/kmines/credits.html
 share/doc/HTML/en/kmines/help-menu.html
@@ -1161,18 +1178,24 @@ share/doc/HTML/en/kmines/kmines2.png
 share/doc/HTML/en/kmines/prefs.html
 share/doc/HTML/en/kmines/settings-menu.html
 share/doc/HTML/en/konquest/.anchors
-share/doc/HTML/en/konquest/epilogue.html
-share/doc/HTML/en/konquest/index.cvlog
+share/doc/HTML/en/konquest/commands.html
+share/doc/HTML/en/konquest/common
+share/doc/HTML/en/konquest/compilation.html
+share/doc/HTML/en/konquest/configuration.html
+share/doc/HTML/en/konquest/credits.html
 share/doc/HTML/en/konquest/index.docbook
 share/doc/HTML/en/konquest/index.html
-share/doc/HTML/en/konquest/notes.html
-share/doc/HTML/en/konquest/playingthegame.html
+share/doc/HTML/en/konquest/installation.html
+share/doc/HTML/en/konquest/introduction.html
+share/doc/HTML/en/konquest/requirements.html
+share/doc/HTML/en/konquest/using-kapp.html
 share/doc/HTML/en/kpat/.anchors
 share/doc/HTML/en/kpat/calculation.html
+share/doc/HTML/en/kpat/common
 share/doc/HTML/en/kpat/compilation.html
 share/doc/HTML/en/kpat/credits.html
-share/doc/HTML/en/kpat/edit-menu.html
 share/doc/HTML/en/kpat/freecell.html
+share/doc/HTML/en/kpat/game-menu.html
 share/doc/HTML/en/kpat/grandfather.html
 share/doc/HTML/en/kpat/help.html
 share/doc/HTML/en/kpat/index.docbook
@@ -1184,11 +1207,13 @@ share/doc/HTML/en/kpat/microsolitaire.html
 share/doc/HTML/en/kpat/mod3.html
 share/doc/HTML/en/kpat/napoleon-s-tomb.html
 share/doc/HTML/en/kpat/rules-of-the-game.html
+share/doc/HTML/en/kpat/settings-menu.html
 share/doc/HTML/en/kpat/ten.html
 share/doc/HTML/en/kpat/the-idiot.html
 share/doc/HTML/en/kpat/using-kpat.html
 share/doc/HTML/en/kpoker/.anchors
 share/doc/HTML/en/kpoker/command.html
+share/doc/HTML/en/kpoker/common
 share/doc/HTML/en/kpoker/compilation.html
 share/doc/HTML/en/kpoker/credits.html
 share/doc/HTML/en/kpoker/hands.html
@@ -1202,32 +1227,40 @@ share/doc/HTML/en/kpoker/kpoker1.png
 share/doc/HTML/en/kpoker/kpoker2.png
 share/doc/HTML/en/kpoker/new-game.html
 share/doc/HTML/en/kpoker/one-player-game.html
-share/doc/HTML/en/kpoker/options-menu.html
+share/doc/HTML/en/kpoker/settings-menu.html
 share/doc/HTML/en/kpoker/scoring.html
 share/doc/HTML/en/kpoker/two-player-game.html
 share/doc/HTML/en/kpoker/two-player-play.html
 share/doc/HTML/en/kpoker/where-do-i-get-the-latest-version-of-kpoker.html
 share/doc/HTML/en/kreversi/.anchors
-share/doc/HTML/en/kreversi/a-minute-to-learn.html
-share/doc/HTML/en/kreversi/authors.html
-share/doc/HTML/en/kreversi/copyright.html
-share/doc/HTML/en/kreversi/epilogue.html
-share/doc/HTML/en/kreversi/index.cvlog
+share/doc/HTML/en/kreversi/common
+share/doc/HTML/en/kreversi/credits-and-license.html
+share/doc/HTML/en/kreversi/game-menu.html
+share/doc/HTML/en/kreversi/help-menu.html
 share/doc/HTML/en/kreversi/index.docbook
 share/doc/HTML/en/kreversi/index.html
+share/doc/HTML/en/kreversi/installation.html
 share/doc/HTML/en/kreversi/introduction.html
-share/doc/HTML/en/kreversi/rulesofthegame.html
-share/doc/HTML/en/kreversi/strategyhints.html
+share/doc/HTML/en/kreversi/kreversi1.png
+share/doc/HTML/en/kreversi/object-of-the-game.html
+share/doc/HTML/en/kreversi/playing.html
+share/doc/HTML/en/kreversi/rules.html
+share/doc/HTML/en/kreversi/settings-menu.html
+share/doc/HTML/en/kreversi/tips.html
+share/doc/HTML/en/kreversi/user-interface.html
 share/doc/HTML/en/ksame/.anchors
-share/doc/HTML/en/ksame/copyright.html
-share/doc/HTML/en/ksame/epilogue.html
-share/doc/HTML/en/ksame/index.cvlog
+share/doc/HTML/en/ksame/commands.html
+share/doc/HTML/en/ksame/common
+share/doc/HTML/en/ksame/compilation.html
+share/doc/HTML/en/ksame/credits.html
 share/doc/HTML/en/ksame/index.docbook
 share/doc/HTML/en/ksame/index.html
+share/doc/HTML/en/ksame/installation.html
 share/doc/HTML/en/ksame/introduction.html
-share/doc/HTML/en/ksame/rules-of-the-game.html
-share/doc/HTML/en/ksame/strategy-hint.html
+share/doc/HTML/en/ksame/requirements.html
+share/doc/HTML/en/ksame/using-ksame.html
 share/doc/HTML/en/kshisen/.anchors
+share/doc/HTML/en/kshisen/common
 share/doc/HTML/en/kshisen/compilation.html
 share/doc/HTML/en/kshisen/configuration.html
 share/doc/HTML/en/kshisen/credits.html
@@ -1241,6 +1274,7 @@ share/doc/HTML/en/kshisen/playing-kshisen.html
 share/doc/HTML/en/kshisen/requirements.html
 share/doc/HTML/en/ksirtet/.anchors
 share/doc/HTML/en/ksirtet/authors.html
+share/doc/HTML/en/ksirtet/common
 share/doc/HTML/en/ksirtet/epilogue.html
 share/doc/HTML/en/ksirtet/how-to-gain-points.html
 share/doc/HTML/en/ksirtet/howtoplay.html
@@ -1252,6 +1286,7 @@ share/doc/HTML/en/ksirtet/multiplayer.html
 share/doc/HTML/en/ksirtet/options.html
 share/doc/HTML/en/ksmiletris/.anchors
 share/doc/HTML/en/ksmiletris/changes.html
+share/doc/HTML/en/ksmiletris/common
 share/doc/HTML/en/ksmiletris/credits.html
 share/doc/HTML/en/ksmiletris/developement.html
 share/doc/HTML/en/ksmiletris/epilogue.html
@@ -1264,6 +1299,7 @@ share/doc/HTML/en/ksmiletris/license.html
 share/doc/HTML/en/ksmiletris/to-do.html
 share/doc/HTML/en/ksnake/.anchors
 share/doc/HTML/en/ksnake/authors.html
+share/doc/HTML/en/ksnake/common
 share/doc/HTML/en/ksnake/customization.html
 share/doc/HTML/en/ksnake/epilogue.html
 share/doc/HTML/en/ksnake/index.cvlog
@@ -1273,6 +1309,7 @@ share/doc/HTML/en/ksnake/introduction.html
 share/doc/HTML/en/ksnake/rulesofthegame.html
 share/doc/HTML/en/ksnake/scoring.html
 share/doc/HTML/en/ksokoban/.anchors
+share/doc/HTML/en/ksokoban/common
 share/doc/HTML/en/ksokoban/credits.html
 share/doc/HTML/en/ksokoban/howtoplay.html
 share/doc/HTML/en/ksokoban/index.docbook
@@ -1282,6 +1319,7 @@ share/doc/HTML/en/ksokoban/loadingexternallevels.html
 share/doc/HTML/en/kspaceduel/.anchors
 share/doc/HTML/en/kspaceduel/ai.html
 share/doc/HTML/en/kspaceduel/command.html
+share/doc/HTML/en/kspaceduel/common
 share/doc/HTML/en/kspaceduel/compilation.html
 share/doc/HTML/en/kspaceduel/credits.html
 share/doc/HTML/en/kspaceduel/help-menu.html
@@ -1297,6 +1335,7 @@ share/doc/HTML/en/kspaceduel/options.html
 share/doc/HTML/en/kspaceduel/settings-menu.html
 share/doc/HTML/en/kspaceduel/thegame.html
 share/doc/HTML/en/ktron/.anchors
+share/doc/HTML/en/ktron/common
 share/doc/HTML/en/ktron/compilation.html
 share/doc/HTML/en/ktron/computerplayer.html
 share/doc/HTML/en/ktron/config-behaviour.html
@@ -1312,6 +1351,7 @@ share/doc/HTML/en/ktron/playingktron.html
 share/doc/HTML/en/ktron/requirements.html
 share/doc/HTML/en/ktron/usingkeyboard.html
 share/doc/HTML/en/ktuberling/.anchors
+share/doc/HTML/en/ktuberling/common
 share/doc/HTML/en/ktuberling/compilation-and-installation.html
 share/doc/HTML/en/ktuberling/epilogue.html
 share/doc/HTML/en/ktuberling/for-programmers.html
@@ -1328,6 +1368,7 @@ share/doc/HTML/en/ktuberling/technical-reference.html
 share/doc/HTML/en/ktuberling/the-menu-items.html
 share/doc/HTML/en/ktuberling/the-tool-bar.html
 share/doc/HTML/en/lskat/.anchors
+share/doc/HTML/en/lskat/common
 share/doc/HTML/en/lskat/compilation.html
 share/doc/HTML/en/lskat/credits.html
 share/doc/HTML/en/lskat/help.html
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index f401a3551902..5b9f06e1928b 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdegames
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -20,8 +20,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index b15ea7406e4c..90910ab70042 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1 +1 @@
-MD5 (kdegames-2.0.tar.bz2) = bc7e15bf60705038f4ed7e3d6a1a3f28
+MD5 (kdegames-2.0.1.tar.bz2) = 4f62555ba74ed3d0c40f989d1a0b697e
diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist
index 3375d50b6db1..d4981631bca2 100644
--- a/games/kdegames3/pkg-plist
+++ b/games/kdegames3/pkg-plist
@@ -1076,6 +1076,7 @@ share/apps/lskat/grafix/type2.png
 share/apps/lskat/grafix/type3.png
 share/doc/HTML/en/kabalone/.anchors
 share/doc/HTML/en/kabalone/command-line-options.html
+share/doc/HTML/en/kabalone/common
 share/doc/HTML/en/kabalone/credits-and-licenses.html
 share/doc/HTML/en/kabalone/edit-menu.html
 share/doc/HTML/en/kabalone/index.cvlog
@@ -1088,6 +1089,7 @@ share/doc/HTML/en/kabalone/settings-menu.html
 share/doc/HTML/en/kabalone/the-user-interface.html
 share/doc/HTML/en/kasteroids/.anchors
 share/doc/HTML/en/kasteroids/authors.html
+share/doc/HTML/en/kasteroids/common
 share/doc/HTML/en/kasteroids/controls.html
 share/doc/HTML/en/kasteroids/epilogue.html
 share/doc/HTML/en/kasteroids/index.cvlog
@@ -1098,6 +1100,7 @@ share/doc/HTML/en/kasteroids/ship.html
 share/doc/HTML/en/kasteroids/tips.html
 share/doc/HTML/en/kasteroids/upgrades.html
 share/doc/HTML/en/katomic/.anchors
+share/doc/HTML/en/katomic/common
 share/doc/HTML/en/katomic/compilation.html
 share/doc/HTML/en/katomic/configuration.html
 share/doc/HTML/en/katomic/credits.html
@@ -1111,6 +1114,7 @@ share/doc/HTML/en/katomic/optmenu.html
 share/doc/HTML/en/katomic/playingkatomic.html
 share/doc/HTML/en/katomic/requirements.html
 share/doc/HTML/en/kblackbox/.anchors
+share/doc/HTML/en/kblackbox/common
 share/doc/HTML/en/kblackbox/credits-and-license.html
 share/doc/HTML/en/kblackbox/game-description.html
 share/doc/HTML/en/kblackbox/game-rules.html
@@ -1124,10 +1128,21 @@ share/doc/HTML/en/kblackbox/toolbar.html
 share/doc/HTML/en/kblackbox/user-interaction.html
 share/doc/HTML/en/kblackbox/what-is-kblackbox.html
 share/doc/HTML/en/kfouleggs/.anchors
+share/doc/HTML/en/kfouleggs/aim-of-the-game.html
+share/doc/HTML/en/kfouleggs/commands.html
+share/doc/HTML/en/kfouleggs/common
+share/doc/HTML/en/kfouleggs/credits.html
+share/doc/HTML/en/kfouleggs/default-keybindings.html
+share/doc/HTML/en/kfouleggs/gameplay.html
 share/doc/HTML/en/kfouleggs/index.docbook
 share/doc/HTML/en/kfouleggs/index.html
+share/doc/HTML/en/kfouleggs/installation.html
 share/doc/HTML/en/kfouleggs/introduction.html
+share/doc/HTML/en/kfouleggs/multiplayer-and-network-play.html
+share/doc/HTML/en/kfouleggs/playing-the-game.html
+share/doc/HTML/en/kfouleggs/preferences.html
 share/doc/HTML/en/kjumpingcube/.anchors
+share/doc/HTML/en/kjumpingcube/common
 share/doc/HTML/en/kjumpingcube/compilation.html
 share/doc/HTML/en/kjumpingcube/credits.html
 share/doc/HTML/en/kjumpingcube/index.docbook
@@ -1140,6 +1155,7 @@ share/doc/HTML/en/kjumpingcube/questions-answers-tips.html
 share/doc/HTML/en/kjumpingcube/requirements.html
 share/doc/HTML/en/kjumpingcube/toolbars.html
 share/doc/HTML/en/kmahjongg/.anchors
+share/doc/HTML/en/kmahjongg/common
 share/doc/HTML/en/kmahjongg/epilogue.html
 share/doc/HTML/en/kmahjongg/index.cvlog
 share/doc/HTML/en/kmahjongg/index.docbook
@@ -1147,6 +1163,7 @@ share/doc/HTML/en/kmahjongg/index.html
 share/doc/HTML/en/kmahjongg/introduction.html
 share/doc/HTML/en/kmines/.anchors
 share/doc/HTML/en/kmines/command.html
+share/doc/HTML/en/kmines/common
 share/doc/HTML/en/kmines/compilation.html
 share/doc/HTML/en/kmines/credits.html
 share/doc/HTML/en/kmines/help-menu.html
@@ -1161,18 +1178,24 @@ share/doc/HTML/en/kmines/kmines2.png
 share/doc/HTML/en/kmines/prefs.html
 share/doc/HTML/en/kmines/settings-menu.html
 share/doc/HTML/en/konquest/.anchors
-share/doc/HTML/en/konquest/epilogue.html
-share/doc/HTML/en/konquest/index.cvlog
+share/doc/HTML/en/konquest/commands.html
+share/doc/HTML/en/konquest/common
+share/doc/HTML/en/konquest/compilation.html
+share/doc/HTML/en/konquest/configuration.html
+share/doc/HTML/en/konquest/credits.html
 share/doc/HTML/en/konquest/index.docbook
 share/doc/HTML/en/konquest/index.html
-share/doc/HTML/en/konquest/notes.html
-share/doc/HTML/en/konquest/playingthegame.html
+share/doc/HTML/en/konquest/installation.html
+share/doc/HTML/en/konquest/introduction.html
+share/doc/HTML/en/konquest/requirements.html
+share/doc/HTML/en/konquest/using-kapp.html
 share/doc/HTML/en/kpat/.anchors
 share/doc/HTML/en/kpat/calculation.html
+share/doc/HTML/en/kpat/common
 share/doc/HTML/en/kpat/compilation.html
 share/doc/HTML/en/kpat/credits.html
-share/doc/HTML/en/kpat/edit-menu.html
 share/doc/HTML/en/kpat/freecell.html
+share/doc/HTML/en/kpat/game-menu.html
 share/doc/HTML/en/kpat/grandfather.html
 share/doc/HTML/en/kpat/help.html
 share/doc/HTML/en/kpat/index.docbook
@@ -1184,11 +1207,13 @@ share/doc/HTML/en/kpat/microsolitaire.html
 share/doc/HTML/en/kpat/mod3.html
 share/doc/HTML/en/kpat/napoleon-s-tomb.html
 share/doc/HTML/en/kpat/rules-of-the-game.html
+share/doc/HTML/en/kpat/settings-menu.html
 share/doc/HTML/en/kpat/ten.html
 share/doc/HTML/en/kpat/the-idiot.html
 share/doc/HTML/en/kpat/using-kpat.html
 share/doc/HTML/en/kpoker/.anchors
 share/doc/HTML/en/kpoker/command.html
+share/doc/HTML/en/kpoker/common
 share/doc/HTML/en/kpoker/compilation.html
 share/doc/HTML/en/kpoker/credits.html
 share/doc/HTML/en/kpoker/hands.html
@@ -1202,32 +1227,40 @@ share/doc/HTML/en/kpoker/kpoker1.png
 share/doc/HTML/en/kpoker/kpoker2.png
 share/doc/HTML/en/kpoker/new-game.html
 share/doc/HTML/en/kpoker/one-player-game.html
-share/doc/HTML/en/kpoker/options-menu.html
+share/doc/HTML/en/kpoker/settings-menu.html
 share/doc/HTML/en/kpoker/scoring.html
 share/doc/HTML/en/kpoker/two-player-game.html
 share/doc/HTML/en/kpoker/two-player-play.html
 share/doc/HTML/en/kpoker/where-do-i-get-the-latest-version-of-kpoker.html
 share/doc/HTML/en/kreversi/.anchors
-share/doc/HTML/en/kreversi/a-minute-to-learn.html
-share/doc/HTML/en/kreversi/authors.html
-share/doc/HTML/en/kreversi/copyright.html
-share/doc/HTML/en/kreversi/epilogue.html
-share/doc/HTML/en/kreversi/index.cvlog
+share/doc/HTML/en/kreversi/common
+share/doc/HTML/en/kreversi/credits-and-license.html
+share/doc/HTML/en/kreversi/game-menu.html
+share/doc/HTML/en/kreversi/help-menu.html
 share/doc/HTML/en/kreversi/index.docbook
 share/doc/HTML/en/kreversi/index.html
+share/doc/HTML/en/kreversi/installation.html
 share/doc/HTML/en/kreversi/introduction.html
-share/doc/HTML/en/kreversi/rulesofthegame.html
-share/doc/HTML/en/kreversi/strategyhints.html
+share/doc/HTML/en/kreversi/kreversi1.png
+share/doc/HTML/en/kreversi/object-of-the-game.html
+share/doc/HTML/en/kreversi/playing.html
+share/doc/HTML/en/kreversi/rules.html
+share/doc/HTML/en/kreversi/settings-menu.html
+share/doc/HTML/en/kreversi/tips.html
+share/doc/HTML/en/kreversi/user-interface.html
 share/doc/HTML/en/ksame/.anchors
-share/doc/HTML/en/ksame/copyright.html
-share/doc/HTML/en/ksame/epilogue.html
-share/doc/HTML/en/ksame/index.cvlog
+share/doc/HTML/en/ksame/commands.html
+share/doc/HTML/en/ksame/common
+share/doc/HTML/en/ksame/compilation.html
+share/doc/HTML/en/ksame/credits.html
 share/doc/HTML/en/ksame/index.docbook
 share/doc/HTML/en/ksame/index.html
+share/doc/HTML/en/ksame/installation.html
 share/doc/HTML/en/ksame/introduction.html
-share/doc/HTML/en/ksame/rules-of-the-game.html
-share/doc/HTML/en/ksame/strategy-hint.html
+share/doc/HTML/en/ksame/requirements.html
+share/doc/HTML/en/ksame/using-ksame.html
 share/doc/HTML/en/kshisen/.anchors
+share/doc/HTML/en/kshisen/common
 share/doc/HTML/en/kshisen/compilation.html
 share/doc/HTML/en/kshisen/configuration.html
 share/doc/HTML/en/kshisen/credits.html
@@ -1241,6 +1274,7 @@ share/doc/HTML/en/kshisen/playing-kshisen.html
 share/doc/HTML/en/kshisen/requirements.html
 share/doc/HTML/en/ksirtet/.anchors
 share/doc/HTML/en/ksirtet/authors.html
+share/doc/HTML/en/ksirtet/common
 share/doc/HTML/en/ksirtet/epilogue.html
 share/doc/HTML/en/ksirtet/how-to-gain-points.html
 share/doc/HTML/en/ksirtet/howtoplay.html
@@ -1252,6 +1286,7 @@ share/doc/HTML/en/ksirtet/multiplayer.html
 share/doc/HTML/en/ksirtet/options.html
 share/doc/HTML/en/ksmiletris/.anchors
 share/doc/HTML/en/ksmiletris/changes.html
+share/doc/HTML/en/ksmiletris/common
 share/doc/HTML/en/ksmiletris/credits.html
 share/doc/HTML/en/ksmiletris/developement.html
 share/doc/HTML/en/ksmiletris/epilogue.html
@@ -1264,6 +1299,7 @@ share/doc/HTML/en/ksmiletris/license.html
 share/doc/HTML/en/ksmiletris/to-do.html
 share/doc/HTML/en/ksnake/.anchors
 share/doc/HTML/en/ksnake/authors.html
+share/doc/HTML/en/ksnake/common
 share/doc/HTML/en/ksnake/customization.html
 share/doc/HTML/en/ksnake/epilogue.html
 share/doc/HTML/en/ksnake/index.cvlog
@@ -1273,6 +1309,7 @@ share/doc/HTML/en/ksnake/introduction.html
 share/doc/HTML/en/ksnake/rulesofthegame.html
 share/doc/HTML/en/ksnake/scoring.html
 share/doc/HTML/en/ksokoban/.anchors
+share/doc/HTML/en/ksokoban/common
 share/doc/HTML/en/ksokoban/credits.html
 share/doc/HTML/en/ksokoban/howtoplay.html
 share/doc/HTML/en/ksokoban/index.docbook
@@ -1282,6 +1319,7 @@ share/doc/HTML/en/ksokoban/loadingexternallevels.html
 share/doc/HTML/en/kspaceduel/.anchors
 share/doc/HTML/en/kspaceduel/ai.html
 share/doc/HTML/en/kspaceduel/command.html
+share/doc/HTML/en/kspaceduel/common
 share/doc/HTML/en/kspaceduel/compilation.html
 share/doc/HTML/en/kspaceduel/credits.html
 share/doc/HTML/en/kspaceduel/help-menu.html
@@ -1297,6 +1335,7 @@ share/doc/HTML/en/kspaceduel/options.html
 share/doc/HTML/en/kspaceduel/settings-menu.html
 share/doc/HTML/en/kspaceduel/thegame.html
 share/doc/HTML/en/ktron/.anchors
+share/doc/HTML/en/ktron/common
 share/doc/HTML/en/ktron/compilation.html
 share/doc/HTML/en/ktron/computerplayer.html
 share/doc/HTML/en/ktron/config-behaviour.html
@@ -1312,6 +1351,7 @@ share/doc/HTML/en/ktron/playingktron.html
 share/doc/HTML/en/ktron/requirements.html
 share/doc/HTML/en/ktron/usingkeyboard.html
 share/doc/HTML/en/ktuberling/.anchors
+share/doc/HTML/en/ktuberling/common
 share/doc/HTML/en/ktuberling/compilation-and-installation.html
 share/doc/HTML/en/ktuberling/epilogue.html
 share/doc/HTML/en/ktuberling/for-programmers.html
@@ -1328,6 +1368,7 @@ share/doc/HTML/en/ktuberling/technical-reference.html
 share/doc/HTML/en/ktuberling/the-menu-items.html
 share/doc/HTML/en/ktuberling/the-tool-bar.html
 share/doc/HTML/en/lskat/.anchors
+share/doc/HTML/en/lskat/common
 share/doc/HTML/en/lskat/compilation.html
 share/doc/HTML/en/lskat/credits.html
 share/doc/HTML/en/lskat/help.html
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index f401a3551902..5b9f06e1928b 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdegames
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -20,8 +20,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index b15ea7406e4c..90910ab70042 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1 +1 @@
-MD5 (kdegames-2.0.tar.bz2) = bc7e15bf60705038f4ed7e3d6a1a3f28
+MD5 (kdegames-2.0.1.tar.bz2) = 4f62555ba74ed3d0c40f989d1a0b697e
diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist
index 3375d50b6db1..d4981631bca2 100644
--- a/games/kdegames4/pkg-plist
+++ b/games/kdegames4/pkg-plist
@@ -1076,6 +1076,7 @@ share/apps/lskat/grafix/type2.png
 share/apps/lskat/grafix/type3.png
 share/doc/HTML/en/kabalone/.anchors
 share/doc/HTML/en/kabalone/command-line-options.html
+share/doc/HTML/en/kabalone/common
 share/doc/HTML/en/kabalone/credits-and-licenses.html
 share/doc/HTML/en/kabalone/edit-menu.html
 share/doc/HTML/en/kabalone/index.cvlog
@@ -1088,6 +1089,7 @@ share/doc/HTML/en/kabalone/settings-menu.html
 share/doc/HTML/en/kabalone/the-user-interface.html
 share/doc/HTML/en/kasteroids/.anchors
 share/doc/HTML/en/kasteroids/authors.html
+share/doc/HTML/en/kasteroids/common
 share/doc/HTML/en/kasteroids/controls.html
 share/doc/HTML/en/kasteroids/epilogue.html
 share/doc/HTML/en/kasteroids/index.cvlog
@@ -1098,6 +1100,7 @@ share/doc/HTML/en/kasteroids/ship.html
 share/doc/HTML/en/kasteroids/tips.html
 share/doc/HTML/en/kasteroids/upgrades.html
 share/doc/HTML/en/katomic/.anchors
+share/doc/HTML/en/katomic/common
 share/doc/HTML/en/katomic/compilation.html
 share/doc/HTML/en/katomic/configuration.html
 share/doc/HTML/en/katomic/credits.html
@@ -1111,6 +1114,7 @@ share/doc/HTML/en/katomic/optmenu.html
 share/doc/HTML/en/katomic/playingkatomic.html
 share/doc/HTML/en/katomic/requirements.html
 share/doc/HTML/en/kblackbox/.anchors
+share/doc/HTML/en/kblackbox/common
 share/doc/HTML/en/kblackbox/credits-and-license.html
 share/doc/HTML/en/kblackbox/game-description.html
 share/doc/HTML/en/kblackbox/game-rules.html
@@ -1124,10 +1128,21 @@ share/doc/HTML/en/kblackbox/toolbar.html
 share/doc/HTML/en/kblackbox/user-interaction.html
 share/doc/HTML/en/kblackbox/what-is-kblackbox.html
 share/doc/HTML/en/kfouleggs/.anchors
+share/doc/HTML/en/kfouleggs/aim-of-the-game.html
+share/doc/HTML/en/kfouleggs/commands.html
+share/doc/HTML/en/kfouleggs/common
+share/doc/HTML/en/kfouleggs/credits.html
+share/doc/HTML/en/kfouleggs/default-keybindings.html
+share/doc/HTML/en/kfouleggs/gameplay.html
 share/doc/HTML/en/kfouleggs/index.docbook
 share/doc/HTML/en/kfouleggs/index.html
+share/doc/HTML/en/kfouleggs/installation.html
 share/doc/HTML/en/kfouleggs/introduction.html
+share/doc/HTML/en/kfouleggs/multiplayer-and-network-play.html
+share/doc/HTML/en/kfouleggs/playing-the-game.html
+share/doc/HTML/en/kfouleggs/preferences.html
 share/doc/HTML/en/kjumpingcube/.anchors
+share/doc/HTML/en/kjumpingcube/common
 share/doc/HTML/en/kjumpingcube/compilation.html
 share/doc/HTML/en/kjumpingcube/credits.html
 share/doc/HTML/en/kjumpingcube/index.docbook
@@ -1140,6 +1155,7 @@ share/doc/HTML/en/kjumpingcube/questions-answers-tips.html
 share/doc/HTML/en/kjumpingcube/requirements.html
 share/doc/HTML/en/kjumpingcube/toolbars.html
 share/doc/HTML/en/kmahjongg/.anchors
+share/doc/HTML/en/kmahjongg/common
 share/doc/HTML/en/kmahjongg/epilogue.html
 share/doc/HTML/en/kmahjongg/index.cvlog
 share/doc/HTML/en/kmahjongg/index.docbook
@@ -1147,6 +1163,7 @@ share/doc/HTML/en/kmahjongg/index.html
 share/doc/HTML/en/kmahjongg/introduction.html
 share/doc/HTML/en/kmines/.anchors
 share/doc/HTML/en/kmines/command.html
+share/doc/HTML/en/kmines/common
 share/doc/HTML/en/kmines/compilation.html
 share/doc/HTML/en/kmines/credits.html
 share/doc/HTML/en/kmines/help-menu.html
@@ -1161,18 +1178,24 @@ share/doc/HTML/en/kmines/kmines2.png
 share/doc/HTML/en/kmines/prefs.html
 share/doc/HTML/en/kmines/settings-menu.html
 share/doc/HTML/en/konquest/.anchors
-share/doc/HTML/en/konquest/epilogue.html
-share/doc/HTML/en/konquest/index.cvlog
+share/doc/HTML/en/konquest/commands.html
+share/doc/HTML/en/konquest/common
+share/doc/HTML/en/konquest/compilation.html
+share/doc/HTML/en/konquest/configuration.html
+share/doc/HTML/en/konquest/credits.html
 share/doc/HTML/en/konquest/index.docbook
 share/doc/HTML/en/konquest/index.html
-share/doc/HTML/en/konquest/notes.html
-share/doc/HTML/en/konquest/playingthegame.html
+share/doc/HTML/en/konquest/installation.html
+share/doc/HTML/en/konquest/introduction.html
+share/doc/HTML/en/konquest/requirements.html
+share/doc/HTML/en/konquest/using-kapp.html
 share/doc/HTML/en/kpat/.anchors
 share/doc/HTML/en/kpat/calculation.html
+share/doc/HTML/en/kpat/common
 share/doc/HTML/en/kpat/compilation.html
 share/doc/HTML/en/kpat/credits.html
-share/doc/HTML/en/kpat/edit-menu.html
 share/doc/HTML/en/kpat/freecell.html
+share/doc/HTML/en/kpat/game-menu.html
 share/doc/HTML/en/kpat/grandfather.html
 share/doc/HTML/en/kpat/help.html
 share/doc/HTML/en/kpat/index.docbook
@@ -1184,11 +1207,13 @@ share/doc/HTML/en/kpat/microsolitaire.html
 share/doc/HTML/en/kpat/mod3.html
 share/doc/HTML/en/kpat/napoleon-s-tomb.html
 share/doc/HTML/en/kpat/rules-of-the-game.html
+share/doc/HTML/en/kpat/settings-menu.html
 share/doc/HTML/en/kpat/ten.html
 share/doc/HTML/en/kpat/the-idiot.html
 share/doc/HTML/en/kpat/using-kpat.html
 share/doc/HTML/en/kpoker/.anchors
 share/doc/HTML/en/kpoker/command.html
+share/doc/HTML/en/kpoker/common
 share/doc/HTML/en/kpoker/compilation.html
 share/doc/HTML/en/kpoker/credits.html
 share/doc/HTML/en/kpoker/hands.html
@@ -1202,32 +1227,40 @@ share/doc/HTML/en/kpoker/kpoker1.png
 share/doc/HTML/en/kpoker/kpoker2.png
 share/doc/HTML/en/kpoker/new-game.html
 share/doc/HTML/en/kpoker/one-player-game.html
-share/doc/HTML/en/kpoker/options-menu.html
+share/doc/HTML/en/kpoker/settings-menu.html
 share/doc/HTML/en/kpoker/scoring.html
 share/doc/HTML/en/kpoker/two-player-game.html
 share/doc/HTML/en/kpoker/two-player-play.html
 share/doc/HTML/en/kpoker/where-do-i-get-the-latest-version-of-kpoker.html
 share/doc/HTML/en/kreversi/.anchors
-share/doc/HTML/en/kreversi/a-minute-to-learn.html
-share/doc/HTML/en/kreversi/authors.html
-share/doc/HTML/en/kreversi/copyright.html
-share/doc/HTML/en/kreversi/epilogue.html
-share/doc/HTML/en/kreversi/index.cvlog
+share/doc/HTML/en/kreversi/common
+share/doc/HTML/en/kreversi/credits-and-license.html
+share/doc/HTML/en/kreversi/game-menu.html
+share/doc/HTML/en/kreversi/help-menu.html
 share/doc/HTML/en/kreversi/index.docbook
 share/doc/HTML/en/kreversi/index.html
+share/doc/HTML/en/kreversi/installation.html
 share/doc/HTML/en/kreversi/introduction.html
-share/doc/HTML/en/kreversi/rulesofthegame.html
-share/doc/HTML/en/kreversi/strategyhints.html
+share/doc/HTML/en/kreversi/kreversi1.png
+share/doc/HTML/en/kreversi/object-of-the-game.html
+share/doc/HTML/en/kreversi/playing.html
+share/doc/HTML/en/kreversi/rules.html
+share/doc/HTML/en/kreversi/settings-menu.html
+share/doc/HTML/en/kreversi/tips.html
+share/doc/HTML/en/kreversi/user-interface.html
 share/doc/HTML/en/ksame/.anchors
-share/doc/HTML/en/ksame/copyright.html
-share/doc/HTML/en/ksame/epilogue.html
-share/doc/HTML/en/ksame/index.cvlog
+share/doc/HTML/en/ksame/commands.html
+share/doc/HTML/en/ksame/common
+share/doc/HTML/en/ksame/compilation.html
+share/doc/HTML/en/ksame/credits.html
 share/doc/HTML/en/ksame/index.docbook
 share/doc/HTML/en/ksame/index.html
+share/doc/HTML/en/ksame/installation.html
 share/doc/HTML/en/ksame/introduction.html
-share/doc/HTML/en/ksame/rules-of-the-game.html
-share/doc/HTML/en/ksame/strategy-hint.html
+share/doc/HTML/en/ksame/requirements.html
+share/doc/HTML/en/ksame/using-ksame.html
 share/doc/HTML/en/kshisen/.anchors
+share/doc/HTML/en/kshisen/common
 share/doc/HTML/en/kshisen/compilation.html
 share/doc/HTML/en/kshisen/configuration.html
 share/doc/HTML/en/kshisen/credits.html
@@ -1241,6 +1274,7 @@ share/doc/HTML/en/kshisen/playing-kshisen.html
 share/doc/HTML/en/kshisen/requirements.html
 share/doc/HTML/en/ksirtet/.anchors
 share/doc/HTML/en/ksirtet/authors.html
+share/doc/HTML/en/ksirtet/common
 share/doc/HTML/en/ksirtet/epilogue.html
 share/doc/HTML/en/ksirtet/how-to-gain-points.html
 share/doc/HTML/en/ksirtet/howtoplay.html
@@ -1252,6 +1286,7 @@ share/doc/HTML/en/ksirtet/multiplayer.html
 share/doc/HTML/en/ksirtet/options.html
 share/doc/HTML/en/ksmiletris/.anchors
 share/doc/HTML/en/ksmiletris/changes.html
+share/doc/HTML/en/ksmiletris/common
 share/doc/HTML/en/ksmiletris/credits.html
 share/doc/HTML/en/ksmiletris/developement.html
 share/doc/HTML/en/ksmiletris/epilogue.html
@@ -1264,6 +1299,7 @@ share/doc/HTML/en/ksmiletris/license.html
 share/doc/HTML/en/ksmiletris/to-do.html
 share/doc/HTML/en/ksnake/.anchors
 share/doc/HTML/en/ksnake/authors.html
+share/doc/HTML/en/ksnake/common
 share/doc/HTML/en/ksnake/customization.html
 share/doc/HTML/en/ksnake/epilogue.html
 share/doc/HTML/en/ksnake/index.cvlog
@@ -1273,6 +1309,7 @@ share/doc/HTML/en/ksnake/introduction.html
 share/doc/HTML/en/ksnake/rulesofthegame.html
 share/doc/HTML/en/ksnake/scoring.html
 share/doc/HTML/en/ksokoban/.anchors
+share/doc/HTML/en/ksokoban/common
 share/doc/HTML/en/ksokoban/credits.html
 share/doc/HTML/en/ksokoban/howtoplay.html
 share/doc/HTML/en/ksokoban/index.docbook
@@ -1282,6 +1319,7 @@ share/doc/HTML/en/ksokoban/loadingexternallevels.html
 share/doc/HTML/en/kspaceduel/.anchors
 share/doc/HTML/en/kspaceduel/ai.html
 share/doc/HTML/en/kspaceduel/command.html
+share/doc/HTML/en/kspaceduel/common
 share/doc/HTML/en/kspaceduel/compilation.html
 share/doc/HTML/en/kspaceduel/credits.html
 share/doc/HTML/en/kspaceduel/help-menu.html
@@ -1297,6 +1335,7 @@ share/doc/HTML/en/kspaceduel/options.html
 share/doc/HTML/en/kspaceduel/settings-menu.html
 share/doc/HTML/en/kspaceduel/thegame.html
 share/doc/HTML/en/ktron/.anchors
+share/doc/HTML/en/ktron/common
 share/doc/HTML/en/ktron/compilation.html
 share/doc/HTML/en/ktron/computerplayer.html
 share/doc/HTML/en/ktron/config-behaviour.html
@@ -1312,6 +1351,7 @@ share/doc/HTML/en/ktron/playingktron.html
 share/doc/HTML/en/ktron/requirements.html
 share/doc/HTML/en/ktron/usingkeyboard.html
 share/doc/HTML/en/ktuberling/.anchors
+share/doc/HTML/en/ktuberling/common
 share/doc/HTML/en/ktuberling/compilation-and-installation.html
 share/doc/HTML/en/ktuberling/epilogue.html
 share/doc/HTML/en/ktuberling/for-programmers.html
@@ -1328,6 +1368,7 @@ share/doc/HTML/en/ktuberling/technical-reference.html
 share/doc/HTML/en/ktuberling/the-menu-items.html
 share/doc/HTML/en/ktuberling/the-tool-bar.html
 share/doc/HTML/en/lskat/.anchors
+share/doc/HTML/en/lskat/common
 share/doc/HTML/en/lskat/compilation.html
 share/doc/HTML/en/lskat/credits.html
 share/doc/HTML/en/lskat/help.html
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 52902e9cc46e..b9f2613c67bd 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 
@@ -23,8 +22,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo
index 116d56e12199..4821550eec63 100644
--- a/graphics/kdegraphics2/distinfo
+++ b/graphics/kdegraphics2/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.0.tar.bz2) = c6e5216221a74a0324fc1466b39785c4
+MD5 (kdegraphics-2.0.1.tar.bz2) = e9d1123f47f9b092a02818f125cdc824
diff --git a/graphics/kdegraphics2/pkg-plist b/graphics/kdegraphics2/pkg-plist
index 6edfa1833d52..292fb8ed59f1 100644
--- a/graphics/kdegraphics2/pkg-plist
+++ b/graphics/kdegraphics2/pkg-plist
@@ -28,14 +28,17 @@ include/mini-magick/version.h
 lib/kview.la
 lib/kview.so
 lib/libbaglayout.la
+lib/libbaglayout.so
 lib/libbaglayout.so.0
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
 lib/libkfax.so
 lib/libkghostview.la
+lib/libkghostview.so
 lib/libkghostview.so.1
 lib/libkmultipage.la
+lib/libkmultipage.so
 lib/libkmultipage.so.0
 lib/libkpagetest.la
 lib/libkpagetest.so
@@ -44,6 +47,7 @@ lib/libkviewerpart.so
 lib/libkviewpart.la
 lib/libkviewpart.so
 lib/libminimagick.la
+lib/libminimagick.so
 lib/libminimagick.so.5
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
@@ -71,6 +75,7 @@ share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
 share/doc/HTML/en/kdvi/aboutkde.ps
+share/doc/HTML/en/kdvi/common
 share/doc/HTML/en/kdvi/index.cvlog
 share/doc/HTML/en/kdvi/index.docbook
 share/doc/HTML/en/kdvi/index.html
@@ -83,6 +88,7 @@ share/doc/HTML/en/kdvi/qampa.html
 share/doc/HTML/en/kdvi/usage.html
 share/doc/HTML/en/kfax/.anchors
 share/doc/HTML/en/kfax/command-line-options.html
+share/doc/HTML/en/kfax/common
 share/doc/HTML/en/kfax/compilation-and-installation.html
 share/doc/HTML/en/kfax/copyright.html
 share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
@@ -103,6 +109,7 @@ share/doc/HTML/en/kfax/requirements.html
 share/doc/HTML/en/kfax/themenuentries.html
 share/doc/HTML/en/kfax/view.html
 share/doc/HTML/en/kfract/.anchors
+share/doc/HTML/en/kfract/common
 share/doc/HTML/en/kfract/index.cvlog
 share/doc/HTML/en/kfract/index.docbook
 share/doc/HTML/en/kfract/index.html
@@ -116,6 +123,7 @@ share/doc/HTML/en/kfract/the-toolbar.html
 share/doc/HTML/en/kfract/the-types-menu.html
 share/doc/HTML/en/kghostview/.anchors
 share/doc/HTML/en/kghostview/authors.html
+share/doc/HTML/en/kghostview/common
 share/doc/HTML/en/kghostview/configure-interpreter.html
 share/doc/HTML/en/kghostview/configure-key-bindings.html
 share/doc/HTML/en/kghostview/copyright.html
@@ -140,6 +148,7 @@ share/doc/HTML/en/kghostview/view-control.html
 share/doc/HTML/en/kghostview/view.html
 share/doc/HTML/en/ksnapshot/.anchors
 share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/ksnapshot/common
 share/doc/HTML/en/ksnapshot/credits.html
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/index.html
@@ -150,6 +159,7 @@ share/doc/HTML/en/ksnapshot/taking-snapshot.html
 share/doc/HTML/en/ksnapshot/using-ksapshot.html
 share/doc/HTML/en/kview/.anchors
 share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/common
 share/doc/HTML/en/kview/how.html
 share/doc/HTML/en/kview/index.cvlog
 share/doc/HTML/en/kview/index.docbook
@@ -158,6 +168,7 @@ share/doc/HTML/en/kview/introduction.html
 share/doc/HTML/en/kview/notes.html
 share/doc/HTML/en/kview/what.html
 share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/common
 share/doc/HTML/en/pixie/index.docbook
 share/doc/HTML/en/pixie/index.html
 share/doc/HTML/en/pixie/introduction.html
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 52902e9cc46e..b9f2613c67bd 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 
@@ -23,8 +22,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 116d56e12199..4821550eec63 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.0.tar.bz2) = c6e5216221a74a0324fc1466b39785c4
+MD5 (kdegraphics-2.0.1.tar.bz2) = e9d1123f47f9b092a02818f125cdc824
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 6edfa1833d52..292fb8ed59f1 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -28,14 +28,17 @@ include/mini-magick/version.h
 lib/kview.la
 lib/kview.so
 lib/libbaglayout.la
+lib/libbaglayout.so
 lib/libbaglayout.so.0
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
 lib/libkfax.so
 lib/libkghostview.la
+lib/libkghostview.so
 lib/libkghostview.so.1
 lib/libkmultipage.la
+lib/libkmultipage.so
 lib/libkmultipage.so.0
 lib/libkpagetest.la
 lib/libkpagetest.so
@@ -44,6 +47,7 @@ lib/libkviewerpart.so
 lib/libkviewpart.la
 lib/libkviewpart.so
 lib/libminimagick.la
+lib/libminimagick.so
 lib/libminimagick.so.5
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
@@ -71,6 +75,7 @@ share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
 share/doc/HTML/en/kdvi/aboutkde.ps
+share/doc/HTML/en/kdvi/common
 share/doc/HTML/en/kdvi/index.cvlog
 share/doc/HTML/en/kdvi/index.docbook
 share/doc/HTML/en/kdvi/index.html
@@ -83,6 +88,7 @@ share/doc/HTML/en/kdvi/qampa.html
 share/doc/HTML/en/kdvi/usage.html
 share/doc/HTML/en/kfax/.anchors
 share/doc/HTML/en/kfax/command-line-options.html
+share/doc/HTML/en/kfax/common
 share/doc/HTML/en/kfax/compilation-and-installation.html
 share/doc/HTML/en/kfax/copyright.html
 share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
@@ -103,6 +109,7 @@ share/doc/HTML/en/kfax/requirements.html
 share/doc/HTML/en/kfax/themenuentries.html
 share/doc/HTML/en/kfax/view.html
 share/doc/HTML/en/kfract/.anchors
+share/doc/HTML/en/kfract/common
 share/doc/HTML/en/kfract/index.cvlog
 share/doc/HTML/en/kfract/index.docbook
 share/doc/HTML/en/kfract/index.html
@@ -116,6 +123,7 @@ share/doc/HTML/en/kfract/the-toolbar.html
 share/doc/HTML/en/kfract/the-types-menu.html
 share/doc/HTML/en/kghostview/.anchors
 share/doc/HTML/en/kghostview/authors.html
+share/doc/HTML/en/kghostview/common
 share/doc/HTML/en/kghostview/configure-interpreter.html
 share/doc/HTML/en/kghostview/configure-key-bindings.html
 share/doc/HTML/en/kghostview/copyright.html
@@ -140,6 +148,7 @@ share/doc/HTML/en/kghostview/view-control.html
 share/doc/HTML/en/kghostview/view.html
 share/doc/HTML/en/ksnapshot/.anchors
 share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/ksnapshot/common
 share/doc/HTML/en/ksnapshot/credits.html
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/index.html
@@ -150,6 +159,7 @@ share/doc/HTML/en/ksnapshot/taking-snapshot.html
 share/doc/HTML/en/ksnapshot/using-ksapshot.html
 share/doc/HTML/en/kview/.anchors
 share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/common
 share/doc/HTML/en/kview/how.html
 share/doc/HTML/en/kview/index.cvlog
 share/doc/HTML/en/kview/index.docbook
@@ -158,6 +168,7 @@ share/doc/HTML/en/kview/introduction.html
 share/doc/HTML/en/kview/notes.html
 share/doc/HTML/en/kview/what.html
 share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/common
 share/doc/HTML/en/pixie/index.docbook
 share/doc/HTML/en/pixie/index.html
 share/doc/HTML/en/pixie/introduction.html
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 52902e9cc46e..b9f2613c67bd 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 
@@ -23,8 +22,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 116d56e12199..4821550eec63 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.0.tar.bz2) = c6e5216221a74a0324fc1466b39785c4
+MD5 (kdegraphics-2.0.1.tar.bz2) = e9d1123f47f9b092a02818f125cdc824
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 6edfa1833d52..292fb8ed59f1 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -28,14 +28,17 @@ include/mini-magick/version.h
 lib/kview.la
 lib/kview.so
 lib/libbaglayout.la
+lib/libbaglayout.so
 lib/libbaglayout.so.0
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
 lib/libkfax.so
 lib/libkghostview.la
+lib/libkghostview.so
 lib/libkghostview.so.1
 lib/libkmultipage.la
+lib/libkmultipage.so
 lib/libkmultipage.so.0
 lib/libkpagetest.la
 lib/libkpagetest.so
@@ -44,6 +47,7 @@ lib/libkviewerpart.so
 lib/libkviewpart.la
 lib/libkviewpart.so
 lib/libminimagick.la
+lib/libminimagick.so
 lib/libminimagick.so.5
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
@@ -71,6 +75,7 @@ share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
 share/doc/HTML/en/kdvi/aboutkde.ps
+share/doc/HTML/en/kdvi/common
 share/doc/HTML/en/kdvi/index.cvlog
 share/doc/HTML/en/kdvi/index.docbook
 share/doc/HTML/en/kdvi/index.html
@@ -83,6 +88,7 @@ share/doc/HTML/en/kdvi/qampa.html
 share/doc/HTML/en/kdvi/usage.html
 share/doc/HTML/en/kfax/.anchors
 share/doc/HTML/en/kfax/command-line-options.html
+share/doc/HTML/en/kfax/common
 share/doc/HTML/en/kfax/compilation-and-installation.html
 share/doc/HTML/en/kfax/copyright.html
 share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
@@ -103,6 +109,7 @@ share/doc/HTML/en/kfax/requirements.html
 share/doc/HTML/en/kfax/themenuentries.html
 share/doc/HTML/en/kfax/view.html
 share/doc/HTML/en/kfract/.anchors
+share/doc/HTML/en/kfract/common
 share/doc/HTML/en/kfract/index.cvlog
 share/doc/HTML/en/kfract/index.docbook
 share/doc/HTML/en/kfract/index.html
@@ -116,6 +123,7 @@ share/doc/HTML/en/kfract/the-toolbar.html
 share/doc/HTML/en/kfract/the-types-menu.html
 share/doc/HTML/en/kghostview/.anchors
 share/doc/HTML/en/kghostview/authors.html
+share/doc/HTML/en/kghostview/common
 share/doc/HTML/en/kghostview/configure-interpreter.html
 share/doc/HTML/en/kghostview/configure-key-bindings.html
 share/doc/HTML/en/kghostview/copyright.html
@@ -140,6 +148,7 @@ share/doc/HTML/en/kghostview/view-control.html
 share/doc/HTML/en/kghostview/view.html
 share/doc/HTML/en/ksnapshot/.anchors
 share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/ksnapshot/common
 share/doc/HTML/en/ksnapshot/credits.html
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/index.html
@@ -150,6 +159,7 @@ share/doc/HTML/en/ksnapshot/taking-snapshot.html
 share/doc/HTML/en/ksnapshot/using-ksapshot.html
 share/doc/HTML/en/kview/.anchors
 share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/common
 share/doc/HTML/en/kview/how.html
 share/doc/HTML/en/kview/index.cvlog
 share/doc/HTML/en/kview/index.docbook
@@ -158,6 +168,7 @@ share/doc/HTML/en/kview/introduction.html
 share/doc/HTML/en/kview/notes.html
 share/doc/HTML/en/kview/what.html
 share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/common
 share/doc/HTML/en/pixie/index.docbook
 share/doc/HTML/en/pixie/index.html
 share/doc/HTML/en/pixie/introduction.html
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/misc/kdeutils2/pkg-plist b/misc/kdeutils2/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/misc/kdeutils2/pkg-plist
+++ b/misc/kdeutils2/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/misc/kdeutils3/pkg-plist
+++ b/misc/kdeutils3/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index aa7c91ef0f1e..6baca2110f50 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-BUILD_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -40,10 +37,10 @@ post-install:
 	@${ECHO_MSG} " % ${CHMOD} 666 <cdrom_device>"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "to link and give permission to access the CD-ROM device."
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 	@${ECHO_MSG} "For example(IDE CD-ROM device):"
 	@${ECHO_MSG} " % ${LN} -sf /dev/racd0c /dev/cdrom"
 	@${ECHO_MSG} " % ${CHMOD} 666 /dev/racd0c"
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 6f6dbcdf4e2c..bdbc1915f697 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-2.0.tar.bz2) = a56ed60810c222a6a2714f261ba1e809
+MD5 (kdemultimedia-2.0.1.tar.bz2) = f339c91b07f142220ed347ca80919bcc
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index ff5bbf615d25..ef219c2a83ef 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -11,30 +11,38 @@ bin/midisend
 bin/sf2cfg
 bin/timidity
 bin/workman2cddb.pl
-lib/Arts/StructureBuilder.mcopclass
-lib/Arts/StructureDesc.mcopclass
-lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
-lib/Arts/Synth_MIDI_TEST.mcopclass
-lib/Arts/Synth_NOISE.mcopclass
-lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
-lib/Arts/Synth_WAVE_TRI.mcopclass
-lib/Arts/Synth_XFADE.mcopclass
-lib/artsmodules.mcopclass
-lib/artsmodules.mcoptype
 lib/kmixctrl.la
 lib/kmixctrl.so
 lib/libaktion.la
+lib/libaktion.so
 lib/libaktion.so.1
 lib/libartsbuilder.la
+lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsmodules.la
+lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libkcm_kmix.la
 lib/libkcm_kmix.so
 lib/libkmidpart.la
+lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmixapplet.la
+lib/libkmixapplet.so
 lib/libkmixapplet.so.1
+lib/libworkman.la
+lib/libworkman.so
+lib/libworkman.so.5
+lib/mcop/Arts/StructureBuilder.mcopclass
+lib/mcop/Arts/StructureDesc.mcopclass
+lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
+lib/mcop/Arts/Synth_NOISE.mcopclass
+lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
+lib/mcop/Arts/Synth_XFADE.mcopclass
+lib/mcop/artsmodules.mcopclass
+lib/mcop/artsmodules.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -269,6 +277,7 @@ share/apps/kscd/pics/cdsmall.xpm
 share/apps/kscd/pics/kscdlogo.xpm
 share/config/aktionrc
 share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
 share/doc/HTML/en/artsbuilder/index.docbook
 share/doc/HTML/en/artsbuilder/index.html
 share/doc/HTML/en/artsbuilder/insidearts.html
@@ -279,6 +288,7 @@ share/doc/HTML/en/kmid/abouttheauthor.html
 share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
 share/doc/HTML/en/kmid/advancedfeatures.html
 share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/compilationandinstallation.html
 share/doc/HTML/en/kmid/creatingamidimap.html
 share/doc/HTML/en/kmid/deletingacollection.html
@@ -306,6 +316,7 @@ share/doc/HTML/en/kmid/usingmidimaps.html
 share/doc/HTML/en/kmidi/.anchors
 share/doc/HTML/en/kmidi/FAQ
 share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
 share/doc/HTML/en/kmidi/compilationandinstallation.html
 share/doc/HTML/en/kmidi/computationissues.html
 share/doc/HTML/en/kmidi/configuring.html
@@ -331,6 +342,7 @@ share/doc/HTML/en/kmidi/synthesismodel.html
 share/doc/HTML/en/kmidi/usage.html
 share/doc/HTML/en/kmidi/volume.html
 share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/common
 share/doc/HTML/en/kmix/compilation.html
 share/doc/HTML/en/kmix/configuration-options.html
 share/doc/HTML/en/kmix/control-panel.html
@@ -348,6 +360,7 @@ share/doc/HTML/en/kscd/cddb-editor.html
 share/doc/HTML/en/kscd/cddb-support.html
 share/doc/HTML/en/kscd/cddb-tab.html
 share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
 share/doc/HTML/en/kscd/configuring-kscd.html
 share/doc/HTML/en/kscd/credits-and-license.html
 share/doc/HTML/en/kscd/index.docbook
@@ -444,7 +457,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
-@dirrm share/apps/kicker/applets
 @dirrm share/apps/kaiman/Skins/k9
 @dirrm share/apps/kaiman/Skins/circle
 @dirrm share/apps/kaiman/Skins/car-preset
@@ -452,6 +464,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kaiman
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
+@dirrm share/apps/artsbuilder
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm lib/Arts
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index aa7c91ef0f1e..6baca2110f50 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-BUILD_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -40,10 +37,10 @@ post-install:
 	@${ECHO_MSG} " % ${CHMOD} 666 <cdrom_device>"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "to link and give permission to access the CD-ROM device."
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 	@${ECHO_MSG} "For example(IDE CD-ROM device):"
 	@${ECHO_MSG} " % ${LN} -sf /dev/racd0c /dev/cdrom"
 	@${ECHO_MSG} " % ${CHMOD} 666 /dev/racd0c"
-	@${ECHO_MSG} 
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 6f6dbcdf4e2c..bdbc1915f697 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-2.0.tar.bz2) = a56ed60810c222a6a2714f261ba1e809
+MD5 (kdemultimedia-2.0.1.tar.bz2) = f339c91b07f142220ed347ca80919bcc
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index ff5bbf615d25..ef219c2a83ef 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -11,30 +11,38 @@ bin/midisend
 bin/sf2cfg
 bin/timidity
 bin/workman2cddb.pl
-lib/Arts/StructureBuilder.mcopclass
-lib/Arts/StructureDesc.mcopclass
-lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
-lib/Arts/Synth_MIDI_TEST.mcopclass
-lib/Arts/Synth_NOISE.mcopclass
-lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
-lib/Arts/Synth_WAVE_TRI.mcopclass
-lib/Arts/Synth_XFADE.mcopclass
-lib/artsmodules.mcopclass
-lib/artsmodules.mcoptype
 lib/kmixctrl.la
 lib/kmixctrl.so
 lib/libaktion.la
+lib/libaktion.so
 lib/libaktion.so.1
 lib/libartsbuilder.la
+lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsmodules.la
+lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libkcm_kmix.la
 lib/libkcm_kmix.so
 lib/libkmidpart.la
+lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmixapplet.la
+lib/libkmixapplet.so
 lib/libkmixapplet.so.1
+lib/libworkman.la
+lib/libworkman.so
+lib/libworkman.so.5
+lib/mcop/Arts/StructureBuilder.mcopclass
+lib/mcop/Arts/StructureDesc.mcopclass
+lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
+lib/mcop/Arts/Synth_NOISE.mcopclass
+lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
+lib/mcop/Arts/Synth_XFADE.mcopclass
+lib/mcop/artsmodules.mcopclass
+lib/mcop/artsmodules.mcoptype
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -269,6 +277,7 @@ share/apps/kscd/pics/cdsmall.xpm
 share/apps/kscd/pics/kscdlogo.xpm
 share/config/aktionrc
 share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
 share/doc/HTML/en/artsbuilder/index.docbook
 share/doc/HTML/en/artsbuilder/index.html
 share/doc/HTML/en/artsbuilder/insidearts.html
@@ -279,6 +288,7 @@ share/doc/HTML/en/kmid/abouttheauthor.html
 share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
 share/doc/HTML/en/kmid/advancedfeatures.html
 share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/compilationandinstallation.html
 share/doc/HTML/en/kmid/creatingamidimap.html
 share/doc/HTML/en/kmid/deletingacollection.html
@@ -306,6 +316,7 @@ share/doc/HTML/en/kmid/usingmidimaps.html
 share/doc/HTML/en/kmidi/.anchors
 share/doc/HTML/en/kmidi/FAQ
 share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
 share/doc/HTML/en/kmidi/compilationandinstallation.html
 share/doc/HTML/en/kmidi/computationissues.html
 share/doc/HTML/en/kmidi/configuring.html
@@ -331,6 +342,7 @@ share/doc/HTML/en/kmidi/synthesismodel.html
 share/doc/HTML/en/kmidi/usage.html
 share/doc/HTML/en/kmidi/volume.html
 share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/common
 share/doc/HTML/en/kmix/compilation.html
 share/doc/HTML/en/kmix/configuration-options.html
 share/doc/HTML/en/kmix/control-panel.html
@@ -348,6 +360,7 @@ share/doc/HTML/en/kscd/cddb-editor.html
 share/doc/HTML/en/kscd/cddb-support.html
 share/doc/HTML/en/kscd/cddb-tab.html
 share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
 share/doc/HTML/en/kscd/configuring-kscd.html
 share/doc/HTML/en/kscd/credits-and-license.html
 share/doc/HTML/en/kscd/index.docbook
@@ -444,7 +457,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
-@dirrm share/apps/kicker/applets
 @dirrm share/apps/kaiman/Skins/k9
 @dirrm share/apps/kaiman/Skins/circle
 @dirrm share/apps/kaiman/Skins/car-preset
@@ -452,6 +464,6 @@ share/services/kmixctrl_restore.desktop
 @dirrm share/apps/kaiman
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
+@dirrm share/apps/artsbuilder
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm lib/Arts
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index adfb423128f2..5656bfa950b0 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -21,8 +21,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index 9ac64c236e7f..060e485c32c1 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
+MD5 (kdenetwork-2.0.1.tar.bz2) = 7d6c3244c34e4ec7b2881f4f7788ee0a
diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist
index fff92a371ade..c87ec12d5a38 100644
--- a/net/kdenetwork2/pkg-plist
+++ b/net/kdenetwork2/pkg-plist
@@ -132,6 +132,17 @@ share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
 share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
 share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
 share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Provider/Yugoslavia/BeoTelNet
+share/apps/kppp/Provider/Yugoslavia/CG.yu
+share/apps/kppp/Provider/Yugoslavia/DrenikNet
+share/apps/kppp/Provider/Yugoslavia/EUnet
+share/apps/kppp/Provider/Yugoslavia/EUnetlite
+share/apps/kppp/Provider/Yugoslavia/InfoSKY
+share/apps/kppp/Provider/Yugoslavia/PTT
+share/apps/kppp/Provider/Yugoslavia/SCnet
+share/apps/kppp/Provider/Yugoslavia/Sezampro
+share/apps/kppp/Provider/Yugoslavia/VeratNet
+share/apps/kppp/Provider/Yugoslavia/YUBCnet
 share/apps/kppp/Rules/Argentina/Argentina_0610.rst
 share/apps/kppp/Rules/Argentina/Argentina_Local.rst
 share/apps/kppp/Rules/Australia/Local.rst
@@ -185,12 +196,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
 share/apps/kppp/Rules/England/BritishTelecom_Local.rst
 share/apps/kppp/Rules/England/BritishTelecom_National.rst
 share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
+share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
 share/apps/kppp/Rules/France/France_Telecom_Local.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
 share/apps/kppp/Rules/France/France_Telecom_National.rst
 share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
 share/apps/kppp/Rules/Germany/Addcom.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst
 share/apps/kppp/Rules/Germany/CallOkaynet.rst
 share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
 share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
@@ -388,15 +402,18 @@ share/apps/ksirc/tester.pl
 share/config/ksircrc
 share/config/protocols/vnc.desktop
 share/doc/HTML/en/keystone/.anchors
+share/doc/HTML/en/keystone/common
 share/doc/HTML/en/keystone/index.docbook
 share/doc/HTML/en/keystone/index.html
 share/doc/HTML/en/keystone/introduction.html
 share/doc/HTML/en/kit/.anchors
+share/doc/HTML/en/kit/common
 share/doc/HTML/en/kit/index.docbook
 share/doc/HTML/en/kit/index.html
 share/doc/HTML/en/kit/introduction.html
 share/doc/HTML/en/kmail/.anchors
 share/doc/HTML/en/kmail/appearancetab.html
+share/doc/HTML/en/kmail/common
 share/doc/HTML/en/kmail/composertab.html
 share/doc/HTML/en/kmail/copyright.html
 share/doc/HTML/en/kmail/documentation.html
@@ -425,6 +442,7 @@ share/doc/HTML/en/kmail/thecomposerwindow.html
 share/doc/HTML/en/kmail/thecomposerwindow2.html
 share/doc/HTML/en/knode/.anchors
 share/doc/HTML/en/knode/commands.html
+share/doc/HTML/en/knode/common
 share/doc/HTML/en/knode/compilation.html
 share/doc/HTML/en/knode/configuration.html
 share/doc/HTML/en/knode/credits.html
@@ -473,6 +491,7 @@ share/doc/HTML/en/knode/update-installation.html
 share/doc/HTML/en/knode/usenet-slang.html
 share/doc/HTML/en/knode/using-knode.html
 share/doc/HTML/en/korn/.anchors
+share/doc/HTML/en/korn/common
 share/doc/HTML/en/korn/index.docbook
 share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/korn/introduction.html
@@ -486,6 +505,7 @@ share/doc/HTML/en/kppp/accounting.html
 share/doc/HTML/en/kppp/appendix.html
 share/doc/HTML/en/kppp/autoconfigurehostname.html
 share/doc/HTML/en/kppp/cb.html
+share/doc/HTML/en/kppp/common
 share/doc/HTML/en/kppp/compilationandinstallation.html
 share/doc/HTML/en/kppp/configuringanaccount.html
 share/doc/HTML/en/kppp/costsgraphs.fig
@@ -529,6 +549,7 @@ share/doc/HTML/en/ksirc/.anchors
 share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
 share/doc/HTML/en/ksirc/bots.html
 share/doc/HTML/en/ksirc/colournumbers.html
+share/doc/HTML/en/ksirc/common
 share/doc/HTML/en/ksirc/examplesfilters.html
 share/doc/HTML/en/ksirc/examplessetcolors.html
 share/doc/HTML/en/ksirc/filters.html
@@ -547,6 +568,7 @@ share/doc/HTML/en/ksirc/setvariables.html
 share/doc/HTML/en/ksirc/timers.html
 share/doc/HTML/en/ksirc/userhostrequests.html
 share/doc/HTML/en/ktalkd/.anchors
+share/doc/HTML/en/ktalkd/common
 share/doc/HTML/en/ktalkd/compilationandinstallation.html
 share/doc/HTML/en/ktalkd/copyright.html
 share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
@@ -632,6 +654,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Rules/Greece
 @dirrm share/apps/kppp/Rules/Germany
 @dirrm share/apps/kppp/Rules/France
+@dirrm share/apps/kppp/Rules/Estonia
 @dirrm share/apps/kppp/Rules/England
 @dirrm share/apps/kppp/Rules/Denmark
 @dirrm share/apps/kppp/Rules/Czechia
@@ -647,6 +670,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Rules/Australia
 @dirrm share/apps/kppp/Rules/Argentina
 @dirrm share/apps/kppp/Rules
+@dirrm share/apps/kppp/Provider/Yugoslavia
 @dirrm share/apps/kppp/Provider/United_Kingdom
 @dirrm share/apps/kppp/Provider/Taiwan
 @dirrm share/apps/kppp/Provider/Portugal
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index adfb423128f2..5656bfa950b0 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -21,8 +21,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 9ac64c236e7f..060e485c32c1 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
+MD5 (kdenetwork-2.0.1.tar.bz2) = 7d6c3244c34e4ec7b2881f4f7788ee0a
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
index fff92a371ade..c87ec12d5a38 100644
--- a/net/kdenetwork3/pkg-plist
+++ b/net/kdenetwork3/pkg-plist
@@ -132,6 +132,17 @@ share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
 share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
 share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
 share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Provider/Yugoslavia/BeoTelNet
+share/apps/kppp/Provider/Yugoslavia/CG.yu
+share/apps/kppp/Provider/Yugoslavia/DrenikNet
+share/apps/kppp/Provider/Yugoslavia/EUnet
+share/apps/kppp/Provider/Yugoslavia/EUnetlite
+share/apps/kppp/Provider/Yugoslavia/InfoSKY
+share/apps/kppp/Provider/Yugoslavia/PTT
+share/apps/kppp/Provider/Yugoslavia/SCnet
+share/apps/kppp/Provider/Yugoslavia/Sezampro
+share/apps/kppp/Provider/Yugoslavia/VeratNet
+share/apps/kppp/Provider/Yugoslavia/YUBCnet
 share/apps/kppp/Rules/Argentina/Argentina_0610.rst
 share/apps/kppp/Rules/Argentina/Argentina_Local.rst
 share/apps/kppp/Rules/Australia/Local.rst
@@ -185,12 +196,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
 share/apps/kppp/Rules/England/BritishTelecom_Local.rst
 share/apps/kppp/Rules/England/BritishTelecom_National.rst
 share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
+share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
 share/apps/kppp/Rules/France/France_Telecom_Local.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
 share/apps/kppp/Rules/France/France_Telecom_National.rst
 share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
 share/apps/kppp/Rules/Germany/Addcom.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst
 share/apps/kppp/Rules/Germany/CallOkaynet.rst
 share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
 share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
@@ -388,15 +402,18 @@ share/apps/ksirc/tester.pl
 share/config/ksircrc
 share/config/protocols/vnc.desktop
 share/doc/HTML/en/keystone/.anchors
+share/doc/HTML/en/keystone/common
 share/doc/HTML/en/keystone/index.docbook
 share/doc/HTML/en/keystone/index.html
 share/doc/HTML/en/keystone/introduction.html
 share/doc/HTML/en/kit/.anchors
+share/doc/HTML/en/kit/common
 share/doc/HTML/en/kit/index.docbook
 share/doc/HTML/en/kit/index.html
 share/doc/HTML/en/kit/introduction.html
 share/doc/HTML/en/kmail/.anchors
 share/doc/HTML/en/kmail/appearancetab.html
+share/doc/HTML/en/kmail/common
 share/doc/HTML/en/kmail/composertab.html
 share/doc/HTML/en/kmail/copyright.html
 share/doc/HTML/en/kmail/documentation.html
@@ -425,6 +442,7 @@ share/doc/HTML/en/kmail/thecomposerwindow.html
 share/doc/HTML/en/kmail/thecomposerwindow2.html
 share/doc/HTML/en/knode/.anchors
 share/doc/HTML/en/knode/commands.html
+share/doc/HTML/en/knode/common
 share/doc/HTML/en/knode/compilation.html
 share/doc/HTML/en/knode/configuration.html
 share/doc/HTML/en/knode/credits.html
@@ -473,6 +491,7 @@ share/doc/HTML/en/knode/update-installation.html
 share/doc/HTML/en/knode/usenet-slang.html
 share/doc/HTML/en/knode/using-knode.html
 share/doc/HTML/en/korn/.anchors
+share/doc/HTML/en/korn/common
 share/doc/HTML/en/korn/index.docbook
 share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/korn/introduction.html
@@ -486,6 +505,7 @@ share/doc/HTML/en/kppp/accounting.html
 share/doc/HTML/en/kppp/appendix.html
 share/doc/HTML/en/kppp/autoconfigurehostname.html
 share/doc/HTML/en/kppp/cb.html
+share/doc/HTML/en/kppp/common
 share/doc/HTML/en/kppp/compilationandinstallation.html
 share/doc/HTML/en/kppp/configuringanaccount.html
 share/doc/HTML/en/kppp/costsgraphs.fig
@@ -529,6 +549,7 @@ share/doc/HTML/en/ksirc/.anchors
 share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
 share/doc/HTML/en/ksirc/bots.html
 share/doc/HTML/en/ksirc/colournumbers.html
+share/doc/HTML/en/ksirc/common
 share/doc/HTML/en/ksirc/examplesfilters.html
 share/doc/HTML/en/ksirc/examplessetcolors.html
 share/doc/HTML/en/ksirc/filters.html
@@ -547,6 +568,7 @@ share/doc/HTML/en/ksirc/setvariables.html
 share/doc/HTML/en/ksirc/timers.html
 share/doc/HTML/en/ksirc/userhostrequests.html
 share/doc/HTML/en/ktalkd/.anchors
+share/doc/HTML/en/ktalkd/common
 share/doc/HTML/en/ktalkd/compilationandinstallation.html
 share/doc/HTML/en/ktalkd/copyright.html
 share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
@@ -632,6 +654,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Rules/Greece
 @dirrm share/apps/kppp/Rules/Germany
 @dirrm share/apps/kppp/Rules/France
+@dirrm share/apps/kppp/Rules/Estonia
 @dirrm share/apps/kppp/Rules/England
 @dirrm share/apps/kppp/Rules/Denmark
 @dirrm share/apps/kppp/Rules/Czechia
@@ -647,6 +670,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Rules/Australia
 @dirrm share/apps/kppp/Rules/Argentina
 @dirrm share/apps/kppp/Rules
+@dirrm share/apps/kppp/Provider/Yugoslavia
 @dirrm share/apps/kppp/Provider/United_Kingdom
 @dirrm share/apps/kppp/Provider/Taiwan
 @dirrm share/apps/kppp/Provider/Portugal
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index adfb423128f2..5656bfa950b0 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -21,8 +21,7 @@ MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 9ac64c236e7f..060e485c32c1 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
+MD5 (kdenetwork-2.0.1.tar.bz2) = 7d6c3244c34e4ec7b2881f4f7788ee0a
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index fff92a371ade..c87ec12d5a38 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -132,6 +132,17 @@ share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
 share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
 share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
 share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Provider/Yugoslavia/BeoTelNet
+share/apps/kppp/Provider/Yugoslavia/CG.yu
+share/apps/kppp/Provider/Yugoslavia/DrenikNet
+share/apps/kppp/Provider/Yugoslavia/EUnet
+share/apps/kppp/Provider/Yugoslavia/EUnetlite
+share/apps/kppp/Provider/Yugoslavia/InfoSKY
+share/apps/kppp/Provider/Yugoslavia/PTT
+share/apps/kppp/Provider/Yugoslavia/SCnet
+share/apps/kppp/Provider/Yugoslavia/Sezampro
+share/apps/kppp/Provider/Yugoslavia/VeratNet
+share/apps/kppp/Provider/Yugoslavia/YUBCnet
 share/apps/kppp/Rules/Argentina/Argentina_0610.rst
 share/apps/kppp/Rules/Argentina/Argentina_Local.rst
 share/apps/kppp/Rules/Australia/Local.rst
@@ -185,12 +196,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
 share/apps/kppp/Rules/England/BritishTelecom_Local.rst
 share/apps/kppp/Rules/England/BritishTelecom_National.rst
 share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
+share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
 share/apps/kppp/Rules/France/France_Telecom_Local.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
 share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
 share/apps/kppp/Rules/France/France_Telecom_National.rst
 share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
 share/apps/kppp/Rules/Germany/Addcom.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst
 share/apps/kppp/Rules/Germany/CallOkaynet.rst
 share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
 share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
@@ -388,15 +402,18 @@ share/apps/ksirc/tester.pl
 share/config/ksircrc
 share/config/protocols/vnc.desktop
 share/doc/HTML/en/keystone/.anchors
+share/doc/HTML/en/keystone/common
 share/doc/HTML/en/keystone/index.docbook
 share/doc/HTML/en/keystone/index.html
 share/doc/HTML/en/keystone/introduction.html
 share/doc/HTML/en/kit/.anchors
+share/doc/HTML/en/kit/common
 share/doc/HTML/en/kit/index.docbook
 share/doc/HTML/en/kit/index.html
 share/doc/HTML/en/kit/introduction.html
 share/doc/HTML/en/kmail/.anchors
 share/doc/HTML/en/kmail/appearancetab.html
+share/doc/HTML/en/kmail/common
 share/doc/HTML/en/kmail/composertab.html
 share/doc/HTML/en/kmail/copyright.html
 share/doc/HTML/en/kmail/documentation.html
@@ -425,6 +442,7 @@ share/doc/HTML/en/kmail/thecomposerwindow.html
 share/doc/HTML/en/kmail/thecomposerwindow2.html
 share/doc/HTML/en/knode/.anchors
 share/doc/HTML/en/knode/commands.html
+share/doc/HTML/en/knode/common
 share/doc/HTML/en/knode/compilation.html
 share/doc/HTML/en/knode/configuration.html
 share/doc/HTML/en/knode/credits.html
@@ -473,6 +491,7 @@ share/doc/HTML/en/knode/update-installation.html
 share/doc/HTML/en/knode/usenet-slang.html
 share/doc/HTML/en/knode/using-knode.html
 share/doc/HTML/en/korn/.anchors
+share/doc/HTML/en/korn/common
 share/doc/HTML/en/korn/index.docbook
 share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/korn/introduction.html
@@ -486,6 +505,7 @@ share/doc/HTML/en/kppp/accounting.html
 share/doc/HTML/en/kppp/appendix.html
 share/doc/HTML/en/kppp/autoconfigurehostname.html
 share/doc/HTML/en/kppp/cb.html
+share/doc/HTML/en/kppp/common
 share/doc/HTML/en/kppp/compilationandinstallation.html
 share/doc/HTML/en/kppp/configuringanaccount.html
 share/doc/HTML/en/kppp/costsgraphs.fig
@@ -529,6 +549,7 @@ share/doc/HTML/en/ksirc/.anchors
 share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
 share/doc/HTML/en/ksirc/bots.html
 share/doc/HTML/en/ksirc/colournumbers.html
+share/doc/HTML/en/ksirc/common
 share/doc/HTML/en/ksirc/examplesfilters.html
 share/doc/HTML/en/ksirc/examplessetcolors.html
 share/doc/HTML/en/ksirc/filters.html
@@ -547,6 +568,7 @@ share/doc/HTML/en/ksirc/setvariables.html
 share/doc/HTML/en/ksirc/timers.html
 share/doc/HTML/en/ksirc/userhostrequests.html
 share/doc/HTML/en/ktalkd/.anchors
+share/doc/HTML/en/ktalkd/common
 share/doc/HTML/en/ktalkd/compilationandinstallation.html
 share/doc/HTML/en/ktalkd/copyright.html
 share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
@@ -632,6 +654,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Rules/Greece
 @dirrm share/apps/kppp/Rules/Germany
 @dirrm share/apps/kppp/Rules/France
+@dirrm share/apps/kppp/Rules/Estonia
 @dirrm share/apps/kppp/Rules/England
 @dirrm share/apps/kppp/Rules/Denmark
 @dirrm share/apps/kppp/Rules/Czechia
@@ -647,6 +670,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Rules/Australia
 @dirrm share/apps/kppp/Rules/Argentina
 @dirrm share/apps/kppp/Rules
+@dirrm share/apps/kppp/Provider/Yugoslavia
 @dirrm share/apps/kppp/Provider/United_Kingdom
 @dirrm share/apps/kppp/Provider/Taiwan
 @dirrm share/apps/kppp/Provider/Portugal
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 9b982fb0684c..a89cae3b2cfc 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
 USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 4ecdaf0a64ec..58298438be3f 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
+MD5 (kdeutils-2.0.1.tar.bz2) = f24d4c6d5d031f931163eca115e3b2a4
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index d881d463eef4..c2b264fe2f3c 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -106,6 +106,7 @@ 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
@@ -117,11 +118,21 @@ 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/index.cvlog
+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.docbook
 share/doc/HTML/en/kab/index.html
-share/doc/HTML/en/kab/temp.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-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
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -129,11 +140,14 @@ 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/commentsonspecificfunctions.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
@@ -160,16 +174,20 @@ share/doc/HTML/en/kcalc/trigonometricmode.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
 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
@@ -188,6 +206,7 @@ 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
@@ -206,6 +225,7 @@ 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.docbook
@@ -214,6 +234,7 @@ 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
@@ -231,6 +252,7 @@ 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/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -241,6 +263,7 @@ share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.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
@@ -257,6 +280,7 @@ 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.docbook
 share/doc/HTML/en/klpq/index.html
@@ -268,6 +292,7 @@ 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/knotes/common
 share/doc/HTML/en/knotes/compilation.html
 share/doc/HTML/en/knotes/configuration.html
 share/doc/HTML/en/knotes/credits.html
@@ -292,6 +317,7 @@ 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
@@ -314,6 +340,7 @@ 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.cvlog
@@ -402,17 +429,25 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @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
+@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
@@ -421,7 +456,8 @@ share/icons/locolor/32x32/apps/laptop_pcmcia.png
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
-@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
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index e8b482b98dff..fe065aaca901 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index e8b482b98dff..fe065aaca901 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kde4-baseapps/files/patch-TEPty.C b/x11/kde4-baseapps/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kde4-baseapps/files/patch-TEPty.C
+++ b/x11/kde4-baseapps/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kde4-baseapps/files/patch-konsole_grantpty.c b/x11/kde4-baseapps/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kde4-runtime/files/patch-TEPty.C b/x11/kde4-runtime/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kde4-runtime/files/patch-TEPty.C
+++ b/x11/kde4-runtime/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kde4-runtime/files/patch-konsole_grantpty.c b/x11/kde4-runtime/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kde4-workspace/files/patch-TEPty.C b/x11/kde4-workspace/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kde4-workspace/files/patch-TEPty.C
+++ b/x11/kde4-workspace/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kde4-workspace/files/patch-konsole_grantpty.c b/x11/kde4-workspace/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index e8b482b98dff..fe065aaca901 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kdebase2/files/patch-TEPty.C b/x11/kdebase2/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kdebase2/files/patch-TEPty.C
+++ b/x11/kdebase2/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kdebase2/files/patch-konsole_grantpty.c b/x11/kdebase2/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kdebase2/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kdebase2/pkg-plist
+++ b/x11/kdebase2/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kdebase3/files/patch-TEPty.C b/x11/kdebase3/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kdebase3/files/patch-TEPty.C
+++ b/x11/kdebase3/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kdebase3/files/patch-konsole_grantpty.c b/x11/kdebase3/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kdebase3/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kdebase4-runtime/files/patch-TEPty.C b/x11/kdebase4-runtime/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kdebase4-runtime/files/patch-TEPty.C
+++ b/x11/kdebase4-runtime/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kdebase4-runtime/files/patch-konsole_grantpty.c b/x11/kdebase4-runtime/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kdebase4-workspace/files/patch-TEPty.C b/x11/kdebase4-workspace/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kdebase4-workspace/files/patch-TEPty.C
+++ b/x11/kdebase4-workspace/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kdebase4-workspace/files/patch-konsole_grantpty.c b/x11/kdebase4-workspace/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 7cf853365999..bbaa70390213 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	2.0
+PORTVERSION= 	2.0.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 04441e904e97..80f0c4ce35f6 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269
+MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66
diff --git a/x11/kdebase4/files/patch-TEPty.C b/x11/kdebase4/files/patch-TEPty.C
index 9a5ece3b2ab3..9bfd5db25ccd 100644
--- a/x11/kdebase4/files/patch-TEPty.C
+++ b/x11/kdebase4/files/patch-TEPty.C
@@ -1,11 +1,88 @@
---- konsole/src/TEPty.C	Tue Oct  3 14:57:30 2000
-+++ konsole/src/TEPty.C.new	Thu Nov  2 17:51:30 2000
-@@ -225,7 +225,7 @@
+--- konsole/src/TEPty.C.orig	Fri Dec  8 11:51:24 2000
++++ konsole/src/TEPty.C	Fri Dec  8 11:52:51 2000
+@@ -180,27 +180,57 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
+-  pid_t pid = fork();
+-  if (pid < 0)
+-  {
+-    return 0;
+-  }
+-  if (pid == 0)
+-  {
+-    /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
+-    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
+-    QString path = locate("exe", BASE_CHOWN);
++  pid_t pid;
++  int pstat;
++  struct sigaction ign;
++  struct sigaction intact;	// interupt action
++  struct sigaction quitact;	// quit action
++  sigset_t newsigblock, oldsigblock;
++	QString path;
++
++  ign.sa_handler = SIG_IGN;
++  sigemptyset(&ign.sa_mask);
++  ign.sa_flags = 0;
++  sigaction(SIGINT, &ign, &intact);
++  sigaction(SIGQUIT, &ign, &quitact);
++  sigemptyset(&newsigblock);
++  sigaddset(&newsigblock, SIGCHLD);
++  sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
++
++  switch (pid = fork()) {
++  case -1:
++    return(0);
++		break;
++  case 0:			// child
++    if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0)
++      exit(1);
++    path = locate("exe", BASE_CHOWN);
++
++    sigaction(SIGINT, &intact, NULL);
++    sigaction(SIGQUIT, &quitact, NULL);
++    sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
+     execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
+-    exit(1); // should not be reached
+-  }
+-  if (pid > 0)
+-  { int w;
+-  retry:
+-    int rc = waitpid (pid, &w, 0);
+-    if ((rc == -1) && (errno == EINTR))
+-      goto retry;
+-    return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0);
++    exit(1);
++		break;
++  default:
++    do {
++      pid = waitpid(pid, &pstat, 0);
++    } while (pid == -1 && errno == EINTR);
++    break;
+   }
++  sigaction(SIGINT, &intact, NULL);
++  sigaction(SIGQUIT, &quitact, NULL);
++  sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
++
++  if (pid == -1) {
++    return 0;
++	}
++  else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) {
++    return 1;
++	}
++  else {
++    return 0;
++	}
+   return 0; //dummy.
+ }
+ 
+@@ -225,7 +255,7 @@
  #ifdef HAVE_UTEMPTER
    removeLineFromUtmp(ttynam, fd);
  #elif defined(USE_LOGIN)
 -  char *tty_name=ttyname(0);
 +  char *tty_name=ttyname(fd);
    if (tty_name)
-         logout(tty_name);
- #endif
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kdebase4/files/patch-konsole_grantpty.c b/x11/kdebase4/files/patch-konsole_grantpty.c
new file mode 100644
index 000000000000..889d15bdb592
--- /dev/null
+++ b/x11/kdebase4/files/patch-konsole_grantpty.c
@@ -0,0 +1,79 @@
+--- konsole/src/konsole_grantpty.c.orig	Sat Jun 12 07:13:31 1999
++++ konsole/src/konsole_grantpty.c	Fri Dec  8 11:54:43 2000
+@@ -31,13 +31,15 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <dirent.h>
++#include <paths.h>
+ 
+ #define PTY_FILENO 3    /* keep in sync with grantpty */
+ #define TTY_GROUP "tty"
+ 
+ int main (int argc, char *argv[])
+ {
+-  char*         pty;
++  char*         pty = NULL;
+   struct stat   st;
+   struct group* p;
+   gid_t         gid;
+@@ -81,6 +83,7 @@
+ 
+   /* get slave pty name from master pty file handle in PTY_FILENO *********/
+ 
++#if 0
+   /* Check that PTY_FILENO is a valid master pseudo terminal.  */
+   pty = ttyname(PTY_FILENO);          /* posix */
+   if (pty == NULL)
+@@ -89,6 +92,42 @@
+     return 1; /* FAIL */
+   }
+   close(PTY_FILENO);
++#else
++	/* The trouble with the ifdef'd-out portion above is that ttyname()
++	** does not work correctly when not passed a valid tty, but a pseudotty
++	** instead. All we're doing here is finding out what the name of
++	** the associated pty is without having to pass it in on the command line.
++	** Nothing complex.
++	*/
++	{
++		struct stat sb;
++		struct stat dsb;
++		struct dirent *dirp;
++		static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
++		DIR *dp;
++		
++		pty = NULL;
++		
++		if (fstat(PTY_FILENO, &sb))
++			return 1; /* FAIL */
++		if ((dp = opendir(_PATH_DEV)) == NULL)
++			return 1; /* FAIL */
++		
++		while ((dirp = readdir(dp))) {
++			if (dirp->d_fileno != sb.st_ino)
++				continue;
++			bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1);
++			/*fprintf(stderr, "looking at %s\n", buf);*/
++			if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino)
++				continue;
++			pty = buf;
++		}
++		closedir(dp);
++		if (pty == NULL)
++			return 1; /* FAIL */
++	}
++	/*fprintf(stderr, "successful at finding %s\n", pty);*/
++#endif
+ 
+   /* matches /dev/pty?? */
+   if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8))
+@@ -120,6 +159,8 @@
+     fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason");
+     return 1; /* FAIL */
+   }
++	
++	/*fprintf(stderr, "made it here\n");*/
+ 
+   return 0; /* OK */
+ }
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index a486bb396bae..7a8ef62507e2 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
+share/apps/kicker/icons/locolor/16x16/actions/modified.png
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/background.html
 share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/bell.html
-share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
 share/doc/HTML/en/kcontrol/control-center-exiting.html
 share/doc/HTML/en/kcontrol/control-center-menus.html
 share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html
 share/doc/HTML/en/kcontrol/energy.html
 share/doc/HTML/en/kcontrol/file-assoc.html
 share/doc/HTML/en/kcontrol/file-manager.html
+share/doc/HTML/en/kcontrol/kfileman1.png
+share/doc/HTML/en/kcontrol/kfileman2.png
 share/doc/HTML/en/kcontrol/fonts.html
 share/doc/HTML/en/kcontrol/help-index.html
 share/doc/HTML/en/kcontrol/icons.html
@@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html
 share/doc/HTML/en/kcontrol/windows-shares.html
 share/doc/HTML/en/kcontrol/xserver.html
 share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.docbook
 share/doc/HTML/en/kdebugdialog/index.html
 share/doc/HTML/en/kdebugdialog/introduction.html
 share/doc/HTML/en/kdesu/.anchors
 share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
 share/doc/HTML/en/kdesu/compiling.html
 share/doc/HTML/en/kdesu/configuration.html
 share/doc/HTML/en/kdesu/index.docbook
@@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html
 share/doc/HTML/en/kdesu/using-kdesu.html
 share/doc/HTML/en/kdm/.anchors
 share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/configuring-kdm.html
 share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
@@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html
 share/doc/HTML/en/kdm/locale.html
 share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
 share/doc/HTML/en/khelpcenter/contact-official.html
@@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html
 share/doc/HTML/en/khelpcenter/invoking-help.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/no-html.html
+share/doc/HTML/en/khelpcenter/faq/about.html
+share/doc/HTML/en/khelpcenter/faq/applications.html
+share/doc/HTML/en/khelpcenter/faq/common
+share/doc/HTML/en/khelpcenter/faq/configure.html
+share/doc/HTML/en/khelpcenter/faq/contribute.html
+share/doc/HTML/en/khelpcenter/faq/credits.html
+share/doc/HTML/en/khelpcenter/faq/desktop.html
+share/doc/HTML/en/khelpcenter/faq/filemanager.html
+share/doc/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/HTML/en/khelpcenter/faq/install.html
+share/doc/HTML/en/khelpcenter/faq/introduction.html
+share/doc/HTML/en/khelpcenter/faq/misc.html
+share/doc/HTML/en/khelpcenter/faq/more-info.html
+share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html
+share/doc/HTML/en/khelpcenter/faq/not-kde.html
+share/doc/HTML/en/khelpcenter/faq/panel.html
+share/doc/HTML/en/khelpcenter/faq/tips.html
+share/doc/HTML/en/khelpcenter/faq/windowmanager.html
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
 share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
 share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
 share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
@@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html
 share/doc/HTML/en/khelpcenter/userguide/adding-programs.html
 share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
 share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
 share/doc/HTML/en/khelpcenter/userguide/desktop-components.html
 share/doc/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html
+share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html
 share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
 share/doc/HTML/en/khelpcenter/userguide/first-impressions.html
 share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
 share/doc/HTML/en/khelpcenter/userguide/getting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html
+share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.html
 share/doc/HTML/en/khelpcenter/userguide/installation.html
@@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
 share/doc/HTML/en/khelpcenter/userguide/more-help.html
 share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html
 share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html
-share/doc/HTML/en/khelpcenter/userguide/networkapplications.html
+share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html
+share/doc/HTML/en/khelpcenter/userguide/network-applications.html
 share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html
 share/doc/HTML/en/khelpcenter/userguide/shortcuts.html
 share/doc/HTML/en/khelpcenter/userguide/source-distribution.html
@@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html
 share/doc/HTML/en/khelpcenter/userguide/utility-applications.html
 share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html
 share/doc/HTML/en/khelpcenter/visualdict/.anchors
+share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/credits.html
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/HTML/en/khelpcenter/visualdict/index.html
@@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors
 share/doc/HTML/en/kicker/access_config.png
 share/doc/HTML/en/kicker/basic_icons.png
 share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
 share/doc/HTML/en/kicker/config_window.png
 share/doc/HTML/en/kicker/configuration-adding-icons.html
 share/doc/HTML/en/kicker/configuration-config-window.html
@@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png
 share/doc/HTML/en/kicker/using-kicker.html
 share/doc/HTML/en/klipper/.anchors
 share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
 share/doc/HTML/en/klipper/compilation.html
 share/doc/HTML/en/klipper/configuration.html
 share/doc/HTML/en/klipper/credits.html
@@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html
 share/doc/HTML/en/klipper/screenshot.png
 share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
 share/doc/HTML/en/kmenuedit/credits.html
 share/doc/HTML/en/kmenuedit/details-advanced.html
 share/doc/HTML/en/kmenuedit/glossary.html
@@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html
 share/doc/HTML/en/kmenuedit/menu-reference.html
 share/doc/HTML/en/kmenuedit/using-kmenuedit.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/autocomplete.html
 share/doc/HTML/en/konqueror/basics.html
 share/doc/HTML/en/konqueror/bookmarks.html
 share/doc/HTML/en/konqueror/browser.html
 share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/common
 share/doc/HTML/en/konqueror/cmndline.png
 share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
 share/doc/HTML/en/konqueror/config-prox.html
 share/doc/HTML/en/konqueror/config.html
 share/doc/HTML/en/konqueror/configure-bars.html
+share/doc/HTML/en/konqueror/cook.html
 share/doc/HTML/en/konqueror/credits.html
+share/doc/HTML/en/konqueror/crypto.html
 share/doc/HTML/en/konqueror/deleting.html
 share/doc/HTML/en/konqueror/dirtree.png
 share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/faq.html
 share/doc/HTML/en/konqueror/fileassoc.html
 share/doc/HTML/en/konqueror/filemanager.html
 share/doc/HTML/en/konqueror/filetype1.png
@@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/kfind.png
-share/doc/HTML/en/konqueror/konqdoc5.png
-share/doc/HTML/en/konqueror/konqdoc9.png
 share/doc/HTML/en/konqueror/konqorg.png
 share/doc/HTML/en/konqueror/lmbmmb.html
 share/doc/HTML/en/konqueror/making.html
@@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html
 share/doc/HTML/en/konqueror/samba.html
 share/doc/HTML/en/konqueror/samba.png
 share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/saveset.html
 share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/credits.html
 share/doc/HTML/en/konsole/history-option.html
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/index.html
 share/doc/HTML/en/konsole/installation.html
 share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole.png
 share/doc/HTML/en/konsole/konsole1.gif
 share/doc/HTML/en/konsole/konsole2.gif
 share/doc/HTML/en/konsole/menubar.html
@@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html
 share/doc/HTML/en/konsole/vt100.gif
 share/doc/HTML/en/kpager/.anchors
 share/doc/HTML/en/kpager/commands.html
+share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/compilation.html
 share/doc/HTML/en/kpager/credits.html
 share/doc/HTML/en/kpager/faq.html
@@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
 share/doc/HTML/en/kpager/using-kapp.html
 share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/compilationandinstallation.html
 share/doc/HTML/en/ksysguard/credits-and-licenses.html
 share/doc/HTML/en/ksysguard/index.docbook
@@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html
 share/doc/HTML/en/ksysguard/usingtheksysguard.html
 share/doc/HTML/en/kwrite/.anchors
 share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/credits.html
 share/doc/HTML/en/kwrite/edit.html
 share/doc/HTML/en/kwrite/go.html
@@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html
 share/doc/HTML/en/kwrite/introduction.html
 share/doc/HTML/en/kwrite/keybindings.html
 share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/other-preferences.html
 share/doc/HTML/en/kwrite/pref-dialog.html
 share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
 share/doc/HTML/en/kwrite/pref-indent.html
 share/doc/HTML/en/kwrite/pref-select.html
 share/doc/HTML/en/kwrite/prefspellchecker.html
@@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/ksysguard/icons/locolor/16x16/apps
 @dirrm share/apps/ksysguard/icons/locolor/16x16
 @dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash
@@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/locolor/16x16/actions
+@dirrm share/apps/konqueror/icons/locolor/16x16
+@dirrm share/apps/konqueror/icons/locolor
 @dirrm share/apps/konqueror/icons/hicolor/32x32/actions
+@dirrm share/apps/konqueror/icons/hicolor/32x32
 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions
+@dirrm share/apps/konqueror/icons/hicolor/22x22
+@dirrm share/apps/konqueror/icons/hicolor
+@dirrm share/apps/konqueror/icons
 @dirrm share/apps/konqueror/dirtree/remote/web
 @dirrm share/apps/konqueror/dirtree/remote/ftp
 @dirrm share/apps/konqueror/dirtree/remote
@@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
 @dirrm share/apps/kmenuedit/icons/hicolor/22x22
 @dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
-@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/icons/locolor/16x16/actions
+@dirrm share/apps/kicker/icons/locolor/16x16
+@dirrm share/apps/kicker/icons/locolor
+@dirrm share/apps/kicker/icons
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
 @dirrm share/apps/khelpcenter/pics
 @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps
+@dirrm share/apps/khelpcenter/icons/locolor/16x16
+@dirrm share/apps/khelpcenter/icons/locolor
+@dirrm share/apps/khelpcenter/icons
 @dirrm share/apps/khelpcenter/en
 @dirrm share/apps/khelpcenter
 @dirrm share/apps/kdm/pics/users
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 90ad5e7fb65d..2c79caa3c9a1 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
@@ -28,8 +26,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index c7a142afe021..763aa8c1e749 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d
+MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c
diff --git a/x11/kdelibs2/files/patch-global.cpp b/x11/kdelibs2/files/patch-global.cpp
index 80b4cb467a6d..13636e36b43a 100644
--- a/x11/kdelibs2/files/patch-global.cpp
+++ b/x11/kdelibs2/files/patch-global.cpp
@@ -1,5 +1,5 @@
---- kio/global.cpp.orig	Mon Sep 18 07:24:44 2000
-+++ kio/global.cpp	Thu Nov  2 11:37:24 2000
+--- kio/global.cpp.orig	Thu Dec  7 14:52:15 2000
++++ kio/global.cpp	Thu Dec  7 14:52:29 2000
 @@ -28,6 +28,12 @@
  #include <string.h>
  #include <unistd.h>
@@ -52,4 +52,3 @@
      return result;
  }
  
-
diff --git a/x11/kdelibs2/files/patch-kcharsets.cpp b/x11/kdelibs2/files/patch-kcharsets.cpp
deleted file mode 100644
index 9d31d51c46fd..000000000000
--- a/x11/kdelibs2/files/patch-kcharsets.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- kdecore/kcharsets.cpp.orig	Mon Oct 16 19:06:25 2000
-+++ kdecore/kcharsets.cpp	Wed Nov 22 14:30:14 2000
-@@ -66,7 +66,7 @@
-     "set-gbk",
-     "set-zh",
-     "set-zh-tw",
--    "set-big5",
-+    "big5",
-     "tscii",
-     "utf-8",
-     "utf-16",
-@@ -101,7 +101,7 @@
-     "tis620.2533-1",
-     "gb2312.1980-0",
-     "gb2312.1980-0",
--	"big5-0",
-+    "cns11643.1986-*",
-     "big5-0",
-     "tscii-0",
-     "utf8",
-@@ -136,8 +136,8 @@
-     QFont::Set_Th_TH,
-     QFont::Set_GBK,
-     QFont::Set_Zh,
--    QFont::Set_Big5,
-     QFont::Set_Zh_TW,
-+    QFont::Set_Big5,
-     QFont::TSCII,
-     QFont::Unicode,
-     QFont::Unicode,
-@@ -552,6 +552,7 @@
- 	case QFont::Set_Zh:
- 	    return "set-gbk";
-     case QFont::Set_Zh_TW:
-+	return "cns11643.1986-*";
-     case QFont::Set_Big5:
- 	return "big5-0";
-     case QFont::AnyCharSet:
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index 92e2cb1e4a75..23caf2feb129 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -160,6 +160,7 @@ include/kdesu/defaults.h
 include/kdesu/kcookie.h
 include/kdesu/kdesu_pty.h
 include/kdesu/process.h
+include/kdesu/pty.h
 include/kdesu/ssh.h
 include/kdesu/stub.h
 include/kdesu/su.h
@@ -383,20 +384,6 @@ include/progressbase.h
 include/qconfigDB.h
 include/qxembed.h
 include/statusbarprogress.h
-lib/Arts/Synth_ADD.mcopclass
-lib/Arts/Synth_AMAN_PLAY.mcopclass
-lib/Arts/Synth_AMAN_RECORD.mcopclass
-lib/Arts/Synth_BUS_DOWNLINK.mcopclass
-lib/Arts/Synth_BUS_UPLINK.mcopclass
-lib/Arts/Synth_FREQUENCY.mcopclass
-lib/Arts/Synth_MUL.mcopclass
-lib/Arts/Synth_MULTI_ADD.mcopclass
-lib/Arts/Synth_PLAY.mcopclass
-lib/Arts/Synth_PLAY_WAV.mcopclass
-lib/Arts/Synth_RECORD.mcopclass
-lib/Arts/Synth_WAVE_SIN.mcopclass
-lib/Arts/WavPlayObject.mcopclass
-lib/Arts/X11GlobalComm.mcopclass
 lib/b3style.la
 lib/b3style.so
 lib/basicstyle.la
@@ -480,7 +467,6 @@ lib/libkdeui.so.4
 lib/libkfile.la
 lib/libkfile.so
 lib/libkfile.so.4
-lib/libkformula.so
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
@@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0
 lib/libx11globalcomm.la
 lib/libx11globalcomm.so
 lib/libx11globalcomm.so.0
+lib/mcop/Arts/Synth_ADD.mcopclass
+lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
+lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
+lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
+lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
+lib/mcop/Arts/Synth_FREQUENCY.mcopclass
+lib/mcop/Arts/Synth_MUL.mcopclass
+lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
+lib/mcop/Arts/Synth_PLAY.mcopclass
+lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
+lib/mcop/Arts/Synth_RECORD.mcopclass
+lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
+lib/mcop/Arts/WavPlayObject.mcopclass
+lib/mcop/Arts/X11GlobalComm.mcopclass
 share/apps/LICENSES/ARTISTIC
 share/apps/LICENSES/BSD
 share/apps/LICENSES/GPL_V2
@@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png
 share/doc/HTML/en/common/x11-licence.html
 share/doc/HTML/en/common/xml.dcl
 share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/configuration-dialog-.html
 share/doc/HTML/en/kspell/contact-information.html
 share/doc/HTML/en/kspell/encodings.html
@@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
 share/servicetypes/ktexteditor.desktop
 share/servicetypes/kurifilterplugin.desktop
+@dirrm share/doc/HTML/en/kspell
 @dirrm share/apps/kstyle/themes
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
@@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop
 @dirrm share/apps/ksgmltools/ca/entities
 @dirrm share/apps/ksgmltools/ca
 @dirrm share/apps/ksgmltools
+@dirrm share/apps/kssl
 @dirrm share/apps/kjava
 @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/locolor/16x16
+@dirrm share/apps/kio_uiserver/icons/locolor
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
 @dirrm share/apps/khtml/icons/locolor/16x16/actions
+@dirrm share/apps/khtml/icons/locolor/16x16
+@dirrm share/apps/khtml/icons/locolor
 @dirrm share/apps/khtml/icons/hicolor/32x32/actions
+@dirrm share/apps/khtml/icons/hicolor/32x32
 @dirrm share/apps/khtml/icons/hicolor/22x22/actions
+@dirrm share/apps/khtml/icons/hicolor/22x22
+@dirrm share/apps/khtml/icons/hicolor
+@dirrm share/apps/khtml/icons
 @dirrm share/apps/khtml/css
 @dirrm share/apps/khtml
 @dirrm share/apps/kdeui/pics
 @dirrm share/apps/kdeui
 @dirrm share/apps/kab
 @dirrm share/apps/LICENSES
-@dirrm lib/Arts
+@dirrm lib/mcop/Arts
+@dirrm lib/mcop
 @dirrm include/libkmid
 @dirrm include/kparts
 @dirrm include/kjs
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 90ad5e7fb65d..2c79caa3c9a1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
@@ -28,8 +26,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index c7a142afe021..763aa8c1e749 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d
+MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 92e2cb1e4a75..23caf2feb129 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -160,6 +160,7 @@ include/kdesu/defaults.h
 include/kdesu/kcookie.h
 include/kdesu/kdesu_pty.h
 include/kdesu/process.h
+include/kdesu/pty.h
 include/kdesu/ssh.h
 include/kdesu/stub.h
 include/kdesu/su.h
@@ -383,20 +384,6 @@ include/progressbase.h
 include/qconfigDB.h
 include/qxembed.h
 include/statusbarprogress.h
-lib/Arts/Synth_ADD.mcopclass
-lib/Arts/Synth_AMAN_PLAY.mcopclass
-lib/Arts/Synth_AMAN_RECORD.mcopclass
-lib/Arts/Synth_BUS_DOWNLINK.mcopclass
-lib/Arts/Synth_BUS_UPLINK.mcopclass
-lib/Arts/Synth_FREQUENCY.mcopclass
-lib/Arts/Synth_MUL.mcopclass
-lib/Arts/Synth_MULTI_ADD.mcopclass
-lib/Arts/Synth_PLAY.mcopclass
-lib/Arts/Synth_PLAY_WAV.mcopclass
-lib/Arts/Synth_RECORD.mcopclass
-lib/Arts/Synth_WAVE_SIN.mcopclass
-lib/Arts/WavPlayObject.mcopclass
-lib/Arts/X11GlobalComm.mcopclass
 lib/b3style.la
 lib/b3style.so
 lib/basicstyle.la
@@ -480,7 +467,6 @@ lib/libkdeui.so.4
 lib/libkfile.la
 lib/libkfile.so
 lib/libkfile.so.4
-lib/libkformula.so
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
@@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0
 lib/libx11globalcomm.la
 lib/libx11globalcomm.so
 lib/libx11globalcomm.so.0
+lib/mcop/Arts/Synth_ADD.mcopclass
+lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
+lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
+lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
+lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
+lib/mcop/Arts/Synth_FREQUENCY.mcopclass
+lib/mcop/Arts/Synth_MUL.mcopclass
+lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
+lib/mcop/Arts/Synth_PLAY.mcopclass
+lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
+lib/mcop/Arts/Synth_RECORD.mcopclass
+lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
+lib/mcop/Arts/WavPlayObject.mcopclass
+lib/mcop/Arts/X11GlobalComm.mcopclass
 share/apps/LICENSES/ARTISTIC
 share/apps/LICENSES/BSD
 share/apps/LICENSES/GPL_V2
@@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png
 share/doc/HTML/en/common/x11-licence.html
 share/doc/HTML/en/common/xml.dcl
 share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/configuration-dialog-.html
 share/doc/HTML/en/kspell/contact-information.html
 share/doc/HTML/en/kspell/encodings.html
@@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
 share/servicetypes/ktexteditor.desktop
 share/servicetypes/kurifilterplugin.desktop
+@dirrm share/doc/HTML/en/kspell
 @dirrm share/apps/kstyle/themes
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
@@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop
 @dirrm share/apps/ksgmltools/ca/entities
 @dirrm share/apps/ksgmltools/ca
 @dirrm share/apps/ksgmltools
+@dirrm share/apps/kssl
 @dirrm share/apps/kjava
 @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/locolor/16x16
+@dirrm share/apps/kio_uiserver/icons/locolor
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
 @dirrm share/apps/khtml/icons/locolor/16x16/actions
+@dirrm share/apps/khtml/icons/locolor/16x16
+@dirrm share/apps/khtml/icons/locolor
 @dirrm share/apps/khtml/icons/hicolor/32x32/actions
+@dirrm share/apps/khtml/icons/hicolor/32x32
 @dirrm share/apps/khtml/icons/hicolor/22x22/actions
+@dirrm share/apps/khtml/icons/hicolor/22x22
+@dirrm share/apps/khtml/icons/hicolor
+@dirrm share/apps/khtml/icons
 @dirrm share/apps/khtml/css
 @dirrm share/apps/khtml
 @dirrm share/apps/kdeui/pics
 @dirrm share/apps/kdeui
 @dirrm share/apps/kab
 @dirrm share/apps/LICENSES
-@dirrm lib/Arts
+@dirrm lib/mcop/Arts
+@dirrm lib/mcop
 @dirrm include/libkmid
 @dirrm include/kparts
 @dirrm include/kjs
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 90ad5e7fb65d..2c79caa3c9a1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
@@ -28,8 +26,7 @@ USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index c7a142afe021..763aa8c1e749 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d
+MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 92e2cb1e4a75..23caf2feb129 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -160,6 +160,7 @@ include/kdesu/defaults.h
 include/kdesu/kcookie.h
 include/kdesu/kdesu_pty.h
 include/kdesu/process.h
+include/kdesu/pty.h
 include/kdesu/ssh.h
 include/kdesu/stub.h
 include/kdesu/su.h
@@ -383,20 +384,6 @@ include/progressbase.h
 include/qconfigDB.h
 include/qxembed.h
 include/statusbarprogress.h
-lib/Arts/Synth_ADD.mcopclass
-lib/Arts/Synth_AMAN_PLAY.mcopclass
-lib/Arts/Synth_AMAN_RECORD.mcopclass
-lib/Arts/Synth_BUS_DOWNLINK.mcopclass
-lib/Arts/Synth_BUS_UPLINK.mcopclass
-lib/Arts/Synth_FREQUENCY.mcopclass
-lib/Arts/Synth_MUL.mcopclass
-lib/Arts/Synth_MULTI_ADD.mcopclass
-lib/Arts/Synth_PLAY.mcopclass
-lib/Arts/Synth_PLAY_WAV.mcopclass
-lib/Arts/Synth_RECORD.mcopclass
-lib/Arts/Synth_WAVE_SIN.mcopclass
-lib/Arts/WavPlayObject.mcopclass
-lib/Arts/X11GlobalComm.mcopclass
 lib/b3style.la
 lib/b3style.so
 lib/basicstyle.la
@@ -480,7 +467,6 @@ lib/libkdeui.so.4
 lib/libkfile.la
 lib/libkfile.so
 lib/libkfile.so.4
-lib/libkformula.so
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
@@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0
 lib/libx11globalcomm.la
 lib/libx11globalcomm.so
 lib/libx11globalcomm.so.0
+lib/mcop/Arts/Synth_ADD.mcopclass
+lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
+lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
+lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
+lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
+lib/mcop/Arts/Synth_FREQUENCY.mcopclass
+lib/mcop/Arts/Synth_MUL.mcopclass
+lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
+lib/mcop/Arts/Synth_PLAY.mcopclass
+lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
+lib/mcop/Arts/Synth_RECORD.mcopclass
+lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
+lib/mcop/Arts/WavPlayObject.mcopclass
+lib/mcop/Arts/X11GlobalComm.mcopclass
 share/apps/LICENSES/ARTISTIC
 share/apps/LICENSES/BSD
 share/apps/LICENSES/GPL_V2
@@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png
 share/doc/HTML/en/common/x11-licence.html
 share/doc/HTML/en/common/xml.dcl
 share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/configuration-dialog-.html
 share/doc/HTML/en/kspell/contact-information.html
 share/doc/HTML/en/kspell/encodings.html
@@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
 share/servicetypes/ktexteditor.desktop
 share/servicetypes/kurifilterplugin.desktop
+@dirrm share/doc/HTML/en/kspell
 @dirrm share/apps/kstyle/themes
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
@@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop
 @dirrm share/apps/ksgmltools/ca/entities
 @dirrm share/apps/ksgmltools/ca
 @dirrm share/apps/ksgmltools
+@dirrm share/apps/kssl
 @dirrm share/apps/kjava
 @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/locolor/16x16
+@dirrm share/apps/kio_uiserver/icons/locolor
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
 @dirrm share/apps/khtml/icons/locolor/16x16/actions
+@dirrm share/apps/khtml/icons/locolor/16x16
+@dirrm share/apps/khtml/icons/locolor
 @dirrm share/apps/khtml/icons/hicolor/32x32/actions
+@dirrm share/apps/khtml/icons/hicolor/32x32
 @dirrm share/apps/khtml/icons/hicolor/22x22/actions
+@dirrm share/apps/khtml/icons/hicolor/22x22
+@dirrm share/apps/khtml/icons/hicolor
+@dirrm share/apps/khtml/icons
 @dirrm share/apps/khtml/css
 @dirrm share/apps/khtml
 @dirrm share/apps/kdeui/pics
 @dirrm share/apps/kdeui
 @dirrm share/apps/kab
 @dirrm share/apps/LICENSES
-@dirrm lib/Arts
+@dirrm lib/mcop/Arts
+@dirrm lib/mcop
 @dirrm include/libkmid
 @dirrm include/kparts
 @dirrm include/kjs