Update kdelibs to 3.1.3.

Changes:
* build system updates, gcc 3.4+ compilation fixes (Dirk Mueller)
* ensure that each installed header file can be compiled on its own (has all
  necessary includes/forward declarations)
* SECURITY: kio/khtml: Improve referer handling, always strip out username and
  password.
* Roaming user support (Helge Deller)
* kabc: add quotes around names from LDAP which contain non-alphanumeric characters
* kabc: unterminated string handling fixes
* kbugreport: only refer to http://bugs.kde.org if the bug-address is
  submit@bugs.kde.org
* kcookiejar: don't deliver cookies when the url is "strange"
* kcookiejar: unbreak cookies for https sites once again
* kcookiejar: make kcookiejar --remove <domain> work
* kdecore: never unload dante socks library, it crashes when doing so
* kdecore: Adding KMacroExpander, class for shell-safe expansion of filenames in
  shellcode
* kdeinit: Handle X errors instead of just crashing when they occur.
* kdeprint: improvements to handling of cups network printers
* kdeprint/smbview: use nmblookup -M -- to make it work with samba 3.0
* kdeui: dragging from the "konqueror wheel" button no longer duplicates the window
* kdeui: rewritten mouse cursor-autohide code (hopefully much more stable now)
* kdeui/kfontdialog: Try very hard to match the font name that was passed with one
  that actually exists
* kdeui/kmainwindow: fix for saving statusbar state when autosave is enabled
* kdewidgets: Add some new widgets
* keramik: Major fixes to toolbar gradient alignment, as well as some miscellaneous
  fixes.
* khtml: avoid endless-relayout-loop
* khtml: several backports of fixes from 3.2 development branch
* khtml: several fixes to bugs exposed by DOM2 testsuite
* khtml jpeg loader: use memmove in places where memory regions overlap (valgrind
  we love you)
