Update KDE to 3.1.

Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name
author: markd <markd@pkgsrc.org> 2003-03-11 13:10:15 +0000
committer: markd <markd@pkgsrc.org> 2003-03-11 13:10:15 +0000
commit: 528e056cde74afcf3106dd363e16cafe2855a9ab (patch)
tree: ce99eff5443d74e3e5c4e2dfa0d0cb7ccf7ac90a /x11/kdelibs3/patches
parent: 615f21ac5023134727518ed2d9af3be025db314d (diff)
download: pkgsrc-528e056cde74afcf3106dd363e16cafe2855a9ab.tar.gz
27 files changed, 726 insertions, 895 deletions
diff --git a/x11/kdelibs3/patches/patch-aa b/x11/kdelibs3/patches/patch-aa
index a7ca1b7792b..8e1fb393a5c 100644
--- a/x11/kdelibs3/patches/patch-aa
+++ b/x11/kdelibs3/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:50 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/11 13:10:33 markd Exp $
 
---- arts/knotify/Makefile.am.orig	Wed Feb 13 21:06:57 2002
+--- arts/knotify/Makefile.am.orig	Mon Sep 16 09:12:54 2002
 +++ arts/knotify/Makefile.am
 @@ -4,15 +4,20 @@
  ####### Files
@@ -10,9 +10,9 @@ $NetBSD: patch-aa,v 1.2 2002/08/25 19:23:50 jlam Exp $
 +lib_LTLIBRARIES = libknotify_main.la knotify.la
  
 -knotify_la_SOURCES	= knotify.cpp knotify.skel
--knotify_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE)
-+libknotify_main_la_SOURCES	= knotify.cpp knotify.skel
-+libknotify_main_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE)
+-knotify_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI)
++libknotify_main_la_SOURCES     = knotify.cpp knotify.skel
++libknotify_main_la_LIBADD      = -lsoundserver_idl -lqtmcop $(LIB_KDEUI)
 +libknotify_main_la_LDFLAGS = $(all_libraries)
 +libknotify_main_la_METASOURCES = AUTO
 +
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab
index 546117db720..be59560a8e2 100644
--- a/x11/kdelibs3/patches/patch-ab
+++ b/x11/kdelibs3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
+$NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $
 
---- arts/knotify/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- arts/knotify/Makefile.in.orig	Thu Jan 23 12:30:33 2003
 +++ arts/knotify/Makefile.in
-@@ -267,17 +267,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
+@@ -287,17 +287,22 @@
  
  ####### Files
  bin_PROGRAMS = knotify
@@ -13,9 +13,9 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
 +#>- libknotify_main_la_SOURCES = knotify.cpp knotify.skel
  #>+ 1
 -knotify_la_SOURCES=knotify.cpp  knotify_skel.cpp
--knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE)
+-knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI)
 +libknotify_main_la_SOURCES=knotify.cpp  knotify_skel.cpp
-+libknotify_main_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE)
++libknotify_main_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI)
 +libknotify_main_la_LDFLAGS = $(all_libraries)
 +#>- libknotify_main_la_METASOURCES = AUTO
 +
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
  knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  check_PROGRAMS = knotifytest
-@@ -295,23 +300,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -315,23 +320,28 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -69,27 +69,30 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
  am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
  #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
  #>+ 1
-@@ -324,13 +334,13 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -345,12 +355,18 @@
  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
- #>+ 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
+ am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/knotify.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/knotify.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/knotify_main.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/knotify_main.Po \
+ #>- @AMDEP_TRUE@	./$(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 \
++#>+ 9
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/knotify_skel.P  $(DEPDIR)/libknotify_main_la.all_cpp.P  ./$(DEPDIR)/knotify.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/knotify_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/knotify_main.Po \
+ @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@DEP_FILES =  $(DEPDIR)/knotify_skel.P  ./$(DEPDIR)/knotify.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/knotify_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/knotify_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/knotifytest.Po
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -351,14 +361,14 @@ CXXLD = $(CXX)
+@@ -372,14 +388,14 @@
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -107,27 +110,27 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -407,6 +417,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -426,6 +442,8 @@
+ 	done
  knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
 +libknotify_main.la: $(libknotify_main_la_OBJECTS) $(libknotify_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libknotify_main_la_LDFLAGS) $(libknotify_main_la_OBJECTS) $(libknotify_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -447,8 +459,9 @@ mostlyclean-compile:
+@@ -475,8 +493,9 @@
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotify.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotify_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotify_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotifytest.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@
  
  distclean-depend:
-@@ -644,13 +657,14 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -691,13 +710,14 @@
  
  messages:
  	$(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
@@ -145,7 +148,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
  #>+ 5
  knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES)
  	$(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false )
-@@ -663,7 +677,7 @@ knotify.moc: $(srcdir)/knotify.h
+@@ -710,7 +730,7 @@
  
  #>+ 3
  clean-metasources:
@@ -154,7 +157,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
  
  #>+ 4
  clean-idl:
-@@ -681,33 +695,33 @@ force-reedit:
+@@ -728,33 +748,33 @@
  
  
  #>+ 11
@@ -201,7 +204,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -717,5 +731,5 @@ kde-rpo-clean:
+@@ -764,5 +784,5 @@
  	-rm -f *.rpo
  
  #>+ 3
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index b13dedaf113..6d394e57652 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:51 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2003/03/11 13:10:34 markd Exp $
 
---- configure.orig	Tue May 21 15:42:33 2002
+--- configure.orig	Sat Feb  1 02:07:28 2003
 +++ configure
-@@ -20846,7 +20846,7 @@
+@@ -20255,7 +20255,7 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 +ac_link='rm -rf SunWS_cache; ${LIBTOOL_SHELL} --tag=CXX --mode=link ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
- ac_cxxflags_safe="$CXXFLAGS"
- ac_ldflags_safe="$LDFLAGS"
+ 
+     cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af
index 8ae3112f350..3f7d4b51bf1 100644
--- a/x11/kdelibs3/patches/patch-af
+++ b/x11/kdelibs3/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2002/08/25 19:23:51 jlam Exp $
+$NetBSD: patch-af,v 1.3 2003/03/11 13:10:34 markd Exp $
 
---- dcop/Makefile.am.orig	Sun Feb 17 06:36:25 2002
+--- dcop/Makefile.am.orig	Mon Sep 16 09:12:54 2002
 +++ dcop/Makefile.am
 @@ -29,7 +29,7 @@
  bin_PROGRAMS = dcopserver dcopserver_shutdown
@@ -9,11 +9,11 @@ $NetBSD: patch-af,v 1.2 2002/08/25 19:23:51 jlam Exp $
 -lib_LTLIBRARIES  = libDCOP.la dcopserver.la
 +lib_LTLIBRARIES  = libDCOP.la libdcopserver_main.la dcopserver.la
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
- libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries)
+ libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
  
-@@ -43,13 +43,17 @@
+@@ -45,13 +45,17 @@
  # dcopstub needs to go first for --enable-final to work
- libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
+ libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
  
 +libdcopserver_main_la_LDFLAGS = $(all_libraries)
 +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
@@ -33,10 +33,13 @@ $NetBSD: patch-af,v 1.2 2002/08/25 19:23:51 jlam Exp $
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -62,6 +66,3 @@
+@@ -64,9 +68,6 @@
  testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
  
  EXTRA_DIST = HOWTO ICE
 -
 -dummy.cpp:
 -	echo > dummy.cpp
