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.

4 files changed, 8 insertions, 85 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index e9a006d84c9..d329cdbf03f 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:29 skrll Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/20 10:03:58 skrll Exp $
 
 DISTNAME=	kdenetwork-3.0.5a
 CATEGORIES=	net
@@ -9,6 +9,12 @@ COMMENT=	Network modules for the KDE integrated X11 desktop
 USE_BUILDLINK2=		yes
 PTHREAD_OPTS+=		require
 
+FOO_MAIN_FILES= \
+	ksirc/ksirc_main.cpp \
+	kxmlrpc/kxmlrpcd_main.cpp
+
+.include "../../x11/kde3/Makefile.foo_main"
+
 .include "../../converters/uulib/buildlink2.mk"
 .include "../../databases/gdbm/buildlink2.mk"
 .include "../../x11/kde3/buildlink2.mk"
diff --git a/net/kdenetwork3/PLIST b/net/kdenetwork3/PLIST
index 6dbf836ef14..781989e9f2a 100644
--- a/net/kdenetwork3/PLIST
+++ b/net/kdenetwork3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:30 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/20 10:03:58 skrll Exp $
 bin/dsirc
 bin/kdict
 bin/kit
@@ -52,63 +52,46 @@ include/mimelib/text.h
 include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
-lib/kde3/kdictapplet.a
 lib/kde3/kdictapplet.la
 lib/kde3/kdictapplet.so
 lib/kde3/kdictapplet.so.1
 lib/kde3/kdictapplet.so.1.0
-lib/kde3/knewsticker_applet.a
 lib/kde3/knewsticker_applet.la
 lib/kde3/knewsticker_applet.so
-lib/kde3/kpfapplet.a
 lib/kde3/kpfapplet.la
 lib/kde3/kpfapplet.so
-lib/kde3/kpfpropertiesdialogplugin.a
 lib/kde3/kpfpropertiesdialogplugin.la
 lib/kde3/kpfpropertiesdialogplugin.so
-lib/kde3/libkcm_kcmkxmlrpcd.a
 lib/kde3/libkcm_kcmkxmlrpcd.la
 lib/kde3/libkcm_kcmkxmlrpcd.so
-lib/kde3/libkcm_ktalkd.a
 lib/kde3/libkcm_ktalkd.la
 lib/kde3/libkcm_ktalkd.so
-lib/kde3/libkcm_lanbrowser.a
 lib/kde3/libkcm_lanbrowser.la
 lib/kde3/libkcm_lanbrowser.so
-lib/kde3/libkcm_newsticker.a
 lib/kde3/libkcm_newsticker.la
 lib/kde3/libkcm_newsticker.so
-lib/kde3/libkcm_xmlrpcd.a
 lib/kde3/libkcm_xmlrpcd.la
 lib/kde3/libkcm_xmlrpcd.so
-lib/kio_lan.a
 lib/kio_lan.la
 lib/kio_lan.so
-lib/ksirc.a
 lib/ksirc.la
 lib/ksirc.so
-lib/kxmlrpcd.a
 lib/kxmlrpcd.la
 lib/kxmlrpcd.so
-lib/libkdenetwork.a
 lib/libkdenetwork.la
 lib/libkdenetwork.so
 lib/libkdenetwork.so.2
 lib/libkdenetwork.so.2.0
-lib/libkntsrcfilepropsdlg.a
 lib/libkntsrcfilepropsdlg.la
 lib/libkntsrcfilepropsdlg.so
-lib/libksirc_main.a
 lib/libksirc_main.la
 lib/libksirc_main.so
 lib/libksirc_main.so.0
 lib/libksirc_main.so.0.0
-lib/libkxmlrpcd_main.a
 lib/libkxmlrpcd_main.la
 lib/libkxmlrpcd_main.so
 lib/libkxmlrpcd_main.so.0
 lib/libkxmlrpcd_main.so.0.0
-lib/libmimelib.a
 lib/libmimelib.la
 lib/libmimelib.so
 lib/libmimelib.so.1
diff --git a/net/kdenetwork3/patches/patch-ah b/net/kdenetwork3/patches/patch-ah
deleted file mode 100644
index 570fb8b61eb..00000000000
--- a/net/kdenetwork3/patches/patch-ah
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
-
---- ksirc/ksirc_main.cpp.orig	Thu May 30 19:21:56 2002
-+++ ksirc/ksirc_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/net/kdenetwork3/patches/patch-ak b/net/kdenetwork3/patches/patch-ak
deleted file mode 100644
index c87b2181935..00000000000
--- a/net/kdenetwork3/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
-
---- kxmlrpc/kxmlrpcd_main.cpp.orig	Thu May 30 19:21:56 2002
-+++ kxmlrpc/kxmlrpcd_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);
-+}