Update to KDE 3.0.4. Changes are as follows (note the security fixes)

arts
	* Compile fix for IRIX64

kdelibs
	* KHTML : Fixed progress bar.
	* KHTML : Fixed several crashes and misrenderings.
	* KHTML : Fixed "HTML source displayed in text viewer" after viewing
	  text.
	* KHTML : Only ask "download plugins?" once per requested mimetype in
	  the same page.
	* Javascript : several fixes (row.cells(), tablecaption.*, heading.*,
	  event.x/y) .
	* libkscreensaver : Fixed bug that in rare cases prevented the
	  screensaver from showing anything.
	* kio_file : Proper "disk full" error message in mkdir
	* KIO : Dropping links to webpages onto the desktop works in all cases
	  now
	* Drag-and-drop of URLs : Improved compatibility with non-KDE apps
	* KToolBar : fix for oversized comboboxes in toolbars, e.g. in KOffice

kdebase
	* NSPlugins : Compatibility with gcc-3.x
	* Konqueror configuration : fixed default font size value
	* KDesktop : better determination of icon heights, for "lineup Icons"
	* KDesktop : Don't rearrange all icons when changing the font size
	* KControl : Fixed proxy configuration dialog layout
	* Fix a lot of mem leak
	* Kaddressbook : fix crash when we export CSV list
	* KDM
		* Security: proper temp dir creation for QT and disabled
		  crash dialog
		* Made chooser work at all
		* Fixed compilation with older glibc
		* Fixed bad lilo interaction wrt. warnings

kdegraphics
	* Kamera: Fixed crash when we didn't select camera in kcmkamera
	* KGhostview: Security related fixes

kdemultimedia
	* KMix : Fixed compilation on Solaris
	* Kaboodle : fixed when it was embedded in konqueror
	* Fix a lot of memory leak

kdenetwork
	* kpf: Security related fixes

