Initial import of the kdeutils pkg (in the right place this time.)

This commit is contained in:
skrll 2002-05-31 13:42:33 +00:00
parent df6c231fc8
commit 3df05a3710
18 changed files with 1774 additions and 0 deletions

1
misc/kdeutils3/DESCR Normal file
View file

@ -0,0 +1 @@
KDE provides an integrated X11 based environment, much like CDE.

26
misc/kdeutils3/Makefile Normal file
View file

@ -0,0 +1,26 @@
# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:42:33 skrll Exp $
DISTNAME= kdeutils-3.0.1
COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../x11/kde3/Makefile.kde3"
USE_BUILDLINK_ONLY= YES
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
LIBS= -Wl,--export-dynamic
. if exists(/usr/include/machine/apmvar.h)
CPPFLAGS+= -D__NetBSD_APM__
. endif
.endif
post-install:
${CHMOD} -s ${PREFIX}/bin/efax
.include "../../x11/kde3/buildlink.mk"
.include "../../x11/kdebase3/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"

308
misc/kdeutils3/PLIST Normal file
View file

@ -0,0 +1,308 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:42:33 skrll Exp $
bin/ark
bin/efax
bin/efix
bin/fax
bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
bin/kdf
bin/kedit
bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/klprfax
bin/klprfax_filter
bin/klprfax_lpd
bin/ktimer
bin/kwikdisk
include/kmultiformlistbox.h
include/kmultiformlistboxentry.h
include/kmultiformlistboxfactory.h
include/kwidgetstreamer.h
lib/kcalc.a
lib/kcalc.la
lib/kcalc.so
lib/kde3/kcharselectapplet.a
lib/kde3/kcharselectapplet.la
lib/kde3/kcharselectapplet.so
lib/kde3/kcharselectapplet.so.1
lib/kde3/kcharselectapplet.so.1.0
lib/kde3/kcm_kdf.a
lib/kde3/kcm_kdf.la
lib/kde3/kcm_kdf.so
lib/kde3/kcm_laptop.a
lib/kde3/kcm_laptop.la
lib/kde3/kcm_laptop.so
lib/kde3/libkregexpeditorgui.a
lib/kde3/libkregexpeditorgui.la
lib/kde3/libkregexpeditorgui.so
lib/kedit.a
lib/kedit.la
lib/kedit.so
lib/klaptopdaemon.a
lib/klaptopdaemon.la
lib/klaptopdaemon.so
lib/libark.a
lib/libark.la
lib/libark.so
lib/libark.so.1
lib/libark.so.1.0
lib/libkcalc_main.a
lib/libkcalc_main.la
lib/libkcalc_main.so
lib/libkcalc_main.so.0
lib/libkcalc_main.so.0.0
lib/libkedit_main.a
lib/libkedit_main.la
lib/libkedit_main.so
lib/libklaptopdaemon_main.a
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
share/doc/kde/HTML/en/KRegExpEditor/altn.png
share/doc/kde/HTML/en/KRegExpEditor/altntool.png
share/doc/kde/HTML/en/KRegExpEditor/anychar.png
share/doc/kde/HTML/en/KRegExpEditor/anychartool.png
share/doc/kde/HTML/en/KRegExpEditor/begline.png
share/doc/kde/HTML/en/KRegExpEditor/boundarytools.png
share/doc/kde/HTML/en/KRegExpEditor/characters.png
share/doc/kde/HTML/en/KRegExpEditor/charactertool.png
share/doc/kde/HTML/en/KRegExpEditor/common
share/doc/kde/HTML/en/KRegExpEditor/compound.png
share/doc/kde/HTML/en/KRegExpEditor/compoundtool.png
share/doc/kde/HTML/en/KRegExpEditor/endline.png
share/doc/kde/HTML/en/KRegExpEditor/index.cache.bz2
share/doc/kde/HTML/en/KRegExpEditor/index.docbook
share/doc/kde/HTML/en/KRegExpEditor/linestartendtool.png
share/doc/kde/HTML/en/KRegExpEditor/lookaheadtools.png
share/doc/kde/HTML/en/KRegExpEditor/neglookahead.png
share/doc/kde/HTML/en/KRegExpEditor/nonwordboundary.png
share/doc/kde/HTML/en/KRegExpEditor/poslookahead.png
share/doc/kde/HTML/en/KRegExpEditor/repeat.png
share/doc/kde/HTML/en/KRegExpEditor/repeattool.png
share/doc/kde/HTML/en/KRegExpEditor/select.png
share/doc/kde/HTML/en/KRegExpEditor/text.png
share/doc/kde/HTML/en/KRegExpEditor/texttool.png
share/doc/kde/HTML/en/KRegExpEditor/theEditor.png
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/kdf/common
share/doc/kde/HTML/en/kdf/index.cache.bz2
share/doc/kde/HTML/en/kdf/index.docbook
share/doc/kde/HTML/en/kdf/kdf.png
share/doc/kde/HTML/en/kdf/kdf_config.png
share/doc/kde/HTML/en/kedit/common
share/doc/kde/HTML/en/kedit/index.cache.bz2
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/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/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/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/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/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/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/kdf/pics/delete.png
share/kde/apps/kdf/pics/tick.png
share/kde/apps/kedit/keditui.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/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/konqueror/servicemenus/arkservicemenu.desktop
share/kde/apps/kregexpeditor/pics/altn.png
share/kde/apps/kregexpeditor/pics/anychar.png
share/kde/apps/kregexpeditor/pics/begline.png
share/kde/apps/kregexpeditor/pics/characters.png
share/kde/apps/kregexpeditor/pics/compound.png
share/kde/apps/kregexpeditor/pics/endline.png
share/kde/apps/kregexpeditor/pics/error.png
share/kde/apps/kregexpeditor/pics/neglookahead.png
share/kde/apps/kregexpeditor/pics/nonwordboundary.png
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/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/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
@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
@dirrm share/kde/apps/klaptopdaemon
@dirrm share/kde/apps/kjots/pics
@dirrm share/kde/apps/kjots
@comment dirrm share/kde/apps/kicker/applets
@dirrm share/kde/apps/khexedit/toolbar
@dirrm share/kde/apps/khexedit
@dirrm share/kde/apps/kedit
@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/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
@dirrm share/kde/apps/ark
@comment dirrm share/kde/apps
@comment dirrm share/kde/applnk/Utilities
@comment dirrm share/kde/applnk/System
@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/kjots
@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/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

