Make kicker and kdesktop not only compile and work in some cases, but

all cases. Apologies for the mess.

If anyone is in the middle of a build I suggest you do:

	cd x11/kdebase2/work/kdebase-2.2.1
	for p in ../../patches/patch-b[hipq] ../../patches/patch-ez \
	    ../patches/patch-fa; do
		patch < $p
	done

and start the build again.

7 files changed, 208 insertions, 57 deletions

diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index c73efc5869f..55e25cd39c8 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2001/10/18 13:23:04 skrll Exp $
+$NetBSD: distinfo,v 1.12 2001/10/18 15:43:10 skrll Exp $
 
 SHA1 (kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9
 Size (kdebase-2.2.1.tar.bz2) = 12696643 bytes
@@ -39,16 +39,16 @@ SHA1 (patch-bd) = 8e0436a500cc2b37098beac7413d8320310e8bb3
 SHA1 (patch-be) = 316ea71a9c2724f790f02a297c5029e556c027f9
 SHA1 (patch-bf) = 2cace1983f5009e94e39eabbebfc261086ffe7bd
 SHA1 (patch-bg) = 4e708f50e2f0cd2f222ac0cb7d155caa929da99a
-SHA1 (patch-bh) = e9c20ea39b09f38f2c8342a388ff249baabbb13e
-SHA1 (patch-bi) = 09b17a8238286e798ea58839029ea6e95f277e7a
+SHA1 (patch-bh) = 0d0e023f793593653dc18d0391a6fcd336d75847
+SHA1 (patch-bi) = 837d0ba37494769d8122e95ce65d208cb07f40e9
 SHA1 (patch-bj) = 45e51ad6da60e2b38ccfecf61b75175b9e9858fb
 SHA1 (patch-bk) = cdb0cc50e498c101e47b689a31078f7f942dcb9c
 SHA1 (patch-bl) = dc3a589816c7c5681c09c9ef962178ff9e37409d
 SHA1 (patch-bm) = 5675e1672697461011657b492f2ca18babcec3f6
 SHA1 (patch-bn) = 93c8f8a3bb6aaf1a5c852eac73441ea868aacf98
 SHA1 (patch-bo) = 3ed1b9b2bd2870c80aad7a0b39aee9ac3bdc9238
-SHA1 (patch-bp) = d49ecab8f1802a7e74d90ac89d2da6da477ef104
-SHA1 (patch-bq) = aa7b7c37b0188ff43b198d615cf7d41d9fa5099b
+SHA1 (patch-bp) = 704329e88e00d9ca817355bf06b83e21f2fdfb71
+SHA1 (patch-bq) = f731da49382e75a6302ac0c15608d48123e72068
 SHA1 (patch-br) = ccb960d5b9f43f70e17bde094ffa1b49f0d89d2b
 SHA1 (patch-bs) = ce2eeeb511591fec68f96cf246c324debfd2690d
 SHA1 (patch-bt) = 19dad64a5f030d502116934618e62913318eb272
@@ -135,3 +135,5 @@ SHA1 (patch-ev) = 2e42263d67e5e44035bed13dc3e5245fc3a86709
 SHA1 (patch-ew) = 78ff80b8b8de9fedaba7d875ac00ea6fd9e88a0a
 SHA1 (patch-ex) = 96fac765f7678be3563245c3fa1a23ace5bce86b
 SHA1 (patch-ey) = 2252a4ed9f9d15021e59b542568b0dc0f9c73e48
+SHA1 (patch-ez) = 904a251a996d9c73e7ea4a0dbc384422ba7d28db
+SHA1 (patch-fa) = c8ceb03ef5eb7a3b16f3fd988e03278e7661978c
diff --git a/x11/kdebase2/patches/patch-bh b/x11/kdebase2/patches/patch-bh
index a9b576c25c2..e0b16027ba9 100644
--- a/x11/kdebase2/patches/patch-bh
+++ b/x11/kdebase2/patches/patch-bh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bh,v 1.1 2001/10/15 22:46:02 skrll Exp $
+$NetBSD: patch-bh,v 1.2 2001/10/18 15:43:10 skrll Exp $
 
 --- kdesktop/Makefile.am.orig	Sun Jul 29 05:56:25 2001
 +++ kdesktop/Makefile.am
@@ -10,7 +10,7 @@ $NetBSD: patch-bh,v 1.1 2001/10/15 22:46:02 skrll Exp $
 +libkdesktop_main_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
  kdesktop_la_LDFLAGS  = $(all_libraries) -lkdesu -module -avoid-version
 -kdesktop_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
-+kdesktop_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la
++kdesktop_la_LIBADD   = libkdesktop_main.la
  kdesktop_LDFLAGS  = $(KDE_RPATH) $(all_libraries)
 -kdesktop_LDADD    = kdesktop.la
 +kdesktop_LDADD    = libkdesktop_main.la
diff --git a/x11/kdebase2/patches/patch-bi b/x11/kdebase2/patches/patch-bi
index e126fb7ef7d..cff4c2933e8 100644
--- a/x11/kdebase2/patches/patch-bi
+++ b/x11/kdebase2/patches/patch-bi
@@ -1,41 +1,57 @@
-$NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
+$NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $
 
 --- kdesktop/Makefile.in.orig	Sat Sep  8 01:36:30 2001
 +++ kdesktop/Makefile.in
-@@ -274,0 +275,2 @@
+@@ -272,10 +272,12 @@
+ x_libraries = @x_libraries@
+ 
+ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes)
 +libkdesktop_main_la_LDFLAGS = $(all_libraries) -lkdesu
 +libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
