The result of my recent KDE fiddlings

- Build all packages with a --disable-static libtool. This is how the
  packages should be built and means that we don't get a load of useless
  static libraries.

- Use x11/kde3/files/foo_main.cpp instead of creating N copies with
  patches.

- Some other PLIST fixes

- Fix PR 19848. kspell doesn't find dictionaries.

8 files changed, 15 insertions, 161 deletions

diff --git a/misc/kdeaddons3/PLIST b/misc/kdeaddons3/PLIST
index 9c463803039..c660c2aed43 100644
--- a/misc/kdeaddons3/PLIST
+++ b/misc/kdeaddons3/PLIST
@@ -1,66 +1,46 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/25 03:07:31 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/20 10:03:52 skrll Exp $
 bin/dcop_kate
 bin/testor
-lib/kde3/katehtmltoolsplugin.a
 lib/kde3/katehtmltoolsplugin.la
 lib/kde3/katehtmltoolsplugin.so
-lib/kde3/kateinsertcommandplugin.a
 lib/kde3/kateinsertcommandplugin.la
 lib/kde3/kateinsertcommandplugin.so
-lib/kde3/kateopenheaderplugin.a
 lib/kde3/kateopenheaderplugin.la
 lib/kde3/kateopenheaderplugin.so
-lib/kde3/kateprojectmanagerplugin.a
 lib/kde3/kateprojectmanagerplugin.la
 lib/kde3/kateprojectmanagerplugin.so
-lib/kde3/katetextfilterplugin.a
 lib/kde3/katetextfilterplugin.la
 lib/kde3/katetextfilterplugin.so
-lib/kde3/katexmltoolsplugin.a
 lib/kde3/katexmltoolsplugin.la
 lib/kde3/katexmltoolsplugin.so
-lib/kde3/kolourpicker_panelapplet.a
 lib/kde3/kolourpicker_panelapplet.la
 lib/kde3/kolourpicker_panelapplet.so
-lib/kde3/konqsidebar_mediaplayer.a
 lib/kde3/konqsidebar_mediaplayer.la
 lib/kde3/konqsidebar_mediaplayer.so
-lib/kde3/ktimemon_panelapplet.a
 lib/kde3/ktimemon_panelapplet.la
 lib/kde3/ktimemon_panelapplet.so
 lib/kde3/ktimemon_panelapplet.so.1
 lib/kde3/ktimemon_panelapplet.so.1.0
-lib/kde3/libbabelfishplugin.a
 lib/kde3/libbabelfishplugin.la
 lib/kde3/libbabelfishplugin.so
-lib/kde3/libdirfilterplugin.a
 lib/kde3/libdirfilterplugin.la
 lib/kde3/libdirfilterplugin.so
-lib/kde3/libdomtreeviewerplugin.a
 lib/kde3/libdomtreeviewerplugin.la
 lib/kde3/libdomtreeviewerplugin.so
-lib/kde3/libkcm_kuick.a
 lib/kde3/libkcm_kuick.la
 lib/kde3/libkcm_kuick.so
-lib/kde3/libkhtmlsettingsplugin.a
 lib/kde3/libkhtmlsettingsplugin.la
 lib/kde3/libkhtmlsettingsplugin.so
-lib/kde3/libkimgallery.a
 lib/kde3/libkimgallery.la
 lib/kde3/libkimgallery.so
-lib/kde3/libkuickplugin.a
 lib/kde3/libkuickplugin.la
 lib/kde3/libkuickplugin.so
-lib/kde3/libuachangerplugin.a
 lib/kde3/libuachangerplugin.la
 lib/kde3/libuachangerplugin.so
-lib/kde3/libvalidatorsplugin.a
 lib/kde3/libvalidatorsplugin.la
 lib/kde3/libvalidatorsplugin.so
-lib/kde3/libwebarchiverplugin.a
 lib/kde3/libwebarchiverplugin.la
 lib/kde3/libwebarchiverplugin.so