+ 
+ DOXYGEN_REFERENCES = kdecore
+ DOXYGEN_EXCLUDE = KDE-ICE/*
diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag
index 63e62042edc..b1cb2705e04 100644
--- a/x11/kdelibs3/patches/patch-ag
+++ b/x11/kdelibs3/patches/patch-ag
@@ -1,19 +1,19 @@
-$NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $
 
---- dcop/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- dcop/Makefile.in.orig	Thu Jan 23 12:30:33 2003
 +++ dcop/Makefile.in
-@@ -293,7 +293,7 @@ INCLUDES = $(all_includes)
+@@ -313,7 +313,7 @@
  bin_PROGRAMS = dcopserver dcopserver_shutdown
  check_PROGRAMS = testdcop testdcopc
  
 -lib_LTLIBRARIES = libDCOP.la dcopserver.la
 +lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
- libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries)
+ libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
  
-@@ -307,13 +307,17 @@ noinst_HEADERS = version.h dcopglobal.h 
+@@ -329,13 +329,17 @@
  # dcopstub needs to go first for --enable-final to work
- libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
+ libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
  
 +libdcopserver_main_la_LDFLAGS = $(all_libraries)
 +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
@@ -33,8 +33,8 @@ $NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -332,14 +336,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
+@@ -357,14 +361,11 @@
+ CONFIG_CLEAN_FILES = dcop-path.h
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
 -dcopserver_la_DEPENDENCIES = libDCOP.la
@@ -50,10 +50,10 @@ $NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +#>+ 1
 +dcopserver_la_OBJECTS = dcopserver_main.lo
  libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la
- am_libDCOP_la_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo \
- 	dcopref.lo
-@@ -350,15 +351,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo
- 	dcopref.lo
+ am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \
+ 	dcopclient.lo
+@@ -375,15 +376,23 @@
+ 	dcopclient.lo
  @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
 +libdcopserver_main_la_DEPENDENCIES = libDCOP.la
@@ -79,44 +79,47 @@ $NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
  am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT)
  #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS)
  #>+ 1
-@@ -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
+@@ -415,25 +424,31 @@
+ #>- @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 \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/testdcop.Po ./$(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
+-@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)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/testdcopc.Po
++#>+ 19
++@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 \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(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 \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/testdcopc.Po
  
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -437,8 +449,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
+@@ -463,8 +478,9 @@
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
@@ -128,74 +131,48 @@ $NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
  HEADERS = $(include_HEADERS) $(noinst_HEADERS)
  
  
-@@ -449,7 +462,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -475,7 +491,7 @@
  DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
- 	Makefile.in
+ 	Makefile.in dcop-path.h.in
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
 +SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
  
  #>- all: all-recursive
  #>+ 1
-@@ -503,6 +516,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) 
+@@ -529,6 +545,8 @@
  @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)
 +libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -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@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver_shutdown.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopsignals.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopstub.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcop.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcopc.Po@am__quote@
- 
-@@ -851,22 +867,19 @@ uninstall-info: uninstall-info-recursive
+@@ -589,10 +607,11 @@
+ @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@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver_shutdown.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopsignals.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopstub.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcop.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcopc.Po@am__quote@
+ 
+@@ -905,9 +924,6 @@
  	uninstall-info-am uninstall-info-recursive \
- 	uninstall-libLTLIBRARIES uninstall-recursive
+ 	uninstall-libLTLIBRARIES uninstall-local uninstall-recursive
  
 -
 -dummy.cpp:
 -	echo > dummy.cpp
- # 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:
- 
- #>+ 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:
+ apidox-am-yes:
+ 	@if test "$(subdir)" != "."; then \
+ 		$(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\
+@@ -1112,18 +1128,6 @@
  
  
  #>+ 11
@@ -211,10 +188,10 @@ $NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
 -	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
+ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopref.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopclient.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
+@@ -1135,22 +1139,34 @@
  	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
  
@@ -254,16 +231,15 @@ $NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -946,9 +959,9 @@ kde-rpo-clean:
+@@ -1160,9 +1176,9 @@
  	-rm -f *.rpo
  
  #>+ 7
++dcopclient.lo: dcopclient.moc 
+ testdcop.lo: testdcop.moc 
+ testdcop.o: testdcop.moc 
+-dcopclient.lo: dcopclient.moc 
 -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.o: dcopserver.moc 
  dcopserver.lo: dcopserver.moc 
diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak
index bf3beec2331..0e09ce82bf1 100644
--- a/x11/kdelibs3/patches/patch-ak
+++ b/x11/kdelibs3/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $
 
---- kconf_update/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kconf_update/Makefile.in.orig	Thu Jan 23 12:30:34 2003
 +++ kconf_update/Makefile.in
-@@ -282,16 +282,20 @@ x_libraries = @x_libraries@
+@@ -302,16 +302,20 @@
  
  INCLUDES = $(all_includes)
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  #>- METASOURCES = AUTO
  subdir = kconf_update
-@@ -300,19 +304,24 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -320,19 +324,24 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -59,24 +59,26 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -320,9 +329,13 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -341,11 +350,13 @@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--#>- @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
+ am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kconf_update.Plo
+-#>+ 3
+-@AMDEP_TRUE@DEP_FILES =   ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@	@AMDEP_TRUE@	./$(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
++@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)
-@@ -343,9 +356,10 @@ CXXLD = $(CXX)
+@@ -366,9 +377,10 @@
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -89,27 +91,27 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -394,6 +408,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -415,6 +427,8 @@
+ 	done
  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)
 +libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -428,8 +444,9 @@ mostlyclean-compile:
+@@ -454,8 +468,9 @@
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kconf_update.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kconf_update_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kconf_update_main.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update_main.Po@am__quote@
  
  distclean-depend:
- 	-rm -rf $(DEPDIR)
-@@ -602,9 +619,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 	-rm -rf ./$(DEPDIR)
+@@ -646,9 +661,6 @@
  
  # Internal
  # noinst_HEADERS = kconf_update.h
diff --git a/x11/kdelibs3/patches/patch-ao b/x11/kdelibs3/patches/patch-ao
index 9b10e555400..711916d7e8f 100644
--- a/x11/kdelibs3/patches/patch-ao
+++ b/x11/kdelibs3/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:52 jlam Exp $
+$NetBSD: patch-ao,v 1.3 2003/03/11 13:10:35 markd Exp $
 
---- kded/Makefile.am.orig	Fri Feb 22 11:05:02 2002
-+++ kded/Makefile.am
+--- kded/Makefile.am.orig	Mon Sep 16 09:13:07 2002
++++ kded/Makefile.am	Sat Feb  1 02:25:15 2003
 @@ -19,32 +19,40 @@
  
  INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
@@ -10,23 +10,23 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:52 jlam Exp $
 +lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
  
 -kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kded_la_LIBADD = $(LIB_KSYCOCA)
+-kded_la_LIBADD = $(LIB_KIO)
 -kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
 +libkded_main_la_LDFLAGS = $(all_libraries)
-+libkded_main_la_LIBADD = $(LIB_KSYCOCA)
++libkded_main_la_LIBADD = $(LIB_KIO)
 +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
  			kbuildservicefactory.cpp \
  			kbuildservicegroupfactory.cpp kdedmodule.cpp
  
 -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA)
+-kbuildsycoca_la_LIBADD = $(LIB_KIO)
 -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 +kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
 +kded_la_LIBADD = libkded_main.la
 +kded_la_SOURCES = kded_main.cpp
 +
 +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries)
-+libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA)
++libkbuildsycoca_main_la_LIBADD = $(LIB_KIO)
 +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
  				kbuildservicefactory.cpp \
  				kbuildservicegroupfactory.cpp \
@@ -41,19 +41,19 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:52 jlam Exp $
  bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname
  
  kded_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kded_LDADD = $(LIB_KSYCOCA) kded.la
+-kded_LDADD = kded.la
 -kded_SOURCES = dummy.cpp
-+kded_LDADD = $(LIB_KSYCOCA) libkded_main.la
++kded_LDADD = libkded_main.la
 +kded_SOURCES = kded_main.cpp
  
  kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la
+-kbuildsycoca_LDADD = kbuildsycoca.la
 -kbuildsycoca_SOURCES = dummy.cpp
-+kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la
++kbuildsycoca_LDADD = libkbuildsycoca_main.la
 +kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
  
  kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- kdontchangethehostname_LDADD =  $(LIB_KDECORE)
+ kdontchangethehostname_LDADD = $(LIB_KDECORE) 
 @@ -64,6 +72,3 @@
  
  update_DATA = kded.upd
diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap
index 825018aea33..9322c74ac33 100644
--- a/x11/kdelibs3/patches/patch-ap
+++ b/x11/kdelibs3/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $
 
---- kded/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kded/Makefile.in.orig	Thu Jan 23 12:30:35 2003
 +++ kded/Makefile.in
-@@ -283,18 +283,22 @@ x_libraries = @x_libraries@
+@@ -303,18 +303,22 @@
  
  INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
  
@@ -10,29 +10,29 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
  
 -kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kded_la_LIBADD = $(LIB_KSYCOCA)
+-kded_la_LIBADD = $(LIB_KIO)
 -kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
 +libkded_main_la_LDFLAGS = $(all_libraries)
-+libkded_main_la_LIBADD = $(LIB_KSYCOCA)
++libkded_main_la_LIBADD = $(LIB_KIO)
 +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \
  			kbuildservicefactory.cpp \
  			kbuildservicegroupfactory.cpp kdedmodule.cpp
  
  
 -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA)
+-kbuildsycoca_la_LIBADD = $(LIB_KIO)
 -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 +kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
 +kded_la_LIBADD = libkded_main.la
 +kded_la_SOURCES = kded_main.cpp
 +
 +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries)
-+libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA)
++libkbuildsycoca_main_la_LIBADD = $(LIB_KIO)
 +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
  				kbuildservicefactory.cpp \
  				kbuildservicegroupfactory.cpp \
  				kbuildimageiofactory.cpp \
-@@ -302,15 +306,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c
+@@ -322,15 +326,19 @@
  				kctimefactory.cpp
  
  
@@ -43,20 +43,20 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
  bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname
  
  kded_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kded_LDADD = $(LIB_KSYCOCA) kded.la
+-kded_LDADD = kded.la
 -kded_SOURCES = dummy.cpp
-+kded_LDADD = $(LIB_KSYCOCA) libkded_main.la
++kded_LDADD = libkded_main.la
 +kded_SOURCES = kded_main.cpp
  
  kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la
+-kbuildsycoca_LDADD = kbuildsycoca.la
 -kbuildsycoca_SOURCES = dummy.cpp
-+kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la
++kbuildsycoca_LDADD = libkbuildsycoca_main.la
 +kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
  
  kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- kdontchangethehostname_LDADD = $(LIB_KDECORE)
-@@ -337,46 +345,56 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ kdontchangethehostname_LDADD = $(LIB_KDECORE) 
+@@ -357,46 +365,56 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -138,54 +138,54 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
  am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
  #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS)
  #>+ 1
-@@ -389,33 +407,39 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -410,33 +428,39 @@
  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
+ am__depfiles_maybe = depfiles
+-#>- @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 \
+-@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
++@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) \
-@@ -438,6 +462,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
+@@ -459,6 +483,7 @@
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
@@ -193,7 +193,7 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
  	$(kbuildsycoca_SOURCES) $(kded_SOURCES) \
  	$(kdontchangethehostname_SOURCES)
  DATA = $(servicetype_DATA) $(update_DATA)
-@@ -446,7 +471,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE
+@@ -467,7 +492,7 @@
  
  DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -202,7 +202,7 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -497,6 +522,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC
+@@ -516,6 +541,10 @@
  	$(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)
@@ -210,31 +210,31 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +	$(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS)
 +libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -537,15 +566,18 @@ mostlyclean-compile:
+@@ -561,15 +590,18 @@
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildimageiofactory.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildprotocolinfofactory.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildservicefactory.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildservicegroupfactory.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildservicetypefactory.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildsycoca.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildsycoca_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbuildsycoca_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kctimefactory.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kded.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kded_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kded_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdedmodule.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khostname.Po@am__quote@
- 
-@@ -657,7 +689,7 @@ distclean-tags:
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildimageiofactory.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildprotocolinfofactory.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicefactory.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicegroupfactory.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicetypefactory.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kctimefactory.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdedmodule.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khostname.Po@am__quote@
  
+@@ -696,7 +728,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h 
@@ -242,7 +242,7 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -776,9 +808,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -821,9 +853,6 @@
  	uninstall-info-am uninstall-libLTLIBRARIES \
  	uninstall-servicetypeDATA uninstall-updateDATA
  
@@ -252,7 +252,7 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll 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:
-@@ -810,45 +839,45 @@ force-reedit:
+@@ -855,45 +884,45 @@
  
  
  #>+ 11
@@ -319,7 +319,7 @@ $NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -859,8 +888,8 @@ kde-rpo-clean:
+@@ -904,8 +933,8 @@
  
  #>+ 7
  kbuildsycoca.lo: kbuildsycoca.moc 
diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av
index 3bb829ea04c..3e46869f3a3 100644
--- a/x11/kdelibs3/patches/patch-av
+++ b/x11/kdelibs3/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $
 
---- kdeprint/management/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kdeprint/management/Makefile.in.orig	Thu Jan 23 12:30:35 2003
 +++ kdeprint/management/Makefile.in
-@@ -264,15 +264,19 @@ x_libraries = @x_libraries@
- 
+@@ -283,15 +283,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)
  
 -lib_LTLIBRARIES = libkdeprint_management.la kaddprinterwizard.la
@@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
  
  libkdeprint_management_la_SOURCES = \
-@@ -317,11 +321,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -336,11 +340,18 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -49,7 +49,7 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
  am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
  	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
-@@ -364,11 +375,11 @@ libkdeprint_management_la_nofinal_OBJECT
+@@ -385,11 +396,11 @@
  bin_PROGRAMS = kaddprinterwizard$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -64,48 +64,46 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -376,9 +387,10 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
+@@ -399,8 +410,10 @@
  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 \
-@@ -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__depfiles_maybe = depfiles
+ #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \
++#>- @AMDEP_TRUE@	./$(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 \
+@@ -447,10 +460,12 @@
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/networkscanner.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/pluginaction.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
+-#>+ 99
++#>+ 103
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkdeprint_management_la.all_cpp.P  ./$(DEPDIR)/cjanuswidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(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 \
+@@ -498,8 +513,10 @@
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/pluginaction.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/cjanuswidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(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 \
+@@ -567,6 +584,7 @@
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
@@ -113,7 +111,7 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  	$(libkdeprint_management_la_SOURCES) \
  	$(kaddprinterwizard_SOURCES)
  DATA = $(dataicon_DATA)
-@@ -526,7 +541,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
+@@ -575,7 +593,7 @@
  
  DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -122,8 +120,8 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -575,6 +590,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -622,6 +640,8 @@
+ 	done
  kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
 +libkaddprinterwizard_main.la: $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_DEPENDENCIES) 
@@ -131,20 +129,20 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll 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) 
-@@ -615,9 +632,10 @@ distclean-compile:
+@@ -667,9 +687,10 @@
  	-rm -f *.tab.c
  
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cjanuswidget.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/jobitem.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaddprinterwizard.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaddprinterwizard_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaddprinterwizard_main.Po@am__quote@
- @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@
-@@ -761,7 +779,7 @@ distclean-tags:
- 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjanuswidget.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobitem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaddprinterwizard.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaddprinterwizard_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaddprinterwizard_main.Po@am__quote@
+ @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@
+@@ -830,7 +851,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=tileup.png tiledown.png side.png 
@@ -152,7 +150,7 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -878,9 +896,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -953,9 +974,6 @@
  	uninstall-dataiconDATA uninstall-info-am \
  	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
  
@@ -162,7 +160,7 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll 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:
-@@ -895,140 +910,140 @@ libkdeprint_management.la.closure: $(lib
+@@ -970,156 +988,156 @@
  
  
  #>+ 3
@@ -172,6 +170,10 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
  
  #>+ 3
+ kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
+ 	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
+ 
+ #>+ 3
 -kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
 -	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
 +kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
@@ -204,6 +206,12 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  #>+ 3
 -pluginaction.moc: $(srcdir)/pluginaction.h
 -	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
++networkscanner.moc: $(srcdir)/networkscanner.h
++	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
+ 
+ #>+ 3
+-kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
+-	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
 +kmlistview.moc: $(srcdir)/kmlistview.h
 +	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
  
@@ -252,18 +260,22 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  #>+ 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
++kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
++	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
  
  #>+ 3
- kmpropwidget.moc: $(srcdir)/kmpropwidget.h
- 	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
+-kmpropwidget.moc: $(srcdir)/kmpropwidget.h
+-	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
++kmdbcreator.moc: $(srcdir)/kmdbcreator.h
++	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
  
  #>+ 3
 -cjanuswidget.moc: $(srcdir)/cjanuswidget.h
 -	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
--
--#>+ 3
++kmpropwidget.moc: $(srcdir)/kmpropwidget.h
++	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
+ 
+ #>+ 3
  kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
  	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
  
@@ -322,63 +334,71 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
  
  #>+ 3
--kmdriverdb.moc: $(srcdir)/kmdriverdb.h
--	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
+-kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
+-	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.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
+-networkscanner.moc: $(srcdir)/networkscanner.h
+-	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
++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
+-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.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
+-kmwsocket.moc: $(srcdir)/kmwsocket.h
+-	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
 +kmdriverdb.moc: $(srcdir)/kmdriverdb.h
 +	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
  
  #>+ 3
+ kmtimer.moc: $(srcdir)/kmtimer.h
+ 	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
+ 
+ #>+ 3
+-kmiconview.moc: $(srcdir)/kmiconview.h
+-	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
++kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
++	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.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
++kmwizardpage.moc: $(srcdir)/kmwizardpage.h
++	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.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
-+
-+#>+ 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
+-	-rm -f  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kmwdriverselect.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 kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
++	-rm -f  kmmainview.moc kmconfigfonts.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.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 kmconfigjobs.moc kmwizardpage.moc kmdriverdialog.moc
  
  #>+ 3
  clean-closures:
-@@ -1045,7 +1060,7 @@ force-reedit:
+@@ -1136,7 +1154,7 @@
  
  
  #>+ 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  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
+-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 $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kmwdriverselect.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmjobviewer.moc kmpropertypage.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 $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmconfigfonts.moc kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.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 kmconfigjobs.moc kmdriverdialog.moc kmwizardpage.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:
+@@ -1172,77 +1190,77 @@
  	-rm -f *.rpo
  
- #>+ 67
+ #>+ 75
 -kmtimer.o: kmtimer.moc 
 -kmpropertypage.o: kmpropertypage.moc 
 -smbview.lo: smbview.moc 
@@ -386,9 +406,11 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
  kmmainview.o: kmmainview.moc 
 -kmwsmb.o: kmwsmb.moc 
 -kmwclass.lo: kmwclass.moc 
+-kmconfigfonts.o: kmconfigfonts.moc 
 -kmwsocket.o: kmwsocket.moc 
 +kmpropcontainer.lo: kmpropcontainer.moc 
 +kmmainview.lo: kmmainview.moc 
++kmconfigjobs.o: kmconfigjobs.moc 
 +kmpropwidget.o: kmpropwidget.moc 
 +kmdbcreator.o: kmdbcreator.moc 
 +kmwizardpage.lo: kmwizardpage.moc 
@@ -403,6 +425,7 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 -kminstancepage.lo: kminstancepage.moc 
 -kiconselectaction.lo: kiconselectaction.moc 
 -kxmlcommandselector.lo: kxmlcommandselector.moc 
+-kmconfigfonts.lo: kmconfigfonts.moc 
 -kmwsocket.lo: kmwsocket.moc 
 -kmmainview.lo: kmmainview.moc 
 -kxmlcommanddlg.o: kxmlcommanddlg.moc 
@@ -415,8 +438,8 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 -kmdbcreator.lo: kmdbcreator.moc 
 -kmjobviewer.o: kmjobviewer.moc 
 -kmpropcontainer.lo: kmpropcontainer.moc 
- kmwizardpage.o: kmwizardpage.moc 
 -kmwclass.o: kmwclass.moc 
+ kmwizardpage.o: kmwizardpage.moc 
 +kmwdrivertest.lo: kmwdrivertest.moc 
 +kiconselectaction.o: kiconselectaction.moc 
 +kmiconview.o: kmiconview.moc 
@@ -425,45 +448,55 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +kmtimer.o: kmtimer.moc 
 +kmjobviewer.o: kmjobviewer.moc 
 +kmtimer.lo: kmtimer.moc 
+ kmwdriverselect.lo: kmwdriverselect.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 
+-smbview.o: smbview.moc 
 -kmwdrivertest.lo: kmwdrivertest.moc 
 -kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
 -kmprinterview.o: kmprinterview.moc 
--kmwizardpage.lo: kmwizardpage.moc 
 -kmpropwidget.o: kmpropwidget.moc 
+-kmwizardpage.lo: kmwizardpage.moc 
++kmconfiggeneral.lo: kmconfiggeneral.moc 
  kmconfigdialog.o: kmconfigdialog.moc 
 -cjanuswidget.lo: cjanuswidget.moc 
++smbview.o: smbview.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 
++kmwdriverselect.o: kmwdriverselect.moc 
++networkscanner.lo: networkscanner.moc 
 +kmdbcreator.lo: kmdbcreator.moc 
++kmconfigfonts.o: kmconfigfonts.moc 
++networkscanner.o: networkscanner.moc 
  kmconfigfilter.lo: kmconfigfilter.moc 
 -kmconfigfilter.o: kmconfigfilter.moc 
 -pluginaction.o: pluginaction.moc 
 -kmiconview.o: kmiconview.moc 
 -kiconselectaction.o: kiconselectaction.moc 
++kmconfigfonts.lo: kmconfigfonts.moc 
 +kmdriverdbwidget.lo: kmdriverdbwidget.moc 
 +kmwsocketutil.lo: kmwsocketutil.moc 
 +kminstancepage.lo: kminstancepage.moc 
  kmwizard.lo: kmwizard.moc 
+-kmconfigjobs.lo: kmconfigjobs.moc 
 -kmconfigpage.o: kmconfigpage.moc 
 -kmdbcreator.o: kmdbcreator.moc 
+-networkscanner.lo: networkscanner.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 
+-kmconfigjobs.o: kmconfigjobs.moc 
 +kmwsocket.lo: kmwsocket.moc 
 +cjanuswidget.lo: cjanuswidget.moc 
 +kmwsmb.o: kmwsmb.moc 
@@ -479,14 +512,17 @@ $NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $
 -kmjobviewer.lo: kmjobviewer.moc 
 -kmwizard.o: kmwizard.moc 
 -kmpropwidget.lo: kmpropwidget.moc 
+-networkscanner.o: networkscanner.moc 
 -kmconfiggeneral.o: kmconfiggeneral.moc 
 -kmwsmb.lo: kmwsmb.moc 
  kmiconview.lo: kmiconview.moc 
 -kminstancepage.o: kminstancepage.moc 
+-kmwdriverselect.o: kmwdriverselect.moc 
 -kmpropcontainer.o: kmpropcontainer.moc 
 +kxmlcommanddlg.o: kxmlcommanddlg.moc 
 +kmconfigfilter.o: kmconfigfilter.moc 
 +kmwsocketutil.o: kmwsocketutil.moc 
++kmconfigjobs.lo: kmconfigjobs.moc 
 +kmdriverdb.lo: kmdriverdb.moc 
 +kmprinterview.o: kmprinterview.moc 
 +kmwsocket.o: kmwsocket.moc 
diff --git a/x11/kdelibs3/patches/patch-az b/x11/kdelibs3/patches/patch-az
index b283240a79a..2f7677d83b6 100644
--- a/x11/kdelibs3/patches/patch-az
+++ b/x11/kdelibs3/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.2 2002/08/25 19:23:53 jlam Exp $
+$NetBSD: patch-az,v 1.3 2003/03/11 13:10:35 markd Exp $
 
---- kinit/Makefile.am.orig	Wed Jan 23 06:28:28 2002
+--- kinit/Makefile.am.orig	Mon Sep 16 09:13:34 2002
 +++ kinit/Makefile.am
-@@ -58,8 +58,7 @@
+@@ -54,8 +54,7 @@
  klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
  
  klauncher_LDFLAGS =  $(all_libraries) $(KDE_RPATH)
@@ -12,9 +12,9 @@ $NetBSD: patch-az,v 1.2 2002/08/25 19:23:53 jlam Exp $
  
  METASOURCES = AUTO
  
-@@ -73,5 +72,3 @@
- # do nothing, it just depends on it
- 	
+@@ -65,5 +64,3 @@
+ 
+ shell.o: wrapper.c
  
 -dummy.cpp:
 -	echo > dummy.cpp
diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba
index 931ba8d9506..89cc14f7181 100644
--- a/x11/kdelibs3/patches/patch-ba
+++ b/x11/kdelibs3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $
 
---- kinit/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kinit/Makefile.in.orig	Thu Jan 23 12:30:38 2003
 +++ kinit/Makefile.in
-@@ -324,8 +324,7 @@ klauncher_la_LIBADD = $(LIB_KSYCOCA)
+@@ -340,8 +340,7 @@
  klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
  
  klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -10,9 +10,9 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:39 skrll Exp $
 -klauncher_SOURCES = dummy.cpp
 +klauncher_SOURCES = main.cpp
  
- METASOURCES = AUTO
+ #>- METASOURCES = AUTO
  
-@@ -374,11 +373,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT)
+@@ -390,11 +389,12 @@
  #>+ 1
  kioslave_OBJECTS = kioslave.$(OBJEXT)
  kioslave_DEPENDENCIES =
@@ -28,64 +28,65 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:39 skrll Exp $
  am_kshell_OBJECTS = shell.$(OBJEXT)
  #>- kshell_OBJECTS = $(am_kshell_OBJECTS)
  #>+ 1
-@@ -404,25 +404,25 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -421,28 +421,25 @@
  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
- #>+ 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
+ am__depfiles_maybe = depfiles
+-#>- @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 \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/wrapper.Po
+-#>+ 15
+-@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@	./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/shell.Po ./$(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)/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 \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.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)/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)/main.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)/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 \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.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
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po
  
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -569,13 +569,13 @@ distclean-compile:
+@@ -592,13 +589,13 @@
  	-rm -f *.tab.c
  
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/autostart.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kinit.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kioslave.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klauncher.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klauncher_main.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrapper.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lnusertemp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@
- @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@
-@@ -716,7 +716,7 @@ distclean-tags:
- 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autostart.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kinit.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kioslave.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klauncher.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klauncher_main.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrapper.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnusertemp.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+ @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@
+@@ -751,7 +748,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=README.DCOP LICENSE.setproctitle README.autostart README.wrapper startkde.example 
@@ -93,10 +94,10 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -858,9 +858,6 @@ kwrapper.c : wrapper.c
+@@ -897,9 +894,6 @@
+ kwrapper.o: wrapper.c
  
- shell.c : wrapper.c
- # do nothing, it just depends on it
+ shell.o: wrapper.c
 -
 -dummy.cpp:
 -	echo > dummy.cpp
diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd
index 2bd59e82d1e..ce67482efec 100644
--- a/x11/kdelibs3/patches/patch-bd
+++ b/x11/kdelibs3/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
+$NetBSD: patch-bd,v 1.5 2003/03/11 13:10:36 markd Exp $
 
---- kio/kssl/kopenssl.cc.orig	Mon Aug 12 19:33:58 2002
+--- kio/kssl/kopenssl.cc.orig	Fri Jan  3 17:58:50 2003
 +++ kio/kssl/kopenssl.cc
-@@ -174,7 +174,7 @@ void KOpenSSLProxy::destroy() {
+@@ -177,7 +177,7 @@
    _me = NULL;
  }
  
@@ -11,7 +11,7 @@ $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
  #include <qdir.h>
  #include <qstring.h>
  #include <qstringlist.h>
-@@ -237,26 +237,22 @@ KConfig *cfg;
+@@ -240,26 +240,22 @@
  
     delete cfg;
  
@@ -43,7 +43,7 @@ $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
  // FIXME: #define here for the various OS types to optimize
     libnamess 
  	     #ifdef hpux
-@@ -285,10 +281,16 @@ KConfig *cfg;
+@@ -294,10 +290,16 @@
  	     << "libcrypto.so.0.9.6"
               #endif
  	     ;
@@ -60,7 +60,7 @@ $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -300,9 +302,9 @@ KConfig *cfg;
+@@ -311,9 +313,9 @@
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
        }
@@ -70,8 +70,8 @@ $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
 -#endif
  
     if (_cryptoLib) {
- #ifdef HAVE_SSL 
-@@ -401,16 +403,14 @@ KConfig *cfg;
+ #ifdef KSSL_HAVE_SSL 
+@@ -413,16 +415,14 @@
  #endif
     }
  
@@ -93,7 +93,7 @@ $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -422,9 +422,9 @@ KConfig *cfg;
+@@ -436,9 +436,9 @@
           	_sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
        }
@@ -103,4 +103,4 @@ $NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
 -#endif
  
     if (_sslLib) {
- #ifdef HAVE_SSL 
+ #ifdef KSSL_HAVE_SSL 
diff --git a/x11/kdelibs3/patches/patch-be b/x11/kdelibs3/patches/patch-be
deleted file mode 100644
index a2318bf1181..00000000000
--- a/x11/kdelibs3/patches/patch-be
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-be,v 1.4 2002/08/28 07:15:44 skrll Exp $
-
---- kio/kssl/ksslcertificate.cc.orig	Wed Aug 14 15:48:38 2002
-+++ kio/kssl/ksslcertificate.cc
-@@ -90,7 +90,7 @@ public:
- KSSLCertificate::KSSLCertificate() {
-   d = new KSSLCertificatePrivate;
-   d->m_stateCached = false;
--  KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl");
-+  KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
- #ifdef HAVE_SSL
-   d->m_cert = NULL;
- #endif
-@@ -100,7 +100,7 @@ KSSLCertificate::KSSLCertificate() {
- KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) {
-   d = new KSSLCertificatePrivate;
-   d->m_stateCached = false;
--  KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl");
-+  KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
- #ifdef HAVE_SSL
-   d->m_cert = NULL;
-   setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert()));
diff --git a/x11/kdelibs3/patches/patch-bf b/x11/kdelibs3/patches/patch-bf
deleted file mode 100644
index d92f5554b08..00000000000
--- a/x11/kdelibs3/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2002/08/25 19:23:54 jlam Exp $
-
---- kio/kssl/ksslsettings.cc.orig	Thu Feb  7 22:16:52 2002
-+++ kio/kssl/ksslsettings.cc
-@@ -89,7 +89,7 @@
-   d = new KSSLSettingsPrivate;
-   m_cfg = new KConfig("cryptodefaults", false, false);
- 
--  if (!KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl")) {
-+  if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
-     //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
-   }
- 
diff --git a/x11/kdelibs3/patches/patch-bg b/x11/kdelibs3/patches/patch-bg
index 2d9789ca09b..0503dc4f47e 100644
--- a/x11/kdelibs3/patches/patch-bg
+++ b/x11/kdelibs3/patches/patch-bg
@@ -1,10 +1,10 @@
-$NetBSD: patch-bg,v 1.2 2002/08/25 19:23:54 jlam Exp $
+$NetBSD: patch-bg,v 1.3 2003/03/11 13:10:37 markd Exp $
 
---- kio/misc/Makefile.am.orig	Fri Jan  4 10:52:42 2002
+--- kio/misc/Makefile.am.orig	Fri Jan  3 17:58:52 2003
 +++ kio/misc/Makefile.am
-@@ -22,16 +22,20 @@
+@@ -22,15 +22,19 @@
  
- SUBDIRS = . ksendbugmail kpac kdesasl kssld
+ SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile
  
 -lib_LTLIBRARIES = kio_uiserver.la
 +lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la
@@ -16,10 +16,9 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:54 jlam Exp $
 +kio_uiserver_LDADD = libkio_uiserver_main.la
  kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
  
--kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
-+libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
- 	renamedlg.cpp skipdlg.cpp
+-kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
 -kio_uiserver_la_LIBADD = $(LIB_KIO)
++libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
 +libkio_uiserver_main_la_LIBADD = $(LIB_KIO)
 +libkio_uiserver_main_la_LDFLAGS = $(all_libraries)
 +
diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh
index 6447aacb0b9..124c15c9b1d 100644
--- a/x11/kdelibs3/patches/patch-bh
+++ b/x11/kdelibs3/patches/patch-bh
@@ -1,10 +1,10 @@
-$NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $
 
---- kio/misc/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kio/misc/Makefile.in.orig	Thu Jan 23 12:30:39 2003
 +++ kio/misc/Makefile.in
-@@ -286,20 +286,24 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
+@@ -306,17 +306,21 @@
  
- SUBDIRS = . ksendbugmail kpac kdesasl kssld
+ SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile
  
 -lib_LTLIBRARIES = kio_uiserver.la
 +lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la
@@ -16,15 +16,12 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +kio_uiserver_LDADD = libkio_uiserver_main.la
  kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
  
--#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
-+#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
- #>- 	renamedlg.cpp skipdlg.cpp
- #>+ 2
--kio_uiserver_la_SOURCES=uiserver.cpp   \
-+libkio_uiserver_main_la_SOURCES=uiserver.cpp   \
- 	renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp
- 
+-#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
++#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
+ #>+ 1
+-kio_uiserver_la_SOURCES=uiserver.cpp   uiserver_skel.cpp observer_stub.cpp
 -kio_uiserver_la_LIBADD = $(LIB_KIO)
++libkio_uiserver_main_la_SOURCES=uiserver.cpp   uiserver_skel.cpp observer_stub.cpp
 +libkio_uiserver_main_la_LIBADD = $(LIB_KIO)
 +libkio_uiserver_main_la_LDFLAGS = $(all_libraries)
 +
@@ -33,27 +30,27 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
  kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  observer_DIR = $(top_srcdir)/kio/kio
-@@ -327,23 +331,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -344,23 +348,28 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
 -kio_uiserver_la_DEPENDENCIES =
--am_kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
+-am_kio_uiserver_la_OBJECTS = uiserver.lo
 +kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la
 +am_kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
  #>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS)
 +#>+ 1
 +kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
 +libkio_uiserver_main_la_DEPENDENCIES =
-+am_libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
++am_libkio_uiserver_main_la_OBJECTS = uiserver.lo
 +#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS)
  #>+ 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_nofinal_OBJECTS = uiserver.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_nofinal_OBJECTS = uiserver.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) \
@@ -71,32 +68,32 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
  am_kmailservice_OBJECTS = kmailservice.$(OBJEXT)
  #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS)
  #>+ 1
-@@ -361,14 +370,20 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -379,14 +388,20 @@
  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
+ am__depfiles_maybe = depfiles
+-#>- @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 \
+ #>- @AMDEP_TRUE@	./$(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 \
+-@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)
++@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 \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(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 \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/uiserver.Plo
+ 
+@@ -409,7 +424,8 @@
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -106,7 +103,7 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
  	$(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
  DATA = $(kde_services_DATA) $(protocol_DATA)
  
-@@ -404,7 +420,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -422,7 +438,7 @@
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -115,35 +112,35 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -453,6 +469,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -469,6 +485,8 @@
+ 	done
  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)
 +libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -493,7 +511,8 @@ mostlyclean-compile:
+@@ -514,7 +532,8 @@
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kio_uiserver_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kio_uiserver_main.Po@am__quote@
- @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@
-@@ -668,7 +687,7 @@ distclean-tags:
- 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kio_uiserver_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kio_uiserver_main.Po@am__quote@
+ @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)/uiserver.Plo@am__quote@
+@@ -702,7 +721,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--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 
+-KDE_DIST=rlogin.protocol telnet.protocol rtsp.protocol kmailservice.protocol kio_uiserver.desktop 
++KDE_DIST=kio_uiserver.desktop rlogin.protocol kmailservice.protocol telnet.protocol rtsp.protocol 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -815,6 +834,18 @@ dummy.cpp: uiserver.kidl
+@@ -855,6 +874,10 @@
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
@@ -151,18 +148,10 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
 +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
+@@ -866,10 +889,6 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
  
  #>+ 3
@@ -170,33 +159,22 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
 -	$(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 renamedlg.moc skipdlg.moc
-+	-rm -f  uiserver.moc skipdlg.moc renamedlg.moc
+ 	-rm -f  uiserver.moc
  
- #>+ 5
- clean-idl:
-@@ -858,33 +877,33 @@ force-reedit:
+@@ -890,33 +909,33 @@
  
  
  #>+ 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  uiserver.moc skipdlg.moc renamedlg.moc
+-kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp  uiserver.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
++libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp  uiserver.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 ; do \
+ 	for file in uiserver.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; \
@@ -231,22 +209,14 @@ $NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -894,13 +913,13 @@ kde-rpo-clean:
+@@ -926,7 +945,7 @@
  	-rm -f *.rpo
  
- #>+ 11
+ #>+ 5
 -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 
+ $(srcdir)/uiserver.cpp: observer_stub.h 
 +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-bj b/x11/kdelibs3/patches/patch-bj
deleted file mode 100644
index a415dd89383..00000000000
--- a/x11/kdelibs3/patches/patch-bj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2002/08/25 19:23:54 jlam Exp $
-
---- kio/misc/kssld/kssld.cpp.orig	Wed May  8 19:28:06 2002
-+++ kio/misc/kssld/kssld.cpp
-@@ -63,7 +63,7 @@
- {
- // ----------------------- FOR THE CACHE ------------------------------------	
-   cfg = new KSimpleConfig("ksslpolicies", false);
--  if (!KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl")) {
-+  if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
-      //    kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
-   }
-   cacheLoadDefaultPolicies();
diff --git a/x11/kdelibs3/patches/patch-bl b/x11/kdelibs3/patches/patch-bl
deleted file mode 100644
index 140feb6cc35..00000000000
--- a/x11/kdelibs3/patches/patch-bl
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-bl,v 1.2 2002/08/25 19:23:54 jlam Exp $
-
---- kioslave/file/file.cc.orig	Thu Feb 28 14:50:26 2002
-+++ kioslave/file/file.cc
-@@ -43,6 +43,8 @@
- #ifdef HAVE_VOLMGT
- #include <volmgt.h>
- #include <sys/mnttab.h>
-+#else
-+#include <kstddirs.h>
- #endif
- 
- #include <kio/ioslave_defaults.h>
-@@ -1034,24 +1036,31 @@
-     QCString point = QFile::encodeName( shellQuote(_point) );
-     QCString fstype = _fstype;
-     QCString readonly = _ro ? "-r" : "";
-+    QString path = getenv("PATH");
-+    path.append(":/usr/sbin:/sbin");
-+    QString mountProg = KGlobal::dirs()->findExe("mount", path);
-+
-+    if (mountProg.isEmpty()) {
-+        mountProg = "mount";
-+    }
- 
-     // Two steps, in case mount doesn't like it when we pass all options
-     for ( int step = 0 ; step <= 1 ; step++ )
-     {
-         // Mount using device only if no fstype nor mountpoint (KDE-1.x like)
-         if ( !_dev.isEmpty() && _point.isEmpty() && fstype.isEmpty() )
--            buffer.sprintf( "mount %s 2>%s", dev.data(), tmp );
-+            buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), dev.data(), tmp );
-         else
-           // Mount using the mountpoint, if no fstype nor device (impossible in first step)
-           if ( !_point.isEmpty() && _dev.isEmpty() && fstype.isEmpty() )
--            buffer.sprintf( "mount %s 2>%s", point.data(), tmp );
-+            buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), point.data(), tmp );
-           else
-             // mount giving device + mountpoint but no fstype
-             if ( !_point.isEmpty() && !_dev.isEmpty() && fstype.isEmpty() )
--              buffer.sprintf( "mount %s %s %s 2>%s", readonly.data(), dev.data(), point.data(), tmp );
-+              buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp );
-             else
-               // mount giving device + mountpoint + fstype
--              buffer.sprintf( "mount %s -t %s %s %s 2>%s", readonly.data(),
-+              buffer.sprintf( "%s %s -t %s %s %s 2>%s", mountProg.latin1(), readonly.data(),
-                               fstype.data(), dev.data(), point.data(), tmp );
- 
-         kdDebug(7101) << buffer << endl;
-@@ -1195,7 +1204,14 @@
- 		return;
- 	}
- #else
--    buffer.sprintf( "umount %s 2>%s", QFile::encodeName(_point).data(), tmp );
-+    QString path = getenv("PATH");
-+    path.append(":/usr/sbin:/sbin");
-+    QString umountProg = KGlobal::dirs()->findExe("umount", path);
-+
-+    if (umountProg.isEmpty()) {
-+        umountProg = "umount";
-+    }
-+    buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), QFile::encodeName(_point).data(), tmp );
-     system( buffer.ascii() );
- #endif /* HAVE_VOLMGT */
- 
diff --git a/x11/kdelibs3/patches/patch-bm b/x11/kdelibs3/patches/patch-bm
index 5d1c55818cd..2f49801b9dc 100644
--- a/x11/kdelibs3/patches/patch-bm
+++ b/x11/kdelibs3/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.2 2002/08/25 19:23:54 jlam Exp $
+$NetBSD: patch-bm,v 1.3 2003/03/11 13:10:38 markd Exp $
 
