3 files changed, 414 insertions, 429 deletions

diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index f575bfd10732..c051b9e6c099 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,15 +3,15 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1997/11/03 21:55:35 se Exp $
+# $Id: Makefile,v 1.4 1997/11/05 04:19:59 asami Exp $
 #
 
-DISTNAME=	kdebase-Beta1-3
-PKGNAME=	kdebase-1.3b
+DISTNAME=	kdebase-Beta2-1
+PKGNAME=	kdebase-2.1b
 CATEGORIES=	x11 kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
@@ -28,9 +28,11 @@ LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
-		"--prefix=$(PREFIX)"
+#CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)/kde" \
+		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
+		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
 WRKSRC=		${WRKDIR}/kdebase
 
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 9328b48f4b29..0a5b3970998e 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1 +1 @@
-MD5 (kdebase-Beta1-3.src.tgz) = cf9b3e0c1279ff35da35caca5e7f9822
+MD5 (kdebase-Beta2-1.src.tgz) = a9649a5cfeef49f69fbd70fe7af644ed
diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist
index 618ad8f65a9c..1c489281e030 100644
--- a/x11/kdebase2/pkg-plist
+++ b/x11/kdebase2/pkg-plist
@@ -1,120 +1,50 @@
-lib/libkdecore.so.0.11
-lib/libkdecore.la
-lib/libkdeui.so.0.10
-lib/libkdeui.la
-lib/libjscript.so.0.1
-lib/libjscript.la
-lib/libkhtmlw.so.0.11
-lib/libkhtmlw.la
-lib/libkfm.so.0.1
-lib/libkfm.la
-lib/libmediatool.so.0.6
-lib/libmediatool.la
-lib/kcc/modules/libsample.la
-lib/kcc/modules/libsample.a
-lib/kcc/modules/libscreensaver.la
-lib/kcc/modules/libscreensaver.a
-lib/kcc/modules/libbell.la
-lib/kcc/modules/libbell.a
-lib/kcc/modules/libcolors.la
-lib/kcc/modules/libcolors.a
-lib/kcc/modules/libkeyboard.la
-lib/kcc/modules/libkeyboard.a
-lib/kcc/modules/libmemory.la
-lib/kcc/modules/libmemory.a
-lib/kcc/modules/libmouse.la
-lib/kcc/modules/libmouse.a
-lib/kcc/modules/libprocessor.la
-lib/kcc/modules/libprocessor.a
-lib/kcc/modules/libsmbstatus.la
-lib/kcc/modules/libsmbstatus.a
-lib/kcc/modules/libstyle.la
-lib/kcc/modules/libstyle.a
-lib/kcc/modules/libtitlebar.la
-lib/kcc/modules/libtitlebar.a
-lib/kcc/modules/libwindows.la
-lib/kcc/modules/libwindows.a
-lib/kcc/modules/libbackground.la
-lib/kcc/modules/libbackground.a
-include/kconfig.h
-include/kconfigdata.h
-include/ksimpleconfig.h
-include/kconfigbase.h
-include/kcolorgroup.h
-include/kapp.h
-include/kurl.h
-include/ksock.h
-include/drag.h
-include/kkeyconf.h
-include/kkeydata.h
-include/ckey.h
-include/kmisc.h
-include/kprocess.h
-include/kprocctrl.h
-include/klocale.h
-include/kiconloader.h
-include/kdebug.h
-include/kstdaccel.h
-include/kwm.h
-include/krootprop.h
-include/kledlamp.h
-include/kprogress.h
-include/kpanner.h
-include/html.h
-include/kcolordlg.h
-include/kselect.h
-include/dither.h
-include/kdatepik.h
-include/kdatetbl.h
-include/kfontdialog.h
-include/kmsgbox.h
-include/kpopmenu.h
-include/ktabctl.h
-include/ktreelist.h
-include/kstatusbar.h
-include/ktopwidget.h
-include/ktoolbar.h
-include/kmenubar.h
-include/kbutton.h
-include/kslider.h
-include/kseparator.h
-include/klined.h
-include/kcombo.h
-include/krestrictedline.h
-include/kintegerline.h
-include/kspinbox.h
-include/kcolorbtn.h
-include/kwmmapp.h
-include/kiconloaderdialog.h
-include/kbuttonbox.h
-include/kconfigmodule.h
-include/ktablistbox.h
-include/knewpanner.h
-include/bison2cpp.h
-include/jstree.h
-include/jsexec.h
-include/jserror.h
-include/builtin.h
-include/jscript.h
-include/htmlobj.h
-include/htmlfont.h
-include/formats.h
-include/htmlform.h
-include/ampseq.h
-include/htmltoken.h
-include/htmlframe.h
-include/htmlview.h
-include/htmlclue.h
-include/kfm.h
-include/kfmclient_ipc.h
-include/kfmipc.h
-include/mediatool.h
-include/kaudio.h
-share/apps/kde/pics/error.xpm
-share/apps/kde/pics/exclamation.xpm
-share/apps/kde/pics/info.xpm
-share/apps/kde/pics/stopsign.xpm
-share/apps/khtmlw/pics/khtmlw_dnd.xpm
+bin/kfmwarn
+bin/kfmclient
+bin/kioslave
+bin/kfmexec
+bin/kfm
+bin/kfmsu
+bin/kfmsu2
+bin/startkde
+bin/kdehelp
+bin/kfontmanager
+bin/kfind
+bin/kvt
+bin/kwm
+bin/kpanel
+bin/kwmcom
+bin/kwmpager
+bin/kbgndwm
+bin/krootwm
+bin/kdm
+bin/kdmdesktop
+bin/kpolygon.kss
+bin/kswarm.kss
+bin/klissie.kss
+bin/kbanner.kss
+bin/klines.kss
+bin/kblankscrn.kss
+bin/krock.kss
+bin/kflame.kss
+bin/klaser.kss
+bin/kpyro.kss
+bin/khop.kss
+bin/kbat.kss
+bin/kslip.kss
+bin/kforest.kss
+bin/klock
+bin/kblob.kss
+bin/kmenuedit
+bin/maudio
+bin/kaudioserver
+bin/kcmsample
+bin/kcmsamba
+bin/kcmbell
+bin/kcmdisplay
+bin/kcminput
+bin/kcmkwm
+bin/kcminfo
+bin/kcontrol
 share/apps/kfm/pics/kmultiple.xpm
 share/apps/kfm/pics/info.xpm
 share/apps/kfm/pics/exclamation.xpm