18
misc/kdeutils3/distinfo Normal file
View file

@ -0,0 +1,18 @@
$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:42:33 skrll Exp $
SHA1 (kdeutils-3.0.1.tar.bz2) = bee3dd5726e6fd1a5cc571a11fc6b5d6a6edaea9
Size (kdeutils-3.0.1.tar.bz2) = 1513540 bytes
SHA1 (patch-aa) = 1175862f6192f57f020f0487e473fe0f45416475
SHA1 (patch-ab) = 7a1f2eff4832d7d159b2f188801259b0c54d68ab
SHA1 (patch-ac) = bb2f28bb4bc5d84d19ebf3a1d19aa5e7d21f61d3
SHA1 (patch-ad) = 0661f7e149c704291d3c668384363bb1e8246c8f
SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
SHA1 (patch-af) = 7118c3f53ea1d5831c53c071cc0fba6317f6b2d9
SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
SHA1 (patch-ah) = fe2b3a94957a2d9cf6a294cbd3a77d100af84164
SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
SHA1 (patch-aj) = 1e6833cfb320f353e62e7be5ccae18deac8b8aef
SHA1 (patch-ak) = 1199959fd27b5084094c065f377cd48747bd8102
SHA1 (patch-al) = 289d94cf7ae64565639250a0e29662074466c8b3
SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
SHA1 (patch-an) = ecb2787f4bff098723095823cee190872db06321

View file

