Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or

1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely.
author: skrll <skrll@pkgsrc.org> 2003-01-02 09:12:19 +0000
committer: skrll <skrll@pkgsrc.org> 2003-01-02 09:12:19 +0000
commit: 42861251c282c37bda020c5e0ae0940c0461f7a9 (patch)
tree: 1ab9a94a1fd0409896e232322846793727e9e77a /x11/kdelibs3
parent: 89fcd02fac594d7b0f01bd59d1a6f1508ec74be2 (diff)
download: pkgsrc-42861251c282c37bda020c5e0ae0940c0461f7a9.tar.gz
17 files changed, 935 insertions, 926 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 2599a8c002e..a97159fe880 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2002/12/24 06:10:33 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/02 09:12:38 skrll Exp $
 
-DISTNAME=	kdelibs-3.0.4
-PKGREVISION=	2
+DISTNAME=	kdelibs-3.0.5a
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index 391bc2c670a..40a27eec1b4 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.9 2002/12/24 06:10:33 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/01/02 09:12:38 skrll Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdelibs3
 BUILDLINK_PKGBASE.kdelibs3?=	kdelibs
-BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.4nb2
+BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.5.1
 BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index bc8e1a13b52..b85250bde25 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,59 +1,54 @@
-$NetBSD: distinfo,v 1.11 2002/12/06 11:00:30 skrll Exp $
+$NetBSD: distinfo,v 1.12 2003/01/02 09:12:38 skrll Exp $
 
-SHA1 (kdelibs-3.0.4.tar.bz2) = f75bd9b813ccb688877aba4fa78c22747e8f3039
-Size (kdelibs-3.0.4.tar.bz2) = 7643484 bytes
+SHA1 (kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad
+Size (kdelibs-3.0.5a.tar.bz2) = 7647507 bytes
 SHA1 (patch-aa) = dc26c7d5f845e881d313745b25ef9e90ead5707f
-SHA1 (patch-ab) = d4f9efbd17df2ee9a5e6cbd1830e343f1b0a8abe
+SHA1 (patch-ab) = 526a52e39d4ce89b875383b8d9b8574a2494715b
 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e
 SHA1 (patch-ad) = 60557b5cd8381a5e23a50d90561ff7ca8a552813
 SHA1 (patch-ae) = 98b5adaab83f292d0b0b8e0363798e5de7b8aa8c
 SHA1 (patch-af) = ea4e54130fa31f3c1036e050503f68734106f4be
-SHA1 (patch-ag) = 46ca6e3ef08694d4214df93dcc15141060150e9e
+SHA1 (patch-ag) = 8d783e53c168dc035c79646e30f3757c0954d589
 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd
 SHA1 (patch-ai) = b64ba773ca70375ed2c850b61f6f039614aff8e7
 SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3
-SHA1 (patch-ak) = 7b98398973ffe5ce7b87ed05400cda017986f55d
+SHA1 (patch-ak) = 2f83b7bbdc0b54c48ef97532e2c3577edd66b3fe
 SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901
 SHA1 (patch-am) = 504d05365a43ad4b05d60195f4ff4e7d1e26e069
 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab
 SHA1 (patch-ao) = 45b265d56e6d793e53dc06237162652903c9423d
-SHA1 (patch-ap) = f4daca020a0d7a7214afe6ae617a216c9b77b8ca
+SHA1 (patch-ap) = 360978cb8119a6e1c554e46ad5fcbf01a00f2685
 SHA1 (patch-aq) = 802405c2384f3fdaa7f4085dca002d2f879c32fe
 SHA1 (patch-ar) = 54990b359e3b50eb96673c30a7326c55f2a322eb
 SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988
 SHA1 (patch-at) = 1f78c48ad6b73882b4ee74900b8312c297b4bdaa
 SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1
-SHA1 (patch-av) = 5fdc6ab612c19add19da554d75780ef5133f53c7
+SHA1 (patch-av) = 4281c59ff129748c6cb8565157d9babd1067799f
 SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620
 SHA1 (patch-ax) = fc9bf7709741c08a0853c6e81c7a2b425d01dbd3
 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0
 SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61
-SHA1 (patch-ba) = d834df468158dee2c4787e0602583d5019708197
+SHA1 (patch-ba) = 219351243956e93f3601641e0c88938270e63599
 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 53f6f18a93296b05f3a7f51152b37ba98c93ff2c
 SHA1 (patch-be) = 55db94a53b4a5ef10b3294b468c2844a84926d5b
 SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6
 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7
-SHA1 (patch-bh) = 92ac4dd4d340a0dd962d577300895511ea439029
+SHA1 (patch-bh) = 6fafdedc00aaa70e7a32be6ae4d0e0d8dc1ce60e
 SHA1 (patch-bi) = fbfe9a8fb2d1be40c03beebce1bfde20f3b9f9f7
 SHA1 (patch-bj) = 36f1e6e2b4dc8be210d7e1cd8e0f80bec08f6a93
 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb
 SHA1 (patch-bl) = 9d4fbc90cb5a638739c3748fbedf74707e96d342
 SHA1 (patch-bm) = 3d9cc7de58f13aa55a5035153174a73aad082ff3
-SHA1 (patch-bn) = 9525a052f60249ebfe2b5d425099e95c0ddea358
+SHA1 (patch-bn) = 7f6d0faf310ae168a44821dabb948f210694f123
 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20
 SHA1 (patch-bp) = f63f0d5bbcf632bc11d28c8cf8034ec9549cd8e2
 SHA1 (patch-bq) = f2aaa203c1c2b968530ea0e2b1c0d2767769093b
-SHA1 (patch-br) = bb136610f11bfb441126af7de05a2f625532ec9f
+SHA1 (patch-br) = e89409ec2cbb7a2b567f85f2de9f8a7a14469c3b
 SHA1 (patch-bs) = 97857ea3a7f43ce73b327e2a2fe10a0e4a5ce1c8
 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = d4c53ba2add053db87a8d382080535ce1c536cbb
-SHA1 (patch-bw) = 246c7123c8ec52944bd99cab1ec8b1226435f5e0
-SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019
-SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6
 SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51
 SHA1 (patch-cb) = 5666c768eb8d56cc1fd67e704153cfc152337f3b
-SHA1 (patch-cc) = 332ce2a57ed979d3a341f9e83a376e9e21dab6fe
-SHA1 (patch-cd) = 14fb38c90a6607a11d8d0b6ab1d71f8019af41f1
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab
index d66a06b3a4a..546117db720 100644
--- a/x11/kdelibs3/patches/patch-ab
+++ b/x11/kdelibs3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
 
---- arts/knotify/Makefile.in.orig	Tue May 21 15:42:03 2002
+--- arts/knotify/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ arts/knotify/Makefile.in
-@@ -267,17 +267,22 @@
+@@ -267,17 +267,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
  
  ####### Files
  bin_PROGRAMS = knotify
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
  knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  check_PROGRAMS = knotifytest
-@@ -295,24 +300,29 @@
+@@ -295,23 +300,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -45,15 +45,13 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
 +libknotify_main_la_DEPENDENCIES =
 +am_libknotify_main_la_OBJECTS = knotify.lo
 +#>- libknotify_main_la_OBJECTS = $(am_libknotify_main_la_OBJECTS)
- #>+ 5
+ #>+ 4
 -knotify_la_final_OBJECTS = knotify_la.all_cpp.lo 
--knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \
--	knotify_la_meta_unload.lo 
+-knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.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 
++libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.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)
  bin_PROGRAMS = knotify$(EXEEXT)
@@ -71,18 +69,27 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
  am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
  #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
  #>+ 1
-@@ -325,8 +335,8 @@
+@@ -324,13 +334,13 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/knotifytest.Po
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/knotifytest.Po
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po
+ #>+ 5
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/knotify_skel.P  $(DEPDIR)/knotify_la.all_cpp.P  $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/knotifytest.Po
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/knotify_skel.P  $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/knotifytest.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/knotify_skel.P  $(DEPDIR)/libknotify_main_la.all_cpp.P  $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/knotify_skel.P  $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
-@@ -346,14 +356,14 @@
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -351,14 +361,14 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -100,7 +107,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -402,6 +412,8 @@
+@@ -407,6 +417,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
@@ -109,7 +116,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -442,8 +454,9 @@
+@@ -447,8 +459,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -120,16 +127,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotifytest.Po@am__quote@
  
  distclean-depend:
-@@ -520,7 +533,7 @@
- 
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=README.knotify_and_arts knotify.desktop 
-+KDE_DIST=knotify.desktop README.knotify_and_arts 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -639,13 +652,14 @@
+@@ -644,13 +657,14 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  messages:
  	$(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
@@ -145,9 +143,9 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
 +	$(MOC) $(srcdir)/knotify.h -o knotify.moc
 +
  #>+ 5
- knotify.kidl: $(srcdir)/knotify.h $(DCOPIDL_DEPENDENCIES)
+ knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES)
  	$(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false )
-@@ -658,7 +672,7 @@
+@@ -663,7 +677,7 @@ knotify.moc: $(srcdir)/knotify.h
  
  #>+ 3
  clean-metasources:
@@ -156,79 +154,33 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
  
  #>+ 4
  clean-idl:
-@@ -676,28 +690,28 @@
- 
- 
- #>+ 12
--knotify_la_meta_unload.cpp:  knotify.moc
--	@echo 'creating knotify_la_meta_unload.cpp'
--	@-rm -f 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
- 	@if test ${kde_qtver} = 2; then \
--		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 ;\
--	else echo > knotify_la_meta_unload.cpp; fi
-+		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 ;\
-+	else echo > libknotify_main_la_meta_unload.cpp; fi
+@@ -681,33 +695,33 @@ force-reedit:
  
  
- #>+ 3
- clean-moc-classes:
--	-rm -f  knotify_la_meta_unload.cpp
-+	-rm -f  libknotify_main_la_meta_unload.cpp
- 
- #>+ 11
--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 
- 	@echo 'creating knotify_la.all_cpp.cpp ...'; \
- 	rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \
--	for file in knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp ; do \
-+	for file in knotify_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \
- 	done; \
-@@ -705,11 +719,23 @@
- 	rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files
- 
  #>+ 11
--knotify.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp   knotify.moc 
+-knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp  knotify.moc
+-	@echo 'creating knotify_la.all_cpp.cpp ...'; \
+-	rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \
++libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.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 \
+ 	for file in knotify.cpp knotify_skel.cpp ; do \
+-	  echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \
 +	  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
-+
-+#>+ 11
-+knotify.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp  
- 	@echo 'creating knotify.all_cpp.cpp ...'; \
- 	rm -f knotify.all_cpp.files knotify.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> knotify.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in knotify_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> knotify.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify.all_cpp.final; \
  	done; \
-@@ -730,20 +756,20 @@
+-	cat knotify_la.all_cpp.final knotify_la.all_cpp.files > knotify_la.all_cpp.cpp; \
+-	rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files
++	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
  
  #>+ 3
  clean-final:
--	-rm -f knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp
-+	-rm -f knotify_la.all_cpp.cpp libknotify_main_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp
+-	-rm -f knotify_la.all_cpp.cpp
++	-rm -f libknotify_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -248,10 +200,12 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
 +	$(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -753,4 +779,4 @@
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -717,5 +731,5 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
- #>+ 2
--$(srcdir)/knotify.cpp: knotify.moc 
-+$(srcdir)/knotify.cpp: knotify.moc knotify.moc 
+ #>+ 3
+-knotify.o: knotify.moc 
+-knotify.lo: knotify.moc 
++knotify.lo: knotify.moc knotify.moc 
++knotify.o: knotify.moc knotify.moc 
diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag
index 99269840d45..63e62042edc 100644
--- a/x11/kdelibs3/patches/patch-ag
+++ b/x11/kdelibs3/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- dcop/Makefile.in.orig	Tue May 21 15:42:04 2002
+--- dcop/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ dcop/Makefile.in
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ INCLUDES = $(all_includes)
  bin_PROGRAMS = dcopserver dcopserver_shutdown
  check_PROGRAMS = testdcop testdcopc
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries)
  
-@@ -307,13 +307,17 @@
+@@ -307,13 +307,17 @@ noinst_HEADERS = version.h dcopglobal.h 
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -332,14 +336,11 @@
+@@ -332,14 +336,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la
  am_libDCOP_la_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo \
  	dcopref.lo
-@@ -350,15 +351,23 @@
+@@ -350,15 +351,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo
  	dcopref.lo
  @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
@@ -79,21 +79,44 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT)
  #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS)
  #>+ 1
-@@ -389,10 +398,11 @@
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/dcopserver.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_shutdown.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/testdcopc.Po
-+	@AMDEP_TRUE@	$(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
+@@ -389,25 +398,28 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
+ #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/dcopserver.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/dcopserver_shutdown.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/testdcopc.Po
+-#>+ 15
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P  $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
++#>+ 17
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/libdcopserver_main_la.all_cpp.P  $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_shutdown.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/testdcopc.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dcopserver_shutdown.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/testdcopc.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
+ 
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -421,8 +431,9 @@
+@@ -437,8 +449,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
@@ -105,7 +128,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  HEADERS = $(include_HEADERS) $(noinst_HEADERS)
  
  
-@@ -433,7 +444,7 @@
+@@ -449,7 +462,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -114,7 +137,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -487,6 +498,8 @@
+@@ -503,6 +516,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) 
  @KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
  @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
@@ -123,7 +146,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -538,10 +551,11 @@
+@@ -554,10 +569,11 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopobject.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopref.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver.Plo@am__quote@
@@ -136,7 +159,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcop.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcopc.Po@am__quote@
  
-@@ -835,9 +849,6 @@
+@@ -851,22 +867,19 @@ uninstall-info: uninstall-info-recursive
  	uninstall-info-am uninstall-info-recursive \
  	uninstall-libLTLIBRARIES uninstall-recursive
  
@@ -146,26 +169,57 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -882,11 +893,11 @@
+ 
+ #>+ 3
+-dcopclient.moc: $(srcdir)/dcopclient.h
+-	$(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
+-
+-#>+ 3
+ testdcop.moc: $(srcdir)/testdcop.h
+ 	$(MOC) $(srcdir)/testdcop.h -o testdcop.moc
+ 
+ #>+ 3
++dcopclient.moc: $(srcdir)/dcopclient.h
++	$(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
++
++#>+ 3
+ dcopserver.moc: $(srcdir)/dcopserver.h
+ 	$(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc
+ 
+@@ -881,7 +894,7 @@ libDCOP.la.closure: $(libDCOP_la_OBJECTS
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  dcopclient.moc testdcop.moc dcopserver.moc
++	-rm -f  testdcop.moc dcopclient.moc dcopserver.moc
+ 
+ #>+ 3
+ clean-closures:
+@@ -898,18 +911,6 @@ force-reedit:
  
  
  #>+ 11
--dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp   testdcop.moc dcopclient.moc dcopserver.moc 
-+dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp   testdcop.moc dcopclient.moc dcopserver.moc 
- 	@echo 'creating dcopserver_la.all_cpp.cpp ...'; \
- 	rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \
+-dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  dcopserver.moc
+-	@echo 'creating dcopserver_la.all_cpp.cpp ...'; \
+-	rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \
 -	for file in dcopserver.cpp dcopsignals.cpp ; do \
-+	for file in dcopserver_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \
- 	done; \
-@@ -906,11 +917,23 @@
+-	  echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \
+-	done; \
+-	cat dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files > dcopserver_la.all_cpp.cpp; \
+-	rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files
+-
+-#>+ 11
+ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopclient.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopref.cpp  dcopclient.moc
+ 	@echo 'creating libDCOP_la.all_cpp.cpp ...'; \
+ 	rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \
+@@ -921,22 +922,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi
+ 	cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \
  	rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files
  
- #>+ 11
--dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  
++#>+ 11
++libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  dcopserver.moc
 +	@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; \
@@ -173,25 +227,13 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
 +	  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; \
++	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.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp  
- 	@echo 'creating dcopserver.all_cpp.cpp ...'; \
- 	rm -f dcopserver.all_cpp.files dcopserver.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> dcopserver.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in dcopserver_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> dcopserver.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver.all_cpp.final; \
- 	done; \
-@@ -931,20 +954,20 @@
- 
  #>+ 3
  clean-final:
--	-rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp
-+	-rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp
+-	-rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp
++	-rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -211,4 +253,17 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
 +	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -946,9 +959,9 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 7
+-dcopserver.o: dcopserver.moc 
+-testdcop.lo: testdcop.moc 
+-testdcop.o: testdcop.moc 
+ dcopclient.lo: dcopclient.moc 
++testdcop.lo: testdcop.moc 
++dcopserver.o: dcopserver.moc 
+ dcopclient.o: dcopclient.moc 
++testdcop.o: testdcop.moc 
+ dcopserver.lo: dcopserver.moc 
diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak
index 5f7057f8f1a..bf3beec2331 100644
--- a/x11/kdelibs3/patches/patch-ak
+++ b/x11/kdelibs3/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
+$NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- kconf_update/Makefile.in.orig	Tue May 21 15:42:05 2002
+--- kconf_update/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kconf_update/Makefile.in
-@@ -282,16 +282,20 @@
+@@ -282,16 +282,20 @@ x_libraries = @x_libraries@
  
  INCLUDES = $(all_includes)
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  #>- METASOURCES = AUTO
  subdir = kconf_update
-@@ -300,19 +304,24 @@
+@@ -300,19 +304,24 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -59,18 +59,24 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -320,7 +329,9 @@
+@@ -320,9 +329,13 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Po
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo
+-#>+ 2
+-@AMDEP_TRUE@DEP_FILES =   $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Po
++#>+ 4
++@AMDEP_TRUE@DEP_FILES =   $(DEPDIR)/kconf_update.Plo \
++@AMDEP_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Plo \
++@AMDEP_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kconf_update_main.Po
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
-@@ -340,9 +351,10 @@
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -343,9 +356,10 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -83,7 +89,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -391,6 +403,8 @@
+@@ -394,6 +408,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS)
@@ -92,7 +98,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -425,8 +439,9 @@
+@@ -428,8 +444,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -103,7 +109,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  distclean-depend:
  	-rm -rf $(DEPDIR)
-@@ -602,9 +617,6 @@
+@@ -602,9 +619,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  # Internal
  # noinst_HEADERS = kconf_update.h
@@ -113,52 +119,3 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -620,11 +632,11 @@
- 
- 
- #>+ 11
--kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp  
-+kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp  
- 	@echo 'creating kconf_update_la.all_cpp.cpp ...'; \
- 	rm -f kconf_update_la.all_cpp.files kconf_update_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kconf_update_la.all_cpp.final; \
--	for file in kconf_update.cpp ; do \
-+	for file in kconf_update_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kconf_update_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update_la.all_cpp.final; \
- 	done; \
-@@ -632,11 +644,23 @@
- 	rm -f kconf_update_la.all_cpp.final kconf_update_la.all_cpp.files
- 
- #>+ 11
--kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.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.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp  
- 	@echo 'creating kconf_update.all_cpp.cpp ...'; \
- 	rm -f kconf_update.all_cpp.files kconf_update.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kconf_update.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kconf_update_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kconf_update.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update.all_cpp.final; \
- 	done; \
-@@ -645,7 +669,7 @@
- 
- #>+ 3
- clean-final:
--	-rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp
-+	-rm -f kconf_update_la.all_cpp.cpp libkconf_update_main_la.all_cpp.cpp kconf_update.all_cpp.cpp
- 
- #>+ 2
- final:
diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap
index 41bfd19f9d6..825018aea33 100644
--- a/x11/kdelibs3/patches/patch-ap
+++ b/x11/kdelibs3/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
+$NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- kded/Makefile.in.orig	Tue May 21 15:42:06 2002
+--- kded/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kded/Makefile.in
-@@ -283,18 +283,22 @@
+@@ -283,18 +283,22 @@ x_libraries = @x_libraries@
  
  INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
  
@@ -15,8 +15,8 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
 +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
+ 			kbuildservicefactory.cpp \
+ 			kbuildservicegroupfactory.cpp kdedmodule.cpp
  
  
 -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -29,11 +29,11 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
 +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 \
-@@ -302,15 +306,19 @@
- 	kctimefactory.cpp
+ 				kbuildservicefactory.cpp \
+ 				kbuildservicegroupfactory.cpp \
+ 				kbuildimageiofactory.cpp \
+@@ -302,15 +306,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c
+ 				kctimefactory.cpp
  
  
 +kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -56,7 +56,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  
  kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  kdontchangethehostname_LDADD = $(LIB_KDECORE)
-@@ -337,48 +345,58 @@
+@@ -337,46 +345,56 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -81,13 +81,12 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
 +	kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
 +	kbuildprotocolinfofactory.lo kctimefactory.lo
 +#>- libkbuildsycoca_main_la_OBJECTS = $(am_libkbuildsycoca_main_la_OBJECTS)
- #>+ 8
+ #>+ 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 
+-	kctimefactory.lo
 -@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS)
 -kded_la_DEPENDENCIES =
@@ -96,8 +95,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
 +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 
++	kbuildprotocolinfofactory.lo kctimefactory.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)
 +libkded_main_la_DEPENDENCIES =
@@ -106,17 +104,15 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  	kdedmodule.lo
 -#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS)
 +#>- libkded_main_la_OBJECTS = $(am_libkded_main_la_OBJECTS)
- #>+ 7
+ #>+ 6
 -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 \
  	kbuildservicefactory.lo kbuildservicegroupfactory.lo \
- 	kdedmodule.lo \
--	kded_la_meta_unload.lo 
+ 	kdedmodule.lo
 -@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_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)
  bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \
@@ -142,26 +138,54 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
  #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS)
  #>+ 1
-@@ -391,14 +409,16 @@
+@@ -389,33 +407,39 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/kbuildimageiofactory.Plo \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbuildprotocolinfofactory.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicefactory.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicegroupfactory.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicetypefactory.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/kbuildimageiofactory.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbuildprotocolinfofactory.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbuildservicefactory.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbuildservicegroupfactory.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbuildservicetypefactory.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po
+-#>+ 19
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P  $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildimageiofactory.Plo \
++#>+ 23
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkbuildsycoca_main_la.all_cpp.P $(DEPDIR)/libkded_main_la.all_cpp.P  $(DEPDIR)/kbuildimageiofactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildprotocolinfofactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicefactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicegroupfactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicetypefactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildimageiofactory.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/kbuildimageiofactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildprotocolinfofactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicefactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicegroupfactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildservicetypefactory.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbuildsycoca_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -420,6 +440,7 @@
+@@ -438,6 +462,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
@@ -169,7 +193,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  	$(kbuildsycoca_SOURCES) $(kded_SOURCES) \
  	$(kdontchangethehostname_SOURCES)
  DATA = $(servicetype_DATA) $(update_DATA)
-@@ -428,7 +449,7 @@
+@@ -446,7 +471,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE
  
  DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -178,7 +202,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -479,6 +500,10 @@
