Update to KDE 3.3

Changes:
* Kgpg
  o Do not show expired keys in the signing dialog Jean-Baptiste Mardelle
  o Make it possible to change colors assigned to trust values
    Jean-Baptiste Mardelle
  o Add option to hide invalid keys (revoked/expired) Jean-Baptiste
    Mardelle
  o Improve multi-file operations (better feedback, non-blocking)
    Jean-Baptiste Mardelle
  o Added search filter in key dialogs Jean-Baptiste Mardelle
  o Added status bar for improved feedback Jean-Baptiste Mardelle
  o Improve autodetection of dropped files (signatures, keys) Jean-Baptiste
    Mardelle
  o Change icon to reflect KGpg's state (busy/ready) Jean-Baptiste
    Mardelle
* KCalc
  o More different modes: logic, statistics, trig-functions Klaus
    Niederkrueger
  o Pressing Ctrl displays the accels for all buttons. Klaus Niederkrueger
  o Display content can be copied with standard actions cut/copy/paste
    Klaus Niederkrueger
* Ark
  o Search Bar Henrique Pinto
  o New Konqueror Integration Plugin Georg Robbers
  o KParts-based integrated viewer Henrique Pinto
  o Improved Extraction Dialog Henrique Pinto

4 files changed, 57 insertions, 117 deletions

diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index f4137bfbd77..ccced2de350 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2004/06/10 12:17:08 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/08/21 14:15:55 markd Exp $
 bin/ark
 bin/irkick
 bin/kcalc
 bin/kcharselect
-bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
@@ -48,8 +47,8 @@ lib/kde3/kcm_kwallet.la
 lib/kde3/kcm_kwallet.so
 lib/kde3/kcm_laptop.la
 lib/kde3/kcm_laptop.so
-lib/kde3/kcm_userinfo.la
-lib/kde3/kcm_userinfo.so
+lib/kde3/kcm_thinkpad.la
+lib/kde3/kcm_thinkpad.so
 lib/kde3/kded_klaptopdaemon.la
 lib/kde3/kded_klaptopdaemon.so
 lib/kde3/kded_kmilod.la
@@ -58,6 +57,8 @@ lib/kde3/kedit.la
 lib/kde3/kedit.so
 lib/kde3/kmilo_generic.la
 lib/kde3/kmilo_generic.so
+lib/kde3/kmilo_thinkpad.la
+lib/kde3/kmilo_thinkpad.so
 lib/kde3/ksim_cpu.la
 lib/kde3/ksim_cpu.so
 lib/kde3/ksim_disk.la
@@ -109,7 +110,6 @@ share/applications/kde/irkick.desktop
 share/applications/kde/kcalc.desktop
 share/applications/kde/kcmdf.desktop
 share/applications/kde/kcmlirc.desktop
-share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdf.desktop
 share/applications/kde/kgpg.desktop
 share/applications/kde/khexedit.desktop
@@ -121,9 +121,7 @@ share/applications/kde/kwalletmanager.desktop
 share/applications/kde/kwikdisk.desktop
 share/applications/kde/laptop.desktop
 share/applications/kde/pcmcia.desktop
-share/applications/kde/userinfo.desktop
-share/autostart/irkick.desktop
-share/autostart/kgpg.desktop
+share/applications/kde/thinkpad.desktop
 share/doc/kde/HTML/en/KRegExpEditor/altn.png
 share/doc/kde/HTML/en/KRegExpEditor/altntool.png
 share/doc/kde/HTML/en/KRegExpEditor/anychar.png
@@ -231,6 +229,11 @@ share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_open.png
 share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png
 share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
 share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
+share/kde/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png
+share/kde/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png
+share/kde/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png
+share/kde/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
+share/kde/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
 share/kde/apps/irkick/icons/hicolor/16x16/actions/irkick.png
 share/kde/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
 share/kde/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
@@ -252,76 +255,15 @@ share/kde/apps/irkick/icons/hicolor/32x32/actions/ledred.png
 share/kde/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
 share/kde/apps/kcalc/kcalcui.rc
 share/kde/apps/kconf_update/kcalcrc.upd
+share/kde/apps/kconf_update/kcharselect.upd
 share/kde/apps/kdf/kdfui.rc
 share/kde/apps/kdf/pics/delete.png
 share/kde/apps/kdf/pics/tick.png