@@ -150,246 +80,24 @@ share/apps/kwm/pics/iconify.xpm
 share/apps/kwm/pics/pindown.xpm
 share/apps/kwm/pics/pinup.xpm
 share/apps/kwm/pics/unknown.xpm
-share/apps/kpanel/pics/exec.xpm
+share/apps/kpanel/pics/mini/go.xpm
+share/apps/kpanel/pics/mini/window_list.xpm
 share/apps/kpanel/pics/exit.xpm
+share/apps/kpanel/pics/go.xpm
 share/apps/kpanel/pics/key.xpm
-share/apps/kpanel/pics/kfm_home.xpm
-share/apps/kpanel/pics/kpanel.xpm
-share/apps/kpanel/pics/system.xpm
 share/apps/kpanel/pics/window_list.xpm
 share/apps/kdm/pics/users/default.xpm
 share/apps/kdm/pics/users/root.xpm
 share/apps/kdm/pics/kdelogo.xpm
-share/apps/kcc/pics/mini-penguin.xpm
-share/apps/kcc/pics/mini-monitor.xpm
-share/apps/kcc/pics/mini-bell.xpm
-share/apps/kcc/pics/mini-palette.xpm
-share/apps/kcc/pics/mini-keyboard.xpm
-share/apps/kcc/pics/mini-chip.xpm
-share/apps/kcc/pics/mini-mouse.xpm
-share/apps/kcc/pics/mini-cpu.xpm
-share/apps/kcc/pics/mini-desktop.xpm
-share/apps/kcc/pics/mini-titlebar.xpm
-share/apps/kcc/pics/mini-windows.xpm
-share/apps/kcc/pics/mini-icons.xpm
-share/apps/kcc/pics/monitor.xpm
-share/apps/kcc/pics/exit.xpm
-share/apps/kcc/pics/kdekcc.xpm
-share/apps/kcc/pics/mini-folder.xpm
-share/apps/kcc/pics/mini-stop.xpm
-share/locale/de/LC_MESSAGES/kde.mo
-share/locale/de/LC_MESSAGES/kfind.mo
-share/locale/de/LC_MESSAGES/kdehelp.mo
-share/locale/de/LC_MESSAGES/kdisplay.mo
-share/locale/de/LC_MESSAGES/kvt.mo
-share/locale/de/LC_MESSAGES/kfm.mo
-share/locale/de/LC_MESSAGES/kwm.mo
-share/locale/de/LC_MESSAGES/kfontmanager.mo
-share/locale/de/LC_MESSAGES/kdm.mo
-share/locale/de/LC_MESSAGES/kpanel.mo
-share/locale/de/LC_MESSAGES/klock.mo
-share/locale/fr/LC_MESSAGES/kde.mo
-share/locale/fr/LC_MESSAGES/kfind.mo
-share/locale/fr/LC_MESSAGES/kdehelp.mo
-share/locale/fr/LC_MESSAGES/kdisplay.mo
-share/locale/fr/LC_MESSAGES/kdm.mo
-share/locale/fr/LC_MESSAGES/kfm.mo
-share/locale/fr/LC_MESSAGES/kfontmanager.mo
-share/locale/fr/LC_MESSAGES/klock.mo
-share/locale/fr/LC_MESSAGES/kpanel.mo
-share/locale/fr/LC_MESSAGES/kvt.mo
-share/locale/fr/LC_MESSAGES/kwm.mo
-share/locale/sv/LC_MESSAGES/kde.mo
-share/locale/sv/LC_MESSAGES/kfind.mo
-share/locale/sv/LC_MESSAGES/kdehelp.mo
-share/locale/sv/LC_MESSAGES/kdisplay.mo
-share/locale/sv/LC_MESSAGES/kvt.mo
-share/locale/sv/LC_MESSAGES/kfm.mo
-share/locale/sv/LC_MESSAGES/kwm.mo
-share/locale/sv/LC_MESSAGES/kfontmanager.mo
-share/locale/cs/LC_MESSAGES/kde.mo
-share/locale/cs/LC_MESSAGES/kfind.mo
-share/locale/cs/LC_MESSAGES/kdehelp.mo
-share/locale/cs/LC_MESSAGES/kdisplay.mo
-share/locale/cs/LC_MESSAGES/kvt.mo
-share/locale/cs/LC_MESSAGES/kwm.mo
-share/locale/cs/LC_MESSAGES/kfontmanager.mo
-share/locale/cs/LC_MESSAGES/kdm.mo
-share/locale/cs/LC_MESSAGES/kpanel.mo
-share/locale/cs/LC_MESSAGES/kfm.mo
-share/locale/cs/LC_MESSAGES/klock.mo
-share/locale/es/LC_MESSAGES/kde.mo
-share/locale/es/LC_MESSAGES/kfind.mo
-share/locale/es/LC_MESSAGES/kdehelp.mo
-share/locale/es/LC_MESSAGES/kdisplay.mo
-share/locale/es/LC_MESSAGES/kvt.mo
-share/locale/es/LC_MESSAGES/kfm.mo
-share/locale/es/LC_MESSAGES/kwm.mo
-share/locale/es/LC_MESSAGES/kfontmanager.mo
-share/locale/es/LC_MESSAGES/kdm.mo
-share/locale/es/LC_MESSAGES/klock.mo
-share/locale/es/LC_MESSAGES/kpanel.mo
-share/locale/ru/LC_MESSAGES/kde.mo
-share/locale/ru/LC_MESSAGES/kfind.mo
-share/locale/ru/LC_MESSAGES/kdehelp.mo
-share/locale/ru/LC_MESSAGES/kdisplay.mo
-share/locale/ru/LC_MESSAGES/kvt.mo
-share/locale/ru/LC_MESSAGES/kwm.mo
-share/locale/ru/LC_MESSAGES/kfontmanager.mo
-share/locale/hu/LC_MESSAGES/kde.mo
-share/locale/hu/LC_MESSAGES/kdehelp.mo
-share/locale/hu/LC_MESSAGES/kfm.mo
-share/locale/hu/LC_MESSAGES/kdm.mo
-share/locale/hu/LC_MESSAGES/kpanel.mo
-share/locale/da/LC_MESSAGES/kde.mo
-share/locale/da/LC_MESSAGES/kdm.mo
-share/locale/it/LC_MESSAGES/kde.mo
-share/locale/it/LC_MESSAGES/kfm.mo
-share/locale/it/LC_MESSAGES/kdisplay.mo
-share/locale/it/LC_MESSAGES/kwm.mo
-share/locale/it/LC_MESSAGES/kfind.mo
-share/locale/it/LC_MESSAGES/kdehelp.mo
-share/locale/it/LC_MESSAGES/kdm.mo
-share/locale/it/LC_MESSAGES/kfontmanager.mo
-share/locale/it/LC_MESSAGES/kpanel.mo
-share/locale/it/LC_MESSAGES/kvt.mo
-share/locale/nl/LC_MESSAGES/kde.mo
-share/locale/nl/LC_MESSAGES/kfind.mo
-share/locale/nl/LC_MESSAGES/kdehelp.mo
-share/locale/nl/LC_MESSAGES/kdisplay.mo
-share/locale/nl/LC_MESSAGES/kvt.mo
-share/locale/nl/LC_MESSAGES/kfm.mo
-share/locale/nl/LC_MESSAGES/kwm.mo
-share/locale/nl/LC_MESSAGES/kfontmanager.mo
-share/locale/pt/LC_MESSAGES/kde.mo
-share/locale/pt/LC_MESSAGES/kfm.mo
-share/locale/pt/LC_MESSAGES/kdehelp.mo
-share/locale/pt/LC_MESSAGES/kdisplay.mo
-share/locale/pt/LC_MESSAGES/kdm.mo
-share/locale/pt/LC_MESSAGES/kfind.mo
-share/locale/pt/LC_MESSAGES/kfontmanager.mo
-share/locale/pt/LC_MESSAGES/klock.mo
-share/locale/pt/LC_MESSAGES/kpanel.mo
-share/locale/pt/LC_MESSAGES/kvt.mo
-share/locale/pt/LC_MESSAGES/kwm.mo
-share/locale/no/LC_MESSAGES/kde.mo
-share/locale/pl/LC_MESSAGES/kde.mo
-share/locale/pl/LC_MESSAGES/kdehelp.mo
-share/locale/pl/LC_MESSAGES/kdisplay.mo
-share/locale/pl/LC_MESSAGES/kvt.mo
-share/locale/pl/LC_MESSAGES/kwm.mo
-share/locale/pl/LC_MESSAGES/kdm.mo
-share/locale/pl/LC_MESSAGES/kpanel.mo
-share/locale/pl/LC_MESSAGES/kfm.mo
-share/locale/pl/LC_MESSAGES/kfontmanager.mo
-share/locale/pl/LC_MESSAGES/kfind.mo
-share/locale/el/LC_MESSAGES/kde.mo
-share/locale/el/LC_MESSAGES/kdisplay.mo
-share/locale/el/LC_MESSAGES/kfm.mo
-share/locale/fi/LC_MESSAGES/kde.mo
-share/locale/fi/LC_MESSAGES/kfind.mo
-share/locale/fi/LC_MESSAGES/kdehelp.mo
-share/locale/fi/LC_MESSAGES/kdm.mo
-share/locale/fi/LC_MESSAGES/kfm.mo
-share/locale/fi/LC_MESSAGES/kpanel.mo
-share/locale/fi/LC_MESSAGES/kwm.mo
-share/locale/fi/LC_MESSAGES/kvt.mo
-share/locale/fi/LC_MESSAGES/kdisplay.mo
-share/doc/HTML/en/kdelibs/kdebug.html
-share/doc/HTML/en/kmedia/maudio.html
-share/doc/HTML/en/kcc/bellconfig.html
-share/doc/HTML/en/kcc/keyboardconfig.html
-share/doc/HTML/en/kcc/mouseconfig.html
-share/doc/HTML/en/kcc/titlebarconfig.html
-share/doc/HTML/en/kcc/windowconfig.html
-share/doc/HTML/en/kcc/index.html
-share/doc/HTML/en/kcc/index-1.html
-share/doc/HTML/en/kcc/index-2.html
-share/doc/HTML/en/kcc/index-3.html
-share/doc/HTML/en/kcc/index-4.html
-share/doc/HTML/en/kcc/index-5.html
-share/doc/HTML/en/kdehelp/devel.html
-share/doc/HTML/en/kdehelp/index.html
-share/doc/HTML/en/kdehelp/intro.html
-share/doc/HTML/en/kdehelp/main.html
-share/doc/HTML/en/kdehelp/kogo3.gif
-share/doc/HTML/en/kdehelp/ksearch.html
-share/doc/HTML/en/kdehelp/single_pixel.gif
-share/doc/HTML/en/kdehelp/whatis.html
-share/doc/HTML/en/kdehelp/kule.gif
-share/doc/HTML/en/kdehelp/exec.xpm
-share/doc/HTML/en/kdehelp/kde.html
-share/doc/HTML/en/kdehelp/kdeside.gif
-share/doc/HTML/en/kdehelp/tealbar.gif
-share/doc/HTML/en/kdehelp/quickstart.html
-share/doc/HTML/en/kdehelp/quickstart-1.html
-share/doc/HTML/en/kdehelp/quickstart-2.html
-share/doc/HTML/en/kdehelp/quickstart-3.html
-share/doc/HTML/en/kdehelp/quickstart-4.html
-share/doc/HTML/en/kdehelp/quickstart-5.html
-share/doc/HTML/en/kdehelp/quickstart-6.html
-share/doc/HTML/en/kdehelp/quickstart-7.html
-share/doc/HTML/en/kdisplay/kdisplay.html
-share/doc/HTML/en/kdisplay/kdisplay-1.html
-share/doc/HTML/en/kdisplay/kdisplay-2.html
-share/doc/HTML/en/kdisplay/kdisplay-3.html
-share/doc/HTML/en/kdisplay/kdisplay-4.html
-share/doc/HTML/en/kdisplay/kdisplay-5.html
-share/doc/HTML/en/kdisplay/kdisplay-6.html
-share/doc/HTML/en/kdisplay/kdisplay-7.html
-share/doc/HTML/en/kdisplay/kdisplay-8.html
-share/doc/HTML/en/kfm/app.html
-share/doc/HTML/en/kfm/mime.html
-share/doc/HTML/en/kfm/app2.html
-share/doc/HTML/en/kfm/mime2.html
-share/doc/HTML/en/kfm/index.html
-share/doc/HTML/en/kfm/kfm_phil.html
-share/doc/HTML/en/kfm/kfm_how.html
-share/doc/HTML/en/kfm/manual.html
-share/doc/HTML/en/kfm/app1.gif
-share/doc/HTML/en/kfm/app3.gif
-share/doc/HTML/en/kfm/mime1.gif
-share/doc/HTML/en/kfm/mime3.gif
-share/doc/HTML/en/kfm/app2.gif
-share/doc/HTML/en/kfm/app4.gif
-share/doc/HTML/en/kfm/mime2.gif
-share/doc/HTML/en/kfm/templates.gif
-share/doc/HTML/en/kfm/dontpanic.jpeg
-share/doc/HTML/en/kfm/lesson2.jpeg
-share/doc/HTML/en/kfm/manual.jpeg
-share/doc/HTML/en/kfm/previous.jpeg
-share/doc/HTML/en/kfm/kfm.jpeg
-share/doc/HTML/en/kfm/lesson3.jpeg
-share/doc/HTML/en/kfm/next.jpeg
-share/doc/HTML/en/kfm/previous2.jpeg
-share/doc/HTML/en/kfm/lesson1.jpeg
-share/doc/HTML/en/kfm/lesson4.jpeg
-share/doc/HTML/en/kfm/next2.jpeg
-share/doc/HTML/en/kdm/index.html
-share/doc/HTML/en/kdm/index-1.html
-share/doc/HTML/en/kdm/index-2.html
-share/doc/HTML/en/kdm/index-3.html
-share/doc/HTML/en/kdm/index-4.html
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kvt/index.html
-share/doc/HTML/en/kfontmanager/index.html
-share/doc/HTML/en/kfontmanager/index-1.html
-share/doc/HTML/en/kfontmanager/index-2.html
-share/doc/HTML/en/kfontmanager/index-3.html
-share/doc/HTML/en/kfontmanager/index-4.html
-share/doc/HTML/en/kfind/index.html
-share/doc/HTML/en/kfind/index-1.html
-share/doc/HTML/en/kfind/index-2.html
-share/doc/HTML/en/kfind/index-3.html
-share/doc/HTML/en/kfind/index-4.html
-share/doc/HTML/en/kfind/index.sgml
-share/doc/HTML/en/kmenuedit/kmenuedit1.gif
-share/doc/HTML/en/kmenuedit/index.html
-share/doc/HTML/en/kmenuedit/kmenuedit2.gif
+share/apps/kdisplay/pics/monitor.xpm
 share/icons/kfm.xpm
