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.

7 files changed, 11 insertions, 204 deletions

diff --git a/audio/arts/PLIST b/audio/arts/PLIST
index 3bbf39b1e5b..d4a6c5587a0 100644
--- a/audio/arts/PLIST
+++ b/audio/arts/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/20 10:03:40 skrll Exp $
 bin/artsc-config
 bin/artscat
 bin/artsd
@@ -66,67 +66,54 @@ include/arts/unixconnection.h
 include/arts/unixserver.h
 include/arts/weakreference.h
 include/artsc/artsc.h
-lib/libartsc.a
 lib/libartsc.la
 lib/libartsc.so
 lib/libartsc.so.0
 lib/libartsc.so.0.0
-lib/libartscbackend.a
 lib/libartscbackend.la
 lib/libartscbackend.so
 lib/libartscbackend.so.0
 lib/libartscbackend.so.0.0
-lib/libartsdsp.a
 lib/libartsdsp.la
 lib/libartsdsp.so
 lib/libartsdsp.so.0
 lib/libartsdsp.so.0.0
-lib/libartsdsp_st.a
 lib/libartsdsp_st.la
 lib/libartsdsp_st.so
 lib/libartsdsp_st.so.0
 lib/libartsdsp_st.so.0.0
-lib/libartsflow.a
 lib/libartsflow.la
 lib/libartsflow.so
 lib/libartsflow.so.1
 lib/libartsflow.so.1.0
-lib/libartsflow_idl.a
 lib/libartsflow_idl.la
 lib/libartsflow_idl.so
 lib/libartsflow_idl.so.1
 lib/libartsflow_idl.so.1.0
-lib/libartswavplayobject.a
 lib/libartswavplayobject.la
 lib/libartswavplayobject.so
 lib/libartswavplayobject.so.0
 lib/libartswavplayobject.so.0.0
-lib/libkmedia2.a
 lib/libkmedia2.la
 lib/libkmedia2.so
 lib/libkmedia2.so.1
 lib/libkmedia2.so.1.0
-lib/libkmedia2_idl.a
 lib/libkmedia2_idl.la
 lib/libkmedia2_idl.so
 lib/libkmedia2_idl.so.1
 lib/libkmedia2_idl.so.1.0
-lib/libmcop.a
 lib/libmcop.la
 lib/libmcop.so
 lib/libmcop.so.1
 lib/libmcop.so.1.0
-lib/libqtmcop.a
 lib/libqtmcop.la
 lib/libqtmcop.so
 lib/libqtmcop.so.1
 lib/libqtmcop.so.1.0
-lib/libsoundserver_idl.a
 lib/libsoundserver_idl.la
 lib/libsoundserver_idl.so
 lib/libsoundserver_idl.so.1
 lib/libsoundserver_idl.so.1.0
-lib/libx11globalcomm.a
 lib/libx11globalcomm.la
 lib/libx11globalcomm.so
 lib/libx11globalcomm.so.1
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 6ebc6027850..88abb2ddad8 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:21 skrll Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/20 10:03:41 skrll Exp $
 
 DISTNAME=	kdemultimedia-3.0.5a
 CATEGORIES=	audio
@@ -20,6 +20,14 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 PTHREAD_OPTS+=	require
 
+FOO_MAIN_FILES= \
+	kaboodle/kaboodle_main.cpp \
+	kmix/kmix_main.cpp \
+	kmix/kmixctrl_main.cpp \
+	noatun/noatun_main.cpp
+
+.include "../../x11/kde3/Makefile.foo_main"
+
 .include "../../audio/arts/buildlink2.mk"
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
diff --git a/audio/kdemultimedia3/PLIST b/audio/kdemultimedia3/PLIST
index 1fd559e565e..ea82d40b93e 100644
--- a/audio/kdemultimedia3/PLIST
+++ b/audio/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/25 06:34:32 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/20 10:03:41 skrll Exp $
 bin/aktion
 bin/artsbuilder
 bin/artscontrol
@@ -130,84 +130,58 @@ include/noatun/stereobuttonaction.h
 include/noatun/tags.h
 include/noatun/winskinvis.h
 include/plugin_deps.h
-lib/kaboodle.a
 lib/kaboodle.la
 lib/kaboodle.so
-lib/kde3/kcm_kmix.a
 lib/kde3/kcm_kmix.la
 lib/kde3/kcm_kmix.so
-lib/kde3/kfile_m3u.a
 lib/kde3/kfile_m3u.la
 lib/kde3/kfile_m3u.so
-lib/kde3/kfile_mp3.a
 lib/kde3/kfile_mp3.la
 lib/kde3/kfile_mp3.so
-lib/kde3/kfile_wav.a
 lib/kde3/kfile_wav.la
 lib/kde3/kfile_wav.so
-lib/kde3/kmix_panelapplet.a
 lib/kde3/kmix_panelapplet.la
 lib/kde3/kmix_panelapplet.so
 lib/kde3/kmix_panelapplet.so.1
 lib/kde3/kmix_panelapplet.so.1.0
