Update to KDE 3.2

Changes:
Utilities

KRegExpEditor
* Create an application on its own from KRegExpEditor (several users
  have requested this) Jesper K. Pedersen
* Add a verifier window where user can try his regular expression
  Jesper K. Pedersen
* Add some warnings on invalid regular expressions (like $^) Jesper
  K. Pedersen
* Ensure predefined regular expressions are correct i18n'ed Jesper K.
  Pedersen
* Add support for Emacs style Regular Expression syntaxes Jesper K. Pedersen

KJots
* XMLUI-ify and improve the interface. Using a treeview for books and
  bookmarks for quick nav. Aaron J. Seigo
* Printing and viewing of entire books. Aaron J. Seigo
* Autosave. Aaron J. Seigo

KMilo
* NEW IN KDE: A generic framework to support special keyboards and
  hardware features, such as those found on laptops. George Staikos
* KMilo support for PowerBooks via pbbuttonsd. George Staikos

KLaptop
* Full Linux ACPI support (suspend etc, throttling, performance
  profiles) Paul Campbell
* Back panel brightness support for some laptops (Sony, Toshiba) Paul
  Campbell
* Recode to run as a KDED daemon Paul Campbell
* Better Thinkpad support Paul Campbell
* Triggers from lid closure (suspend, powerdown etc) - on laptops with
  ACPI support Paul Campbell
* Sony laptop extensions support (/dev/sonypi - scroll wheel, panel
  brightness) Paul Campbell
* Added the ability to auto-disable suspend etc when the load average
  is high Paul Campbell
* Display the state of individual batteries in ACPI systems Paul
  Campbell
* Support for Linux kernel software suspend Paul Campbell
* Added battery charged notification dialog Paul Campbell
* Option to use blank screensaver when in battery mode George Staikos
* Support for the Linux CPUFreq interface. Volker Krause

Kgpg
* NEW IN KDE: frontend for gpg. Jean-Baptiste Mardelle
* Key editing in GUI (changing passphrase, trust, expiration)
* Support for key groups
* Speed up key manager
* Gpg-agent support
* Auto import missing signatures
* improved editor (print, spell check, ...)
* Manage photo id's
* Revocation certificates (print, save)
* Change dialogs to KBaseDialog for ui consistency
* Implement the missing key editing commands in the GUI (adduid,
  deluid,..)
* When encrypting a folder, give a choice of compression scheme
  (zip, tar,...)

KHexEdit2
* NEW IN KDE: A hex edit widget library Friedrich W. H. Kossebau
* move the lib of the new KHexEdit2 widget from kdenonbeta over to
  kdeutils/khexedit/lib Friedrich W. H. Kossebau
* implement interfaces for the KBytesEdit widget part Friedrich W. H.
  Kossebau

16 files changed, 376 insertions, 1354 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index b7c2735456f..d44afec6de7 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/02/04 20:38:00 markd Exp $
 
-DISTNAME=	kdeutils-3.1.5
-PKGREVISION=	1
+DISTNAME=	kdeutils-${_KDE_VERSION}
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
@@ -19,13 +18,6 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 CPPFLAGS+=             -D__NetBSD_APM__
 .endif
 
-FOO_MAIN_FILES= \
-	kcalc/kcalc_main.cpp \
-	kedit/kedit_main.cpp \
-	klaptopdaemon/klaptopdaemon_main.cpp
-
-.include "../../meta-pkgs/kde3/Makefile.foo_main"
-
 .include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index fec7a978972..3d1ee260eaf 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/30 14:24:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/02/04 20:38:00 markd Exp $
 bin/ark
+bin/irkick
 bin/kcalc
 bin/kcharselect
 bin/kdepasswd
@@ -7,17 +8,21 @@ bin/kdessh
 bin/kdf
 bin/kedit
 bin/kfloppy
+bin/kgpg
 bin/khexedit
 bin/kjots
-bin/klaptopdaemon
-bin/ksim
+bin/klaptop_acpi_helper
+bin/klaptop_check
+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
@@ -27,14 +32,32 @@ 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/kcm_laptop.la
 lib/kde3/kcm_laptop.so
+lib/kde3/kcm_userinfo.la
+lib/kde3/kcm_userinfo.so
+lib/kde3/kded_klaptopdaemon.la
+lib/kde3/kded_klaptopdaemon.so
+lib/kde3/kded_kmilod.la
+lib/kde3/kded_kmilod.so
+lib/kde3/kedit.la
+lib/kde3/kedit.so
+lib/kde3/kmilo_generic.la
+lib/kde3/kmilo_generic.so
 lib/kde3/ksim_cpu.la
 lib/kde3/ksim_cpu.so
 lib/kde3/ksim_disk.la
@@ -43,32 +66,64 @@ 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/klaptopdaemon.la
-lib/klaptopdaemon.so
-lib/ksim.la
-lib/ksim.so
-lib/libarkpart.la
-lib/libarkpart.so
-lib/libkcalc_main.la
-lib/libkcalc_main.so
-lib/libkcalc_main.so.0
-lib/libkcalc_main.so.0.0
-lib/libkedit_main.la
-lib/libkedit_main.so
-lib/libklaptopdaemon_main.la
-lib/libklaptopdaemon_main.so
-lib/libklaptopdaemon_main.so.0
-lib/libklaptopdaemon_main.so.0.0
+lib/libkcmlaptop.la
+lib/libkcmlaptop.so
+lib/libkcmlaptop.so.0
+lib/libkcmlaptop.so.0.0
+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/libkmilo.la
+lib/libkmilo.so
+lib/libkmilo.so.1
+lib/libkmilo.so.1.0
+lib/libkregexpeditorcommon.la
+lib/libkregexpeditorcommon.so
+lib/libkregexpeditorcommon.so.1
+lib/libkregexpeditorcommon.so.1.0
 lib/libksimcore.la
 lib/libksimcore.so
 lib/libksimcore.so.1
 lib/libksimcore.so.1.0
+share/applications/kde/KCharSelect.desktop
+share/applications/kde/KEdit.desktop
+share/applications/kde/KFloppy.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/kdepasswd.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/applications/kde/laptop.desktop
+share/applications/kde/pcmcia.desktop
+share/applications/kde/userinfo.desktop
+share/autostart/irkick.desktop
+share/autostart/kgpg.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
@@ -98,6 +153,9 @@ share/doc/kde/HTML/en/KRegExpEditor/wordboundary.png
 share/doc/kde/HTML/en/ark/common
 share/doc/kde/HTML/en/ark/index.cache.bz2
 share/doc/kde/HTML/en/ark/index.docbook
+share/doc/kde/HTML/en/irkick/common
+share/doc/kde/HTML/en/irkick/index.cache.bz2
+share/doc/kde/HTML/en/irkick/index.docbook
 share/doc/kde/HTML/en/kcalc/common
 share/doc/kde/HTML/en/kcalc/index.cache.bz2
 share/doc/kde/HTML/en/kcalc/index.docbook
@@ -106,6 +164,9 @@ share/doc/kde/HTML/en/kcalc/kcalc_on_OSF.txt
 share/doc/kde/HTML/en/kcharselect/common
 share/doc/kde/HTML/en/kcharselect/index.cache.bz2
 share/doc/kde/HTML/en/kcharselect/index.docbook
+share/doc/kde/HTML/en/kcmlirc/common
+share/doc/kde/HTML/en/kcmlirc/index.cache.bz2
+share/doc/kde/HTML/en/kcmlirc/index.docbook
 share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/common
 share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
@@ -129,6 +190,15 @@ share/doc/kde/HTML/en/kedit/index.docbook
 share/doc/kde/HTML/en/kfloppy/common
 share/doc/kde/HTML/en/kfloppy/index.cache.bz2
 share/doc/kde/HTML/en/kfloppy/index.docbook
+share/doc/kde/HTML/en/kgpg/common
+share/doc/kde/HTML/en/kgpg/editor.png
+share/doc/kde/HTML/en/kgpg/index.cache.bz2
+share/doc/kde/HTML/en/kgpg/index.docbook
+share/doc/kde/HTML/en/kgpg/keygen.png
+share/doc/kde/HTML/en/kgpg/keymanage.png
+share/doc/kde/HTML/en/kgpg/keys.png
+share/doc/kde/HTML/en/kgpg/kicker.png
+share/doc/kde/HTML/en/kgpg/options.png
 share/doc/kde/HTML/en/khexedit/common
 share/doc/kde/HTML/en/khexedit/index.cache.bz2
 share/doc/kde/HTML/en/khexedit/index.docbook
@@ -145,28 +215,9 @@ share/doc/kde/HTML/en/ksim/index.docbook
 share/doc/kde/HTML/en/ktimer/common
 share/doc/kde/HTML/en/ktimer/index.cache.bz2
 share/doc/kde/HTML/en/ktimer/index.docbook