---- kioslave/http/Makefile.am.orig	Fri Jan 18 16:04:23 2002
+--- kioslave/http/Makefile.am.orig	Sun Oct 27 11:18:24 2002
 +++ kioslave/http/Makefile.am
-@@ -9,19 +9,22 @@
+@@ -9,7 +9,7 @@
  ####### Files
  
  bin_PROGRAMS = kio_http_cache_cleaner
@@ -10,7 +10,8 @@ $NetBSD: patch-bm,v 1.2 2002/08/25 19:23:54 jlam Exp $
 +lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la
  kde_module_LTLIBRARIES = kio_http.la
  
- kio_http_la_SOURCES = http.cc
+ kio_http_la_SOURCES = http.cc httpfilter.cc
+@@ -17,12 +17,15 @@
  kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ)
  kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  
@@ -30,7 +31,7 @@ $NetBSD: patch-bm,v 1.2 2002/08/25 19:23:54 jlam Exp $
  kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
  
  noinst_HEADERS = http.h
-@@ -29,6 +32,3 @@
+@@ -30,6 +33,3 @@
  kdelnkdir = $(kde_servicesdir)
  kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol \
                webdav.protocol webdavs.protocol
diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn
index 0ca5f5cfee0..36d302f0722 100644
--- a/x11/kdelibs3/patches/patch-bn
+++ b/x11/kdelibs3/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $
 