-lib/kde3/noatun.a
 lib/kde3/noatun.la
 lib/kde3/noatun.so
-lib/kde3/noatun_dcopiface.a
 lib/kde3/noatun_dcopiface.la
 lib/kde3/noatun_dcopiface.so
-lib/kde3/noatun_excellent.a
 lib/kde3/noatun_excellent.la
 lib/kde3/noatun_excellent.so
-lib/kde3/noatun_htmlexport.a
 lib/kde3/noatun_htmlexport.la
 lib/kde3/noatun_htmlexport.so
-lib/kde3/noatun_infrared.a
 lib/kde3/noatun_infrared.la
 lib/kde3/noatun_infrared.so
-lib/kde3/noatun_kaiman.a
 lib/kde3/noatun_kaiman.la
 lib/kde3/noatun_kaiman.so
-lib/kde3/noatun_keyz.a
 lib/kde3/noatun_keyz.la
 lib/kde3/noatun_keyz.so
-lib/kde3/noatun_kjofol.a
 lib/kde3/noatun_kjofol.la
 lib/kde3/noatun_kjofol.so
-lib/kde3/noatun_marquis.a
 lib/kde3/noatun_marquis.la
 lib/kde3/noatun_marquis.so
-lib/kde3/noatun_metatag.a
 lib/kde3/noatun_metatag.la
 lib/kde3/noatun_metatag.so
-lib/kde3/noatun_monoscope.a
 lib/kde3/noatun_monoscope.la
 lib/kde3/noatun_monoscope.so
-lib/kde3/noatun_net.a
 lib/kde3/noatun_net.la
 lib/kde3/noatun_net.so
-lib/kde3/noatun_splitplaylist.a
 lib/kde3/noatun_splitplaylist.la
 lib/kde3/noatun_splitplaylist.so
-lib/kde3/noatun_systray.a
 lib/kde3/noatun_systray.la
 lib/kde3/noatun_systray.so
-lib/kde3/noatun_ui.a
 lib/kde3/noatun_ui.la
 lib/kde3/noatun_ui.so
-lib/kde3/noatun_voiceprint.a
 lib/kde3/noatun_voiceprint.la
 lib/kde3/noatun_voiceprint.so
-lib/kde3/noatun_winskin.a
 lib/kde3/noatun_winskin.la
 lib/kde3/noatun_winskin.so
-lib/kmix.a
 lib/kmix.la
 lib/kmix.so
-lib/kmixctrl.a
 lib/kmixctrl.la
 lib/kmixctrl.so
-lib/libaktion.a
 lib/libaktion.la
 lib/libaktion.so
 lib/libaktion.so.1
@@ -215,124 +189,97 @@ lib/libaktion.so.1.0
 lib/libarts_mpeglib-0.3.0.so
 lib/libarts_mpeglib-0.3.0.so.0
 lib/libarts_mpeglib-0.3.0.so.0.3
-lib/libarts_mpeglib.a
 lib/libarts_mpeglib.la
 lib/libarts_mpeglib.so
-lib/libarts_splay.a
 lib/libarts_splay.la
 lib/libarts_splay.so
 lib/libarts_splay.so.0
 lib/libarts_splay.so.0.0
-lib/libartsbuilder.a
 lib/libartsbuilder.la
 lib/libartsbuilder.so
 lib/libartsbuilder.so.0
 lib/libartsbuilder.so.0.0
-lib/libartseffects.a
 lib/libartseffects.la
 lib/libartseffects.so
-lib/libartsgui.a
 lib/libartsgui.la
 lib/libartsgui.so
 lib/libartsgui.so.0
 lib/libartsgui.so.0.0
-lib/libartsgui_idl.a
 lib/libartsgui_idl.la
 lib/libartsgui_idl.so
 lib/libartsgui_idl.so.0
 lib/libartsgui_idl.so.0.0
-lib/libartsgui_kde.a
 lib/libartsgui_kde.la
 lib/libartsgui_kde.so
 lib/libartsgui_kde.so.0
 lib/libartsgui_kde.so.0.0
-lib/libartsmidi.a
 lib/libartsmidi.la
 lib/libartsmidi.so
 lib/libartsmidi.so.0
 lib/libartsmidi.so.0.0
-lib/libartsmidi_idl.a
 lib/libartsmidi_idl.la
 lib/libartsmidi_idl.so
 lib/libartsmidi_idl.so.0
 lib/libartsmidi_idl.so.0.0
-lib/libartsmodules.a
 lib/libartsmodules.la
 lib/libartsmodules.so
 lib/libartsmodules.so.0
 lib/libartsmodules.so.0.0
-lib/libaudiofilearts.a
 lib/libaudiofilearts.la
 lib/libaudiofilearts.so
