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.

13 files changed, 52 insertions, 378 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 63b0013cb07..8b49489783c 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/01/17 03:20:58 markd Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/20 10:04:18 skrll Exp $
 
 DISTNAME=	kdelibs-3.0.5a
 CATEGORIES=	x11
@@ -31,6 +31,30 @@ REPLACE_PERL= \
 PLIST_SRC=		${WRKDIR}/PLIST
 UNLIMIT_RESOURCES=	datasize memorysize
 
+FOO_MAIN_FILES= \
+	arts/knotify/knotify_main.cpp \
+	dcop/dcopserver_main.cpp \
+	kconf_update/kconf_update_main.cpp \
+	kded/kbuildsycoca_main.cpp \
+	kded/kded_main.cpp \
+	kdeprint/management/kaddprinterwizard_main.cpp \
+	kio/misc/kio_uiserver_main.cpp \
+	kioslave/http/http_cache_cleaner_main.cpp \
+	kioslave/http/kcookiejar/kcookiejar_main.cpp
+
+.include "../../x11/kde3/Makefile.foo_main"
+
+FIXUP_FILES= \
+	kspell/ksconfig.cpp
+
+pre-configure:
+	@for i in ${FIXUP_FILES}; do \
+		${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
+		     ${WRKSRC}/$${i} > ${WRKSRC}/$${i}.fixup && \
+		${MV} ${WRKSRC}/$${i}.fixup ${WRKSRC}/$${i}; \
+	done
+
+
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
 .include "../../print/cups/buildlink2.mk"
 BUILD_DEFS+=		USE_CUPS
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index 22d70cd194f..8f38e30d350 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/20 10:04:19 skrll Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -505,282 +505,210 @@ include/renamedlgplugin.h
 include/scriptclientinterface.h
 include/scriptinterface.h
 include/scriptmanager.h
-lib/dcopserver.a
 lib/dcopserver.la
 lib/dcopserver.so
-lib/kaddprinterwizard.a
 lib/kaddprinterwizard.la
 lib/kaddprinterwizard.so
-lib/kbuildsycoca.a
 lib/kbuildsycoca.la
 lib/kbuildsycoca.so
-lib/kconf_update.a
 lib/kconf_update.la
 lib/kconf_update.so
-lib/kcookiejar.a
 lib/kcookiejar.la
 lib/kcookiejar.so
-lib/kde3/kbzip2filter.a
 lib/kde3/kbzip2filter.la
 lib/kde3/kbzip2filter.so
-lib/kde3/kded_kdeprintd.a
 lib/kde3/kded_kdeprintd.la
 lib/kde3/kded_kdeprintd.so
-lib/kde3/kded_kssld.a
 lib/kde3/kded_kssld.la
 lib/kde3/kded_kssld.so
-${CUPS}lib/kde3/kdeprint_cups.a
 ${CUPS}lib/kde3/kdeprint_cups.la
 ${CUPS}lib/kde3/kdeprint_cups.so
-lib/kde3/kdeprint_ext.a
 lib/kde3/kdeprint_ext.la
 lib/kde3/kdeprint_ext.so
-lib/kde3/kdeprint_lpdunix.a
 lib/kde3/kdeprint_lpdunix.la
 lib/kde3/kdeprint_lpdunix.so
-lib/kde3/kdeprint_lpr.a
 lib/kde3/kdeprint_lpr.la
 lib/kde3/kdeprint_lpr.so
-lib/kde3/kdeprint_rlpr.a
 lib/kde3/kdeprint_rlpr.la
 lib/kde3/kdeprint_rlpr.so
-lib/kde3/kgzipfilter.a
 lib/kde3/kgzipfilter.la
 lib/kde3/kgzipfilter.so
-lib/kde3/khtmlimagepart.a
 lib/kde3/khtmlimagepart.la
 lib/kde3/khtmlimagepart.so
-lib/kde3/kimg_eps.a
 lib/kde3/kimg_eps.la
 lib/kde3/kimg_eps.so
-lib/kde3/kimg_g3.a
 lib/kde3/kimg_g3.la
 lib/kde3/kimg_g3.so
-lib/kde3/kimg_ico.a
 lib/kde3/kimg_ico.la
 lib/kde3/kimg_ico.so
-lib/kde3/kimg_krl.a
 lib/kde3/kimg_krl.la
 lib/kde3/kimg_krl.so
-lib/kde3/kimg_tiff.a
 lib/kde3/kimg_tiff.la
 lib/kde3/kimg_tiff.so
-lib/kde3/kimg_xview.a
 lib/kde3/kimg_xview.la
 lib/kde3/kimg_xview.so
-lib/kde3/kio_file.a
 lib/kde3/kio_file.la
 lib/kde3/kio_file.so
-lib/kde3/kio_ftp.a
 lib/kde3/kio_ftp.la
 lib/kde3/kio_ftp.so
-lib/kde3/kio_help.a
 lib/kde3/kio_help.la
 lib/kde3/kio_help.so
-lib/kde3/kio_http.a
 lib/kde3/kio_http.la
 lib/kde3/kio_http.so
-lib/kde3/kjs_html.a
 lib/kde3/kjs_html.la
 lib/kde3/kjs_html.so
-lib/kde3/libkpac.a
 lib/kde3/libkpac.la
 lib/kde3/libkpac.so
-lib/kde3/plugins/designer/kdewidgets.a
 lib/kde3/plugins/designer/kdewidgets.la
 lib/kde3/plugins/designer/kdewidgets.so
-lib/kde3/plugins/styles/highcolor.a
 lib/kde3/plugins/styles/highcolor.la
 lib/kde3/plugins/styles/highcolor.so
-lib/kde3/plugins/styles/kthemestyle.a
 lib/kde3/plugins/styles/kthemestyle.la
 lib/kde3/plugins/styles/kthemestyle.so
-lib/kde3/plugins/styles/light.a
 lib/kde3/plugins/styles/light.la
 lib/kde3/plugins/styles/light.so
-${KDED_WORKAROUND}lib/kded.a
 ${KDED_WORKAROUND}lib/kded.la
 ${KDED_WORKAROUND}lib/kded.so
-lib/kio_http_cache_cleaner.a
 lib/kio_http_cache_cleaner.la
 lib/kio_http_cache_cleaner.so
-lib/kio_uiserver.a
 lib/kio_uiserver.la
 lib/kio_uiserver.so
-lib/klauncher.a
 lib/klauncher.la
 lib/klauncher.so
-lib/knotify.a
 lib/knotify.la
 lib/knotify.so
-lib/libDCOP.a
 lib/libDCOP.la
 lib/libDCOP.so
 lib/libDCOP.so.4
 lib/libDCOP.so.4.0
-lib/libartskde.a
 lib/libartskde.la
 lib/libartskde.so
 lib/libartskde.so.1
 lib/libartskde.so.1.0
-${CUPS}lib/libcupsdconf.a
 ${CUPS}lib/libcupsdconf.la
 ${CUPS}lib/libcupsdconf.so
-lib/libdcopserver_main.a
 lib/libdcopserver_main.la
 lib/libdcopserver_main.so
 lib/libdcopserver_main.so.0
 lib/libdcopserver_main.so.0.0
-lib/libkabc.a
 lib/libkabc.la
 lib/libkabc.so
 lib/libkabc.so.1
 lib/libkabc.so.1.0
-lib/libkaddprinterwizard_main.a
 lib/libkaddprinterwizard_main.la
 lib/libkaddprinterwizard_main.so
-lib/libkatepart.a
 lib/libkatepart.la
 lib/libkatepart.so
-lib/libkatepartinterfaces.a
 lib/libkatepartinterfaces.la
 lib/libkatepartinterfaces.so
 lib/libkatepartinterfaces.so.0
 lib/libkatepartinterfaces.so.0.0
-lib/libkbuildsycoca_main.a
 lib/libkbuildsycoca_main.la
 lib/libkbuildsycoca_main.so
 lib/libkbuildsycoca_main.so.0
 lib/libkbuildsycoca_main.so.0.0
-lib/libkcertpart.a
 lib/libkcertpart.la
 lib/libkcertpart.so
-lib/libkconf_update_main.a
 lib/libkconf_update_main.la
 lib/libkconf_update_main.so
 lib/libkconf_update_main.so.0
 lib/libkconf_update_main.so.0.0
-lib/libkcookiejar_main.a
 lib/libkcookiejar_main.la
 lib/libkcookiejar_main.so
 lib/libkcookiejar_main.so.0
 lib/libkcookiejar_main.so.0.0
-lib/libkdecore.a
 lib/libkdecore.la
 lib/libkdecore.so
 lib/libkdecore.so.4
 lib/libkdecore.so.4.0
-lib/libkded_main.a
 lib/libkded_main.la
 lib/libkded_main.so
 lib/libkded_main.so.0
 lib/libkded_main.so.0.0
-lib/libkdefakes.a
 lib/libkdefakes.la
 lib/libkdefakes.so
 lib/libkdefakes.so.4
 lib/libkdefakes.so.4.0
-lib/libkdefx.a
 lib/libkdefx.la
 lib/libkdefx.so
 lib/libkdefx.so.4
 lib/libkdefx.so.4.0
-lib/libkdeprint.a
 lib/libkdeprint.la
 lib/libkdeprint.so
 lib/libkdeprint.so.4
 lib/libkdeprint.so.4.0
-lib/libkdeprint_management.a
 lib/libkdeprint_management.la
 lib/libkdeprint_management.so
 lib/libkdeprint_management.so.4
 lib/libkdeprint_management.so.4.0
-lib/libkdesasl.a
 lib/libkdesasl.la
 lib/libkdesasl.so
 lib/libkdesasl.so.1
 lib/libkdesasl.so.1.0
-lib/libkdesu.a
 lib/libkdesu.la
 lib/libkdesu.so
 lib/libkdesu.so.4
 lib/libkdesu.so.4.0
-lib/libkdeui.a
 lib/libkdeui.la
 lib/libkdeui.so
 lib/libkdeui.so.4
 lib/libkdeui.so.4.0
-lib/libkhtml.a
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
 lib/libkhtml.so.4.0
-lib/libkio.a
 lib/libkio.la
 lib/libkio.so
 lib/libkio.so.4
 lib/libkio.so.4.0
-lib/libkio_http_cache_cleaner_main.a
 lib/libkio_http_cache_cleaner_main.la
 lib/libkio_http_cache_cleaner_main.so
 lib/libkio_http_cache_cleaner_main.so.0
 lib/libkio_http_cache_cleaner_main.so.0.0
-lib/libkio_uiserver_main.a
 lib/libkio_uiserver_main.la
 lib/libkio_uiserver_main.so
 lib/libkio_uiserver_main.so.0
 lib/libkio_uiserver_main.so.0.0
-lib/libkjava.a
 lib/libkjava.la
 lib/libkjava.so
 lib/libkjava.so.1
 lib/libkjava.so.1.0
-lib/libkjs.a
 lib/libkjs.la
 lib/libkjs.so
 lib/libkjs.so.1
 lib/libkjs.so.1.0
-lib/libkmid.a
 lib/libkmid.la
 lib/libkmid.so
 lib/libkmid.so.0
 lib/libkmid.so.0.95
-lib/libknotify_main.a
 lib/libknotify_main.la
 lib/libknotify_main.so
 lib/libknotify_main.so.0
 lib/libknotify_main.so.0.0
-lib/libkparts.a
 lib/libkparts.la
 lib/libkparts.so
 lib/libkparts.so.2
 lib/libkparts.so.2.0
-lib/libkscreensaver.a
 lib/libkscreensaver.la
 lib/libkscreensaver.so
 lib/libkscreensaver.so.4
 lib/libkscreensaver.so.4.0
-lib/libkscript.a
 lib/libkscript.la
 lib/libkscript.so
 lib/libkscript.so.0
 lib/libkscript.so.0.0
-lib/libkspell.a
 lib/libkspell.la
 lib/libkspell.so
 lib/libkspell.so.4
 lib/libkspell.so.4.0
-lib/libktexteditor.a
 lib/libktexteditor.la
 lib/libktexteditor.so
 lib/libktexteditor.so.0
 lib/libktexteditor.so.0.0
-lib/libshellscript.a
 lib/libshellscript.la
 lib/libshellscript.so
 lib/libshellscript.so.0
 lib/libshellscript.so.0.0
-lib/libvcard.a
 lib/libvcard.la
 lib/libvcard.so
 lib/libvcard.so.0
@@ -3330,6 +3258,8 @@ share/kde/servicetypes/scriptinterface.desktop
 @dirrm share/kde/mimelnk/application
 @dirrm share/kde/mimelnk/all
 @dirrm share/kde/mimelnk
+@exec ${MKDIR} %D/share/kde/locale
+@dirrm share/kde/locale
 @dirrm share/kde/config/ui
 @dirrm share/kde/config/colors
 @dirrm share/kde/config
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 246621a0b09..0fbf65280a6 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,31 +1,25 @@
-$NetBSD: distinfo,v 1.13 2003/01/17 02:59:52 markd Exp $
+$NetBSD: distinfo,v 1.14 2003/01/20 10:04:19 skrll Exp $
 
 SHA1 (kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad
 Size (kdelibs-3.0.5a.tar.bz2) = 7647507 bytes
 SHA1 (patch-aa) = dc26c7d5f845e881d313745b25ef9e90ead5707f
 SHA1 (patch-ab) = 526a52e39d4ce89b875383b8d9b8574a2494715b
 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e
-SHA1 (patch-ad) = 60557b5cd8381a5e23a50d90561ff7ca8a552813
 SHA1 (patch-ae) = 98b5adaab83f292d0b0b8e0363798e5de7b8aa8c
 SHA1 (patch-af) = ea4e54130fa31f3c1036e050503f68734106f4be
 SHA1 (patch-ag) = 8d783e53c168dc035c79646e30f3757c0954d589
 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd
-SHA1 (patch-ai) = b64ba773ca70375ed2c850b61f6f039614aff8e7
 SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3
 SHA1 (patch-ak) = 2f83b7bbdc0b54c48ef97532e2c3577edd66b3fe
 SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901
-SHA1 (patch-am) = 504d05365a43ad4b05d60195f4ff4e7d1e26e069
 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab
 SHA1 (patch-ao) = 45b265d56e6d793e53dc06237162652903c9423d
 SHA1 (patch-ap) = 360978cb8119a6e1c554e46ad5fcbf01a00f2685
 SHA1 (patch-aq) = 802405c2384f3fdaa7f4085dca002d2f879c32fe
-SHA1 (patch-ar) = 54990b359e3b50eb96673c30a7326c55f2a322eb
 SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988
-SHA1 (patch-at) = 1f78c48ad6b73882b4ee74900b8312c297b4bdaa
 SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1
 SHA1 (patch-av) = 4281c59ff129748c6cb8565157d9babd1067799f
 SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620
-SHA1 (patch-ax) = fc9bf7709741c08a0853c6e81c7a2b425d01dbd3
 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0
 SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61
 SHA1 (patch-ba) = 219351243956e93f3601641e0c88938270e63599
@@ -36,19 +30,17 @@ SHA1 (patch-be) = 55db94a53b4a5ef10b3294b468c2844a84926d5b
 SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6
 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7
 SHA1 (patch-bh) = 6fafdedc00aaa70e7a32be6ae4d0e0d8dc1ce60e
-SHA1 (patch-bi) = fbfe9a8fb2d1be40c03beebce1bfde20f3b9f9f7
 SHA1 (patch-bj) = 36f1e6e2b4dc8be210d7e1cd8e0f80bec08f6a93
 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb
 SHA1 (patch-bl) = 9d4fbc90cb5a638739c3748fbedf74707e96d342
 SHA1 (patch-bm) = 3d9cc7de58f13aa55a5035153174a73aad082ff3
 SHA1 (patch-bn) = 7f6d0faf310ae168a44821dabb948f210694f123
 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20
-SHA1 (patch-bp) = f63f0d5bbcf632bc11d28c8cf8034ec9549cd8e2
 SHA1 (patch-bq) = f2aaa203c1c2b968530ea0e2b1c0d2767769093b
 SHA1 (patch-br) = e89409ec2cbb7a2b567f85f2de9f8a7a14469c3b
-SHA1 (patch-bs) = 97857ea3a7f43ce73b327e2a2fe10a0e4a5ce1c8
 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = d4c53ba2add053db87a8d382080535ce1c536cbb
 SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51
 SHA1 (patch-cb) = 1db71d0236955d07c3b246f1c4810a9378eace3f
+SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
diff --git a/x11/kdelibs3/patches/patch-ad b/x11/kdelibs3/patches/patch-ad
deleted file mode 100644
index 40d7103d69f..00000000000
--- a/x11/kdelibs3/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:51 jlam Exp $
-
---- arts/knotify/knotify_main.cpp.orig	Thu May 30 09:48:48 2002
-+++ arts/knotify/knotify_main.cpp
-@@ -0,0 +1,27 @@
-+/*
-+ *
-+ * 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/x11/kdelibs3/patches/patch-ai b/x11/kdelibs3/patches/patch-ai
deleted file mode 100644
index fc80b3419a9..00000000000
--- a/x11/kdelibs3/patches/patch-ai
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:51 jlam Exp $
-
---- dcop/dcopserver_main.cpp.orig	Thu May 30 09:48:50 2002
-+++ dcop/dcopserver_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/x11/kdelibs3/patches/patch-am b/x11/kdelibs3/patches/patch-am
deleted file mode 100644
index cfdf7e09202..00000000000
--- a/x11/kdelibs3/patches/patch-am
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-am,v 1.2 2002/08/25 19:23:52 jlam Exp $
-
---- kconf_update/kconf_update_main.cpp.orig	Thu May 30 09:48:50 2002
-+++ kconf_update/kconf_update_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/x11/kdelibs3/patches/patch-ar b/x11/kdelibs3/patches/patch-ar
deleted file mode 100644
index a323686025a..00000000000
--- a/x11/kdelibs3/patches/patch-ar
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:52 jlam Exp $
-
---- kded/kbuildsycoca_main.cpp.orig	Thu May 30 09:48:50 2002
-+++ kded/kbuildsycoca_main.cpp
-@@ -0,0 +1,27 @@
-+/*
-+ * 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/x11/kdelibs3/patches/patch-at b/x11/kdelibs3/patches/patch-at
deleted file mode 100644
index 3ffa16379af..00000000000
--- a/x11/kdelibs3/patches/patch-at
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-at,v 1.2 2002/08/25 19:23:52 jlam Exp $
-
---- kded/kded_main.cpp.orig	Thu May 30 09:48:51 2002
-+++ kded/kded_main.cpp
-@@ -0,0 +1,27 @@
-+/*
-+ * 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/x11/kdelibs3/patches/patch-ax b/x11/kdelibs3/patches/patch-ax
deleted file mode 100644
index fb8817b52fb..00000000000
--- a/x11/kdelibs3/patches/patch-ax
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:53 jlam Exp $
-
---- kdeprint/management/kaddprinterwizard_main.cpp.orig	Thu May 30 09:48:52 2002
-+++ kdeprint/management/kaddprinterwizard_main.cpp
-@@ -0,0 +1,27 @@
-+/*
-+ * 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/x11/kdelibs3/patches/patch-bi b/x11/kdelibs3/patches/patch-bi
deleted file mode 100644
index b8cd03fdc22..00000000000
--- a/x11/kdelibs3/patches/patch-bi
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2002/08/25 19:23:54 jlam Exp $
-
---- kio/misc/kio_uiserver_main.cpp.orig	Thu May 30 09:48:54 2002
-+++ kio/misc/kio_uiserver_main.cpp
-@@ -0,0 +1,27 @@
-+/*
-+ * 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/x11/kdelibs3/patches/patch-bp b/x11/kdelibs3/patches/patch-bp
deleted file mode 100644
index f1c7f2abed9..00000000000
--- a/x11/kdelibs3/patches/patch-bp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bp,v 1.2 2002/08/25 19:23:55 jlam Exp $
-
---- kioslave/http/http_cache_cleaner_main.cpp.orig	Thu May 30 09:48:55 2002
-+++ kioslave/http/http_cache_cleaner_main.cpp
-@@ -0,0 +1,29 @@
-+/*
-+ * This file is part of KDE
-+ *
-+ * 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, 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/x11/kdelibs3/patches/patch-bs b/x11/kdelibs3/patches/patch-bs
deleted file mode 100644
index fedee546142..00000000000
--- a/x11/kdelibs3/patches/patch-bs
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bs,v 1.2 2002/08/25 19:23:55 jlam Exp $
-
---- kioslave/http/kcookiejar/kcookiejar_main.cpp.orig	Thu May 30 09:48:55 2002
-+++ kioslave/http/kcookiejar/kcookiejar_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/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc
new file mode 100644
index 00000000000..e6c95297616
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-cc,v 1.3 2003/01/20 10:04:26 skrll Exp $
+
+--- kspell/ksconfig.cpp.orig	Wed Jan 15 12:18:30 2003
++++ kspell/ksconfig.cpp
+@@ -360,6 +360,8 @@ void KSpellConfig::getAvailDictsIspell (
+   // dictionary path
+   QFileInfo dir ("/usr/lib/ispell");
+   if (!dir.exists() || !dir.isDir())
++    dir.setFile ("@LOCALBASE@/lib");
++  if (!dir.exists() || !dir.isDir())
+     dir.setFile ("/usr/local/lib/ispell");
+   if (!dir.exists() || !dir.isDir())
+     dir.setFile ("/usr/local/share/ispell");
+@@ -422,6 +424,8 @@ void KSpellConfig::getAvailDictsAspell (
+   // dictionary path
+   // FIXME: use "aspell dump config" to find out the dict-dir
+   QFileInfo dir ("/usr/lib/aspell");
++  if (!dir.exists() || !dir.isDir())
++    dir.setFile ("@LOCALBASE@/lib");
+   if (!dir.exists() || !dir.isDir())
+     dir.setFile ("/usr/local/lib/aspell");
+   if (!dir.exists() || !dir.isDir())