-share/icons/kfind.xpm
-share/icons/kvt.xpm
+share/icons/mini/kdehelp.xpm
+share/icons/mini/kfontmanager.xpm
+share/icons/mini/kfind.xpm
+share/icons/mini/kvt.xpm
+share/icons/mini/kwm.xpm
 share/icons/mini/mini-default.xpm
+share/icons/mini/kscreensaver.xpm
 share/icons/mini/maximize2.xpm
 share/icons/mini/mini-ball.xpm
 share/icons/mini/mini-bball.xpm
@@ -403,6 +111,7 @@ share/icons/mini/mini-calc.xpm
 share/icons/mini/mini-camera.xpm
 share/icons/mini/mini-cdlabel.xpm
 share/icons/mini/mini-clock.xpm
+share/icons/mini/dvi.xpm
 share/icons/mini/mini-colors.xpm
 share/icons/mini/mini-connect.xpm
 share/icons/mini/mini-connected.xpm
@@ -423,6 +132,7 @@ share/icons/mini/mini-hextris.xpm
 share/icons/mini/mini-k.xpm
 share/icons/mini/mini-lock.xpm
 share/icons/mini/mini-lower.xpm
+share/icons/mini/ftp.xpm
 share/icons/mini/mini-mail.xpm
 share/icons/mini/mini-manual.xpm
 share/icons/mini/mini-max1.xpm