-lib/libdummy.a
 lib/libdummy.la
 lib/libdummy.so
 lib/libdummy.so.0
 lib/libdummy.so.0.0
-lib/libkaboodle_main.a
 lib/libkaboodle_main.la
 lib/libkaboodle_main.so
 lib/libkaboodle_main.so.0
 lib/libkaboodle_main.so.0.0
-lib/libkaboodlepart.a
 lib/libkaboodlepart.la
 lib/libkaboodlepart.so
-lib/libkmidpart.a
 lib/libkmidpart.la
 lib/libkmidpart.so
 lib/libkmidpart.so.1
 lib/libkmidpart.so.1.0
-lib/libkmix_main.a
 lib/libkmix_main.la
 lib/libkmix_main.so
 lib/libkmix_main.so.0
 lib/libkmix_main.so.0.0
-lib/libkmixctrl_main.a
 lib/libkmixctrl_main.la
 lib/libkmixctrl_main.so
 lib/libkmixctrl_main.so.0
 lib/libkmixctrl_main.so.0.0
 lib/libmpeg-0.3.0.so
-lib/libmpeg.a
 lib/libmpeg.la
 lib/libmpeg.so
-lib/libnoatun_core.a
 lib/libnoatun_core.la
 lib/libnoatun_core.so
 lib/libnoatun_core.so.0
 lib/libnoatun_core.so.0.0
-lib/libnoatun_main.a
 lib/libnoatun_main.la
 lib/libnoatun_main.so
 lib/libnoatun_main.so.0
 lib/libnoatun_main.so.0.0
-lib/libnoatunarts.a
 lib/libnoatunarts.la
 lib/libnoatunarts.so
-lib/libnoatuncontrols.a
 lib/libnoatuncontrols.la
 lib/libnoatuncontrols.so
 lib/libnoatuncontrols.so.0
 lib/libnoatuncontrols.so.0.0
-lib/libnoatuntags.a
 lib/libnoatuntags.la
 lib/libnoatuntags.so
 lib/libnoatuntags.so.0
 lib/libnoatuntags.so.0.0
-lib/libwinskinvis.a
 lib/libwinskinvis.la
 lib/libwinskinvis.so
-lib/libworkman.a
 lib/libworkman.la
 lib/libworkman.so
 lib/libworkman.so.5
 lib/libworkman.so.5.3
-lib/libyafcore.a
 lib/libyafcore.la
 lib/libyafcore.so
 lib/libyafcore.so.0
 lib/libyafcore.so.0.0
-lib/libyafxplayer.a
 lib/libyafxplayer.la
 lib/libyafxplayer.so
 lib/libyafxplayer.so.0
diff --git a/audio/kdemultimedia3/patches/patch-ad b/audio/kdemultimedia3/patches/patch-ad
deleted file mode 100644
index 6c586597bed..00000000000
--- a/audio/kdemultimedia3/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
-
---- kaboodle/kaboodle_main.cpp.orig	Thu May 30 20:46:07 2002
-+++ kaboodle/kaboodle_main.cpp
-@@ -0,0 +1,29 @@
-+/*
-+ * 
-+ * 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 argc, char* argv[]);
-+
-+int main( int argc, char* argv[] )
-+{
-+	return kdemain(argc, argv);
-+}
diff --git a/audio/kdemultimedia3/patches/patch-al b/audio/kdemultimedia3/patches/patch-al
deleted file mode 100644
index 64f8f606009..00000000000
--- a/audio/kdemultimedia3/patches/patch-al
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
-
---- kmix/kmix_main.cpp.orig	Thu May 30 20:46:07 2002
-+++ kmix/kmix_main.cpp
-@@ -0,0 +1,29 @@
-+/*
-+ * 
-+ * 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 argc, char* argv[]);
-+
-+int main( int argc, char* argv[] )
-+{
-+	return kdemain(argc, argv);
-+}
diff --git a/audio/kdemultimedia3/patches/patch-an b/audio/kdemultimedia3/patches/patch-an
deleted file mode 100644
index 6b24db4f22d..00000000000
--- a/audio/kdemultimedia3/patches/patch-an
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
-
---- kmix/kmixctrl_main.cpp.orig	Thu May 30 20:46:08 2002
-+++ kmix/kmixctrl_main.cpp
-@@ -0,0 +1,29 @@
-+/*
-+ * 
-+ * 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 argc, char* argv[]);
-+
-+int main( int argc, char* argv[] )
-+{
-+	return kdemain(argc, argv);
-+}
diff --git a/audio/kdemultimedia3/patches/patch-ck b/audio/kdemultimedia3/patches/patch-ck
deleted file mode 100644
index 761b12b5986..00000000000
--- a/audio/kdemultimedia3/patches/patch-ck
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2002/06/25 06:34:42 skrll Exp $
-
---- noatun/noatun_main.cpp.orig	Sat Jun  8 12:07:50 2002
-+++ noatun/noatun_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);
-+}