@ -0,0 +1,40 @@
$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:42:33 skrll Exp $
--- kcalc/Makefile.am.orig Wed May 8 19:31:32 2002
+++ kcalc/Makefile.am
@@ -1,20 +1,22 @@
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_LIBADD = $(LIB_KDEUI) -lm
+
+kcalc_la_SOURCES = kcalc_main.cpp
+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
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 +31,3 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
-
-dummy.cpp:
- echo > dummy.cpp

View file

@ -0,0 +1,243 @@
$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- kcalc/Makefile.in.orig Wed May 8 21:11:41 2002
+++ kcalc/Makefile.in
@@ -228,22 +228,24 @@
x_libraries = @x_libraries@
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_LIBADD = $(LIB_KDEUI) -lm
+
+kcalc_la_SOURCES = kcalc_main.cpp
+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
#>- 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 =
@@ -261,25 +263,31 @@
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_LIBADD =
+am_kcalc_la_OBJECTS = kcalc_main.lo
#>- 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
+#>- libkcalc_main_la_OBJECTS = $(am_libkcalc_main_la_OBJECTS)
#>+ 6
-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 \
- kcalc_la_meta_unload.lo
-@KDE_USE_FINAL_FALSE@kcalc_la_OBJECTS = $(kcalc_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kcalc_la_OBJECTS = $(kcalc_la_final_OBJECTS)
+ libkcalc_main_la_meta_unload.lo
+@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
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -287,9 +295,10 @@
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
+@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
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
@@ -309,14 +318,15 @@
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-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
@@ -365,6 +375,8 @@
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
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)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -400,9 +412,10 @@
-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@
@@ -497,7 +510,7 @@
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kcalclogo.xpm optiondialog.h hi32-app-kcalc.png ToDo configure.in.in hi16-app-kcalc.png kcalc.desktop hi48-app-kcalc.png version.h
+KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png kcalc version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png dummy.cpp ToDo
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -620,9 +633,6 @@
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:
@@ -668,28 +678,28 @@
#>+ 12
-kcalc_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc
- @echo 'creating kcalc_la_meta_unload.cpp'
- @-rm -f kcalc_la_meta_unload.cpp
+libkcalc_main_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc
+ @echo 'creating libkcalc_main_la_meta_unload.cpp'
+ @-rm -f libkcalc_main_la_meta_unload.cpp
@if test ${kde_qtver} = 2; then \
- echo 'static const char * _metalist_kcalc_la[] = {' > kcalc_la_meta_unload.cpp ;\
- cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcalc_la_meta_unload.cpp ;\
- echo '0};' >> kcalc_la_meta_unload.cpp ;\
- echo '#include <kunload.h>' >> kcalc_la_meta_unload.cpp ;\
- echo '_UNLOAD(kcalc_la)' >> kcalc_la_meta_unload.cpp ;\
- else echo > kcalc_la_meta_unload.cpp; fi
+ echo 'static const char * _metalist_libkcalc_main_la[] = {' > libkcalc_main_la_meta_unload.cpp ;\
+ cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcalc_main_la_meta_unload.cpp ;\
+ echo '0};' >> libkcalc_main_la_meta_unload.cpp ;\
+ echo '#include <kunload.h>' >> libkcalc_main_la_meta_unload.cpp ;\
+ echo '_UNLOAD(libkcalc_main_la)' >> libkcalc_main_la_meta_unload.cpp ;\
+ else echo > libkcalc_main_la_meta_unload.cpp; fi
#>+ 3
clean-moc-classes:
- -rm -f kcalc_la_meta_unload.cpp
+ -rm -f libkcalc_main_la_meta_unload.cpp
#>+ 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 kcalc_la_meta_unload.cpp kcalc.moc optiondialog.moc dlabel.moc
+kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp kcalc.moc optiondialog.moc dlabel.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; \
- for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp kcalc_la_meta_unload.cpp ; do \
+ for file in kcalc_main.cpp ; do \
echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \
done; \
@@ -697,11 +707,23 @@
rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files
#>+ 11
-kcalc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+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 libkcalc_main_la_meta_unload.cpp
+ @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 libkcalc_main_la_meta_unload.cpp ; do \
+ 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 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
+
+#>+ 11
+kcalc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp
@echo 'creating kcalc.all_cpp.cpp ...'; \
rm -f kcalc.all_cpp.files kcalc.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcalc.all_cpp.final; \
- for file in dummy.cpp ; do \
+ for file in kcalc_main.cpp ; do \
echo "#include \"$$file\"" >> kcalc.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc.all_cpp.final; \
done; \
@@ -710,20 +732,20 @@
#>+ 3
clean-final:
- -rm -f kcalc_la.all_cpp.cpp kcalc.all_cpp.cpp
+ -rm -f kcalc_la.all_cpp.cpp libkcalc_main_la.all_cpp.cpp kcalc.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) -f $(top_srcdir)/admin/Makefile.common cvs-clean