-@@ -276 +278 @@
+ kdesktop_la_LDFLAGS = $(all_libraries) -lkdesu -module -avoid-version
 -kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
-+kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la
-@@ -278 +280 @@
++kdesktop_la_LIBADD = libkdesktop_main.la
+ kdesktop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 -kdesktop_LDADD = kdesktop.la
 +kdesktop_LDADD = libkdesktop_main.la
-@@ -286 +288 @@
+ 
+ SUBDIRS = . pics patterns programs init kwebdesktop
+ 
+@@ -283,14 +285,16 @@
+ 
+ bin_PROGRAMS = kdesktop kdmdesktop
+ bin_SCRIPTS = kdeeject
 -lib_LTLIBRARIES = kdesktop.la
 +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la
-@@ -288 +290 @@
+ 
 -#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc KDesktopIface.skel 	bgmanager.cc init.cc KScreensaverIface.skel 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc 	startupid.cpp
 +#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc KDesktopIface.skel 	bgmanager.cc init.cc KScreensaverIface.skel 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc 	startupid.cpp
-@@ -290 +292 @@
+ #>+ 1
 -kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc  	bgmanager.cc init.cc  	minicli.cpp  pixmapserver.cc kcustommenu.cc 	startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc
 +libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc  	bgmanager.cc init.cc  	minicli.cpp  pixmapserver.cc kcustommenu.cc 	startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc
-@@ -293 +295,3 @@
+ 
+ 
 -kdesktop_SOURCES = dummy.cc
 +kdesktop_la_SOURCES = kdesktop_main.cc
 +
 +kdesktop_SOURCES = kdesktop_main.cc
-@@ -325 +329 @@
+ 
+ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h
+ 
+@@ -322,26 +326,30 @@
+ LIBS = @LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
 -kdesktop_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la \
 +libkdesktop_main_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la \
-@@ -327,3 +331,3 @@
+ $(top_builddir)/kcontrol/background/libbgnd.la
 -#>- kdesktop_la_OBJECTS =  krootwm.lo xautolock.lo kdiconview.lo desktop.lo \
 -#>- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \
 -#>- pixmapserver.lo kcustommenu.lo startupid.lo
 +#>- libkdesktop_main_la_OBJECTS =  krootwm.lo xautolock.lo kdiconview.lo \
 +#>- desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \
 +#>- minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo
-@@ -331,7 +335,12 @@
+ #>+ 7
 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo 
 -kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \
 -main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \
@@ -50,35 +66,65 @@ $NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
 +libkdesktop_main_la_meta_unload.lo 
 +@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS)
-+kdesktop_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la \
-+$(top_builddir)/kcontrol/background/libbgnd.la
++kdesktop_la_DEPENDENCIES =  libkdesktop_main.la
 +#>- kdesktop_la_OBJECTS =  kdesktop_main.lo
 +#>+ 1
 +kdesktop_la_OBJECTS = kdesktop_main.lo
-@@ -341 +350 @@
+ bin_PROGRAMS =  kdesktop$(EXEEXT) kdmdesktop$(EXEEXT)
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
 -#>- kdesktop_OBJECTS =  dummy.$(OBJEXT)
 +#>- kdesktop_OBJECTS =  kdesktop_main.$(OBJEXT)
