Update to KDE 3.5.6

ark
* Improved 7zip support.

kcalc
* Kcalc did not paste all hex values correctly.
* Wrong DEC to HEX conversion on 64-bit CPUs.
* modulus of a pasted number is always 0.
* Default constants like pi displayed wrong digits.
* Decimal symbol could change during typing.

kgpg
* Show keyservers in search dialog on first run, if no server present
  in .gnupg/options.

klaptopdaemon
* Optionally show battery level percentage over the systemtray icon.

kmilo
* Fix KMilo/KMix interoperability issues.

SuperKaramba
* Fix problem displaying non ascii characters.
* Fix infinite theme reloading when the theme code is changed.

3 files changed, 133 insertions, 136 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 99d5ff944a2..fd24b4d0984 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.57 2007/01/17 23:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2007/01/26 03:19:22 markd Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
-PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_DIRS+=		xdg-1.1
-
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
@@ -35,6 +32,7 @@ CONFIGURE_ENV+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index 09e76fc5cce..d31ac0211d9 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/03/30 02:50:18 markd Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/01/26 03:19:22 markd Exp $
 bin/ark
 bin/irkick
 bin/kcalc
@@ -79,7 +79,6 @@ 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-kwalletd.desktop
@@ -195,6 +194,108 @@ share/doc/kde/HTML/en/kwallet/password2.png
 share/doc/kde/HTML/en/superkaramba/common
 share/doc/kde/HTML/en/superkaramba/index.cache.bz2
 share/doc/kde/HTML/en/superkaramba/index.docbook