@@ -470,14 +180,93 @@ share/icons/mini/mini.move.xpm
 share/icons/mini/mini.netscape.xpm
 share/icons/mini/mini.raise.xpm
 share/icons/mini/mini.resize.xpm
-share/icons/mini/mini.xboing.xpm
 share/icons/mini/mini.xarchie.xpm
+share/icons/mini/mini.xboing.xpm
 share/icons/mini/mini.xlock.xpm
 share/icons/mini/mini.xterm.xpm
 share/icons/mini/mini.zircon.xpm
+share/icons/mini/kmenuedit.xpm
+share/icons/mini/sample.xpm
+share/icons/mini/smbstatus.xpm
+share/icons/mini/bell.xpm
+share/icons/mini/background.xpm
+share/icons/mini/colors.xpm
+share/icons/mini/screensaver.xpm
+share/icons/mini/style.xpm
+share/icons/mini/mouse.xpm
+share/icons/mini/keyboard.xpm
+share/icons/mini/windows.xpm
+share/icons/mini/titlebar.xpm
+share/icons/mini/buttons.xpm
+share/icons/mini/memory.xpm
+share/icons/mini/processor.xpm
+share/icons/mini/3floppy_mount.xpm
+share/icons/mini/3floppy_unmount.xpm
+share/icons/mini/5floppy_mount.xpm
+share/icons/mini/5floppy_unmount.xpm
+share/icons/mini/binary.xpm
+share/icons/mini/blockdevice.xpm
+share/icons/mini/c_src.xpm
+share/icons/mini/cdrom_mount.xpm
+share/icons/mini/cdrom_unmount.xpm
+share/icons/mini/chardevice.xpm
+share/icons/mini/core.xpm
+share/icons/mini/document.xpm
+share/icons/mini/exec.xpm
+share/icons/mini/f_src.xpm
 share/icons/mini/folder.xpm