-share/kde/applnk/Editors/KEdit.desktop
-share/kde/applnk/Settings/Information/kcmdf.desktop
-share/kde/applnk/Settings/Information/pcmcia.desktop
-share/kde/applnk/Settings/PowerControl/laptop.desktop
-share/kde/applnk/Settingsmenu/kdepasswd.desktop
-share/kde/applnk/System/More/kdf.desktop
-share/kde/applnk/System/More/ksim.desktop
-share/kde/applnk/System/More/kwikdisk.desktop
-share/kde/applnk/System/kdf.desktop
-share/kde/applnk/System/kwikdisk.desktop
-share/kde/applnk/Utilities/KCharSelect.desktop
-share/kde/applnk/Utilities/KFloppy.desktop
-share/kde/applnk/Utilities/Kjots.desktop
-share/kde/applnk/Utilities/More/KCharSelect.desktop
-share/kde/applnk/Utilities/More/Kjots.desktop
-share/kde/applnk/Utilities/More/khexedit.desktop
-share/kde/applnk/Utilities/More/ktimer.desktop
-share/kde/applnk/Utilities/ark.desktop
-share/kde/applnk/Utilities/kcalc.desktop
-share/kde/applnk/Utilities/kdepasswd.desktop
-share/kde/applnk/Utilities/khexedit.desktop
-share/kde/applnk/Utilities/ktimer.desktop
+share/doc/kde/HTML/en/kwallet/common
+share/doc/kde/HTML/en/kwallet/index.cache.bz2
+share/doc/kde/HTML/en/kwallet/index.docbook
 share/kde/apps/ark/ark_part.rc
 share/kde/apps/ark/ark_part_readonly.rc
 share/kde/apps/ark/arkui.rc
@@ -180,14 +231,130 @@ 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/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
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledblue.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledorange.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledred.png
+share/kde/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png
+share/kde/apps/irkick/icons/hicolor/32x32/actions/ledblue.png
+share/kde/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png
+share/kde/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png
+share/kde/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png
+share/kde/apps/irkick/icons/hicolor/32x32/actions/ledorange.png
+share/kde/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
+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/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/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
+share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png
+share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png
+share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png
+share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png
+share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png
+share/kde/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png
+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/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/kicker/applets/kcharselectapplet.desktop
+share/kde/apps/kicker/extensions/ksim.desktop
+share/kde/apps/kjots/kjotsui.rc
 share/kde/apps/kjots/pics/filedel.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_power.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_power.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_power.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
@@ -197,9 +364,13 @@ 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
 share/kde/apps/kregexpeditor/pics/anychar.png
+share/kde/apps/kregexpeditor/pics/autoverify.png
 share/kde/apps/kregexpeditor/pics/begline.png
 share/kde/apps/kregexpeditor/pics/characters.png
 share/kde/apps/kregexpeditor/pics/compound.png
@@ -211,6 +382,7 @@ share/kde/apps/kregexpeditor/pics/poslookahead.png
 share/kde/apps/kregexpeditor/pics/repeat.png
 share/kde/apps/kregexpeditor/pics/select.png
 share/kde/apps/kregexpeditor/pics/text.png
+share/kde/apps/kregexpeditor/pics/verify.png
 share/kde/apps/kregexpeditor/pics/wordboundary.png
 share/kde/apps/kregexpeditor/predefined/general/anything.regexp
 share/kde/apps/kregexpeditor/predefined/general/spaces.regexp
@@ -239,10 +411,32 @@ share/kde/apps/ksim/themes/ksim/mail/decal_mail.png
 share/kde/apps/ksim/themes/ksim/mail/krell_mail.png
 share/kde/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
 share/kde/apps/ksim/themes/ksim/net/decal_net_leds.png
-share/kde/config/ksimrc
+share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
+share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
+share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
+share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
+share/kde/apps/kwalletmanager/kwalleteditor.rc
+share/kde/apps/kwalletmanager/kwalletmanager.rc
+share/kde/apps/profiles/klauncher.profile.xml
+share/kde/apps/profiles/konqueror.profile.xml
+share/kde/apps/profiles/noatun.profile.xml
+share/kde/apps/profiles/profile.dtd
+share/kde/apps/remotes/RM-0010.remote.xml
+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/config.kcfg/kcalc.kcfg
+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/ark.png
 share/kde/icons/crystalsvg/128x128/apps/kdf.png
 share/kde/icons/crystalsvg/128x128/apps/kfloppy.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
 share/kde/icons/crystalsvg/128x128/apps/laptop_battery.png
 share/kde/icons/crystalsvg/16x16/apps/ark.png
 share/kde/icons/crystalsvg/16x16/apps/kcalc.png
@@ -251,23 +445,31 @@ share/kde/icons/crystalsvg/16x16/apps/kcmdf.png
 share/kde/icons/crystalsvg/16x16/apps/kdf.png
 share/kde/icons/crystalsvg/16x16/apps/kedit.png
 share/kde/icons/crystalsvg/16x16/apps/kfloppy.png
+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/ksim.png
+share/kde/icons/crystalsvg/16x16/apps/ktimer.png
+share/kde/icons/crystalsvg/16x16/apps/kwalletmanager.png
 share/kde/icons/crystalsvg/16x16/apps/kwikdisk.png
 share/kde/icons/crystalsvg/16x16/apps/laptop_battery.png
 share/kde/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
 share/kde/icons/crystalsvg/16x16/devices/ksim_cpu.png
+share/kde/icons/crystalsvg/22x22/apps/kgpg.png
+share/kde/icons/crystalsvg/22x22/apps/kwalletmanager.png
 share/kde/icons/crystalsvg/32x32/apps/ark.png
 share/kde/icons/crystalsvg/32x32/apps/kcalc.png
 share/kde/icons/crystalsvg/32x32/apps/kcmdf.png
 share/kde/icons/crystalsvg/32x32/apps/kdf.png
 share/kde/icons/crystalsvg/32x32/apps/kedit.png
 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/ksim.png
+share/kde/icons/crystalsvg/32x32/apps/ktimer.png
+share/kde/icons/crystalsvg/32x32/apps/kwalletmanager.png
 share/kde/icons/crystalsvg/32x32/apps/kwikdisk.png
 share/kde/icons/crystalsvg/32x32/apps/laptop_battery.png
 share/kde/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
@@ -277,17 +479,34 @@ share/kde/icons/crystalsvg/48x48/apps/kcharselect.png
 share/kde/icons/crystalsvg/48x48/apps/kdf.png
 share/kde/icons/crystalsvg/48x48/apps/kedit.png
 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/ksim.png
+share/kde/icons/crystalsvg/48x48/apps/ktimer.png
+share/kde/icons/crystalsvg/48x48/apps/kwalletmanager.png
+share/kde/icons/crystalsvg/48x48/apps/kwikdisk.png
 share/kde/icons/crystalsvg/48x48/apps/laptop_battery.png
 share/kde/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
 share/kde/icons/crystalsvg/64x64/apps/ark.png
+share/kde/icons/crystalsvg/64x64/apps/kcalc.png
 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/kwalletmanager.png
+share/kde/icons/crystalsvg/64x64/apps/kwikdisk.png
 share/kde/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/kde/icons/hicolor/16x16/apps/irkick.png
+share/kde/icons/hicolor/22x22/apps/irkick.png
+share/kde/icons/hicolor/32x32/apps/irkick.png
+share/kde/icons/locolor/16x16/apps/irkick.png
+share/kde/icons/locolor/32x32/apps/irkick.png
 share/kde/services/ark_part.desktop
-share/kde/services/klaptopdaemon.desktop
+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/kregexpeditorgui.desktop
 @comment dirrm share/kde/services
 @comment dirrm share/kde/icons/crystalsvg/64x64/apps
@@ -297,6 +516,13 @@ share/kde/services/kregexpeditorgui.desktop
 @comment dirrm share/kde/icons/crystalsvg/16x16/apps
 @comment dirrm share/kde/icons/crystalsvg/128x128/apps
 @comment dirrm share/kde/config
+@dirrm share/kde/apps/remotes
+@dirrm share/kde/apps/profiles
+@dirrm share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kwalletmanager/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kwalletmanager/icons/crystalsvg
+@dirrm share/kde/apps/kwalletmanager/icons
+@dirrm share/kde/apps/kwalletmanager
 @dirrm share/kde/apps/ksim/themes/ksim/net
 @dirrm share/kde/apps/ksim/themes/ksim/mail
 @dirrm share/kde/apps/ksim/themes/ksim/host
@@ -319,35 +545,46 @@ share/kde/services/kregexpeditorgui.desktop
 @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/khexedit
+@dirrm share/kde/apps/kgpg/pics
+@dirrm share/kde/apps/kgpg/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kgpg/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kgpg/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kgpg/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kgpg/icons/crystalsvg
+@dirrm share/kde/apps/kgpg/icons
+@dirrm share/kde/apps/kgpg
 @dirrm share/kde/apps/kedit
+@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/kcalc
+@dirrm share/kde/apps/irkick/icons/hicolor/32x32/actions
+@dirrm share/kde/apps/irkick/icons/hicolor/32x32
+@dirrm share/kde/apps/irkick/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/irkick/icons/hicolor/16x16
+@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/22x22/actions
 @dirrm share/kde/apps/ark/icons/crystalsvg/22x22
 @dirrm share/kde/apps/ark/icons/crystalsvg
 @dirrm share/kde/apps/ark/icons
 @dirrm share/kde/apps/ark
 @comment dirrm share/kde/apps
