Update to KDE 2.2.1

With apologies to Al I wouldn't know where to start with a summary of the
changes between 2.1 and 2.2.1 - there are just too many. A couple of
hopefully static URLS that contain useful information are

http://www.kde.org/announcements/changelog2_1to2_2.html
http://www.kde.org/announcements/changelog2_2to2_2_1.html

Support for a.out for kde{libs,base} added by me. The libtool/a.out
combination doesn't like the linking of modules into binaries. A better
way of doing this will appear in future versions of KDE/pkgsrc.

41 files changed, 1935 insertions, 430 deletions

diff --git a/x11/kdelibs2/patches/patch-aa b/x11/kdelibs2/patches/patch-aa
index 16613502963..5f878994ea5 100644
--- a/x11/kdelibs2/patches/patch-aa
+++ b/x11/kdelibs2/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 15:59:44 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2001/10/15 22:46:21 skrll Exp $
 
---- Makefile.in.orig	Thu Feb 22 18:17:09 2001
-+++ Makefile.in
-@@ -258,7 +258,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--COMPILE_FIRST = dcop libltdl kdecore kdeui kdesu kssl kjs kio kimgio kfile kparts libkmid ksgmltools
-+COMPILE_FIRST = dcop kdecore kdeui kdesu kssl kjs kio kimgio kfile kparts libkmid ksgmltools
- 
- SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS)
+--- arts/flow/cpuinfo.cc.orig	Sun Jul 29 05:54:48 2001
++++ arts/flow/cpuinfo.cc
+@@ -196,6 +196,9 @@
+ 		: /* no input */
+ 		: "memory"
+ 	);
++#if defined(__NetBSD__)
++        CpuInfo::s_flags = 0;
++#else
+ 	// SSE must be supported by the OS, if it's not, any SSE insn will
+ 	// trigger an invalid opcode exception, to check for this, a SIGILL
+ 	// handler is installed and a SSE insn run. If the handler is called,
+@@ -218,6 +221,7 @@
+ 		}
+ 		signal(SIGILL, oldHandler);
+ 	}
++#endif
+ #endif /* HAVE_X86_SSE */
+ }
  
diff --git a/x11/kdelibs2/patches/patch-ab b/x11/kdelibs2/patches/patch-ab
index 73ffd387e16..3f9f3941d97 100644
--- a/x11/kdelibs2/patches/patch-ab
+++ b/x11/kdelibs2/patches/patch-ab
@@ -1,31 +1,38 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 15:59:49 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2001/10/15 22:46:21 skrll Exp $
 
---- arts/artsc/Makefile.in.orig	Thu Feb 22 18:17:09 2001
-+++ arts/artsc/Makefile.in
-@@ -243,7 +243,7 @@
- lib_LTLIBRARIES = libartsc.la libartscbackend.la libartsdsp.la
- FLOWLIBS = $(top_builddir)/arts/flow/libartsflow.la
+--- arts/knotify/Makefile.am.orig	Sat Jun 24 16:21:46 2000
++++ arts/knotify/Makefile.am
+@@ -7,16 +7,21 @@
+ ####### Files
  
--INCLUDES = $(all_includes) -I$(top_srcdir)/arts/mcop -I$(top_srcdir)/arts/flow       -I$(top_builddir)/arts/flow -I$(top_builddir)/arts/soundserver       -I$(top_srcdir)/libltdl
-+INCLUDES = $(all_includes) -I$(top_srcdir)/arts/mcop -I$(top_srcdir)/arts/flow       -I$(top_builddir)/arts/flow -I$(top_builddir)/arts/soundserver 
+ bin_PROGRAMS	= knotify
+-lib_LTLIBRARIES = knotify.la
++lib_LTLIBRARIES = libknotify_main.la knotify.la
  
+-knotify_la_SOURCES	= knotify.cpp knotify.skel
+-knotify_la_LIBADD	= ../soundserver/libsoundserver_idl.la \
++libknotify_main_la_SOURCES	= knotify.cpp knotify.skel
++libknotify_main_la_LIBADD	= ../soundserver/libsoundserver_idl.la \
+                       ../qtmcop/libqtmcop.la $(LIB_KDEUI) $(LIB_KDECORE)
++libknotify_main_la_LDFLAGS = $(all_libraries)
++libknotify_main_la_METASOURCES = AUTO
++
++knotify_la_SOURCES	= knotify_main.cpp
++knotify_la_LIBADD	= libknotify_main.la
+ knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ knotify_la_METASOURCES = AUTO
  
- bin_SCRIPTS = artsc-config artsdsp
-@@ -254,7 +254,7 @@
+-knotify_SOURCES = dummy.cpp
+-knotify_LDADD = knotify.la
++knotify_SOURCES = knotify_main.cpp
++knotify_LDADD = libknotify_main.la
+ knotify_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
  
- libartsc_la_SOURCES = artsc.c
- libartsc_la_LDFLAGS = -no-undefined
--libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBPTHREAD) $(USE_THREADS)
-+libartsc_la_LIBADD = -lltdl $(LIBPTHREAD) $(USE_THREADS)
+ check_PROGRAMS		= knotifytest
+@@ -31,6 +36,3 @@
  