---- kioslave/http/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kioslave/http/Makefile.in.orig	Thu Jan 23 12:30:40 2003
 +++ kioslave/http/Makefile.in
-@@ -273,19 +273,22 @@ LDFLAGS = $(all_libraries)
+@@ -293,7 +293,7 @@
  
  ####### Files
  bin_PROGRAMS = kio_http_cache_cleaner
@@ -10,7 +10,8 @@ $NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
 +lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la
  kde_module_LTLIBRARIES = kio_http.la
  
- kio_http_la_SOURCES = http.cc
+ kio_http_la_SOURCES = http.cc httpfilter.cc
+@@ -301,12 +301,15 @@
  kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ)
  kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  
@@ -30,10 +31,10 @@ $NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
  kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
  
  noinst_HEADERS = http.h
-@@ -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
+@@ -329,20 +332,28 @@
+ kio_http_la_nofinal_OBJECTS = http.lo httpfilter.lo
+ @KDE_USE_FINAL_FALSE@kio_http_la_OBJECTS = $(kio_http_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kio_http_la_OBJECTS = $(kio_http_la_final_OBJECTS)
 -kio_http_cache_cleaner_la_DEPENDENCIES =
 -am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo
 +kio_http_cache_cleaner_la_DEPENDENCIES = \
@@ -65,27 +66,33 @@ $NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- CPPFLAGS = @CPPFLAGS@
+@@ -350,15 +361,21 @@
  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
--#>+ 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
+ am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.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@	./$(DEPDIR)/httpfilter.Plo
+-#>+ 7
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kio_http_la.all_cc.P  ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.Plo \
++#>+ 11
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kio_http_la.all_cc.P  ./$(DEPDIR)/http.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/http_cache_cleaner.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/http_cache_cleaner_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/http_cache_cleaner_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/httpfilter.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/http.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/http_cache_cleaner.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/http_cache_cleaner_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/http_cache_cleaner_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/httpfilter.Plo
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -360,6 +375,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(
+@@ -390,6 +407,7 @@
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kio_http_la_SOURCES) \
  	$(kio_http_cache_cleaner_la_SOURCES) \
@@ -93,7 +100,7 @@ $NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
  	$(kio_http_cache_cleaner_SOURCES)
  DATA = $(kdelnk_DATA)
  
-@@ -372,7 +388,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -402,7 +420,7 @@
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -102,37 +109,37 @@ $NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -445,6 +461,8 @@ clean-libLTLIBRARIES:
+@@ -482,6 +500,8 @@
  	$(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)
 +libkio_http_cache_cleaner_main.la: $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkio_http_cache_cleaner_main_la_LDFLAGS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -479,9 +497,10 @@ mostlyclean-compile:
+@@ -521,9 +541,10 @@
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http_cache_cleaner.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http_cache_cleaner_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/http_cache_cleaner_main.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpfilter.Plo@am__quote@
  
  distclean-depend:
- 	-rm -rf $(DEPDIR)
-@@ -635,7 +654,7 @@ distclean-tags:
- 
+@@ -691,7 +712,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--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 
+-KDE_DIST=webdav.protocol http_cache_cleaner.desktop README.webdav rfc2817.txt THOUGHTS README.http_cache_cleaner webdavs.protocol rfc2617.txt rfc2818.txt rfc2616.txt http.protocol https.protocol httpfilter.h rfc3253.txt rfc2518.txt 
++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2817.txt httpfilter.h webdavs.protocol rfc3253.txt rfc2818.txt http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2518.txt rfc2617.txt THOUGHTS 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -778,9 +797,6 @@ uninstall-info: uninstall-info-recursive
+@@ -840,9 +861,6 @@
  	uninstall-kdelnkDATA uninstall-libLTLIBRARIES \
  	uninstall-recursive
  
@@ -142,3 +149,13 @@ $NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll 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:
+@@ -919,7 +937,7 @@
+ 	-rm -f *.rpo
+ 
+ #>+ 5
++http.o: http.moc 
++httpfilter.lo: httpfilter.moc 
+ httpfilter.o: httpfilter.moc 
+ http.lo: http.moc 
+-httpfilter.lo: httpfilter.moc 
+-http.o: http.moc 
diff --git a/x11/kdelibs3/patches/patch-bq b/x11/kdelibs3/patches/patch-bq
index 25c08040085..9c54bf284bc 100644
--- a/x11/kdelibs3/patches/patch-bq
+++ b/x11/kdelibs3/patches/patch-bq
@@ -1,36 +1,39 @@
-$NetBSD: patch-bq,v 1.2 2002/08/25 19:23:55 jlam Exp $
+$NetBSD: patch-bq,v 1.3 2003/03/11 13:10:38 markd Exp $
 
---- kioslave/http/kcookiejar/Makefile.am.orig	Fri May 11 02:23:55 2001
+--- kioslave/http/kcookiejar/Makefile.am.orig	Mon Sep 16 09:13:44 2002
 +++ kioslave/http/kcookiejar/Makefile.am
-@@ -6,17 +6,21 @@
+@@ -6,21 +6,25 @@
  ####### Files
  
  bin_PROGRAMS = kcookiejar
 -lib_LTLIBRARIES = kcookiejar.la
 +lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la
+ kde_module_LTLIBRARIES = kded_kcookiejar.la
  
--kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
-+libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
- 			kcookieserver.skel kcookiewin.cpp \
- 			kcookiewin.h main.cpp 
--kcookiejar_la_METASOURCES = AUTO
-+libkcookiejar_main_la_METASOURCES = AUTO
-+libkcookiejar_main_la_LDFLAGS = $(all_libraries)
-+libkcookiejar_main_la_LIBADD = $(LIB_KIO)
+-kcookiejar_la_SOURCES = main.cpp
++libkcookiejar_main_la_SOURCES = main.cpp
+ METASOURCES = AUTO
++libkcookiejar_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkcookiejar_main_la_LIBADD = $(LIB_KDECORE)
 +
 +kcookiejar_la_SOURCES = kcookiejar_main.cpp
  kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kcookiejar_la_LIBADD = $(LIB_KIO)
+-kcookiejar_la_LIBADD = $(LIB_KDECORE)
 +kcookiejar_la_LIBADD = libkcookiejar_main.la
  
+ kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
+ 			kcookieserver.skel kcookiewin.cpp 
+ kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ kded_kcookiejar_la_LIBADD = $(LIB_KIO)
+ 
 -kcookiejar_SOURCES = dummy.cpp
 -kcookiejar_LDADD = kcookiejar.la
 +kcookiejar_SOURCES = kcookiejar_main.cpp
 +kcookiejar_LDADD = libkcookiejar_main.la
  kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
- services_DATA = kcookiejar.desktop
-@@ -24,6 +28,3 @@
+ kded_DATA = kcookiejar.desktop
+@@ -28,6 +32,3 @@
  
  update_DATA = kcookiescfg.upd
  updatedir = $(kde_datadir)/kconf_update
diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br
index 8b795ddd908..790c094c24a 100644
--- a/x11/kdelibs3/patches/patch-br
+++ b/x11/kdelibs3/patches/patch-br
@@ -1,68 +1,63 @@
-$NetBSD: patch-br,v 1.3 2003/01/02 09:12:39 skrll Exp $
+$NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $
 
---- kioslave/http/kcookiejar/Makefile.in.orig	Tue Nov 26 08:57:39 2002
+--- kioslave/http/kcookiejar/Makefile.in.orig	Thu Jan 23 12:30:40 2003
 +++ kioslave/http/kcookiejar/Makefile.in
-@@ -270,22 +270,26 @@ INCLUDES = $(all_includes)
+@@ -290,13 +290,17 @@
  
  ####### Files
  bin_PROGRAMS = kcookiejar
 -lib_LTLIBRARIES = kcookiejar.la
 +lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la
+ kde_module_LTLIBRARIES = kded_kcookiejar.la
  
--#>- kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
-+#>- libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
- #>- 			kcookieserver.skel kcookiewin.cpp \
- #>- 			kcookiewin.h main.cpp 
- #>+ 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
- 
--#>- kcookiejar_la_METASOURCES = AUTO
-+#>- libkcookiejar_main_la_METASOURCES = AUTO
-+libkcookiejar_main_la_LDFLAGS = $(all_libraries)
-+libkcookiejar_main_la_LIBADD = $(LIB_KIO)
+-kcookiejar_la_SOURCES = main.cpp
++libkcookiejar_main_la_SOURCES = main.cpp
+ #>- METASOURCES = AUTO
++libkcookiejar_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkcookiejar_main_la_LIBADD = $(LIB_KDECORE)
 +
 +kcookiejar_la_SOURCES = kcookiejar_main.cpp
  kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kcookiejar_la_LIBADD = $(LIB_KIO)
+-kcookiejar_la_LIBADD = $(LIB_KDECORE)
 +kcookiejar_la_LIBADD = libkcookiejar_main.la
  
+ #>- kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
+ #>- 			kcookieserver.skel kcookiewin.cpp 
+@@ -307,8 +311,8 @@
+ kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ kded_kcookiejar_la_LIBADD = $(LIB_KIO)
+ 
 -kcookiejar_SOURCES = dummy.cpp
 -kcookiejar_LDADD = kcookiejar.la
 +kcookiejar_SOURCES = kcookiejar_main.cpp
 +kcookiejar_LDADD = libkcookiejar_main.la
  kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
- services_DATA = kcookiejar.desktop
-@@ -299,24 +303,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ kded_DATA = kcookiejar.desktop
+@@ -322,11 +326,11 @@
  CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
  
 -kcookiejar_la_DEPENDENCIES =
--am_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo kcookiewin.lo \
--	main.lo
+-am_kcookiejar_la_OBJECTS = main.lo
 +kcookiejar_la_DEPENDENCIES = libkcookiejar_main.la
 +am_kcookiejar_la_OBJECTS = kcookiejar_main.lo
  #>- kcookiejar_la_OBJECTS = $(am_kcookiejar_la_OBJECTS)
-+#>+ 1
+ #>+ 1
+-kcookiejar_la_OBJECTS = main.lo
 +kcookiejar_la_OBJECTS = kcookiejar_main.lo
+ kded_kcookiejar_la_DEPENDENCIES =
+ am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \
+ 	kcookiewin.lo
+@@ -337,14 +341,19 @@
+ 	kcookiewin.lo kcookieserver_skel.lo
+ @KDE_USE_FINAL_FALSE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_final_OBJECTS)
 +libkcookiejar_main_la_DEPENDENCIES =