+share/icons/crystalsvg/128x128/apps/laptop_battery.png
+share/icons/crystalsvg/128x128/apps/superkaramba.png
+share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/16x16/apps/kcmdf.png
+share/icons/crystalsvg/16x16/apps/ksim.png
+share/icons/crystalsvg/16x16/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
+share/icons/crystalsvg/16x16/apps/superkaramba.png
+share/icons/crystalsvg/16x16/devices/ksim_cpu.png
+share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/22x22/apps/kcmdf.png
+share/icons/crystalsvg/22x22/apps/superkaramba.png
+share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/32x32/apps/kcmdf.png
+share/icons/crystalsvg/32x32/apps/ksim.png
+share/icons/crystalsvg/32x32/apps/laptop_battery.png
+share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
+share/icons/crystalsvg/32x32/apps/superkaramba.png
+share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/48x48/apps/ksim.png
+share/icons/crystalsvg/48x48/apps/laptop_battery.png
+share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
+share/icons/crystalsvg/48x48/apps/superkaramba.png
+share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/icons/crystalsvg/64x64/apps/superkaramba.png
+share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
+share/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+share/icons/crystalsvg/scalable/apps/superkaramba.svgz
+share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+share/icons/hicolor/128x128/apps/ark.png
+share/icons/hicolor/128x128/apps/kdf.png
+share/icons/hicolor/128x128/apps/kfloppy.png
+share/icons/hicolor/128x128/apps/kregexpeditor.png
+share/icons/hicolor/128x128/apps/ktimer.png
+share/icons/hicolor/128x128/apps/kwalletmanager.png
+share/icons/hicolor/128x128/apps/kwikdisk.png
+share/icons/hicolor/16x16/apps/ark.png
+share/icons/hicolor/16x16/apps/irkick.png
+share/icons/hicolor/16x16/apps/kcalc.png
+share/icons/hicolor/16x16/apps/kcharselect.png
+share/icons/hicolor/16x16/apps/kdf.png
+share/icons/hicolor/16x16/apps/kedit.png
+share/icons/hicolor/16x16/apps/kfloppy.png
+share/icons/hicolor/16x16/apps/kgpg.png
+share/icons/hicolor/16x16/apps/khexedit.png
+share/icons/hicolor/16x16/apps/kjots.png
+share/icons/hicolor/16x16/apps/kregexpeditor.png
+share/icons/hicolor/16x16/apps/ktimer.png
+share/icons/hicolor/16x16/apps/kwalletmanager.png
+share/icons/hicolor/16x16/apps/kwikdisk.png
+share/icons/hicolor/22x22/apps/ark.png
+share/icons/hicolor/22x22/apps/irkick.png
+share/icons/hicolor/22x22/apps/kcalc.png
+share/icons/hicolor/22x22/apps/kdf.png
+share/icons/hicolor/22x22/apps/kedit.png
+share/icons/hicolor/22x22/apps/kfloppy.png
+share/icons/hicolor/22x22/apps/kgpg.png
+share/icons/hicolor/22x22/apps/kjots.png
+share/icons/hicolor/22x22/apps/kregexpeditor.png
+share/icons/hicolor/22x22/apps/kwalletmanager.png
+share/icons/hicolor/22x22/apps/kwikdisk.png
+share/icons/hicolor/32x32/apps/ark.png
+share/icons/hicolor/32x32/apps/irkick.png
+share/icons/hicolor/32x32/apps/kcalc.png
+share/icons/hicolor/32x32/apps/kcharselect.png
+share/icons/hicolor/32x32/apps/kdf.png
+share/icons/hicolor/32x32/apps/kedit.png
+share/icons/hicolor/32x32/apps/kfloppy.png
+share/icons/hicolor/32x32/apps/kgpg.png
+share/icons/hicolor/32x32/apps/khexedit.png
+share/icons/hicolor/32x32/apps/kjots.png
+share/icons/hicolor/32x32/apps/kregexpeditor.png
+share/icons/hicolor/32x32/apps/ktimer.png
+share/icons/hicolor/32x32/apps/kwalletmanager.png
+share/icons/hicolor/32x32/apps/kwikdisk.png
+share/icons/hicolor/48x48/apps/ark.png
+share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
+share/icons/hicolor/48x48/apps/kdf.png
+share/icons/hicolor/48x48/apps/kedit.png
+share/icons/hicolor/48x48/apps/kfloppy.png
+share/icons/hicolor/48x48/apps/kgpg.png
+share/icons/hicolor/48x48/apps/khexedit.png
+share/icons/hicolor/48x48/apps/kjots.png
+share/icons/hicolor/48x48/apps/kregexpeditor.png
+share/icons/hicolor/48x48/apps/ktimer.png
+share/icons/hicolor/48x48/apps/kwalletmanager.png
+share/icons/hicolor/48x48/apps/kwikdisk.png
+share/icons/hicolor/64x64/apps/ark.png
+share/icons/hicolor/64x64/apps/kcalc.png
+share/icons/hicolor/64x64/apps/kdf.png
+share/icons/hicolor/64x64/apps/kedit.png
+share/icons/hicolor/64x64/apps/kfloppy.png
+share/icons/hicolor/64x64/apps/kjots.png
+share/icons/hicolor/64x64/apps/kregexpeditor.png
+share/icons/hicolor/64x64/apps/kwalletmanager.png
+share/icons/hicolor/64x64/apps/kwikdisk.png
+share/icons/hicolor/scalable/apps/ark.svgz
+share/icons/hicolor/scalable/apps/kcalc.svgz
+share/icons/locolor/16x16/apps/irkick.png
+share/icons/locolor/32x32/apps/irkick.png
 share/kde/applnk/Utilities/superkaramba.desktop
 share/kde/apps/ark/ark_part.rc
 share/kde/apps/ark/ark_part_readonly.rc
@@ -355,108 +456,6 @@ share/kde/config.kcfg/kedit.kcfg
 share/kde/config.kcfg/kgpg.kcfg
 share/kde/config.kcfg/kjots.kcfg
 share/kde/config/ksim_panelextensionrc
