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.

5 files changed, 9 insertions, 112 deletions

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);
-+}