-share/icons/mini/kfm_trash.xpm
+share/icons/mini/font.xpm
+share/icons/mini/gf.xpm
+share/icons/mini/h_src.xpm
+share/icons/mini/html.xpm
+share/icons/mini/kfm.xpm
+share/icons/mini/image.xpm
+share/icons/mini/info.xpm
+share/icons/mini/java_src.xpm
 share/icons/mini/kfm_fulltrash.xpm
+share/icons/mini/kfm_home.xpm
+share/icons/mini/kfm_trash.xpm
+share/icons/mini/l_src.xpm
+share/icons/mini/library.xpm
+share/icons/mini/lockedfolder.xpm
+share/icons/mini/log.xpm
+share/icons/mini/make.xpm
+share/icons/mini/man.xpm
+share/icons/mini/metafont.xpm
+share/icons/mini/midi.xpm
+share/icons/mini/moc_src.xpm
+share/icons/mini/o_src.xpm
+share/icons/mini/p_src.xpm
+share/icons/mini/pdf.xpm
+share/icons/mini/pipe.xpm
+share/icons/mini/pk.xpm
+share/icons/mini/postscript.xpm
+share/icons/mini/printer.xpm
+share/icons/mini/readme.xpm
+share/icons/mini/resource.xpm
+share/icons/mini/s_src.xpm
+share/icons/mini/script.xpm
+share/icons/mini/socket.xpm
+share/icons/mini/sound.xpm
+share/icons/mini/terminal.xpm
+share/icons/mini/tex.xpm
+share/icons/mini/tgz.xpm
+share/icons/mini/trash.xpm
+share/icons/mini/txt.xpm
+share/icons/mini/unknown.xpm
+share/icons/mini/video.xpm
+share/icons/mini/www.xpm
+share/icons/mini/y_src.xpm
+share/icons/mini/zip_mount.xpm
+share/icons/mini/zip_unmount.xpm
+share/icons/kdehelp.xpm
+share/icons/kfontmanager.xpm
+share/icons/kfind.xpm
+share/icons/kvt.xpm
+share/icons/kwm.xpm
+share/icons/kscreensaver.xpm
+share/icons/kmenuedit.xpm
+share/icons/kcmkwm.xpm
 share/icons/3floppy_mount.xpm
 share/icons/3floppy_unmount.xpm
 share/icons/5floppy_mount.xpm
@@ -488,7 +277,6 @@ share/icons/c_src.xpm
 share/icons/cdrom_mount.xpm
 share/icons/cdrom_unmount.xpm
 share/icons/chardevice.xpm
-share/icons/closed.xpm
 share/icons/core.xpm
 share/icons/document.xpm
 share/icons/dvi.xpm
@@ -496,6 +284,7 @@ share/icons/exec.xpm
 share/icons/f_src.xpm
 share/icons/folder.xpm
 share/icons/font.xpm
+share/icons/ftp.xpm
 share/icons/gf.xpm
 share/icons/h_src.xpm
 share/icons/html.xpm
@@ -506,38 +295,40 @@ share/icons/kfm_fulltrash.xpm
 share/icons/kfm_home.xpm
 share/icons/kfm_trash.xpm
 share/icons/l_src.xpm
+share/icons/library.xpm
 share/icons/link.xpm
 share/icons/lockedfolder.xpm
+share/icons/log.xpm
 share/icons/make.xpm
+share/icons/man.xpm
 share/icons/metafont.xpm
+share/icons/pdf.xpm
 share/icons/midi.xpm
 share/icons/moc_src.xpm
-share/icons/news.xpm
-share/icons/open.xpm
+share/icons/o_src.xpm
 share/icons/p_src.xpm
-share/icons/pdf.xpm
 share/icons/pipe.xpm
 share/icons/pk.xpm
 share/icons/postscript.xpm
 share/icons/printer.xpm
 share/icons/readme.xpm
 share/icons/readonly.xpm
+share/icons/resource.xpm
 share/icons/s_src.xpm
+share/icons/script.xpm
+share/icons/socket.xpm
 share/icons/sound.xpm
+share/icons/terminal.xpm
 share/icons/tex.xpm
 share/icons/tgz.xpm
 share/icons/trash.xpm
 share/icons/txt.xpm
 share/icons/unknown.xpm
-share/icons/unzip.xpm
 share/icons/video.xpm
 share/icons/www.xpm
 share/icons/y_src.xpm
 share/icons/zip_mount.xpm
 share/icons/zip_unmount.xpm
-share/icons/ftp.xpm
-share/icons/socket.xpm
-share/icons/terminal.xpm
 share/config/kfmrc
 share/config/desktop
 share/config/kdmrc
@@ -589,15 +380,10 @@ share/mimelnk/inode/directory.kdelnk
 share/mimelnk/inode/fifo.kdelnk
 share/mimelnk/inode/socket.kdelnk
 share/applnk/System/kwmpager.kdelnk
-share/applnk/System/kbgndwm.kdelnk
-share/applnk/System/Core/kdm.kdelnk
-share/applnk/System/Core/kpanel.kdelnk
-share/applnk/System/Core/kwm.kdelnk
-share/applnk/System/Core/kfm.kdelnk
 share/applnk/System/.directory
 share/applnk/System/Arrange.kdelnk
 share/applnk/System/Kfontmanager.kdelnk
