10 files changed, 253 insertions, 115 deletions

diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 071fcca08c57..a8f8ac39502e 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
@@ -24,6 +24,10 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+DO_NOT_COMPILE+=kmilo kdepasswd
+CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+
+CONFLICTS=	kgpg-*
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
@@ -31,7 +35,7 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 #klaptop needs APM, which is i386 only 
 .if ${MACHINE_ARCH} != "i386"
 WITHOUT_KLAPTOP	=yes
-.endif 
+.endif # ${MACHINE_ARCH} == "alpha"
 
 .if defined(WITHOUT_KLAPTOP)
 DO_NOT_COMPILE+=klaptopdaemon
@@ -52,11 +56,6 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500107
-post-patch:
-	${REINPLACE_CMD} -e 's,selectdevs,devstat_selectdevs,' ${WRKSRC}/configure
-.endif
-
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.post.mk>
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 2ac005c8ff12..d41de8f317f4 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1,3 +1 @@
-MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
-MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
-MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
+MD5 (KDE/kdeutils-3.2.0.tar.bz2) = 988480b534c1fab9003f624edb87e7a7
diff --git a/security/kwallet/files/patch-ksimcpu.cpp b/security/kwallet/files/patch-ksimcpu.cpp
deleted file mode 100644
index ca5e6343df41..000000000000
--- a/security/kwallet/files/patch-ksimcpu.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ksim/monitors/cpu/ksimcpu.cpp.orig	Fri Mar  7 23:10:34 2003
-+++ ksim/monitors/cpu/ksimcpu.cpp	Sat Apr 26 02:41:45 2003
-@@ -226,7 +226,7 @@
-   static int oidCpuTime[CTL_MAXNAME + 2];
-   static size_t oidCpuTimeLen = sizeof(oidCpuTime);
-   long cpuTime[CPUSTATES];
--  unsigned int cpuTimeLen = sizeof(cpuTime);
-+  size_t cpuTimeLen = sizeof(cpuTime);
-   static char *name = "kern.cp_time";
-   static int initialized = 0;
- 
diff --git a/security/kwallet/files/patch-ksimdisk.cpp b/security/kwallet/files/patch-ksimdisk.cpp
deleted file mode 100644
index ecb5bd17da08..000000000000
--- a/security/kwallet/files/patch-ksimdisk.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- ksim/monitors/disk/ksimdisk.cpp.orig	Mon Nov  4 11:03:53 2002
-+++ ksim/monitors/disk/ksimdisk.cpp	Wed Mar 19 13:37:39 2003
-@@ -248,6 +253,16 @@
- #endif
- 
- #ifdef Q_OS_FREEBSD
-+#if __FreeBSD_version < 500107
-+#define	devstat_getdevs(fd, stats)	getdevs(stats)
-+#define	devstat_selectdevs		selectdevs
-+#define	bytes_read(dev)			(dev).bytes_read
-+#define	bytes_written(dev)		(dev).bytes_written
-+#else
-+#define	bytes_read(dev)			(dev).bytes[DEVSTAT_READ]
-+#define	bytes_written(dev)		(dev).bytes[DEVSTAT_WRITE]
-+#endif
-+
-   statinfo diskStats;
-   bzero(&diskStats, sizeof(diskStats));
-   diskStats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
-@@ -258,11 +273,11 @@
-   long generation;
-   device_selection *deviceSelect = 0;
- 
--  if (getdevs(&diskStats) < 0)
-+  if (devstat_getdevs(NULL, &diskStats) < 0)
-     return;
- 
-   deviceAmount = diskStats.dinfo->numdevs;
--  if (selectdevs(&deviceSelect, &selected, &selections,
-+  if (devstat_selectdevs(&deviceSelect, &selected, &selections,
-      &generation, diskStats.dinfo->generation,
-      diskStats.dinfo->devices, deviceAmount,
-      0, 0, 0, 0, DS_SELECT_ONLY, 10, 1) < 0)
-@@ -275,8 +290,8 @@
-     disk = deviceSelect[i].position;
-     device = diskStats.dinfo->devices[disk];
-     blockSize = (device.block_size <= 0 ? 512 : device.block_size);
--    readBlocks = device.bytes_read / blockSize;
--    writeBlocks = device.bytes_written / blockSize;
-+    readBlocks = bytes_read(device) / blockSize;
-+    writeBlocks = bytes_written(device) / blockSize;
- 
-     DiskData diskData;
-     diskData.name = device.device_name
diff --git a/security/kwallet/files/patch-smapidev.c b/security/kwallet/files/patch-smapidev.c
new file mode 100644
index 000000000000..ad2c801de530
--- /dev/null
+++ b/security/kwallet/files/patch-smapidev.c
@@ -0,0 +1,10 @@
+--- klaptopdaemon/smapidev.c	Mon Apr 28 12:00:07 2003
++++ klaptopdaemon/smapidev.c.new	Mon Jan 26 13:49:25 2004
+@@ -34,7 +34,6 @@
+ #else
+ #include <unistd.h>
+ #endif
+-#include <getopt.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #ifdef __linux__
diff --git a/security/kwallet/files/plist.base b/security/kwallet/files/plist.base
index 4db631d4dff3..ae4450052801 100644
--- a/security/kwallet/files/plist.base
+++ b/security/kwallet/files/plist.base
@@ -1,20 +1,23 @@
 bin/ark
+bin/irkick
 bin/kcalc
 bin/kcharselect
-bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
+bin/kgpg
 bin/khexedit
 bin/kjots
-bin/ksim
+bin/kregexpeditor
 bin/ktimer
+bin/kwalletmanager
 bin/kwikdisk
 include/kmultiformlistbox.h
 include/kmultiformlistboxentry.h
 include/kmultiformlistboxfactory.h
 include/ksim/chart.h
 include/ksim/common.h
+include/ksim/ksimconfig.h
 include/ksim/label.h
 include/ksim/led.h
 include/ksim/pluginglobal.h
@@ -24,12 +27,22 @@ include/ksim/progress.h
 include/ksim/themeloader.h
 include/ksim/themetypes.h
 include/kwidgetstreamer.h
-lib/kcalc.la
-lib/kcalc.so
+lib/kde3/ark.la
+lib/kde3/ark.so
+lib/kde3/irkick.la
+lib/kde3/irkick.so
+lib/kde3/kcalc.la
+lib/kde3/kcalc.so
 lib/kde3/kcharselect_panelapplet.la
 lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kcmlirc.la
+lib/kde3/kcm_kcmlirc.so
 lib/kde3/kcm_kdf.la
 lib/kde3/kcm_kdf.so
+lib/kde3/kcm_kwallet.la
+lib/kde3/kcm_kwallet.so
+lib/kde3/kedit.la
+lib/kde3/kedit.so
 lib/kde3/ksim_cpu.la
 lib/kde3/ksim_cpu.so
 lib/kde3/ksim_disk.la
@@ -38,38 +51,47 @@ lib/kde3/ksim_filesystem.la
 lib/kde3/ksim_filesystem.so
 lib/kde3/ksim_net.la
 lib/kde3/ksim_net.so
+lib/kde3/ksim_panelextension.la
+lib/kde3/ksim_panelextension.so
 lib/kde3/ksim_sensors.la
 lib/kde3/ksim_sensors.so
+lib/kde3/libarkpart.la
+lib/kde3/libarkpart.so
+lib/kde3/libkbyteseditwidget.la
+lib/kde3/libkbyteseditwidget.so
 lib/kde3/libkregexpeditorgui.la
 lib/kde3/libkregexpeditorgui.so
-lib/kedit.la
-lib/kedit.so
-lib/ksim.la
-lib/ksim.so
-lib/libarkpart.la
-lib/libarkpart.so
+lib/libkdeinit_ark.la
+lib/libkdeinit_ark.so
+lib/libkdeinit_irkick.la
+lib/libkdeinit_irkick.so
+lib/libkdeinit_kcalc.la
+lib/libkdeinit_kcalc.so
+lib/libkdeinit_kedit.la
+lib/libkdeinit_kedit.so
+lib/libkregexpeditorcommon.la
+lib/libkregexpeditorcommon.so
+lib/libkregexpeditorcommon.so.1
 lib/libksimcore.la
 lib/libksimcore.so
 lib/libksimcore.so.1
-share/applnk/Editors/KEdit.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settingsmenu/kdepasswd.desktop
-share/applnk/System/More/kdf.desktop
-share/applnk/System/More/ksim.desktop
-share/applnk/System/More/kwikdisk.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/More/KCharSelect.desktop
-share/applnk/Utilities/More/Kjots.desktop
-share/applnk/Utilities/More/khexedit.desktop
-share/applnk/Utilities/More/ktimer.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/ktimer.desktop
+share/applications/kde/KCharSelect.desktop
+share/applications/kde/KEdit.desktop
+share/applications/kde/Kjots.desktop
+share/applications/kde/ark.desktop
+share/applications/kde/irkick.desktop
+share/applications/kde/kcalc.desktop
+share/applications/kde/kcmdf.desktop
+share/applications/kde/kcmlirc.desktop
+share/applications/kde/kdf.desktop
+share/applications/kde/kgpg.desktop
+share/applications/kde/khexedit.desktop
+share/applications/kde/kregexpeditor.desktop
+share/applications/kde/ksim.desktop
+share/applications/kde/ktimer.desktop
+share/applications/kde/kwalletconfig.desktop
+share/applications/kde/kwalletmanager.desktop
+share/applications/kde/kwikdisk.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/ark_part_readonly.rc
 share/apps/ark/arkui.rc
@@ -83,17 +105,67 @@ share/apps/ark/icons/crystalsvg/22x22/actions/ark_open.png
 share/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png
 share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
 share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
+share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
+share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
+share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledred.png
+share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
+share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
+share/apps/kcalc/kcalcui.rc
+share/apps/kconf_update/kcalcrc.upd
+share/apps/kdf/kdfui.rc
 share/apps/kdf/pics/delete.png
 share/apps/kdf/pics/tick.png
 share/apps/kedit/keditui.rc
+share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
+share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
+share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png
+share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png
+share/apps/kgpg/kgpg.rc
+share/apps/kgpg/listkeys.rc
+share/apps/kgpg/pics/kgpg_anim.gif
+share/apps/kgpg/pics/kgpg_bad.png
+share/apps/kgpg/pics/kgpg_good.png
+share/apps/kgpg/pics/kgpg_marginal.png
+share/apps/kgpg/pics/kgpg_unknown.png
+share/apps/kgpg/tips
+share/apps/khexedit/khexeditui.rc
 share/apps/khexedit/toolbar/hexdrag.png
 share/apps/khexedit/toolbar/hexmask.png
 share/apps/khexedit/toolbar/hexwrite.png
 share/apps/kicker/applets/kcharselectapplet.desktop
+share/apps/kicker/extensions/ksim.desktop
+share/apps/kjots/kjotsui.rc
 share/apps/kjots/pics/filedel.png
+share/apps/konqueror/servicemenus/ark_directory_service.desktop
 share/apps/konqueror/servicemenus/arkservicemenu.desktop
+share/apps/konqueror/servicemenus/encryptfile.desktop
+share/apps/konqueror/servicemenus/encryptfolder.desktop
 share/apps/kregexpeditor/pics/altn.png
 share/apps/kregexpeditor/pics/anychar.png
+share/apps/kregexpeditor/pics/autoverify.png
 share/apps/kregexpeditor/pics/begline.png
 share/apps/kregexpeditor/pics/characters.png
 share/apps/kregexpeditor/pics/compound.png
@@ -105,6 +177,7 @@ share/apps/kregexpeditor/pics/poslookahead.png
 share/apps/kregexpeditor/pics/repeat.png
 share/apps/kregexpeditor/pics/select.png
 share/apps/kregexpeditor/pics/text.png
+share/apps/kregexpeditor/pics/verify.png
 share/apps/kregexpeditor/pics/wordboundary.png
 share/apps/kregexpeditor/predefined/general/anything.regexp
 share/apps/kregexpeditor/predefined/general/spaces.regexp
@@ -133,7 +206,28 @@ share/apps/ksim/themes/ksim/mail/decal_mail.png
 share/apps/ksim/themes/ksim/mail/krell_mail.png
 share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
 share/apps/ksim/themes/ksim/net/decal_net_leds.png
-share/config/ksimrc
+share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
+share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
+share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
+share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
+share/apps/kwalletmanager/kwalleteditor.rc
+share/apps/kwalletmanager/kwalletmanager.rc
+share/apps/profiles/klauncher.profile.xml
+share/apps/profiles/konqueror.profile.xml
+share/apps/profiles/noatun.profile.xml
+share/apps/profiles/profile.dtd
+share/apps/remotes/RM-0010.remote.xml
+share/apps/remotes/cimr100.remote.xml
+share/apps/remotes/hauppauge.remote.xml
+share/apps/remotes/remote.dtd
+share/apps/remotes/sherwood.remote.xml
+share/autostart/irkick.desktop
+share/autostart/kgpg.desktop
+share/config.kcfg/kcalc.kcfg
+share/config.kcfg/kedit.kcfg
+share/config.kcfg/kgpg.kcfg
+share/config.kcfg/kjots.kcfg
+share/config/ksim_panelextensionrc
 share/doc/HTML/en/KRegExpEditor/altn.png
 share/doc/HTML/en/KRegExpEditor/altntool.png
 share/doc/HTML/en/KRegExpEditor/anychar.png
@@ -163,6 +257,9 @@ share/doc/HTML/en/KRegExpEditor/wordboundary.png
 share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
+share/doc/HTML/en/irkick/common
+share/doc/HTML/en/irkick/index.cache.bz2
+share/doc/HTML/en/irkick/index.docbook
 share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/index.cache.bz2
 share/doc/HTML/en/kcalc/index.docbook
@@ -171,6 +268,9 @@ share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
 share/doc/HTML/en/kcharselect/common
 share/doc/HTML/en/kcharselect/index.cache.bz2
 share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kcmlirc/common
+share/doc/HTML/en/kcmlirc/index.cache.bz2
+share/doc/HTML/en/kcmlirc/index.docbook
 share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
 share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
 share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
@@ -194,6 +294,15 @@ share/doc/HTML/en/kedit/index.docbook
 share/doc/HTML/en/kfloppy/common
 share/doc/HTML/en/kfloppy/index.cache.bz2
 share/doc/HTML/en/kfloppy/index.docbook
+share/doc/HTML/en/kgpg/common
+share/doc/HTML/en/kgpg/editor.png
+share/doc/HTML/en/kgpg/index.cache.bz2
+share/doc/HTML/en/kgpg/index.docbook
+share/doc/HTML/en/kgpg/keygen.png
+share/doc/HTML/en/kgpg/keymanage.png
+share/doc/HTML/en/kgpg/keys.png
+share/doc/HTML/en/kgpg/kicker.png
+share/doc/HTML/en/kgpg/options.png
 share/doc/HTML/en/khexedit/common
 share/doc/HTML/en/khexedit/index.cache.bz2
 share/doc/HTML/en/khexedit/index.docbook
@@ -210,38 +319,68 @@ share/doc/HTML/en/ksim/index.docbook
 share/doc/HTML/en/ktimer/common
 share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
+share/doc/HTML/en/kwallet/common
+share/doc/HTML/en/kwallet/index.cache.bz2
+share/doc/HTML/en/kwallet/index.docbook
 share/icons/crystalsvg/128x128/apps/ark.png
 share/icons/crystalsvg/128x128/apps/kdf.png
+share/icons/crystalsvg/128x128/apps/ktimer.png
+share/icons/crystalsvg/128x128/apps/kwalletmanager.png
+share/icons/crystalsvg/128x128/apps/kwikdisk.png
 share/icons/crystalsvg/16x16/apps/ark.png
 share/icons/crystalsvg/16x16/apps/kcalc.png
 share/icons/crystalsvg/16x16/apps/kcharselect.png
 share/icons/crystalsvg/16x16/apps/kcmdf.png
 share/icons/crystalsvg/16x16/apps/kdf.png
 share/icons/crystalsvg/16x16/apps/kedit.png
+share/icons/crystalsvg/16x16/apps/kgpg.png
 share/icons/crystalsvg/16x16/apps/khexedit.png
 share/icons/crystalsvg/16x16/apps/kjots.png
 share/icons/crystalsvg/16x16/apps/ksim.png
+share/icons/crystalsvg/16x16/apps/ktimer.png
+share/icons/crystalsvg/16x16/apps/kwalletmanager.png
 share/icons/crystalsvg/16x16/apps/kwikdisk.png
 share/icons/crystalsvg/16x16/devices/ksim_cpu.png
+share/icons/crystalsvg/22x22/apps/kgpg.png
+share/icons/crystalsvg/22x22/apps/kwalletmanager.png
 share/icons/crystalsvg/32x32/apps/ark.png
 share/icons/crystalsvg/32x32/apps/kcalc.png
 share/icons/crystalsvg/32x32/apps/kcmdf.png
 share/icons/crystalsvg/32x32/apps/kdf.png
 share/icons/crystalsvg/32x32/apps/kedit.png
+share/icons/crystalsvg/32x32/apps/kgpg.png
 share/icons/crystalsvg/32x32/apps/khexedit.png
 share/icons/crystalsvg/32x32/apps/kjots.png
 share/icons/crystalsvg/32x32/apps/ksim.png
+share/icons/crystalsvg/32x32/apps/ktimer.png
+share/icons/crystalsvg/32x32/apps/kwalletmanager.png
 share/icons/crystalsvg/32x32/apps/kwikdisk.png
 share/icons/crystalsvg/48x48/apps/ark.png
 share/icons/crystalsvg/48x48/apps/kcalc.png
 share/icons/crystalsvg/48x48/apps/kcharselect.png
 share/icons/crystalsvg/48x48/apps/kdf.png
 share/icons/crystalsvg/48x48/apps/kedit.png
+share/icons/crystalsvg/48x48/apps/kgpg.png
 share/icons/crystalsvg/48x48/apps/khexedit.png
 share/icons/crystalsvg/48x48/apps/kjots.png
 share/icons/crystalsvg/48x48/apps/ksim.png
+share/icons/crystalsvg/48x48/apps/ktimer.png
+share/icons/crystalsvg/48x48/apps/kwalletmanager.png
+share/icons/crystalsvg/48x48/apps/kwikdisk.png
 share/icons/crystalsvg/64x64/apps/ark.png
+share/icons/crystalsvg/64x64/apps/kcalc.png
 share/icons/crystalsvg/64x64/apps/kdf.png
+share/icons/crystalsvg/64x64/apps/kedit.png
+share/icons/crystalsvg/64x64/apps/kjots.png
+share/icons/crystalsvg/64x64/apps/kwalletmanager.png
+share/icons/crystalsvg/64x64/apps/kwikdisk.png
+share/icons/hicolor/16x16/apps/irkick.png
+share/icons/hicolor/22x22/apps/irkick.png
+share/icons/hicolor/32x32/apps/irkick.png
+share/icons/locolor/16x16/apps/irkick.png
+share/icons/locolor/32x32/apps/irkick.png
 share/services/ark_part.desktop
+share/services/kbyteseditwidget.desktop
 share/services/kregexpeditorgui.desktop
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
+share/services/kwallet_config.desktop
+share/services/kwalletmanager_show.desktop
diff --git a/security/kwallet/files/plist.base.rm b/security/kwallet/files/plist.base.rm
index c0eb57b0ed06..c6cf19dc5fe2 100644
--- a/security/kwallet/files/plist.base.rm
+++ b/security/kwallet/files/plist.base.rm
@@ -1,11 +1,24 @@
-@unexec /bin/rmdir %D/share/apps/kcalc/pics || true
 @dirrm share/services
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
 @dirrm share/icons/crystalsvg/64x64/apps
 @dirrm share/icons/crystalsvg/64x64
 @dirrm share/icons/crystalsvg/48x48/apps
 @dirrm share/icons/crystalsvg/48x48
 @dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/22x22
 @dirrm share/icons/crystalsvg/16x16/devices
 @dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/icons/crystalsvg/16x16
@@ -13,12 +26,14 @@
 @dirrm share/icons/crystalsvg/128x128
 @dirrm share/icons/crystalsvg
 @dirrm share/icons
+@dirrm share/doc/HTML/en/kwallet
 @dirrm share/doc/HTML/en/ktimer
 @dirrm share/doc/HTML/en/ksim
 @dirrm share/doc/HTML/en/kjots
 @dirrm share/doc/HTML/en/kinfocenter/blockdevices
 @dirrm share/doc/HTML/en/kinfocenter
 @dirrm share/doc/HTML/en/khexedit
+@dirrm share/doc/HTML/en/kgpg
 @dirrm share/doc/HTML/en/kfloppy
 @dirrm share/doc/HTML/en/kedit
 @dirrm share/doc/HTML/en/kdf
@@ -27,13 +42,24 @@
 @dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
 @dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
 @dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en/kcmlirc
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/irkick
 @dirrm share/doc/HTML/en/ark
 @dirrm share/doc/HTML/en/KRegExpEditor
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/config.kcfg
 @dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/remotes
+@dirrm share/apps/profiles
+@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22
+@dirrm share/apps/kwalletmanager/icons/crystalsvg
+@dirrm share/apps/kwalletmanager/icons
+@dirrm share/apps/kwalletmanager
 @dirrm share/apps/ksim/themes/ksim/net
 @dirrm share/apps/ksim/themes/ksim/mail
 @dirrm share/apps/ksim/themes/ksim/host
@@ -50,28 +76,38 @@
 @dirrm share/apps/konqueror
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
+@dirrm share/apps/kicker/extensions
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khexedit/toolbar
 @dirrm share/apps/khexedit
+@dirrm share/apps/kgpg/pics
+@dirrm share/apps/kgpg/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kgpg/icons/crystalsvg/22x22
+@dirrm share/apps/kgpg/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kgpg/icons/crystalsvg/16x16
+@dirrm share/apps/kgpg/icons/crystalsvg
+@dirrm share/apps/kgpg/icons
+@dirrm share/apps/kgpg
 @dirrm share/apps/kedit
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
+@dirrm share/apps/kconf_update
 @dirrm share/apps/kcalc
+@dirrm share/apps/irkick/icons/hicolor/32x32/actions
+@dirrm share/apps/irkick/icons/hicolor/32x32
+@dirrm share/apps/irkick/icons/hicolor/16x16/actions
+@dirrm share/apps/irkick/icons/hicolor/16x16
+@dirrm share/apps/irkick/icons/hicolor
+@dirrm share/apps/irkick/icons
+@dirrm share/apps/irkick
 @dirrm share/apps/ark/icons/crystalsvg/22x22/actions
 @dirrm share/apps/ark/icons/crystalsvg/22x22
 @dirrm share/apps/ark/icons/crystalsvg
 @dirrm share/apps/ark/icons
 @dirrm share/apps/ark
 @dirrm share/apps
-@dirrm share/applnk/Utilities/More
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System/More
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors
-@dirrm share/applnk
+@dirrm share/applications/kde
+@dirrm share/applications
 @dirrm lib/kde3
 @dirrm include/ksim
diff --git a/security/kwallet/files/plist.kfloppy b/security/kwallet/files/plist.kfloppy
index 58363c80f2de..3b985d193d36 100644
--- a/security/kwallet/files/plist.kfloppy
+++ b/security/kwallet/files/plist.kfloppy
@@ -1,5 +1,5 @@
 bin/kfloppy
-share/applnk/Utilities/KFloppy.desktop
+share/applications/kde/KFloppy.desktop
 share/icons/crystalsvg/128x128/apps/kfloppy.png
 share/icons/crystalsvg/16x16/apps/kfloppy.png
 share/icons/crystalsvg/32x32/apps/kfloppy.png
diff --git a/security/kwallet/files/plist.klaptop b/security/kwallet/files/plist.klaptop
index 13c6fff6b0a9..63626bf83973 100644
--- a/security/kwallet/files/plist.klaptop
+++ b/security/kwallet/files/plist.klaptop
@@ -1,10 +1,21 @@
-bin/klaptopdaemon
+bin/klaptop_acpi_helper
+bin/klaptop_check
 lib/kde3/kcm_laptop.la
 lib/kde3/kcm_laptop.so
-lib/klaptopdaemon.la
-lib/klaptopdaemon.so
-share/applnk/Settings/Information/pcmcia.desktop
-share/applnk/Settings/PowerControl/laptop.desktop
+lib/kde3/kded_klaptopdaemon.la
+lib/kde3/kded_klaptopdaemon.so
+lib/libkcmlaptop.la
+lib/libkcmlaptop.so
+lib/libkcmlaptop.so.0
+share/applications/kde/laptop.desktop
+share/applications/kde/pcmcia.desktop
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_power.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_power.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_power.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
@@ -23,4 +34,4 @@ share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
 share/icons/crystalsvg/48x48/apps/laptop_battery.png
 share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
 share/icons/crystalsvg/64x64/apps/laptop_battery.png
-share/services/klaptopdaemon.desktop
+share/services/kded/klaptopdaemon.desktop
diff --git a/security/kwallet/files/plist.klaptop.rm b/security/kwallet/files/plist.klaptop.rm
index 312e3fb50138..fcfdaf029bb3 100644
--- a/security/kwallet/files/plist.klaptop.rm
+++ b/security/kwallet/files/plist.klaptop.rm
@@ -1,3 +1,4 @@
+@dirrm share/services/kded
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
@@ -7,4 +8,3 @@
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg
 @dirrm share/apps/klaptopdaemon/icons
 @dirrm share/apps/klaptopdaemon
-@dirrm share/applnk/Settings/PowerControl