summaryrefslogtreecommitdiff
path: root/misc/kdeutils3
diff options
context:
space:
mode:
Diffstat (limited to 'misc/kdeutils3')
-rw-r--r--misc/kdeutils3/Makefile4
-rw-r--r--misc/kdeutils3/PLIST318
-rw-r--r--misc/kdeutils3/buildlink2.mk4
-rw-r--r--misc/kdeutils3/distinfo23
-rw-r--r--misc/kdeutils3/patches/patch-aa13
-rw-r--r--misc/kdeutils3/patches/patch-ab107
-rw-r--r--misc/kdeutils3/patches/patch-ac10
-rw-r--r--misc/kdeutils3/patches/patch-af90
-rw-r--r--misc/kdeutils3/patches/patch-aj21
-rw-r--r--misc/kdeutils3/patches/patch-ak225
-rw-r--r--misc/kdeutils3/patches/patch-an274
-rw-r--r--misc/kdeutils3/patches/patch-ao53
-rw-r--r--misc/kdeutils3/patches/patch-ap14
13 files changed, 525 insertions, 631 deletions
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 7d7391e2e18..642c4882368 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2003/02/18 00:35:51 jtb Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/11 13:22:30 markd Exp $
-DISTNAME= kdeutils-3.0.5a
+DISTNAME= kdeutils-3.1
COMMENT= Utilities for the KDE integrated X11 desktop
CONFLICTS= efax-[0-9]*
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index 5a2f249eee4..539f738bd5a 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/20 10:03:54 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/11 13:22:30 markd Exp $
bin/ark
-bin/efax
-bin/efix
-bin/fax
bin/kcalc
bin/kcharselect
bin/kdepasswd
@@ -13,37 +10,51 @@ bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
+bin/ksim
bin/ktimer
bin/kwikdisk
include/kmultiformlistbox.h
include/kmultiformlistboxentry.h
include/kmultiformlistboxfactory.h
+include/ksim/chart.h
+include/ksim/common.h
+include/ksim/label.h
+include/ksim/led.h
+include/ksim/pluginglobal.h
+include/ksim/pluginloader.h
+include/ksim/pluginmodule.h
+include/ksim/progress.h
+include/ksim/themeloader.h
+include/ksim/themetypes.h
include/kwidgetstreamer.h
lib/kcalc.la
lib/kcalc.so
-lib/kde3/kcharselectapplet.la
-lib/kde3/kcharselectapplet.so
-lib/kde3/kcharselectapplet.so.1
-lib/kde3/kcharselectapplet.so.1.0
+lib/kde3/kcharselect_panelapplet.la
+lib/kde3/kcharselect_panelapplet.so
lib/kde3/kcm_kdf.la
lib/kde3/kcm_kdf.so
lib/kde3/kcm_laptop.la
lib/kde3/kcm_laptop.so
+lib/kde3/ksim_cpu.la
+lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.la
+lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.la
+lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.la
+lib/kde3/ksim_net.so
+lib/kde3/ksim_sensors.la
+lib/kde3/ksim_sensors.so
lib/kde3/libkregexpeditorgui.la
lib/kde3/libkregexpeditorgui.so
lib/kedit.la
lib/kedit.so
lib/klaptopdaemon.la
lib/klaptopdaemon.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-lib/libark.so.1.0
+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
@@ -54,9 +65,10 @@ lib/libklaptopdaemon_main.la
lib/libklaptopdaemon_main.so
lib/libklaptopdaemon_main.so.0
lib/libklaptopdaemon_main.so.0.0
-man/man1/efax.1
-man/man1/efix.1
-man/man1/fax.1
+lib/libksimcore.la
+lib/libksimcore.so
+lib/libksimcore.so.1
+lib/libksimcore.so.1.0
share/doc/kde/HTML/en/KRegExpEditor/altn.png
share/doc/kde/HTML/en/KRegExpEditor/altntool.png
share/doc/kde/HTML/en/KRegExpEditor/anychar.png
@@ -86,16 +98,26 @@ 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/kab/common
-share/doc/kde/HTML/en/kab/index.cache.bz2
-share/doc/kde/HTML/en/kab/index.docbook
-share/doc/kde/HTML/en/kab/kab-edit.png
-share/doc/kde/HTML/en/kab/kab-using.png
share/doc/kde/HTML/en/kcalc/common
share/doc/kde/HTML/en/kcalc/index.cache.bz2
share/doc/kde/HTML/en/kcalc/index.docbook
share/doc/kde/HTML/en/kcalc/kcalc_on_Aix.txt
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/kcontrol/kcmlowbatcrit/common
+share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
+share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/common
+share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
+share/doc/kde/HTML/en/kcontrol/laptop/common
+share/doc/kde/HTML/en/kcontrol/laptop/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/laptop/index.docbook
+share/doc/kde/HTML/en/kcontrol/powerctrl/common
+share/doc/kde/HTML/en/kcontrol/powerctrl/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/powerctrl/index.docbook
share/doc/kde/HTML/en/kdf/common
share/doc/kde/HTML/en/kdf/index.cache.bz2
share/doc/kde/HTML/en/kdf/index.docbook
@@ -111,56 +133,53 @@ share/doc/kde/HTML/en/khexedit/common
share/doc/kde/HTML/en/khexedit/index.cache.bz2
share/doc/kde/HTML/en/khexedit/index.docbook
share/doc/kde/HTML/en/khexedit/khexedit1.png
+share/doc/kde/HTML/en/kinfocenter/blockdevices/common
+share/doc/kde/HTML/en/kinfocenter/blockdevices/index.cache.bz2
+share/doc/kde/HTML/en/kinfocenter/blockdevices/index.docbook
share/doc/kde/HTML/en/kjots/common
share/doc/kde/HTML/en/kjots/index.cache.bz2
share/doc/kde/HTML/en/kjots/index.docbook
-share/doc/kde/HTML/en/kljettool/README
-share/doc/kde/HTML/en/kljettool/common
-share/doc/kde/HTML/en/kljettool/djcdoscommands.txt
-share/doc/kde/HTML/en/kljettool/filter
-share/doc/kde/HTML/en/kljettool/hp690c.zip
-share/doc/kde/HTML/en/kljettool/index.cache.bz2
-share/doc/kde/HTML/en/kljettool/index.docbook
-share/doc/kde/HTML/en/kljettool/magic
-share/doc/kde/HTML/en/kljettool/screenshot.png
-share/doc/kde/HTML/en/klpq/common
-share/doc/kde/HTML/en/klpq/index.cache.bz2
-share/doc/kde/HTML/en/klpq/index.docbook
-share/doc/kde/HTML/en/klprfax/common
-share/doc/kde/HTML/en/klprfax/index.cache.bz2
-share/doc/kde/HTML/en/klprfax/index.docbook
+share/doc/kde/HTML/en/ksim/common
+share/doc/kde/HTML/en/ksim/index.cache.bz2
+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/battery.desktop
-share/kde/applnk/Settings/PowerControl/bwarning.desktop
-share/kde/applnk/Settings/PowerControl/cwarning.desktop
-share/kde/applnk/Settings/PowerControl/power.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/KLJetTool.desktop
-share/kde/applnk/Utilities/KLpq.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/klprfax.desktop
share/kde/applnk/Utilities/ktimer.desktop
share/kde/apps/ark/ark_part.rc
+share/kde/apps/ark/ark_part_readonly.rc
share/kde/apps/ark/arkui.rc
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/kde/apps/ark/icons/hicolor/22x22/actions/ark_view.png
+share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
+share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
+share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
+share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
+share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_help.png
+share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_new.png
+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/kdf/pics/delete.png
share/kde/apps/kdf/pics/tick.png
share/kde/apps/kedit/keditui.rc
@@ -169,12 +188,11 @@ share/kde/apps/khexedit/toolbar/hexmask.png
share/kde/apps/khexedit/toolbar/hexwrite.png
share/kde/apps/kicker/applets/kcharselectapplet.desktop
share/kde/apps/kjots/pics/filedel.png
-share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-share/kde/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/kde/apps/kljettool/pics/kljetlogo.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
+share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
share/kde/apps/konqueror/servicemenus/arkservicemenu.desktop
share/kde/apps/kregexpeditor/pics/altn.png
share/kde/apps/kregexpeditor/pics/anychar.png
@@ -192,71 +210,107 @@ share/kde/apps/kregexpeditor/pics/text.png
share/kde/apps/kregexpeditor/pics/wordboundary.png
share/kde/apps/kregexpeditor/predefined/general/anything.regexp
share/kde/apps/kregexpeditor/predefined/general/spaces.regexp
-share/kde/icons/hicolor/16x16/apps/ark.png
-share/kde/icons/hicolor/16x16/apps/kcalc.png
-share/kde/icons/hicolor/16x16/apps/kcharselect.png
-share/kde/icons/hicolor/16x16/apps/kcmdf.png
-share/kde/icons/hicolor/16x16/apps/kdf.png
-share/kde/icons/hicolor/16x16/apps/kedit.png
-share/kde/icons/hicolor/16x16/apps/kfloppy.png
-share/kde/icons/hicolor/16x16/apps/khexedit.png
-share/kde/icons/hicolor/16x16/apps/kjots.png
-share/kde/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/kde/icons/hicolor/16x16/apps/kljettool.png
-share/kde/icons/hicolor/16x16/apps/klpq.png
-share/kde/icons/hicolor/16x16/apps/klprfax.png
-share/kde/icons/hicolor/16x16/apps/kwikdisk.png
-share/kde/icons/hicolor/16x16/apps/laptop_battery.png
-share/kde/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/kde/icons/hicolor/32x32/apps/ark.png
-share/kde/icons/hicolor/32x32/apps/kcalc.png
-share/kde/icons/hicolor/32x32/apps/kcmdf.png
-share/kde/icons/hicolor/32x32/apps/kdf.png
-share/kde/icons/hicolor/32x32/apps/kedit.png
-share/kde/icons/hicolor/32x32/apps/kfloppy.png
-share/kde/icons/hicolor/32x32/apps/khexedit.png
-share/kde/icons/hicolor/32x32/apps/kjots.png
-share/kde/icons/hicolor/32x32/apps/kljettool.png
-share/kde/icons/hicolor/32x32/apps/klpq.png
-share/kde/icons/hicolor/32x32/apps/klprfax.png
-share/kde/icons/hicolor/32x32/apps/kwikdisk.png
-share/kde/icons/hicolor/32x32/apps/laptop_battery.png
-share/kde/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/kde/icons/hicolor/48x48/apps/ark.png
-share/kde/icons/hicolor/48x48/apps/kcalc.png
-share/kde/icons/hicolor/48x48/apps/kcharselect.png
-share/kde/icons/hicolor/48x48/apps/kedit.png
-share/kde/icons/hicolor/48x48/apps/kfloppy.png
-share/kde/icons/hicolor/48x48/apps/khexedit.png
-share/kde/icons/hicolor/48x48/apps/kjots.png
-share/kde/icons/hicolor/48x48/apps/kljettool.png
-share/kde/icons/hicolor/48x48/apps/klpq.png
-share/kde/icons/hicolor/48x48/apps/laptop_battery.png
-share/kde/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/kde/icons/locolor/16x16/apps/klprfax.png
-share/kde/icons/locolor/32x32/apps/klprfax.png
-share/kde/services/arkpart.desktop
+share/kde/apps/ksim/monitors/DFree.desktop
+share/kde/apps/ksim/monitors/Lm_sensors.desktop
+share/kde/apps/ksim/monitors/Net.desktop
+share/kde/apps/ksim/monitors/cpu.desktop
+share/kde/apps/ksim/monitors/disk.desktop
+share/kde/apps/ksim/pics/clock.png
+share/kde/apps/ksim/pics/uptime.png
+share/kde/apps/ksim/themes/ksim/bg_chart.png
+share/kde/apps/ksim/themes/ksim/bg_grid.png
+share/kde/apps/ksim/themes/ksim/bg_meter.png
+share/kde/apps/ksim/themes/ksim/bg_panel.png
+share/kde/apps/ksim/themes/ksim/frame_bottom.png
+share/kde/apps/ksim/themes/ksim/frame_left.png
+share/kde/apps/ksim/themes/ksim/frame_right.png
+share/kde/apps/ksim/themes/ksim/frame_top.png
+share/kde/apps/ksim/themes/ksim/gkrellmrc
+share/kde/apps/ksim/themes/ksim/gkrellmrc_ksim
+share/kde/apps/ksim/themes/ksim/host/bg_meter.png
+share/kde/apps/ksim/themes/ksim/krell_meter.png
+share/kde/apps/ksim/themes/ksim/krell_panel.png
+share/kde/apps/ksim/themes/ksim/krell_slider.png
+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/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/laptop_battery.png
+share/kde/icons/crystalsvg/16x16/apps/ark.png
+share/kde/icons/crystalsvg/16x16/apps/kcalc.png
+share/kde/icons/crystalsvg/16x16/apps/kcharselect.png
+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/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/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/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/khexedit.png
+share/kde/icons/crystalsvg/32x32/apps/kjots.png
+share/kde/icons/crystalsvg/32x32/apps/ksim.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
+share/kde/icons/crystalsvg/48x48/apps/ark.png
+share/kde/icons/crystalsvg/48x48/apps/kcalc.png
+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/khexedit.png
+share/kde/icons/crystalsvg/48x48/apps/kjots.png
+share/kde/icons/crystalsvg/48x48/apps/ksim.png
+share/kde/icons/crystalsvg/48x48/apps/laptop_battery.png
+share/kde/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
+share/kde/icons/crystalsvg/64x64/apps/ark.png
+share/kde/icons/crystalsvg/64x64/apps/kdf.png
+share/kde/icons/crystalsvg/64x64/apps/kfloppy.png
+share/kde/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/kde/services/ark_part.desktop
share/kde/services/klaptopdaemon.desktop
share/kde/services/kregexpeditorgui.desktop
@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/48x48/apps
-@comment dirrm share/kde/icons/hicolor/32x32/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/16x16/devices
+@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/ksim/themes/ksim/net
+@dirrm share/kde/apps/ksim/themes/ksim/mail
+@dirrm share/kde/apps/ksim/themes/ksim/host
+@dirrm share/kde/apps/ksim/themes/ksim
+@dirrm share/kde/apps/ksim/themes
+@dirrm share/kde/apps/ksim/pics
+@dirrm share/kde/apps/ksim/monitors
+@dirrm share/kde/apps/ksim
@dirrm share/kde/apps/kregexpeditor/predefined/general
@dirrm share/kde/apps/kregexpeditor/predefined
@dirrm share/kde/apps/kregexpeditor/pics
@dirrm share/kde/apps/kregexpeditor
@dirrm share/kde/apps/konqueror/servicemenus
-@comment dirrm share/kde/apps/konqueror
-@dirrm share/kde/apps/kljettool/pics
-@dirrm share/kde/apps/kljettool
-@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/kde/apps/klaptopdaemon/icons/hicolor
+@dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32
+@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
@@ -270,28 +324,38 @@ share/kde/services/kregexpeditorgui.desktop
@exec ${MKDIR} %D/share/kde/apps/kcalc/pics
@dirrm share/kde/apps/kcalc/pics
@dirrm share/kde/apps/kcalc
-@dirrm share/kde/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/ark/icons/hicolor/22x22
-@dirrm share/kde/apps/ark/icons/hicolor
+@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/klprfax
-@dirrm share/doc/kde/HTML/en/klpq
-@dirrm share/doc/kde/HTML/en/kljettool
+@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/kfloppy
@dirrm share/doc/kde/HTML/en/kedit
@dirrm share/doc/kde/HTML/en/kdf
+@dirrm share/doc/kde/HTML/en/kcontrol/powerctrl
+@dirrm share/doc/kde/HTML/en/kcontrol/laptop
+@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/kcharselect
@dirrm share/doc/kde/HTML/en/kcalc
-@dirrm share/doc/kde/HTML/en/kab
@dirrm share/doc/kde/HTML/en/ark
@dirrm share/doc/kde/HTML/en/KRegExpEditor
@comment dirrm share/doc/kde/HTML/en
@comment dirrm lib/kde3
+@dirrm include/ksim
diff --git a/misc/kdeutils3/buildlink2.mk b/misc/kdeutils3/buildlink2.mk
index 13982728a07..9c245f7a7fd 100644
--- a/misc/kdeutils3/buildlink2.mk
+++ b/misc/kdeutils3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:42 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/03/11 13:22:31 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.0.5.1
+BUILDLINK_DEPENDS.kdeutils?= kdeutils>=3.1
BUILDLINK_PKGSRCDIR.kdeutils?= ../../misc/kdeutils3
EVAL_PREFIX+= BUILDLINK_PREFIX.kdeutils=kdeutils
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 2e91e583d03..593575d2ab2 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.11 2003/02/26 23:09:01 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2003/03/11 13:22:31 markd Exp $
-SHA1 (kdeutils-3.0.5a.tar.bz2) = 63104afb1686c5eaed7939e1bd8b6ec6b2cda7fd
-Size (kdeutils-3.0.5a.tar.bz2) = 1515962 bytes
-SHA1 (patch-aa) = ac87861b38a93564e79e57cf5c8dc0de7f8c720a
-SHA1 (patch-ab) = 7e29e85c52c585b795f0a1a9f8c2a92bef6804a0
-SHA1 (patch-ac) = bb2f28bb4bc5d84d19ebf3a1d19aa5e7d21f61d3
+SHA1 (kdeutils-3.1.tar.bz2) = 892ea1a2839edfd58b7c9632874656160207d414
+Size (kdeutils-3.1.tar.bz2) = 1371036 bytes
+SHA1 (patch-aa) = 1f5c49e6bea164de6fa1f6db2340d3d96f79a4d9
+SHA1 (patch-ab) = cb92ee33598ddc88f4c208643d30eec7fe1939e3
+SHA1 (patch-ac) = 82f07ddce0b787e8b66a968be94fda88936315eb
SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = 4091778400aded8120d59707eeeeaa4e8864cd34
+SHA1 (patch-af) = afde2d8744a38ed54d2c864708f3aa3b60a5b850
SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
-SHA1 (patch-aj) = 31d0fe7b4d4b785da9e4e8188feb4378a25ce05a
-SHA1 (patch-ak) = 19816b75a7dad23fc52ba5c856f549d66c45d8ee
+SHA1 (patch-aj) = d5c667c05354b24026e041e33e1a509166630830
+SHA1 (patch-ak) = 1467f9378baa739ea44bfa064975623c3d458c19
SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
-SHA1 (patch-an) = ffd5589988aaa4e581cdfa9bfb7bdb9067f505fe
-SHA1 (patch-ao) = 796feacef8048a1fd48f431cc5a00e9ca7bd63d3
+SHA1 (patch-an) = ecc14037fad569dc0627c980537bbfa03e4f820c
+SHA1 (patch-ao) = ea325f7a07260a8a7277aa9b040bb92d4f0d916c
+SHA1 (patch-ap) = 7938c4a33fa178740b0d2f704f4aab1b693ee112
diff --git a/misc/kdeutils3/patches/patch-aa b/misc/kdeutils3/patches/patch-aa
index c7b948d488b..b21c5ebb035 100644
--- a/misc/kdeutils3/patches/patch-aa
+++ b/misc/kdeutils3/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2002/06/21 15:36:31 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/11 13:22:31 markd Exp $
---- kcalc/Makefile.am.orig Wed May 8 19:31:32 2002
+--- kcalc/Makefile.am.orig Mon Sep 16 09:16:37 2002
+++ kcalc/Makefile.am
-@@ -1,20 +1,23 @@
-
+@@ -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
@@ -11,11 +11,12 @@ $NetBSD: patch-aa,v 1.2 2002/06/21 15:36:31 skrll Exp $
-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_LIBADD = libkcalc_main.la
+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kcalc_la_LIBADD = libkcalc_main.la
METASOURCES = AUTO
@@ -32,7 +33,7 @@ $NetBSD: patch-aa,v 1.2 2002/06/21 15:36:31 skrll Exp $
kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
pics_DATA =
-@@ -29,6 +32,3 @@
+@@ -29,6 +33,3 @@ EXTRA_DIST = $(pics_DATA) $(apps_DATA)
messages:
$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
index 94c76fcd3d9..4746b59638c 100644
--- a/misc/kdeutils3/patches/patch-ab
+++ b/misc/kdeutils3/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
+$NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
---- kcalc/Makefile.in.orig Mon Dec 30 16:23:59 2002
+--- kcalc/Makefile.in.orig Fri Jan 17 08:58:06 2003
+++ kcalc/Makefile.in
-@@ -227,22 +227,25 @@ x_includes = @x_includes@
+@@ -247,22 +247,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
@@ -13,11 +13,12 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
+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_LIBADD = libkcalc_main.la
+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kcalc_la_LIBADD = libkcalc_main.la
#>- METASOURCES = AUTO
@@ -34,7 +35,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
pics_DATA =
-@@ -260,24 +263,30 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -280,24 +284,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -46,7 +47,6 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
#>- kcalc_la_OBJECTS = $(am_kcalc_la_OBJECTS)
+#>+ 1
+kcalc_la_OBJECTS = kcalc_main.lo
-+libkcalc_main_la_LDFLAGS =
+libkcalc_main_la_DEPENDENCIES =
+am_libkcalc_main_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
+ optiondialog.lo
@@ -75,37 +75,36 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -285,16 +294,19 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -306,15 +315,21 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \
--#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \
--#>- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
+ 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 \
--@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@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
-+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \
-+#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \
-+#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
-+#>- @AMDEP_TRUE@ $(DEPDIR)/stats.Plo
-+#>+ 9
-+@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 $(DEPDIR)/kcalc_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/stats.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 $(DEPDIR)/kcalc_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo
+-@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) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -315,14 +327,15 @@ CXXLD = $(CXX)
+@@ -336,14 +351,15 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
@@ -123,37 +122,37 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
#>- all: all-am
#>+ 1
-@@ -371,6 +384,8 @@ clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -390,6 +406,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)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -406,9 +421,10 @@ distclean-compile:
+@@ -430,9 +448,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@
-
-@@ -503,7 +519,7 @@ distclean-tags:
-
+ @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@
+
+@@ -541,7 +560,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
--KDE_DIST=hi16-app-kcalc.png optiondialog.h kcalc.desktop hi48-app-kcalc.png kcalclogo.xpm configure.in.in hi32-app-kcalc.png ToDo version.h
-+KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo
+-KDE_DIST=cr32-app-kcalc.png cr48-app-kcalc.png optiondialog.h kcalc.desktop kcalclogo.xpm configure.in.in cr16-app-kcalc.png ToDo version.h
++KDE_DIST=version.h cr32-app-kcalc.png Makefile.am.rej kcalclogo.xpm configure.in.in kcalc.desktop cr48-app-kcalc.png optiondialog.h cr16-app-kcalc.png ToDo
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -626,9 +642,6 @@ uninstall-am: uninstall-kde-icons unins
+@@ -670,9 +689,6 @@ uninstall-am: uninstall-kde-icons unins
messages:
$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
@@ -163,7 +162,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
# 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:
-@@ -638,16 +651,16 @@ kcalc.moc: $(srcdir)/kcalc.h
+@@ -682,16 +698,16 @@ kcalc.moc: $(srcdir)/kcalc.h
$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
#>+ 3
@@ -185,7 +184,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
#>+ 2
docs-am:
-@@ -674,33 +687,33 @@ force-reedit:
+@@ -718,33 +734,33 @@ force-reedit:
#>+ 11
@@ -232,7 +231,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -713,6 +726,6 @@ kde-rpo-clean:
+@@ -757,6 +773,6 @@ kde-rpo-clean:
optiondialog.o: optiondialog.moc
kcalc.lo: kcalc.moc
optiondialog.lo: optiondialog.moc
diff --git a/misc/kdeutils3/patches/patch-ac b/misc/kdeutils3/patches/patch-ac
index 63828fa01cd..1f29403fb91 100644
--- a/misc/kdeutils3/patches/patch-ac
+++ b/misc/kdeutils3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2003/03/11 13:22:31 markd Exp $
---- kcalc/kcalc.cpp.orig Wed May 8 19:31:32 2002
+--- kcalc/kcalc.cpp.orig Fri Jan 3 18:07:36 2003
+++ kcalc/kcalc.cpp
-@@ -2274,7 +2274,9 @@
+@@ -2320,7 +2320,9 @@ bool QtCalculator::eventFilter(QObject *
//-------------------------------------------------------------------------
// Name: main(int argc, char *argv[])
//-------------------------------------------------------------------------
@@ -11,5 +11,5 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
+
+int kdemain(int argc, char *argv[])
{
- KAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
- version, description, KAboutData::License_GPL,
+ QString precisionStatement;
+
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af
index d7cdbf2f2f0..b3e5deaf1d7 100644
--- a/misc/kdeutils3/patches/patch-af
+++ b/misc/kdeutils3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
+$NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
---- kedit/Makefile.in.orig Mon Dec 30 16:24:30 2002
+--- kedit/Makefile.in.orig Fri Jan 17 08:58:06 2003
+++ kedit/Makefile.in
-@@ -236,16 +236,20 @@ x_libraries = @x_libraries@
+@@ -256,16 +256,20 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = kedit
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -269,22 +273,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -289,22 +293,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -68,33 +68,29 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -292,16 +303,16 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -313,14 +324,17 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \
--#>- @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \
--#>- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo
-+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \
-+#>- @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \
-+#>- @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo
- #>+ 7
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kedit_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \
--@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@ @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo
-+@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 $(DEPDIR)/ktextfiledlg.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.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 $(DEPDIR)/ktextfiledlg.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo
-
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -322,7 +333,8 @@ CXXLD = $(CXX)
+ 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
+
+@@ -343,7 +357,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
@@ -104,7 +100,7 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
DATA = $(apps_DATA) $(rc_DATA)
HEADERS = $(noinst_HEADERS)
-@@ -335,7 +347,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -356,7 +371,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
Makefile.in TODO
DIST_SUBDIRS = $(SUBDIRS)
@@ -113,28 +109,28 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
#>- all: all-recursive
#>+ 1
-@@ -384,6 +396,8 @@ clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -403,6 +418,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)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -418,8 +432,9 @@ mostlyclean-compile:
+@@ -442,8 +459,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@
-@@ -575,7 +590,7 @@ distclean-tags:
-
+-@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@
+@@ -613,7 +631,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=optionstate.h keditui.rc KEdit.desktop
@@ -142,7 +138,7 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -714,14 +729,15 @@ uninstall-info: uninstall-info-recursive
+@@ -758,14 +776,15 @@ uninstall-info: uninstall-info-recursive
messages: rc.cpp
$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
@@ -161,7 +157,7 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
mail.moc: $(srcdir)/mail.h
$(MOC) $(srcdir)/mail.h -o mail.moc
-@@ -734,12 +750,8 @@ kedit.moc: $(srcdir)/kedit.h
+@@ -778,12 +797,8 @@ kedit.moc: $(srcdir)/kedit.h
$(MOC) $(srcdir)/kedit.h -o kedit.moc
#>+ 3
@@ -175,7 +171,7 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
#>+ 2
docs-am:
-@@ -752,33 +764,33 @@ force-reedit:
+@@ -796,33 +811,33 @@ force-reedit:
#>+ 11
@@ -222,7 +218,7 @@ $NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -789,10 +801,10 @@ kde-rpo-clean:
+@@ -833,10 +848,10 @@ kde-rpo-clean:
#>+ 9
optiondialog.o: optiondialog.moc
diff --git a/misc/kdeutils3/patches/patch-aj b/misc/kdeutils3/patches/patch-aj
index d3b4b2d1d90..fc79986358d 100644
--- a/misc/kdeutils3/patches/patch-aj
+++ b/misc/kdeutils3/patches/patch-aj
@@ -1,23 +1,24 @@
-$NetBSD: patch-aj,v 1.2 2003/01/17 03:34:04 markd Exp $
+$NetBSD: patch-aj,v 1.3 2003/03/11 13:22:32 markd Exp $
---- klaptopdaemon/Makefile.am.orig Fri Mar 8 14:19:15 2002
+--- klaptopdaemon/Makefile.am.orig Mon Sep 16 09:16:37 2002
+++ klaptopdaemon/Makefile.am
-@@ -1,15 +1,19 @@
+@@ -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 kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
-+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
+-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)
++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_la_LIBADD = libklaptopdaemon_main.la
-klaptopdaemon_SOURCES = dummy.cpp
+klaptopdaemon_SOURCES = klaptopdaemon_main.cpp
@@ -25,9 +26,9 @@ $NetBSD: patch-aj,v 1.2 2003/01/17 03:34:04 markd Exp $
-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
-
-@@ -18,13 +22,10 @@
+ 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)
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
index f6676c99251..3b65505b3b5 100644
--- a/misc/kdeutils3/patches/patch-ak
+++ b/misc/kdeutils3/patches/patch-ak
@@ -1,19 +1,21 @@
-$NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
+$NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
---- klaptopdaemon/Makefile.in.orig Tue Dec 17 23:55:05 2002
+--- klaptopdaemon/Makefile.in.orig Fri Jan 17 08:58:07 2003
+++ klaptopdaemon/Makefile.in
-@@ -226,18 +226,22 @@ qt_libraries = @qt_libraries@
+@@ -245,20 +245,24 @@ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
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 kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
-+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
+-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)
+
@@ -28,9 +30,9 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
-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
-
-@@ -246,7 +250,7 @@
+ kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
+ portable.cpp acpi_config.cpp
+@@ -268,7 +272,7 @@ kcm_laptop_la_LIBADD = $(LIB_KFILE)
INCLUDES = $(all_includes)
@@ -39,32 +41,35 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
#>- kcm_laptop_la_METASOURCES = AUTO
subdir = klaptopdaemon
-@@ -265,24 +269,30 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
- warning.lo portable.lo
+@@ -287,24 +291,32 @@ 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
+- 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
++ kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
++ acpi_config.lo
+#>- libklaptopdaemon_main_la_OBJECTS = \
+#>- $(am_libklaptopdaemon_main_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
--@KDE_USE_FINAL_FALSE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_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
++ 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)
@@ -81,42 +86,44 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -290,23 +300,26 @@ CPPFLAGS = @CPPFLAGS@
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- #>- @AMDEP_TRUE@DEP_FILES = $(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
--#>+ 15
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P $(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 \
-+#>+ 17
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.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)/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 \
-@@ -332,7 +345,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
+@@ -314,25 +326,28 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
+ 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 \
+@@ -358,7 +373,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
@@ -125,7 +132,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
uninstall-info-recursive all-recursive install-data-recursive \
-@@ -340,7 +353,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -366,7 +381,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@@ -134,35 +141,35 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -413,6 +426,8 @@ clean-libLTLIBRARIES:
+@@ -446,6 +461,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)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -449,7 +464,8 @@ distclean-compile:
-
- @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@
-@@ -577,7 +593,7 @@ distclean-tags:
-
+@@ -488,7 +505,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@
+@@ -628,7 +646,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
--KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h
-+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h portable.h daemondock.h pcmcia.h kpcmcia.h laptop_daemon.h notify.h
+-KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h acpi_config.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h
++KDE_DIST=power.h Makefile.am.rej warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h kpcmcia.h laptop_daemon.h notify.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -721,9 +737,6 @@ uninstall-info: uninstall-info-recursive
+@@ -778,9 +796,6 @@ uninstall-info: uninstall-info-recursive
messages:
$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
@@ -172,15 +179,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
# 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:
-@@ -738,20 +751,28 @@ kcm_laptop.la.closure: $(kcm_laptop_la_O
-
-
- #>+ 3
-+kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
-+ $(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
-+
-+#>+ 3
- kpcmcia.moc: $(srcdir)/kpcmcia.h
+@@ -799,20 +814,32 @@ kpcmcia.moc: $(srcdir)/kpcmcia.h
$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
#>+ 3
@@ -192,20 +191,32 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
+#>+ 3
+daemondock.moc: $(srcdir)/daemondock.h
+ $(MOC) $(srcdir)/daemondock.h -o daemondock.moc
++
++#>+ 3
++notify.moc: $(srcdir)/notify.h
++ $(MOC) $(srcdir)/notify.h -o notify.moc
#>+ 3
+ main.moc: $(srcdir)/main.h
+ $(MOC) $(srcdir)/main.h -o main.moc
+
+ #>+ 3
++kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
++ $(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
++
++#>+ 3
battery.moc: $(srcdir)/battery.h
$(MOC) $(srcdir)/battery.h -o battery.moc
#>+ 3
-daemondock.moc: $(srcdir)/daemondock.h
- $(MOC) $(srcdir)/daemondock.h -o daemondock.moc
-+notify.moc: $(srcdir)/notify.h
-+ $(MOC) $(srcdir)/notify.h -o notify.moc
++acpi_config.moc: $(srcdir)/acpi_config.h
++ $(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
#>+ 3
power.moc: $(srcdir)/power.h
-@@ -762,20 +783,12 @@ warning.moc: $(srcdir)/warning.h
+@@ -823,24 +850,12 @@ warning.moc: $(srcdir)/warning.h
$(MOC) $(srcdir)/warning.h -o warning.moc
#>+ 3
@@ -221,34 +232,38 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
#>+ 3
+-acpi_config.moc: $(srcdir)/acpi_config.h
+- $(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
+-
+-#>+ 3
clean-metasources:
-- -rm -f kpcmcia.moc kpcmciainfo.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc
-+ -rm -f kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc
+- -rm -f kpcmcia.moc kpcmciainfo.moc main.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc acpi_config.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:
-@@ -792,7 +805,7 @@ force-reedit:
+@@ -857,7 +872,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 battery.moc pcmcia.moc warning.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 pcmcia.moc battery.moc power.moc warning.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 battery.moc pcmcia.moc warning.moc power.moc acpi_config.moc main.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; \
-@@ -804,33 +817,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
+@@ -869,33 +884,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 daemondock.moc kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc
+-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 kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc acpi_config.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 daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
++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 ; do \
+ 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; \
@@ -283,14 +298,16 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -841,20 +854,20 @@ kde-rpo-clean:
+@@ -906,24 +921,24 @@ kde-rpo-clean:
- #>+ 19
+ #>+ 23
kpcmcia.o: kpcmcia.moc
-battery.lo: battery.moc
+-main.lo: main.moc
-notify.o: notify.moc
-pcmcia.lo: pcmcia.moc
kpcmcia.lo: kpcmcia.moc
+-main.o: main.moc
-laptop_daemon.lo: laptop_daemon.moc
+laptop_daemon.o: laptop_daemon.moc
+notify.o: notify.moc
@@ -298,18 +315,24 @@ $NetBSD: patch-ak,v 1.3 2003/01/17 03:34:04 markd Exp $
-daemondock.o: daemondock.moc
-power.lo: power.moc
notify.lo: notify.moc
+-battery.o: battery.moc
+-pcmcia.o: pcmcia.moc
+warning.lo: warning.moc
+warning.o: warning.moc
+ acpi_config.lo: acpi_config.moc
+-daemondock.lo: daemondock.moc
++main.lo: main.moc
+laptop_daemon.lo: laptop_daemon.moc
+kpcmciainfo.o: kpcmciainfo.moc
- battery.o: battery.moc
--pcmcia.o: pcmcia.moc
++battery.o: battery.moc
+ acpi_config.o: acpi_config.moc
+-warning.o: warning.moc
+pcmcia.lo: pcmcia.moc
+battery.lo: battery.moc
- daemondock.lo: daemondock.moc
--warning.o: warning.moc
++daemondock.lo: daemondock.moc
+daemondock.o: daemondock.moc
+pcmcia.o: pcmcia.moc
++main.o: main.moc
kpcmciainfo.lo: kpcmciainfo.moc
-laptop_daemon.o: laptop_daemon.moc
-warning.lo: warning.moc
diff --git a/misc/kdeutils3/patches/patch-an b/misc/kdeutils3/patches/patch-an
index b0e801b7bea..61e0b592246 100644
--- a/misc/kdeutils3/patches/patch-an
+++ b/misc/kdeutils3/patches/patch-an
@@ -1,246 +1,44 @@
-$NetBSD: patch-an,v 1.2 2002/10/04 00:14:19 chris Exp $
+$NetBSD: patch-an,v 1.3 2003/03/11 13:22:32 markd Exp $
---- klaptopdaemon/portable.cpp.orig Sat Jan 26 17:58:32 2002
-+++ klaptopdaemon/portable.cpp Thu Oct 3 23:42:47 2002
-@@ -857,6 +857,241 @@
- {
- return(1);
- }
-+
-+#elif __NetBSD_APM__
-+
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <sys/ioctl.h>
-+#include <sys/stat.h>
-+#include <machine/apmvar.h>
-+#include <iostream.h>
-+
-+//
-+// 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
-+//
-+#define APMDEV "/dev/apm"
-+
-+//
-+// Check for apm in kernel by talking to /dev/apm
-+// (opening read only is allowed by any process).
-+// returns 1 if we support power management
-+//
-+int
-+laptop_portable::has_power_management()
-+{
-+ int ret, fd = ::open(APMDEV, O_RDONLY);
-+
-+ if (fd == -1) {
-+ return 0;
-+ }
-+
-+ struct apm_power_info info;
-+ memset(&info, 0, sizeof(info));
-+ ret=ioctl(fd, APM_IOC_GETPOWER, &info);
-+ ::close(fd);
-+
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+//
-+// returns 1 if the BIOS returns the time left in the battery rather than a % of full
-+//
-+int laptop_portable::has_battery_time()
-+{
-+ int ret, fd = ::open(APMDEV, O_RDONLY);
-+
-+ if (fd == -1)
-+ return 0;
-+
-+ struct apm_power_info info;
-+ memset(&info, 0, sizeof(info));
-+ ret=ioctl(fd, APM_IOC_GETPOWER, &info);
-+ ::close(fd);
-+
-+ if (ret == -1)
-+ return 0;
-+
-+ return (info.minutes_left != 0xffff);
-+}
-+
-+//
-+// returns 1 if we can perform a change-to-suspend-mode operation for the user
-+// (ust check to see if we have the binary)
-+// (has_power_management() has already returned 1)
-+//
-+int laptop_portable::has_suspend()
-+{
-+
-+ struct stat s;
-+ if (stat("/usr/sbin/apm", &s))
-+ return(0);
-+ return(1);
-+}
-+
-+//
-+// returns 1 if we can perform a change-to-standby-mode operation for the user
-+// (just check to see if we have the binary)
-+// (has_power_management() has already returned 1)
-+//
-+int laptop_portable::has_standby()
-+{
-+
-+ struct stat s;
-+ if (stat("/usr/sbin/apm", &s))
-+ return(0);
-+ return(1);
-+}
-+
-+//
-+// returns 1 if we can perform a change-to-hibernate-mode for a user
-+// (has_power_management() has already returned 1) [hibernate is the save-to-disk mode
-+// not supported by linux - different laptops have their own - the first here is for
-+// a ThinkPad]
-+// No support in NetBSD at this time.
-+//
-+int laptop_portable::has_hibernation()
-+{
-+ return(0);
-+}
-+
-+//
-+// explain to the user what they need to do if has_power_management() returned 0
-+// to get any software they lack
-+//
-+QLabel *laptop_portable::no_power_management_explanation(QWidget *parent)
-+{
-+ int fd;
-+ QLabel *explain;
-+
-+ fd = ::open(APMDEV, O_RDONLY);
-+ if (fd == -1) {
-+ switch (errno) {
-+ case ENOENT:
-+ explain = new QLabel("There is no /dev/apm file on this system. Pleae review the NetBSD documentation on how to create a device node for the apm device driver (man 4 apm)", parent);
-+ break;
-+ case EACCES:
-+ explain = new QLabel("Your system has the proper device node for apm support, however you can't access it. If you have apm in the kernel this should not happen", parent);
-+ break;
-+ case ENXIO:
-+ explain = new QLabel("Your kernel lacks support for Advanced Power Managment.", parent);
-+ break;
-+ break;
-+ default:
-+ explain = new QLabel("There was some generic error while opening /dev/apm.", parent);
-+ break;
-+ }
-+ } else {
-+ close(fd);
-+ explain = new QLabel("APM has most likely been disabled. Oops", parent);
-+ }
-+
-+ explain->setMinimumSize(explain->sizeHint());
-+ return(explain);
-+}
-+
-+//
-+// explain to the user what they need to do to get suspend/resume to work from user mode
-+//
-+QLabel *laptop_portable::how_to_do_suspend_resume(QWidget *parent)
-+{
-+ QLabel* note = new QLabel(i18n(" "), parent);
-+ note->setMinimumSize(note->sizeHint());
-+ return(note);
-+}
-+
-+//
-+// pcmcia support - this will be replaced by better - pcmcia support being worked on by
-+// others
-+//
-+QLabel *laptop_portable::pcmcia_info(int x, QWidget *parent)
-+{
-+ if (x == 0)
-+ return(new QLabel(i18n("No PCMCIA controller detected"), parent));
-+ return(new QLabel(i18n(""), parent));
-+}
-+
-+//
-+// puts us into standby mode
-+// Use apm rather than ioctls in case they are running apmd
-+// (as they should be).
-+//
-+void laptop_portable::invoke_standby()
-+{
-+ ::system("/usr/sbin/apm -S");
-+}
-+
-+//
-+// puts us into suspend mode
-+// Use apm rather than ioctls in case they are running apmd
-+// (as they should be).
-+//
-+void laptop_portable::invoke_suspend()
-+{
-+
-+ ::system("/usr/sbin/apm -z");
-+}
-+
-+//
-+// puts us into hibernate mode
-+// No hibernate mode for NetBSD.
+--- klaptopdaemon/portable.cpp.orig Fri Jan 3 18:07:53 2003
++++ klaptopdaemon/portable.cpp
+@@ -1130,6 +1130,7 @@ laptop_portable::has_power_management()
+ }
+
+ struct apm_power_info info;
++ memset(&info, 0, sizeof(info));
+ ret=ioctl(fd, APM_IOC_GETPOWER, &info);
+ ::close(fd);
+
+@@ -1151,6 +1152,7 @@ int laptop_portable::has_battery_time()
+ return 0;
+
+ struct apm_power_info info;
++ memset(&info, 0, sizeof(info));
+ ret=ioctl(fd, APM_IOC_GETPOWER, &info);
+ ::close(fd);
+
+@@ -1288,6 +1290,15 @@ void laptop_portable::invoke_hibernation
+
+
+ //
++// adds extra widgets to the battery panel
+//
-+void laptop_portable::invoke_hibernation()
++void
++laptop_portable::extra_config(QWidget *parent, KConfig *config, QVBoxLayout *layout)
+{
-+ return;
+}
+
+
+//
-+// return current battery state
-+//
-+struct power_result laptop_portable::poll_battery_state()
-+{
-+ struct power_result p;
-+ int ret;
-+
-+ int fd = ::open(APMDEV, O_RDONLY);
-+
-+ if (fd == -1)
-+ goto bad;
-+
-+ struct apm_power_info info;
-+ memset(&info, 0, sizeof(info));
-+ ret=ioctl(fd, APM_IOC_GETPOWER, &info);
-+ ::close(fd);
-+
-+ if (ret == -1)
-+ goto bad;
-+
-+ p.powered = (info.ac_state == APM_AC_ON);
-+ p.percentage = (info.battery_life==255 ? 100 : info.battery_life);
-+ p.time = (info.minutes_left != 0xffff ? info.minutes_left : -1);
-+ return(p);
-+
-+bad:
-+ p.powered = 1;
-+ p.percentage = 100;
-+ p.time = 0;
-+ return(p);
-+}
-+
-+//
-+//
-+// returns true if any mouse or kdb activity has been detected
-+//
-+int laptop_portable::poll_activity()
-+{
-+ return(1);
-+}
- #else
+ // return current battery state
+ //
+ struct power_result laptop_portable::poll_battery_state()
+@@ -1301,6 +1312,7 @@ struct power_result laptop_portable::pol
+ goto bad;
- // INSERT HERE
+ struct apm_power_info info;
++ memset(&info, 0, sizeof(info));
+ ret=ioctl(fd, APM_IOC_GETPOWER, &info);
+ ::close(fd);
+
diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index 86da26580fb..b941c2a8096 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,32 +1,28 @@
-$NetBSD: patch-ao,v 1.2 2003/02/26 23:09:02 dmcmahill Exp $
+$NetBSD: patch-ao,v 1.3 2003/03/11 13:22:32 markd Exp $
---- configure.orig Tue Dec 17 05:55:09 2002
+--- configure.orig Fri Jan 17 08:58:13 2003
+++ configure
-@@ -21610,7 +21610,7 @@ main ()
+@@ -25795,63 +25795,6 @@ _ACEOF
- char buf[20];
- buf[0]='\0';
-- strlat(buf, "KDE function test", sizeof(buf));
-+ strlcat(buf, "KDE function test", sizeof(buf));
- ;
- return 0;
-@@ -22222,57 +22222,6 @@ echo "${ECHO_T}$ac_cv_sizeof_unsigned_in
- cat >>confdefs.h <<EOF
- #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
- EOF
--
-- echo "$as_me:22226: checking sizeof(size_t) == sizeof(unsigned int)" >&5
--echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned int)... $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 22229 "configure"
+-#line $LINENO "configure"
-#include "confdefs.h"
-
+-#ifdef F77_DUMMY_MAIN
+-# ifdef __cplusplus
+- extern "C"
+-# endif
+- int F77_DUMMY_MAIN() { return 1; }
+-#endif
-int
-main ()
-{
-
-- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT
+- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
- choke me
- #endif
-
@@ -35,37 +31,38 @@ $NetBSD: patch-ao,v 1.2 2003/02/26 23:09:02 dmcmahill Exp $
-}
-_ACEOF
-rm -f conftest.$ac_objext
--if { (eval echo "$as_me:22245: \"$ac_compile\"") >&5
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:22248: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:22251: \"$ac_try\"") >&5
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:22254: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:22256: result: yes" >&5
+- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-- echo "$as_me:22262: result: no" >&5
+- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- { { echo "$as_me:22264: error:
-- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int)
+- { { echo "$as_me:$LINENO: error:
+- 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 int)
+- 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; }; }
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
+-
CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST"
+ echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
diff --git a/misc/kdeutils3/patches/patch-ap b/misc/kdeutils3/patches/patch-ap
new file mode 100644
index 00000000000..ba682f4dfb6
--- /dev/null
+++ b/misc/kdeutils3/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 2003/03/11 13:22:32 markd Exp $
+
+--- ksim/monitors/cpu/ksimcpu.cpp.orig Tue May 14 02:47:51 2002
++++ ksim/monitors/cpu/ksimcpu.cpp
+@@ -269,6 +269,9 @@ void CpuView::updateCpu(CpuData &cpu, in
+ cpu.idle = cpuTime[CP_IDLE];
+ #endif
+
++#if defined(Q_OS_NETBSD)
++#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"
+ int name2oid[2] = { CTL_KERN, KERN_CPTIME };
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 05:48:01 +0000