-share/applnk/System/kcc.kdelnk
+share/applnk/System/kfmsu.kdelnk
 share/applnk/Applications/.directory
 share/applnk/Games/.directory
 share/applnk/Graphics/.directory
@@ -606,15 +392,113 @@ share/applnk/Multimedia/.directory
 share/applnk/Utilities/.directory
 share/applnk/Utilities/kvt.kdelnk
 share/applnk/Utilities/KMenuEdit.kdelnk
+share/applnk/Settings/Input_Devices/.directory
+share/applnk/Settings/Input_Devices/mouse.kdelnk
+share/applnk/Settings/Input_Devices/keyboard.kdelnk
+share/applnk/Settings/Desktop/.directory
+share/applnk/Settings/Desktop/colors.kdelnk
+share/applnk/Settings/Desktop/screensaver.kdelnk
+share/applnk/Settings/Desktop/style.kdelnk
+share/applnk/Settings/Desktop/background.kdelnk
+share/applnk/Settings/Sound/.directory
+share/applnk/Settings/Sound/bell.kdelnk
+share/applnk/Settings/KWM/.directory
+share/applnk/Settings/KWM/buttons.kdelnk
+share/applnk/Settings/KWM/windows.kdelnk
+share/applnk/Settings/KWM/titlebar.kdelnk
+share/applnk/Settings/Network/.directory
+share/applnk/Settings/Network/smbstatus.kdelnk
+share/applnk/Settings/Information/.directory
+share/applnk/Settings/Information/memory.kdelnk
+share/applnk/Settings/Information/processor.kdelnk
+share/applnk/Settings/.directory
 share/applnk/Help.kdelnk
 share/applnk/Home.kdelnk
 share/applnk/Kfind.kdelnk
 share/applnk/Krefresh.kdelnk
 share/applnk/Trash.kdelnk
+share/doc/HTML/en/kmedia/maudio.html
+share/doc/HTML/en/kdehelp/devel.html
+share/doc/HTML/en/kdehelp/index.html
+share/doc/HTML/en/kdehelp/intro.html
+share/doc/HTML/en/kdehelp/main.html
+share/doc/HTML/en/kdehelp/kogo3.gif
+share/doc/HTML/en/kdehelp/ksearch.html
+share/doc/HTML/en/kdehelp/single_pixel.gif
+share/doc/HTML/en/kdehelp/whatis.html
+share/doc/HTML/en/kdehelp/kule.gif
+share/doc/HTML/en/kdehelp/exec.xpm
+share/doc/HTML/en/kdehelp/kde.html
+share/doc/HTML/en/kdehelp/kdeside.gif
+share/doc/HTML/en/kdehelp/tealbar.gif
+share/doc/HTML/en/kdehelp/quickstart.html
+share/doc/HTML/en/kdehelp/quickstart-1.html
+share/doc/HTML/en/kdehelp/quickstart-2.html
+share/doc/HTML/en/kdehelp/quickstart-3.html
+share/doc/HTML/en/kdehelp/quickstart-4.html
+share/doc/HTML/en/kdehelp/quickstart-5.html
+share/doc/HTML/en/kdehelp/quickstart-6.html
+share/doc/HTML/en/kdehelp/quickstart-7.html
+share/doc/HTML/en/kdisplay/kdisplay.html
+share/doc/HTML/en/kdisplay/kdisplay-1.html
+share/doc/HTML/en/kdisplay/kdisplay-2.html
+share/doc/HTML/en/kdisplay/kdisplay-3.html
+share/doc/HTML/en/kdisplay/kdisplay-4.html
+share/doc/HTML/en/kdisplay/kdisplay-5.html
+share/doc/HTML/en/kdisplay/kdisplay-6.html
+share/doc/HTML/en/kdisplay/kdisplay-7.html
+share/doc/HTML/en/kdisplay/kdisplay-8.html
+share/doc/HTML/en/kfm/app.html
+share/doc/HTML/en/kfm/mime.html
+share/doc/HTML/en/kfm/app2.html
+share/doc/HTML/en/kfm/mime2.html
+share/doc/HTML/en/kfm/index.html
+share/doc/HTML/en/kfm/kfm_phil.html
+share/doc/HTML/en/kfm/kfm_how.html
+share/doc/HTML/en/kfm/manual.html
+share/doc/HTML/en/kfm/app1.gif
+share/doc/HTML/en/kfm/app3.gif
+share/doc/HTML/en/kfm/mime1.gif
+share/doc/HTML/en/kfm/mime3.gif
+share/doc/HTML/en/kfm/app2.gif
+share/doc/HTML/en/kfm/app4.gif
+share/doc/HTML/en/kfm/mime2.gif
+share/doc/HTML/en/kfm/templates.gif
+share/doc/HTML/en/kfm/dontpanic.jpeg
+share/doc/HTML/en/kfm/lesson2.jpeg
+share/doc/HTML/en/kfm/manual.jpeg
+share/doc/HTML/en/kfm/previous.jpeg
+share/doc/HTML/en/kfm/kfm.jpeg
+share/doc/HTML/en/kfm/lesson3.jpeg
+share/doc/HTML/en/kfm/next.jpeg
+share/doc/HTML/en/kfm/previous2.jpeg
+share/doc/HTML/en/kfm/lesson1.jpeg
+share/doc/HTML/en/kfm/lesson4.jpeg
+share/doc/HTML/en/kfm/next2.jpeg
+share/doc/HTML/en/kdm/index.html
+share/doc/HTML/en/kdm/index-1.html
+share/doc/HTML/en/kdm/index-2.html
+share/doc/HTML/en/kdm/index-3.html
+share/doc/HTML/en/kdm/index-4.html
+share/doc/HTML/en/kwm/index.html
+share/doc/HTML/en/kvt/index.html
+share/doc/HTML/en/kfontmanager/index.html
+share/doc/HTML/en/kfontmanager/index-1.html
+share/doc/HTML/en/kfontmanager/index-2.html
+share/doc/HTML/en/kfontmanager/index-3.html
+share/doc/HTML/en/kfontmanager/index-4.html
+share/doc/HTML/en/kfind/index.html
+share/doc/HTML/en/kfind/index-1.html
+share/doc/HTML/en/kfind/index-2.html
+share/doc/HTML/en/kfind/index-3.html
+share/doc/HTML/en/kfind/index-4.html
+share/doc/HTML/en/kfind/index.sgml
+share/doc/HTML/en/kmenuedit/kmenuedit1.gif
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/kmenuedit2.gif
 share/toolbar/back.xpm
 share/toolbar/bottom.xpm
 share/toolbar/contents.xpm