-share/kde/apps/kdm/pics/users/Apple.png
-share/kde/apps/kdm/pics/users/Arch.png
-share/kde/apps/kdm/pics/users/Astronaut.png
-share/kde/apps/kdm/pics/users/BeachBall.png
-share/kde/apps/kdm/pics/users/BeachBall2.png
-share/kde/apps/kdm/pics/users/Blowfish.png
-share/kde/apps/kdm/pics/users/BlueMarble1.png
-share/kde/apps/kdm/pics/users/Bug.png
-share/kde/apps/kdm/pics/users/Burger.png
-share/kde/apps/kdm/pics/users/Butterfly.png
-share/kde/apps/kdm/pics/users/Butterfly2.png
-share/kde/apps/kdm/pics/users/Cactus.png
-share/kde/apps/kdm/pics/users/Car.png
-share/kde/apps/kdm/pics/users/Car2.png
-share/kde/apps/kdm/pics/users/Cheese.png
-share/kde/apps/kdm/pics/users/Clock.png
-share/kde/apps/kdm/pics/users/Cow.png
-share/kde/apps/kdm/pics/users/Daemon.png
-share/kde/apps/kdm/pics/users/Dice.png
-share/kde/apps/kdm/pics/users/Dog.png
-share/kde/apps/kdm/pics/users/Dog2.png
-share/kde/apps/kdm/pics/users/Dragon.png
-share/kde/apps/kdm/pics/users/Elephant.png
-share/kde/apps/kdm/pics/users/Fish.png
-share/kde/apps/kdm/pics/users/Flower.png
-share/kde/apps/kdm/pics/users/Flower2.png
-share/kde/apps/kdm/pics/users/Flower3.png
-share/kde/apps/kdm/pics/users/Frog.png
-share/kde/apps/kdm/pics/users/Ghost.png
-share/kde/apps/kdm/pics/users/Guitar.png
-share/kde/apps/kdm/pics/users/Heart.png
-share/kde/apps/kdm/pics/users/Kiwi.png
-share/kde/apps/kdm/pics/users/Konqui.png
-share/kde/apps/kdm/pics/users/Lava.png
-share/kde/apps/kdm/pics/users/Lion.png
-share/kde/apps/kdm/pics/users/Man.png
-share/kde/apps/kdm/pics/users/Monkey.png
-share/kde/apps/kdm/pics/users/Night.png
-share/kde/apps/kdm/pics/users/Pearl.png
-share/kde/apps/kdm/pics/users/Penguin.png
-share/kde/apps/kdm/pics/users/Pig.png
-share/kde/apps/kdm/pics/users/Pineapple.png
-share/kde/apps/kdm/pics/users/Rabbit.png
-share/kde/apps/kdm/pics/users/Ring.png
-share/kde/apps/kdm/pics/users/Scream.png
-share/kde/apps/kdm/pics/users/Shark.png
-share/kde/apps/kdm/pics/users/Skull.png
-share/kde/apps/kdm/pics/users/Smiley.png
-share/kde/apps/kdm/pics/users/Speakers.png
-share/kde/apps/kdm/pics/users/Splash.png
-share/kde/apps/kdm/pics/users/Star.png
-share/kde/apps/kdm/pics/users/Star2.png
-share/kde/apps/kdm/pics/users/Star3.png
-share/kde/apps/kdm/pics/users/Star4.png
-share/kde/apps/kdm/pics/users/Stars.png
-share/kde/apps/kdm/pics/users/Stars2.png
-share/kde/apps/kdm/pics/users/Teddybear.png
-share/kde/apps/kdm/pics/users/Tiger.png
-share/kde/apps/kdm/pics/users/Tukan.png
-share/kde/apps/kdm/pics/users/Turtle.png
-share/kde/apps/kdm/pics/users/UFO.png
-share/kde/apps/kdm/pics/users/Watch.png
-share/kde/apps/kdm/pics/users/Wind.png
 share/kde/apps/kedit/keditui.rc
 share/kde/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
 share/kde/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
 share/kde/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
+share/kde/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png
 share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
 share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
 share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
@@ -335,15 +277,15 @@ share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png
 share/kde/apps/kgpg/kgpg.rc
 share/kde/apps/kgpg/listkeys.rc
 share/kde/apps/kgpg/pics/kgpg_anim.gif