-+am_libkcookiejar_main_la_OBJECTS = kcookiejar.lo kcookieserver.lo \
-+	kcookiewin.lo main.lo
++am_libkcookiejar_main_la_OBJECTS = main.lo
 +#>- libkcookiejar_main_la_OBJECTS = $(am_libkcookiejar_main_la_OBJECTS)
- #>+ 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
--@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
-+@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)
++#>+ 1
++libkcookiejar_main_la_OBJECTS = main.lo
  bin_PROGRAMS = kcookiejar$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -77,78 +72,77 @@ $NetBSD: patch-br,v 1.3 2003/01/02 09:12:39 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -324,14 +333,20 @@ CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -353,14 +362,20 @@
  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
+ am__depfiles_maybe = depfiles
+-#>- @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 \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kcookieserver_skel.P  $(DEPDIR)/kded_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) \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kcookieserver_skel.P  $(DEPDIR)/kded_kcookiejar_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
+ 
+@@ -384,11 +399,11 @@
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
-+DIST_SOURCES = $(kcookiejar_la_SOURCES) $(libkcookiejar_main_la_SOURCES) \
-+	$(kcookiejar_SOURCES)
- DATA = $(services_DATA) $(update_DATA)
+ CXXFLAGS = @CXXFLAGS@
+ DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) \
+-	$(kcookiejar_SOURCES)
++	$(libkcookiejar_main_la_SOURCES) $(kcookiejar_SOURCES)
+ DATA = $(kded_DATA) $(update_DATA)
  
  DIST_COMMON = Makefile.am Makefile.in