-share/toolbar/devious.xpm
 share/toolbar/down.xpm
 share/toolbar/editcopy.xpm
 share/toolbar/editcut.xpm
@@ -654,51 +538,120 @@ share/toolbar/stop.xpm
 share/wallpapers/ocean01.jpg
 share/wallpapers/paper01.jpg
 share/wallpapers/water01.jpg
-bin/kfmwarn
-bin/kfmclient
-bin/kioslave
-bin/kfmexec
-bin/kfm
-bin/kdehelp
-bin/kfontmanager
-bin/kfind
-bin/kvt
-bin/kwm
-bin/kpanel
-bin/kwmcom
-bin/kwmpager
-bin/kbgndwm
-bin/krootwm
-bin/kdm
-bin/kdmdesktop
-bin/kpolygon.kss
-bin/kswarm.kss
-bin/klissie.kss
-bin/kbanner.kss
-bin/klines.kss
-bin/kblankscrn.kss
-bin/krock.kss
-bin/kflame.kss
-bin/klaser.kss
-bin/kpyro.kss
-bin/khop.kss
-bin/kbat.kss
-bin/kslip.kss
-bin/kforest.kss
-bin/klock
-bin/kblob.kss
-bin/kmenuedit
-bin/maudio
-bin/kaudioserver
-bin/kcc
-bin/kfmsu
-bin/kfmsu2
-bin/startkde
+share/locale/cs/LC_MESSAGES/kfind.mo
+share/locale/cs/LC_MESSAGES/kdehelp.mo
+share/locale/cs/LC_MESSAGES/kdisplay.mo
+share/locale/cs/LC_MESSAGES/kvt.mo
+share/locale/cs/LC_MESSAGES/kwm.mo
+share/locale/cs/LC_MESSAGES/kfontmanager.mo
+share/locale/cs/LC_MESSAGES/kdm.mo
+share/locale/cs/LC_MESSAGES/kpanel.mo
+share/locale/cs/LC_MESSAGES/kfm.mo
+share/locale/cs/LC_MESSAGES/klock.mo
+share/locale/cs/LC_MESSAGES/krootwm.mo
+share/locale/da/LC_MESSAGES/kdm.mo
+share/locale/de/LC_MESSAGES/kfind.mo
+share/locale/de/LC_MESSAGES/kdehelp.mo
+share/locale/de/LC_MESSAGES/kdisplay.mo
+share/locale/de/LC_MESSAGES/kvt.mo
+share/locale/de/LC_MESSAGES/kfm.mo
+share/locale/de/LC_MESSAGES/kwm.mo
+share/locale/de/LC_MESSAGES/kfontmanager.mo
+share/locale/de/LC_MESSAGES/kdm.mo
+share/locale/de/LC_MESSAGES/kpanel.mo
+share/locale/de/LC_MESSAGES/klock.mo
+share/locale/es/LC_MESSAGES/kfind.mo
+share/locale/es/LC_MESSAGES/kdehelp.mo
+share/locale/es/LC_MESSAGES/kdisplay.mo
+share/locale/es/LC_MESSAGES/kvt.mo
+share/locale/es/LC_MESSAGES/kfm.mo
+share/locale/es/LC_MESSAGES/kwm.mo
+share/locale/es/LC_MESSAGES/kfontmanager.mo
+share/locale/es/LC_MESSAGES/kdm.mo
+share/locale/es/LC_MESSAGES/klock.mo
+share/locale/es/LC_MESSAGES/kpanel.mo
+share/locale/fi/LC_MESSAGES/kfind.mo
+share/locale/fi/LC_MESSAGES/kdehelp.mo
+share/locale/fi/LC_MESSAGES/kdm.mo
+share/locale/fi/LC_MESSAGES/kfm.mo
+share/locale/fi/LC_MESSAGES/kpanel.mo
+share/locale/fi/LC_MESSAGES/kwm.mo
+share/locale/fi/LC_MESSAGES/kvt.mo
+share/locale/fi/LC_MESSAGES/kdisplay.mo
+share/locale/fr/LC_MESSAGES/kfind.mo
+share/locale/fr/LC_MESSAGES/kdehelp.mo
+share/locale/fr/LC_MESSAGES/kdisplay.mo
+share/locale/fr/LC_MESSAGES/kdm.mo
+share/locale/fr/LC_MESSAGES/kfm.mo
+share/locale/fr/LC_MESSAGES/kfontmanager.mo
+share/locale/fr/LC_MESSAGES/klock.mo
+share/locale/fr/LC_MESSAGES/kpanel.mo
+share/locale/fr/LC_MESSAGES/kvt.mo
+share/locale/fr/LC_MESSAGES/kwm.mo
+share/locale/it/LC_MESSAGES/kfm.mo
+share/locale/it/LC_MESSAGES/kdisplay.mo
+share/locale/it/LC_MESSAGES/kwm.mo
+share/locale/it/LC_MESSAGES/kfind.mo
+share/locale/it/LC_MESSAGES/kdehelp.mo
+share/locale/it/LC_MESSAGES/kdm.mo
+share/locale/it/LC_MESSAGES/kfontmanager.mo
+share/locale/it/LC_MESSAGES/kpanel.mo
+share/locale/it/LC_MESSAGES/kvt.mo
+share/locale/nl/LC_MESSAGES/kfind.mo
+share/locale/nl/LC_MESSAGES/kdehelp.mo
+share/locale/nl/LC_MESSAGES/kdisplay.mo
+share/locale/nl/LC_MESSAGES/kvt.mo
+share/locale/nl/LC_MESSAGES/kfm.mo
+share/locale/nl/LC_MESSAGES/kwm.mo
+share/locale/nl/LC_MESSAGES/kfontmanager.mo
+share/locale/ru/LC_MESSAGES/kfind.mo
+share/locale/ru/LC_MESSAGES/kdehelp.mo
+share/locale/ru/LC_MESSAGES/kdisplay.mo
+share/locale/ru/LC_MESSAGES/kvt.mo
+share/locale/ru/LC_MESSAGES/kwm.mo
+share/locale/ru/LC_MESSAGES/kfontmanager.mo
+share/locale/sv/LC_MESSAGES/kfind.mo
+share/locale/sv/LC_MESSAGES/kdehelp.mo
+share/locale/sv/LC_MESSAGES/kdisplay.mo
+share/locale/sv/LC_MESSAGES/kvt.mo
+share/locale/sv/LC_MESSAGES/kfm.mo
+share/locale/sv/LC_MESSAGES/kwm.mo
+share/locale/sv/LC_MESSAGES/kfontmanager.mo
+share/locale/hu/LC_MESSAGES/kdehelp.mo
+share/locale/hu/LC_MESSAGES/kfm.mo
+share/locale/hu/LC_MESSAGES/kdm.mo
+share/locale/hu/LC_MESSAGES/kpanel.mo
+share/locale/hu/LC_MESSAGES/kdisplay.mo
+share/locale/hu/LC_MESSAGES/klock.mo
+share/locale/hu/LC_MESSAGES/kwm.mo
+share/locale/hu/LC_MESSAGES/kfind.mo
+share/locale/hu/LC_MESSAGES/kfontmanager.mo
+share/locale/pt/LC_MESSAGES/kfm.mo
+share/locale/pt/LC_MESSAGES/kdehelp.mo
+share/locale/pt/LC_MESSAGES/kdisplay.mo
+share/locale/pt/LC_MESSAGES/kdm.mo
+share/locale/pt/LC_MESSAGES/kfind.mo
+share/locale/pt/LC_MESSAGES/kfontmanager.mo
+share/locale/pt/LC_MESSAGES/klock.mo
+share/locale/pt/LC_MESSAGES/kpanel.mo
+share/locale/pt/LC_MESSAGES/kvt.mo
+share/locale/pt/LC_MESSAGES/kwm.mo
+share/locale/pl/LC_MESSAGES/kdehelp.mo
+share/locale/pl/LC_MESSAGES/kdisplay.mo
+share/locale/pl/LC_MESSAGES/kvt.mo
+share/locale/pl/LC_MESSAGES/kwm.mo
+share/locale/pl/LC_MESSAGES/kdm.mo
+share/locale/pl/LC_MESSAGES/kpanel.mo
+share/locale/pl/LC_MESSAGES/kfm.mo
+share/locale/pl/LC_MESSAGES/kfontmanager.mo
+share/locale/pl/LC_MESSAGES/kfind.mo
+share/locale/pl/LC_MESSAGES/klock.mo
+share/locale/pl/LC_MESSAGES/kcc.mo
+share/locale/pl/LC_MESSAGES/krootwm.mo
+share/locale/el/LC_MESSAGES/kdisplay.mo
+share/locale/el/LC_MESSAGES/kfm.mo
 cgi-bin/helpsearch
 cgi-bin/helpindex