-share/kde/apps/kgpg/pics/kgpg_bad.png
-share/kde/apps/kgpg/pics/kgpg_good.png
-share/kde/apps/kgpg/pics/kgpg_marginal.png
-share/kde/apps/kgpg/pics/kgpg_unknown.png
+share/kde/apps/kgpg/pics/kgpg_blank.png
+share/kde/apps/kgpg/pics/kgpg_docked.gif
+share/kde/apps/kgpg/pics/kgpg_docked.png
+share/kde/apps/kgpg/pics/kgpg_fill.png
 share/kde/apps/kgpg/tips
 share/kde/apps/khexedit/khexeditui.rc
-share/kde/apps/khexedit/toolbar/hexdrag.png
-share/kde/apps/khexedit/toolbar/hexmask.png
-share/kde/apps/khexedit/toolbar/hexwrite.png
+share/kde/apps/khexedit/pics/hexdrag.png
+share/kde/apps/khexedit/pics/hexmask.png
+share/kde/apps/khexedit/pics/hexwrite.png
 share/kde/apps/kicker/applets/kcharselectapplet.desktop
 share/kde/apps/kicker/extensions/ksim.desktop
 share/kde/apps/kjots/kjotsui.rc
@@ -364,8 +306,6 @@ share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
-share/kde/apps/konqueror/servicemenus/ark_directory_service.desktop
-share/kde/apps/konqueror/servicemenus/arkservicemenu.desktop
 share/kde/apps/konqueror/servicemenus/encryptfile.desktop
 share/kde/apps/konqueror/servicemenus/encryptfolder.desktop
 share/kde/apps/kregexpeditor/pics/altn.png
@@ -426,6 +366,10 @@ share/kde/apps/remotes/cimr100.remote.xml
 share/kde/apps/remotes/hauppauge.remote.xml
 share/kde/apps/remotes/remote.dtd
 share/kde/apps/remotes/sherwood.remote.xml
+share/kde/apps/remotes/sonytv.remote.xml
+share/kde/autostart/irkick.desktop
+share/kde/autostart/kgpg.desktop
+share/kde/config.kcfg/ark.kcfg
 share/kde/config.kcfg/kcalc.kcfg
 share/kde/config.kcfg/kedit.kcfg
 share/kde/config.kcfg/kgpg.kcfg
@@ -434,6 +378,7 @@ share/kde/config/ksim_panelextensionrc
 share/kde/icons/crystalsvg/128x128/apps/ark.png
 share/kde/icons/crystalsvg/128x128/apps/kdf.png
 share/kde/icons/crystalsvg/128x128/apps/kfloppy.png
+share/kde/icons/crystalsvg/128x128/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/128x128/apps/ktimer.png
 share/kde/icons/crystalsvg/128x128/apps/kwalletmanager.png
 share/kde/icons/crystalsvg/128x128/apps/kwikdisk.png
@@ -449,6 +394,7 @@ share/kde/icons/crystalsvg/16x16/apps/kgpg.png
 share/kde/icons/crystalsvg/16x16/apps/khexedit.png
 share/kde/icons/crystalsvg/16x16/apps/kjots.png
 share/kde/icons/crystalsvg/16x16/apps/klaptopdaemon.png
+share/kde/icons/crystalsvg/16x16/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/16x16/apps/ksim.png
 share/kde/icons/crystalsvg/16x16/apps/ktimer.png
 share/kde/icons/crystalsvg/16x16/apps/kwalletmanager.png
@@ -467,6 +413,7 @@ share/kde/icons/crystalsvg/32x32/apps/kfloppy.png
 share/kde/icons/crystalsvg/32x32/apps/kgpg.png
 share/kde/icons/crystalsvg/32x32/apps/khexedit.png
 share/kde/icons/crystalsvg/32x32/apps/kjots.png
+share/kde/icons/crystalsvg/32x32/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/32x32/apps/ksim.png
 share/kde/icons/crystalsvg/32x32/apps/ktimer.png
 share/kde/icons/crystalsvg/32x32/apps/kwalletmanager.png
@@ -482,6 +429,7 @@ share/kde/icons/crystalsvg/48x48/apps/kfloppy.png
 share/kde/icons/crystalsvg/48x48/apps/kgpg.png
 share/kde/icons/crystalsvg/48x48/apps/khexedit.png
 share/kde/icons/crystalsvg/48x48/apps/kjots.png