-share/kde/icons/crystalsvg/128x128/apps/laptop_battery.png
-share/kde/icons/crystalsvg/128x128/apps/superkaramba.png
-share/kde/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-share/kde/icons/crystalsvg/16x16/apps/kcmdf.png
-share/kde/icons/crystalsvg/16x16/apps/ksim.png
-share/kde/icons/crystalsvg/16x16/apps/laptop_battery.png
-share/kde/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
-share/kde/icons/crystalsvg/16x16/apps/superkaramba.png
-share/kde/icons/crystalsvg/16x16/devices/ksim_cpu.png
-share/kde/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
-share/kde/icons/crystalsvg/22x22/apps/kcmdf.png
-share/kde/icons/crystalsvg/22x22/apps/superkaramba.png
-share/kde/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
-share/kde/icons/crystalsvg/32x32/apps/kcmdf.png
-share/kde/icons/crystalsvg/32x32/apps/ksim.png
-share/kde/icons/crystalsvg/32x32/apps/laptop_battery.png
-share/kde/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
-share/kde/icons/crystalsvg/32x32/apps/superkaramba.png
-share/kde/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
-share/kde/icons/crystalsvg/48x48/apps/ksim.png
-share/kde/icons/crystalsvg/48x48/apps/laptop_battery.png
-share/kde/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
-share/kde/icons/crystalsvg/48x48/apps/superkaramba.png
-share/kde/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
-share/kde/icons/crystalsvg/64x64/apps/laptop_battery.png
-share/kde/icons/crystalsvg/64x64/apps/superkaramba.png
-share/kde/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
-share/kde/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-share/kde/icons/crystalsvg/scalable/apps/superkaramba.svgz
-share/kde/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-share/kde/icons/hicolor/128x128/apps/ark.png
-share/kde/icons/hicolor/128x128/apps/kdf.png
-share/kde/icons/hicolor/128x128/apps/kfloppy.png
-share/kde/icons/hicolor/128x128/apps/kregexpeditor.png
-share/kde/icons/hicolor/128x128/apps/ktimer.png
-share/kde/icons/hicolor/128x128/apps/kwalletmanager.png
-share/kde/icons/hicolor/128x128/apps/kwikdisk.png
-share/kde/icons/hicolor/16x16/apps/ark.png
-share/kde/icons/hicolor/16x16/apps/irkick.png
-share/kde/icons/hicolor/16x16/apps/kcalc.png
-share/kde/icons/hicolor/16x16/apps/kcharselect.png
-share/kde/icons/hicolor/16x16/apps/kdf.png
-share/kde/icons/hicolor/16x16/apps/kedit.png
-share/kde/icons/hicolor/16x16/apps/kfloppy.png
-share/kde/icons/hicolor/16x16/apps/kgpg.png
-share/kde/icons/hicolor/16x16/apps/khexedit.png
-share/kde/icons/hicolor/16x16/apps/kjots.png
-share/kde/icons/hicolor/16x16/apps/kregexpeditor.png
-share/kde/icons/hicolor/16x16/apps/ktimer.png
-share/kde/icons/hicolor/16x16/apps/kwalletmanager.png
-share/kde/icons/hicolor/16x16/apps/kwikdisk.png
-share/kde/icons/hicolor/22x22/apps/ark.png
-share/kde/icons/hicolor/22x22/apps/irkick.png
-share/kde/icons/hicolor/22x22/apps/kcalc.png
-share/kde/icons/hicolor/22x22/apps/kdf.png
-share/kde/icons/hicolor/22x22/apps/kedit.png
-share/kde/icons/hicolor/22x22/apps/kfloppy.png
-share/kde/icons/hicolor/22x22/apps/kgpg.png
-share/kde/icons/hicolor/22x22/apps/kjots.png
-share/kde/icons/hicolor/22x22/apps/kregexpeditor.png
-share/kde/icons/hicolor/22x22/apps/kwalletmanager.png
-share/kde/icons/hicolor/22x22/apps/kwikdisk.png
-share/kde/icons/hicolor/32x32/apps/ark.png
-share/kde/icons/hicolor/32x32/apps/irkick.png
-share/kde/icons/hicolor/32x32/apps/kcalc.png
-share/kde/icons/hicolor/32x32/apps/kcharselect.png
-share/kde/icons/hicolor/32x32/apps/kdf.png
-share/kde/icons/hicolor/32x32/apps/kedit.png
-share/kde/icons/hicolor/32x32/apps/kfloppy.png
-share/kde/icons/hicolor/32x32/apps/kgpg.png
-share/kde/icons/hicolor/32x32/apps/khexedit.png
-share/kde/icons/hicolor/32x32/apps/kjots.png
-share/kde/icons/hicolor/32x32/apps/kregexpeditor.png
-share/kde/icons/hicolor/32x32/apps/ktimer.png
-share/kde/icons/hicolor/32x32/apps/kwalletmanager.png
-share/kde/icons/hicolor/32x32/apps/kwikdisk.png
-share/kde/icons/hicolor/48x48/apps/ark.png
-share/kde/icons/hicolor/48x48/apps/kcalc.png
-share/kde/icons/hicolor/48x48/apps/kcharselect.png
-share/kde/icons/hicolor/48x48/apps/kdf.png
-share/kde/icons/hicolor/48x48/apps/kedit.png
-share/kde/icons/hicolor/48x48/apps/kfloppy.png
-share/kde/icons/hicolor/48x48/apps/kgpg.png
-share/kde/icons/hicolor/48x48/apps/khexedit.png
-share/kde/icons/hicolor/48x48/apps/kjots.png
-share/kde/icons/hicolor/48x48/apps/kregexpeditor.png
-share/kde/icons/hicolor/48x48/apps/ktimer.png
-share/kde/icons/hicolor/48x48/apps/kwalletmanager.png
-share/kde/icons/hicolor/48x48/apps/kwikdisk.png
-share/kde/icons/hicolor/64x64/apps/ark.png
-share/kde/icons/hicolor/64x64/apps/kcalc.png
-share/kde/icons/hicolor/64x64/apps/kdf.png
-share/kde/icons/hicolor/64x64/apps/kedit.png
-share/kde/icons/hicolor/64x64/apps/kfloppy.png
-share/kde/icons/hicolor/64x64/apps/kjots.png
-share/kde/icons/hicolor/64x64/apps/kregexpeditor.png
-share/kde/icons/hicolor/64x64/apps/kwalletmanager.png
-share/kde/icons/hicolor/64x64/apps/kwikdisk.png
-share/kde/icons/hicolor/scalable/apps/ark.svgz
-share/kde/icons/hicolor/scalable/apps/kcalc.svgz
-share/kde/icons/locolor/16x16/apps/irkick.png
-share/kde/icons/locolor/32x32/apps/irkick.png
 share/kde/mimelnk/application/x-superkaramba.desktop
 share/kde/services/ark_part.desktop
 share/kde/services/kbyteseditwidget.desktop