-@exec /sbin/ldconfig -m %B
-@dirrm lib/kcc/modules
-@dirrm lib/kcc
 @dirrm share/wallpapers
 @dirrm share/toolbar
 @dirrm share/mimelnk/video
@@ -708,9 +661,37 @@ cgi-bin/helpindex
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
+@dirrm share/locale/sv/LC_MESSAGES
+@dirrm share/locale/sv
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
+@dirrm share/locale/fr/LC_MESSAGES
+@dirrm share/locale/fr
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+@dirrm share/locale/el/LC_MESSAGES
+@dirrm share/locale/el
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
-@dirrm share/doc/HTML/default
 @dirrm share/doc/HTML/en/kwm
 @dirrm share/doc/HTML/en/kvt
 @dirrm share/doc/HTML/en/kmenuedit
@@ -720,19 +701,16 @@ cgi-bin/helpindex
 @dirrm share/doc/HTML/en/kfind
 @dirrm share/doc/HTML/en/kdm
 @dirrm share/doc/HTML/en/kdisplay
-@dirrm share/doc/HTML/en/kdelibs
 @dirrm share/doc/HTML/en/kdehelp
-@dirrm share/doc/HTML/en/kcc
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
 @dirrm share/doc
 @dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
+@dirrm share/apps/kpanel/pics/mini
 @dirrm share/apps/kpanel/pics
 @dirrm share/apps/kpanel
-@dirrm share/apps/khtmlw/pics
-@dirrm share/apps/khtmlw
 @dirrm share/apps/kfm/pics
 @dirrm share/apps/kfm/Desktop/Templates
 @dirrm share/apps/kfm/Desktop
@@ -742,17 +720,22 @@ cgi-bin/helpindex
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
 @dirrm share/apps/kdm
-@dirrm share/apps/kde/pics
-@dirrm share/apps/kde
-@dirrm share/apps/kcc/pics
-@dirrm share/apps/kcc
+@dirrm share/apps/kdisplay/pics
+@dirrm share/apps/kdisplay
 @dirrm share/apps
 @dirrm share/applnk/Utilities
-@dirrm share/applnk/System/Core
 @dirrm share/applnk/System
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings/Network
+@dirrm share/applnk/Settings/KWM
+@dirrm share/applnk/Settings/Input_Devices
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Settings/Desktop
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Multimedia
 @dirrm share/applnk/Internet
 @dirrm share/applnk/Graphics
 @dirrm share/applnk/Games
 @dirrm share/applnk/Applications
 @dirrm share/applnk
+@dirrm cgi-bin