+share/kde/icons/crystalsvg/48x48/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/48x48/apps/ksim.png
 share/kde/icons/crystalsvg/48x48/apps/ktimer.png
 share/kde/icons/crystalsvg/48x48/apps/kwalletmanager.png
@@ -494,6 +442,7 @@ share/kde/icons/crystalsvg/64x64/apps/kdf.png
 share/kde/icons/crystalsvg/64x64/apps/kedit.png
 share/kde/icons/crystalsvg/64x64/apps/kfloppy.png
 share/kde/icons/crystalsvg/64x64/apps/kjots.png
+share/kde/icons/crystalsvg/64x64/apps/kregexpeditor.png
 share/kde/icons/crystalsvg/64x64/apps/kwalletmanager.png
 share/kde/icons/crystalsvg/64x64/apps/kwikdisk.png
 share/kde/icons/crystalsvg/64x64/apps/laptop_battery.png
@@ -507,18 +456,30 @@ share/kde/services/kbyteseditwidget.desktop
 share/kde/services/kded/klaptopdaemon.desktop
 share/kde/services/kded/kmilod.desktop
 share/kde/services/kmilo/kmilo_generic.desktop
+share/kde/services/kmilo/kmilo_thinkpad.desktop
 share/kde/services/kregexpeditorgui.desktop
 share/kde/services/kwallet_config.desktop
 share/kde/services/kwalletmanager_show.desktop
 share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
+@dirrm share/kde/servicetypes/kmilo
+@dirrm share/kde/services/kmilo
+@dirrm share/kde/services/kded
 @comment dirrm share/kde/services
+@comment dirrm share/kde/icons/locolor/32x32/apps
+@comment dirrm share/kde/icons/locolor/16x16/apps
+@comment dirrm share/kde/icons/hicolor/32x32/apps
+@comment dirrm share/kde/icons/hicolor/22x22/apps
+@comment dirrm share/kde/icons/hicolor/16x16/apps
 @comment dirrm share/kde/icons/crystalsvg/64x64/apps
 @comment dirrm share/kde/icons/crystalsvg/48x48/apps
 @comment dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment dirrm share/kde/icons/crystalsvg/22x22/apps
 @comment dirrm share/kde/icons/crystalsvg/16x16/devices
 @comment dirrm share/kde/icons/crystalsvg/16x16/apps
 @comment dirrm share/kde/icons/crystalsvg/128x128/apps
+@comment dirrm share/kde/config.kcfg
 @comment dirrm share/kde/config
+@comment dirrm share/kde/autostart
 @dirrm share/kde/apps/remotes
 @dirrm share/kde/apps/profiles
 @dirrm share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions
@@ -542,17 +503,14 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16
 @dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg
-@dirrm share/kde/apps/klaptopdaemon/icons
-@dirrm share/kde/apps/klaptopdaemon
 @dirrm share/kde/apps/kjots/pics
 @dirrm share/kde/apps/kjots
-@comment dirrm share/kde/apps/kicker/extensions
-@comment dirrm share/kde/apps/kicker/applets
-@dirrm share/kde/apps/khexedit/toolbar
+@dirrm share/kde/apps/kicker/extensions
+@dirrm share/kde/apps/kicker/applets
+@dirrm share/kde/apps/khexedit/pics
 @dirrm share/kde/apps/khexedit
 @dirrm share/kde/apps/kgpg/pics
 @dirrm share/kde/apps/kgpg/icons/crystalsvg/22x22/actions
@@ -566,8 +524,7 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/kdm/pics/users
 @dirrm share/kde/apps/kdf/pics
 @dirrm share/kde/apps/kdf
-@exec ${MKDIR} %D/share/kde/apps/kcalc/pics
-@dirrm share/kde/apps/kcalc/pics
+@dirrm share/kde/apps/kconf_update
 @dirrm share/kde/apps/kcalc
 @dirrm share/kde/apps/irkick/icons/hicolor/32x32/actions
 @dirrm share/kde/apps/irkick/icons/hicolor/32x32
@@ -576,6 +533,8 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/kde/apps/irkick/icons/hicolor
 @dirrm share/kde/apps/irkick/icons
 @dirrm share/kde/apps/irkick
+@dirrm share/kde/apps/ark/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/ark/icons/crystalsvg/32x32
 @dirrm share/kde/apps/ark/icons/crystalsvg/22x22/actions
 @dirrm share/kde/apps/ark/icons/crystalsvg/22x22
 @dirrm share/kde/apps/ark/icons/crystalsvg