* kio: crash/memory leak fixes
* kio: added ability to add host:port to the no-proxy list
* kio: speedup handling local files
* kio: improvements to the layout of the HTTP Authentication password dialog
* kio: allow rtsp:// protocol redirecting to mms://
* kio: KIOSK restriction fixes
* kio: signal handling fixes (SIGPIPE etc)
* kio_http: text/html mimetype in Accept: gets preference over other text/* types
* kio_http: improvements in HTTP referer handling
* kiconloader: memory leak fix
* kjava: thread handling fixes
* kjava: don't send text to the console window if its not visible (saves huge
  amount of memory on some pages)
* kjava: catch exceptions thrown inside Applet.destroy
* klocale: Support Macedonian plural forms

7 files changed, 190 insertions, 68 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 46c8b9f0169..8dec4ddca52 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2003/07/13 13:54:25 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/07/30 13:16:56 markd Exp $
 
-DISTNAME=	kdelibs-3.1.2
-PKGREVISION=	1
+DISTNAME=	kdelibs-3.1.3
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
-.include "../../x11/kde3/Makefile.kde3"
+.include "../../meta-pkgs/kde3/Makefile.kde3"
 
 CONFLICTS+=	koffice3<=1.1.1
 
@@ -43,7 +42,7 @@ FOO_MAIN_FILES= \
 	kioslave/http/http_cache_cleaner_main.cpp \
 	kioslave/http/kcookiejar/kcookiejar_main.cpp
 
-.include "../../x11/kde3/Makefile.foo_main"
+.include "../../meta-pkgs/kde3/Makefile.foo_main"
 
 FIXUP_FILES= \
 	kspell/ksconfig.cpp \
@@ -119,10 +118,10 @@ post-install:
 .include "../../graphics/libart2/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
-.include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/qt3-libs/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index cbe7e54fa62..c65e67ba1f7 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/04/01 12:27:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/07/30 13:16:56 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -103,6 +103,7 @@ include/kabc/distributionlistdialog.h
 include/kabc/distributionlisteditor.h
 include/kabc/errorhandler.h
 include/kabc/field.h
+include/kabc/format.h
 include/kabc/formatfactory.h
 include/kabc/formatplugin.h
 include/kabc/geo.h
@@ -559,7 +560,6 @@ include/libkmid/track.h
 include/libkmid/voiceman.h
 include/netwm.h
 include/netwm_def.h
-include/netwm_p.h
 include/qxembed.h
 include/renamedlgplugin.h
 include/scriptclientinterface.h
@@ -629,8 +629,6 @@ lib/kde3/kio_metainfo.la
 lib/kde3/kio_metainfo.so
 lib/kde3/kjavaappletviewer.la
 lib/kde3/kjavaappletviewer.so
-lib/kde3/kjs_html.la
-lib/kde3/kjs_html.so
 lib/kde3/ktexteditor_insertfile.la
 lib/kde3/ktexteditor_insertfile.so
 lib/kde3/ktexteditor_isearch.la
@@ -2304,6 +2302,7 @@ share/kde/icons/crystalsvg/16x16/actions/flag.png
 share/kde/icons/crystalsvg/16x16/actions/folder_new.png
 share/kde/icons/crystalsvg/16x16/actions/fontsizedown.png
 share/kde/icons/crystalsvg/16x16/actions/fontsizeup.png
+share/kde/icons/crystalsvg/16x16/actions/fork.png
 share/kde/icons/crystalsvg/16x16/actions/forward.png
 share/kde/icons/crystalsvg/16x16/actions/frame_edit.png
 share/kde/icons/crystalsvg/16x16/actions/frame_formula.png
@@ -2700,6 +2699,7 @@ share/kde/icons/crystalsvg/22x22/actions/folder.png
 share/kde/icons/crystalsvg/22x22/actions/folder_new.png
 share/kde/icons/crystalsvg/22x22/actions/fontsizedown.png
 share/kde/icons/crystalsvg/22x22/actions/fontsizeup.png
+share/kde/icons/crystalsvg/22x22/actions/fork.png
 share/kde/icons/crystalsvg/22x22/actions/forward.png
 share/kde/icons/crystalsvg/22x22/actions/frame_chart.png
 share/kde/icons/crystalsvg/22x22/actions/frame_edit.png
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index f941663ce25..45ce8566114 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.17 2003/07/13 13:54:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2003/07/30 13:16:56 markd Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdelibs3
 BUILDLINK_PKGBASE.kdelibs3?=	kdelibs
-BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.1.2nb1
+BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.1.3
 BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 36892fa71fc..7df7858ac18 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2003/07/13 11:37:18 wulf Exp $
+$NetBSD: distinfo,v 1.23 2003/07/30 13:16:56 markd Exp $
 
-SHA1 (kdelibs-3.1.2.tar.bz2) = ce1a18206590f8ab62f267efc90dd7083822de74
-Size (kdelibs-3.1.2.tar.bz2) = 10524265 bytes
+SHA1 (kdelibs-3.1.3.tar.bz2) = 1bc987bd7b5a171e4efe5b5edad3134a3959e50b
+Size (kdelibs-3.1.3.tar.bz2) = 10533062 bytes
 SHA1 (patch-aa) = 4e79f488d54f6b05a23951c6e206e6582ef2a2a7
-SHA1 (patch-ab) = 627d8a0fa59622c171ce28908e509f2e443c4a40
+SHA1 (patch-ab) = 5b2188a3e4edd1f5eb0f3516f6a846e9a8c8c055
 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e
 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d
 SHA1 (patch-af) = 5b19804a42f5358f26ded54e9606efbc9a9a19b4
@@ -18,7 +18,7 @@ SHA1 (patch-ap) = d6bf9271eea905aadfcaa847f9c9363c81bc1df8
 SHA1 (patch-aq) = 69cd39a625654839c1e8358284df291f947682e5
 SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988
 SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1
-SHA1 (patch-av) = 4803053bfa1c5972e339b0c1613565544fcf2469
+SHA1 (patch-av) = f68e06883c6f1f8e49514c71e5c66cbbce28b805
 SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620
 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0
 SHA1 (patch-az) = 2d61015758a415eeafed9931da07c419b99cb710
@@ -27,7 +27,7 @@ SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 4f4a1fc17108f539c3e459744ccc0dc6f71bb989
 SHA1 (patch-bg) = 456c9f128deaeefea448c038feeb256b8a9837bd
-SHA1 (patch-bh) = a67593f15960dcde8565079cef12a0e4b503cc0d
+SHA1 (patch-bh) = d2f2f4d506412d1f12dde4e2e6a0c88e82853eca
 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb
 SHA1 (patch-bm) = 9b5326099e3006c491a90ac8ad8e5f5aa0eed945
 SHA1 (patch-bn) = 4840127102ac4e79481c09eb378b5af8df9a930b
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab
index 1829ea19d6d..25c9f83e2d0 100644
--- a/x11/kdelibs3/patches/patch-ab
+++ b/x11/kdelibs3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
+$NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
 
---- arts/knotify/Makefile.in.orig	Thu May  8 05:24:03 2003
+--- arts/knotify/Makefile.in.orig	2003-07-16 12:59:51.000000000 +1200
 +++ arts/knotify/Makefile.in
-@@ -378,17 +378,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
+@@ -379,17 +379,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
  
  ####### Files
  bin_PROGRAMS = knotify
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  check_PROGRAMS = knotifytest
-@@ -406,23 +411,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -407,23 +412,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
  #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
  #>+ 1
-@@ -432,12 +442,18 @@ knotifytest_DEPENDENCIES =
+@@ -433,12 +443,18 @@ knotifytest_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -92,7 +92,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/knotifytest.Po
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -458,14 +474,14 @@ CXXLD = $(CXX)
+@@ -459,14 +475,14 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -110,7 +110,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -512,6 +528,8 @@ clean-libLTLIBRARIES:
+@@ -513,6 +529,8 @@ clean-libLTLIBRARIES:
  	done
  knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
@@ -119,7 +119,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -561,8 +579,9 @@ mostlyclean-compile:
+@@ -562,8 +580,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -130,7 +130,16 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@
  
  distclean-depend:
-@@ -824,13 +843,14 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -685,7 +704,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=knotify.desktop README.knotify_and_arts 
++KDE_DIST=Makefile.in.rej knotify.desktop README.knotify_and_arts 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -825,13 +844,16 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  messages:
  	$(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
@@ -145,11 +154,13 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
 +knotify.moc: $(srcdir)/knotify.h
 +	$(MOC) $(srcdir)/knotify.h -o knotify.moc
 +
++#>+ 1
++mocs: knotify.moc
  #>+ 5
  knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES)
- 	$(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false )
-@@ -843,7 +863,7 @@ knotify.moc: $(srcdir)/knotify.h
- 
+ 	$(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; false )
+@@ -846,7 +868,7 @@ knotify.moc: $(srcdir)/knotify.h
+ mocs: knotify.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  knotify.moc
@@ -157,7 +168,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -861,33 +881,33 @@ force-reedit:
+@@ -864,33 +886,33 @@ force-reedit:
  
  
  #>+ 11
@@ -204,7 +215,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -897,5 +917,5 @@ kde-rpo-clean:
+@@ -900,5 +922,5 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 3
diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av
index 6fde605c0f2..b3812ddac38 100644
--- a/x11/kdelibs3/patches/patch-av
+++ b/x11/kdelibs3/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
+$NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
 
---- kdeprint/management/Makefile.in.orig	Thu May  8 05:24:06 2003
+--- kdeprint/management/Makefile.in.orig	2003-07-16 12:59:54.000000000 +1200
 +++ kdeprint/management/Makefile.in
-@@ -374,15 +374,19 @@ x_includes = @x_includes@
+@@ -375,15 +375,19 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
  
@@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
  
  libkdeprint_management_la_SOURCES = \
-@@ -427,11 +431,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -428,11 +432,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -49,7 +49,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
  am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
  	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
-@@ -476,18 +487,20 @@ libkdeprint_management_la_nofinal_OBJECT
+@@ -477,18 +488,20 @@ libkdeprint_management_la_nofinal_OBJECT
  bin_PROGRAMS = kaddprinterwizard$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -74,7 +74,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kiconselectaction.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kmconfigcommand.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kmconfigdialog.Plo \
-@@ -534,10 +547,12 @@ am__depfiles_maybe = depfiles
+@@ -535,10 +548,12 @@ am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@	./$(DEPDIR)/networkscanner.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/pluginaction.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
@@ -89,7 +89,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  @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 \
-@@ -585,8 +600,10 @@ am__depfiles_maybe = depfiles
+@@ -586,8 +601,10 @@ am__depfiles_maybe = depfiles
  @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 \
@@ -101,7 +101,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  @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 \
-@@ -653,6 +670,7 @@ CXXLD = $(CXX)
+@@ -654,6 +671,7 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
@@ -109,7 +109,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  	$(libkdeprint_management_la_SOURCES) \
  	$(kaddprinterwizard_SOURCES)
  DATA = $(dataicon_DATA)
-@@ -661,7 +679,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
+@@ -662,7 +680,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
  
  DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -118,7 +118,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -708,6 +726,8 @@ clean-libLTLIBRARIES:
+@@ -709,6 +727,8 @@ clean-libLTLIBRARIES:
  	done
  kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
@@ -127,7 +127,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd 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) 
-@@ -753,9 +773,10 @@ distclean-compile:
+@@ -754,9 +774,10 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjanuswidget.Plo@am__quote@
@@ -139,16 +139,16 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kiconselectaction.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigcommand.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigdialog.Plo@am__quote@
-@@ -948,7 +969,7 @@ distclean-tags:
+@@ -949,7 +970,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=tileup.png tiledown.png side.png 
-+KDE_DIST=side.png tiledown.png tileup.png 
++KDE_DIST=Makefile.in.rej side.png tiledown.png tileup.png 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1085,9 +1106,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -1086,9 +1107,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \
  	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
  
@@ -158,7 +158,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd 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:
-@@ -1102,156 +1120,156 @@ libkdeprint_management.la.closure: $(lib
+@@ -1103,11 +1121,11 @@ libkdeprint_management.la.closure: $(lib
  
  
  #>+ 3
@@ -167,216 +167,324 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
 +kmmainview.moc: $(srcdir)/kmmainview.h
 +	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
  
+ #>+ 1
+-mocs: kmpropcontainer.moc
++mocs: kmmainview.moc
  #>+ 3
  kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
  	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
- 
+@@ -1115,107 +1133,107 @@ kmconfigfonts.moc: $(srcdir)/kmconfigfon
+ #>+ 1
+ mocs: kmconfigfonts.moc
  #>+ 3
 -kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
 -	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
 +kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
 +	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
  
+ #>+ 1
+-mocs: kmwsocketutil.moc
++mocs: kmdriverdbwidget.moc
  #>+ 3
 -kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
 -	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
 +kmconfigpage.moc: $(srcdir)/kmconfigpage.h
 +	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
  
+ #>+ 1
+-mocs: kmspecialprinterdlg.moc
++mocs: kmconfigpage.moc
  #>+ 3
 -kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
 -	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
 +smbview.moc: $(srcdir)/smbview.h
 +	$(MOC) $(srcdir)/smbview.h -o smbview.moc
  
+ #>+ 1
+-mocs: kmconfigfilter.moc
++mocs: smbview.moc
  #>+ 3
 -kmwclass.moc: $(srcdir)/kmwclass.h
 -	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
 +kmwsmb.moc: $(srcdir)/kmwsmb.h
 +	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
  
+ #>+ 1
+-mocs: kmwclass.moc
++mocs: kmwsmb.moc
  #>+ 3
 -kmconfigpage.moc: $(srcdir)/kmconfigpage.h
 -	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
 +cjanuswidget.moc: $(srcdir)/cjanuswidget.h
 +	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
  
+ #>+ 1
+-mocs: kmconfigpage.moc
++mocs: cjanuswidget.moc
  #>+ 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
  
+ #>+ 1
+-mocs: pluginaction.moc
++mocs: 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
  
+ #>+ 1
+-mocs: kmwdriverselect.moc
++mocs: kmlistview.moc
  #>+ 3
 -kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
 -	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
 +pluginaction.moc: $(srcdir)/pluginaction.h
 +	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
  
+ #>+ 1
+-mocs: kxmlcommanddlg.moc
++mocs: pluginaction.moc
  #>+ 3
 -kmwizardpage.moc: $(srcdir)/kmwizardpage.h
 -	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
 +kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
 +	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
  
+ #>+ 1
+-mocs: kmwizardpage.moc
++mocs: kmconfiggeneral.moc
  #>+ 3
 -kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
 -	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
 +kmwclass.moc: $(srcdir)/kmwclass.h
 +	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
  
+ #>+ 1
+-mocs: kmdriverdbwidget.moc
++mocs: kmwclass.moc
  #>+ 3
 -kmdbcreator.moc: $(srcdir)/kmdbcreator.h
 -	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
 +kminstancepage.moc: $(srcdir)/kminstancepage.h
 +	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
  
+ #>+ 1
+-mocs: kmdbcreator.moc
++mocs: kminstancepage.moc
  #>+ 3
 -kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
 -	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
 +kmprinterview.moc: $(srcdir)/kmprinterview.h
 +	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
  
+ #>+ 1
+-mocs: kxmlcommandselector.moc
++mocs: kmprinterview.moc
  #>+ 3
 -kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
 -	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
 +kmiconview.moc: $(srcdir)/kmiconview.h
 +	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
  
+ #>+ 1
+-mocs: kmwdrivertest.moc
++mocs: kmiconview.moc
  #>+ 3
 -kmmainview.moc: $(srcdir)/kmmainview.h
 -	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
 +kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
 +	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
  
+ #>+ 1
+-mocs: kmmainview.moc
++mocs: kmpropcontainer.moc
  #>+ 3
 -kmwizard.moc: $(srcdir)/kmwizard.h
 -	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
 +kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
 +	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
  
+ #>+ 1
+-mocs: kmwizard.moc
++mocs: kmwdriverselect.moc
  #>+ 3
 -kmpropwidget.moc: $(srcdir)/kmpropwidget.h
 -	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
 +kmdbcreator.moc: $(srcdir)/kmdbcreator.h
 +	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
  
+ #>+ 1
+-mocs: kmpropwidget.moc
++mocs: kmdbcreator.moc
  #>+ 3
 -cjanuswidget.moc: $(srcdir)/cjanuswidget.h
 -	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
 +kmpropwidget.moc: $(srcdir)/kmpropwidget.h
 +	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
  
+ #>+ 1
+-mocs: cjanuswidget.moc
++mocs: kmpropwidget.moc
  #>+ 3
  kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
  	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
- 
+@@ -1223,83 +1241,83 @@ kmconfigdialog.moc: $(srcdir)/kmconfigdi
+ #>+ 1
+ mocs: kmconfigdialog.moc
  #>+ 3
 -kminstancepage.moc: $(srcdir)/kminstancepage.h
 -	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
 +kmwlocal.moc: $(srcdir)/kmwlocal.h
 +	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
  
+ #>+ 1
+-mocs: kminstancepage.moc
++mocs: kmwlocal.moc
  #>+ 3
 -kiconselectaction.moc: $(srcdir)/kiconselectaction.h
 -	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
 +kmjobviewer.moc: $(srcdir)/kmjobviewer.h
 +	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
  
+ #>+ 1
+-mocs: kiconselectaction.moc
++mocs: kmjobviewer.moc
  #>+ 3
 -kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
 -	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
 +kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
 +	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
  
+ #>+ 1
+-mocs: kmdriverdialog.moc
++mocs: kmspecialprinterdlg.moc
  #>+ 3
 -kmlistview.moc: $(srcdir)/kmlistview.h
 -	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
 +kiconselectaction.moc: $(srcdir)/kiconselectaction.h
 +	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
  
+ #>+ 1
+-mocs: kmlistview.moc
++mocs: kiconselectaction.moc
  #>+ 3
 -kmwsmb.moc: $(srcdir)/kmwsmb.h
 -	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
 +kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
 +	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
  
+ #>+ 1
+-mocs: kmwsmb.moc
++mocs: kmwsocketutil.moc
  #>+ 3
 -kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
 -	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
 +kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
 +	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
  
+ #>+ 1
+-mocs: kmconfiggeneral.moc
++mocs: kmconfigfilter.moc
  #>+ 3
 -kmwlocal.moc: $(srcdir)/kmwlocal.h
 -	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
 +kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
 +	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
  
+ #>+ 1
+-mocs: kmwlocal.moc
++mocs: kxmlcommanddlg.moc
  #>+ 3
 -kmprinterview.moc: $(srcdir)/kmprinterview.h
 -	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
 +kmpropertypage.moc: $(srcdir)/kmpropertypage.h
 +	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
  
+ #>+ 1
+-mocs: kmprinterview.moc
++mocs: kmpropertypage.moc
  #>+ 3
 -smbview.moc: $(srcdir)/smbview.h
 -	$(MOC) $(srcdir)/smbview.h -o smbview.moc
 +kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
 +	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
  
+ #>+ 1
+-mocs: smbview.moc
++mocs: kxmlcommandselector.moc
  #>+ 3
 -kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
 -	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
 +kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
 +	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
  
+ #>+ 1
+-mocs: kmconfigjobs.moc
++mocs: kmwdrivertest.moc
  #>+ 3
 -networkscanner.moc: $(srcdir)/networkscanner.h
 -	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
 +kmwsocket.moc: $(srcdir)/kmwsocket.h
 +	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
  
+ #>+ 1
+-mocs: networkscanner.moc
++mocs: kmwsocket.moc
  #>+ 3
 -kmdriverdb.moc: $(srcdir)/kmdriverdb.h
 -	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
 +kmwizard.moc: $(srcdir)/kmwizard.h
 +	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
  
+ #>+ 1
+-mocs: kmdriverdb.moc
++mocs: kmwizard.moc
  #>+ 3
 -kmwsocket.moc: $(srcdir)/kmwsocket.h
 -	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
 +kmdriverdb.moc: $(srcdir)/kmdriverdb.h
 +	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
  
+ #>+ 1
+-mocs: kmwsocket.moc
++mocs: kmdriverdb.moc
  #>+ 3
  kmtimer.moc: $(srcdir)/kmtimer.h
  	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
- 
+@@ -1307,26 +1325,26 @@ kmtimer.moc: $(srcdir)/kmtimer.h
+ #>+ 1
+ mocs: 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
  
+ #>+ 1
+-mocs: kmiconview.moc
++mocs: kmconfigjobs.moc
  #>+ 3
 -kmpropertypage.moc: $(srcdir)/kmpropertypage.h
 -	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
 +kmwizardpage.moc: $(srcdir)/kmwizardpage.h
 +	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
  
+ #>+ 1
+-mocs: kmpropertypage.moc
++mocs: kmwizardpage.moc
  #>+ 3
 -kmjobviewer.moc: $(srcdir)/kmjobviewer.h
 -	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
 +kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
 +	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
  
+ #>+ 1
+-mocs: kmjobviewer.moc
++mocs: kmdriverdialog.moc
  #>+ 3
  clean-metasources:
 -	-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
@@ -384,7 +492,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -1268,7 +1286,7 @@ force-reedit:
+@@ -1343,7 +1361,7 @@ force-reedit:
  
  
  #>+ 11
@@ -393,7 +501,7 @@ $NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $
  	@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; \
-@@ -1304,77 +1322,77 @@ kde-rpo-clean:
+@@ -1379,77 +1397,77 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 75
diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh
index b20ac62ff15..e00f627b170 100644
--- a/x11/kdelibs3/patches/patch-bh
+++ b/x11/kdelibs3/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
+$NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
 
---- kio/misc/Makefile.in.orig	Thu May  8 05:24:11 2003
+--- kio/misc/Makefile.in.orig	2003-07-16 12:59:59.000000000 +1200
 +++ kio/misc/Makefile.in
-@@ -397,17 +397,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
+@@ -398,17 +398,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
  
  SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile
  
@@ -30,7 +30,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  observer_DIR = $(top_srcdir)/kio/kio
-@@ -435,23 +439,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -436,23 +440,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -68,7 +68,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  am_kmailservice_OBJECTS = kmailservice.$(OBJEXT)
  #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS)
  #>+ 1
-@@ -466,14 +475,20 @@ ktelnetservice_DEPENDENCIES =
+@@ -467,14 +476,20 @@ ktelnetservice_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -93,7 +93,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ktelnetservice.Po \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/uiserver.Plo
  
-@@ -495,7 +510,8 @@ CXXLD = $(CXX)
+@@ -496,7 +511,8 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -103,7 +103,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  	$(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
  DATA = $(kde_services_DATA) $(protocol_DATA)
  
-@@ -509,7 +525,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -510,7 +526,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	check-recursive installcheck-recursive
  DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -112,7 +112,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -556,6 +572,8 @@ clean-libLTLIBRARIES:
+@@ -557,6 +573,8 @@ clean-libLTLIBRARIES:
  	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)
@@ -121,7 +121,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -601,7 +619,8 @@ mostlyclean-compile:
+@@ -602,7 +620,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -131,16 +131,16 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmailservice.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktelnetservice.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uiserver.Plo@am__quote@
-@@ -825,7 +844,7 @@ distclean-tags:
+@@ -826,7 +845,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -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 
++KDE_DIST=kio_uiserver.desktop rlogin.protocol Makefile.in.rej kmailservice.protocol telnet.protocol rtsp.protocol 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -993,6 +1012,10 @@ dummy.cpp: uiserver.kidl
+@@ -994,6 +1013,12 @@ dummy.cpp: uiserver.kidl
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
@@ -148,21 +148,25 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
 +uiserver.moc: $(srcdir)/uiserver.h
 +	$(MOC) $(srcdir)/uiserver.h -o uiserver.moc
 +
++#>+ 1
++mocs: uiserver.moc
  #>+ 9
  uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES)
- 	$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
-@@ -1004,10 +1027,6 @@ observer_stub.h: observer.kidl
+ 	$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; false )
+@@ -1005,12 +1030,6 @@ observer_stub.h: observer.kidl
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
  
  #>+ 3
 -uiserver.moc: $(srcdir)/uiserver.h
 -	$(MOC) $(srcdir)/uiserver.h -o uiserver.moc
 -
+-#>+ 1
+-mocs: uiserver.moc
 -#>+ 3
  clean-metasources:
  	-rm -f  uiserver.moc
  
-@@ -1028,33 +1047,33 @@ force-reedit:
+@@ -1031,33 +1050,33 @@ force-reedit:
  
  
  #>+ 11
@@ -209,7 +213,7 @@ $NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1064,7 +1083,7 @@ kde-rpo-clean:
+@@ -1067,7 +1086,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5