+@@ -497,6 +522,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC
  	$(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
  kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
@@ -189,7 +213,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -519,15 +544,18 @@
+@@ -537,15 +566,18 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -209,16 +233,16 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdedmodule.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khostname.Po@am__quote@
  
-@@ -639,7 +667,7 @@
+@@ -657,7 +689,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.upd kded.h kctimefactory.h 
+-KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h 
 +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kded.upd kctimefactory.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -758,9 +786,6 @@
+@@ -776,9 +808,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-info-am uninstall-libLTLIBRARIES \
  	uninstall-servicetypeDATA uninstall-updateDATA
  
@@ -228,141 +252,53 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -792,41 +817,41 @@
- 
- 
- #>+ 12
--kbuildsycoca_la_meta_unload.cpp:  kbuildsycoca.moc
--	@echo 'creating kbuildsycoca_la_meta_unload.cpp'
--	@-rm -f 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
- 	@if test ${kde_qtver} = 2; then \
--		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 ;\
--	else echo > kbuildsycoca_la_meta_unload.cpp; fi
-+		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 ;\
-+	else echo > libkbuildsycoca_main_la_meta_unload.cpp; fi
- 
- 
- #>+ 12
--kded_la_meta_unload.cpp:  kded.moc kdedmodule.moc
--	@echo 'creating kded_la_meta_unload.cpp'
--	@-rm -f 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
- 	@if test ${kde_qtver} = 2; then \
--		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 ;\
--	else echo > kded_la_meta_unload.cpp; fi
-+		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 ;\
-+	else echo > libkded_main_la_meta_unload.cpp; fi
- 
- 
- #>+ 3
- clean-moc-classes:
--	-rm -f  kbuildsycoca_la_meta_unload.cpp kded_la_meta_unload.cpp
-+	-rm -f  libkbuildsycoca_main_la_meta_unload.cpp libkded_main_la_meta_unload.cpp
- 
- #>+ 11
--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   kded.moc kdedmodule.moc kbuildsycoca.moc 
-+kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp   kded.moc kdedmodule.moc kbuildsycoca.moc 
- 	@echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \
- 	rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \
--	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 \
- 	  echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \
- 	done; \
-@@ -834,11 +859,11 @@
- 	rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files
+@@ -810,45 +839,45 @@ force-reedit:
  
- #>+ 11
--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_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp  
- 	@echo 'creating kded_la.all_cpp.cpp ...'; \
- 	rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \
--	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 \
- 	  echo "#include \"$$file\"" >> kded_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \
- 	done; \
-@@ -846,11 +871,35 @@
- 	rm -f kded_la.all_cpp.final kded_la.all_cpp.files
  
  #>+ 11
--kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.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  
+-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.moc
+-	@echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \
+-	rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \
++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  kbuildsycoca.moc
 +	@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 \
+ 	for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp ; do \
+-	  echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \
 +	  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; \
+ 	done; \
+-	cat kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files > kbuildsycoca_la.all_cpp.cpp; \
+-	rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files
++	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
-+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  
+ 
+ #>+ 11
+-kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp  kded.moc kdedmodule.moc
+-	@echo 'creating kded_la.all_cpp.cpp ...'; \
+-	rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \
++libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp  kded.moc kdedmodule.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 \
+ 	for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp ; do \
+-	  echo "#include \"$$file\"" >> kded_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \
 +	  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
-+
-+#>+ 11
-+kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp  
- 	@echo 'creating kbuildsycoca.all_cpp.cpp ...'; \
- 	rm -f kbuildsycoca.all_cpp.files kbuildsycoca.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kbuildsycoca.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kbuildsycoca_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kbuildsycoca.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca.all_cpp.final; \
- 	done; \
-@@ -858,11 +907,11 @@
- 	rm -f kbuildsycoca.all_cpp.final kbuildsycoca.all_cpp.files
- 
- #>+ 11
--kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp  
- 	@echo 'creating kded.all_cpp.cpp ...'; \
- 	rm -f kded.all_cpp.files kded.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kded.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kded_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kded.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded.all_cpp.final; \
  	done; \
-@@ -883,20 +932,20 @@
+-	cat kded_la.all_cpp.final kded_la.all_cpp.files > kded_la.all_cpp.cpp; \
+-	rm -f kded_la.all_cpp.final kded_la.all_cpp.files
++	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
  
  #>+ 3
  clean-final:
--	-rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp
-+	-rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp
+-	-rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp
++	-rm -f libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -382,4 +318,16 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
 +	$(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -859,8 +888,8 @@ kde-rpo-clean:
+ 
+ #>+ 7
+ kbuildsycoca.lo: kbuildsycoca.moc 
+-kbuildsycoca.o: kbuildsycoca.moc 
+-kded.lo: kded.moc 
+-kdedmodule.lo: kdedmodule.moc 
+ kded.o: kded.moc 
++kded.lo: kded.moc 
+ kdedmodule.o: kdedmodule.moc 
++kbuildsycoca.o: kbuildsycoca.moc 
++kdedmodule.lo: kdedmodule.moc 
diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av
index 2afd69910e7..3bb829ea04c 100644
--- a/x11/kdelibs3/patches/patch-av
+++ b/x11/kdelibs3/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
+$NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- kdeprint/management/Makefile.in.orig	Tue May 21 15:42:07 2002
+--- kdeprint/management/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kdeprint/management/Makefile.in
-@@ -264,15 +264,19 @@
+@@ -264,15 +264,19 @@ x_libraries = @x_libraries@
  
  INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
  
@@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
  
  libkdeprint_management_la_SOURCES = \
-@@ -317,11 +321,18 @@
+@@ -317,11 +321,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -43,13 +43,13 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
 +libkaddprinterwizard_main_la_DEPENDENCIES = libkdeprint_management.la
 +am_libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo
 +#>- libkaddprinterwizard_main_la_OBJECTS = \
-+#>- $(am_libkaddprinterwizard_main_la_OBJECTS)
++#>- 	$(am_libkaddprinterwizard_main_la_OBJECTS)
 +#>+ 1
 +libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo
  libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
  am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
  	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
-@@ -365,11 +376,11 @@
+@@ -364,11 +375,11 @@ libkdeprint_management_la_nofinal_OBJECT
  bin_PROGRAMS = kaddprinterwizard$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -64,20 +64,48 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -377,9 +388,10 @@
+@@ -376,9 +387,10 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/jobitem.Plo \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/kiconselectaction.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kmconfigcommand.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kmconfigdialog.Plo \
-@@ -437,6 +449,7 @@
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/jobitem.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kiconselectaction.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kmconfigcommand.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kmconfigdialog.Plo \
+@@ -416,10 +428,11 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kxmlcommandselector.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/pluginaction.Plo $(DEPDIR)/sidepixmap.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/smbview.Plo
+-#>+ 81
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkdeprint_management_la.all_cpp.P  $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/jobitem.Plo \
++#>+ 83
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkdeprint_management_la.all_cpp.P  $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kiconselectaction.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kmconfigcommand.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kmconfigdialog.Plo \
+@@ -457,9 +470,10 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kxmlcommandselector.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/pluginaction.Plo $(DEPDIR)/sidepixmap.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/smbview.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/jobitem.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kaddprinterwizard_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kiconselectaction.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kmconfigcommand.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kmconfigdialog.Plo \
+@@ -518,6 +532,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
@@ -85,7 +113,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  	$(libkdeprint_management_la_SOURCES) \
  	$(kaddprinterwizard_SOURCES)
  DATA = $(dataicon_DATA)
-@@ -445,7 +458,7 @@
+@@ -526,7 +541,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
  
  DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -94,7 +122,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -494,6 +507,8 @@
+@@ -575,6 +590,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
@@ -103,7 +131,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
  #>+ 2
  @KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
-@@ -534,9 +549,10 @@
+@@ -615,9 +632,10 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cjanuswidget.Plo@am__quote@
@@ -115,7 +143,16 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kiconselectaction.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmconfigcommand.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmconfigdialog.Plo@am__quote@
-@@ -797,9 +813,6 @@
+@@ -761,7 +779,7 @@ distclean-tags:
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=tileup.png tiledown.png side.png 
++KDE_DIST=side.png tiledown.png tileup.png 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -878,9 +896,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-dataiconDATA uninstall-info-am \
  	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
  
@@ -125,59 +162,337 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -981,11 +994,11 @@
- 	-rm -f  libkdeprint_management_la_meta_unload.cpp
+@@ -895,140 +910,140 @@ libkdeprint_management.la.closure: $(lib
  
- #>+ 11
--kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp  
-+kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp  
- 	@echo 'creating kaddprinterwizard_la.all_cpp.cpp ...'; \
- 	rm -f kaddprinterwizard_la.all_cpp.files kaddprinterwizard_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard_la.all_cpp.final; \
--	for file in kaddprinterwizard.cpp ; do \
-+	for file in kaddprinterwizard_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kaddprinterwizard_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard_la.all_cpp.final; \
- 	done; \
-@@ -993,6 +1006,18 @@
- 	rm -f kaddprinterwizard_la.all_cpp.final kaddprinterwizard_la.all_cpp.files
  
- #>+ 11
-+libkaddprinterwizard_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp  
-+	@echo 'creating libkaddprinterwizard_main_la.all_cpp.cpp ...'; \
-+	rm -f libkaddprinterwizard_main_la.all_cpp.files libkaddprinterwizard_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkaddprinterwizard_main_la.all_cpp.final; \
-+	for file in kaddprinterwizard.cpp ; do \
-+	  echo "#include \"$$file\"" >> libkaddprinterwizard_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaddprinterwizard_main_la.all_cpp.final; \
-+	done; \
-+	cat libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files  > libkaddprinterwizard_main_la.all_cpp.cpp; \
-+	rm -f libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files
+ #>+ 3
+-kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
+-	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
++kmmainview.moc: $(srcdir)/kmmainview.h
++	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
+ 
+ #>+ 3
+-kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
+-	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
++kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
++	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
+ 
+ #>+ 3
+-kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
+-	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
++kmconfigpage.moc: $(srcdir)/kmconfigpage.h
++	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
+ 
+ #>+ 3
+-kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
+-	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
++smbview.moc: $(srcdir)/smbview.h
++	$(MOC) $(srcdir)/smbview.h -o smbview.moc
+ 
+ #>+ 3
+-kmwclass.moc: $(srcdir)/kmwclass.h
+-	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
++kmwsmb.moc: $(srcdir)/kmwsmb.h
++	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
+ 
+ #>+ 3
+-kmconfigpage.moc: $(srcdir)/kmconfigpage.h
+-	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
++cjanuswidget.moc: $(srcdir)/cjanuswidget.h
++	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
+ 
+ #>+ 3
+-pluginaction.moc: $(srcdir)/pluginaction.h
+-	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
++kmlistview.moc: $(srcdir)/kmlistview.h
++	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
+ 
+ #>+ 3
+-kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
+-	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
++pluginaction.moc: $(srcdir)/pluginaction.h
++	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
+ 
+ #>+ 3
+-kmwizardpage.moc: $(srcdir)/kmwizardpage.h
+-	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
++kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
++	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
+ 
+ #>+ 3
+-kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
+-	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
++kmwclass.moc: $(srcdir)/kmwclass.h
++	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
+ 
+ #>+ 3
+-kmdbcreator.moc: $(srcdir)/kmdbcreator.h
+-	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
++kminstancepage.moc: $(srcdir)/kminstancepage.h
++	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
+ 
+ #>+ 3
+-kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
+-	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
++kmprinterview.moc: $(srcdir)/kmprinterview.h
++	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
+ 
+ #>+ 3
+-kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
+-	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
++kmiconview.moc: $(srcdir)/kmiconview.h
++	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
+ 
+ #>+ 3
+-kmmainview.moc: $(srcdir)/kmmainview.h
+-	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
++kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
++	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
+ 
+ #>+ 3
+-kmwizard.moc: $(srcdir)/kmwizard.h
+-	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
++kmdbcreator.moc: $(srcdir)/kmdbcreator.h
++	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
+ 
+ #>+ 3
+ kmpropwidget.moc: $(srcdir)/kmpropwidget.h
+ 	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
+ 
+ #>+ 3
+-cjanuswidget.moc: $(srcdir)/cjanuswidget.h
+-	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
+-
+-#>+ 3
+ kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
+ 	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
+ 
+ #>+ 3
+-kminstancepage.moc: $(srcdir)/kminstancepage.h
+-	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
++kmwlocal.moc: $(srcdir)/kmwlocal.h
++	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
+ 
+ #>+ 3
+-kiconselectaction.moc: $(srcdir)/kiconselectaction.h
+-	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
++kmjobviewer.moc: $(srcdir)/kmjobviewer.h
++	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
+ 
+ #>+ 3
+-kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
+-	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
++kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
++	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
+ 
+ #>+ 3
+-kmlistview.moc: $(srcdir)/kmlistview.h
+-	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
++kiconselectaction.moc: $(srcdir)/kiconselectaction.h
++	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
+ 
+ #>+ 3
+-kmwsmb.moc: $(srcdir)/kmwsmb.h
+-	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
++kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
++	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
+ 
+ #>+ 3
+-kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
+-	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
++kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
++	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
+ 
+ #>+ 3
+-kmwlocal.moc: $(srcdir)/kmwlocal.h
+-	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
++kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
++	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
+ 
+ #>+ 3
+-kmprinterview.moc: $(srcdir)/kmprinterview.h
+-	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
++kmpropertypage.moc: $(srcdir)/kmpropertypage.h
++	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
+ 
+ #>+ 3
+-smbview.moc: $(srcdir)/smbview.h
+-	$(MOC) $(srcdir)/smbview.h -o smbview.moc
++kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
++	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
+ 
+ #>+ 3
+-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
++kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
++	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
+ 
+ #>+ 3
+ kmwsocket.moc: $(srcdir)/kmwsocket.h
+ 	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
+ 
+ #>+ 3
+-kmtimer.moc: $(srcdir)/kmtimer.h
+-	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
++kmwizard.moc: $(srcdir)/kmwizard.h
++	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
+ 
+ #>+ 3
+-kmiconview.moc: $(srcdir)/kmiconview.h
+-	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
++kmdriverdb.moc: $(srcdir)/kmdriverdb.h
++	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
+ 
+ #>+ 3
+-kmpropertypage.moc: $(srcdir)/kmpropertypage.h
+-	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
++kmtimer.moc: $(srcdir)/kmtimer.h
++	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
+ 
+ #>+ 3
+-kmjobviewer.moc: $(srcdir)/kmjobviewer.h
+-	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
++kmwizardpage.moc: $(srcdir)/kmwizardpage.h
++	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
 +
-+#>+ 11
- libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp libkdeprint_management_la_meta_unload.cpp   kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc 
- 	@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
- 	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
-@@ -1005,11 +1030,11 @@
- 	rm -f libkdeprint_management_la.all_cpp.final libkdeprint_management_la.all_cpp.files
++#>+ 3
++kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
++	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kmpropcontainer.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
++	-rm -f  kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc
+ 
+ #>+ 3
+ clean-closures:
+@@ -1045,7 +1060,7 @@ force-reedit:
+ 
  
  #>+ 11
--kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp  
- 	@echo 'creating kaddprinterwizard.all_cpp.cpp ...'; \
- 	rm -f kaddprinterwizard.all_cpp.files kaddprinterwizard.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kaddprinterwizard_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kaddprinterwizard.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard.all_cpp.final; \
- 	done; \
-@@ -1018,7 +1043,7 @@
- 
- #>+ 3
- clean-final:
--	-rm -f kaddprinterwizard_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp
-+	-rm -f kaddprinterwizard_la.all_cpp.cpp libkaddprinterwizard_main_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp
+-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp  kmdriverdialog.moc kmpropcontainer.moc kmlistview.moc kmwsocketutil.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmdriverdb.moc kmwclass.moc kmwsocket.moc kmconfigpage.moc pluginaction.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmiconview.moc kmtimer.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmjobviewer.moc kmpropertypage.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc
++libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp  kmmainview.moc kmdriverdbwidget.moc kmjobviewer.moc kmwlocal.moc kmconfigdialog.moc kmspecialprinterdlg.moc kiconselectaction.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmconfigfilter.moc kmwsocketutil.moc kmlistview.moc kmpropertypage.moc kxmlcommanddlg.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmdbcreator.moc kmdriverdialog.moc kmwizardpage.moc kmpropwidget.moc
+ 	@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
+@@ -1081,69 +1096,69 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
  
- #>+ 2
- final:
+ #>+ 67
+-kmtimer.o: kmtimer.moc 
+-kmpropertypage.o: kmpropertypage.moc 
+-smbview.lo: smbview.moc 
+-kmdriverdialog.o: kmdriverdialog.moc 
+ kmmainview.o: kmmainview.moc 
+-kmwsmb.o: kmwsmb.moc 
+-kmwclass.lo: kmwclass.moc 
+-kmwsocket.o: kmwsocket.moc 
++kmpropcontainer.lo: kmpropcontainer.moc 
++kmmainview.lo: kmmainview.moc 
++kmpropwidget.o: kmpropwidget.moc 
++kmdbcreator.o: kmdbcreator.moc 
++kmwizardpage.lo: kmwizardpage.moc 
++kmwclass.o: kmwclass.moc 
+ kmwlocal.lo: kmwlocal.moc 
++kmconfigpage.o: kmconfigpage.moc 
++pluginaction.lo: pluginaction.moc 
+ kmwdrivertest.o: kmwdrivertest.moc 
+-kmpropertypage.lo: kmpropertypage.moc 
+-kmwlocal.o: kmwlocal.moc 
+-kxmlcommanddlg.lo: kxmlcommanddlg.moc 
+-kminstancepage.lo: kminstancepage.moc 
+-kiconselectaction.lo: kiconselectaction.moc 
+-kxmlcommandselector.lo: kxmlcommandselector.moc 
+-kmwsocket.lo: kmwsocket.moc 
+-kmmainview.lo: kmmainview.moc 
+-kxmlcommanddlg.o: kxmlcommanddlg.moc 
+-kmconfiggeneral.lo: kmconfiggeneral.moc 
+-kmlistview.lo: kmlistview.moc 
+-kmwsocketutil.lo: kmwsocketutil.moc 
++smbview.lo: smbview.moc 
+ kmconfigdialog.lo: kmconfigdialog.moc 
+-kmdriverdbwidget.lo: kmdriverdbwidget.moc 
+-kmdbcreator.lo: kmdbcreator.moc 
+-kmjobviewer.o: kmjobviewer.moc 
+-kmpropcontainer.lo: kmpropcontainer.moc 
+ kmwizardpage.o: kmwizardpage.moc 
+-kmwclass.o: kmwclass.moc 
++kmwdrivertest.lo: kmwdrivertest.moc 
++kiconselectaction.o: kiconselectaction.moc 
++kmiconview.o: kmiconview.moc 
++kmdriverdb.o: kmdriverdb.moc 
++kmpropcontainer.o: kmpropcontainer.moc 
++kmtimer.o: kmtimer.moc 
++kmjobviewer.o: kmjobviewer.moc 
++kmtimer.lo: kmtimer.moc 
++cjanuswidget.o: cjanuswidget.moc 
++kmwlocal.o: kmwlocal.moc 
++kmjobviewer.lo: kmjobviewer.moc 
+ kmdriverdbwidget.o: kmdriverdbwidget.moc 
+-pluginaction.lo: pluginaction.moc 
+-kxmlcommandselector.o: kxmlcommandselector.moc 
++kmconfiggeneral.lo: kmconfiggeneral.moc 
+ smbview.o: smbview.moc 
+-kmwdrivertest.lo: kmwdrivertest.moc 
+-kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
+-kmprinterview.o: kmprinterview.moc 
+-kmwizardpage.lo: kmwizardpage.moc 
+-kmpropwidget.o: kmpropwidget.moc 
+ kmconfigdialog.o: kmconfigdialog.moc 
+-cjanuswidget.lo: cjanuswidget.moc 
++kmwsmb.lo: kmwsmb.moc 
++kiconselectaction.lo: kiconselectaction.moc 
++kxmlcommandselector.o: kxmlcommandselector.moc 
++kminstancepage.o: kminstancepage.moc 
++kmconfiggeneral.o: kmconfiggeneral.moc 
++kmwclass.lo: kmwclass.moc 
++kmdbcreator.lo: kmdbcreator.moc 
+ kmconfigfilter.lo: kmconfigfilter.moc 
+-kmconfigfilter.o: kmconfigfilter.moc 
+-pluginaction.o: pluginaction.moc 
+-kmiconview.o: kmiconview.moc 
+-kiconselectaction.o: kiconselectaction.moc 
++kmdriverdbwidget.lo: kmdriverdbwidget.moc 
++kmwsocketutil.lo: kmwsocketutil.moc 
++kminstancepage.lo: kminstancepage.moc 
+ kmwizard.lo: kmwizard.moc 
+-kmconfigpage.o: kmconfigpage.moc 
+-kmdbcreator.o: kmdbcreator.moc 
+-kmwsocketutil.o: kmwsocketutil.moc 
+-cjanuswidget.o: cjanuswidget.moc 
+-kmlistview.o: kmlistview.moc 
++kmpropwidget.lo: kmpropwidget.moc 
+ kmprinterview.lo: kmprinterview.moc 
+-kmtimer.lo: kmtimer.moc 
++kmwsocket.lo: kmwsocket.moc 
++cjanuswidget.lo: cjanuswidget.moc 
++kmwsmb.o: kmwsmb.moc 
++kmlistview.o: kmlistview.moc 
+ kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
+-kmdriverdb.lo: kmdriverdb.moc 
++pluginaction.o: pluginaction.moc 
++kxmlcommanddlg.lo: kxmlcommanddlg.moc 
++kxmlcommandselector.lo: kxmlcommandselector.moc 
++kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
+ kmconfigpage.lo: kmconfigpage.moc 
+-kmdriverdb.o: kmdriverdb.moc 
+-kmjobviewer.lo: kmjobviewer.moc 
+-kmwizard.o: kmwizard.moc 
+-kmpropwidget.lo: kmpropwidget.moc 
+-kmconfiggeneral.o: kmconfiggeneral.moc 
+-kmwsmb.lo: kmwsmb.moc 
+ kmiconview.lo: kmiconview.moc 
+-kminstancepage.o: kminstancepage.moc 
+-kmpropcontainer.o: kmpropcontainer.moc 
++kxmlcommanddlg.o: kxmlcommanddlg.moc 
++kmconfigfilter.o: kmconfigfilter.moc 
++kmwsocketutil.o: kmwsocketutil.moc 
++kmdriverdb.lo: kmdriverdb.moc 
++kmprinterview.o: kmprinterview.moc 
++kmwsocket.o: kmwsocket.moc 
++kmpropertypage.o: kmpropertypage.moc 
+ kmdriverdialog.lo: kmdriverdialog.moc 
++kmlistview.lo: kmlistview.moc 
++kmdriverdialog.o: kmdriverdialog.moc 
++kmpropertypage.lo: kmpropertypage.moc 
++kmwizard.o: kmwizard.moc 
diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba
index 2a93504785d..931ba8d9506 100644
--- a/x11/kdelibs3/patches/patch-ba
+++ b/x11/kdelibs3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $
+$NetBSD: patch-ba,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- kinit/Makefile.in.orig	Tue May 21 15:42:12 2002
+--- kinit/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kinit/Makefile.in
-@@ -324,8 +324,7 @@
+@@ -324,8 +324,7 @@ klauncher_la_LIBADD = $(LIB_KSYCOCA)
  klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
  
  klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $
  
  METASOURCES = AUTO
  
-@@ -375,11 +374,12 @@
+@@ -374,11 +373,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT)
  #>+ 1
  kioslave_OBJECTS = kioslave.$(OBJEXT)
  kioslave_DEPENDENCIES =
@@ -28,25 +28,48 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $
  am_kshell_OBJECTS = shell.$(OBJEXT)
  #>- kshell_OBJECTS = $(am_kshell_OBJECTS)
  #>+ 1
-@@ -405,12 +405,12 @@
+@@ -404,25 +404,25 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/klauncher.Plo \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po
-+	@AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/wrapper.Po
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/klauncher.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po
++#>- @AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/wrapper.Po
+ #>+ 13
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P  $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/klauncher.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P  $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/klauncher.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/wrapper.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/wrapper.Po
+ 
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -556,13 +556,13 @@
+@@ -569,13 +569,13 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/autostart.Plo@am__quote@
@@ -61,16 +84,16 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setproctitle.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shell.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrapper.Po@am__quote@
-@@ -703,7 +703,7 @@
+@@ -716,7 +716,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=LICENSE.setproctitle README.autostart README.DCOP startkde.example README.wrapper 
+-KDE_DIST=README.DCOP LICENSE.setproctitle README.autostart README.wrapper startkde.example 
 +KDE_DIST=startkde.example LICENSE.setproctitle README.wrapper README.autostart README.DCOP 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -845,9 +845,6 @@
+@@ -858,9 +858,6 @@ kwrapper.c : wrapper.c
  
  shell.c : wrapper.c
  # do nothing, it just depends on it
@@ -80,17 +103,3 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -924,11 +921,11 @@
- 	rm -f kioslave.all_cpp.final kioslave.all_cpp.files
- 
- #>+ 11
--klauncher.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+klauncher.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp  
- 	@echo 'creating klauncher.all_cpp.cpp ...'; \
- 	rm -f klauncher.all_cpp.files klauncher.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> klauncher.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in main.cpp ; do \
- 	  echo "#include \"$$file\"" >> klauncher.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klauncher.all_cpp.final; \
- 	done; \
diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh
index afafa74ef63..6447aacb0b9 100644
--- a/x11/kdelibs3/patches/patch-bh
+++ b/x11/kdelibs3/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
+$NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- kio/misc/Makefile.in.orig	Tue May 21 15:42:15 2002
+--- kio/misc/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kio/misc/Makefile.in
-@@ -286,20 +286,24 @@
+@@ -286,20 +286,24 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
  
  SUBDIRS = . ksendbugmail kpac kdesasl kssld
  
@@ -18,7 +18,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  
 -#>- 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
+ #>- 	renamedlg.cpp skipdlg.cpp
  #>+ 2
 -kio_uiserver_la_SOURCES=uiserver.cpp   \
 +libkio_uiserver_main_la_SOURCES=uiserver.cpp   \
@@ -33,7 +33,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  observer_DIR = $(top_srcdir)/kio/kio
-@@ -327,24 +331,29 @@
+@@ -327,23 +331,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -47,15 +47,13 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
 +libkio_uiserver_main_la_DEPENDENCIES =
 +am_libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
 +#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS)
- #>+ 5
+ #>+ 4
 -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 
+-kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.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 
++libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.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)
  bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \
@@ -73,18 +71,32 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  am_kmailservice_OBJECTS = kmailservice.$(OBJEXT)
  #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS)
  #>+ 1
-@@ -362,7 +371,9 @@
+@@ -361,14 +370,20 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kio_uiserver_main.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/kmailservice.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -384,7 +395,8 @@
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kio_uiserver_main.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kmailservice.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
+-#>+ 7
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P  $(DEPDIR)/kio_uiserver_la.all_cpp.P  $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
++#>+ 11
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P  $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P  $(DEPDIR)/kio_uiserver_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kio_uiserver_main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kmailservice.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P  $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P  $(DEPDIR)/kio_uiserver_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kio_uiserver_main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kmailservice.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
+ 
+@@ -391,7 +406,8 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -94,7 +106,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  	$(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
  DATA = $(kde_services_DATA) $(protocol_DATA)
  
-@@ -397,7 +409,7 @@
+@@ -404,7 +420,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -103,7 +115,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -446,6 +458,8 @@
+@@ -453,6 +469,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS)
@@ -112,7 +124,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -486,7 +500,8 @@
+@@ -493,7 +511,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -122,122 +134,83 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmailservice.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ktelnetservice.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/renamedlg.Plo@am__quote@
-@@ -661,7 +676,7 @@
+@@ -668,7 +687,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=skipdlg.cpp rlogin.protocol kio_uiserver.desktop kmailservice.protocol renamedlg.cpp telnet.protocol rtsp.protocol 
+-KDE_DIST=rlogin.protocol renamedlg.cpp telnet.protocol rtsp.protocol skipdlg.cpp kmailservice.protocol kio_uiserver.desktop 
 +KDE_DIST=kio_uiserver.desktop renamedlg.cpp skipdlg.cpp kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -808,16 +823,6 @@
+@@ -815,6 +834,18 @@ dummy.cpp: uiserver.kidl
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
--#>+ 9
--uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
--uiserver_skel.cpp: uiserver.kidl
--	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl
--observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES)
--	$(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false )
--observer_stub.h: observer.kidl
--	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
--
- #>+ 3
- uiserver.moc: $(srcdir)/uiserver.h
- 	$(MOC) $(srcdir)/uiserver.h -o uiserver.moc
-@@ -830,6 +835,16 @@
- renamedlg.moc: $(srcdir)/renamedlg.h
- 	$(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc
- 
-+#>+ 9
-+uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
-+uiserver_skel.cpp: uiserver.kidl
-+	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl
-+observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES)
-+	$(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false )
-+observer_stub.h: observer.kidl
-+	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
++#>+ 3
++uiserver.moc: $(srcdir)/uiserver.h
++	$(MOC) $(srcdir)/uiserver.h -o uiserver.moc
++
++#>+ 3
++skipdlg.moc: $(srcdir)/skipdlg.h
++	$(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc
 +
++#>+ 3
++renamedlg.moc: $(srcdir)/renamedlg.h
++	$(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc
++
+ #>+ 9
+ uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES)
+ 	$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
+@@ -826,20 +857,8 @@ observer_stub.h: observer.kidl
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
+ 
  #>+ 3
+-uiserver.moc: $(srcdir)/uiserver.h
+-	$(MOC) $(srcdir)/uiserver.h -o uiserver.moc
+-
+-#>+ 3
+-renamedlg.moc: $(srcdir)/renamedlg.h
+-	$(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc
+-
+-#>+ 3
+-skipdlg.moc: $(srcdir)/skipdlg.h
+-	$(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc
+-
+-#>+ 3
  clean-metasources:
- 	-rm -f  uiserver.moc skipdlg.moc renamedlg.moc
-@@ -851,28 +866,28 @@
- 
+-	-rm -f  uiserver.moc renamedlg.moc skipdlg.moc
++	-rm -f  uiserver.moc skipdlg.moc renamedlg.moc
  
- #>+ 12
--kio_uiserver_la_meta_unload.cpp:  uiserver.moc skipdlg.moc renamedlg.moc
--	@echo 'creating kio_uiserver_la_meta_unload.cpp'
--	@-rm -f kio_uiserver_la_meta_unload.cpp
-+libkio_uiserver_main_la_meta_unload.cpp:  uiserver.moc skipdlg.moc renamedlg.moc
-+	@echo 'creating libkio_uiserver_main_la_meta_unload.cpp'
-+	@-rm -f libkio_uiserver_main_la_meta_unload.cpp
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp ;\
--		cat  uiserver.moc skipdlg.moc renamedlg.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 ;\
--	else echo > kio_uiserver_la_meta_unload.cpp; fi
-+		echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp ;\
-+		cat  uiserver.moc skipdlg.moc renamedlg.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 ;\
-+	else echo > libkio_uiserver_main_la_meta_unload.cpp; fi
- 
- 
- #>+ 3
- clean-moc-classes:
--	-rm -f  kio_uiserver_la_meta_unload.cpp
-+	-rm -f  libkio_uiserver_main_la_meta_unload.cpp
+ #>+ 5
+ clean-idl:
+@@ -858,33 +877,33 @@ force-reedit:
  
- #>+ 11
--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   uiserver.moc skipdlg.moc renamedlg.moc 
-+kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp   uiserver.moc skipdlg.moc renamedlg.moc 
- 	@echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \
- 	rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \
--	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 \
- 	  echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \
- 	done; \
-@@ -880,11 +895,23 @@
- 	rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files
  
  #>+ 11
--kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.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  
+-kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp  uiserver.moc skipdlg.moc renamedlg.moc
+-	@echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \
+-	rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \
++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  uiserver.moc skipdlg.moc renamedlg.moc
 +	@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 \
+ 	for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp ; do \
+-	  echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \
 +	  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.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp  
- 	@echo 'creating kio_uiserver.all_cpp.cpp ...'; \
- 	rm -f kio_uiserver.all_cpp.files kio_uiserver.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kio_uiserver.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kio_uiserver_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kio_uiserver.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver.all_cpp.final; \
  	done; \
-@@ -917,20 +944,20 @@
+-	cat kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files > kio_uiserver_la.all_cpp.cpp; \
+-	rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files
++	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
  
  #>+ 3
  clean-final:
--	-rm -f kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp
-+	-rm -f kio_uiserver_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp
+-	-rm -f kio_uiserver_la.all_cpp.cpp
++	-rm -f libkio_uiserver_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -257,4 +230,23 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
 +	$(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -894,13 +913,13 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 11
+-uiserver.o: uiserver.moc 
++skipdlg.o: skipdlg.moc 
+ $(srcdir)/skipdlg.cpp: observer_stub.h 
+ renamedlg.lo: renamedlg.moc 
+-skipdlg.o: skipdlg.moc 
+-observer_stub.cpp: observer_stub.h 
+-uiserver.lo: uiserver.moc 
+ $(srcdir)/renamedlg.cpp: observer_stub.h 
++$(srcdir)/uiserver.cpp: observer_stub.h 
+ skipdlg.lo: skipdlg.moc 
++observer_stub.cpp: observer_stub.h 
++uiserver.lo: uiserver.moc 
++uiserver.o: uiserver.moc 
+ renamedlg.o: renamedlg.moc 
+-$(srcdir)/uiserver.cpp: observer_stub.h 
diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn
index c5d94a28785..0ca5f5cfee0 100644
--- a/x11/kdelibs3/patches/patch-bn
+++ b/x11/kdelibs3/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
+$NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
 
---- kioslave/http/Makefile.in.orig	Wed Jun 26 08:21:42 2002
+--- kioslave/http/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kioslave/http/Makefile.in
-@@ -273,19 +273,22 @@
+@@ -273,19 +273,22 @@ LDFLAGS = $(all_libraries)
  
  ####### Files
  bin_PROGRAMS = kio_http_cache_cleaner
@@ -30,7 +30,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
  
  noinst_HEADERS = http.h
-@@ -305,28 +308,38 @@
+@@ -305,31 +308,43 @@ am_kio_http_la_OBJECTS = http.lo
  #>- kio_http_la_OBJECTS = $(am_kio_http_la_OBJECTS)
  #>+ 1
  kio_http_la_OBJECTS = http.lo
@@ -40,7 +40,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
 +	libkio_http_cache_cleaner_main.la
 +am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo
  #>- kio_http_cache_cleaner_la_OBJECTS = \
- #>- $(am_kio_http_cache_cleaner_la_OBJECTS)
+ #>- 	$(am_kio_http_cache_cleaner_la_OBJECTS)
  #>+ 1
 -kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo
 +kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo
@@ -48,7 +48,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
 +libkio_http_cache_cleaner_main_la_DEPENDENCIES =
 +am_libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo
 +#>- libkio_http_cache_cleaner_main_la_OBJECTS = \
-+#>- $(am_libkio_http_cache_cleaner_main_la_OBJECTS)
++#>- 	$(am_libkio_http_cache_cleaner_main_la_OBJECTS)
 +#>+ 1
 +libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo
  bin_PROGRAMS = kio_http_cache_cleaner$(EXEEXT)
@@ -68,16 +68,24 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  CPPFLAGS = @CPPFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner.Plo
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner_main.Po
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner.Plo
+-#>+ 3
+-@AMDEP_TRUE@DEP_FILES =   $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \
+-@AMDEP_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner.Plo
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner_main.Po
++#>+ 5
++@AMDEP_TRUE@DEP_FILES =   $(DEPDIR)/http.Plo \
++@AMDEP_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner.Plo \
++@AMDEP_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner_main.Plo \
++@AMDEP_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/http_cache_cleaner_main.Po
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
-@@ -356,6 +369,7 @@
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -360,6 +375,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kio_http_la_SOURCES) \
  	$(kio_http_cache_cleaner_la_SOURCES) \
@@ -85,7 +93,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  	$(kio_http_cache_cleaner_SOURCES)
  DATA = $(kdelnk_DATA)
  
-@@ -368,7 +382,7 @@
+@@ -372,7 +388,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -94,7 +102,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -441,6 +455,8 @@
+@@ -445,6 +461,8 @@ clean-libLTLIBRARIES:
  	$(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS)
  kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS)
@@ -103,7 +111,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -475,9 +491,10 @@
+@@ -479,9 +497,10 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -115,25 +123,16 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  
  distclean-depend:
  	-rm -rf $(DEPDIR)
-@@ -631,7 +648,7 @@
+@@ -635,7 +654,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=README.http_cache_cleaner README.webdav THOUGHTS https.protocol rfc2616.txt rfc2617.txt http.protocol http_cache_cleaner.desktop webdavs.protocol webdav.protocol 
-+KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2617.txt kio_http.la.closure THOUGHTS kio_http_cache_cleaner 
+-KDE_DIST=webdav.protocol http_cache_cleaner.desktop README.webdav THOUGHTS README.http_cache_cleaner webdavs.protocol rfc2617.txt rfc2616.txt http.protocol https.protocol 
++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol rfc2617.txt http.protocol webdav.protocol README.webdav https.protocol THOUGHTS rfc2616.txt 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -729,7 +746,7 @@
- 
- #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
- #>+ 1
--install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES
-+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
- 
- install-info: install-info-recursive
- 
-@@ -774,9 +791,6 @@
+@@ -778,9 +797,6 @@ uninstall-info: uninstall-info-recursive
  	uninstall-kdelnkDATA uninstall-libLTLIBRARIES \
  	uninstall-recursive
  
@@ -143,52 +142,3 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -817,11 +831,11 @@
- 	rm -f kio_http_la.all_cc.final kio_http_la.all_cc.files
- 
- #>+ 11
--kio_http_cache_cleaner_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner.cpp  
-+kio_http_cache_cleaner_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner_main.cpp  
- 	@echo 'creating kio_http_cache_cleaner_la.all_cpp.cpp ...'; \
- 	rm -f kio_http_cache_cleaner_la.all_cpp.files kio_http_cache_cleaner_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kio_http_cache_cleaner_la.all_cpp.final; \
--	for file in http_cache_cleaner.cpp ; do \
-+	for file in http_cache_cleaner_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kio_http_cache_cleaner_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_http_cache_cleaner_la.all_cpp.final; \
- 	done; \
-@@ -829,11 +843,23 @@
- 	rm -f kio_http_cache_cleaner_la.all_cpp.final kio_http_cache_cleaner_la.all_cpp.files
- 
- #>+ 11
--kio_http_cache_cleaner.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libkio_http_cache_cleaner_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner.cpp  
-+	@echo 'creating libkio_http_cache_cleaner_main_la.all_cpp.cpp ...'; \
-+	rm -f libkio_http_cache_cleaner_main_la.all_cpp.files libkio_http_cache_cleaner_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkio_http_cache_cleaner_main_la.all_cpp.final; \
-+	for file in http_cache_cleaner.cpp ; do \
-+	  echo "#include \"$$file\"" >> libkio_http_cache_cleaner_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_http_cache_cleaner_main_la.all_cpp.final; \
-+	done; \
-+	cat libkio_http_cache_cleaner_main_la.all_cpp.final libkio_http_cache_cleaner_main_la.all_cpp.files  > libkio_http_cache_cleaner_main_la.all_cpp.cpp; \
-+	rm -f libkio_http_cache_cleaner_main_la.all_cpp.final libkio_http_cache_cleaner_main_la.all_cpp.files
-+
-+#>+ 11
-+kio_http_cache_cleaner.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner_main.cpp  
- 	@echo 'creating kio_http_cache_cleaner.all_cpp.cpp ...'; \
- 	rm -f kio_http_cache_cleaner.all_cpp.files kio_http_cache_cleaner.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kio_http_cache_cleaner.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in http_cache_cleaner_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kio_http_cache_cleaner.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_http_cache_cleaner.all_cpp.final; \
- 	done; \
-@@ -842,7 +868,7 @@
- 
- #>+ 3
- clean-final:
--	-rm -f kio_http_la.all_cc.cc kio_http_cache_cleaner_la.all_cpp.cpp kio_http_cache_cleaner.all_cpp.cpp
-+	-rm -f kio_http_la.all_cc.cc kio_http_cache_cleaner_la.all_cpp.cpp libkio_http_cache_cleaner_main_la.all_cpp.cpp kio_http_cache_cleaner.all_cpp.cpp
- 
- #>+ 2
- final:
diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br
index 458e9fa80b6..8b795ddd908 100644
--- a/x11/kdelibs3/patches/patch-br
+++ b/x11/kdelibs3/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
+$NetBSD: patch-br,v 1.3 2003/01/02 09:12:39 skrll Exp $
 
---- kioslave/http/kcookiejar/Makefile.in.orig	Tue May 21 15:42:15 2002
+--- kioslave/http/kcookiejar/Makefile.in.orig	Tue Nov 26 08:57:39 2002
 +++ kioslave/http/kcookiejar/Makefile.in
-@@ -270,22 +270,26 @@
+@@ -270,22 +270,26 @@ INCLUDES = $(all_includes)
  
  ####### Files
  bin_PROGRAMS = kcookiejar
@@ -11,13 +11,13 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  
 -#>- kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
 +#>- libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
- #>- kcookieserver.skel kcookiewin.cpp \
- #>- kcookiewin.h main.cpp 
+ #>- 			kcookieserver.skel kcookiewin.cpp \
+ #>- 			kcookiewin.h main.cpp 
  #>+ 3
 -kcookiejar_la_SOURCES=kcookiejar.cpp kcookieserver.cpp \
 +libkcookiejar_main_la_SOURCES=kcookiejar.cpp kcookieserver.cpp \
- 	 kcookiewin.cpp \
- 	kcookiewin.h main.cpp  kcookieserver_skel.cpp
+ 			 kcookiewin.cpp \
+ 			kcookiewin.h main.cpp  kcookieserver_skel.cpp
  
 -#>- kcookiejar_la_METASOURCES = AUTO
 +#>- libkcookiejar_main_la_METASOURCES = AUTO
@@ -36,7 +36,7 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  services_DATA = kcookiejar.desktop
-@@ -299,25 +303,30 @@
+@@ -299,24 +303,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -52,17 +52,15 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
 +am_libkcookiejar_main_la_OBJECTS = kcookiejar.lo kcookieserver.lo \
 +	kcookiewin.lo main.lo
 +#>- libkcookiejar_main_la_OBJECTS = $(am_libkcookiejar_main_la_OBJECTS)
- #>+ 6
+ #>+ 5
 -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 
+-	main.lo kcookieserver_skel.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 
++	kcookiewin.lo main.lo kcookieserver_skel.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)
  bin_PROGRAMS = kcookiejar$(EXEEXT)
@@ -79,18 +77,32 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -325,7 +334,9 @@
+@@ -324,14 +333,20 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcookiejar.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/kcookieserver.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -355,11 +366,12 @@
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcookiejar.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kcookieserver.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo
+-#>+ 7
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kcookieserver_skel.P  $(DEPDIR)/kcookiejar_la.all_cpp.P  $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \
++#>+ 11
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kcookieserver_skel.P  $(DEPDIR)/libkcookiejar_main_la.all_cpp.P  $(DEPDIR)/kcookiejar.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcookieserver.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kcookieserver_skel.P  $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kcookieserver_skel.P  $(DEPDIR)/kcookiejar.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcookiejar_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcookieserver.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo
+ 
+@@ -362,11 +377,12 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -105,7 +117,7 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -408,6 +420,8 @@
+@@ -415,6 +431,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kcookiejar.la: $(kcookiejar_la_OBJECTS) $(kcookiejar_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS)
@@ -114,7 +126,7 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -442,8 +456,9 @@
+@@ -449,8 +467,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -125,16 +137,16 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookieserver.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookiewin.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@
-@@ -539,7 +554,7 @@
+@@ -546,7 +565,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=kcookiescfg.upd main.cpp kcookiejar.desktop kcookieserver.h kcookiejar.h rfc2965 kcookiewin.h netscape_cookie_spec.html rfc2109 kcookiewin.cpp 
+-KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h main.cpp kcookiewin.cpp kcookiewin.h rfc2109 kcookiejar.desktop 
 +KDE_DIST=kcookiewin.h netscape_cookie_spec.html main.cpp kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h kcookiewin.cpp 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -656,9 +671,6 @@
+@@ -663,9 +682,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-libLTLIBRARIES uninstall-servicesDATA \
  	uninstall-updateDATA
  
@@ -144,79 +156,33 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -697,28 +709,28 @@
- 
- 
- #>+ 12
--kcookiejar_la_meta_unload.cpp:  kcookieserver.moc kcookiewin.moc
--	@echo 'creating kcookiejar_la_meta_unload.cpp'
--	@-rm -f 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
- 	@if test ${kde_qtver} = 2; then \
--		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 ;\
--	else echo > kcookiejar_la_meta_unload.cpp; fi
-+		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 ;\
-+	else echo > libkcookiejar_main_la_meta_unload.cpp; fi
- 
+@@ -704,33 +720,33 @@ force-reedit:
  
- #>+ 3
- clean-moc-classes:
--	-rm -f  kcookiejar_la_meta_unload.cpp
-+	-rm -f  libkcookiejar_main_la_meta_unload.cpp
- 
- #>+ 11
--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  
- 	@echo 'creating kcookiejar_la.all_cpp.cpp ...'; \
- 	rm -f kcookiejar_la.all_cpp.files kcookiejar_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcookiejar_la.all_cpp.final; \
--	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 \
- 	  echo "#include \"$$file\"" >> kcookiejar_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar_la.all_cpp.final; \
- 	done; \
-@@ -726,11 +738,23 @@
- 	rm -f kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files
  
  #>+ 11
--kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+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 
+-kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp  kcookiewin.moc kcookieserver.moc
+-	@echo 'creating kcookiejar_la.all_cpp.cpp ...'; \
+-	rm -f kcookiejar_la.all_cpp.files kcookiejar_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kcookiejar_la.all_cpp.final; \
++libkcookiejar_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.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 \
+ 	for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp ; do \
+-	  echo "#include \"$$file\"" >> kcookiejar_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar_la.all_cpp.final; \
 +	  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
-+
-+#>+ 11
-+kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp  
- 	@echo 'creating kcookiejar.all_cpp.cpp ...'; \
- 	rm -f kcookiejar.all_cpp.files kcookiejar.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcookiejar.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kcookiejar_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kcookiejar.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar.all_cpp.final; \
  	done; \
-@@ -739,20 +763,20 @@
+-	cat kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files > kcookiejar_la.all_cpp.cpp; \
+-	rm -f kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files
++	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
  
  #>+ 3
  clean-final:
--	-rm -f kcookiejar_la.all_cpp.cpp kcookiejar.all_cpp.cpp
-+	-rm -f kcookiejar_la.all_cpp.cpp libkcookiejar_main_la.all_cpp.cpp kcookiejar.all_cpp.cpp
+-	-rm -f kcookiejar_la.all_cpp.cpp
++	-rm -f libkcookiejar_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -236,4 +202,15 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
 +	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -740,7 +756,7 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 5
+-kcookieserver.lo: kcookieserver.moc 
+-kcookiewin.lo: kcookiewin.moc 
+-kcookiewin.o: kcookiewin.moc 
+ kcookieserver.o: kcookieserver.moc 
++kcookiewin.o: kcookiewin.moc 
++kcookiewin.lo: kcookiewin.moc 
++kcookieserver.lo: kcookieserver.moc 
diff --git a/x11/kdelibs3/patches/patch-bw b/x11/kdelibs3/patches/patch-bw
deleted file mode 100644
index 6cedaf864e7..00000000000
--- a/x11/kdelibs3/patches/patch-bw
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bw,v 1.2 2002/08/25 19:23:55 jlam Exp $
-
---- admin/am_edit.orig	Wed Jun 26 08:27:56 2002
-+++ admin/am_edit
-@@ -384,7 +384,16 @@
-     # all modules are installed.  automake doesn't know this, so we need to move
-     # this here from install-data to install-exec.
-     if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) {
--      $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
-+      my $lookup2 = 'install-exec-am:\s*([^\n]*)';
-+      if ($MakefileData =~ /\n$lookup2\n/) {
-+        my $newdeps = $1;
-+        if ($newdeps =~ m/\s*install-libLTLIBRARIES\s*/) {
-+	  $newdeps =~ s/(install-libLTLIBRARIES)/$1 install-kde_moduleLTLIBRARIES/g;
-+	  substituteLine($lookup2, "install-exec-am: " . $newdeps);
-+        } else {
-+          $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
-+        }
-+      }
-       my $lookup = 'install-data-am:\s*(.*)';
-       if ($MakefileData =~ /\n$lookup\n/) {
-         my $newdeps = $1;
diff --git a/x11/kdelibs3/patches/patch-bx b/x11/kdelibs3/patches/patch-bx
deleted file mode 100644
index d07ecd68a5f..00000000000
--- a/x11/kdelibs3/patches/patch-bx
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-bx,v 1.2 2002/08/25 19:23:55 jlam Exp $
-
---- khtml/Makefile.in.orig	Wed Jun 26 08:21:40 2002
-+++ khtml/Makefile.in
-@@ -833,7 +833,7 @@
- 
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=khtmlimage.desktop domtreeview.h khtml_events.cpp TODO-3.0 khtml_browser.rc configure.in.in khtml_iface.cc khtml.rc khtml_factory.h khtml_printsettings.cpp khtml_pagecache.cpp khtml_iface.h khtml_run.h khtml_ext.cpp DESIGN.html khtml.desktop khtml_find.cpp SECURITY khtml_popupmenu.rc 
-+KDE_DIST=khtml_iface.h khtmlimage.desktop khtml.desktop khtml_find.cpp domtreeview.h configure.in.in khtml_iface.cc khtml_events.cpp SECURITY khtml_popupmenu.rc khtml_run.h khtml_iface_skel.cc TODO-3.0 libkhtml.la.closure khtml_ext.cpp khtml.rc khtmlimagepart.la.closure khtml_iface.kidl khtml_factory.h khtml_printsettings.cpp khtml_pagecache.cpp khtml_browser.rc DESIGN.html 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -932,7 +932,7 @@
- 
- #>- install-exec-am: install-libLTLIBRARIES
- #>+ 1
--install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
- 
- install-info: install-info-recursive
- 
-@@ -1186,7 +1186,7 @@
- 	rm -f khtmlimagepart_la.all_cpp.final khtmlimagepart_la.all_cpp.files
- 
- #>+ 11
--khtmlimagepart_la.all_cc.cc: $(srcdir)/Makefile.in khtmlimagepart_la_meta_unload.cc  
-+khtmlimagepart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtmlimagepart_la_meta_unload.cc  
- 	@echo 'creating khtmlimagepart_la.all_cc.cc ...'; \
- 	rm -f khtmlimagepart_la.all_cc.files khtmlimagepart_la.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> khtmlimagepart_la.all_cc.final; \
-@@ -1210,7 +1210,7 @@
- 	rm -f libkhtml_la.all_cpp.final libkhtml_la.all_cpp.files
- 
- #>+ 11
--libkhtml_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtml_settings.cc $(srcdir)/khtml_iface.cc khtml_iface_skel.cc libkhtml_la_meta_unload.cc   testrender.moc khtml_part.moc khtml_run.moc khtmlimage.moc testkhtml.moc khtml_factory.moc domtreeview.moc khtml_ext.moc khtml_pagecache.moc khtml_find.moc test_regression.moc khtmlview.moc khtml_printsettings.moc 
-+libkhtml_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtml_settings.cc $(srcdir)/khtml_iface.cc $(srcdir)/khtml_iface_skel.cc $(srcdir)/libkhtml_la_meta_unload.cc   testrender.moc khtml_part.moc khtml_run.moc khtmlimage.moc testkhtml.moc khtml_factory.moc domtreeview.moc khtml_ext.moc khtml_pagecache.moc khtml_find.moc test_regression.moc khtmlview.moc khtml_printsettings.moc 
- 	@echo 'creating libkhtml_la.all_cc.cc ...'; \
- 	rm -f libkhtml_la.all_cc.files libkhtml_la.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkhtml_la.all_cc.final; \
diff --git a/x11/kdelibs3/patches/patch-by b/x11/kdelibs3/patches/patch-by
deleted file mode 100644
index 80a2442bd66..00000000000
--- a/x11/kdelibs3/patches/patch-by
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-by,v 1.2 2002/08/25 19:23:55 jlam Exp $
-
---- kdeprint/Makefile.in.orig	Wed Jun 26 08:21:44 2002
-+++ kdeprint/Makefile.in
-@@ -843,7 +843,7 @@
- 
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=kprinter.cpp kmdbentry.cpp printerfilter.cpp kprintfilter.h kprinterimpl.cpp util.cpp kpqtpage.cpp kprintpreview.cpp configure.in.in kmthreadjob.cpp kpfilterpage.cpp maticparser.cpp.h kprintaction.cpp driveritem.cpp signal_proc.c kmspecialmanager.cpp kdeprintcheck.cpp kxmlcommand.cpp specials.desktop matic.cpp kpcopiespage.cpp kpreloadobject.cpp testprint.ps kprintdialog.cpp treecombobox.cpp kfilelist.cpp driver.cpp kdeprintd.desktop plugincombobox.cpp kpfileselectpage.cpp kmvirtualmanager.cpp kpdriverpage.cpp kmfiltermanager.cpp kdeprintrc kprintdialogpage.cpp kmfiltermanager.h kpipeprocess.cpp driverview.cpp maticscanner.cpp kprinterpropertydialog.cpp kmuimanager.cpp kpgeneralpage.cpp kprintfilter.cpp maticparser.cpp droptionview.cpp 
-+KDE_DIST=kdeprintd.kidl kprinter.cpp testprint.ps kprintdialog.cpp treecombobox.cpp kfilelist.cpp driver.cpp kdeprintd.desktop kmdbentry.cpp libkdeprint.la.closure plugincombobox.cpp printerfilter.cpp kprintfilter.h kpfileselectpage.cpp kmvirtualmanager.cpp kpdriverpage.cpp libdriverparse.a kmfiltermanager.cpp kprinterimpl.cpp util.cpp kpqtpage.cpp kdeprintrc kmfactory.kidl kprintdialogpage.cpp kpipeprocess.cpp kmfiltermanager.h kprintpreview.cpp configure.in.in kmthreadjob.cpp driverview.cpp kmfactory_skel.cpp maticscanner.cpp kpfilterpage.cpp maticparser.cpp.h kprinterpropertydialog.cpp kprintaction.cpp kmuimanager.cpp driveritem.cpp signal_proc.c kpgeneralpage.cpp kmspecialmanager.cpp kprintfilter.cpp kdeprintcheck.cpp kxmlcommand.cpp maticparser.cpp specials.desktop matic.cpp kpcopiespage.cpp droptionview.cpp kpreloadobject.cpp 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -943,7 +943,7 @@
- 
- #>- install-exec-am: install-libLTLIBRARIES
- #>+ 1
--install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
- 
- install-info: install-info-recursive
- 
-@@ -1161,7 +1161,7 @@
- 	-rm -f  kded_kdeprintd_la_meta_unload.cpp libkdeprint_la_meta_unload.cpp
- 
- #>+ 11
--kded_kdeprintd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdeprintd.cpp $(srcdir)/kprintprocess.cpp kdeprintd_skel.cpp kded_kdeprintd_la_meta_unload.cpp  
-+kded_kdeprintd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdeprintd.cpp $(srcdir)/kprintprocess.cpp $(srcdir)/kdeprintd_skel.cpp $(srcdir)/kded_kdeprintd_la_meta_unload.cpp  
- 	@echo 'creating kded_kdeprintd_la.all_cpp.cpp ...'; \
- 	rm -f kded_kdeprintd_la.all_cpp.files kded_kdeprintd_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kded_kdeprintd_la.all_cpp.final; \
-@@ -1173,7 +1173,7 @@
- 	rm -f kded_kdeprintd_la.all_cpp.final kded_kdeprintd_la.all_cpp.files
- 
- #>+ 11
--libkdeprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmfactory.cpp $(srcdir)/kmjob.cpp $(srcdir)/kmjobmanager.cpp $(srcdir)/kmmanager.cpp $(srcdir)/kmprinter.cpp $(srcdir)/kmuimanager.cpp $(srcdir)/kmvirtualmanager.cpp $(srcdir)/driver.cpp $(srcdir)/driveritem.cpp $(srcdir)/droptionview.cpp $(srcdir)/driverview.cpp $(srcdir)/maticscanner.cpp $(srcdir)/maticparser.cpp $(srcdir)/matic.cpp $(srcdir)/kmdbentry.cpp $(srcdir)/kprintpreview.cpp $(srcdir)/kprintdialog.cpp $(srcdir)/kprinter.cpp $(srcdir)/kprinterimpl.cpp $(srcdir)/kprintdialogpage.cpp $(srcdir)/kpcopiespage.cpp $(srcdir)/kpdriverpage.cpp $(srcdir)/kprinterpropertydialog.cpp $(srcdir)/kpgeneralpage.cpp $(srcdir)/kpqtpage.cpp $(srcdir)/kmthreadjob.cpp $(srcdir)/kpipeprocess.cpp $(srcdir)/kpfilterpage.cpp $(srcdir)/kmspecialmanager.cpp $(srcdir)/kdeprintcheck.cpp $(srcdir)/plugincombobox.cpp $(srcdir)/kpreloadobject.cpp $(srcdir)/kfilelist.cpp $(srcdir)/kprintaction.cpp $(srcdir)/kpfileselectpage.cpp $(srcdir)/treecombobox.cpp $(srcdir)/kxmlcommand.cpp $(srcdir)/util.cpp $(srcdir)/printerfilter.cpp kmfactory_skel.cpp libkdeprint_la_meta_unload.cpp   kmjobmanager.moc kprinterpropertydialog.moc kmfactory.moc kprintpreview.moc kpfilterpage.moc kpcopiespage.moc kprintdialogpage.moc kpqtpage.moc kprintprocess.moc kpgeneralpage.moc kmmanager.moc kfilelist.moc droptionview.moc kdeprintd.moc kprintaction.moc driverview.moc plugincombobox.moc kprinterimpl.moc kprintdialog.moc 
-+libkdeprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmfactory.cpp $(srcdir)/kmjob.cpp $(srcdir)/kmjobmanager.cpp $(srcdir)/kmmanager.cpp $(srcdir)/kmprinter.cpp $(srcdir)/kmuimanager.cpp $(srcdir)/kmvirtualmanager.cpp $(srcdir)/driver.cpp $(srcdir)/driveritem.cpp $(srcdir)/droptionview.cpp $(srcdir)/driverview.cpp $(srcdir)/maticscanner.cpp $(srcdir)/maticparser.cpp $(srcdir)/matic.cpp $(srcdir)/kmdbentry.cpp $(srcdir)/kprintpreview.cpp $(srcdir)/kprintdialog.cpp $(srcdir)/kprinter.cpp $(srcdir)/kprinterimpl.cpp $(srcdir)/kprintdialogpage.cpp $(srcdir)/kpcopiespage.cpp $(srcdir)/kpdriverpage.cpp $(srcdir)/kprinterpropertydialog.cpp $(srcdir)/kpgeneralpage.cpp $(srcdir)/kpqtpage.cpp $(srcdir)/kmthreadjob.cpp $(srcdir)/kpipeprocess.cpp $(srcdir)/kpfilterpage.cpp $(srcdir)/kmspecialmanager.cpp $(srcdir)/kdeprintcheck.cpp $(srcdir)/plugincombobox.cpp $(srcdir)/kpreloadobject.cpp $(srcdir)/kfilelist.cpp $(srcdir)/kprintaction.cpp $(srcdir)/kpfileselectpage.cpp $(srcdir)/treecombobox.cpp $(srcdir)/kxmlcommand.cpp $(srcdir)/util.cpp $(srcdir)/printerfilter.cpp $(srcdir)/kmfactory_skel.cpp $(srcdir)/libkdeprint_la_meta_unload.cpp   kmjobmanager.moc kprinterpropertydialog.moc kmfactory.moc kprintpreview.moc kpfilterpage.moc kpcopiespage.moc kprintdialogpage.moc kpqtpage.moc kprintprocess.moc kpgeneralpage.moc kmmanager.moc kfilelist.moc droptionview.moc kdeprintd.moc kprintaction.moc driverview.moc plugincombobox.moc kprinterimpl.moc kprintdialog.moc 
- 	@echo 'creating libkdeprint_la.all_cpp.cpp ...'; \
- 	rm -f libkdeprint_la.all_cpp.files libkdeprint_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkdeprint_la.all_cpp.final; \
diff --git a/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc
deleted file mode 100644
index 68770652081..00000000000
--- a/x11/kdelibs3/patches/patch-cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2002/12/06 11:00:31 skrll Exp $
-
---- kio/misc/rlogin.protocol.orig	Sat Jan 20 23:01:05 2001
-+++ kio/misc/rlogin.protocol
-@@ -1,10 +1,10 @@
- [Protocol]
--exec=konsole -e rlogin `echo %u | sed -e 's,rlogin:/*,,'`
-+exec=ktelnetservice %u
- protocol=rlogin
- input=none
- output=none
- helper=true
--listing=false
-+listing=
- reading=false
- writing=false
- makedir=false
diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd
deleted file mode 100644
index 818cf48b8a9..00000000000
--- a/x11/kdelibs3/patches/patch-cd
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2002/12/06 11:00:31 skrll Exp $
-
---- kio/misc/ktelnetservice.cpp.orig	Tue Sep 25 12:04:11 2001
-+++ kio/misc/ktelnetservice.cpp	Fri Dec  6 08:46:50 2002
-@@ -48,9 +48,16 @@
- 
- 	KURL url(args->arg(0));
- 	QStringList cmd;
--	
-+
- 	cmd << "-e";
--	cmd << "telnet";
-+        if ( url.protocol() == "telnet" )
-+            cmd << "telnet";
-+        else if ( url.protocol() == "rlogin" )
-+            cmd << "rlogin";
-+        else {
-+            kdError() << "Invalid protocol " << url.protocol() << endl;
-+            return 2;
-+        }
- 	if (!url.user().isEmpty())
- 	{
- 		cmd << "-l";
author	skrll <skrll@pkgsrc.org>	2003-01-02 09:12:19 +0000
committer	skrll <skrll@pkgsrc.org>	2003-01-02 09:12:19 +0000
commit	42861251c282c37bda020c5e0ae0940c0461f7a9 (patch)
tree	1ab9a94a1fd0409896e232322846793727e9e77a /x11/kdelibs3
parent	89fcd02fac594d7b0f01bd59d1a6f1508ec74be2 (diff)
download	pkgsrc-42861251c282c37bda020c5e0ae0940c0461f7a9.tar.gz