-@@ -343,2 +352,2 @@
+ #>+ 1
 -kdesktop_OBJECTS = dummy.$(OBJEXT)
 -kdesktop_DEPENDENCIES =  kdesktop.la
 +kdesktop_OBJECTS = kdesktop_main.$(OBJEXT)
 +kdesktop_DEPENDENCIES =  libkdesktop_main.la
-@@ -376 +385 @@
+ #>- kdmdesktop_OBJECTS =  kdmdesktop.$(OBJEXT)
+ #>+ 5
+ kdmdesktop_final_OBJECTS = kdmdesktop.o kdmdesktop.all_cc.o 
+@@ -373,15 +381,15 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
 -KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 DESIGN kcustommenu.h kdiconview.h kdesktopbindings.cpp kdmdesktop.h kdeeject 
-+KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject kdmdesktop.h 
-@@ -383,2 +392,2 @@
++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kdmdesktop kcustommenu.h KBackgroundIface.kidl kdiconview.h KScreensaverIface.kidl kdesktop libkdesktop_main_la_meta_unload.cc kdesktop.core kdesktopbindings.cpp kdeeject KDesktopIface.kidl kdmdesktop_meta_unload.cc kdmdesktop.h 
+ 
+ DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+ 
+ TAR = tar
+ GZIP_ENV = --best
 -SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES)
 -OBJECTS = $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS)
 +SOURCES = $(libkdesktop_main_la_SOURCES) $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES)
 +OBJECTS = $(libkdesktop_main_la_OBJECTS) $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS)
-@@ -470,0 +480,3 @@
+ 
+ #>- all: all-redirect
+ #>+ 1
+@@ -468,6 +476,9 @@
+ 
+ maintainer-clean-libtool:
+ 
 +libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES)
 +	$(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS)
 +
-@@ -627 +639 @@
+ kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES)
+ 	$(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS)
+ 
+@@ -624,7 +635,7 @@
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
 -	  test "$$subdir" = "." && dot_seen=yes; \
 +	  test "$$subdir" != "." || dot_seen=yes; \
-@@ -685,11 +696,0 @@
+ 	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+@@ -682,17 +693,6 @@
+ subdir = kdesktop
+ 
+ distdir: $(DISTFILES)
 -#>- 	@for file in $(DISTFILES); do \
 -#>- 	  d=$(srcdir); \
 -#>- 	  if test -d $$d/$$file; then \
@@ -90,11 +136,23 @@ $NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
 -#>- 	  fi; \
 -#>- 	done
 -#>+ 10
-@@ -822,3 +822,0 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -819,9 +819,6 @@
+ messages:
+ 	$(XGETTEXT) *.cc *.cpp *.h -o $(podir)/kdesktop.pot
+ 
 -dummy.cc:
 -	echo > dummy.cc
 -
-@@ -915,8 +913,8 @@
+ install-data-local:
+ 	@test -n "$(DESTDIR)" || test -z "$(PAM)" || $(top_srcdir)/mkpamserv $(PAM)
+ 
+@@ -912,14 +909,14 @@
+ 
+ 
+ #>+ 10
 -kdesktop_la_meta_unload.cc:  lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc
 -	@echo 'creating kdesktop_la_meta_unload.cc'
 -	@-rm -f kdesktop_la_meta_unload.cc
@@ -111,10 +169,17 @@ $NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
 +	@echo '0};' >> libkdesktop_main_la_meta_unload.cc
 +	@echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc
 +	@echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc
-@@ -938 +936 @@
+ 
+ 
+ #>+ 10
+@@ -935,26 +932,38 @@
+ 
+ #>+ 3
+ clean-moc-classes:
 -	-rm -f  kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc
 +	-rm -f  libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc
-@@ -941,4 +939,4 @@
+ 
+ #>+ 11
 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp  
 -	@echo 'creating kdesktop_la.all_cpp.cpp ...'; \
 -	rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \
@@ -123,7 +188,7 @@ $NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
 +	@echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \
 +	rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \
-@@ -946,2 +944,14 @@
+ 	for file in minicli.cpp startupid.cpp ; do \
 -	  echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \
 -	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \
 +	  echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \
@@ -133,36 +198,68 @@ $NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
 +	rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files
 +
 +#>+ 11