kdepim
	* KAlarm: Fix right-to-left character sets not being displayed in
	  message edit control
	* KAlarm: Make "Help -> Report Bug" use the KDE bug system (bug
	  #43250)
	* KNotes: Fixed session management (bug #22844)
	* KNotes: Fixed mouse behaviour to be like kwin's (raise and lower
	  already on mouse press)
	* KNotes: Fixed (in)famous bug that caused the big black windows
	  and lost data (bugs #22062, #44870, #45084, #45386, #45451,
	  #46570, #47352)
	* KNotes: Fixed drag'n drop of links and plain text

kdesdk
	* Disabled kbugbuster compilation because bug system changed. Use CVS
	  version if you need it.

4 files changed, 296 insertions, 144 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 394ded90f16..bf9c6b6491e 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/10/05 13:11:27 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/14 09:13:50 skrll Exp $
 
-DISTNAME=	kdenetwork-3.0.3
+DISTNAME=	kdenetwork-3.0.4
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index d51135a1a54..77dd62cdfb0 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.3 2002/08/28 07:15:38 skrll Exp $
+$NetBSD: distinfo,v 1.4 2002/10/14 09:13:52 skrll Exp $
 
-SHA1 (kdenetwork-3.0.3.tar.bz2) = ba91977beb8a99a14a5939091d9b2b77448ff7f9
-Size (kdenetwork-3.0.3.tar.bz2) = 3865560 bytes
-SHA1 (patch-aa) = c196d5ed0bff6ba1786c68d0b7735b63b04362b9
-SHA1 (patch-ab) = a1e962fe17b16aa2d1304cc2ba327b294b5d2f7a
+SHA1 (kdenetwork-3.0.4.tar.bz2) = 4288cde85cf157f442b71fa3cc3cc82917eadb6d
+Size (kdenetwork-3.0.4.tar.bz2) = 3961252 bytes
 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855
 SHA1 (patch-ad) = cb9f035a5df914550b691c7c056cc50b96182145
 SHA1 (patch-ae) = f223a5e3923d6d45866ea89119bacba5fd107eb9
-SHA1 (patch-af) = 26ca3d474f8f9ff3daceaf450e8e7850eeb19057
+SHA1 (patch-af) = e8d93e1362343a6313297afdfb8fa00bd8993fe1
 SHA1 (patch-ag) = 41838a86a06877deb2635470a79aeb104cd56474
 SHA1 (patch-ah) = eca8369d447fa423e2ec0965e0a3bdd08a850dda
 SHA1 (patch-ai) = e4c5fa35a4731300d75067b7eebb6f0969775db6
-SHA1 (patch-aj) = 14e5f1fa4a095036fdd1c01c6e2eec1d4d294cf8
+SHA1 (patch-aj) = e8cfe911eee70e6562d616ba374a3f8ce53c67cd
 SHA1 (patch-ak) = 018cff6d72916b528e8e4e47b8cc01cb36799e24
 SHA1 (patch-al) = 13c6bfb20fc49ae22d30029044808c9b77747754
 SHA1 (patch-am) = ea75731f5c51c7a4868f4e63e3b97b9a78d6d80c
diff --git a/net/kdenetwork3/patches/patch-af b/net/kdenetwork3/patches/patch-af
index 9c640f98c86..b6add4bd624 100644
--- a/net/kdenetwork3/patches/patch-af
+++ b/net/kdenetwork3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $
 
---- ksirc/Makefile.in.orig	Fri May 10 13:09:01 2002
+--- ksirc/Makefile.in.orig	Sat Oct 12 13:19:13 2002
 +++ ksirc/Makefile.in
-@@ -244,13 +244,13 @@
+@@ -251,13 +251,13 @@ testview_SOURCES = kstextview.cpp kstext
  testview_LDADD = $(LIB_KDEUI)
  testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
@@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  #>- toplevel.cpp \
  #>- charSelector.cpp \
  #>- chanButtons.cpp \
-@@ -283,7 +283,7 @@
+@@ -290,7 +290,7 @@ noinst_PROGRAMS = getdate
  #>- kstextview.cpp \
  #>- colorpicker.cpp
  #>+ 32
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	toplevel.cpp \
  	charSelector.cpp \
  	chanButtons.cpp \
-@@ -318,6 +318,9 @@
+@@ -325,6 +325,9 @@ ksirc_la_SOURCES=\
  
  
  # the library search path
@@ -37,7 +37,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  all_ksirc_libraries = \
-@@ -329,10 +332,10 @@
+@@ -336,10 +339,10 @@ all_ksirc_libraries = \
  
  # the libraries to link against. Be aware of the order. First the libraries,
  # that depend on the following ones.
@@ -51,7 +51,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  getdate_SOURCES = getdate.c
-@@ -391,9 +394,14 @@
+@@ -398,9 +401,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -68,7 +68,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \
  	NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \
  	ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \
-@@ -402,10 +410,10 @@
+@@ -409,10 +417,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe
  	baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \
  	displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \
  	logfile.lo kstextview.lo colorpicker.lo
@@ -82,7 +82,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \
  	NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \
  	ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \
-@@ -414,9 +422,9 @@
+@@ -421,9 +429,9 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c
  	baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \
  	displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \
  	logfile.lo kstextview.lo colorpicker.lo FilterRuleEditorData.lo \
@@ -95,7 +95,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  bin_PROGRAMS = ksirc$(EXEEXT)
  check_PROGRAMS = testview$(EXEEXT)
  noinst_PROGRAMS = getdate$(EXEEXT)
-@@ -429,11 +437,11 @@
+@@ -436,11 +444,11 @@ getdate_OBJECTS = getdate.$(OBJEXT)
  getdate_LDADD = $(LDADD)
  getdate_DEPENDENCIES =
  getdate_LDFLAGS =
@@ -110,33 +110,22 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  am_testview_OBJECTS = kstextview.$(OBJEXT) kstextviewtest.$(OBJEXT)
  #>- testview_OBJECTS = $(am_testview_OBJECTS)
  #>+ 5
-@@ -460,15 +468,16 @@
- 	@AMDEP_TRUE@	$(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/dccDialogData.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/displayMgrMDI.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/mditoplevel.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/messageReceiver.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/objFinder.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/servercontroller.Plo \
-@@ -503,8 +512,8 @@
+@@ -471,11 +479,13 @@ am__depfiles_maybe = depfiles
+ 	@AMDEP_TRUE@	./$(DEPDIR)/dccDialog.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/dccDialogData.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrMDI.Plo \
+-	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \
++	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \
++	@AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Plo \
++	@AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Po \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/kstextview.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/kstextview.Po \
+@@ -516,8 +526,8 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -147,7 +136,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  DATA = $(apps_DATA) $(conf_DATA) $(misc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -516,7 +525,7 @@
+@@ -529,7 +539,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -156,42 +145,42 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -565,6 +574,8 @@
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -576,6 +586,8 @@ clean-libLTLIBRARIES:
+ 	done
  ksirc.la: $(ksirc_la_OBJECTS) $(ksirc_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(ksirc_la_LDFLAGS) $(ksirc_la_OBJECTS) $(ksirc_la_LIBADD) $(LIBS)
 +libksirc_main.la: $(libksirc_main_la_OBJECTS) $(libksirc_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libksirc_main_la_LDFLAGS) $(libksirc_main_la_OBJECTS) $(libksirc_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -645,7 +656,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dccDialogData.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/displayMgrMDI.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/displayMgrSDI.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioBroadcast.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioDCC.Plo@am__quote@
-@@ -654,6 +664,8 @@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioNotify.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iocontroller.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksircprocess.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksopts.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kstextview.Plo@am__quote@
-@@ -858,7 +870,7 @@
- 
+@@ -668,7 +680,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccDialogData.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrMDI.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrSDI.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioBroadcast.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioDCC.Plo@am__quote@
+@@ -677,6 +688,8 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioNotify.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iocontroller.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksircprocess.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksopts.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstextview.Plo@am__quote@
+@@ -896,7 +909,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=FilterRuleEditor.dlg stringparserstate.h FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp charSelector.cpp dccDialog.cpp kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioLAG.cpp dsirc openksircproc.dlg baserules.cpp logfile.h ksircprocess.cpp displayMgrMDI.h colorpicker.cpp chanButtons.cpp ksirc.desktop ksview.cpp displayMgrSDI.cpp messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp ksircrc usercontrolmenu.cpp displayMgrMDI.cpp charSelector.h ioDCC.cpp filters.pl ssfepromptdata.cpp Artistic ksopts.cpp NewWindowDialog.cpp alistbox.cpp servercontroller.dlg ssfeprompt.cpp dccDialogData.cpp topic.h logfile.cpp FilterRuleEditorData.ui ksirc.cpp chanButtons.h ksirc.pl chanparser.cpp iocontroller.cpp version.h relnotes ioDiscard.cpp ioBroadcast.cpp dccDialog.dlg toplevel.cpp colorpicker.h servercontroller.cpp 
-+KDE_DIST=FilterRuleEditor.dlg stringparserstate.h ksview.cpp displayMgrSDI.cpp FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp ksirc messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp charSelector.cpp ksircrc usercontrolmenu.cpp displayMgrMDI.cpp dccDialog.cpp getdate charSelector.h kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioDCC.cpp ioLAG.cpp dsirc filters.pl ssfepromptdata.cpp openksircproc.dlg baserules.cpp dummy.cpp Artistic logfile.h ksopts.cpp NewWindowDialog.cpp alistbox.cpp servercontroller.dlg FilterRuleEditorData.cpp ksircprocess.cpp ssfeprompt.cpp dccDialogData.cpp FilterRuleEditorData.ui logfile.cpp topic.h displayMgrMDI.h ksirc.cpp chanButtons.h colorpicker.cpp ksirc.pl chanButtons.cpp chanparser.cpp ksirc.desktop iocontroller.cpp version.h relnotes ioBroadcast.cpp ioDiscard.cpp toplevel.cpp dccDialog.dlg colorpicker.h servercontroller.cpp 
+-KDE_DIST=sirc.help.gz mditoplevel.cpp ssfepromptdata.cpp FilterRuleEditor.cpp displayMgrMDI.h messageReceiver.cpp ahistlineedit.cpp Artistic ksview.cpp default.pl ioLAG.cpp kstextview.h charSelector.h chanButtons.cpp ksopts.cpp relnotes filters.pl displayMgrMDI.cpp openksircproc.dlg ioNotify.cpp servercontroller.dlg dccDialog.dlg FilterRuleEditorData.ui topic.cpp chanButtons.h ioDiscard.cpp topic.h ksircrc colorpicker.cpp ksirc.pl ksircprocess.cpp stringparserstate.h logfile.cpp FilterRuleEditor.dlg ksirc.desktop dccDialog.cpp ioDCC.cpp iocontroller.cpp objFinder.cpp ksirc.cpp FAQ baserules.cpp charSelector.cpp logfile.h colorpicker.h toplevel.cpp NewWindowDialog.cpp dsirc servercontroller.cpp dccDialogData.cpp ssfeprompt.cpp mditoplevel.h displayMgrSDI.cpp usercontrolmenu.cpp version.h ioBroadcast.cpp alistbox.cpp chanparser.cpp 
++KDE_DIST=FilterRuleEditor.dlg stringparserstate.h ksview.cpp displayMgrSDI.cpp FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp charSelector.cpp ksircrc usercontrolmenu.cpp displayMgrMDI.cpp dccDialog.cpp charSelector.h kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioDCC.cpp ioLAG.cpp toplevel.loT dsirc filters.pl ssfepromptdata.cpp openksircproc.dlg baserules.cpp Artistic logfile.h ksopts.cpp NewWindowDialog.cpp alistbox.cpp servercontroller.dlg ksircprocess.cpp ssfeprompt.cpp dccDialogData.cpp FilterRuleEditorData.ui logfile.cpp topic.h displayMgrMDI.h ksirc.cpp chanButtons.h colorpicker.cpp ksirc.pl chanButtons.cpp chanparser.cpp ksirc.desktop iocontroller.cpp version.h relnotes ioBroadcast.cpp ioDiscard.cpp toplevel.cpp dccDialog.dlg colorpicker.h servercontroller.cpp 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1017,26 +1029,10 @@
+@@ -1061,125 +1074,122 @@ messages: rc.cpp
  	$(EXTRACTRC) KSOpenkSirc/*.ui >> rc.cpp
  	$(EXTRACTRC) KSPrefs/*.ui >> rc.cpp
  	$(XGETTEXT) *.cpp */*.cpp -o $(podir)/ksirc.pot
@@ -211,53 +200,174 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
 -
 -FilterRuleEditorData.h: $(srcdir)/FilterRuleEditorData.ui
 -	$(UIC) -o FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui
--
++#>+ 3
++iocontroller.moc: $(srcdir)/iocontroller.h
++	$(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc
+ 
 -FilterRuleEditorData.moc: FilterRuleEditorData.h
 -	$(MOC) FilterRuleEditorData.h -o FilterRuleEditorData.moc
--
++#>+ 3
++charSelector.moc: $(srcdir)/charSelector.h
++	$(MOC) $(srcdir)/charSelector.h -o charSelector.moc
+ 
+ #>+ 3
+-ksircprocess.moc: $(srcdir)/ksircprocess.h
+-	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
++ioLAG.moc: $(srcdir)/ioLAG.h
++	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
+ 
+ #>+ 3
+-servercontroller.moc: $(srcdir)/servercontroller.h
+-	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
++NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
++	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
+ 
+ #>+ 3
+-ioDCC.moc: $(srcdir)/ioDCC.h
+-	$(MOC) $(srcdir)/ioDCC.h -o ioDCC.moc
++ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h
++	$(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc
+ 
+ #>+ 3
+-ssfeprompt.moc: $(srcdir)/ssfeprompt.h
+-	$(MOC) $(srcdir)/ssfeprompt.h -o ssfeprompt.moc
++kstextview.moc: $(srcdir)/kstextview.h
++	$(MOC) $(srcdir)/kstextview.h -o kstextview.moc
+ 
+ #>+ 3
+-FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
+-	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
++ksview.moc: $(srcdir)/ksview.h
++	$(MOC) $(srcdir)/ksview.h -o ksview.moc
+ 
+ #>+ 3
+-ahistlineedit.moc: $(srcdir)/ahistlineedit.h
+-	$(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc
++objFinder.moc: $(srcdir)/objFinder.h
++	$(MOC) $(srcdir)/objFinder.h -o objFinder.moc
+ 
+ #>+ 3
+ chanButtons.moc: $(srcdir)/chanButtons.h
+ 	$(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
+ 
+ #>+ 3
+-alistbox.moc: $(srcdir)/alistbox.h
+-	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
++ioDCC.moc: $(srcdir)/ioDCC.h
++	$(MOC) $(srcdir)/ioDCC.h -o ioDCC.moc
+ 
+ #>+ 3
+-iocontroller.moc: $(srcdir)/iocontroller.h
+-	$(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ 
  #>+ 3
- iocontroller.moc: $(srcdir)/iocontroller.h
- 	$(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc
-@@ -1114,6 +1110,10 @@
- 	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
+-dccDialog.moc: $(srcdir)/dccDialog.h
+-	$(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc
++displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
++	$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
  
  #>+ 3
-+FilterRuleEditorData.moc: $(srcdir)/FilterRuleEditorData.h
-+	$(MOC) $(srcdir)/FilterRuleEditorData.h -o FilterRuleEditorData.moc
+-ksview.moc: $(srcdir)/ksview.h
+-	$(MOC) $(srcdir)/ksview.h -o ksview.moc
++ksircprocess.moc: $(srcdir)/ksircprocess.h
++	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
+ 
+ #>+ 3
+-ioLAG.moc: $(srcdir)/ioLAG.h
+-	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
++dccDialogData.moc: $(srcdir)/dccDialogData.h
++	$(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc
+ 
+ #>+ 3
+-mditoplevel.moc: $(srcdir)/mditoplevel.h
+-	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
++ssfeprompt.moc: $(srcdir)/ssfeprompt.h
++	$(MOC) $(srcdir)/ssfeprompt.h -o ssfeprompt.moc
+ 
+ #>+ 3
+ colorpicker.moc: $(srcdir)/colorpicker.h
+ 	$(MOC) $(srcdir)/colorpicker.h -o colorpicker.moc
+ 
+ #>+ 3
++servercontroller.moc: $(srcdir)/servercontroller.h
++	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
 +
 +#>+ 3
- ioNotify.moc: $(srcdir)/ioNotify.h
- 	$(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc
+ topic.moc: $(srcdir)/topic.h
+ 	$(MOC) $(srcdir)/topic.h -o topic.moc
+ 
+ #>+ 3
+-objFinder.moc: $(srcdir)/objFinder.h
+-	$(MOC) $(srcdir)/objFinder.h -o objFinder.moc
++alistbox.moc: $(srcdir)/alistbox.h
++	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
  
-@@ -1133,9 +1133,22 @@
- ahistlineedit.moc: $(srcdir)/ahistlineedit.h
- 	$(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc
+ #>+ 3
+-displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
+-	$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
++ioNotify.moc: $(srcdir)/ioNotify.h
++	$(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc
+ 
+ #>+ 3
+-dccDialogData.moc: $(srcdir)/dccDialogData.h
+-	$(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc
++mditoplevel.moc: $(srcdir)/mditoplevel.h
++	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
  
+ #>+ 3
+-ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h
+-	$(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc
++FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
++	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
+ 
+ #>+ 3
+-charSelector.moc: $(srcdir)/charSelector.h
+-	$(MOC) $(srcdir)/charSelector.h -o charSelector.moc
++dccDialog.moc: $(srcdir)/dccDialog.h
++	$(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc
+ 
+ #>+ 3
+-NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
+-	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
++ahistlineedit.moc: $(srcdir)/ahistlineedit.h
++	$(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc
+ 
+-#>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
 +#>+ 12
 +FilterRuleEditorData.cpp: $(srcdir)/FilterRuleEditorData.ui FilterRuleEditorData.h FilterRuleEditorData.moc
 +	rm -f FilterRuleEditorData.cpp
 +	echo '#include <klocale.h>' > FilterRuleEditorData.cpp
 +	$(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp || rm -f FilterRuleEditorData.cpp
 +	echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp
-+
+ 
+-#>+ 3
+-kstextview.moc: $(srcdir)/kstextview.h
+-	$(MOC) $(srcdir)/kstextview.h -o kstextview.moc
 +FilterRuleEditorData.h: $(srcdir)/FilterRuleEditorData.ui
 +	$(UIC) -o FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui
-+
+ 
+-#>+ 3
+-ioNotify.moc: $(srcdir)/ioNotify.h
+-	$(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc
 +FilterRuleEditorData.moc: FilterRuleEditorData.h
 +	$(MOC) FilterRuleEditorData.h -o FilterRuleEditorData.moc
-+
+ 
  #>+ 3
  clean-metasources:
--	-rm -f  iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc
-+	-rm -f  iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc
+-	-rm -f  ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc NewWindowDialog.moc toplevel.moc kstextview.moc ioNotify.moc
++	-rm -f  iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc
  
  #>+ 4
  clean-ui:
-@@ -1153,16 +1166,16 @@
+@@ -1197,16 +1207,16 @@ force-reedit:
  
  
  #>+ 12
--ksirc_la_meta_unload.cpp:  iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc
+-ksirc_la_meta_unload.cpp:  servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc FilterRuleEditorData.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc kstextview.moc ioNotify.moc
 -	@echo 'creating ksirc_la_meta_unload.cpp'
 -	@-rm -f ksirc_la_meta_unload.cpp
 +libksirc_main_la_meta_unload.cpp:  iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc
@@ -265,7 +375,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
 +	@-rm -f libksirc_main_la_meta_unload.cpp
  	@if test ${kde_qtver} = 2; then \
 -		echo 'static const char * _metalist_ksirc_la[] = {' > ksirc_la_meta_unload.cpp ;\
--		cat  iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> ksirc_la_meta_unload.cpp ;\
+-		cat  servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc FilterRuleEditorData.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc kstextview.moc ioNotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> ksirc_la_meta_unload.cpp ;\
 -		echo '0};' >> ksirc_la_meta_unload.cpp ;\
 -		echo '#include <kunload.h>' >> ksirc_la_meta_unload.cpp ;\
 -		echo '_UNLOAD(ksirc_la)' >> ksirc_la_meta_unload.cpp ;\
@@ -279,7 +389,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  
  
  #>+ 12
-@@ -1180,14 +1193,14 @@
+@@ -1224,14 +1234,14 @@ testview_meta_unload.cpp:  kstextview.mo
  
  #>+ 3
  clean-moc-classes:
@@ -287,8 +397,8 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
 +	-rm -f  libksirc_main_la_meta_unload.cpp testview_meta_unload.cpp
  
  #>+ 11
--ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp ksirc_la_meta_unload.cpp   FilterRuleEditorData.moc iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc 
-+ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in ksirc_main.cpp   iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc 
+-ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp ksirc_la_meta_unload.cpp   FilterRuleEditorData.moc ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc NewWindowDialog.moc toplevel.moc kstextview.moc ioNotify.moc 
++ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksirc_main.cpp   iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc 
  	@echo 'creating ksirc_la.all_cpp.cpp ...'; \
  	rm -f ksirc_la.all_cpp.files ksirc_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> ksirc_la.all_cpp.final; \
@@ -297,12 +407,12 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	  echo "#include \"$$file\"" >> ksirc_la.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc_la.all_cpp.final; \
  	done; \
-@@ -1195,11 +1208,23 @@
+@@ -1239,11 +1249,23 @@ ksirc_la.all_cpp.cpp: $(srcdir)/Makefile
  	rm -f ksirc_la.all_cpp.final ksirc_la.all_cpp.files
  
  #>+ 11
 -ksirc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/FilterRuleEditorData.cpp $(srcdir)/libksirc_main_la_meta_unload.cpp   FilterRuleEditorData.moc
++libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp libksirc_main_la_meta_unload.cpp   FilterRuleEditorData.moc
 +	@echo 'creating libksirc_main_la.all_cpp.cpp ...'; \
 +	rm -f libksirc_main_la.all_cpp.files libksirc_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libksirc_main_la.all_cpp.final; \
@@ -314,7 +424,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
 +	rm -f libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files
 +
 +#>+ 11
-+ksirc.all_cpp.cpp: $(srcdir)/Makefile.in ksirc_main.cpp  
++ksirc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksirc_main.cpp  
  	@echo 'creating ksirc.all_cpp.cpp ...'; \
  	rm -f ksirc.all_cpp.files ksirc.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> ksirc.all_cpp.final; \
@@ -323,7 +433,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	  echo "#include \"$$file\"" >> ksirc.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc.all_cpp.final; \
  	done; \
-@@ -1220,20 +1245,20 @@
+@@ -1264,20 +1286,20 @@ testview.all_cpp.cpp: $(srcdir)/Makefile
  
  #>+ 3
  clean-final:
@@ -349,20 +459,65 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1242,7 +1267,7 @@
- kde-rpo-clean:
+@@ -1287,36 +1309,36 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
--#>+ 34
-+#>+ 35
+ #>+ 34
+-$(srcdir)/usercontrolmenu.cpp: FilterRuleEditorData.h 
+-$(srcdir)/ioDCC.cpp: ioDCC.moc FilterRuleEditorData.h 
+-$(srcdir)/NewWindowDialog.cpp: NewWindowDialog.moc FilterRuleEditorData.h 
+-$(srcdir)/ahistlineedit.cpp: ahistlineedit.moc FilterRuleEditorData.h 
+-$(srcdir)/ksview.cpp: ksview.moc FilterRuleEditorData.h 
+-$(srcdir)/dccDialog.cpp: dccDialog.moc FilterRuleEditorData.h 
+-$(srcdir)/charSelector.cpp: charSelector.moc FilterRuleEditorData.h 
+-$(srcdir)/iocontroller.cpp: iocontroller.moc FilterRuleEditorData.h 
+-$(srcdir)/toplevel.cpp: toplevel.moc FilterRuleEditorData.h 
+-$(srcdir)/colorpicker.cpp: colorpicker.moc FilterRuleEditorData.h 
  $(srcdir)/objFinder.cpp: objFinder.moc FilterRuleEditorData.h 
- $(srcdir)/chanparser.cpp: FilterRuleEditorData.h 
- $(srcdir)/colorpicker.cpp: colorpicker.moc FilterRuleEditorData.h 
-@@ -1272,6 +1297,7 @@
- $(srcdir)/ksview.cpp: ksview.moc FilterRuleEditorData.h 
- $(srcdir)/ksopts.cpp: FilterRuleEditorData.h 
+-$(srcdir)/logfile.cpp: FilterRuleEditorData.h 
+-$(srcdir)/dccDialogData.cpp: dccDialogData.moc FilterRuleEditorData.h 
+-$(srcdir)/baserules.cpp: FilterRuleEditorData.h 
++$(srcdir)/chanparser.cpp: FilterRuleEditorData.h 
++$(srcdir)/colorpicker.cpp: colorpicker.moc FilterRuleEditorData.h 
+ $(srcdir)/chanButtons.cpp: chanButtons.moc FilterRuleEditorData.h 
+-$(srcdir)/ksopts.cpp: FilterRuleEditorData.h 
+-$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h 
+-$(srcdir)/ssfepromptdata.cpp: ssfepromptdata.moc FilterRuleEditorData.h 
++$(srcdir)/topic.cpp: topic.moc FilterRuleEditorData.h 
++$(srcdir)/dccDialog.cpp: dccDialog.moc FilterRuleEditorData.h 
++$(srcdir)/logfile.cpp: FilterRuleEditorData.h 
++$(srcdir)/kstextview.cpp: kstextview.moc FilterRuleEditorData.h 
+ $(srcdir)/ioBroadcast.cpp: FilterRuleEditorData.h 
++$(srcdir)/toplevel.cpp: toplevel.moc FilterRuleEditorData.h 
++$(srcdir)/NewWindowDialog.cpp: NewWindowDialog.moc FilterRuleEditorData.h 
++$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h 
++$(srcdir)/ksircprocess.cpp: ksircprocess.moc FilterRuleEditorData.h 
+ $(srcdir)/displayMgrSDI.cpp: FilterRuleEditorData.h 
++$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h 
++$(srcdir)/charSelector.cpp: charSelector.moc FilterRuleEditorData.h 
++$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditor.moc FilterRuleEditorData.h 
++$(srcdir)/baserules.cpp: FilterRuleEditorData.h 
++$(srcdir)/usercontrolmenu.cpp: FilterRuleEditorData.h 
++$(srcdir)/alistbox.cpp: alistbox.moc FilterRuleEditorData.h 
+ $(srcdir)/ssfeprompt.cpp: ssfeprompt.moc FilterRuleEditorData.h 
++$(srcdir)/ioDCC.cpp: ioDCC.moc FilterRuleEditorData.h 
++$(srcdir)/ioLAG.cpp: ioLAG.moc FilterRuleEditorData.h 
++$(srcdir)/ahistlineedit.cpp: ahistlineedit.moc FilterRuleEditorData.h 
+ $(srcdir)/mditoplevel.cpp: mditoplevel.moc FilterRuleEditorData.h 
+-$(srcdir)/topic.cpp: topic.moc FilterRuleEditorData.h 
+-$(srcdir)/kstextview.cpp: kstextview.moc FilterRuleEditorData.h 
++$(srcdir)/dccDialogData.cpp: dccDialogData.moc FilterRuleEditorData.h 
++$(srcdir)/ksview.cpp: ksview.moc FilterRuleEditorData.h 
++$(srcdir)/ksopts.cpp: FilterRuleEditorData.h 
  $(srcdir)/servercontroller.cpp: servercontroller.moc FilterRuleEditorData.h 
-+$(srcdir)/FilterRuleEditorData.cpp: FilterRuleEditorData.moc 
- $(srcdir)/ssfepromptdata.cpp: ssfepromptdata.moc FilterRuleEditorData.h 
+-$(srcdir)/ioLAG.cpp: ioLAG.moc FilterRuleEditorData.h 
+-$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h 
+-$(srcdir)/ioNotify.cpp: ioNotify.moc FilterRuleEditorData.h 
+-$(srcdir)/alistbox.cpp: alistbox.moc FilterRuleEditorData.h 
+-$(srcdir)/ksircprocess.cpp: ksircprocess.moc FilterRuleEditorData.h 
++$(srcdir)/ssfepromptdata.cpp: ssfepromptdata.moc FilterRuleEditorData.h 
  $(srcdir)/displayMgrMDI.cpp: displayMgrMDI.moc FilterRuleEditorData.h 
- $(srcdir)/iocontroller.cpp: iocontroller.moc FilterRuleEditorData.h 
+-$(srcdir)/chanparser.cpp: FilterRuleEditorData.h 
+-$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditor.moc FilterRuleEditorData.h 
++$(srcdir)/iocontroller.cpp: iocontroller.moc FilterRuleEditorData.h 
++$(srcdir)/ioNotify.cpp: ioNotify.moc FilterRuleEditorData.h 
diff --git a/net/kdenetwork3/patches/patch-aj b/net/kdenetwork3/patches/patch-aj
index 1fe3c9382e2..8af6eec94f4 100644
--- a/net/kdenetwork3/patches/patch-aj
+++ b/net/kdenetwork3/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $
 
---- kxmlrpc/Makefile.in.orig	Fri May 10 13:09:01 2002
+--- kxmlrpc/Makefile.in.orig	Sat Oct 12 13:19:15 2002
 +++ kxmlrpc/Makefile.in
-@@ -234,17 +234,22 @@
+@@ -241,17 +241,22 @@ SUBDIRS = gui
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kxmlrpcd
@@ -31,7 +31,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  #>- kxmlrpcd_la_METASOURCES = AUTO
  
  libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE)
-@@ -261,30 +266,35 @@
+@@ -268,30 +273,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
  
@@ -80,18 +80,17 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -292,7 +302,9 @@
- LDFLAGS = @LDFLAGS@
+@@ -300,7 +310,8 @@ LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kxmlrpcd_main.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/kxmlrpcdaemon.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kxmlrpcinit.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kxmlrpcparser.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kxmlrpcserver.Plo \
-@@ -317,7 +329,7 @@
+ am__depfiles_maybe = depfiles
+-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \
++	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcd_main.Po \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcdaemon.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcinit.Plo \
+ 	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcparser.Plo \
+@@ -326,7 +337,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) \
@@ -100,7 +99,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  DATA = $(service_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -329,7 +341,7 @@
+@@ -338,7 +349,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -109,35 +108,35 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -402,6 +414,8 @@
+@@ -418,6 +429,8 @@ kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kx
  @KDE_USE_CLOSURE_TRUE@libkcm_xmlrpcd.la: libkcm_xmlrpcd.la.closure $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_DEPENDENCIES) 
  @KDE_USE_CLOSURE_FALSE@libkcm_xmlrpcd.la: $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(kde_moduledir) $(libkcm_xmlrpcd_la_LDFLAGS) $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_LIBADD) $(LIBS)
 +libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -436,7 +450,8 @@
+@@ -457,7 +470,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcd_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcinit.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcparser.Plo@am__quote@
-@@ -577,7 +592,7 @@
- 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcinit.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcparser.Plo@am__quote@
+@@ -611,7 +625,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=kxmlrpcd.desktop LICENSE 
-+KDE_DIST=kxmlrpcd kxmlrpcd.desktop LICENSE libkcm_xmlrpcd.la.closure dummy.cpp 
++KDE_DIST=LICENSE kxmlrpcd.desktop 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -744,8 +759,12 @@
+@@ -784,8 +798,12 @@ libkcm_xmlrpcd.la.closure: $(libkcm_xmlr
  
  
  #>+ 3
@@ -151,7 +150,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  
  #>+ 3
  clean-closures:
-@@ -762,28 +781,28 @@
+@@ -802,28 +820,28 @@ force-reedit:
  
  
  #>+ 12
@@ -192,7 +191,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	  echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \
  	done; \
-@@ -803,11 +822,23 @@
+@@ -843,11 +861,23 @@ libkcm_xmlrpcd_la.all_cpp.cpp: $(srcdir)
  	rm -f libkcm_xmlrpcd_la.all_cpp.final libkcm_xmlrpcd_la.all_cpp.files
  
  #>+ 11
@@ -218,7 +217,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  	  echo "#include \"$$file\"" >> kxmlrpcd.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd.all_cpp.final; \
  	done; \
-@@ -816,20 +847,20 @@
+@@ -856,20 +886,20 @@ kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile
  
  #>+ 3
  clean-final:
@@ -244,7 +243,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -839,4 +870,4 @@
+@@ -879,4 +909,4 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 2