- libartscbackend_la_SOURCES = artscbackend.cc
- libartscbackend_la_LDFLAGS = -no-undefined -module
-@@ -273,7 +273,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libartsc_la_DEPENDENCIES =  $(top_builddir)/libltdl/libltdlc.la
-+libartsc_la_DEPENDENCIES =  -lltdl
- #>- libartsc_la_OBJECTS =  artsc.lo
- #>+ 1
- libartsc_la_OBJECTS = artsc.lo
+ messages:
+ 	$(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-ac b/x11/kdelibs2/patches/patch-ac
index cabcc8c5cb6..1a8c077e4c3 100644
--- a/x11/kdelibs2/patches/patch-ac
+++ b/x11/kdelibs2/patches/patch-ac
@@ -1,27 +1,154 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 15:59:49 skrll Exp $
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-ac,v 1.2 2001/10/15 22:46:21 skrll Exp $
 
---- arts/mcop/Makefile.in.orig	Thu Feb 22 18:17:10 2001
-+++ arts/mcop/Makefile.in
-@@ -244,11 +244,11 @@
- #
- # Programs to compile, Manpages to install and Versions
- #
--INCLUDES = -I$(top_srcdir)/libltdl $(all_includes)
-+INCLUDES = $(all_includes)
- libmcop_la_SOURCES = buffer.cc connection.cc core.cc dispatcher.cc      iomanager.cc object.cc socketconnection.cc tcpconnection.cc 	 unixconnection.cc tcpserver.cc unixserver.cc objectmanager.cc 	 factory.cc idlfilereg.cc ifacerepo_impl.cc mcoputils.cc 	 startupmanager.cc md5.c md5auth.cc referenceclean.cc datapacket.cc 	 asyncstream.cc notification.cc flowsystem.cc extensionloader.cc 	 tmpglobalcomm.cc mcopconfig.cc connect.cc reference.cc type.cc 	 trader_impl.cc dynamicrequest.cc anyref.cc loopback.cc debug.cc
- 
- 
--libmcop_la_LIBADD = $(LIBSOCKET) $(LIBPTHREAD) $(USE_THREADS)      $(top_builddir)/libltdl/libltdlc.la
-+libmcop_la_LIBADD = $(LIBSOCKET) $(LIBPTHREAD) $(USE_THREADS) -lltdl
- 
- libmcop_la_LDFLAGS = -no-undefined 
- 
-@@ -265,7 +265,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libmcop_la_DEPENDENCIES =  $(top_builddir)/libltdl/libltdlc.la
-+libmcop_la_DEPENDENCIES =  -lltdl
- #>- libmcop_la_OBJECTS =  buffer.lo connection.lo core.lo dispatcher.lo \
- #>- iomanager.lo object.lo socketconnection.lo tcpconnection.lo \
- #>- unixconnection.lo tcpserver.lo unixserver.lo objectmanager.lo \
+--- arts/knotify/Makefile.in.orig	Wed Sep 12 06:09:35 2001
++++ arts/knotify/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -270 +270 @@
+-lib_LTLIBRARIES = knotify.la
++lib_LTLIBRARIES = libknotify_main.la knotify.la
+@@ -272 +272 @@
+-#>- knotify_la_SOURCES = knotify.cpp knotify.skel
++#>- libknotify_main_la_SOURCES = knotify.cpp knotify.skel
+@@ -274,2 +274,2 @@
+-knotify_la_SOURCES=knotify.cpp  knotify_skel.cpp
+-knotify_la_LIBADD = ../soundserver/libsoundserver_idl.la                       ../qtmcop/libqtmcop.la $(LIB_KDEUI) $(LIB_KDECORE)
++libknotify_main_la_SOURCES=knotify.cpp  knotify_skel.cpp
++libknotify_main_la_LIBADD = ../soundserver/libsoundserver_idl.la                       ../qtmcop/libqtmcop.la $(LIB_KDEUI) $(LIB_KDECORE)
+@@ -276,0 +277,5 @@
++libknotify_main_la_LDFLAGS = $(all_libraries)
++#>- libknotify_main_la_METASOURCES = AUTO
++
++knotify_la_SOURCES = knotify_main.cpp
++knotify_la_LIBADD = libknotify_main.la
+@@ -280,2 +285,2 @@
+-knotify_SOURCES = dummy.cpp
+-knotify_LDADD = knotify.la
++knotify_SOURCES = knotify_main.cpp
++knotify_LDADD = libknotify_main.la
+@@ -303 +308 @@
+-knotify_la_DEPENDENCIES =  ../soundserver/libsoundserver_idl.la \
++libknotify_main_la_DEPENDENCIES =  ../soundserver/libsoundserver_idl.la \
+@@ -305 +310 @@
+-#>- knotify_la_OBJECTS =  knotify.lo
++#>- libknotify_main_la_OBJECTS =  knotify.lo
+@@ -307,5 +312,9 @@
+-knotify_la_final_OBJECTS = knotify_la.all_cpp.lo 
+-knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \
+-knotify_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS)
++libknotify_main_la_final_OBJECTS = libknotify_main_la.all_cpp.lo 
++libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \
++libknotify_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libknotify_main_la_OBJECTS = $(libknotify_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libknotify_main_la_OBJECTS = $(libknotify_main_la_final_OBJECTS)
++knotify_la_DEPENDENCIES =  libknotify_main.la
++#>- knotify_la_OBJECTS =  knotify_main.lo
++#>+ 1
++knotify_la_OBJECTS = knotify_main.lo
+@@ -316 +325 @@
+-#>- knotify_OBJECTS =  dummy.$(OBJEXT)
++#>- knotify_OBJECTS =  knotify_main.$(OBJEXT)
+@@ -318,2 +327,2 @@
+-knotify_OBJECTS = dummy.$(OBJEXT)
+-knotify_DEPENDENCIES =  knotify.la
++knotify_OBJECTS = knotify_main.$(OBJEXT)
++knotify_DEPENDENCIES =  libknotify_main.la
+@@ -344 +353 @@
+-KDE_DIST=README.knotify_and_arts knotify.desktop 
++KDE_DIST=knotify.desktop README.knotify_and_arts 
+@@ -351,2 +360,2 @@
+-SOURCES = $(knotify_la_SOURCES) $(knotify_SOURCES) $(knotifytest_SOURCES)
+-OBJECTS = $(knotify_la_OBJECTS) $(knotify_OBJECTS) $(knotifytest_OBJECTS)
++SOURCES = $(libknotify_main_la_SOURCES) $(knotify_la_SOURCES) $(knotify_SOURCES) $(knotifytest_SOURCES)
++OBJECTS = $(libknotify_main_la_OBJECTS) $(knotify_la_OBJECTS) $(knotify_OBJECTS) $(knotifytest_OBJECTS)
+@@ -438,0 +448,3 @@
++libknotify_main.la: $(libknotify_main_la_OBJECTS) $(libknotify_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libknotify_main_la_LDFLAGS) $(libknotify_main_la_OBJECTS) $(libknotify_main_la_LIBADD) $(LIBS)
++
+@@ -543,11 +554,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -661,3 +661,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -678,0 +677,4 @@
++knotify.moc: $(srcdir)/knotify.h
++	$(MOC) $(srcdir)/knotify.h -o knotify.moc
++
++#>+ 3
+@@ -680 +682 @@
+-	-rm -f  knotify.moc
++	-rm -f  knotify.moc knotify.moc
+@@ -697,8 +699,8 @@
+-knotify_la_meta_unload.cpp:  knotify.moc
+-	@echo 'creating knotify_la_meta_unload.cpp'
+-	@-rm -f knotify_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_knotify_la[] = {' > knotify_la_meta_unload.cpp
+-	@cat  knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> knotify_la_meta_unload.cpp
+-	@echo '0};' >> knotify_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> knotify_la_meta_unload.cpp
+-	@echo '_UNLOAD(knotify_la)' >> knotify_la_meta_unload.cpp
++libknotify_main_la_meta_unload.cpp:  knotify.moc
++	@echo 'creating libknotify_main_la_meta_unload.cpp'
++	@-rm -f libknotify_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libknotify_main_la[] = {' > libknotify_main_la_meta_unload.cpp
++	@cat  knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libknotify_main_la_meta_unload.cpp
++	@echo '0};' >> libknotify_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libknotify_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libknotify_main_la)' >> libknotify_main_la_meta_unload.cpp
+@@ -709 +711,13 @@
+-	-rm -f  knotify_la_meta_unload.cpp
++	-rm -f  libknotify_main_la_meta_unload.cpp
++
++#>+ 11
++libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp   knotify.moc 
++	@echo 'creating libknotify_main_la.all_cpp.cpp ...'; \
++	rm -f libknotify_main_la.all_cpp.files libknotify_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libknotify_main_la.all_cpp.final; \
++	for file in knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libknotify_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libknotify_main_la.all_cpp.final; \
++	done; \
++	cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files  > libknotify_main_la.all_cpp.cpp; \
++	rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files
+@@ -712 +726 @@
+-knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp   knotify.moc 
++knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp   knotify.moc 
+@@ -716 +730 @@
+-	for file in knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp ; do \
++	for file in knotify_main.cpp ; do \
+@@ -724 +738 @@
+-knotify.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++knotify.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp  
+@@ -728 +742 @@
+-	for file in dummy.cpp ; do \
++	for file in knotify_main.cpp ; do \
+@@ -749 +763 @@
+-	-rm -f knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp
++	-rm -f libknotify_main_la.all_cpp.cpp knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp
+@@ -753 +767 @@
+-	$(MAKE) knotify_la_OBJECTS="$(knotify_la_final_OBJECTS)" all-am
++	$(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_final_OBJECTS)" all-am
+@@ -756 +770 @@
+-	$(MAKE) knotify_la_OBJECTS="$(knotify_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" all-am
+@@ -766 +780 @@
+-$(srcdir)/knotify.cpp: knotify.moc 
++$(srcdir)/knotify.cpp: knotify.moc knotify.moc 
diff --git a/x11/kdelibs2/patches/patch-ad b/x11/kdelibs2/patches/patch-ad
index 62549f703f4..474a01d2643 100644
--- a/x11/kdelibs2/patches/patch-ad
+++ b/x11/kdelibs2/patches/patch-ad
@@ -1,63 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2001/09/07 14:32:21 drochner Exp $
+$NetBSD: patch-ad,v 1.5 2001/10/15 22:46:21 skrll Exp $
 
---- configure.orig	Thu Feb 22 13:17:52 2001
-+++ configure
-@@ -5849,7 +5849,7 @@
-    for dir in $kde_use_extra_libs; do
-      kde_extra_libs="$kde_extra_libs $dir"
-      KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
--     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-+     #USER_LDFLAGS="$USER_LDFLAGS -L$dir"	# buildlink.mk
-    done
-    IFS=$ac_save_ifs
-    kde_use_extra_libs="added"
-@@ -6790,7 +6790,7 @@
- ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
+--- arts/knotify/knotify.cpp.orig	Mon Aug  6 00:28:11 2001
++++ arts/knotify/knotify.cpp
+@@ -73,7 +73,7 @@
+ };
  
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='rm -rf SunWS_cache; ${LIBTOOL_SHELL} --tag=CXX --mode=link ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
- 
- 
-@@ -7043,7 +7043,7 @@
- if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-  QT_LDFLAGS=""
- else
-- QT_LDFLAGS="-L$qt_libraries"
-+ QT_LDFLAGS="-L${QTDIR}/lib -Wl,-R$qt_libraries"		# buildlink.mk
-  all_libraries="$all_libraries $QT_LDFLAGS"
- fi
- 
-@@ -7369,11 +7369,11 @@
- if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" ; then
-  KDE_INCLUDES=""
- else
-- KDE_INCLUDES="-I$kde_includes"
-+ KDE_INCLUDES="-I${BUILDLINK_DIR}/include"	# buildlink.mk
-  all_includes="$KDE_INCLUDES $all_includes"
- fi
-  
--KDE_LDFLAGS="-L$kde_libraries"
-+KDE_LDFLAGS="-L${BUILDLINK_DIR}/lib"		# buildlink.mk
- if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
-  all_libraries="$all_libraries $KDE_LDFLAGS"
- fi
-@@ -13183,7 +13183,7 @@
- 
- 
- 
--all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui -I$(top_srcdir)/kssl $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
-+all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui -I$(top_srcdir)/kssl $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
- 
- 
- CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST"
-@@ -14140,7 +14140,7 @@
-     esac
-   done
- 
--  for ac_config_dir in libltdl; do
-+  for ac_config_dir in ; do
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
+-int main(int argc, char **argv)
++int knotify_main(int argc, char **argv)
+ {
+     KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
+                          "2.0pre", I18N_NOOP("KDE Notification Server"),
diff --git a/x11/kdelibs2/patches/patch-ae b/x11/kdelibs2/patches/patch-ae
index c3202ba6c8c..3c0a0e6ebfc 100644
--- a/x11/kdelibs2/patches/patch-ae
+++ b/x11/kdelibs2/patches/patch-ae
@@ -1,31 +1,32 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/14 15:59:48 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2001/10/15 22:46:21 skrll Exp $
 
---- kdecore/Makefile.in.orig	Thu Feb 22 18:17:15 2001
-+++ kdecore/Makefile.in
-@@ -276,7 +276,7 @@
- 
- 
- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 3:0 -no-undefined
--libkdecore_la_LIBADD = libkdefakes.la ../libltdl/libltdlc.la -lXext $(LIB_DCOP) $(LIB_DMALLOC) $(LIBRESOLV)
-+libkdecore_la_LIBADD = libkdefakes.la -lltdl -lXext $(LIB_DCOP) $(LIB_DMALLOC) $(LIBRESOLV)
- 
- #>- libkdecore_la_METASOURCES = AUTO
- 
-@@ -311,7 +311,7 @@
- libkdefakes_la_nofinal_OBJECTS = fakes.lo vsnprintf.lo
- @KDE_USE_FINAL_FALSE@libkdefakes_la_OBJECTS = $(libkdefakes_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE@libkdefakes_la_OBJECTS = $(libkdefakes_la_final_OBJECTS)
--libkdecore_la_DEPENDENCIES =  libkdefakes.la ../libltdl/libltdlc.la
-+libkdecore_la_DEPENDENCIES =  libkdefakes.la -lltdl
- #>- libkdecore_la_OBJECTS =  libintl.lo kdebug.lo kstddirs.lo kconfigbase.lo \
- #>- kstyle.lo kglobalaccel.lo netwm.lo kconfig.lo ksimpleconfig.lo \
- #>- kdesktopfile.lo kconfigbackend.lo kapp.lo kuniqueapp.lo ksock.lo \
-@@ -773,7 +773,7 @@
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)
- #>- 	$(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(includedir)/ltdl.h
- #>+ 1
--	$(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(DESTDIR)$(includedir)/ltdl.h
-+#	$(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(DESTDIR)$(includedir)/ltdl.h
- #>- 	$(mkinstalldirs) $(kde_confdir)
- #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
+--- arts/knotify/knotify_main.cpp.orig	Tue Sep 25 22:09:45 2001
++++ 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 int knotify_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return knotify_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-af b/x11/kdelibs2/patches/patch-af
index 1a324696cc6..260d903484c 100644
--- a/x11/kdelibs2/patches/patch-af
+++ b/x11/kdelibs2/patches/patch-af
@@ -1,45 +1,25 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/14 15:59:48 skrll Exp $
+$NetBSD: patch-af,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kdecore/kapp.cpp.orig	Thu Feb 22 18:12:55 2001
-+++ kdecore/kapp.cpp
-@@ -1433,18 +1433,18 @@
-             setStyle(pKStyle);
-         }
-         else{
--            lt_ptr_t alloc_func;
-+            lt_ptr alloc_func;
-             if (styleStr.find("basicstyle.la",0,false)==-1)
--                alloc_func=lt_dlsym(styleHandle,"allocate");
-+                alloc_func=lt_dlsym((lt_dlhandle)styleHandle,"allocate");
-             else
--                alloc_func= lt_dlsym(styleHandle,"allocateCustomTheme");
-+                alloc_func= lt_dlsym((lt_dlhandle)styleHandle,"allocateCustomTheme");
+--- configure.orig	Wed Sep 12 06:10:21 2001
++++ configure
+@@ -6211,9 +6211,10 @@
+   x_libraries="/usr/lib";  else
+   x_libraries=$kde_x_libraries
+   X_LDFLAGS="-L$x_libraries"
++  X_WLRFLAGS="-Wl,-R$x_libraries"
+ fi
+ all_includes="$X_INCLUDES"
+-all_libraries="$X_LDFLAGS"
++all_libraries="$X_LDFLAGS $X_WLRFLAGS"
+ 
+ 
+ 
+@@ -6889,7 +6890,7 @@
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='rm -rf SunWS_cache; ${LIBTOOL_SHELL} --tag=CXX --mode=link ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
  
-             if(!alloc_func){
- 	        kdWarning() << "Unable to init style plugin " << styleStr
- 		                      << "(" << lt_dlerror() << ")\n";
-                 pKStyle = new KDEStyle;
-                 setStyle(pKStyle);
--                lt_dlclose(styleHandle);
-+                lt_dlclose((lt_dlhandle)styleHandle);
-                 styleHandle = 0;
-             }
-             else{
-@@ -1467,7 +1467,7 @@
-                     kdWarning() << "Style plugin unable to allocate style.\n";
-                     pKStyle = new KDEStyle;
-                     setStyle(pKStyle);
--                    lt_dlclose(styleHandle);
-+                    lt_dlclose((lt_dlhandle)styleHandle);
-                     styleHandle = 0;
-                 }
-             }
-@@ -1480,7 +1480,7 @@
-     }
  
-     if(oldHandle){
--        lt_dlclose((lt_dlhandle*)oldHandle);
-+        lt_dlclose((lt_dlhandle)oldHandle);
-     }
-     if(pKStyle)
-         connect(pKStyle, SIGNAL(destroyed()), SLOT(kstyleDestroyed()));
diff --git a/x11/kdelibs2/patches/patch-ag b/x11/kdelibs2/patches/patch-ag
index 8a020607360..6e92f3f266a 100644
--- a/x11/kdelibs2/patches/patch-ag
+++ b/x11/kdelibs2/patches/patch-ag
@@ -1,13 +1,49 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/03/14 15:59:46 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kdecore/klibloader.cpp.orig	Sun Feb 18 15:26:54 2001
-+++ kdecore/klibloader.cpp
-@@ -16,6 +16,8 @@
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
- */
-+#include <stdlib.h>
+--- dcop/Makefile.am.orig	Wed Apr 18 17:19:12 2001
++++ dcop/Makefile.am
+@@ -25,12 +25,12 @@
+ KDE_OPTIONS = qtonly
+ 
+ INCLUDES=  $(all_includes)
+-LDFLAGS = $(all_libraries)
++LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ bin_PROGRAMS = dcopserver
+ check_PROGRAMS = testdcop testdcopc
+ 
+-lib_LTLIBRARIES  = libDCOP.la dcopserver.la
++lib_LTLIBRARIES  = libDCOP.la libdcopserver_main.la dcopserver.la
+ libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
+ libDCOP_la_LDFLAGS = -version-info 1:0 $(all_libraries) -no-undefined
+ 
+@@ -44,13 +44,17 @@
+ # dcopstub needs to go first for --enable-final to work
+ libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
+ 
+-dcopserver_la_LDFLAGS = -module -avoid-version
+-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+-dcopserver_la_LIBADD   = libDCOP.la
++#libdcopserver_main_la_LDFLAGS = -export-dynamic
++libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
++libdcopserver_main_la_LIBADD = libDCOP.la
 +
- #include <config.h>
- #include <qclipboard.h>
- #include <qwidgetlist.h>
++dcopserver_la_LDFLAGS = -Wl,-export-dynamic -module -avoid-version
++dcopserver_la_SOURCES = dcopserver_main.cpp
++dcopserver_la_LIBADD  = libdcopserver_main.la
+ 
+ dcopserver_LDFLAGS = $(KDE_RPATH)
+-dcopserver_SOURCES = dummy.cpp
+-dcopserver_LDADD   = dcopserver.la
++dcopserver_SOURCES = dcopserver_main.cpp
++dcopserver_LDADD   = libdcopserver_main.la
+ 
+ testdcop_SOURCES = testdcop.cpp
+ testdcop_LDADD = ../kdecore/libkdecore.la
+@@ -59,6 +63,3 @@
+ testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
+ 
+ EXTRA_DIST = HOWTO ICE
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-ah b/x11/kdelibs2/patches/patch-ah
index e1cefbd8bb3..70a2f802974 100644
--- a/x11/kdelibs2/patches/patch-ah
+++ b/x11/kdelibs2/patches/patch-ah
@@ -1,52 +1,121 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/03/14 15:59:46 skrll Exp $
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-ah,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kdecore/kstddirs.cpp.orig	Sun Jan 28 23:44:28 2001
-+++ kdecore/kstddirs.cpp
-@@ -652,33 +652,33 @@
- 
- QString KStandardDirs::kde_default(const char *type) {
-     if (!strcmp(type, "data"))
--	return "share/apps/";
-+	return "share/kde/apps/";
-     if (!strcmp(type, "html"))
--	return "share/doc/HTML/";
-+	return "share/doc/kde/HTML/";
-     if (!strcmp(type, "icon"))
--	return "share/icons/";
-+	return "share/kde/icons/";
-     if (!strcmp(type, "config"))
--	return "share/config/";
-+	return "share/kde/config/";
-     if (!strcmp(type, "pixmap"))
--	return "share/pixmaps/";
-+	return "share/kde/pixmaps/";
-     if (!strcmp(type, "apps"))
--	return "share/applnk/";
-+	return "share/kde/applnk/";
-     if (!strcmp(type, "sound"))
--	return "share/sounds/";
-+	return "share/kde/sounds/";
-     if (!strcmp(type, "locale"))
--	return "share/locale/";
-+	return "share/kde/locale/";
-     if (!strcmp(type, "services"))
--	return "share/services/";
-+	return "share/kde/services/";
-     if (!strcmp(type, "servicetypes"))
--	return "share/servicetypes/";
-+	return "share/kde/servicetypes/";
-     if (!strcmp(type, "mime"))
--	return "share/mimelnk/";
-+	return "share/kde/mimelnk/";
-     if (!strcmp(type, "cgi"))
--	return "cgi-bin/";
-+	return "kde-cgi-bin/";
-     if (!strcmp(type, "wallpaper"))
--	return "share/wallpapers/";
-+	return "share/kde/wallpapers/";
-     if (!strcmp(type, "templates"))
--	return "share/templates/";
-+	return "share/kde/templates/";
-     if (!strcmp(type, "exe"))
- 	return "bin/";
-     if (!strcmp(type, "lib"))
+--- dcop/Makefile.in.orig	Wed Sep 12 06:09:37 2001
++++ dcop/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -291 +291 @@
+-LDFLAGS = $(all_libraries)
++LDFLAGS = $(all_libraries) $(KDE_RPATH)
+@@ -296 +296 @@
+-lib_LTLIBRARIES = libDCOP.la dcopserver.la
++lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la
+@@ -310,3 +310,7 @@
+-dcopserver_la_LDFLAGS = -module -avoid-version
+-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+-dcopserver_la_LIBADD = libDCOP.la
++#libdcopserver_main_la_LDFLAGS = -export-dynamic
++libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
++libdcopserver_main_la_LIBADD = libDCOP.la
++
++dcopserver_la_LDFLAGS = -Wl,-export-dynamic -module -avoid-version
++dcopserver_la_SOURCES = dcopserver_main.cpp
++dcopserver_la_LIBADD = libdcopserver_main.la
+@@ -315,2 +319,2 @@
+-dcopserver_SOURCES = dummy.cpp
+-dcopserver_LDADD = dcopserver.la
++dcopserver_SOURCES = dcopserver_main.cpp
++dcopserver_LDADD = libdcopserver_main.la
+@@ -341,2 +345,3 @@
+-dcopserver_la_DEPENDENCIES =  libDCOP.la
+-#>- dcopserver_la_OBJECTS =  dcopserver.lo dcopsignals.lo
++libdcopserver_main_la_LDFLAGS = 
++libdcopserver_main_la_DEPENDENCIES =  libDCOP.la
++#>- libdcopserver_main_la_OBJECTS =  dcopserver.lo dcopsignals.lo
+@@ -344,4 +349,8 @@
+-dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo 
+-dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo
+-@KDE_USE_FINAL_FALSE@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@dcopserver_la_OBJECTS = $(dcopserver_la_final_OBJECTS)
++libdcopserver_main_la_final_OBJECTS = libdcopserver_main_la.all_cpp.lo 
++libdcopserver_main_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo
++@KDE_USE_FINAL_FALSE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_final_OBJECTS)
++dcopserver_la_DEPENDENCIES =  libdcopserver_main.la
++#>- dcopserver_la_OBJECTS =  dcopserver_main.lo
++#>+ 1
++dcopserver_la_OBJECTS = dcopserver_main.lo
+@@ -352 +361 @@
+-#>- dcopserver_OBJECTS =  dummy.$(OBJEXT)
++#>- dcopserver_OBJECTS =  dcopserver_main.$(OBJEXT)
+@@ -354,2 +363,2 @@
+-dcopserver_OBJECTS = dummy.$(OBJEXT)
+-dcopserver_DEPENDENCIES =  dcopserver.la
++dcopserver_OBJECTS = dcopserver_main.$(OBJEXT)
++dcopserver_DEPENDENCIES =  libdcopserver_main.la
+@@ -399,2 +408,2 @@
+-SOURCES = $(libDCOP_la_SOURCES) $(dcopserver_la_SOURCES) $(dcopserver_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
+-OBJECTS = $(libDCOP_la_OBJECTS) $(dcopserver_la_OBJECTS) $(dcopserver_OBJECTS) $(testdcop_OBJECTS) $(testdcopc_OBJECTS)
++SOURCES = $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_la_SOURCES) $(dcopserver_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
++OBJECTS = $(libDCOP_la_OBJECTS) $(libdcopserver_main_la_OBJECTS) $(dcopserver_la_OBJECTS) $(dcopserver_OBJECTS) $(testdcop_OBJECTS) $(testdcopc_OBJECTS)
+@@ -492,0 +502,3 @@
++libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS)
++
+@@ -599 +611 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -657,11 +668,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -788,3 +788,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -846 +844,13 @@
+-dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  
++libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  
++	@echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \
++	rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \
++	for file in dcopserver.cpp dcopsignals.cpp ; do \
++	  echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \
++	done; \
++	cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files  > libdcopserver_main_la.all_cpp.cpp; \
++	rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files
++
++#>+ 11
++dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp  
+@@ -850 +860 @@
+-	for file in dcopserver.cpp dcopsignals.cpp ; do \
++	for file in dcopserver_main.cpp ; do \
+@@ -858 +868 @@
+-dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp  
+@@ -862 +872 @@
+-	for file in dummy.cpp ; do \
++	for file in dcopserver_main.cpp ; do \
+@@ -883 +893 @@
+-	-rm -f libDCOP_la.all_cpp.cpp dcopserver_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp
++	-rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp
+@@ -887 +897 @@
+-	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am
++	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am
+@@ -890 +900 @@
+-	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am
++	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am
diff --git a/x11/kdelibs2/patches/patch-ai b/x11/kdelibs2/patches/patch-ai
index 80e4c9847d8..0818ee487e4 100644
--- a/x11/kdelibs2/patches/patch-ai
+++ b/x11/kdelibs2/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/03/14 15:59:46 skrll Exp $
+$NetBSD: patch-ai,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kfile/Makefile.in.orig	Thu Feb 22 18:17:27 2001
-+++ kfile/Makefile.in
-@@ -259,7 +259,7 @@
- 
- AM_CPPFLAGS = -DQT_NO_CAST_ASCII
- 
--INCLUDES = -I$(top_srcdir) -I$(srcdir)/../libltdl/ -I$(top_srcdir)/kio -I$(top_builddir)/kio $(all_includes)
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_builddir)/kio $(all_includes)
- 
- lib_LTLIBRARIES = libkfile.la
- 
+--- dcop/dcopserver.cpp.orig	Fri Aug  3 21:13:52 2001
++++ dcop/dcopserver.cpp
+@@ -1562,7 +1562,7 @@
+ "Copyright (C) 1999-2000, The KDE Developers <http://www.kde.org>\n"
+ ;
+ 
+-int main( int argc, char* argv[] )
++int dcopserver_main( int argc, char* argv[] )
+ {
+     bool nofork = false;
+     bool nosid = false;
diff --git a/x11/kdelibs2/patches/patch-aj b/x11/kdelibs2/patches/patch-aj
index ef80e695e3e..813f55024bc 100644
--- a/x11/kdelibs2/patches/patch-aj
+++ b/x11/kdelibs2/patches/patch-aj
@@ -1,13 +1,34 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/03/14 15:59:46 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- khtml/Makefile.in.orig	Thu Feb 22 18:17:28 2001
-+++ khtml/Makefile.in
-@@ -293,7 +293,7 @@
- libkhtmlimage_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
- libkhtmlimage_la_LIBADD = libkhtml.la
- 
--INCLUDES = -I$(top_srcdir)/kjs -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc 	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css 	-I$(top_srcdir)/kfile -I$(top_srcdir)/libltdl 	-I$(top_srcdir)/kssl -I$(top_srcdir) $(all_includes)
-+INCLUDES = -I$(top_srcdir)/kjs -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio 	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc 	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css 	-I$(top_srcdir)/kfile -I$(top_srcdir)/kssl -I$(top_srcdir) $(all_includes)
- 
- 
- servicedir = $(kde_servicesdir)
+--- dcop/dcopserver_main.cpp.orig	Tue Sep 25 22:09:47 2001
++++ 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 int dcopserver_main(int argc, char* argv[]);
++
++int main( int argc, char* argv[] )
++{
++	return dcopserver_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-ak b/x11/kdelibs2/patches/patch-ak
index 31b93be30a2..129d0f57fbd 100644
--- a/x11/kdelibs2/patches/patch-ak
+++ b/x11/kdelibs2/patches/patch-ak
@@ -1,13 +1,36 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- khtml/css/Makefile.in.orig	Thu Feb 22 18:17:29 2001
-+++ khtml/css/Makefile.in
-@@ -268,7 +268,7 @@
- noinst_HEADERS =  	css_extensionsimpl.h  css_stylesheetimpl.h  cssparser.h 	css_ruleimpl.h        css_valueimpl.h 	cssstyleselector.h csshelper.h
+--- kconf_update/Makefile.am.orig	Wed Apr 18 00:54:02 2001
++++ kconf_update/Makefile.am
+@@ -18,22 +18,22 @@
  
+ INCLUDES= $(all_includes)
  
--INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop  -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/misc -I$(top_srcdir)/khtml/css  -I$(top_srcdir)/khtml/dom -I$(top_srcdir)/khtml/xml -I$(top_srcdir)/khtml/html  -I$(top_srcdir)/libltdl -I$(top_srcdir) $(all_includes)
-+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop  -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/misc -I$(top_srcdir)/khtml/css  -I$(top_srcdir)/khtml/dom -I$(top_srcdir)/khtml/xml -I$(top_srcdir)/khtml/html -I$(top_srcdir) $(all_includes)
+-lib_LTLIBRARIES = kconf_update.la
++lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la
  
+ bin_PROGRAMS = kconf_update
+-kconf_update_SOURCES = dummy.cpp
+-kconf_update_LDADD = kconf_update.la
++kconf_update_SOURCES = kconf_update_main.cpp
++kconf_update_LDADD = libkconf_update_main.la
+ kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries)
  
- cssdir = $(kde_datadir)/khtml/css
+-kconf_update_la_SOURCES = kconf_update.cpp
+-kconf_update_la_LIBADD = ../kdecore/libkdecore.la
++libkconf_update_main_la_SOURCES = kconf_update.cpp
++libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la
++libkconf_update_main_la_LDFLAGS = $(all_libraries)
++
++kconf_update_la_SOURCES = kconf_update_main.cpp
+ kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kconf_update_la_LIBADD = libkconf_update_main.la
+ 
+ METASOURCES = AUTO
+ 
+ # Internal
+ # noinst_HEADERS = kconf_update.h
+-
+-dummy.cpp: 
+-	echo > dummy.cpp
+-
diff --git a/x11/kdelibs2/patches/patch-al b/x11/kdelibs2/patches/patch-al
index e2600f33e5f..f7083fd1c5d 100644
--- a/x11/kdelibs2/patches/patch-al
+++ b/x11/kdelibs2/patches/patch-al
@@ -1,13 +1,101 @@
-$NetBSD: patch-al,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-al,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- khtml/rendering/Makefile.in.orig	Thu Feb 22 18:17:31 2001
-+++ khtml/rendering/Makefile.in
-@@ -274,7 +274,7 @@
- noinst_HEADERS =  	bidi.h break_lines.h 	render_style.h render_object.h render_box.h 	render_flow.h render_text.h render_box.h render_replaced.h 	render_form.h render_list.h render_root.h render_frames.h 	render_br.h render_applet.h
- 
- 
--INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop  -I$(top_srcdir)/kfile  -I$(top_srcdir)/khtml/java  -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/misc  -I$(top_srcdir)/khtml/css  -I$(top_srcdir)/khtml/dom -I$(top_srcdir)/khtml/xml -I$(top_srcdir)/khtml/html  -I$(top_srcdir)/libltdl -I$(top_srcdir) $(all_includes)
-+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop  -I$(top_srcdir)/kfile  -I$(top_srcdir)/khtml/java  -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/misc  -I$(top_srcdir)/khtml/css  -I$(top_srcdir)/khtml/dom -I$(top_srcdir)/khtml/xml -I$(top_srcdir)/khtml/html  -I$(top_srcdir) $(all_includes)
- 
- 
- SRCDOC_DEST = $(kde_htmldir)/en/kdelibs/khtml
+--- kconf_update/Makefile.in.orig	Wed Sep 12 06:09:39 2001
++++ kconf_update/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -284 +284 @@
+-lib_LTLIBRARIES = kconf_update.la
++lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la
+@@ -287,2 +287,2 @@
+-kconf_update_SOURCES = dummy.cpp
+-kconf_update_LDADD = kconf_update.la
++kconf_update_SOURCES = kconf_update_main.cpp
++kconf_update_LDADD = libkconf_update_main.la
+@@ -291,2 +291,5 @@
+-kconf_update_la_SOURCES = kconf_update.cpp
+-kconf_update_la_LIBADD = ../kdecore/libkdecore.la
++libkconf_update_main_la_SOURCES = kconf_update.cpp
++libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la
++libkconf_update_main_la_LDFLAGS = $(all_libraries)
++
++kconf_update_la_SOURCES = kconf_update_main.cpp
+@@ -293,0 +297 @@
++kconf_update_la_LIBADD = libkconf_update_main.la
+@@ -306,2 +310,6 @@
+-kconf_update_la_DEPENDENCIES =  ../kdecore/libkdecore.la
+-#>- kconf_update_la_OBJECTS =  kconf_update.lo
++libkconf_update_main_la_DEPENDENCIES =  ../kdecore/libkdecore.la
++#>- libkconf_update_main_la_OBJECTS =  kconf_update.lo
++#>+ 1
++libkconf_update_main_la_OBJECTS = kconf_update.lo
++kconf_update_la_DEPENDENCIES =  libkconf_update_main.la
++#>- kconf_update_la_OBJECTS =  kconf_update_main.lo
+@@ -309 +317 @@
+-kconf_update_la_OBJECTS = kconf_update.lo
++kconf_update_la_OBJECTS = kconf_update_main.lo
+@@ -313 +321 @@
+-#>- kconf_update_OBJECTS =  dummy.$(OBJEXT)
++#>- kconf_update_OBJECTS =  kconf_update_main.$(OBJEXT)
+@@ -315,2 +323,2 @@
+-kconf_update_OBJECTS = dummy.$(OBJEXT)
+-kconf_update_DEPENDENCIES =  kconf_update.la
++kconf_update_OBJECTS = kconf_update_main.$(OBJEXT)
++kconf_update_DEPENDENCIES =  libkconf_update_main.la
+@@ -340,2 +348,2 @@
+-SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
+-OBJECTS = $(kconf_update_la_OBJECTS) $(kconf_update_OBJECTS)
++SOURCES = $(libkconf_update_main_la_SOURCES) $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
++OBJECTS = $(libkconf_update_main_la_OBJECTS) $(kconf_update_la_OBJECTS) $(kconf_update_OBJECTS)
+@@ -427,0 +436,3 @@
++libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS)
++
+@@ -500,11 +510,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -610,3 +609,0 @@
+-dummy.cpp: 
+-	echo > dummy.cpp
+-
+@@ -627 +624,13 @@
+-kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp  
++libkconf_update_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp  
++	@echo 'creating libkconf_update_main_la.all_cpp.cpp ...'; \
++	rm -f libkconf_update_main_la.all_cpp.files libkconf_update_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkconf_update_main_la.all_cpp.final; \
++	for file in kconf_update.cpp ; do \
++	  echo "#include \"$$file\"" >> libkconf_update_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkconf_update_main_la.all_cpp.final; \
++	done; \
++	cat libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files  > libkconf_update_main_la.all_cpp.cpp; \
++	rm -f libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files
++
++#>+ 11
++kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp  
+@@ -631 +640 @@
+-	for file in kconf_update.cpp ; do \
++	for file in kconf_update_main.cpp ; do \
+@@ -639 +648 @@
+-kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp  
+@@ -643 +652 @@
+-	for file in dummy.cpp ; do \
++	for file in kconf_update_main.cpp ; do \
+@@ -652 +661 @@
+-	-rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp
++	-rm -f libkconf_update_main_la.all_cpp.cpp kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp
diff --git a/x11/kdelibs2/patches/patch-am b/x11/kdelibs2/patches/patch-am
index 42f1d2bcc10..05a15a43855 100644
--- a/x11/kdelibs2/patches/patch-am
+++ b/x11/kdelibs2/patches/patch-am
@@ -1,13 +1,14 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
+$NetBSD: patch-am,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kimgio/Makefile.in.orig	Thu Feb 22 18:17:32 2001
-+++ kimgio/Makefile.in
-@@ -273,7 +273,7 @@
- 
- noinst_HEADERS = xview.h eps.h tiffr.h krl.h g3r.h ico.h
- 
--INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes)
-+INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop $(all_includes)
- 
- EXTRA_DIST = netpbm.cpp netpbm.h
- 
+--- kconf_update/kconf_update.cpp.orig	Fri Aug  3 21:13:52 2001
++++ kconf_update/kconf_update.cpp
+@@ -632,8 +632,7 @@
+    m_bOverwrite = false;
+ }
+ 
+-
+-int main(int argc, char **argv)
++int kconf_update_main(int argc, char **argv)
+ {
+    KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
+                         "1.0.2",
diff --git a/x11/kdelibs2/patches/patch-an b/x11/kdelibs2/patches/patch-an
index e3a9711a57a..33dd23e42a8 100644
--- a/x11/kdelibs2/patches/patch-an
+++ b/x11/kdelibs2/patches/patch-an
@@ -1,13 +1,33 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
+$NetBSD: patch-an,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kinit/Makefile.in.orig	Thu Feb 22 18:17:32 2001
-+++ kinit/Makefile.in
-@@ -256,7 +256,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--INCLUDES = -I$(srcdir)/../libltdl/ -I$(srcdir)/../kio/klauncher/ $(all_includes)
-+INCLUDES = -I$(srcdir)/../kio/klauncher/ $(all_includes)
- 
- SUBDIRS = .
- 
+--- kconf_update/kconf_update_main.cpp.orig	Tue Sep 25 22:09:48 2001
++++ 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 int kconf_update_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kconf_update_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-ao b/x11/kdelibs2/patches/patch-ao
index e55551cebf5..a0320fc8988 100644
--- a/x11/kdelibs2/patches/patch-ao
+++ b/x11/kdelibs2/patches/patch-ao
@@ -1,53 +1,20 @@
-$NetBSD: patch-ao,v 1.2 2001/09/07 14:32:21 drochner Exp $
+$NetBSD: patch-ao,v 1.3 2001/10/15 22:46:22 skrll Exp $
 
---- kinit/kinit.cpp.orig	Thu Mar 15 01:38:06 2001
-+++ kinit/kinit.cpp	Thu Aug  9 16:12:05 2001
-@@ -64,18 +64,8 @@
- # include <dlfcn.h>
- #endif
- 
--#ifdef RTLD_GLOBAL
--# define LTDL_GLOBAL	RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--#  define LTDL_GLOBAL	DL_GLOBAL
--# else
--#  define LTDL_GLOBAL	0
--# endif
--#endif
- 
- 
--extern int lt_dlopen_flag;
- static int X11fd = -1;
- static Display *X11display = 0;
- static const KInstance *s_instance = 0;
-@@ -96,11 +86,10 @@
-   pid_t my_pid;
-   int n;
-   lt_dlhandle handle;
--  lt_ptr_t sym;
-+  lt_ptr sym;
-   char **argv;
-   int (*func)(int, char *[]);
-   int (*launcher_func)(int);
--  int lt_dlopen_flag;
- } d;
- 
- extern "C" {
-@@ -228,7 +217,6 @@
-            }
-         }
-      }
--     lt_dlopen_flag = d.lt_dlopen_flag;
-      if (!d.handle )
-      {
-         d.result = 2; // Try execing
-@@ -993,8 +981,6 @@
-    d.maxname = strlen(argv[0]);
-    d.launcher_pid = 0;
-    d.wrapper = 0;
--   d.lt_dlopen_flag = lt_dlopen_flag;
--   lt_dlopen_flag |= LTDL_GLOBAL;
-    init_signals();
+--- kdecore/Makefile.am.orig	Sun Jun 10 01:07:44 2001
++++ kdecore/Makefile.am
+@@ -89,7 +89,6 @@
+ install-data-local: charsets.config
+ 	$(mkinstalldirs) $(includedir)
+ 	$(mkinstalldirs) $(includedir)/kio
+-	$(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(includedir)/ltdl.h
+ 	$(mkinstalldirs) $(kde_confdir)
+ 	$(INSTALL_DATA) $(srcdir)/charsets.config $(kde_confdir)/charsets
+ 	$(mkinstalldirs) $(kde_datadir)/knotify
+@@ -102,7 +101,6 @@
  
+ uninstall-local:
+ 	-rm -f $(kde_confdir)/charsets
+-	-rm -f $(includedir)/ltdl.h
+ 	-rm -f $(includedir)/kio/kmdcodec.h
  
+ EXTRA_DIST = generate_keys.sh charsets.config $(kdebug_DATA) Web.colors \
diff --git a/x11/kdelibs2/patches/patch-ap b/x11/kdelibs2/patches/patch-ap
index 5968955ba07..c3baab02fc8 100644
--- a/x11/kdelibs2/patches/patch-ap
+++ b/x11/kdelibs2/patches/patch-ap
@@ -1,22 +1,37 @@
-$NetBSD: patch-ap,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-ap,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kio/kimageio.cpp.orig	Wed Dec 13 18:24:15 2000
-+++ kio/kimageio.cpp
-@@ -112,7 +112,7 @@
-       if (bRead)
-       {
-          funcName = "kimgio_"+mType.lower()+"_read";
--         lt_ptr_t func = lt_dlsym(libhandle, funcName.ascii());
-+         lt_ptr func = lt_dlsym(libhandle, funcName.ascii());
- 
-          if (func == NULL) {
-             iio->setStatus(1); // error
-@@ -123,7 +123,7 @@
-       if (bWrite)
-       {
-          funcName = "kimgio_"+mType.lower()+"_write";
--         lt_ptr_t func = lt_dlsym(libhandle, funcName.ascii());
-+         lt_ptr func = lt_dlsym(libhandle, funcName.ascii());
- 
-          if (func == NULL) {
-             iio->setStatus(1); // error
+--- kdecore/Makefile.in.orig	Wed Sep 12 06:09:44 2001
++++ kdecore/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -623 +623 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -681,11 +680,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -821,3 +809,0 @@
+-#>- 	$(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(includedir)/ltdl.h
+-#>+ 1
+-	$(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(DESTDIR)$(includedir)/ltdl.h
+@@ -854,3 +839,0 @@
+-#>- 	-rm -f $(includedir)/ltdl.h
+-#>+ 1
+-	-rm -f $(DESTDIR)$(includedir)/ltdl.h
+@@ -1041 +1024 @@
+-kde_config.all_cpp.cpp: $(srcdir)/Makefile.in kde-config.cpp  
++kde_config.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kde-config.cpp  
diff --git a/x11/kdelibs2/patches/patch-aq b/x11/kdelibs2/patches/patch-aq
index 2708b4f15c9..6b8a99b1af4 100644
--- a/x11/kdelibs2/patches/patch-aq
+++ b/x11/kdelibs2/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.1.1.1 2001/03/14 15:59:44 skrll Exp $
+$NetBSD: patch-aq,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kparts/Makefile.in.orig	Thu Feb 22 18:17:39 2001
-+++ kparts/Makefile.in
-@@ -241,7 +241,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--INCLUDES = -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl 	-I$(top_srcdir)/kfile $(all_includes)
-+INCLUDES = -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/kfile $(all_includes)
- 
- libkparts_la_LDFLAGS = -version-info 1:0:0 -no-undefined
- libkparts_la_LIBADD = $(LIB_KFILE) $(LIB_KIO)
+--- kdecore/klibloader.cpp.orig	Fri Aug  3 21:13:52 2001
++++ kdecore/klibloader.cpp
+@@ -16,6 +16,8 @@
+    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+ */
++#include <stdlib.h>
++
+ #include <config.h>
+ #include <qclipboard.h>
+ #include <qwidgetlist.h>
diff --git a/x11/kdelibs2/patches/patch-ar b/x11/kdelibs2/patches/patch-ar
index 6d794df158f..2b7bb09ddce 100644
--- a/x11/kdelibs2/patches/patch-ar
+++ b/x11/kdelibs2/patches/patch-ar
@@ -1,13 +1,52 @@
-$NetBSD: patch-ar,v 1.1.1.1 2001/03/14 15:59:44 skrll Exp $
+$NetBSD: patch-ar,v 1.2 2001/10/15 22:46:22 skrll Exp $
 
---- kparts/tests/Makefile.in.orig	Thu Feb 22 18:17:40 2001
-+++ kparts/tests/Makefile.in
-@@ -239,7 +239,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kfile -I$(top_srcdir)/kio $(all_includes)
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kfile -I$(top_srcdir)/kio $(all_includes)
- LDFLAGS = $(all_libraries)
- LDADD = $(top_builddir)/kparts/libkparts.la $(LIB_KDECORE)
+--- kdecore/kstddirs.cpp.orig	Wed Jan 24 22:29:38 2001
++++ kdecore/kstddirs.cpp
+@@ -652,33 +652,33 @@
  
+ QString KStandardDirs::kde_default(const char *type) {
+     if (!strcmp(type, "data"))
+-	return "share/apps/";
++	return "share/kde/apps/";
+     if (!strcmp(type, "html"))
+-	return "share/doc/HTML/";
++	return "share/doc/kde/HTML/";
+     if (!strcmp(type, "icon"))
+-	return "share/icons/";
++	return "share/kde/icons/";
+     if (!strcmp(type, "config"))
+-	return "share/config/";
++	return "share/kde/config/";
+     if (!strcmp(type, "pixmap"))
+-	return "share/pixmaps/";
++	return "share/kde/pixmaps/";
+     if (!strcmp(type, "apps"))
+-	return "share/applnk/";
++	return "share/kde/applnk/";
+     if (!strcmp(type, "sound"))
+-	return "share/sounds/";
++	return "share/kde/sounds/";
+     if (!strcmp(type, "locale"))
+-	return "share/locale/";
++	return "share/kde/locale/";
+     if (!strcmp(type, "services"))
+-	return "share/services/";
++	return "share/kde/services/";
+     if (!strcmp(type, "servicetypes"))
+-	return "share/servicetypes/";
++	return "share/kde/servicetypes/";
+     if (!strcmp(type, "mime"))
+-	return "share/mimelnk/";
++	return "share/kde/mimelnk/";
+     if (!strcmp(type, "cgi"))
+-	return "cgi-bin/";
++	return "kde-cgi-bin/";
+     if (!strcmp(type, "wallpaper"))
+-	return "share/wallpapers/";
++	return "share/kde/wallpapers/";
+     if (!strcmp(type, "templates"))
+-	return "share/templates/";
++	return "share/kde/templates/";
+     if (!strcmp(type, "exe"))
+ 	return "bin/";
+     if (!strcmp(type, "lib"))
diff --git a/x11/kdelibs2/patches/patch-as b/x11/kdelibs2/patches/patch-as
index 628ea6005dc..03d8d1c2c00 100644
--- a/x11/kdelibs2/patches/patch-as
+++ b/x11/kdelibs2/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.1.1.1 2001/03/14 15:59:49 skrll Exp $
+$NetBSD: patch-as,v 1.2 2001/10/15 22:46:23 skrll Exp $
 
---- ksgmltools/kdb2html.in.orig	Wed Jun  7 13:28:18 2000
-+++ ksgmltools/kdb2html.in
-@@ -1,7 +1,7 @@
- #! /bin/sh
- 
- if test -z "$KDB2HTML_UNINSTALLED"; then
--ksgmldir=@prefix@/share/apps/ksgmltools
-+ksgmldir=@kde_datadir@/ksgmltools
- else
- ksgmldir=$KDB2HTML_UNINSTALLED
- fi
+--- kdecore/netsupp.h.orig	Sun Jul 29 05:54:51 2001
++++ kdecore/netsupp.h
+@@ -61,7 +61,7 @@
+ #ifdef HAVE_SOCKADDR_SA_LEN
+   Q_UINT8		sin6_len;
+ #endif
+-  sa_family_t		sin6_family;
++  u_char		sin6_family;
+   unsigned short       	sin6_port;	/* RFC says in_port_t */
+   Q_UINT32		sin6_flowinfo;
+   struct kde_in6_addr	sin6_addr;
diff --git a/x11/kdelibs2/patches/patch-at b/x11/kdelibs2/patches/patch-at
new file mode 100644
index 00000000000..b3b27dc78ee
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-at
@@ -0,0 +1,45 @@
+$NetBSD: patch-at,v 1.3 2001/10/15 22:46:23 skrll Exp $
+
+--- kio/Makefile.am.orig	Thu Jun 21 00:05:50 2001
++++ kio/Makefile.am
+@@ -21,7 +21,7 @@
+ SUBDIRS = . klauncher kded file http ftp pics tests ksendbugmail kpac \
+ 	gzip $(BZIP2DIR)
+ 
+-lib_LTLIBRARIES = libkio.la libksycoca.la kio_uiserver.la
++lib_LTLIBRARIES = libkio.la libksycoca.la libkio_uiserver_main.la kio_uiserver.la
+ bin_PROGRAMS = kio_uiserver kmailservice
+ 
+ #libkioslave_la_LDFLAGS = -version-info 3:0
+@@ -82,13 +82,17 @@
+ 	kemailsettings.cpp authinfo.cpp \
+ 	kprotocolinfo.cpp kprotocolinfofactory.cpp
+ 
+-kio_uiserver_SOURCES = dummy.cpp
+-kio_uiserver_LDADD = kio_uiserver.la
++kio_uiserver_SOURCES = kio_uiserver_main.cpp
++kio_uiserver_LDADD = libkio_uiserver_main.la
+ kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+-kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
++libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
+ 	renamedlg.cpp skipdlg.cpp
+-kio_uiserver_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la
++libkio_uiserver_main_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la
++libkio_uiserver_main_la_LDFLAGS = $(all_libraries)
++
++kio_uiserver_la_SOURCES = kio_uiserver_main.cpp
++kio_uiserver_la_LIBADD = libkio_uiserver_main.la
+ kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ METASOURCES = AUTO
+@@ -121,9 +125,6 @@
+ parserfiles = yacc.y lex.l
+ 
+ EXTRA_DIST = $(kde_mime_DATA) $(parserfiles)
+-
+-dummy.cpp: uiserver.kidl
+-	echo > dummy.cpp
+ 
+ kmailservice_SOURCES = kmailservice.cpp
+ kmailservice_LDADD = $(LIB_KDECORE)
diff --git a/x11/kdelibs2/patches/patch-au b/x11/kdelibs2/patches/patch-au
new file mode 100644
index 00000000000..f4d607066ea
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-au
@@ -0,0 +1,145 @@
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-au,v 1.3 2001/10/15 22:46:23 skrll Exp $
+
+--- kio/Makefile.in.orig	Wed Sep 12 06:10:12 2001
++++ kio/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -287 +287 @@
+-lib_LTLIBRARIES = libkio.la libksycoca.la kio_uiserver.la
++lib_LTLIBRARIES = libkio.la libksycoca.la libkio_uiserver_main.la kio_uiserver.la
+@@ -311,2 +311,2 @@
+-kio_uiserver_SOURCES = dummy.cpp
+-kio_uiserver_LDADD = kio_uiserver.la
++kio_uiserver_SOURCES = kio_uiserver_main.cpp
++kio_uiserver_LDADD = libkio_uiserver_main.la
+@@ -315 +315 @@
+-#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub 	renamedlg.cpp skipdlg.cpp
++#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub 	renamedlg.cpp skipdlg.cpp
+@@ -317 +317 @@
+-kio_uiserver_la_SOURCES=uiserver.cpp   	renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp
++libkio_uiserver_main_la_SOURCES=uiserver.cpp   	renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp
+@@ -319 +319,5 @@
+-kio_uiserver_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la
++libkio_uiserver_main_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la
++libkio_uiserver_main_la_LDFLAGS = $(all_libraries)
++
++kio_uiserver_la_SOURCES = kio_uiserver_main.cpp
++kio_uiserver_la_LIBADD = libkio_uiserver_main.la
+@@ -399 +403 @@
+-kio_uiserver_la_DEPENDENCIES =  libksycoca.la ../kssl/libkssl.la \
++libkio_uiserver_main_la_DEPENDENCIES =  libksycoca.la ../kssl/libkssl.la \
+@@ -401 +405 @@
+-#>- kio_uiserver_la_OBJECTS =  uiserver.lo renamedlg.lo skipdlg.lo
++#>- libkio_uiserver_main_la_OBJECTS =  uiserver.lo renamedlg.lo skipdlg.lo
+@@ -403,5 +407,9 @@
+-kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo 
+-kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \
+-kio_uiserver_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS)
++libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo 
++libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \
++libkio_uiserver_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS)
++kio_uiserver_la_DEPENDENCIES =  libkio_uiserver_main.la
++#>- kio_uiserver_la_OBJECTS =  kio_uiserver_main.lo
++#>+ 1
++kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
+@@ -411 +419 @@
+-#>- kio_uiserver_OBJECTS =  dummy.$(OBJEXT)
++#>- kio_uiserver_OBJECTS =  kio_uiserver_main.$(OBJEXT)
+@@ -413,2 +421,2 @@
+-kio_uiserver_OBJECTS = dummy.$(OBJEXT)
+-kio_uiserver_DEPENDENCIES =  kio_uiserver.la
++kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT)
++kio_uiserver_DEPENDENCIES =  libkio_uiserver_main.la
+@@ -445 +453 @@
+-KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kscan.desktop kio_uiserver.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD 
++KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kio_uiserver.desktop kscan.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD 
+@@ -452,2 +460,2 @@
+-SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES)
+-OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS)
++SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES)
++OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(libkio_uiserver_main_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS)
+@@ -551,0 +560,3 @@
++libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS)
++
+@@ -755 +766 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -813,11 +823,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -958,3 +957,0 @@
+-dummy.cpp: uiserver.kidl
+-	echo > dummy.cpp
+-
+@@ -1176,8 +1173,8 @@
+-kio_uiserver_la_meta_unload.cpp:  renamedlg.moc uiserver.moc skipdlg.moc
+-	@echo 'creating kio_uiserver_la_meta_unload.cpp'
+-	@-rm -f kio_uiserver_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp
+-	@cat  renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp
+-	@echo '0};' >> kio_uiserver_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kio_uiserver_la_meta_unload.cpp
+-	@echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp
++libkio_uiserver_main_la_meta_unload.cpp:  renamedlg.moc uiserver.moc skipdlg.moc
++	@echo 'creating libkio_uiserver_main_la_meta_unload.cpp'
++	@-rm -f libkio_uiserver_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp
++	@cat  renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp
++	@echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkio_uiserver_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp
+@@ -1188 +1185 @@
+-	-rm -f  libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp kio_uiserver_la_meta_unload.cpp
++	-rm -f  libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp libkio_uiserver_main_la_meta_unload.cpp
+@@ -1215 +1212,13 @@
+-kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp  
++libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp  
++	@echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \
++	rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \
++	for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \
++	done; \
++	cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files  > libkio_uiserver_main_la.all_cpp.cpp; \
++	rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files
++
++#>+ 11
++kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp  
+@@ -1219 +1228 @@
+-	for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \
++	for file in kio_uiserver_main.cpp ; do \
+@@ -1227 +1236 @@
+-kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp  
+@@ -1231 +1240 @@
+-	for file in dummy.cpp ; do \
++	for file in kio_uiserver_main.cpp ; do \
+@@ -1252 +1261 @@
+-	-rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp
++	-rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp
+@@ -1256 +1265 @@
+-	$(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am
++	$(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am
+@@ -1259 +1268 @@
+-	$(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdelibs2/patches/patch-av b/x11/kdelibs2/patches/patch-av
new file mode 100644
index 00000000000..6dd7e1313cb
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-av
@@ -0,0 +1,38 @@
+$NetBSD: patch-av,v 1.3 2001/10/15 22:46:23 skrll Exp $
+
+--- kio/http/Makefile.am.orig	Sun Jul 29 05:55:39 2001
++++ kio/http/Makefile.am
+@@ -9,25 +9,25 @@
+ ####### Files
+ 
+ bin_PROGRAMS = kio_http_cache_cleaner
+-lib_LTLIBRARIES = kio_http_cache_cleaner.la
++lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la
+ kde_module_LTLIBRARIES = kio_http.la
+ 
+ kio_http_la_SOURCES = http.cc
+ kio_http_la_LIBADD = ../libkio.la $(LIBZ)
+ kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ 
+-kio_http_cache_cleaner_SOURCES = dummy.cpp
+-kio_http_cache_cleaner_LDADD   = kio_http_cache_cleaner.la
++kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp
++kio_http_cache_cleaner_LDADD   = libkio_http_cache_cleaner_main.la
+ kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH)
+ 
+-kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
+-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO)
++libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp
++libkio_http_cache_cleaner_main_la_LIBADD  = $(LIB_KIO)
++ 
++kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp
++kio_http_cache_cleaner_la_LIBADD  = libkio_http_cache_cleaner_main.la
+ kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
+ 
+ noinst_HEADERS = http.h
+ 
+ kdelnkdir = $(kde_servicesdir)
+ kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-aw b/x11/kdelibs2/patches/patch-aw
new file mode 100644
index 00000000000..a6bd9731a6d
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-aw
@@ -0,0 +1,80 @@
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-aw,v 1.1 2001/10/15 22:46:23 skrll Exp $
+
+--- kio/http/Makefile.in.orig	Wed Sep 12 06:10:13 2001
++++ kio/http/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -275 +275 @@
+-lib_LTLIBRARIES = kio_http_cache_cleaner.la
++lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la
+@@ -282,2 +282,2 @@
+-kio_http_cache_cleaner_SOURCES = dummy.cpp
+-kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la
++kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp
++kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la
+@@ -286,2 +286,5 @@
+-kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
+-kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO)
++libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp
++libkio_http_cache_cleaner_main_la_LIBADD = $(LIB_KIO)
++
++kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp
++kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la
+@@ -307,2 +310,8 @@
+-kio_http_cache_cleaner_la_DEPENDENCIES = 
+-#>- kio_http_cache_cleaner_la_OBJECTS =  http_cache_cleaner.lo
++libkio_http_cache_cleaner_main_la_LDFLAGS = 
++libkio_http_cache_cleaner_main_la_DEPENDENCIES = 
++#>- libkio_http_cache_cleaner_main_la_OBJECTS =  http_cache_cleaner.lo
++#>+ 1
++libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo
++kio_http_cache_cleaner_la_DEPENDENCIES =  \
++libkio_http_cache_cleaner_main.la
++#>- kio_http_cache_cleaner_la_OBJECTS =  http_cache_cleaner_main.lo
+@@ -310 +319 @@
+-kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo
++kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo
+@@ -314 +323 @@
+-#>- kio_http_cache_cleaner_OBJECTS =  dummy.$(OBJEXT)
++#>- kio_http_cache_cleaner_OBJECTS =  http_cache_cleaner_main.$(OBJEXT)
+@@ -316,2 +325,2 @@
+-kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT)
+-kio_http_cache_cleaner_DEPENDENCIES =  kio_http_cache_cleaner.la
++kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT)
++kio_http_cache_cleaner_DEPENDENCIES =  libkio_http_cache_cleaner_main.la
+@@ -338 +347 @@
+-KDE_DIST=README.http_cache_cleaner THOUGHTS https.protocol rfc2616.txt rfc2617.txt http.protocol http_cache_cleaner.desktop 
++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2617.txt http.protocol https.protocol THOUGHTS rfc2616.txt 
+@@ -345,2 +354,2 @@
+-SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES)
+-OBJECTS = $(kio_http_la_OBJECTS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_OBJECTS)
++SOURCES = $(kio_http_la_SOURCES) $(libkio_http_cache_cleaner_main_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES)
++OBJECTS = $(kio_http_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_OBJECTS)
+@@ -463,0 +473,3 @@
++libkio_http_cache_cleaner_main.la: $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkio_http_cache_cleaner_main_la_LDFLAGS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_LIBADD) $(LIBS)
++
+@@ -563 +575 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -621,11 +632,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -756,3 +756,0 @@
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-ax b/x11/kdelibs2/patches/patch-ax
new file mode 100644
index 00000000000..1839d4aac29
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2001/10/15 22:46:23 skrll Exp $
+
+--- kio/http/http_cache_cleaner.cpp.orig	Sun Jul 29 05:55:39 2001
++++ kio/http/http_cache_cleaner.cpp
+@@ -187,7 +187,7 @@
+    }
+ }
+ 
+-int main(int argc, char **argv)
++int kio_http_cache_cleaner_main(int argc, char **argv)
+ {
+    KLocale::setMainCatalogue("kdelibs");
+    KCmdLineArgs::init( argc, argv, appName, description, version, true);
diff --git a/x11/kdelibs2/patches/patch-ay b/x11/kdelibs2/patches/patch-ay
new file mode 100644
index 00000000000..50e360419ee
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-ay
@@ -0,0 +1,34 @@
+$NetBSD: patch-ay,v 1.1 2001/10/15 22:46:24 skrll Exp $
+
+--- kio/http/http_cache_cleaner_main.cpp.orig	Tue Sep 25 22:09:52 2001
++++ kio/http/http_cache_cleaner_main.cpp
+@@ -0,0 +1,29 @@
++/*
++ * This file is part of KDE
++ *
++ * Copyright (C) 2001 Nick Hudson (bastian@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 int kio_http_cache_cleaner_main(int, char **);
++
++int main(int argc, char **argv)
++{
++  return kio_http_cache_cleaner_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-az b/x11/kdelibs2/patches/patch-az
new file mode 100644
index 00000000000..731ddf573a5
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-az
@@ -0,0 +1,39 @@
+$NetBSD: patch-az,v 1.1 2001/10/15 22:46:24 skrll Exp $
+
+--- kio/http/kcookiejar/Makefile.am.orig	Fri May 11 02:23:55 2001
++++ kio/http/kcookiejar/Makefile.am
+@@ -6,17 +6,21 @@
+ ####### Files
+ 
+ bin_PROGRAMS = kcookiejar
+-lib_LTLIBRARIES = kcookiejar.la
++lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la
+ 
+-kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
++libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
+ 			kcookieserver.skel kcookiewin.cpp \
+ 			kcookiewin.h main.cpp 
+-kcookiejar_la_METASOURCES = AUTO
++libkcookiejar_main_la_METASOURCES = AUTO
++libkcookiejar_main_la_LDFLAGS = $(all_libraries)
++libkcookiejar_main_la_LIBADD = $(LIB_KIO)
++
++kcookiejar_la_SOURCES = kcookiejar_main.cpp
+ kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kcookiejar_la_LIBADD = $(LIB_KIO)
++kcookiejar_la_LIBADD = libkcookiejar_main.la
+ 
+-kcookiejar_SOURCES = dummy.cpp
+-kcookiejar_LDADD = kcookiejar.la
++kcookiejar_SOURCES = kcookiejar_main.cpp
++kcookiejar_LDADD = libkcookiejar_main.la
+ kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ services_DATA = kcookiejar.desktop
+@@ -24,6 +28,3 @@
+ 
+ update_DATA = kcookiescfg.upd
+ updatedir = $(kde_datadir)/kconf_update
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-ba b/x11/kdelibs2/patches/patch-ba
new file mode 100644
index 00000000000..eb19b918db1
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-ba
@@ -0,0 +1,148 @@
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-ba,v 1.1 2001/10/15 22:46:24 skrll Exp $
+
+--- kio/http/kcookiejar/Makefile.in.orig	Wed Sep 12 06:10:13 2001
++++ kio/http/kcookiejar/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -272 +272 @@
+-lib_LTLIBRARIES = kcookiejar.la
++lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la
+@@ -274 +274 @@
+-#>- kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp 			kcookieserver.skel kcookiewin.cpp 			kcookiewin.h main.cpp 
++#>- libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp 			kcookieserver.skel kcookiewin.cpp 			kcookiewin.h main.cpp 
+@@ -276 +276 @@
+-kcookiejar_la_SOURCES=kcookiejar.cpp kcookieserver.cpp 			 kcookiewin.cpp 			kcookiewin.h main.cpp  kcookieserver_skel.cpp
++libkcookiejar_main_la_SOURCES=kcookiejar.cpp kcookieserver.cpp 			 kcookiewin.cpp 			kcookiewin.h main.cpp  kcookieserver_skel.cpp
+@@ -278 +278,5 @@
+-#>- kcookiejar_la_METASOURCES = AUTO
++#>- libkcookiejar_main_la_METASOURCES = AUTO
++libkcookiejar_main_la_LDFLAGS = $(all_libraries)
++libkcookiejar_main_la_LIBADD = $(LIB_KIO)
++
++kcookiejar_la_SOURCES = kcookiejar_main.cpp
+@@ -280 +284 @@
+-kcookiejar_la_LIBADD = $(LIB_KIO)
++kcookiejar_la_LIBADD = libkcookiejar_main.la
+@@ -282,2 +286,2 @@
+-kcookiejar_SOURCES = dummy.cpp
+-kcookiejar_LDADD = kcookiejar.la
++kcookiejar_SOURCES = kcookiejar_main.cpp
++kcookiejar_LDADD = libkcookiejar_main.la
+@@ -301,3 +305,3 @@
+-kcookiejar_la_DEPENDENCIES = 
+-#>- kcookiejar_la_OBJECTS =  kcookiejar.lo kcookieserver.lo kcookiewin.lo \
+-#>- main.lo
++libkcookiejar_main_la_DEPENDENCIES = 
++#>- libkcookiejar_main_la_OBJECTS =  kcookiejar.lo kcookieserver.lo \
++#>- kcookiewin.lo main.lo
+@@ -305,6 +309,10 @@
+-kcookiejar_la_final_OBJECTS = kcookiejar_la.all_cpp.lo 
+-kcookiejar_la_nofinal_OBJECTS = kcookiejar.lo kcookieserver.lo kcookiewin.lo \
+-main.lo kcookieserver_skel.lo \
+-kcookiejar_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kcookiejar_la_OBJECTS = $(kcookiejar_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kcookiejar_la_OBJECTS = $(kcookiejar_la_final_OBJECTS)
++libkcookiejar_main_la_final_OBJECTS = libkcookiejar_main_la.all_cpp.lo 
++libkcookiejar_main_la_nofinal_OBJECTS = kcookiejar.lo kcookieserver.lo \
++kcookiewin.lo main.lo kcookieserver_skel.lo \
++libkcookiejar_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkcookiejar_main_la_OBJECTS = $(libkcookiejar_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkcookiejar_main_la_OBJECTS = $(libkcookiejar_main_la_final_OBJECTS)
++kcookiejar_la_DEPENDENCIES =  libkcookiejar_main.la
++#>- kcookiejar_la_OBJECTS =  kcookiejar_main.lo
++#>+ 1
++kcookiejar_la_OBJECTS = kcookiejar_main.lo
+@@ -314 +322 @@
+-#>- kcookiejar_OBJECTS =  dummy.$(OBJEXT)
++#>- kcookiejar_OBJECTS =  kcookiejar_main.$(OBJEXT)
+@@ -316,2 +324,2 @@
+-kcookiejar_OBJECTS = dummy.$(OBJEXT)
+-kcookiejar_DEPENDENCIES =  kcookiejar.la
++kcookiejar_OBJECTS = kcookiejar_main.$(OBJEXT)
++kcookiejar_DEPENDENCIES =  libkcookiejar_main.la
+@@ -341 +349 @@
+-KDE_DIST=kcookiescfg.upd kcookiejar.desktop kcookieserver.h kcookiejar.h rfc2965 netscape_cookie_spec.html rfc2109 
++KDE_DIST=netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h 
+@@ -348,2 +356,2 @@
+-SOURCES = $(kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
+-OBJECTS = $(kcookiejar_la_OBJECTS) $(kcookiejar_OBJECTS)
++SOURCES = $(libkcookiejar_main_la_SOURCES) $(kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
++OBJECTS = $(libkcookiejar_main_la_OBJECTS) $(kcookiejar_la_OBJECTS) $(kcookiejar_OBJECTS)
+@@ -435,0 +444,3 @@
++libkcookiejar_main.la: $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkcookiejar_main_la_LDFLAGS) $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_LIBADD) $(LIBS)
++
+@@ -546,11 +556,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -656,3 +655,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -696,8 +693,8 @@
+-kcookiejar_la_meta_unload.cpp:  kcookieserver.moc kcookiewin.moc
+-	@echo 'creating kcookiejar_la_meta_unload.cpp'
+-	@-rm -f kcookiejar_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kcookiejar_la[] = {' > kcookiejar_la_meta_unload.cpp
+-	@cat  kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcookiejar_la_meta_unload.cpp
+-	@echo '0};' >> kcookiejar_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kcookiejar_la_meta_unload.cpp
+-	@echo '_UNLOAD(kcookiejar_la)' >> kcookiejar_la_meta_unload.cpp
++libkcookiejar_main_la_meta_unload.cpp:  kcookieserver.moc kcookiewin.moc
++	@echo 'creating libkcookiejar_main_la_meta_unload.cpp'
++	@-rm -f libkcookiejar_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkcookiejar_main_la[] = {' > libkcookiejar_main_la_meta_unload.cpp
++	@cat  kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcookiejar_main_la_meta_unload.cpp
++	@echo '0};' >> libkcookiejar_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkcookiejar_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkcookiejar_main_la)' >> libkcookiejar_main_la_meta_unload.cpp
+@@ -708 +705,13 @@
+-	-rm -f  kcookiejar_la_meta_unload.cpp
++	-rm -f  libkcookiejar_main_la_meta_unload.cpp
++
++#>+ 11
++libkcookiejar_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp libkcookiejar_main_la_meta_unload.cpp   kcookieserver.moc kcookiewin.moc 
++	@echo 'creating libkcookiejar_main_la.all_cpp.cpp ...'; \
++	rm -f libkcookiejar_main_la.all_cpp.files libkcookiejar_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkcookiejar_main_la.all_cpp.final; \
++	for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp libkcookiejar_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkcookiejar_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcookiejar_main_la.all_cpp.final; \
++	done; \
++	cat libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files  > libkcookiejar_main_la.all_cpp.cpp; \
++	rm -f libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files
+@@ -711 +720 @@
+-kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp kcookiejar_la_meta_unload.cpp   kcookieserver.moc kcookiewin.moc 
++kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp  
+@@ -715 +724 @@
+-	for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp kcookiejar_la_meta_unload.cpp ; do \
++	for file in kcookiejar_main.cpp ; do \
+@@ -723 +732 @@
+-kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp  
+@@ -727 +736 @@
+-	for file in dummy.cpp ; do \
++	for file in kcookiejar_main.cpp ; do \
+@@ -736 +745 @@
+-	-rm -f kcookiejar_la.all_cpp.cpp kcookiejar.all_cpp.cpp
++	-rm -f libkcookiejar_main_la.all_cpp.cpp kcookiejar_la.all_cpp.cpp kcookiejar.all_cpp.cpp
+@@ -740 +749 @@
+-	$(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_final_OBJECTS)" all-am
++	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_final_OBJECTS)" all-am
+@@ -743 +752 @@
+-	$(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdelibs2/patches/patch-bb b/x11/kdelibs2/patches/patch-bb
new file mode 100644
index 00000000000..292ca584478
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bb
@@ -0,0 +1,33 @@
+$NetBSD: patch-bb,v 1.1 2001/10/15 22:46:24 skrll Exp $
+
+--- kio/http/kcookiejar/kcookiejar_main.cpp.orig	Tue Sep 25 22:09:53 2001
++++ kio/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 int kcookiejar_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kcookiejar_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-bc b/x11/kdelibs2/patches/patch-bc
new file mode 100644
index 00000000000..7de8eedabd0
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2001/10/15 22:46:24 skrll Exp $
+
+--- kio/http/kcookiejar/main.cpp.orig	Wed Dec 27 18:59:18 2000
++++ kio/http/kcookiejar/main.cpp
+@@ -46,7 +46,7 @@
+  { 0, 0, 0 }
+ };
+ 
+-int main(int argc, char *argv[])
++int kcookiejar_main(int argc, char *argv[])
+ {
+    KLocale::setMainCatalogue("kdelibs");
+    KCmdLineArgs::init(argc, argv, "kcookiejar", description, version);
diff --git a/x11/kdelibs2/patches/patch-bd b/x11/kdelibs2/patches/patch-bd
new file mode 100644
index 00000000000..787c050253a
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bd
@@ -0,0 +1,63 @@
+$NetBSD: patch-bd,v 1.1 2001/10/15 22:46:25 skrll Exp $
+
+--- kio/kded/Makefile.am.orig	Sun Jul 29 05:55:39 2001
++++ kio/kded/Makefile.am
+@@ -19,32 +19,40 @@
+ 
+ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
+ 
+-lib_LTLIBRARIES = kded.la kbuildsycoca.la
++lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
+ 
+-kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_la_LIBADD = $(LIB_KSYCOCA)
+-kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
++libkded_main_la_LDFLAGS = $(all_libraries)
++libkded_main_la_LIBADD = $(LIB_KSYCOCA)
++libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
+ 			kbuildservicefactory.cpp \
+ 			kbuildservicegroupfactory.cpp kdedmodule.cpp
+ 
+-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA)
+-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
++kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kded_la_LIBADD = libkded_main.la
++kded_la_SOURCES = kded_main.cpp
++
++libkbuildsycoca_main_la_LDFLAGS = $(all_libraries)
++libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA)
++libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
+ 				kbuildservicefactory.cpp \
+ 				kbuildservicegroupfactory.cpp \
+ 				kbuildimageiofactory.cpp \
+ 				kbuildprotocolinfofactory.cpp \
+ 				kctimefactory.cpp
+ 
++kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la
++kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp
++
+ bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname
+ 
+ kded_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kded_LDADD = $(LIB_KSYCOCA) kded.la
+-kded_SOURCES = dummy.cpp
++kded_LDADD = $(LIB_KSYCOCA) libkded_main.la
++kded_SOURCES = kded_main.cpp
+ 
+ kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la
+-kbuildsycoca_SOURCES = dummy.cpp
++kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la
++kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
+ 
+ kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ kdontchangethehostname_LDADD =  $(LIB_KDECORE)
+@@ -61,6 +69,3 @@
+ 
+ servicetype_DATA = kdedmodule.desktop
+ servicetypedir = $(kde_servicetypesdir)
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-be b/x11/kdelibs2/patches/patch-be
new file mode 100644
index 00000000000..991b884eca8
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-be
@@ -0,0 +1,238 @@
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $
+
+--- kio/kded/Makefile.in.orig	Wed Sep 12 06:10:13 2001
++++ kio/kded/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -285 +285,6 @@
+-lib_LTLIBRARIES = kded.la kbuildsycoca.la
++lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
++
++libkded_main_la_LDFLAGS = $(all_libraries)
++libkded_main_la_LIBADD = $(LIB_KSYCOCA)
++libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp 			kbuildservicefactory.cpp 			kbuildservicegroupfactory.cpp kdedmodule.cpp
++
+@@ -288,2 +293,2 @@
+-kded_la_LIBADD = $(LIB_KSYCOCA)
+-kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp 			kbuildservicefactory.cpp 			kbuildservicegroupfactory.cpp kdedmodule.cpp
++kded_la_LIBADD = libkded_main.la
++kded_la_SOURCES = kded_main.cpp
+@@ -290,0 +296,3 @@
++libkbuildsycoca_main_la_LDFLAGS = $(all_libraries)
++libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA)
++libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp 				kbuildservicefactory.cpp 				kbuildservicegroupfactory.cpp 				kbuildimageiofactory.cpp 				kbuildprotocolinfofactory.cpp 				kctimefactory.cpp
+@@ -292,3 +299,0 @@
+-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA)
+-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp 				kbuildservicefactory.cpp 				kbuildservicegroupfactory.cpp 				kbuildimageiofactory.cpp 				kbuildprotocolinfofactory.cpp 				kctimefactory.cpp
+@@ -295,0 +301,3 @@
++kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la
++kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp
+@@ -300,2 +308,2 @@
+-kded_LDADD = $(LIB_KSYCOCA) kded.la
+-kded_SOURCES = dummy.cpp
++kded_LDADD = $(LIB_KSYCOCA) libkded_main.la
++kded_SOURCES = kded_main.cpp
+@@ -304,2 +312,2 @@
+-kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la
+-kbuildsycoca_SOURCES = dummy.cpp
++kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la
++kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
+@@ -330,2 +338,2 @@
+-kded_la_DEPENDENCIES = 
+-#>- kded_la_OBJECTS =  kded.lo kbuildservicetypefactory.lo \
++libkded_main_la_DEPENDENCIES = 
++#>- libkded_main_la_OBJECTS =  kded.lo kbuildservicetypefactory.lo \
+@@ -334,2 +342,2 @@
+-kded_la_final_OBJECTS = kded_la.all_cpp.lo 
+-kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \
++libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo 
++libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \
+@@ -337,15 +345,25 @@
+-kded_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_la_final_OBJECTS)
+-kbuildsycoca_la_DEPENDENCIES = 
+-#>- kbuildsycoca_la_OBJECTS =  kbuildsycoca.lo kbuildservicetypefactory.lo \
+-#>- kbuildservicefactory.lo kbuildservicegroupfactory.lo \
+-#>- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo
+-#>+ 7
+-kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo 
+-kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \
+-kbuildservicefactory.lo kbuildservicegroupfactory.lo \
+-kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo \
+-kbuildsycoca_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS)
++libkded_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS)
++kded_la_DEPENDENCIES =  libkded_main.la
++#>- kded_la_OBJECTS =  kded_main.lo
++#>+ 1
++kded_la_OBJECTS = kded_main.lo
++libkbuildsycoca_main_la_DEPENDENCIES = 
++#>- libkbuildsycoca_main_la_OBJECTS =  kbuildsycoca.lo \
++#>- kbuildservicetypefactory.lo kbuildservicefactory.lo \
++#>- kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
++#>- kbuildprotocolinfofactory.lo kctimefactory.lo
++#>+ 8
++libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo 
++libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \
++kbuildservicetypefactory.lo kbuildservicefactory.lo \
++kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
++kbuildprotocolinfofactory.lo kctimefactory.lo \
++libkbuildsycoca_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS)
++kbuildsycoca_la_DEPENDENCIES =  libkbuildsycoca_main.la
++#>- kbuildsycoca_la_OBJECTS =  kbuildsycoca_main.lo
++#>+ 1
++kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo
+@@ -356 +374 @@
+-#>- kded_OBJECTS =  dummy.$(OBJEXT)
++#>- kded_OBJECTS =  kded_main.$(OBJEXT)
+@@ -358,3 +376,3 @@
+-kded_OBJECTS = dummy.$(OBJEXT)
+-kded_DEPENDENCIES =  kded.la
+-#>- kbuildsycoca_OBJECTS =  dummy.$(OBJEXT)
++kded_OBJECTS = kded_main.$(OBJEXT)
++kded_DEPENDENCIES =  libkded_main.la
++#>- kbuildsycoca_OBJECTS =  kbuildsycoca_main.$(OBJEXT)
+@@ -362,2 +380,2 @@
+-kbuildsycoca_OBJECTS = dummy.$(OBJEXT)
+-kbuildsycoca_DEPENDENCIES =  kbuildsycoca.la
++kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT)
++kbuildsycoca_DEPENDENCIES =  libkbuildsycoca_main.la
+@@ -388 +406 @@
+-KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.h kctimefactory.h 
++KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kctimefactory.h 
+@@ -395,2 +413,2 @@
+-SOURCES = $(kded_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES)
+-OBJECTS = $(kded_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS)
++SOURCES = $(libkded_main_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES)
++OBJECTS = $(libkded_main_la_OBJECTS) $(kded_la_OBJECTS) $(libkbuildsycoca_main_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS)
+@@ -482,0 +501,3 @@
++libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS)
++
+@@ -485,0 +507,3 @@
++libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS)
++
+@@ -600,11 +623,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -710,3 +722,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -743,8 +753,8 @@
+-kded_la_meta_unload.cpp:  kded.moc kdedmodule.moc
+-	@echo 'creating kded_la_meta_unload.cpp'
+-	@-rm -f kded_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp
+-	@cat  kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp
+-	@echo '0};' >> kded_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kded_la_meta_unload.cpp
+-	@echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp
++libkded_main_la_meta_unload.cpp:  kded.moc kdedmodule.moc
++	@echo 'creating libkded_main_la_meta_unload.cpp'
++	@-rm -f libkded_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp
++	@cat  kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp
++	@echo '0};' >> libkded_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkded_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp
+@@ -754,8 +764,8 @@
+-kbuildsycoca_la_meta_unload.cpp:  kbuildsycoca.moc
+-	@echo 'creating kbuildsycoca_la_meta_unload.cpp'
+-	@-rm -f kbuildsycoca_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp
+-	@cat  kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp
+-	@echo '0};' >> kbuildsycoca_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kbuildsycoca_la_meta_unload.cpp
+-	@echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp
++libkbuildsycoca_main_la_meta_unload.cpp:  kbuildsycoca.moc
++	@echo 'creating libkbuildsycoca_main_la_meta_unload.cpp'
++	@-rm -f libkbuildsycoca_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp
++	@cat  kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp
++	@echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkbuildsycoca_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp
+@@ -766 +776,13 @@
+-	-rm -f  kded_la_meta_unload.cpp kbuildsycoca_la_meta_unload.cpp
++	-rm -f  libkded_main_la_meta_unload.cpp libkbuildsycoca_main_la_meta_unload.cpp
++
++#>+ 11
++libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp libkded_main_la_meta_unload.cpp   kded.moc kdedmodule.moc kbuildsycoca.moc 
++	@echo 'creating libkded_main_la.all_cpp.cpp ...'; \
++	rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \
++	for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp libkded_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \
++	done; \
++	cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files  > libkded_main_la.all_cpp.cpp; \
++	rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files
+@@ -769 +791 @@
+-kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp   kded.moc kdedmodule.moc kbuildsycoca.moc 
++kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp  
+@@ -773 +795 @@
+-	for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \
++	for file in kded_main.cpp ; do \
+@@ -781 +803,13 @@
+-kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp  
++libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp  
++	@echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \
++	rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \
++	for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \
++	done; \
++	cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files  > libkbuildsycoca_main_la.all_cpp.cpp; \
++	rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files
++
++#>+ 11
++kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp  
+@@ -785 +819 @@
+-	for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \
++	for file in kbuildsycoca_main.cpp ; do \
+@@ -793 +827 @@
+-kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp  
+@@ -797 +831 @@
+-	for file in dummy.cpp ; do \
++	for file in kded_main.cpp ; do \
+@@ -805 +839 @@
+-kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp  
+@@ -809 +843 @@
+-	for file in dummy.cpp ; do \
++	for file in kbuildsycoca_main.cpp ; do \
+@@ -830 +864 @@
+-	-rm -f kded_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp
++	-rm -f libkded_main_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp
+@@ -834 +868 @@
+-	$(MAKE) kded_la_OBJECTS="$(kded_la_final_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" all-am
++	$(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" all-am
+@@ -837 +871 @@
+-	$(MAKE) kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdelibs2/patches/patch-bf b/x11/kdelibs2/patches/patch-bf
new file mode 100644
index 00000000000..6d21aae654a
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2001/10/15 22:46:25 skrll Exp $
+
+--- kio/kded/kbuildsycoca.cpp.orig	Wed Sep  5 00:08:16 2001
++++ kio/kded/kbuildsycoca.cpp
+@@ -382,7 +382,7 @@
+ static const char *appName = "kbuildsycoca";
+ static const char *appVersion = "1.0";
+ 
+-int main(int argc, char **argv)
++int kbuildsycoca_main(int argc, char **argv)
+ {
+    KLocale::setMainCatalogue("kdelibs");
+    KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
diff --git a/x11/kdelibs2/patches/patch-bg b/x11/kdelibs2/patches/patch-bg
new file mode 100644
index 00000000000..2c719fecfeb
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bg
@@ -0,0 +1,32 @@
+$NetBSD: patch-bg,v 1.1 2001/10/15 22:46:25 skrll Exp $
+
+--- kio/kded/kbuildsycoca_main.cpp.orig	Tue Sep 25 22:09:54 2001
++++ kio/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 int kbuildsycoca_main(int, char* []);
++
++int main(int argc, char *argv[])
++{
++     return kbuildsycoca_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-bh b/x11/kdelibs2/patches/patch-bh
new file mode 100644
index 00000000000..cd65236c03b
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bh
@@ -0,0 +1,11 @@
+$NetBSD: patch-bh,v 1.1 2001/10/15 22:46:25 skrll Exp $
+
+--- kio/kded/kded.cpp.orig	Wed Sep  5 00:08:16 2001
++++ kio/kded/kded.cpp
+@@ -449,5 +449,5 @@
+ };
+ 
+-int main(int argc, char *argv[])
++int kded_main(int argc, char *argv[])
+ {
+      KAboutData aboutData( "kded", I18N_NOOP("KDE Daemon"),
diff --git a/x11/kdelibs2/patches/patch-bi b/x11/kdelibs2/patches/patch-bi
new file mode 100644
index 00000000000..1cacb9670e2
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bi
@@ -0,0 +1,32 @@
+$NetBSD: patch-bi,v 1.1 2001/10/15 22:46:26 skrll Exp $
+
+--- kio/kded/kded_main.cpp.orig	Tue Sep 25 22:09:54 2001
++++ kio/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 int kded_main(int, char* []);
++
++int main(int argc, char *argv[])
++{
++     return kded_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-bj b/x11/kdelibs2/patches/patch-bj
new file mode 100644
index 00000000000..b08f341c90f
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bj
@@ -0,0 +1,32 @@
+$NetBSD: patch-bj,v 1.1 2001/10/15 22:46:26 skrll Exp $
+
+--- kio/kio_uiserver_main.cpp.orig	Tue Sep 25 22:09:55 2001
++++ kio/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 int kio_uiserver_main(int, char* []);
++
++int main(int argc, char *argv[])
++{
++     return kio_uiserver_main(argc, argv);
++}
diff --git a/x11/kdelibs2/patches/patch-bk b/x11/kdelibs2/patches/patch-bk
new file mode 100644
index 00000000000..26e2b21d978
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bk
@@ -0,0 +1,22 @@
+$NetBSD: patch-bk,v 1.1 2001/10/15 22:46:26 skrll Exp $
+
+--- kio/klauncher/Makefile.am.orig	Tue Jan 30 07:25:20 2001
++++ kio/klauncher/Makefile.am
+@@ -25,15 +25,11 @@
+ 
+ klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ klauncher_la_LIBADD = $(LIB_KSYCOCA)
+-klauncher_la_SOURCES = klauncher.cpp main.cpp autostart.cpp
++klauncher_la_SOURCES = klauncher.cpp autostart.cpp main.cpp
+ 
+ klauncher_LDFLAGS =  $(all_libraries) $(KDE_RPATH)
+-klauncher_LDADD = klauncher.la
+-klauncher_SOURCES = dummy.cpp
++klauncher_SOURCES = klauncher_main.cpp
+ 
+ METASOURCES = AUTO
+ 
+ noinst_HEADERS = klauncher.h autostart.h
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdelibs2/patches/patch-bl b/x11/kdelibs2/patches/patch-bl
new file mode 100644
index 00000000000..05d4ac09f2f
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bl
@@ -0,0 +1,64 @@
+Cannot strip away RCS IDs, please handle manually!
+$NetBSD: patch-bl,v 1.1 2001/10/15 22:46:26 skrll Exp $
+
+--- kio/klauncher/Makefile.in.orig	Wed Sep 12 06:10:14 2001
++++ kio/klauncher/Makefile.in
+@@ -2 +2 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+@@ -4 +4 @@
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+@@ -291 +291 @@
+-klauncher_la_SOURCES = klauncher.cpp main.cpp autostart.cpp
++klauncher_la_SOURCES = klauncher.cpp autostart.cpp main.cpp
+@@ -294,2 +294 @@
+-klauncher_LDADD = klauncher.la
+-klauncher_SOURCES = dummy.cpp
++klauncher_SOURCES = klauncher_main.cpp
+@@ -311 +310 @@
+-#>- klauncher_la_OBJECTS =  klauncher.lo main.lo autostart.lo
++#>- klauncher_la_OBJECTS =  klauncher.lo autostart.lo main.lo
+@@ -314 +313 @@
+-klauncher_la_nofinal_OBJECTS = klauncher.lo main.lo autostart.lo \
++klauncher_la_nofinal_OBJECTS = klauncher.lo autostart.lo main.lo \
+@@ -321 +320 @@
+-#>- klauncher_OBJECTS =  dummy.$(OBJEXT)
++#>- klauncher_OBJECTS =  klauncher_main.$(OBJEXT)
+@@ -323,2 +322,3 @@
+-klauncher_OBJECTS = dummy.$(OBJEXT)
+-klauncher_DEPENDENCIES =  klauncher.la
++klauncher_OBJECTS = klauncher_main.$(OBJEXT)
++klauncher_LDADD = $(LDADD)
++klauncher_DEPENDENCIES = 
+@@ -512 +512 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -570,11 +569,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -693,3 +681,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -733 +719 @@
+-klauncher_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klauncher.cpp $(srcdir)/main.cpp $(srcdir)/autostart.cpp klauncher_la_meta_unload.cpp   klauncher.moc 
++klauncher_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klauncher.cpp $(srcdir)/autostart.cpp $(srcdir)/main.cpp klauncher_la_meta_unload.cpp   klauncher.moc 
+@@ -737 +723 @@
+-	for file in klauncher.cpp main.cpp autostart.cpp klauncher_la_meta_unload.cpp ; do \
++	for file in klauncher.cpp autostart.cpp main.cpp klauncher_la_meta_unload.cpp ; do \
+@@ -745 +731 @@
+-klauncher.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++klauncher.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klauncher_main.cpp  
+@@ -749 +735 @@
+-	for file in dummy.cpp ; do \
++	for file in klauncher_main.cpp ; do \
diff --git a/x11/kdelibs2/patches/patch-bm b/x11/kdelibs2/patches/patch-bm
new file mode 100644
index 00000000000..12bc4395129
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bm
@@ -0,0 +1,31 @@
+$NetBSD: patch-bm,v 1.1 2001/10/15 22:46:26 skrll Exp $
+
+--- kio/klauncher/klauncher_main.cpp.orig	Tue Sep 25 22:09:56 2001
++++ kio/klauncher/klauncher_main.cpp
+@@ -0,0 +1,26 @@
++/*
++ * 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.
++ */
++
++int
++main(int argc, char* argv[]) 
++{
++  return 0;
++}
diff --git a/x11/kdelibs2/patches/patch-bn b/x11/kdelibs2/patches/patch-bn
new file mode 100644
index 00000000000..40d964ed322
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bn
@@ -0,0 +1,13 @@
+$NetBSD: patch-bn,v 1.1 2001/10/15 22:46:26 skrll Exp $
+
+--- kio/klauncher/main.cpp.orig	Sun Jul 29 05:55:39 2001
++++ kio/klauncher/main.cpp
+@@ -86,8 +86,3 @@
+    launcher->exec();
+    return 0;
+ }
+-
+-int main(/*int argc, char **argv*/)
+-{
+-   return 0;
+-}
diff --git a/x11/kdelibs2/patches/patch-bo b/x11/kdelibs2/patches/patch-bo
new file mode 100644
index 00000000000..ad537fabfa9
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bo
@@ -0,0 +1,13 @@
+$NetBSD: patch-bo,v 1.1 2001/10/15 22:46:27 skrll Exp $
+
+--- kio/uiserver.cpp.orig	Sun Jul 29 05:55:38 2001
++++ kio/uiserver.cpp
+@@ -962,7 +962,7 @@
+ 
+ //------------------------------------------------------------
+ 
+-int main(int argc, char **argv)
++int kio_uiserver_main(int argc, char **argv)
+ {
+     KLocale::setMainCatalogue("kdelibs");
+     //  GS 5/2001 - I changed the name to "KDE" to make it look better