-lib/kde3/webarchivethumbnail.a
 lib/kde3/webarchivethumbnail.la
 lib/kde3/webarchivethumbnail.so
 share/doc/kde/HTML/en/kate-plugins/common
diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST
index 68743394658..a277f003ec6 100644
--- a/misc/kdeartwork3/PLIST
+++ b/misc/kdeartwork3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:27 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/20 10:03:53 skrll Exp $
 bin/kbanner.kss
 bin/kblob.kss
 bin/kbouboule.kss
@@ -19,22 +19,16 @@ bin/kswarm.kss
 bin/kvm.kss
 bin/kxsconfig
 bin/kxsrun
-lib/kde3/kwin_cde.a
 lib/kde3/kwin_cde.la
 lib/kde3/kwin_cde.so
-lib/kde3/kwin_cde_config.a
 lib/kde3/kwin_cde_config.la
 lib/kde3/kwin_cde_config.so
-lib/kde3/kwin_glow.a
 lib/kde3/kwin_glow.la
 lib/kde3/kwin_glow.so
-lib/kde3/kwin_glow_config.a
 lib/kde3/kwin_glow_config.la
 lib/kde3/kwin_glow_config.so
-lib/kde3/kwin_openlook.a
 lib/kde3/kwin_openlook.la
 lib/kde3/kwin_openlook.so
-lib/kde3/plugins/styles/dotnet.a
 lib/kde3/plugins/styles/dotnet.la
 lib/kde3/plugins/styles/dotnet.so
 share/kde/applnk/System/ScreenSavers/KBanner.desktop
@@ -2868,12 +2862,12 @@ share/kde/wallpapers/winter_theme_1.jpg
 @dirrm share/kde/icons/Locolor
 @dirrm share/kde/apps/kworldclock/maps/rainfall
 @dirrm share/kde/apps/kworldclock/maps/mggd
-@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock/maps/depths >/dev/null || true
+@unexec ${RMDIR} -p %D/share/kde/apps/kworldclock/maps/depths 2>/dev/null || true
 @dirrm share/kde/apps/kworldclock/maps/caida_bw
 @dirrm share/kde/apps/kworldclock/maps/caida
 @dirrm share/kde/apps/kworldclock/maps/bio
 @dirrm share/kde/apps/kworldclock/maps/alt
-@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock/maps >/dev/null || true
-@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock >/dev/null || true
+@unexec ${RMDIR} -p %D/share/kde/apps/kworldclock/maps 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/kde/apps/kworldclock 2>/dev/null || true
 @dirrm share/kde/apps/kwin/icewm-themes/Model
 @dirrm share/kde/apps/kwin/icewm-themes/MenschMaschine
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 43552bb1b92..ae972bb299e 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/02 09:12:28 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/20 10:03:54 skrll Exp $
 bin/ical2vcal
 bin/kabcfrontend
 bin/kalarm
@@ -37,77 +37,60 @@ include/kpilot/pilotSerialDatabase.h
 include/kpilot/plugin.h
 include/kpilot/syncAction.h
 include/kpilot/uiDialog.h
-lib/kde3/libabbrowserconduit.a
 lib/kde3/libabbrowserconduit.la
 lib/kde3/libabbrowserconduit.so
 lib/kde3/libabbrowserconduit.so.0
 lib/kde3/libabbrowserconduit.so.0.0
-lib/kde3/libexpenseconduit.a
 lib/kde3/libexpenseconduit.la
 lib/kde3/libexpenseconduit.so
 lib/kde3/libexpenseconduit.so.0
 lib/kde3/libexpenseconduit.so.0.0
-lib/kde3/libkcm_alarmdaemonctrl.a
 lib/kde3/libkcm_alarmdaemonctrl.la
 lib/kde3/libkcm_alarmdaemonctrl.so
-lib/kde3/libknotesconduit.a
 lib/kde3/libknotesconduit.la
 lib/kde3/libknotesconduit.so
 lib/kde3/libknotesconduit.so.0
 lib/kde3/libknotesconduit.so.0.0