--SOURCES = $(kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
-+SOURCES = $(kcookiejar_la_SOURCES) $(libkcookiejar_main_la_SOURCES) $(kcookiejar_SOURCES)
+-SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
++SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(libkcookiejar_main_la_SOURCES) $(kcookiejar_SOURCES)
  
  #>- all: all-am
  #>+ 1
-@@ -415,6 +431,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- kcookiejar.la: $(kcookiejar_la_OBJECTS) $(kcookiejar_la_DEPENDENCIES) 
+@@ -465,6 +480,8 @@
  	$(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS)
+ kded_kcookiejar.la: $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_LDFLAGS) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS)
 +libkcookiejar_main.la: $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkcookiejar_main_la_LDFLAGS) $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -449,8 +467,9 @@ mostlyclean-compile:
+@@ -504,8 +521,9 @@
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookiejar.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookiejar_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookiejar_main.Po@am__quote@
- @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@
-@@ -546,7 +565,7 @@ distclean-tags:
- 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejar.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejar_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejar_main.Po@am__quote@
+ @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@
+@@ -615,7 +633,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--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 
+-KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h kcookiewin.cpp kcookiewin.h rfc2109 kcookiejar.desktop 
++KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h kcookiewin.cpp 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -663,9 +682,6 @@ uninstall-am: uninstall-binPROGRAMS unin
- 	uninstall-libLTLIBRARIES uninstall-servicesDATA \
- 	uninstall-updateDATA
+@@ -745,9 +763,6 @@
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \
+ 	uninstall-libLTLIBRARIES uninstall-updateDATA
  
 -
 -dummy.cpp:
@@ -156,61 +150,22 @@ $NetBSD: patch-br,v 1.3 2003/01/02 09:12:39 skrll 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:
-@@ -704,33 +720,33 @@ force-reedit:
+@@ -786,7 +801,7 @@
  
  
  #>+ 11
--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 ; 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 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
-+	-rm -f libkcookiejar_main_la.all_cpp.cpp
- 
- #>+ 2
- final:
--	$(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_final_OBJECTS)" all-am
-+	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_final_OBJECTS)" all-am
- #>+ 2
- final-install:
--	$(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_final_OBJECTS)" install-am
-+	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_final_OBJECTS)" install-am
- #>+ 2
- no-final:
--	$(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_nofinal_OBJECTS)" all-am
- #>+ 2
- no-final-install:
--	$(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_nofinal_OBJECTS)" install-am
- #>+ 3
- cvs-clean:
- 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -740,7 +756,7 @@ kde-rpo-clean:
+-kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp  kcookiewin.moc kcookieserver.moc
++kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp  kcookieserver.moc kcookiewin.moc
+ 	@echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \
+ 	rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \
+@@ -822,7 +837,7 @@
  	-rm -f *.rpo
  
  #>+ 5
--kcookieserver.lo: kcookieserver.moc 
 -kcookiewin.lo: kcookiewin.moc 