-+libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc   xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc 
++libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc $(srcdir)/KDesktopIface_skel.cc $(srcdir)/KScreensaverIface_skel.cc $(srcdir)/KBackgroundIface_skel.cc $(srcdir)/libkdesktop_main_la_meta_unload.cc   xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc 
 +	@echo 'creating libkdesktop_main_la.all_cc.cc ...'; \
 +	rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \
 +	for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \
 +	  echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \
-@@ -949,2 +959,2 @@
+ 	done; \
 -	cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files  > kdesktop_la.all_cpp.cpp; \
 -	rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files
 +	cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files  > libkdesktop_main_la.all_cc.cc; \
 +	rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files
-@@ -953 +963 @@
+ 
+ #>+ 11
 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc   xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc 
-+kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in kdesktop_main.cc  
-@@ -957 +967 @@
++kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc  
+ 	@echo 'creating kdesktop_la.all_cc.cc ...'; \
+ 	rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \
 -	for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \
 +	for file in kdesktop_main.cc ; do \
-@@ -965 +975 @@
+ 	  echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \
+ 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \
+ 	done; \
+@@ -962,11 +971,11 @@
+ 	rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files
+ 
+ #>+ 11
 -kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc  
-+kdesktop.all_cc.cc: $(srcdir)/Makefile.in kdesktop_main.cc  
-@@ -969 +979 @@
++kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc  
+ 	@echo 'creating kdesktop.all_cc.cc ...'; \
+ 	rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \
 -	for file in dummy.cc ; do \
 +	for file in kdesktop_main.cc ; do \
-@@ -990 +1000 @@
+ 	  echo "#include \"$$file\"" >> kdesktop.all_cc.files; \
+ 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \
+ 	done; \
+@@ -974,7 +983,7 @@
+ 	rm -f kdesktop.all_cc.final kdesktop.all_cc.files
+ 
+ #>+ 11
+-kdmdesktop.all_cc.cc: $(srcdir)/Makefile.in kdmdesktop_meta_unload.cc  
++kdmdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdmdesktop_meta_unload.cc  
+ 	@echo 'creating kdmdesktop.all_cc.cc ...'; \
+ 	rm -f kdmdesktop.all_cc.files kdmdesktop.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kdmdesktop.all_cc.final; \
+@@ -987,14 +996,14 @@
+ 
+ #>+ 3
+ clean-final:
 -	-rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cc.cc
 +	-rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cc.cc