-@comment dirrm share/kde/applnk/Utilities/More
-@comment dirrm share/kde/applnk/Utilities
-@comment dirrm share/kde/applnk/System/More
-@comment dirrm share/kde/applnk/System
-@comment dirrm share/kde/applnk/Settingsmenu
-@comment dirrm share/kde/applnk/Settings/PowerControl
-@comment dirrm share/kde/applnk/Settings/Information
-@comment dirrm share/kde/applnk/Editors
+@dirrm share/doc/kde/HTML/en/kwallet
 @dirrm share/doc/kde/HTML/en/ktimer
 @dirrm share/doc/kde/HTML/en/ksim
 @dirrm share/doc/kde/HTML/en/kjots
 @dirrm share/doc/kde/HTML/en/kinfocenter/blockdevices
 @dirrm share/doc/kde/HTML/en/kinfocenter
 @dirrm share/doc/kde/HTML/en/khexedit
+@dirrm share/doc/kde/HTML/en/kgpg
 @dirrm share/doc/kde/HTML/en/kfloppy
 @dirrm share/doc/kde/HTML/en/kedit
 @dirrm share/doc/kde/HTML/en/kdf
@@ -356,8 +593,10 @@ share/kde/services/kregexpeditorgui.desktop
 @dirrm share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn
 @dirrm share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit
 @dirrm share/doc/kde/HTML/en/kcontrol
+@dirrm share/doc/kde/HTML/en/kcmlirc
 @dirrm share/doc/kde/HTML/en/kcharselect
 @dirrm share/doc/kde/HTML/en/kcalc
+@dirrm share/doc/kde/HTML/en/irkick
 @dirrm share/doc/kde/HTML/en/ark
 @dirrm share/doc/kde/HTML/en/KRegExpEditor
 @comment dirrm share/doc/kde/HTML/en
diff --git a/misc/kdeutils3/buildlink2.mk b/misc/kdeutils3/buildlink2.mk
index eabc12aeecd..96721510c6a 100644
--- a/misc/kdeutils3/buildlink2.mk
+++ b/misc/kdeutils3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/01/03 18:49:47 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/04 20:38:00 markd Exp $
 #
 # This Makefile fragment is included by packages that use kdeutils.
 #
@@ -9,7 +9,7 @@
 KDEUTILS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdeutils
-BUILDLINK_DEPENDS.kdeutils?=		kdeutils>=3.1.4nb2
+BUILDLINK_DEPENDS.kdeutils?=		kdeutils>=3.2.0
 BUILDLINK_PKGSRCDIR.kdeutils?=		../../misc/kdeutils3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdeutils=kdeutils
@@ -17,18 +17,20 @@ BUILDLINK_PREFIX.kdeutils_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.kdeutils+=	include/kmultiformlistbox.h
 BUILDLINK_FILES.kdeutils+=	include/kmultiformlistboxentry.h
 BUILDLINK_FILES.kdeutils+=	include/kmultiformlistboxfactory.h