--kcookiewin.o: kcookiewin.moc 
+-kcookieserver.lo: kcookieserver.moc 
  kcookieserver.o: kcookieserver.moc 
-+kcookiewin.o: kcookiewin.moc 
+ kcookiewin.o: kcookiewin.moc 
 +kcookiewin.lo: kcookiewin.moc 
 +kcookieserver.lo: kcookieserver.moc 
diff --git a/x11/kdelibs3/patches/patch-bv b/x11/kdelibs3/patches/patch-bv
index a046b050f83..8cf75446ae0 100644
--- a/x11/kdelibs3/patches/patch-bv
+++ b/x11/kdelibs3/patches/patch-bv
@@ -1,6 +1,6 @@
-$NetBSD: patch-bv,v 1.3 2002/10/14 09:13:55 skrll Exp $
+$NetBSD: patch-bv,v 1.4 2003/03/11 13:10:38 markd Exp $
 
---- mimetypes/application/x-core.desktop.orig	Tue Oct  1 17:40:02 2002
+--- mimetypes/application/x-core.desktop.orig	Wed Nov 20 10:23:58 2002
 +++ mimetypes/application/x-core.desktop
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
@@ -9,5 +9,5 @@ $NetBSD: patch-bv,v 1.3 2002/10/14 09:13:55 skrll Exp $
 -Patterns=core;
 +Patterns=*.core;
  MimeType=application/x-core
- Comment=Program crash data
- Comment[af]=Program omval data
+ Comment=Program Crash Data
+ Comment[af]=Program Omval Data
diff --git a/x11/kdelibs3/patches/patch-ca b/x11/kdelibs3/patches/patch-ca
deleted file mode 100644
index 03793a1b377..00000000000
--- a/x11/kdelibs3/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2002/08/25 19:23:56 jlam Exp $
-
---- kdesu/kdesu_pty.cpp.orig	Mon Aug 19 20:55:44 2002
-+++ kdesu/kdesu_pty.cpp
-@@ -20,7 +20,7 @@
- #define _GNU_SOURCE   /* Needed for getpt, ptsname in glibc 2.1.x systems */
- #endif
- 
--#if !defined(_XOPEN_SOURCE) && !defined(__osf__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__osf__) && !defined(__NetBSD__)
- #define _XOPEN_SOURCE /* Needed for grantpt, unlockpt in glibc 2.1.x      */
- #endif
- 
diff --git a/x11/kdelibs3/patches/patch-cb b/x11/kdelibs3/patches/patch-cb
deleted file mode 100644
index 24bb7a733bf..00000000000
--- a/x11/kdelibs3/patches/patch-cb
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-cb,v 1.3 2003/01/17 02:59:51 markd Exp $
-
---- khtml/java/kjava.policy.in.orig	Wed Nov 15 19:57:40 2000
-+++ khtml/java/kjava.policy.in
-@@ -1,3 +1,3 @@
--grant codeBase "file:@prefix@/share/apps/kjava/-"
-+grant codeBase "file:@kde_datadir@/kjava/-"
- {
-     permission java.security.AllPermission;
diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd
index 2ea2342664c..aaf11a88291 100644
--- a/x11/kdelibs3/patches/patch-cd
+++ b/x11/kdelibs3/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.3 2003/02/08 11:13:13 dmcmahill Exp $
+$NetBSD: patch-cd,v 1.4 2003/03/11 13:10:39 markd Exp $
 
---- kdefx/Makefile.in.orig	Tue Dec 17 05:43:25 2002
+--- kdefx/Makefile.in.orig	Thu Jan 23 12:30:35 2003
 +++ kdefx/Makefile.in
-@@ -359,12 +359,15 @@ HEADERS = $(include_HEADERS)
+@@ -389,12 +389,15 @@ HEADERS = $(include_HEADERS)
  DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
  SOURCES = $(libkdefx_la_SOURCES)
  
@@ -16,19 +16,19 @@ $NetBSD: patch-cd,v 1.3 2003/02/08 11:13:13 dmcmahill Exp $
  .SUFFIXES:
 -.SUFFIXES: .cpp .lo .o .obj
 +.SUFFIXES: .cc .cpp .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -443,6 +446,28 @@ distclean-depend:
+ $(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --foreign  kdefx/Makefile
+@@ -471,6 +474,28 @@ distclean-depend:
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- 	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+ 	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 +
 +.cc.o:
 +@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 +@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 +
 +.cc.obj:
 +@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -40,15 +40,15 @@ $NetBSD: patch-cd,v 1.3 2003/02/08 11:13:13 dmcmahill Exp $
 +@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
 +@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 +
 +.cpp.cc:
 +	cp -f $< $@
 +
  CXXDEPMODE = @CXXDEPMODE@
- uninstall-info-am:
- install-includeHEADERS: $(include_HEADERS)
-@@ -683,3 +708,6 @@ kde-rpo-clean:
+ 
+ mostlyclean-libtool:
+@@ -890,3 +915,6 @@ kde-rpo-clean:
  #>+ 3
  kstyle.lo: kstyle.moc 
  kstyle.o: kstyle.moc 
diff --git a/x11/kdelibs3/patches/patch-ce b/x11/kdelibs3/patches/patch-ce
index a3e956607e8..3074271b7f0 100644
--- a/x11/kdelibs3/patches/patch-ce
+++ b/x11/kdelibs3/patches/patch-ce
@@ -1,17 +1,17 @@
-$NetBSD: patch-ce,v 1.1 2003/02/08 11:13:13 dmcmahill Exp $
+$NetBSD: patch-ce,v 1.2 2003/03/11 13:10:39 markd Exp $
 
---- kioslave/file/Makefile.in.orig	Fri Feb  7 14:51:42 2003
+--- kioslave/file/Makefile.in.orig	Thu Jan 23 12:30:39 2003
 +++ kioslave/file/Makefile.in
-@@ -336,7 +336,7 @@ SOURCES = $(kio_file_la_SOURCES)
+@@ -358,7 +358,7 @@ SOURCES = $(kio_file_la_SOURCES)
  all: docs-am  all-am
  
  .SUFFIXES:
 -.SUFFIXES: .cc .lo .o .obj
 +.SUFFIXES: .cpp .cc .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -658,3 +658,35 @@ kde-rpo-clean:
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --foreign  kioslave/file/Makefile
+@@ -698,3 +698,35 @@ kde-rpo-clean:
  #>+ 3
  file.lo: file.moc 
  file.o: file.moc
author	markd <markd@pkgsrc.org>	2003-03-11 13:10:15 +0000
committer	markd <markd@pkgsrc.org>	2003-03-11 13:10:15 +0000
commit	528e056cde74afcf3106dd363e16cafe2855a9ab (patch)
tree	ce99eff5443d74e3e5c4e2dfa0d0cb7ccf7ac90a /x11/kdelibs3/patches
parent	615f21ac5023134727518ed2d9af3be025db314d (diff)
download	pkgsrc-528e056cde74afcf3106dd363e16cafe2855a9ab.tar.gz