-lib/kde3/libkorg_datenums.a
 lib/kde3/libkorg_datenums.la
 lib/kde3/libkorg_datenums.so
-lib/kde3/libkorg_holidays.a
 lib/kde3/libkorg_holidays.la
 lib/kde3/libkorg_holidays.so
-lib/kde3/libkorg_projectview.a
 lib/kde3/libkorg_projectview.la
 lib/kde3/libkorg_projectview.so
-lib/kde3/libkorg_webexport.a
 lib/kde3/libkorg_webexport.la
 lib/kde3/libkorg_webexport.so
-lib/kde3/libnullconduit.a
 lib/kde3/libnullconduit.la
 lib/kde3/libnullconduit.so
 lib/kde3/libnullconduit.so.0
 lib/kde3/libnullconduit.so.0.0
-lib/kde3/libpopmailconduit.a
 lib/kde3/libpopmailconduit.la
 lib/kde3/libpopmailconduit.so
 lib/kde3/libpopmailconduit.so.0
 lib/kde3/libpopmailconduit.so.0.0
-lib/kde3/libtodoconduit.a
 lib/kde3/libtodoconduit.la
 lib/kde3/libtodoconduit.so
 lib/kde3/libtodoconduit.so.0
 lib/kde3/libtodoconduit.so.0.0
-lib/kde3/libvcalconduit.a
 lib/kde3/libvcalconduit.la
 lib/kde3/libvcalconduit.so
 lib/kde3/libvcalconduit.so.0
 lib/kde3/libvcalconduit.so.0.0
-lib/libkalarmd.a
 lib/libkalarmd.la
 lib/libkalarmd.so
 lib/libkalarmd.so.0
 lib/libkalarmd.so.0.0
-lib/libkcal.a
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.2
 lib/libkcal.so.2.0
-lib/libkgantt.a
 lib/libkgantt.la
 lib/libkgantt.so
 lib/libkgantt.so.0
 lib/libkgantt.so.0.2
-lib/libkorganizer.a
 lib/libkorganizer.la
 lib/libkorganizer.so
 lib/libkorganizer.so.1
 lib/libkorganizer.so.1.0
-lib/libkpilot.a
 lib/libkpilot.la
 lib/libkpilot.so
 lib/libkpilot.so.0
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index e442a71c5ad..d36ed608e95 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/17 03:34:03 markd Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/20 10:03:54 skrll Exp $
 
 DISTNAME=	kdeutils-3.0.5a
 COMMENT=	Utilities for the KDE integrated X11 desktop
@@ -21,6 +21,13 @@ SPECIAL_PERMS+=	${PREFIX}/bin/efax ${_KDE_SETUID_ROOT}
 CPPFLAGS+=             -D__NetBSD_APM__
 .endif
 
+FOO_MAIN_FILES= \
+	kcalc/kcalc_main.cpp \
+	kedit/kedit_main.cpp \
+	klaptopdaemon/klaptopdaemon_main.cpp
+
+.include "../../x11/kde3/Makefile.foo_main"
+
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index b10987bfd7a..5a2f249eee4 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:42:33 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/20 10:03:54 skrll Exp $
 bin/ark
 bin/efax
 bin/efix
@@ -24,43 +24,32 @@ 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
diff --git a/misc/kdeutils3/patches/patch-ad b/misc/kdeutils3/patches/patch-ad
deleted file mode 100644
index e0499f947dd..00000000000
--- a/misc/kdeutils3/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$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);
-+}
diff --git a/misc/kdeutils3/patches/patch-ah b/misc/kdeutils3/patches/patch-ah
deleted file mode 100644
index 60b756ccdcc..00000000000
--- a/misc/kdeutils3/patches/patch-ah
+++ /dev/null
@@ -1,33 +0,0 @@
-$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);
-+}
diff --git a/misc/kdeutils3/patches/patch-al b/misc/kdeutils3/patches/patch-al
deleted file mode 100644
index c70b28c78e1..00000000000
--- a/misc/kdeutils3/patches/patch-al
+++ /dev/null
@@ -1,33 +0,0 @@
-$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);
-+}