+BUILDLINK_FILES.kdeutils+=	include/ksim/*
 BUILDLINK_FILES.kdeutils+=	include/kwidgetstreamer.h
-BUILDLINK_FILES.kdeutils+=	lib/kcalc.*
+BUILDLINK_FILES.kdeutils+=	lib/kde3/kcalc.*
 BUILDLINK_FILES.kdeutils+=	lib/kde3/kcharselectapplet.*
 BUILDLINK_FILES.kdeutils+=	lib/kde3/kcm_kdf.*
 BUILDLINK_FILES.kdeutils+=	lib/kde3/kcm_laptop.*
 BUILDLINK_FILES.kdeutils+=	lib/kde3/libkregexpeditorgui.*
-BUILDLINK_FILES.kdeutils+=	lib/kedit.*
-BUILDLINK_FILES.kdeutils+=	lib/klaptopdaemon.*
-BUILDLINK_FILES.kdeutils+=	lib/libark.*
-BUILDLINK_FILES.kdeutils+=	lib/libkcalc_main.*
-BUILDLINK_FILES.kdeutils+=	lib/libkedit_main.*
-BUILDLINK_FILES.kdeutils+=	lib/libklaptopdaemon_main.*
+BUILDLINK_FILES.kdeutils+=	lib/kde3/kedit.*
+BUILDLINK_FILES.kdeutils+=	lib/kde3/kded_klaptopdaemon.*
+BUILDLINK_FILES.kdeutils+=	lib/kde3/ark.*
+BUILDLINK_FILES.kdeutils+=	lib/libkcmlaptop.*
+BUILDLINK_FILES.kdeutils+=	lib/libkmilo.*
+BUILDLINK_FILES.kdeutils+=	lib/libkregexpeditorcommon.*
+BUILDLINK_FILES.kdeutils+=	lib/libksimcore.*
 
 .include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 7d8912f8119..f15f1b040e2 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,17 +1,7 @@
-$NetBSD: distinfo,v 1.18 2004/01/15 11:12:40 markd Exp $
+$NetBSD: distinfo,v 1.19 2004/02/04 20:38:00 markd Exp $
 
-SHA1 (kdeutils-3.1.5.tar.bz2) = 7f4e4994b5da6c9658151a292df641e7ff029316
-Size (kdeutils-3.1.5.tar.bz2) = 1379702 bytes
-SHA1 (patch-aa) = 1f5c49e6bea164de6fa1f6db2340d3d96f79a4d9
-SHA1 (patch-ab) = 138e5b88d9f214b6a79adb2d09a2ef68d2eed699
-SHA1 (patch-ac) = a679be9fd652ca2df67f136ace4ad6cee43fffbd
-SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = e367d9098321324391e0c36e64b21ebf71a623af
-SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
-SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
-SHA1 (patch-aj) = d5c667c05354b24026e041e33e1a509166630830
-SHA1 (patch-ak) = 62ba7cf0217ccebbf9c1458b34420a735ee78f80
-SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
-SHA1 (patch-an) = ecc14037fad569dc0627c980537bbfa03e4f820c
-SHA1 (patch-ao) = 1357a3d4df4811e8af59e39ff755e6bf7543987a
+SHA1 (kdeutils-3.2.0.tar.bz2) = 86acd2ae37de5cb6e1b37f141a2d65ba3f336beb
+Size (kdeutils-3.2.0.tar.bz2) = 2517278 bytes
+SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
+SHA1 (patch-ao) = dde26f89bcef1d728aca23053a9afb4e990bb3db
 SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
diff --git a/misc/kdeutils3/patches/patch-aa b/misc/kdeutils3/patches/patch-aa
deleted file mode 100644
index b21c5ebb035..00000000000
--- a/misc/kdeutils3/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/03/11 13:22:31 markd Exp $
-
---- kcalc/Makefile.am.orig	Mon Sep 16 09:16:37 2002
-+++ kcalc/Makefile.am
-@@ -1,20 +1,24 @@
- AM_CPPFLAGS=-D_GNU_SOURCE -D_ISOC99_SOURCE
- bin_PROGRAMS = kcalc
--lib_LTLIBRARIES = kcalc.la
-+lib_LTLIBRARIES = libkcalc_main.la kcalc.la
- 
--kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
-+libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
- 	           optiondialog.cpp
-+libkcalc_main_la_LDFLAGS = $(all_libraries)
-+libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm
-+
-+kcalc_la_SOURCES = kcalc_main.cpp
-+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kcalc_la_LIBADD = libkcalc_main.la
- 
- METASOURCES = AUTO
- 
- noinst_HEADERS  = kcalc.h dlabel.h stats.h kcalctype.h
- 
- INCLUDES= $(all_includes)
--kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kcalc_la_LIBADD = $(LIB_KDEUI) -lm
- 
--kcalc_SOURCES = dummy.cpp
--kcalc_LDADD = kcalc.la
-+kcalc_SOURCES = kcalc_main.cpp
-+kcalc_LDADD = libkcalc_main.la
- kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- pics_DATA = 
-@@ -29,6 +33,3 @@ EXTRA_DIST = $(pics_DATA) $(apps_DATA) 
- 
- messages:
- 	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
--
--dummy.cpp:
--	echo > dummy.cpp
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
deleted file mode 100644
index 51d13878be3..00000000000
--- a/misc/kdeutils3/patches/patch-ab
+++ /dev/null
@@ -1,253 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2004/01/15 11:12:40 markd Exp $
-
---- kcalc/Makefile.in.orig	2003-12-29 11:33:17.000000000 +1300
-+++ kcalc/Makefile.in
-@@ -273,22 +273,26 @@ x_includes = @x_includes@
- x_libraries = @x_libraries@
- AM_CPPFLAGS = -D_GNU_SOURCE -D_ISOC99_SOURCE
- bin_PROGRAMS = kcalc
--lib_LTLIBRARIES = kcalc.la
-+lib_LTLIBRARIES = libkcalc_main.la kcalc.la
- 
--kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
-+libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
- 	           optiondialog.cpp
- 
-+libkcalc_main_la_LDFLAGS = $(all_libraries)
-+libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm
-+
-+kcalc_la_SOURCES = kcalc_main.cpp
-+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kcalc_la_LIBADD = libkcalc_main.la
- 
- #>- METASOURCES = AUTO
- 
- noinst_HEADERS = kcalc.h dlabel.h stats.h kcalctype.h
- 
- INCLUDES = $(all_includes)
--kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kcalc_la_LIBADD = $(LIB_KDEUI) -lm
- 
--kcalc_SOURCES = dummy.cpp
--kcalc_LDADD = kcalc.la
-+kcalc_SOURCES = kcalc_main.cpp
-+kcalc_LDADD = libkcalc_main.la
- kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- pics_DATA = 
-@@ -307,37 +311,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--kcalc_la_DEPENDENCIES =
--am_kcalc_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
--	optiondialog.lo
-+kcalc_la_DEPENDENCIES = libkcalc_main.la
-+am_kcalc_la_OBJECTS = kcalc_main.lo
- #>- kcalc_la_OBJECTS = $(am_kcalc_la_OBJECTS)
-+#>+ 1
-+kcalc_la_OBJECTS = kcalc_main.lo
-+libkcalc_main_la_DEPENDENCIES =
-+am_libkcalc_main_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
-+	optiondialog.lo
-+#>- libkcalc_main_la_OBJECTS = $(am_libkcalc_main_la_OBJECTS)
- #>+ 5
--kcalc_la_final_OBJECTS = kcalc_la.all_cpp.lo 
--kcalc_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
-+libkcalc_main_la_final_OBJECTS = libkcalc_main_la.all_cpp.lo 
-+libkcalc_main_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
- 	optiondialog.lo
--@KDE_USE_FINAL_FALSE@kcalc_la_OBJECTS = $(kcalc_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@kcalc_la_OBJECTS = $(kcalc_la_final_OBJECTS)
-+@KDE_USE_FINAL_FALSE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_nofinal_OBJECTS)
-+@KDE_USE_FINAL_TRUE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_final_OBJECTS)
- bin_PROGRAMS = kcalc$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
--am_kcalc_OBJECTS = dummy.$(OBJEXT)
-+am_kcalc_OBJECTS = kcalc_main.$(OBJEXT)
- #>- kcalc_OBJECTS = $(am_kcalc_OBJECTS)
- #>+ 1
--kcalc_OBJECTS = dummy.$(OBJEXT)
--kcalc_DEPENDENCIES = kcalc.la
-+kcalc_OBJECTS = kcalc_main.$(OBJEXT)
-+kcalc_DEPENDENCIES = libkcalc_main.la
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/dummy.Po \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/kcalc.Plo ./$(DEPDIR)/kcalc_core.Plo \
-+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/kcalc.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kcalc_core.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kcalc_main.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kcalc_main.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
--#>+ 7
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kcalc_la.all_cpp.P  ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/dummy.Po \
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc.Plo ./$(DEPDIR)/kcalc_core.Plo \
-+#>+ 11
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkcalc_main_la.all_cpp.P  ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/kcalc.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc_core.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/dummy.Po \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc.Plo ./$(DEPDIR)/kcalc_core.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/kcalc.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc_core.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kcalc_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
- 
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -358,14 +373,15 @@ CXXLD = $(CXX)
- #>+ 2
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
-+DIST_SOURCES = $(kcalc_la_SOURCES) $(libkcalc_main_la_SOURCES) \
-+	$(kcalc_SOURCES)
- DATA = $(apps_DATA) $(pics_DATA)
- 
- HEADERS = $(noinst_HEADERS)
- 
- DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
- 	Makefile.in
--SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
-+SOURCES = $(kcalc_la_SOURCES) $(libkcalc_main_la_SOURCES) $(kcalc_SOURCES)
- 
- #>- all: all-am
- #>+ 1
-@@ -412,6 +428,8 @@ clean-libLTLIBRARIES:
- 	done
- kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS)
-+libkcalc_main.la: $(libkcalc_main_la_OBJECTS) $(libkcalc_main_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libkcalc_main_la_LDFLAGS) $(libkcalc_main_la_OBJECTS) $(libkcalc_main_la_LIBADD) $(LIBS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -452,9 +470,10 @@ distclean-compile:
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlabel.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcalc.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcalc_core.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcalc_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcalc_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
- 
-@@ -595,7 +614,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=configure.in.in version.h cr16-app-kcalc.png kcalc.desktop optiondialog.h ToDo cr32-app-kcalc.png kcalclogo.xpm cr48-app-kcalc.png 
-+KDE_DIST=version.h cr32-app-kcalc.png kcalclogo.xpm configure.in.in Makefile.in.rej kcalc.desktop cr48-app-kcalc.png optiondialog.h cr16-app-kcalc.png ToDo 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -737,19 +756,16 @@ uninstall-am: uninstall-kde-icons  unins
- 
- messages:
- 	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
--
--dummy.cpp:
--	echo > dummy.cpp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 3
--dlabel.moc: $(srcdir)/dlabel.h
--	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
-+kcalc.moc: $(srcdir)/kcalc.h
-+	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
- 
- #>+ 1
--mocs: dlabel.moc
-+mocs: kcalc.moc
- #>+ 3
- optiondialog.moc: $(srcdir)/optiondialog.h
- 	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
-@@ -757,14 +773,14 @@ optiondialog.moc: $(srcdir)/optiondialog
- #>+ 1
- mocs: optiondialog.moc
- #>+ 3
--kcalc.moc: $(srcdir)/kcalc.h
--	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
-+dlabel.moc: $(srcdir)/dlabel.h
-+	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
- 
- #>+ 1
--mocs: kcalc.moc
-+mocs: dlabel.moc
- #>+ 3
- clean-metasources:
--	-rm -f  dlabel.moc optiondialog.moc kcalc.moc
-+	-rm -f  kcalc.moc optiondialog.moc dlabel.moc
- 
- #>+ 2
- docs-am:
-@@ -791,33 +807,33 @@ force-reedit:
- 
- 
- #>+ 11
--kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp  dlabel.moc kcalc.moc optiondialog.moc
--	@echo 'creating kcalc_la.all_cpp.cpp ...'; \
--	rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \
-+libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp  kcalc.moc optiondialog.moc dlabel.moc
-+	@echo 'creating libkcalc_main_la.all_cpp.cpp ...'; \
-+	rm -f libkcalc_main_la.all_cpp.files libkcalc_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkcalc_main_la.all_cpp.final; \
- 	for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp ; do \
--	  echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \
-+	  echo "#include \"$$file\"" >> libkcalc_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcalc_main_la.all_cpp.final; \
- 	done; \
--	cat kcalc_la.all_cpp.final kcalc_la.all_cpp.files > kcalc_la.all_cpp.cpp; \
--	rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files
-+	cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \
-+	rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files
- 
- #>+ 3
- clean-final:
--	-rm -f kcalc_la.all_cpp.cpp
-+	-rm -f libkcalc_main_la.all_cpp.cpp
- 
- #>+ 2
- final:
--	$(MAKE) kcalc_la_OBJECTS="$(kcalc_la_final_OBJECTS)" all-am
-+	$(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_final_OBJECTS)" all-am
- #>+ 2
- final-install:
--	$(MAKE) kcalc_la_OBJECTS="$(kcalc_la_final_OBJECTS)" install-am
-+	$(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_final_OBJECTS)" install-am
- #>+ 2
- no-final:
--	$(MAKE) kcalc_la_OBJECTS="$(kcalc_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_nofinal_OBJECTS)" all-am
- #>+ 2
- no-final-install:
--	$(MAKE) kcalc_la_OBJECTS="$(kcalc_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_nofinal_OBJECTS)" install-am
- #>+ 3
- cvs-clean:
- 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -827,9 +843,9 @@ kde-rpo-clean:
- 	-rm -f *.rpo
- 
- #>+ 7
--kcalc.o: kcalc.moc 
--dlabel.lo: dlabel.moc 
- optiondialog.o: optiondialog.moc 
--optiondialog.lo: optiondialog.moc 
- kcalc.lo: kcalc.moc 
-+optiondialog.lo: optiondialog.moc 
-+kcalc.o: kcalc.moc 
-+dlabel.lo: dlabel.moc 
- dlabel.o: dlabel.moc 
diff --git a/misc/kdeutils3/patches/patch-ac b/misc/kdeutils3/patches/patch-ac
deleted file mode 100644
index b43e5df9e37..00000000000
--- a/misc/kdeutils3/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/05/22 02:57:14 markd Exp $
-
---- kcalc/kcalc.cpp.orig	Wed May  7 23:48:58 2003
-+++ kcalc/kcalc.cpp
-@@ -2324,7 +2324,9 @@ bool QtCalculator::eventFilter(QObject *
- //-------------------------------------------------------------------------
- // Name: main(int argc, char *argv[])
- //-------------------------------------------------------------------------
--int main(int argc, char *argv[])
-+extern "C" int kdemain(int, char *[]);
-+
-+int kdemain(int argc, char *argv[])
- {
-         QString precisionStatement;
- 
diff --git a/misc/kdeutils3/patches/patch-ae b/misc/kdeutils3/patches/patch-ae
deleted file mode 100644
index 63980bd7df7..00000000000
--- a/misc/kdeutils3/patches/patch-ae
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
-
---- kedit/Makefile.am.orig	Wed May  8 19:31:38 2002
-+++ kedit/Makefile.am
-@@ -8,15 +8,19 @@
- INCLUDES = $(all_includes)
- 
- bin_PROGRAMS = kedit
--lib_LTLIBRARIES = kedit.la
-+lib_LTLIBRARIES = libkedit_main.la kedit.la
- 
--kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
-+libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
- 		mail.cpp  optiondialog.cpp 
--kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
-+libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
-+libkedit_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+
-+kedit_la_SOURCES = kedit_main.cpp
-+kedit_la_LIBADD = libkedit_main.la
- kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
--kedit_SOURCES = dummy.cpp
--kedit_LDADD   = kedit.la
-+kedit_SOURCES = kedit_main.cpp
-+kedit_LDADD   = libkedit_main.la
- kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -36,6 +40,3 @@
- 
- messages: rc.cpp
- 	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
--
--dummy.cpp:
--	echo > dummy.cpp
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af
deleted file mode 100644
index 58bdc512b50..00000000000
--- a/misc/kdeutils3/patches/patch-af
+++ /dev/null
@@ -1,248 +0,0 @@
-$NetBSD: patch-af,v 1.6 2004/01/15 11:12:40 markd Exp $
-
---- kedit/Makefile.in.orig	2003-12-29 11:33:17.000000000 +1300
-+++ kedit/Makefile.in
-@@ -282,16 +282,20 @@ x_libraries = @x_libraries@
- INCLUDES = $(all_includes)
- 
- bin_PROGRAMS = kedit
--lib_LTLIBRARIES = kedit.la
-+lib_LTLIBRARIES = libkedit_main.la kedit.la
- 
--kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
-+libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
- 		mail.cpp  optiondialog.cpp 
- 
--kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
-+libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
-+libkedit_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+
-+kedit_la_SOURCES = kedit_main.cpp
-+kedit_la_LIBADD = libkedit_main.la
- kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
--kedit_SOURCES = dummy.cpp
--kedit_LDADD = kedit.la
-+kedit_SOURCES = kedit_main.cpp
-+kedit_LDADD = libkedit_main.la
- kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -316,34 +320,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--kedit_la_DEPENDENCIES =
--am_kedit_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo
-+kedit_la_DEPENDENCIES = libkedit_main.la
-+am_kedit_la_OBJECTS = kedit_main.lo
- #>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS)
--#>+ 4
--kedit_la_final_OBJECTS = kedit_la.all_cpp.lo 
--kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo
--@KDE_USE_FINAL_FALSE@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS)
-+#>+ 1
-+kedit_la_OBJECTS = kedit_main.lo
-+libkedit_main_la_DEPENDENCIES =
-+am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
-+	optiondialog.lo
-+#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS)
-+#>+ 5
-+libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo 
-+libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
-+	optiondialog.lo
-+@KDE_USE_FINAL_FALSE@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS)
-+@KDE_USE_FINAL_TRUE@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS)
- bin_PROGRAMS = kedit$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
--am_kedit_OBJECTS = dummy.$(OBJEXT)
-+am_kedit_OBJECTS = kedit_main.$(OBJEXT)
- #>- kedit_OBJECTS = $(am_kedit_OBJECTS)
- #>+ 1
--kedit_OBJECTS = dummy.$(OBJEXT)
--kedit_DEPENDENCIES = kedit.la
-+kedit_OBJECTS = kedit_main.$(OBJEXT)
-+kedit_DEPENDENCIES = libkedit_main.la
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
-+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kedit_main.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo
--#>+ 7
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kedit_la.all_cpp.P  ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
-+#>+ 9
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkedit_main_la.all_cpp.P  ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kedit_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kedit_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo
- 
-@@ -365,7 +379,8 @@ CXXLD = $(CXX)
- #>+ 2
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
-+DIST_SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) \
-+	$(kedit_SOURCES)
- DATA = $(apps_DATA) $(rc_DATA)
- 
- HEADERS = $(noinst_HEADERS)
-@@ -379,7 +394,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
- 	Makefile.in TODO
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
-+SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) $(kedit_SOURCES)
- 
- #>- all: all-recursive
- #>+ 1
-@@ -426,6 +441,8 @@ clean-libLTLIBRARIES:
- 	done
- kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS)
-+libkedit_main.la: $(libkedit_main_la_OBJECTS) $(libkedit_main_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libkedit_main_la_LDFLAGS) $(libkedit_main_la_OBJECTS) $(libkedit_main_la_LIBADD) $(LIBS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -465,8 +482,9 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kedit.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kedit_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kedit_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktextfiledlg.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
-@@ -678,7 +696,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=KEdit.desktop keditui.rc optionstate.h 
-+KDE_DIST=KEdit.desktop keditui.rc Makefile.in.rej optionstate.h 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -838,19 +856,16 @@ uninstall-info: uninstall-info-recursive
- 
- messages: rc.cpp
- 	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
--
--dummy.cpp:
--	echo > dummy.cpp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 3
--ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h
--	$(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc
-+optiondialog.moc: $(srcdir)/optiondialog.h
-+	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
- 
- #>+ 1
--mocs: ktextfiledlg.moc
-+mocs: optiondialog.moc
- #>+ 3
- mail.moc: $(srcdir)/mail.h
- 	$(MOC) $(srcdir)/mail.h -o mail.moc
-@@ -858,11 +873,11 @@ mail.moc: $(srcdir)/mail.h
- #>+ 1
- mocs: mail.moc
- #>+ 3
--optiondialog.moc: $(srcdir)/optiondialog.h
--	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
-+ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h
-+	$(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc
- 
- #>+ 1
--mocs: optiondialog.moc
-+mocs: ktextfiledlg.moc
- #>+ 3
- kedit.moc: $(srcdir)/kedit.h
- 	$(MOC) $(srcdir)/kedit.h -o kedit.moc
-@@ -871,7 +886,7 @@ kedit.moc: $(srcdir)/kedit.h
- mocs: kedit.moc
- #>+ 3
- clean-metasources:
--	-rm -f  ktextfiledlg.moc mail.moc optiondialog.moc kedit.moc
-+	-rm -f  optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc
- 
- #>+ 2
- docs-am:
-@@ -884,33 +899,33 @@ force-reedit:
- 
- 
- #>+ 11
--kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp  ktextfiledlg.moc mail.moc optiondialog.moc kedit.moc
--	@echo 'creating kedit_la.all_cpp.cpp ...'; \
--	rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \
-+libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp  optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
-+	@echo 'creating libkedit_main_la.all_cpp.cpp ...'; \
-+	rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \
- 	for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp ; do \
--	  echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \
-+	  echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \
- 	done; \
--	cat kedit_la.all_cpp.final kedit_la.all_cpp.files > kedit_la.all_cpp.cpp; \
--	rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files
-+	cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \
-+	rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files
- 
- #>+ 3
- clean-final:
--	-rm -f kedit_la.all_cpp.cpp
-+	-rm -f libkedit_main_la.all_cpp.cpp
- 
- #>+ 2
- final:
--	$(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" all-am
-+	$(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" all-am
- #>+ 2
- final-install:
--	$(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" install-am
-+	$(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" install-am
- #>+ 2
- no-final:
--	$(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" all-am
- #>+ 2
- no-final-install:
--	$(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" install-am
- #>+ 3
- cvs-clean:
- 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -920,11 +935,11 @@ kde-rpo-clean:
- 	-rm -f *.rpo
- 
- #>+ 9
--kedit.o: kedit.moc 
--ktextfiledlg.lo: ktextfiledlg.moc 
--ktextfiledlg.o: ktextfiledlg.moc 
- optiondialog.o: optiondialog.moc 
-+mail.lo: mail.moc 
- optiondialog.lo: optiondialog.moc 
--kedit.lo: kedit.moc 
- mail.o: mail.moc 
--mail.lo: mail.moc 
-+kedit.lo: kedit.moc 
-+ktextfiledlg.o: ktextfiledlg.moc 
-+ktextfiledlg.lo: ktextfiledlg.moc 
-+kedit.o: kedit.moc 
diff --git a/misc/kdeutils3/patches/patch-ag b/misc/kdeutils3/patches/patch-ag
deleted file mode 100644
index d04f98596c1..00000000000
--- a/misc/kdeutils3/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
-
---- kedit/kedit.cpp.orig	Tue Feb 26 16:08:29 2002
-+++ kedit/kedit.cpp
-@@ -1502,7 +1502,9 @@
- 	{ 0, 0, 0}
- };
- 
--int main (int argc, char **argv)
-+extern "C" int kdemain (int, char **);
-+
-+int kdemain (int argc, char **argv)
- {
- 	bool have_top_window = false;
- 
diff --git a/misc/kdeutils3/patches/patch-ai b/misc/kdeutils3/patches/patch-ai
deleted file mode 100644
index 7fe5e568bc0..00000000000
--- a/misc/kdeutils3/patches/patch-ai
+++ /dev/null
@@ -1,197 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
-
---- kfloppy/floppy.cpp.orig	Wed May  8 19:31:38 2002
-+++ kfloppy/floppy.cpp
-@@ -211,64 +211,114 @@
- {
-   if( deviceComboBox->currentText() == i18n("Primary") ){
-     if( densityComboBox->currentText() == i18n("3.5\" 1.44MB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd0b";
-+      tracks = 160;
-+#else
-       device = "/dev/fd0H1440";
--      blocks = 1440;
-       tracks = 80;
-+#endif
-+      blocks = 1440;
-+#ifndef __NetBSD__
-       if( access(QFile::encodeName(device),W_OK) < 0){
- 	device = "/dev/fd0u1440";
-       }
-+#endif
-     }
-     else
-     if( densityComboBox->currentText() == i18n("3.5\" 720KB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd0f";
-+      tracks = 160;
-+#else
-       device = "/dev/fd0D720";
--      blocks = 720;
-       tracks = 80;
-+#endif
-+      blocks = 720;
-+#ifndef __NetBSD__
-       if( access(QFile::encodeName(device),W_OK) < 0){
- 	device = "/dev/fd0u720";
-       }
-+#endif
-     }
-     else
-     if( densityComboBox->currentText() == i18n("5.25\" 1.2MB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd0c";
-+      tracks = 160;
-+      blocks = 1200;
-+#else
-       device = "/dev/fd0h1200";
-       blocks = 720;
-       tracks = 80;
-+#endif
-       }
-     else
-     if( densityComboBox->currentText() == i18n("5.25\" 360KB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd0g";
-+      tracks = 160;
-+#else
-       device = "/dev/fd0h360";
--      blocks = 720;
-       tracks = 80;
-+#endif
-+      blocks = 720;
-       }
-     }
-   if( deviceComboBox->currentText() == i18n("Secondary") ){
-     if( densityComboBox->currentText() == i18n("3.5\" 1.44MB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd1b";
-+      tracks = 160;
-+#else
-       device = "/dev/fd1H1440";
--      blocks = 1440;
-       tracks = 80;
-+#endif
-+      blocks = 1440;
-+#ifndef __NetBSD__
-       if( access(QFile::encodeName(device),W_OK) < 0){
--	device = "/dev/fd1u1440";
-+	device = "/dev/fd0u1440";
-       }
-+#endif
-     }
-     else
-     if( densityComboBox->currentText() == i18n("3.5\" 720KB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd1f";
-+      tracks = 160;
-+#else
-       device = "/dev/fd1D720";
--      blocks = 720;
-       tracks = 80;
-+#endif
-+      blocks = 720;
-+#ifndef __NetBSD__
-       if( access(QFile::encodeName(device),W_OK) < 0){
- 	device = "/dev/fd1u720";
-       }
-+#endif
-     }
-     else
-     if( densityComboBox->currentText() == i18n("5.25\" 1.2MB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd1c";
-+      tracks = 160;
-+      blocks = 1200;
-+#else
-       device = "/dev/fd1h1200";
-       blocks = 720;
-       tracks = 80;
-+#endif
-       }
-     else
-     if( densityComboBox->currentText() == i18n("5.25\" 360KB")){
-+#ifdef __NetBSD__
-+      device = "/dev/rfd1g";
-+      tracks = 160;
-+#else
-       device = "/dev/fd1h360";
--      blocks = 720;
-       tracks = 80;
-+#endif
-+      blocks = 720;
-       }
-     }
- 
-@@ -294,16 +344,22 @@
-   path.append(":/usr/sbin:/sbin");
- 
-   fdformat = KGlobal::dirs()->findExe("fdformat", path);
-+#ifndef __NetBSD__
-   mke2fs = KGlobal::dirs()->findExe("mke2fs", path);
-   mkdosfs = KGlobal::dirs()->findExe("mkdosfs", path);
-+#else
-+  mkdosfs = KGlobal::dirs()->findExe("newfs_msdos", path);
-+#endif
-   QString str = "";
-   if (fdformat.isEmpty()) {
-     str = i18n("Cannot find fdformat.");
-   }
- 
-+#ifndef __NetBSD__
-   if (mke2fs.isEmpty()) {
-     str = i18n("Cannot find mke2fs");
-   }
-+#endif
- 
-   if (mkdosfs.isEmpty()) {
-     str = i18n("Cannot find mkdosfs");
-@@ -416,6 +472,9 @@
-   if (!verifylabel->isChecked()) {
-     *proc << "-n";
-   }
-+#ifdef __NetBSD__
-+  *proc << "-f";
-+#endif
-   *proc << device;
- 
-   connect(proc, SIGNAL(processExited(KProcess *)),this, SLOT(formatdone(KProcess*)));
-@@ -433,7 +492,10 @@
-     KMessageBox::error(this, str);
-     reset();
-   }
--}
-+#ifdef __NetBSD__
-+  proc->writeStdin("y\n", 2);
-+#endif
-+} 
- }
- }
- 
-@@ -740,12 +802,17 @@
- 
-         *proc << mkdosfs;
- 	if(labellabel->isChecked())
-+#ifdef __NetBSD__
-+	  *proc << "-L" <<lineedit->text();
-+#else
- 	  *proc << "-n" <<lineedit->text();
-         if (verifylabel->isChecked()) {
-           *proc << "-c";
-         }
-+#endif
- 	*proc << device;
-   }
-+#ifndef __NetBSD__
-   else{
- 
-     *proc << mke2fs;
-@@ -757,6 +824,7 @@
-     }
-     *proc << device;
-   }
-+#endif
- 
- 
- 
diff --git a/misc/kdeutils3/patches/patch-aj b/misc/kdeutils3/patches/patch-aj
deleted file mode 100644
index fc79986358d..00000000000
--- a/misc/kdeutils3/patches/patch-aj
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2003/03/11 13:22:32 markd Exp $
-
---- klaptopdaemon/Makefile.am.orig	Mon Sep 16 09:16:37 2002
-+++ klaptopdaemon/Makefile.am
-@@ -1,16 +1,20 @@
--lib_LTLIBRARIES = klaptopdaemon.la
-+lib_LTLIBRARIES = libklaptopdaemon_main.la klaptopdaemon.la
- kde_module_LTLIBRARIES = kcm_laptop.la
- bin_PROGRAMS = klaptopdaemon
- SUBDIRS = pics applnk
- 
--klaptopdaemon_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
-+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
- 	kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp acpi_config.cpp
-+libklaptopdaemon_main_la_LDFLAGS = $(all_libraries)
-+libklaptopdaemon_main_la_LIBADD   = $(LIB_KDEUI)
-+
-+klaptopdaemon_la_SOURCES = klaptopdaemon_main.cpp
- klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version
--klaptopdaemon_la_LIBADD   = $(LIB_KDEUI)
-+klaptopdaemon_la_LIBADD   = libklaptopdaemon_main.la
- 
--klaptopdaemon_SOURCES = dummy.cpp
-+klaptopdaemon_SOURCES = klaptopdaemon_main.cpp
- klaptopdaemon_LDFLAGS = $(all_libraries)
--klaptopdaemon_LDADD = klaptopdaemon.la
-+klaptopdaemon_LDADD = libklaptopdaemon_main.la
- 
- kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
- 	portable.cpp acpi_config.cpp
-@@ -19,13 +23,10 @@ kcm_laptop_la_LIBADD = $(LIB_KFILE)
- 
- INCLUDES= $(all_includes)
- 
--LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
- 
- kcm_laptop_la_METASOURCES = AUTO
- 
- messages:
- 	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
- 	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
--
--dummy.cpp:
--	echo >dummy.cpp
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
deleted file mode 100644
index 287d78b5218..00000000000
--- a/misc/kdeutils3/patches/patch-ak
+++ /dev/null
@@ -1,384 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2004/01/15 11:12:40 markd Exp $
-
---- klaptopdaemon/Makefile.in.orig	2003-12-29 11:33:18.000000000 +1300
-+++ klaptopdaemon/Makefile.in
-@@ -91,7 +91,7 @@ KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FAL
- KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- 
--LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
- LIBCOMPAT = @LIBCOMPAT@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
-@@ -272,20 +272,24 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
--lib_LTLIBRARIES = klaptopdaemon.la
-+lib_LTLIBRARIES = libklaptopdaemon_main.la klaptopdaemon.la
- kde_module_LTLIBRARIES = kcm_laptop.la
- bin_PROGRAMS = klaptopdaemon
- SUBDIRS = pics applnk
- 
--klaptopdaemon_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
-+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
- 	kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp acpi_config.cpp
- 
-+libklaptopdaemon_main_la_LDFLAGS = $(all_libraries)
-+libklaptopdaemon_main_la_LIBADD = $(LIB_KDEUI)
-+
-+klaptopdaemon_la_SOURCES = klaptopdaemon_main.cpp
- klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version
--klaptopdaemon_la_LIBADD = $(LIB_KDEUI)
-+klaptopdaemon_la_LIBADD = libklaptopdaemon_main.la
- 
--klaptopdaemon_SOURCES = dummy.cpp
-+klaptopdaemon_SOURCES = klaptopdaemon_main.cpp
- klaptopdaemon_LDFLAGS = $(all_libraries)
--klaptopdaemon_LDADD = klaptopdaemon.la
-+klaptopdaemon_LDADD = libklaptopdaemon_main.la
- 
- kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
- 	portable.cpp acpi_config.cpp
-@@ -313,49 +317,60 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
- 	warning.lo portable.lo acpi_config.lo
- @KDE_USE_FINAL_FALSE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_final_OBJECTS)
--klaptopdaemon_la_DEPENDENCIES =
--am_klaptopdaemon_la_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
--	daemondock.lo notify.lo portable.lo acpi_config.lo
-+klaptopdaemon_la_DEPENDENCIES = libklaptopdaemon_main.la
-+am_klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
- #>- klaptopdaemon_la_OBJECTS = $(am_klaptopdaemon_la_OBJECTS)
--#>+ 5
--klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo 
--klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
--	daemondock.lo notify.lo portable.lo acpi_config.lo
--@KDE_USE_FINAL_FALSE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS)
-+#>+ 1
-+klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
-+libklaptopdaemon_main_la_DEPENDENCIES =
-+am_libklaptopdaemon_main_la_OBJECTS = laptop_daemon.lo kpcmcia.lo \
-+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
-+	acpi_config.lo
-+#>- libklaptopdaemon_main_la_OBJECTS = \
-+#>- 	$(am_libklaptopdaemon_main_la_OBJECTS)
-+#>+ 6
-+libklaptopdaemon_main_la_final_OBJECTS = libklaptopdaemon_main_la.all_cpp.lo 
-+libklaptopdaemon_main_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo \
-+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
-+	acpi_config.lo
-+@KDE_USE_FINAL_FALSE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_nofinal_OBJECTS)
-+@KDE_USE_FINAL_TRUE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_final_OBJECTS)
- bin_PROGRAMS = klaptopdaemon$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
--am_klaptopdaemon_OBJECTS = dummy.$(OBJEXT)
-+am_klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
- #>- klaptopdaemon_OBJECTS = $(am_klaptopdaemon_OBJECTS)
- #>+ 1
--klaptopdaemon_OBJECTS = dummy.$(OBJEXT)
--klaptopdaemon_DEPENDENCIES = klaptopdaemon.la
-+klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
-+klaptopdaemon_DEPENDENCIES = libklaptopdaemon_main.la
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
- #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi_config.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kpcmcia.Plo \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/kpcmciainfo.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/klaptopdaemon_main.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/klaptopdaemon_main.Po \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kpcmcia.Plo ./$(DEPDIR)/kpcmciainfo.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/warning.Plo
--#>+ 17
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P  ./$(DEPDIR)/acpi_config.Plo \
-+#>+ 19
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P  ./$(DEPDIR)/acpi_config.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kpcmcia.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kpcmciainfo.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/klaptopdaemon_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/klaptopdaemon_main.Po \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kpcmcia.Plo ./$(DEPDIR)/kpcmciainfo.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/warning.Plo
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/acpi_config.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kpcmcia.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kpcmciainfo.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/klaptopdaemon_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/klaptopdaemon_main.Po \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kpcmcia.Plo ./$(DEPDIR)/kpcmciainfo.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
-@@ -380,7 +395,7 @@ CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
--	$(klaptopdaemon_SOURCES)
-+	$(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- 	ps-recursive install-info-recursive uninstall-info-recursive \
-@@ -389,7 +404,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	check-recursive installcheck-recursive
- DIST_COMMON = README Makefile.am Makefile.in
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(klaptopdaemon_SOURCES)
-+SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
- 
- #>- all: all-recursive
- #>+ 1
-@@ -469,6 +484,8 @@ clean-libLTLIBRARIES:
- 	$(CXXLINK) -rpath $(kde_moduledir) $(kcm_laptop_la_LDFLAGS) $(kcm_laptop_la_OBJECTS) $(kcm_laptop_la_LIBADD) $(LIBS)
- klaptopdaemon.la: $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(klaptopdaemon_la_LDFLAGS) $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_LIBADD) $(LIBS)
-+libklaptopdaemon_main.la: $(libklaptopdaemon_main_la_OBJECTS) $(libklaptopdaemon_main_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libklaptopdaemon_main_la_LDFLAGS) $(libklaptopdaemon_main_la_OBJECTS) $(libklaptopdaemon_main_la_LIBADD) $(LIBS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -511,7 +528,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi_config.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battery.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemondock.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klaptopdaemon_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klaptopdaemon_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpcmcia.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpcmciainfo.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laptop_daemon.Plo@am__quote@
-@@ -693,7 +711,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=laptop_daemon.h pcmcia.h acpi_config.h warning.h notify.h power.h configure.in.in version.h battery.h portable.h kpcmciainfo.h main.h kpcmcia.h daemondock.h 
-+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h Makefile.in.rej kpcmcia.h laptop_daemon.h notify.h 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -859,9 +877,6 @@ uninstall-info: uninstall-info-recursive
- messages:
- 	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
- 	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
--
--dummy.cpp:
--	echo >dummy.cpp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-@@ -876,17 +891,17 @@ kcm_laptop.la.closure: $(kcm_laptop_la_O
- 
- 
- #>+ 3
--pcmcia.moc: $(srcdir)/pcmcia.h
--	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
-+kpcmcia.moc: $(srcdir)/kpcmcia.h
-+	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
- 
- #>+ 1
--mocs: pcmcia.moc
-+mocs: kpcmcia.moc
- #>+ 3
--battery.moc: $(srcdir)/battery.h
--	$(MOC) $(srcdir)/battery.h -o battery.moc
-+pcmcia.moc: $(srcdir)/pcmcia.h
-+	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
- 
- #>+ 1
--mocs: battery.moc
-+mocs: pcmcia.moc
- #>+ 3
- daemondock.moc: $(srcdir)/daemondock.h
- 	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
-@@ -894,41 +909,35 @@ daemondock.moc: $(srcdir)/daemondock.h
- #>+ 1
- mocs: daemondock.moc
- #>+ 3
--acpi_config.moc: $(srcdir)/acpi_config.h
--	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
--
--#>+ 1
--mocs: acpi_config.moc
--#>+ 3
--kpcmcia.moc: $(srcdir)/kpcmcia.h
--	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
--
--#>+ 1
--mocs: kpcmcia.moc
--#>+ 3
- notify.moc: $(srcdir)/notify.h
- 	$(MOC) $(srcdir)/notify.h -o notify.moc
- 
- #>+ 1
- mocs: notify.moc
- #>+ 3
--warning.moc: $(srcdir)/warning.h
--	$(MOC) $(srcdir)/warning.h -o warning.moc
-+main.moc: $(srcdir)/main.h
-+	$(MOC) $(srcdir)/main.h -o main.moc
- 
- #>+ 1
--mocs: warning.moc
-+mocs: main.moc
- #>+ 3
--laptop_daemon.moc: $(srcdir)/laptop_daemon.h
--	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
-+kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
-+	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
- 
- #>+ 1
--mocs: laptop_daemon.moc
-+mocs: kpcmciainfo.moc
- #>+ 3
--main.moc: $(srcdir)/main.h
--	$(MOC) $(srcdir)/main.h -o main.moc
-+battery.moc: $(srcdir)/battery.h
-+	$(MOC) $(srcdir)/battery.h -o battery.moc
- 
- #>+ 1
--mocs: main.moc
-+mocs: battery.moc
-+#>+ 3
-+acpi_config.moc: $(srcdir)/acpi_config.h
-+	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
-+
-+#>+ 1
-+mocs: acpi_config.moc
- #>+ 3
- power.moc: $(srcdir)/power.h
- 	$(MOC) $(srcdir)/power.h -o power.moc
-@@ -936,14 +945,20 @@ power.moc: $(srcdir)/power.h
- #>+ 1
- mocs: power.moc
- #>+ 3
--kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
--	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
-+warning.moc: $(srcdir)/warning.h
-+	$(MOC) $(srcdir)/warning.h -o warning.moc
- 
- #>+ 1
--mocs: kpcmciainfo.moc
-+mocs: warning.moc
-+#>+ 3
-+laptop_daemon.moc: $(srcdir)/laptop_daemon.h
-+	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
-+
-+#>+ 1
-+mocs: laptop_daemon.moc
- #>+ 3
- clean-metasources:
--	-rm -f  pcmcia.moc battery.moc daemondock.moc acpi_config.moc kpcmcia.moc notify.moc warning.moc laptop_daemon.moc main.moc power.moc kpcmciainfo.moc
-+	-rm -f  kpcmcia.moc pcmcia.moc daemondock.moc notify.moc main.moc kpcmciainfo.moc battery.moc acpi_config.moc power.moc warning.moc laptop_daemon.moc
- 
- #>+ 3
- clean-closures:
-@@ -960,7 +975,7 @@ force-reedit:
- 
- 
- #>+ 11
--kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  pcmcia.moc battery.moc acpi_config.moc warning.moc main.moc power.moc
-+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  pcmcia.moc main.moc battery.moc acpi_config.moc warning.moc power.moc
- 	@echo 'creating kcm_laptop_la.all_cpp.cpp ...'; \
- 	rm -f kcm_laptop_la.all_cpp.files kcm_laptop_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_laptop_la.all_cpp.final; \
-@@ -972,33 +987,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
- 	rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files
- 
- #>+ 11
--klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc acpi_config.moc kpcmcia.moc notify.moc laptop_daemon.moc kpcmciainfo.moc
--	@echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \
--	rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \
-+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc acpi_config.moc laptop_daemon.moc
-+	@echo 'creating libklaptopdaemon_main_la.all_cpp.cpp ...'; \
-+	rm -f libklaptopdaemon_main_la.all_cpp.files libklaptopdaemon_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libklaptopdaemon_main_la.all_cpp.final; \
- 	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp acpi_config.cpp ; do \
--	  echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
-+	  echo "#include \"$$file\"" >> libklaptopdaemon_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklaptopdaemon_main_la.all_cpp.final; \
- 	done; \
--	cat klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files > klaptopdaemon_la.all_cpp.cpp; \
--	rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
-+	cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \
-+	rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files
- 
- #>+ 3
- clean-final:
--	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp
-+	-rm -f kcm_laptop_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp
- 
- #>+ 2
- final:
--	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_final_OBJECTS)" all-am
-+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_final_OBJECTS)" all-am
- #>+ 2
- final-install:
--	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_final_OBJECTS)" install-am
-+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_final_OBJECTS)" install-am
- #>+ 2
- no-final:
--	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" all-am
- #>+ 2
- no-final-install:
--	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" install-am
- #>+ 3
- cvs-clean:
- 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1008,25 +1023,25 @@ kde-rpo-clean:
- 	-rm -f *.rpo
- 
- #>+ 23
--laptop_daemon.lo: laptop_daemon.moc 
--daemondock.o: daemondock.moc 
--pcmcia.o: pcmcia.moc 
--kpcmciainfo.lo: kpcmciainfo.moc 
--battery.lo: battery.moc 
--power.o: power.moc 
-+kpcmcia.o: kpcmcia.moc 
-+kpcmcia.lo: kpcmcia.moc 
-+laptop_daemon.o: laptop_daemon.moc 
- notify.o: notify.moc 
--power.lo: power.moc 
--daemondock.lo: daemondock.moc 
--pcmcia.lo: pcmcia.moc 
-+power.o: power.moc 
-+notify.lo: notify.moc 
- warning.lo: warning.moc 
--kpcmcia.o: kpcmcia.moc 
--kpcmciainfo.o: kpcmciainfo.moc 
-+warning.o: warning.moc 
- acpi_config.lo: acpi_config.moc 
- main.lo: main.moc 
-+laptop_daemon.lo: laptop_daemon.moc 
-+kpcmciainfo.o: kpcmciainfo.moc 
-+battery.o: battery.moc 
- acpi_config.o: acpi_config.moc 
--notify.lo: notify.moc 
--warning.o: warning.moc 
-+pcmcia.lo: pcmcia.moc 
-+battery.lo: battery.moc 
-+daemondock.lo: daemondock.moc 
-+daemondock.o: daemondock.moc 
-+pcmcia.o: pcmcia.moc 
- main.o: main.moc 
--battery.o: battery.moc 
--kpcmcia.lo: kpcmcia.moc 
--laptop_daemon.o: laptop_daemon.moc 
-+kpcmciainfo.lo: kpcmciainfo.moc 
-+power.lo: power.moc 
diff --git a/misc/kdeutils3/patches/patch-am b/misc/kdeutils3/patches/patch-am
deleted file mode 100644
index d10ee54587b..00000000000
--- a/misc/kdeutils3/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
-
---- klaptopdaemon/laptop_daemon.cpp.orig	Thu Dec 13 06:53:49 2001
-+++ klaptopdaemon/laptop_daemon.cpp
-@@ -426,7 +426,9 @@
-         emit(signal_checkBattery());
- }
- 
--int main(int argc, char **argv)
-+extern "C" int kdemain(int, char **);
-+
-+int kdemain(int argc, char **argv)
- {
-    /* if (!laptop_portable::has_power_management())
- 	exit(0); 
diff --git a/misc/kdeutils3/patches/patch-an b/misc/kdeutils3/patches/patch-an
index 61e0b592246..b0232611ab2 100644
--- a/misc/kdeutils3/patches/patch-an
+++ b/misc/kdeutils3/patches/patch-an
@@ -1,8 +1,25 @@
-$NetBSD: patch-an,v 1.3 2003/03/11 13:22:32 markd Exp $
+$NetBSD: patch-an,v 1.4 2004/02/04 20:38:00 markd Exp $
 
---- klaptopdaemon/portable.cpp.orig	Fri Jan  3 18:07:53 2003
+--- klaptopdaemon/portable.cpp.orig	2003-11-30 22:50:47.000000000 +1300
 +++ klaptopdaemon/portable.cpp
-@@ -1130,6 +1130,7 @@ laptop_portable::has_power_management()
+@@ -2414,10 +2414,14 @@ laptop_portable::software_suspend_set_ma
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <machine/apmvar.h>
+-#include <iostream.h>
++#include <iostream>
++#include <qpushbutton.h>
++#include <qobject.h>
++#include <kactivelabel.h>
++#include <kprocess.h>
+ 
+ //
+-// klaptopdeamon interface to NetBSD 1.5 apm.
++// Klaptopdeamon interface to NetBSD 1.5 apm.
+ // Scott Presnell, srp@zgi.com, srp@tworoads.net
+ // Fri Jun 29 17:21:25 PDT 2001
+ // Tested on Dell I4K running NetBSD 1.5R
+@@ -2439,6 +2443,7 @@ laptop_portable::has_power_management()
         }
  
         struct apm_power_info info;
@@ -10,7 +27,7 @@ $NetBSD: patch-an,v 1.3 2003/03/11 13:22:32 markd Exp $
         ret=ioctl(fd, APM_IOC_GETPOWER, &info);
         ::close(fd);
  
-@@ -1151,6 +1152,7 @@ int laptop_portable::has_battery_time()
+@@ -2466,6 +2471,7 @@ int laptop_portable::has_battery_time()
           return 0;
  
         struct apm_power_info info;
@@ -18,7 +35,7 @@ $NetBSD: patch-an,v 1.3 2003/03/11 13:22:32 markd Exp $
         ret=ioctl(fd, APM_IOC_GETPOWER, &info);
         ::close(fd);
  
-@@ -1288,6 +1290,15 @@ void laptop_portable::invoke_hibernation
+@@ -2639,6 +2645,15 @@ laptop_portable::apm_set_mask(bool , boo
  
  
  //
@@ -34,7 +51,7 @@ $NetBSD: patch-an,v 1.3 2003/03/11 13:22:32 markd Exp $
  //     return current battery state
  //
  struct power_result laptop_portable::poll_battery_state()
-@@ -1301,6 +1312,7 @@ struct power_result laptop_portable::pol
+@@ -2652,6 +2667,7 @@ struct power_result laptop_portable::pol
                 goto bad;
  
                 struct apm_power_info info;
@@ -42,3 +59,34 @@ $NetBSD: patch-an,v 1.3 2003/03/11 13:22:32 markd Exp $
                 ret=ioctl(fd, APM_IOC_GETPOWER, &info);
                 ::close(fd);
         
+@@ -2714,7 +2730,16 @@ laptop_portable::get_brightness()
+ }
+ 
+ bool
+-laptop_portable::get_system_throttling(bool, int &current, QStringList &s)   // do something to help get system throttling data from places like ACPI
++laptop_portable::get_system_performance(bool, int &current, QStringList &s, bool *&)	 // do something to help get system profiles from places like ACPI
++{
++	// INSERT HERE
++	current = 0;
++	s.clear();
++	return(0);	// if no profiles are available
++}
++
++bool
++laptop_portable::get_system_throttling(bool, int &current, QStringList &s, bool *&)   // do something to help get system throttling data from places like ACPI
+ {
+ 	// INSERT HERE
+ 	current = 0;
+@@ -2772,6 +2797,12 @@ laptop_portable::get_battery_status(int 
+ 	values.append(s);
+ }
+ 
++void
++laptop_portable::software_suspend_set_mask(bool hibernate)
++{
++	// software_suspend_is_preferred = hibernate;
++}
++
+ #else
+ 
+ /*
diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index 14109e581c4..c00f96a9482 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.7 2004/01/15 11:12:40 markd Exp $
+$NetBSD: patch-ao,v 1.8 2004/02/04 20:38:00 markd Exp $
 
---- configure.orig	2003-12-17 13:58:48.000000000 +1300
+--- configure.orig	2004-02-01 14:43:19.000000000 +1300
 +++ configure
-@@ -26231,62 +26231,6 @@ _ACEOF
+@@ -24850,63 +24850,6 @@ _ACEOF
  
  
  
--  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
--echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* #line $LINENO "configure" */
 -/* confdefs.h.  */
@@ -50,11 +50,11 @@ $NetBSD: patch-ao,v 1.7 2004/01/15 11:12:40 markd Exp $
 -      echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -      { { echo "$as_me:$LINENO: error:
--       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
+-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long
 -       does not apply. Please mail kde-devel@kde.org with a description of your system!
 -      " >&5
 -echo "$as_me: error:
--       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
+-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long
 -       does not apply. Please mail kde-devel@kde.org with a description of your system!
 -      " >&2;}
 -   { (exit 1); exit 1; }; }
@@ -62,6 +62,7 @@ $NetBSD: patch-ao,v 1.7 2004/01/15 11:12:40 markd Exp $
 -fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 -
- CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE  -DQT_NO_ASCII_CAST"
+-
+ # darwin needs this to initialize the environment
  
- echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
+ for ac_header in crt_externs.h