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, 11 insertions, 49 deletions

diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 2f00d857088..8719db53e79 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/01/02 09:12:24 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/20 10:03:46 skrll Exp $
 
 DISTNAME=	kdegames-3.0.5a
 CATEGORIES=	games
@@ -8,6 +8,11 @@ COMMENT=	Games for the KDE integrated X11 desktop
 
 USE_BUILDLINK2=		YES
 
+FOO_MAIN_FILES= \
+	kbackgammon/kbackgammon_main.cpp
+
+.include "../../x11/kde3/Makefile.foo_main"
+
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kdegames3/PLIST b/games/kdegames3/PLIST
index 7a8cfdeb39d..812506421fe 100644
--- a/games/kdegames3/PLIST
+++ b/games/kdegames3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 14:02:54 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/20 10:03:46 skrll Exp $
 bin/kasteroids
 bin/katomic
 bin/kbackgammon
@@ -57,30 +57,24 @@ include/kgameprogress.h
 include/khighscore.h
 include/kscoredialog.h
 include/kstdgameaction.h
-lib/kbackgammon.a
 lib/kbackgammon.la
 lib/kbackgammon.so
-lib/libkbackgammon_main.a
 lib/libkbackgammon_main.la
 lib/libkbackgammon_main.so
 lib/libkbackgammon_main.so.0
 lib/libkbackgammon_main.so.0.0
-lib/libkdegames.a
 lib/libkdegames.la
 lib/libkdegames.so
 lib/libkdegames.so.1
 lib/libkdegames.so.1.1
-lib/libkdehighscores.a
 lib/libkdehighscores.la
 lib/libkdehighscores.so
 lib/libkdehighscores.so.0
 lib/libkdehighscores.so.0.1
-lib/libksirtetbase.a
 lib/libksirtetbase.la
 lib/libksirtetbase.so
 lib/libksirtetbase.so.0
 lib/libksirtetbase.so.0.1
-lib/libksirtetcommon.a
 lib/libksirtetcommon.la
 lib/libksirtetcommon.so
 lib/libksirtetcommon.so.0
diff --git a/games/kdegames3/patches/patch-ac b/games/kdegames3/patches/patch-ac
deleted file mode 100644
index 65036476821..00000000000
--- a/games/kdegames3/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
-
---- kbackgammon/kbackgammon_main.cpp.orig	Fri May 31 12:54:09 2002
-+++ kbackgammon/kbackgammon_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/games/kdetoys3/PLIST b/games/kdetoys3/PLIST
index 64d5d068558..9374fd83272 100644
--- a/games/kdetoys3/PLIST
+++ b/games/kdetoys3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:25 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/20 10:03:48 skrll Exp $
 bin/amor
 bin/kaphorism
 bin/kmoon
@@ -7,22 +7,18 @@ bin/kteatime
 bin/ktux
 bin/kworldclock
 include/AmorIface.h
-lib/kde3/eyes_panelapplet.a
 lib/kde3/eyes_panelapplet.la
 lib/kde3/eyes_panelapplet.so
 lib/kde3/eyes_panelapplet.so.1
 lib/kde3/eyes_panelapplet.so.1.0
-lib/kde3/fifteen_panelapplet.a
 lib/kde3/fifteen_panelapplet.la
 lib/kde3/fifteen_panelapplet.so
 lib/kde3/fifteen_panelapplet.so.1
 lib/kde3/fifteen_panelapplet.so.1.0
-lib/kde3/weather_panelapplet.a
 lib/kde3/weather_panelapplet.la
 lib/kde3/weather_panelapplet.so
 lib/kde3/weather_panelapplet.so.1
 lib/kde3/weather_panelapplet.so.1.0
-lib/kde3/ww_panelapplet.a
 lib/kde3/ww_panelapplet.la
 lib/kde3/ww_panelapplet.so
 lib/kde3/ww_panelapplet.so.1
@@ -586,9 +582,9 @@ share/kde/icons/locolor/32x32/apps/ktux.png
 @comment dirrm share/kde/icons/hicolor/32x32/apps
 @comment dirrm share/kde/icons/hicolor/16x16/apps
 @dirrm share/kde/apps/kworldclock/pics
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps/depths >/dev/null || true
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps >/dev/null || true
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock >/dev/null || true
+@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps/depths 2>/dev/null || true
+@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps 2>/dev/null || true
+@unexec ${RMDIR} %D/share/kde/apps/kworldclock 2>/dev/null || true
 @dirrm share/kde/apps/kweather
 @dirrm share/kde/apps/ktux/sprites
 @dirrm share/kde/apps/ktux