@@ -476,30 +475,6 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @comment in kde: @dirrm share/kde/services/kded
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/devices
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
 @comment in kde: @dirrm share/kde/config.kcfg
 @comment in kde: @dirrm share/kde/config
 @comment in kde: @dirrm share/kde/autostart
@@ -570,6 +545,30 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/ark
 @comment in kde: @dirrm share/kde/apps
 @comment in kde: @dirrm share/kde/applnk/Utilities
+@comment in kde: @dirrm share/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/icons/locolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in kde: @dirrm share/icons/crystalsvg/scalable/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/scalable/apps
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/apps
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/devices
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/doc/kde/HTML/en/superkaramba
 @dirrm share/doc/kde/HTML/en/kwallet
 @dirrm share/doc/kde/HTML/en/ktimer
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index ab34de0b285..a48954364e7 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2006/10/12 10:51:01 markd Exp $
+$NetBSD: distinfo,v 1.45 2007/01/26 03:19:22 markd Exp $
 
-SHA1 (kdeutils-3.5.5.tar.bz2) = 9f81cf7987e23b12861635cfeb69dc46f87f050f
-RMD160 (kdeutils-3.5.5.tar.bz2) = 28ba45da550fd81f2ff9670cc0a98f7d965c3e92
-Size (kdeutils-3.5.5.tar.bz2) = 2988542 bytes
+SHA1 (kdeutils-3.5.6.tar.bz2) = 4ac4b1a9ecb5c695eaff22b15e45eb043516f816
+RMD160 (kdeutils-3.5.6.tar.bz2) = ae0430b4647c259bf730fb427325644b0e8da721
+Size (kdeutils-3.5.6.tar.bz2) = 2989659 bytes
 SHA1 (patch-aa) = 0e9c35666640bdd17b22c03fb06ad6c3eed3a382
 SHA1 (patch-ab) = c85392afdb34c52d309940d7a485d4d2b7b6faaf
 SHA1 (patch-ac) = 9b31039b0e3cc05dc4fb288ee8f66ebf3e440f6e