View file

@ -0,0 +1,15 @@
$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- kcalc/kcalc.cpp.orig Wed May 8 19:31:32 2002
+++ kcalc/kcalc.cpp
@@ -2274,7 +2274,9 @@
//-------------------------------------------------------------------------
// Name: main(int argc, char *argv[])
//-------------------------------------------------------------------------
-int main(int argc, char *argv[])
+extern "C" int kdemain(int, char *[]);
+
+int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
version, description, KAboutData::License_GPL,

View file

@ -0,0 +1,33 @@
$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- kcalc/kcalc_main.cpp.orig Fri May 31 11:58:44 2002
+++ kcalc/kcalc_main.cpp
@@ -0,0 +1,28 @@
+/*
+ *
+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+extern "C" int kdemain(int, char* []);
+
+int main( int argc, char* argv[] )
+{
+ return kdemain(argc, argv);
+}

View file

@ -0,0 +1,36 @@
$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

View file

@ -0,0 +1,236 @@
$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- kedit/Makefile.in.orig Wed May 8 21:11:41 2002
+++ kedit/Makefile.in
@@ -237,16 +237,20 @@
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\
@@ -270,23 +274,30 @@
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)
-#>+ 5
-kedit_la_final_OBJECTS = kedit_la.all_cpp.lo
-kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo \
- kedit_la_meta_unload.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)
+#>+ 6
+libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo
+libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
+ optiondialog.lo \
+ libkedit_main_la_meta_unload.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
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -294,9 +305,9 @@
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
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
@@ -316,7 +327,8 @@
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-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)
@@ -329,7 +341,7 @@
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
@@ -378,6 +390,8 @@
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
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)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -412,8 +426,9 @@
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@
@@ -569,7 +584,7 @@
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=optionstate.h KEdit.desktop keditui.rc
+KDE_DIST=KEdit.desktop kedit keditui.rc dummy.cpp optionstate.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -708,9 +723,6 @@
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:
@@ -746,28 +758,28 @@
#>+ 12
-kedit_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
- @echo 'creating kedit_la_meta_unload.cpp'
- @-rm -f kedit_la_meta_unload.cpp
+libkedit_main_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
+ @echo 'creating libkedit_main_la_meta_unload.cpp'
+ @-rm -f libkedit_main_la_meta_unload.cpp
@if test ${kde_qtver} = 2; then \
- echo 'static const char * _metalist_kedit_la[] = {' > kedit_la_meta_unload.cpp ;\
- cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kedit_la_meta_unload.cpp ;\
- echo '0};' >> kedit_la_meta_unload.cpp ;\
- echo '#include <kunload.h>' >> kedit_la_meta_unload.cpp ;\
- echo '_UNLOAD(kedit_la)' >> kedit_la_meta_unload.cpp ;\
- else echo > kedit_la_meta_unload.cpp; fi
+ echo 'static const char * _metalist_libkedit_main_la[] = {' > libkedit_main_la_meta_unload.cpp ;\
+ cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkedit_main_la_meta_unload.cpp ;\
+ echo '0};' >> libkedit_main_la_meta_unload.cpp ;\
+ echo '#include <kunload.h>' >> libkedit_main_la_meta_unload.cpp ;\
+ echo '_UNLOAD(libkedit_main_la)' >> libkedit_main_la_meta_unload.cpp ;\
+ else echo > libkedit_main_la_meta_unload.cpp; fi
#>+ 3
clean-moc-classes:
- -rm -f kedit_la_meta_unload.cpp
+ -rm -f libkedit_main_la_meta_unload.cpp
#>+ 11
-kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp kedit_la_meta_unload.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc
+kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp optiondialog.moc mail.moc ktextfiledlg.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; \
- for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp kedit_la_meta_unload.cpp ; do \
+ for file in kedit_main.cpp ; do \
echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \
done; \
@@ -775,11 +787,23 @@
rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files
#>+ 11
-kedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkedit_main_la_meta_unload.cpp
+ @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 libkedit_main_la_meta_unload.cpp ; do \
+ 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 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
+
+#>+ 11
+kedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp
@echo 'creating kedit.all_cpp.cpp ...'; \
rm -f kedit.all_cpp.files kedit.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kedit.all_cpp.final; \
- for file in dummy.cpp ; do \
+ for file in kedit_main.cpp ; do \
echo "#include \"$$file\"" >> kedit.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit.all_cpp.final; \
done; \
@@ -788,20 +812,20 @@
#>+ 3
clean-final:
- -rm -f kedit_la.all_cpp.cpp kedit.all_cpp.cpp
+ -rm -f kedit_la.all_cpp.cpp libkedit_main_la.all_cpp.cpp kedit.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) -f $(top_srcdir)/admin/Makefile.common cvs-clean

View file

@ -0,0 +1,15 @@
$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;

View file

@ -0,0 +1,33 @@
$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- kedit/kedit_main.cpp.orig Fri May 31 11:58:44 2002
+++ kedit/kedit_main.cpp
@@ -0,0 +1,28 @@
+/*
+ *
+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+extern "C" int kdemain(int, char* []);
+
+int main( int argc, char* argv[] )
+{
+ return kdemain(argc, argv);
+}

View file

@ -0,0 +1,197 @@
$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

View file

@ -0,0 +1,36 @@
$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- klaptopdaemon/Makefile.am.orig Tue Feb 26 20:54:52 2002
+++ klaptopdaemon/Makefile.am
@@ -1,15 +1,19 @@
-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
+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
@@ -25,6 +29,3 @@
messages:
$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
-
-dummy.cpp:
- echo >dummy.cpp

View file

@ -0,0 +1,246 @@
$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- klaptopdaemon/Makefile.in.orig Wed May 8 21:11:42 2002
+++ klaptopdaemon/Makefile.in
@@ -227,18 +227,22 @@
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
+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
@@ -267,25 +271,31 @@
kcm_laptop_la_meta_unload.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
+klaptopdaemon_la_DEPENDENCIES = libklaptopdaemon_main.la
+am_klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
#>- klaptopdaemon_la_OBJECTS = $(am_klaptopdaemon_la_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
+#>- libklaptopdaemon_main_la_OBJECTS = \
+#>- $(am_libklaptopdaemon_main_la_OBJECTS)
#>+ 6
-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 \
- klaptopdaemon_la_meta_unload.lo
-@KDE_USE_FINAL_FALSE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS)
+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 \
+ libklaptopdaemon_main_la_meta_unload.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
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -293,8 +303,9 @@
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 \
@@ -319,7 +330,7 @@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
- $(klaptopdaemon_SOURCES)
+ $(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
uninstall-info-recursive all-recursive install-data-recursive \
@@ -327,7 +338,7 @@
uninstall-recursive 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
@@ -400,6 +411,8 @@
$(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)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -436,7 +449,8 @@
@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@
@@ -564,7 +578,7 @@
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=pcmcia.h configure.in.in battery.h notify.h power.h warning.h kpcmciainfo.h version.h daemondock.h portable.h kpcmcia.h laptop_daemon.h
+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h klaptopdaemon portable.h daemondock.h pcmcia.h kcm_laptop.la.closure kpcmcia.h laptop_daemon.h notify.h dummy.cpp
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -708,9 +722,6 @@
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:
@@ -792,24 +803,24 @@
#>+ 12
-klaptopdaemon_la_meta_unload.cpp: daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
- @echo 'creating klaptopdaemon_la_meta_unload.cpp'
- @-rm -f klaptopdaemon_la_meta_unload.cpp
+libklaptopdaemon_main_la_meta_unload.cpp: daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
+ @echo 'creating libklaptopdaemon_main_la_meta_unload.cpp'
+ @-rm -f libklaptopdaemon_main_la_meta_unload.cpp
@if test ${kde_qtver} = 2; then \
- echo 'static const char * _metalist_klaptopdaemon_la[] = {' > klaptopdaemon_la_meta_unload.cpp ;\
- cat daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klaptopdaemon_la_meta_unload.cpp ;\
- echo '0};' >> klaptopdaemon_la_meta_unload.cpp ;\
- echo '#include <kunload.h>' >> klaptopdaemon_la_meta_unload.cpp ;\
- echo '_UNLOAD(klaptopdaemon_la)' >> klaptopdaemon_la_meta_unload.cpp ;\
- else echo > klaptopdaemon_la_meta_unload.cpp; fi
+ echo 'static const char * _metalist_libklaptopdaemon_main_la[] = {' > libklaptopdaemon_main_la_meta_unload.cpp ;\
+ cat daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+ echo '0};' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+ echo '#include <kunload.h>' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+ echo '_UNLOAD(libklaptopdaemon_main_la)' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+ else echo > libklaptopdaemon_main_la_meta_unload.cpp; fi
#>+ 3
clean-moc-classes:
- -rm -f kcm_laptop_la_meta_unload.cpp klaptopdaemon_la_meta_unload.cpp
+ -rm -f kcm_laptop_la_meta_unload.cpp libklaptopdaemon_main_la_meta_unload.cpp
#>+ 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 kcm_laptop_la_meta_unload.cpp kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.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)/kcm_laptop_la_meta_unload.cpp kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.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; \
@@ -821,11 +832,11 @@
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 klaptopdaemon_la_meta_unload.cpp
+klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp
@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; \
- for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp klaptopdaemon_la_meta_unload.cpp ; do \
+ for file in klaptopdaemon_main.cpp ; do \
echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
done; \
@@ -833,11 +844,23 @@
rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
#>+ 11
-klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+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 libklaptopdaemon_main_la_meta_unload.cpp
+ @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 libklaptopdaemon_main_la_meta_unload.cpp ; do \
+ 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 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
+
+#>+ 11
+klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp
@echo 'creating klaptopdaemon.all_cpp.cpp ...'; \
rm -f klaptopdaemon.all_cpp.files klaptopdaemon.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> klaptopdaemon.all_cpp.final; \
- for file in dummy.cpp ; do \
+ for file in klaptopdaemon_main.cpp ; do \
echo "#include \"$$file\"" >> klaptopdaemon.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon.all_cpp.final; \
done; \
@@ -846,20 +869,20 @@
#>+ 3
clean-final:
- -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
+ -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp klaptopdaemon.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) -f $(top_srcdir)/admin/Makefile.common cvs-clean

View file

@ -0,0 +1,33 @@
$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- klaptopdaemon/klaptopdaemon_main.cpp.orig Fri May 31 11:58:44 2002
+++ klaptopdaemon/klaptopdaemon_main.cpp
@@ -0,0 +1,28 @@
+/*
+ *
+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+extern "C" int kdemain(int, char* []);
+
+int main( int argc, char* argv[] )
+{
+ return kdemain(argc, argv);
+}

View file

@ -0,0 +1,15 @@
$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);

View file

@ -0,0 +1,243 @@
$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- klaptopdaemon/portable.cpp.orig Wed Jan 9 12:11:32 2002
+++ klaptopdaemon/portable.cpp
@@ -857,6 +857,238 @@
{
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;
+ 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;
+ 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.
+//
+void laptop_portable::invoke_hibernation()
+{
+ 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;
+ 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
// INSERT HERE