-@@ -994 +1004 @@
+ 
+ #>+ 2
+ final:
 -	$(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am
 +	$(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am
-@@ -997 +1007 @@
+ #>+ 2
+ no-final:
 -	$(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am
 +	$(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am
+ #>+ 3
+ cvs-clean:
+ 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
diff --git a/x11/kdebase2/patches/patch-bp b/x11/kdebase2/patches/patch-bp
index 50ddc6ed177..a202f8c2d74 100644
--- a/x11/kdebase2/patches/patch-bp
+++ b/x11/kdebase2/patches/patch-bp
@@ -1,8 +1,8 @@
-$NetBSD: patch-bp,v 1.2 2001/10/18 08:17:49 skrll Exp $
+$NetBSD: patch-bp,v 1.3 2001/10/18 15:43:11 skrll Exp $
 
 --- kicker/Makefile.am.orig	Sat Jun  2 19:01:03 2001
 +++ kicker/Makefile.am
-@@ -3,7 +3,7 @@
+@@ -3,16 +3,20 @@
  SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data
  
  bin_PROGRAMS = kicker
@@ -11,16 +11,19 @@ $NetBSD: patch-bp,v 1.2 2001/10/18 08:17:49 skrll Exp $
  
  CLEANFILES = dummy.cpp
  
-@@ -11,7 +11,11 @@
- kicker_la_SOURCES = dummy.cpp
+ kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
+-kicker_la_SOURCES = dummy.cpp
++kicker_la_SOURCES = kicker_main.cpp
  kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
  
 -kicker_LDADD = kicker.la
+-kicker_SOURCES = dummy.cpp
 +libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
 +libkicker_la_SOURCES = dummy.cpp
 +libkicker_la_LDFLAGS = $(KDE_PLUGIN)
 +
 +kicker_LDADD = libkicker.la
- kicker_SOURCES = dummy.cpp
++kicker_SOURCES = kicker_main.cpp
  kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
+ autostart_DATA = panel.desktop
diff --git a/x11/kdebase2/patches/patch-bq b/x11/kdebase2/patches/patch-bq
index c97dfb0c214..2d8b10bb323 100644
--- a/x11/kdebase2/patches/patch-bq
+++ b/x11/kdebase2/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.2 2001/10/18 08:17:49 skrll Exp $
+$NetBSD: patch-bq,v 1.3 2001/10/18 15:43:11 skrll Exp $
 
 --- kicker/Makefile.in.orig	Sat Sep  8 01:36:32 2001
 +++ kicker/Makefile.in
@@ -13,7 +13,7 @@ $NetBSD: patch-bq,v 1.2 2001/10/18 08:17:49 skrll Exp $
  
  bindir = @bindir@
  sbindir = @sbindir@
-@@ -276,7 +271,7 @@
+@@ -276,16 +271,20 @@
  SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data
  
  bin_PROGRAMS = kicker
@@ -22,19 +22,22 @@ $NetBSD: patch-bq,v 1.2 2001/10/18 08:17:49 skrll Exp $
  
  CLEANFILES = dummy.cpp
  
-@@ -284,7 +279,11 @@
- kicker_la_SOURCES = dummy.cpp
+ kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
+-kicker_la_SOURCES = dummy.cpp
++kicker_la_SOURCES = kicker_main.cpp
  kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
  
 -kicker_LDADD = kicker.la
+-kicker_SOURCES = dummy.cpp
 +libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
 +libkicker_la_SOURCES = dummy.cpp
 +libkicker_la_LDFLAGS = $(KDE_PLUGIN)
 +
 +kicker_LDADD = libkicker.la
- kicker_SOURCES = dummy.cpp
++kicker_SOURCES = kicker_main.cpp
  kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
+ autostart_DATA = panel.desktop
 @@ -304,54 +303,37 @@
  X_LIBS = @X_LIBS@
  kicker_la_DEPENDENCIES =  share/libkicker_share.la \
@@ -42,7 +45,7 @@ $NetBSD: patch-bq,v 1.2 2001/10/18 08:17:49 skrll Exp $
 -#>- kicker_la_OBJECTS =  dummy.lo
 -#>+ 1
 -kicker_la_OBJECTS = dummy.lo
-+kicker_la_OBJECTS =  dummy.lo
++kicker_la_OBJECTS =  kicker_main.lo
 +libkicker_la_DEPENDENCIES =  share/libkicker_share.la \
 +core/libkicker_core.la ui/libkicker_ui.la
 +libkicker_la_OBJECTS =  dummy.lo
@@ -53,7 +56,7 @@ $NetBSD: patch-bq,v 1.2 2001/10/18 08:17:49 skrll Exp $
 -#>+ 1
 -kicker_OBJECTS = dummy.$(OBJEXT)
 -kicker_DEPENDENCIES =  kicker.la
-+kicker_OBJECTS =  dummy.$(OBJEXT)
++kicker_OBJECTS =  kicker_main.$(OBJEXT)
 +kicker_DEPENDENCIES =  libkicker.la
  CXXFLAGS = @CXXFLAGS@
 -#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff --git a/x11/kdebase2/patches/patch-ez b/x11/kdebase2/patches/patch-ez
new file mode 100644
index 00000000000..16fb505b3ab
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ez
@@ -0,0 +1,33 @@
+$NetBSD: patch-ez,v 1.1 2001/10/18 15:43:11 skrll Exp $
+
+--- kicker/kicker_main.cpp.orig	Thu Oct 18 16:16:52 2001
++++ kicker/kicker_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 kicker_main(int, char **);
++
++int main( int argc, char* argv[] )
++{
++	return kicker_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-fa b/x11/kdebase2/patches/patch-fa
new file mode 100644
index 00000000000..f501df32891
--- /dev/null
+++ b/x11/kdebase2/patches/patch-fa
@@ -0,0 +1,13 @@
+$NetBSD: patch-fa,v 1.1 2001/10/18 15:43:11 skrll Exp $
+
+--- kicker/core/main.cpp.orig	Fri Aug  3 21:14:29 2001
++++ kicker/core/main.cpp
+@@ -122,7 +122,7 @@
+     QApplication::exit();
+ }
+ 
+-int main( int argc, char ** argv )
++int kicker_main( int argc, char ** argv )
+ {
+     {
+         QCString multiHead = getenv("KDE_MULTIHEAD");