@@ -605,5 +564,6 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
 @dirrm share/doc/kde/HTML/en/ark
 @dirrm share/doc/kde/HTML/en/KRegExpEditor
 @comment dirrm share/doc/kde/HTML/en
+@comment dirrm share/applications/kde
 @comment dirrm lib/kde3
 @dirrm include/ksim
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 8976c70d084..61d5ce8c0c7 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2004/06/10 12:17:08 markd Exp $
+$NetBSD: distinfo,v 1.26 2004/08/21 14:15:55 markd Exp $
 
-SHA1 (kdeutils-3.2.3.tar.bz2) = 8a5a9a69a7a4f841abec051b8cfbc60d9718503b
-Size (kdeutils-3.2.3.tar.bz2) = 2482811 bytes
-SHA1 (patch-aa) = 01c0d686ea0f92fb4dbc5ac04591031dff1137de
+SHA1 (kdeutils-3.3.0.tar.bz2) = ebc87f383ae8cd49171f9f68792595ffad638549
+Size (kdeutils-3.3.0.tar.bz2) = 2206454 bytes
 SHA1 (patch-ac) = c1d962b36bbc3ee3f63155c3d98aa9f92117ecf0
 SHA1 (patch-ad) = ad4fcdda6f9fc1b91e1f125421800e412e2ee0aa
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
 SHA1 (patch-ao) = e6998991444af6becbe89b674728080a27e7a0f1
-SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
+SHA1 (patch-ap) = 5058d3777d03f0ba18047592849c28bd318019ab
diff --git a/misc/kdeutils3/patches/patch-aa b/misc/kdeutils3/patches/patch-aa
deleted file mode 100644
index 266402a90f0..00000000000
--- a/misc/kdeutils3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/02/28 16:21:26 jmmv Exp $
-
---- ark/arksettings.cpp.orig	2003-06-27 15:38:52.000000000 +0200
-+++ ark/arksettings.cpp
-@@ -118,7 +118,7 @@ void ArkSettings::readConfiguration()
- 
-   kc->setGroup( ARK_GROUP );
- 
--  tar_exe = kc->readPathEntry( TAR_KEY, "tar");
-+  tar_exe = kc->readPathEntry( TAR_KEY, ARK_TAR);
- #ifdef ARK_SETTINGS_DEBUG
-   kdDebug(1601) << "Tar command is " << tar_exe << endl;
- #endif
diff --git a/misc/kdeutils3/patches/patch-ap b/misc/kdeutils3/patches/patch-ap
index 289f7011d3a..d30b248618b 100644
--- a/misc/kdeutils3/patches/patch-ap
+++ b/misc/kdeutils3/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 2003/12/27 14:35:16 mrg Exp $
+$NetBSD: patch-ap,v 1.3 2004/08/21 14:15:55 markd Exp $
 
---- ksim/monitors/cpu/ksimcpu.cpp.orig	2003-09-02 11:49:19.000000000 +0000
-+++ ksim/monitors/cpu/ksimcpu.cpp	2003-12-27 14:28:38.000000000 +0000
-@@ -277,11 +277,14 @@
+--- ksim/monitors/cpu/ksimcpu.cpp.orig	2004-07-18 07:13:06.000000000 +1200
++++ ksim/monitors/cpu/ksimcpu.cpp
+@@ -264,6 +264,9 @@ void CpuView::updateCpu(CpuData &cpu, in
    cpu.idle = cpuTime[CP_IDLE];
  #endif
  
@@ -10,11 +10,5 @@ $NetBSD: patch-ap,v 1.2 2003/12/27 14:35:16 mrg Exp $
 +#define KERN_CPTIME KERN_CP_TIME
 +#endif
  #if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
- #warning "add support for SMP on OpenBSD and NetBSD"
+ //#warning "add support for SMP on OpenBSD and NetBSD"
    int name2oid[2] = { CTL_KERN, KERN_CPTIME };
-   long cpuTime[CPUSTATES];
--  unsigned int cpuTimeLen = sizeof(cpuTime);
-+  size_t cpuTimeLen = sizeof(cpuTime);
- 
-   if (sysctl(name2oid, 2, &cpuTime, &cpuTimeLen,
-      0, 0) < 0)