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

1.0.5.1 accordingly.

Fixes and changes are:

Multiple vulnerabilities.

kdelibs
	KHTML : Fixed several crashes and misrenderings.
	rlogin.protocol: fixed command execution in specially crafted
	urls.

kdebase
	KAddressbook: Don't squeeze columns on startup/properly restore
	column width settings.

kdenetwork
	lisa, reslisa: Fixed several security vulnerabilities.

kdesdk
	Cervisia: Show long lines in diff view always completely.

4 files changed, 485 insertions, 313 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 54051f861d3..c90278e4d47 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/12/24 06:10:06 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:25 skrll Exp $
 
-DISTNAME=	kdegraphics-3.0.4
-PKGREVISION=	1
+DISTNAME=	kdegraphics-3.0.5a
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index b75328b44d4..833197ed8ac 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2002/10/14 09:13:47 skrll Exp $
+$NetBSD: distinfo,v 1.5 2003/01/02 09:12:25 skrll Exp $
 
-SHA1 (kdegraphics-3.0.4.tar.bz2) = 859584b2c522402149887f7e23f14bc3b8c06c54
-Size (kdegraphics-3.0.4.tar.bz2) = 2665229 bytes
+SHA1 (kdegraphics-3.0.5a.tar.bz2) = 2288b4ee8ce80ef8103baa3783749655fd9e19a5
+Size (kdegraphics-3.0.5a.tar.bz2) = 2664922 bytes
 SHA1 (patch-aa) = 6abaca67ea4d0fa0a5f9ac9126adb78cc15bc287
 SHA1 (patch-ab) = 2797a41da3c39cca6d39369bba767728f973e245
 SHA1 (patch-ac) = 64cd943b954af8f0b2b8875f56a43ec6d175f5c7
-SHA1 (patch-ad) = 5aadae5dda5ec9a6f66b3cf7870967291e73922b
+SHA1 (patch-ad) = d66a8749a0c7c6ac76ba2e196f1bd6bb94d5f66a
 SHA1 (patch-ae) = f9ff03ea8e1ff92126312ef28e5d5df5a17b8e57
 SHA1 (patch-af) = 9dd124174938f41124b98540da3d3548ebedbb48
 SHA1 (patch-ag) = 81c4a846763534c9fe3366bf8d571208d337e2c4
-SHA1 (patch-ah) = 3a7984280e549bc0dcf05b01f80f8367747c78c9
+SHA1 (patch-ah) = 551a85ead5c295e9342134478062abfb9700b4d4
 SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1
 SHA1 (patch-aj) = 907f78831601897aa12de00f07c2978d09b72ad5
diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad
index 6a6a776883c..dcc4b2ab1b1 100644
--- a/graphics/kdegraphics3/patches/patch-ad
+++ b/graphics/kdegraphics3/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2003/01/02 09:12:26 skrll Exp $
 
---- kview/Makefile.in.orig	Wed May  8 20:05:35 2002
+--- kview/Makefile.in.orig	Tue Dec 31 13:27:55 2002
 +++ kview/Makefile.in
-@@ -246,33 +246,37 @@
+@@ -245,33 +245,37 @@ INCLUDES = $(all_includes)
  
  #>- METASOURCES = AUTO
  
@@ -21,20 +21,20 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  
 -#>- kview_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \
 +#>- libkview_main_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \
- #>- filter.cpp filtlist.cpp \
- #>- kcproc.cpp kviewconfdialog_base.ui kviewconfdialog.cpp \
- #>- imagelistdialog_base.ui imagelistdialog.cpp \
- #>- knumdialog_base.ui knumdialog.cpp \
- #>- kfilteraction.cpp infowin_base.ui infowin.cpp
+ #>- 	filter.cpp filtlist.cpp \
+ #>- 	kcproc.cpp kviewconfdialog_base.ui kviewconfdialog.cpp \
+ #>-         imagelistdialog_base.ui imagelistdialog.cpp \
+ #>-         knumdialog_base.ui knumdialog.cpp \
+ #>-         kfilteraction.cpp infowin_base.ui infowin.cpp
  #>+ 6
 -kview_la_SOURCES=main.cpp viewer.cpp kview.cpp colour.cpp \
 +libkview_main_la_SOURCES=main.cpp viewer.cpp kview.cpp colour.cpp \
  	filter.cpp filtlist.cpp \
  	kcproc.cpp  kviewconfdialog.cpp \
- 	 imagelistdialog.cpp \
- 	 knumdialog.cpp \
--	kfilteraction.cpp  infowin.cpp kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C
-+	kfilteraction.cpp  infowin.cpp kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc
+          imagelistdialog.cpp \
+          knumdialog.cpp \
+-        kfilteraction.cpp  infowin.cpp kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C
++        kfilteraction.cpp  infowin.cpp kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc
  
  
 -kview_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  
  test_SOURCES = libkview.la test.cpp
  test_LDFLAGS = $(all_libraries) -module -avoid-version
-@@ -296,24 +300,29 @@
+@@ -295,23 +299,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -66,31 +66,29 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 +	filter.lo filtlist.lo kcproc.lo kviewconfdialog.lo \
 +	imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo
 +#>- libkview_main_la_OBJECTS = $(am_libkview_main_la_OBJECTS)
- #>+ 7
--kview_la_final_OBJECTS = kview_la.all_cpp.lo kview_la.all_C.lo 
+ #>+ 6
+-kview_la_final_OBJECTS = kview_la.all_C.lo kview_la.all_cpp.lo 
 -kview_la_nofinal_OBJECTS = main.lo viewer.lo kview.lo colour.lo filter.lo \
 -	filtlist.lo kcproc.lo kviewconfdialog.lo imagelistdialog.lo \
--	knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo \
--	kview_la_meta_unload.lo 
+-	knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo
 -@KDE_USE_FINAL_FALSE@kview_la_OBJECTS = $(kview_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kview_la_OBJECTS = $(kview_la_final_OBJECTS)
 +libkview_main_la_final_OBJECTS = libkview_main_la.all_cpp.lo libkview_main_la.all_cc.lo 
 +libkview_main_la_nofinal_OBJECTS = main.lo viewer.lo kview.lo colour.lo \
 +	filter.lo filtlist.lo kcproc.lo kviewconfdialog.lo \
-+	imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo \
-+	libkview_main_la_meta_unload.lo 
++	imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo
 +@KDE_USE_FINAL_FALSE@libkview_main_la_OBJECTS = $(libkview_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkview_main_la_OBJECTS = $(libkview_main_la_final_OBJECTS)
  libkviewpart_la_DEPENDENCIES =
  am_libkviewpart_la_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo
  #>- libkviewpart_la_OBJECTS = $(am_libkviewpart_la_OBJECTS)
- #>+ 5
--libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cpp.lo libkviewpart_la.all_C.lo libkviewpart_la.all_cc.lo 
-+libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cpp.lo libkviewpart_la.all_cc.lo 
- libkviewpart_la_nofinal_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo \
- 	libkviewpart_la_meta_unload.lo 
+ #>+ 4
+-libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cc.lo canvas.lo 
++libkviewpart_la_final_OBJECTS = canvas.lo libkviewpart_la.all_cc.lo 
+ libkviewpart_la_nofinal_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo
  @KDE_USE_FINAL_FALSE@libkviewpart_la_OBJECTS = $(libkviewpart_la_nofinal_OBJECTS)
-@@ -322,11 +331,11 @@
+ @KDE_USE_FINAL_TRUE@libkviewpart_la_OBJECTS = $(libkviewpart_la_final_OBJECTS)
+@@ -319,11 +328,11 @@ bin_PROGRAMS = kview$(EXEEXT)
  check_PROGRAMS = test$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -105,22 +103,48 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  am_test_OBJECTS = test.$(OBJEXT)
  #>- test_OBJECTS = $(am_test_OBJECTS)
  #>+ 1
-@@ -340,12 +349,12 @@
+@@ -337,33 +346,33 @@ LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/filtlist.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kview_asyncio.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \
- 	@AMDEP_TRUE@	$(DEPDIR)/kview_view.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo
-@@ -376,8 +385,8 @@
+ #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/filtlist.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kview_asyncio.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kview_view.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo
+ #>+ 21
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kviewconfdialog_base.P $(DEPDIR)/imagelistdialog_base.P $(DEPDIR)/knumdialog_base.P $(DEPDIR)/infowin_base.P  $(DEPDIR)/kview_la.all_C.P $(DEPDIR)/kview_la.all_cpp.P $(DEPDIR)/libkviewpart_la.all_cc.P  $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/filtlist.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kviewconfdialog_base.P $(DEPDIR)/imagelistdialog_base.P $(DEPDIR)/knumdialog_base.P $(DEPDIR)/infowin_base.P  $(DEPDIR)/libkview_main_la.all_cpp.P $(DEPDIR)/libkview_main_la.all_cc.P $(DEPDIR)/libkviewpart_la.all_cc.P  $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kview_asyncio.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kview_view.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kviewconfdialog_base.P $(DEPDIR)/imagelistdialog_base.P $(DEPDIR)/knumdialog_base.P $(DEPDIR)/infowin_base.P  $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/filtlist.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kview_asyncio.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kview_view.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo
+@@ -395,8 +404,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -131,7 +155,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  DATA = $(lnk_DATA) $(part_DATA) $(rc_DATA)
  
  
-@@ -387,14 +396,14 @@
+@@ -406,14 +415,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = README AUTHORS Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -148,7 +172,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -436,6 +445,8 @@
+@@ -455,6 +464,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kview.la: $(kview_la_OBJECTS) $(kview_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kview_la_LDFLAGS) $(kview_la_OBJECTS) $(kview_la_LIBADD) $(LIBS)
@@ -157,7 +181,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  #>- libkviewpart.la: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) 
  #>+ 2
  @KDE_USE_CLOSURE_TRUE@libkviewpart.la: libkviewpart.la.closure $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) 
-@@ -483,7 +494,6 @@
+@@ -502,7 +513,6 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/canvas.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/colour.Plo@am__quote@
@@ -165,7 +189,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filter.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filtlist.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/imagelistdialog.Plo@am__quote@
-@@ -493,6 +503,8 @@
+@@ -512,6 +522,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knumdialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_asyncio.Plo@am__quote@
@@ -174,7 +198,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_view.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kviewconfdialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@
-@@ -502,25 +514,6 @@
+@@ -521,25 +533,6 @@ distclean-compile:
  distclean-depend:
  	-rm -rf $(DEPDIR)
  
@@ -200,7 +224,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  .cc.o:
  @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@@ -538,6 +531,7 @@
+@@ -557,6 +550,7 @@ CXXDEPMODE = @CXXDEPMODE@
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
@@ -208,16 +232,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  
  .cpp.o:
  @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@@ -703,7 +697,7 @@
+@@ -722,7 +716,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=filter.h infowin.h viewer.h kview_popup.rc kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp kview.h kviewconfdialog.cpp kfilteraction.cpp hi32-app-kview.png imagelistdialog.cpp knumdialog.h kviewui.rc kcproc.h knumdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h kcproc.cpp hi48-app-kview.png kviewconfdialog.h infowin_base.ui filtlist.h canvas.h kviewconfdialog_base.ui filter.cpp kview_view.h filtlist.cpp kview.desktop knumdialog.cpp version.h imagelistdialog_base.ui 
-+KDE_DIST=filter.h imagelistdialog_base.cc infowin.h viewer.h kview_popup.rc kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp kview.h kviewconfdialog.cpp kfilteraction.cpp hi32-app-kview.png imagelistdialog.cpp knumdialog.h imagelistdialog_base.C kviewconfdialog_base.C kviewui.rc kcproc.h knumdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h kview kcproc.cpp knumdialog_base.cc knumdialog_base.C hi48-app-kview.png kviewconfdialog.h kview_la_closure.C kviewconfdialog_base.h imagelistdialog_base.h infowin_base.ui libkviewpart.la.closure infowin_base.C canvas.h filtlist.h kviewconfdialog_base.ui filter.cpp kview_view.h filtlist.cpp infowin_base.cc kview.desktop knumdialog.cpp knumdialog_base.h dummy.C imagelistdialog_base.ui version.h kviewconfdialog_base.cc infowin_base.h 
+-KDE_DIST=colour.h kview_asyncio.h kviewconfdialog.h hi32-app-kview.png filtlist.h kfilteraction.h kviewconfdialog.cpp kview_part.rc kviewui.rc filter.cpp imagelistdialog.cpp infowin.h imagelistdialog_base.ui knumdialog_base.ui kfilteraction.cpp hi48-app-kview.png knumdialog.cpp hi16-app-kview.png kview.h infowin.cpp filter.h imagelistdialog.h kviewconfdialog_base.ui viewer.h filtlist.cpp kview_popup.rc infowin_base.ui knumdialog.h kview_view.h canvas.h version.h kcproc.cpp kview.desktop kcproc.h 
++KDE_DIST=kcproc.cpp filter.h infowin.h viewer.h hi48-app-kview.png kview_popup.rc kviewconfdialog.h kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp infowin_base.ui kview.h kviewconfdialog.cpp filtlist.h canvas.h kfilteraction.cpp hi32-app-kview.png kviewconfdialog_base.ui imagelistdialog.cpp knumdialog.h filter.cpp kview_view.h filtlist.cpp kview.desktop kviewui.rc kcproc.h knumdialog.cpp knumdialog_base.ui version.h imagelistdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -857,9 +851,6 @@
+@@ -876,9 +870,6 @@ messages: rc.cpp
  srcdoc:
  	kdoc -a -p -H -d $(HOME)/web/src/kview kview *.h -lqt -lkdecore -lkdeui -lkfile
  
@@ -227,16 +251,18 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  ###KMAKE-start (don't edit or delete this block)
  
  ###KMAKE-end
-@@ -867,52 +858,6 @@
+@@ -886,63 +877,13 @@ dummy.C:
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
--#>+ 45
+-#>+ 53
 -kviewconfdialog_base.C: $(srcdir)/kviewconfdialog_base.ui kviewconfdialog_base.h kviewconfdialog_base.moc
 -	rm -f kviewconfdialog_base.C
 -	echo '#include <klocale.h>' > kviewconfdialog_base.C
--	$(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.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_kviewconfdialog_base,g" >> kviewconfdialog_base.C || rm -f kviewconfdialog_base.C
--	echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.C
+-	$(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui > kviewconfdialog_base.C.temp ; ret=$$?; \
+-	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" kviewconfdialog_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.C ;\
+-	rm -f kviewconfdialog_base.C.temp ;\
+-	if test "$$ret" = 0; then echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.C; else rm -f kviewconfdialog_base.C ; exit $$ret ; fi
 -
 -kviewconfdialog_base.h: $(srcdir)/kviewconfdialog_base.ui
 -	$(UIC) -o kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui
@@ -246,8 +272,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 -imagelistdialog_base.C: $(srcdir)/imagelistdialog_base.ui imagelistdialog_base.h imagelistdialog_base.moc
 -	rm -f imagelistdialog_base.C
 -	echo '#include <klocale.h>' > imagelistdialog_base.C
--	$(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.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_imagelistdialog_base,g" >> imagelistdialog_base.C || rm -f imagelistdialog_base.C
--	echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.C
+-	$(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui > imagelistdialog_base.C.temp ; ret=$$?; \
+-	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" imagelistdialog_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.C ;\
+-	rm -f imagelistdialog_base.C.temp ;\
+-	if test "$$ret" = 0; then echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.C; else rm -f imagelistdialog_base.C ; exit $$ret ; fi
 -
 -imagelistdialog_base.h: $(srcdir)/imagelistdialog_base.ui
 -	$(UIC) -o imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui
@@ -257,8 +285,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 -knumdialog_base.C: $(srcdir)/knumdialog_base.ui knumdialog_base.h knumdialog_base.moc
 -	rm -f knumdialog_base.C
 -	echo '#include <klocale.h>' > knumdialog_base.C
--	$(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.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_knumdialog_base,g" >> knumdialog_base.C || rm -f knumdialog_base.C
--	echo '#include "knumdialog_base.moc"' >> knumdialog_base.C
+-	$(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui > knumdialog_base.C.temp ; ret=$$?; \
+-	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" knumdialog_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.C ;\
+-	rm -f knumdialog_base.C.temp ;\
+-	if test "$$ret" = 0; then echo '#include "knumdialog_base.moc"' >> knumdialog_base.C; else rm -f knumdialog_base.C ; exit $$ret ; fi
 -
 -knumdialog_base.h: $(srcdir)/knumdialog_base.ui
 -	$(UIC) -o knumdialog_base.h $(srcdir)/knumdialog_base.ui
@@ -268,39 +298,81 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 -infowin_base.C: $(srcdir)/infowin_base.ui infowin_base.h infowin_base.moc
 -	rm -f infowin_base.C
 -	echo '#include <klocale.h>' > infowin_base.C
--	$(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.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_infowin_base,g" >> infowin_base.C || rm -f infowin_base.C
--	echo '#include "infowin_base.moc"' >> infowin_base.C
+-	$(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui > infowin_base.C.temp ; ret=$$?; \
+-	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" infowin_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.C ;\
+-	rm -f infowin_base.C.temp ;\
+-	if test "$$ret" = 0; then echo '#include "infowin_base.moc"' >> infowin_base.C; else rm -f infowin_base.C ; exit $$ret ; fi
 -
 -infowin_base.h: $(srcdir)/infowin_base.ui
 -	$(UIC) -o infowin_base.h $(srcdir)/infowin_base.ui
 -
 -infowin_base.moc: infowin_base.h
 -	$(MOC) infowin_base.h -o infowin_base.moc
--
++#>+ 3
++kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h
++	$(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc
+ 
+ #>+ 3
+-kfilteraction.moc: $(srcdir)/kfilteraction.h
+-	$(MOC) $(srcdir)/kfilteraction.h -o kfilteraction.moc
++canvas.moc: $(srcdir)/canvas.h
++	$(MOC) $(srcdir)/canvas.h -o canvas.moc
+ 
+ #>+ 3
+ infowin.moc: $(srcdir)/infowin.h
+@@ -957,8 +898,16 @@ kview_view.moc: $(srcdir)/kview_view.h
+ 	$(MOC) $(srcdir)/kview_view.h -o kview_view.moc
+ 
+ #>+ 3
+-kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h
+-	$(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc
++kfilteraction.moc: $(srcdir)/kfilteraction.h
++	$(MOC) $(srcdir)/kfilteraction.h -o kfilteraction.moc
++
++#>+ 3
++kview.moc: $(srcdir)/kview.h
++	$(MOC) $(srcdir)/kview.h -o kview.moc
++
++#>+ 3
++imagelistdialog.moc: $(srcdir)/imagelistdialog.h
++	$(MOC) $(srcdir)/imagelistdialog.h -o imagelistdialog.moc
+ 
  #>+ 3
- kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h
- 	$(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc
-@@ -953,10 +898,56 @@
+ filter.moc: $(srcdir)/filter.h
+@@ -968,22 +917,64 @@ filter.moc: $(srcdir)/filter.h
  kview_asyncio.moc: $(srcdir)/kview_asyncio.h
  	$(MOC) $(srcdir)/kview_asyncio.h -o kview_asyncio.moc
  
-+#>+ 45
+-#>+ 3
+-imagelistdialog.moc: $(srcdir)/imagelistdialog.h
+-	$(MOC) $(srcdir)/imagelistdialog.h -o imagelistdialog.moc
++#>+ 53
 +kviewconfdialog_base.cc: $(srcdir)/kviewconfdialog_base.ui kviewconfdialog_base.h kviewconfdialog_base.moc
 +	rm -f kviewconfdialog_base.cc
 +	echo '#include <klocale.h>' > kviewconfdialog_base.cc
-+	$(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.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_kviewconfdialog_base,g" >> kviewconfdialog_base.cc || rm -f kviewconfdialog_base.cc
-+	echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.cc
-+
++	$(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui > kviewconfdialog_base.cc.temp ; ret=$$?; \
++	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" kviewconfdialog_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.cc ;\
++	rm -f kviewconfdialog_base.cc.temp ;\
++	if test "$$ret" = 0; then echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.cc; else rm -f kviewconfdialog_base.cc ; exit $$ret ; fi
+ 
+-#>+ 3
+-kview.moc: $(srcdir)/kview.h
+-	$(MOC) $(srcdir)/kview.h -o kview.moc
 +kviewconfdialog_base.h: $(srcdir)/kviewconfdialog_base.ui
 +	$(UIC) -o kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui
-+
+ 
+-#>+ 3
+-canvas.moc: $(srcdir)/canvas.h
+-	$(MOC) $(srcdir)/canvas.h -o canvas.moc
 +kviewconfdialog_base.moc: kviewconfdialog_base.h
 +	$(MOC) kviewconfdialog_base.h -o kviewconfdialog_base.moc
 +imagelistdialog_base.cc: $(srcdir)/imagelistdialog_base.ui imagelistdialog_base.h imagelistdialog_base.moc
 +	rm -f imagelistdialog_base.cc
 +	echo '#include <klocale.h>' > imagelistdialog_base.cc
-+	$(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.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_imagelistdialog_base,g" >> imagelistdialog_base.cc || rm -f imagelistdialog_base.cc
-+	echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.cc
++	$(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui > imagelistdialog_base.cc.temp ; ret=$$?; \
++	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" imagelistdialog_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.cc ;\
++	rm -f imagelistdialog_base.cc.temp ;\
++	if test "$$ret" = 0; then echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.cc; else rm -f imagelistdialog_base.cc ; exit $$ret ; fi
 +
 +imagelistdialog_base.h: $(srcdir)/imagelistdialog_base.ui
 +	$(UIC) -o imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui
@@ -310,8 +382,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 +knumdialog_base.cc: $(srcdir)/knumdialog_base.ui knumdialog_base.h knumdialog_base.moc
 +	rm -f knumdialog_base.cc
 +	echo '#include <klocale.h>' > knumdialog_base.cc
-+	$(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.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_knumdialog_base,g" >> knumdialog_base.cc || rm -f knumdialog_base.cc
-+	echo '#include "knumdialog_base.moc"' >> knumdialog_base.cc
++	$(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui > knumdialog_base.cc.temp ; ret=$$?; \
++	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" knumdialog_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.cc ;\
++	rm -f knumdialog_base.cc.temp ;\
++	if test "$$ret" = 0; then echo '#include "knumdialog_base.moc"' >> knumdialog_base.cc; else rm -f knumdialog_base.cc ; exit $$ret ; fi
 +
 +knumdialog_base.h: $(srcdir)/knumdialog_base.ui
 +	$(UIC) -o knumdialog_base.h $(srcdir)/knumdialog_base.ui
@@ -321,15 +395,17 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 +infowin_base.cc: $(srcdir)/infowin_base.ui infowin_base.h infowin_base.moc
 +	rm -f infowin_base.cc
 +	echo '#include <klocale.h>' > infowin_base.cc
-+	$(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.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_infowin_base,g" >> infowin_base.cc || rm -f infowin_base.cc
-+	echo '#include "infowin_base.moc"' >> infowin_base.cc
++	$(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui > infowin_base.cc.temp ; ret=$$?; \
++	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" infowin_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.cc ;\
++	rm -f infowin_base.cc.temp ;\
++	if test "$$ret" = 0; then echo '#include "infowin_base.moc"' >> infowin_base.cc; else rm -f infowin_base.cc ; exit $$ret ; fi
 +
 +infowin_base.h: $(srcdir)/infowin_base.ui
 +	$(UIC) -o infowin_base.h $(srcdir)/infowin_base.ui
 +
 +infowin_base.moc: infowin_base.h
 +	$(MOC) infowin_base.h -o infowin_base.moc
-+
+ 
  #>+ 8
  libkviewpart.la.closure: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES)
 -	@echo "int main() {return 0;}" > libkviewpart_la_closure.C
@@ -339,7 +415,13 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  	$(CXXLINK) libkviewpart_la_closure.lo $(libkviewpart_la_LDFLAGS) $(libkviewpart_la_OBJECTS) $(libkviewpart_la_LIBADD) $(LIBS)
  	@rm -f libkviewpart_la_closure.* libkviewpart.la.closure
  	@echo "timestamp" > libkviewpart.la.closure
-@@ -969,10 +960,10 @@
+@@ -991,15 +982,15 @@ libkviewpart.la.closure: $(libkviewpart_
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kfilteraction.moc infowin.moc viewer.moc kview_view.moc kviewconfdialog.moc filter.moc kview_asyncio.moc imagelistdialog.moc kview.moc canvas.moc
++	-rm -f  kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc
+ 
  #>+ 7
  clean-ui:
  	-rm -f \
@@ -354,165 +436,63 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
  
  #>+ 3
  clean-closures:
-@@ -1003,41 +994,41 @@
- 
- 
- #>+ 12
--kview_la_meta_unload.C:  kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc
--	@echo 'creating kview_la_meta_unload.C'
--	@-rm -f kview_la_meta_unload.C
-+libkview_main_la_meta_unload.cc:  kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc
-+	@echo 'creating libkview_main_la_meta_unload.cc'
-+	@-rm -f libkview_main_la_meta_unload.cc
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_kview_la[] = {' > kview_la_meta_unload.C ;\
--		cat  kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kview_la_meta_unload.C ;\
--		echo '0};' >> kview_la_meta_unload.C ;\
--		echo '#include <kunload.h>' >> kview_la_meta_unload.C ;\
--		echo '_UNLOAD(kview_la)' >> kview_la_meta_unload.C ;\
--	else echo > kview_la_meta_unload.C; fi
-+		echo 'static const char * _metalist_libkview_main_la[] = {' > libkview_main_la_meta_unload.cc ;\
-+		cat  kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkview_main_la_meta_unload.cc ;\
-+		echo '0};' >> libkview_main_la_meta_unload.cc ;\
-+		echo '#include <kunload.h>' >> libkview_main_la_meta_unload.cc ;\
-+		echo '_UNLOAD(libkview_main_la)' >> libkview_main_la_meta_unload.cc ;\
-+	else echo > libkview_main_la_meta_unload.cc; fi
- 
- 
- #>+ 12
--libkviewpart_la_meta_unload.C:  kview_asyncio.moc canvas.moc kview_view.moc
--	@echo 'creating libkviewpart_la_meta_unload.C'
--	@-rm -f libkviewpart_la_meta_unload.C
-+libkviewpart_la_meta_unload.cc:  kview_asyncio.moc canvas.moc kview_view.moc
-+	@echo 'creating libkviewpart_la_meta_unload.cc'
-+	@-rm -f libkviewpart_la_meta_unload.cc
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_libkviewpart_la[] = {' > libkviewpart_la_meta_unload.C ;\
--		cat  kview_asyncio.moc canvas.moc kview_view.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkviewpart_la_meta_unload.C ;\
--		echo '0};' >> libkviewpart_la_meta_unload.C ;\
--		echo '#include <kunload.h>' >> libkviewpart_la_meta_unload.C ;\
--		echo '_UNLOAD(libkviewpart_la)' >> libkviewpart_la_meta_unload.C ;\
--	else echo > libkviewpart_la_meta_unload.C; fi
-+		echo 'static const char * _metalist_libkviewpart_la[] = {' > libkviewpart_la_meta_unload.cc ;\
-+		cat  kview_asyncio.moc canvas.moc kview_view.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkviewpart_la_meta_unload.cc ;\
-+		echo '0};' >> libkviewpart_la_meta_unload.cc ;\
-+		echo '#include <kunload.h>' >> libkviewpart_la_meta_unload.cc ;\
-+		echo '_UNLOAD(libkviewpart_la)' >> libkviewpart_la_meta_unload.cc ;\
-+	else echo > libkviewpart_la_meta_unload.cc; fi
+@@ -1030,31 +1021,31 @@ force-reedit:
  
  
- #>+ 3
- clean-moc-classes:
--	-rm -f  kview_la_meta_unload.C libkviewpart_la_meta_unload.C
-+	-rm -f  libkview_main_la_meta_unload.cc libkviewpart_la_meta_unload.cc
- 
- #>+ 11
--kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp   kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc 
-+kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kview_main.cpp   kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc 
- 	@echo 'creating kview_la.all_cpp.cpp ...'; \
- 	rm -f kview_la.all_cpp.files kview_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kview_la.all_cpp.final; \
--	for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \
-+	for file in kview_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kview_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_cpp.final; \
- 	done; \
-@@ -1045,16 +1036,28 @@
- 	rm -f kview_la.all_cpp.final kview_la.all_cpp.files
- 
  #>+ 11
--kview_la.all_C.C: $(srcdir)/Makefile.in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C kview_la_meta_unload.C   kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc 
+-kview_la.all_C.C: $(srcdir)/Makefile.in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C  filter.moc kfilteraction.moc infowin.moc viewer.moc kviewconfdialog.moc kview.moc imagelistdialog.moc
 -	@echo 'creating kview_la.all_C.C ...'; \
 -	rm -f kview_la.all_C.files kview_la.all_C.final; \
 -	echo "#define KDE_USE_FINAL 1" >> kview_la.all_C.final; \
--	for file in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C kview_la_meta_unload.C ; do \
+-	for file in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C ; do \
 -	  echo "#include \"$$file\"" >> kview_la.all_C.files; \
 -	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_C.final; \
-+libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp   kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc
++libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp  kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc
 +	@echo 'creating libkview_main_la.all_cpp.cpp ...'; \
 +	rm -f libkview_main_la.all_cpp.files libkview_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cpp.final; \
 +	for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \
 +	  echo "#include \"$$file\"" >> libkview_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cpp.final; \
-+	done; \
-+	cat libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files  > libkview_main_la.all_cpp.cpp; \
+ 	done; \
+-	cat kview_la.all_C.final kview_la.all_C.files > kview_la.all_C.C; \
+-	rm -f kview_la.all_C.final kview_la.all_C.files
++	cat libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files > libkview_main_la.all_cpp.cpp; \
 +	rm -f libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files
-+
-+#>+ 11
-+libkview_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kviewconfdialog_base.cc $(srcdir)/imagelistdialog_base.cc $(srcdir)/knumdialog_base.cc $(srcdir)/infowin_base.cc $(srcdir)/libkview_main_la_meta_unload.cc   kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc
+ 
+ #>+ 11
+-kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp  filter.moc kfilteraction.moc infowin.moc viewer.moc kviewconfdialog.moc kview.moc imagelistdialog.moc
+-	@echo 'creating kview_la.all_cpp.cpp ...'; \
+-	rm -f kview_la.all_cpp.files kview_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kview_la.all_cpp.final; \
+-	for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \
+-	  echo "#include \"$$file\"" >> kview_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_cpp.final; \
++libkview_main_la.all_cc.cc: $(srcdir)/Makefile.in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc  kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc
 +	@echo 'creating libkview_main_la.all_cc.cc ...'; \
 +	rm -f libkview_main_la.all_cc.files libkview_main_la.all_cc.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cc.final; \
-+	for file in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc libkview_main_la_meta_unload.cc ; do \
++	for file in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc ; do \
 +	  echo "#include \"$$file\"" >> libkview_main_la.all_cc.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cc.final; \
  	done; \
--	cat kview_la.all_C.final kview_la.all_C.files  > kview_la.all_C.C; \
--	rm -f kview_la.all_C.final kview_la.all_C.files
-+	cat libkview_main_la.all_cc.final libkview_main_la.all_cc.files  > libkview_main_la.all_cc.cc; \
+-	cat kview_la.all_cpp.final kview_la.all_cpp.files > kview_la.all_cpp.cpp; \
+-	rm -f kview_la.all_cpp.final kview_la.all_cpp.files
++	cat libkview_main_la.all_cc.final libkview_main_la.all_cc.files > libkview_main_la.all_cc.cc; \
 +	rm -f libkview_main_la.all_cc.final libkview_main_la.all_cc.files
  
  #>+ 11
- libkviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/canvas.cpp  
-@@ -1069,23 +1072,11 @@
- 	rm -f libkviewpart_la.all_cpp.final libkviewpart_la.all_cpp.files
- 
- #>+ 11
--libkviewpart_la.all_C.C: $(srcdir)/Makefile.in libkviewpart_la_meta_unload.C  
--	@echo 'creating libkviewpart_la.all_C.C ...'; \
--	rm -f libkviewpart_la.all_C.files libkviewpart_la.all_C.final; \
--	echo "#define KDE_USE_FINAL 1" >> libkviewpart_la.all_C.final; \
--	for file in libkviewpart_la_meta_unload.C ; do \
--	  echo "#include \"$$file\"" >> libkviewpart_la.all_C.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkviewpart_la.all_C.final; \
--	done; \
--	cat libkviewpart_la.all_C.final libkviewpart_la.all_C.files  > libkviewpart_la.all_C.C; \
--	rm -f libkviewpart_la.all_C.final libkviewpart_la.all_C.files
--
--#>+ 11
--libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc  
-+libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc $(srcdir)/libkviewpart_la_meta_unload.cc  
+-libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc  kview_view.moc canvas.moc kview_asyncio.moc
++libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc  kview_asyncio.moc canvas.moc kview_view.moc
  	@echo 'creating libkviewpart_la.all_cc.cc ...'; \
  	rm -f libkviewpart_la.all_cc.files libkviewpart_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkviewpart_la.all_cc.final; \
--	for file in kview_view.cc kview_asyncio.cc ; do \
-+	for file in kview_view.cc kview_asyncio.cc libkviewpart_la_meta_unload.cc ; do \
- 	  echo "#include \"$$file\"" >> libkviewpart_la.all_cc.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkviewpart_la.all_cc.final; \
- 	done; \
-@@ -1093,16 +1084,16 @@
- 	rm -f libkviewpart_la.all_cc.final libkviewpart_la.all_cc.files
- 
- #>+ 11
--kview.all_C.C: $(srcdir)/Makefile.in dummy.C  
--	@echo 'creating kview.all_C.C ...'; \
--	rm -f kview.all_C.files kview.all_C.final; \
--	echo "#define KDE_USE_FINAL 1" >> kview.all_C.final; \
--	for file in dummy.C ; do \
--	  echo "#include \"$$file\"" >> kview.all_C.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview.all_C.final; \
-+kview.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kview_main.cpp  
-+	@echo 'creating kview.all_cpp.cpp ...'; \
-+	rm -f kview.all_cpp.files kview.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> kview.all_cpp.final; \
-+	for file in kview_main.cpp ; do \
-+	  echo "#include \"$$file\"" >> kview.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview.all_cpp.final; \
- 	done; \
--	cat kview.all_C.final kview.all_C.files  > kview.all_C.C; \
--	rm -f kview.all_C.final kview.all_C.files
-+	cat kview.all_cpp.final kview.all_cpp.files  > kview.all_cpp.cpp; \
-+	rm -f kview.all_cpp.final kview.all_cpp.files
- 
- #>+ 11
- test.all_cpp.cpp: $(srcdir)/Makefile.in test.cpp  
-@@ -1118,20 +1109,20 @@
+@@ -1067,20 +1058,20 @@ libkviewpart_la.all_cc.cc: $(srcdir)/Mak
  
  #>+ 3
  clean-final:
--	-rm -f kview_la.all_cpp.cpp kview_la.all_C.C libkviewpart_la.all_cpp.cpp libkviewpart_la.all_C.C libkviewpart_la.all_cc.cc kview.all_C.C test.all_cpp.cpp
-+	-rm -f kview_la.all_cpp.cpp libkview_main_la.all_cpp.cpp libkview_main_la.all_cc.cc libkviewpart_la.all_cpp.cpp libkviewpart_la.all_cc.cc kview.all_cpp.cpp test.all_cpp.cpp
+-	-rm -f kview_la.all_C.C kview_la.all_cpp.cpp libkviewpart_la.all_cc.cc
++	-rm -f libkview_main_la.all_cpp.cpp libkview_main_la.all_cc.cc libkviewpart_la.all_cc.cc
  
  #>+ 2
  final:
@@ -532,4 +512,63 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
 +	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -1090,35 +1081,35 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 33
+-kview_asyncio.lo: kview_asyncio.moc 
+-kviewconfdialog.o: kviewconfdialog.moc 
+-viewer.lo: viewer.moc 
+-$(srcdir)/main.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++$(srcdir)/knumdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+ $(srcdir)/infowin.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+-canvas.o: canvas.moc 
+-infowin.o: infowin.moc 
+-$(srcdir)/filter.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+ $(srcdir)/filtlist.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++filter.o: filter.moc 
+ kfilteraction.lo: kfilteraction.moc 
+-$(srcdir)/kcproc.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+-kview.lo: kview.moc 
+-$(srcdir)/knumdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+-$(srcdir)/imagelistdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++imagelistdialog.lo: imagelistdialog.moc 
++$(srcdir)/main.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++infowin.o: infowin.moc 
+ viewer.o: viewer.moc 
+-filter.o: filter.moc 
+-filter.lo: filter.moc 
+-kview.o: kview.moc 
+-kfilteraction.o: kfilteraction.moc 
++$(srcdir)/filter.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++kviewconfdialog.o: kviewconfdialog.moc 
+ infowin.lo: infowin.moc 
+-kview_asyncio.o: kview_asyncio.moc 
+-$(srcdir)/kview.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+-kview_view.lo: kview_view.moc 
++kfilteraction.o: kfilteraction.moc 
+ imagelistdialog.o: imagelistdialog.moc 
+-$(srcdir)/viewer.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+-$(srcdir)/kfilteraction.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+-imagelistdialog.lo: imagelistdialog.moc 
+-$(srcdir)/kviewconfdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+ kviewconfdialog.lo: kviewconfdialog.moc 
+-kview_view.o: kview_view.moc 
++kview.o: kview.moc 
++canvas.o: canvas.moc 
++kview_asyncio.lo: kview_asyncio.moc 
+ $(srcdir)/colour.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
+ canvas.lo: canvas.moc 
++kview.lo: kview.moc 
++$(srcdir)/kviewconfdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++kview_view.o: kview_view.moc 
++viewer.lo: viewer.moc 
++$(srcdir)/viewer.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++$(srcdir)/kcproc.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++$(srcdir)/imagelistdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++kview_view.lo: kview_view.moc 
++$(srcdir)/kview.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++$(srcdir)/kfilteraction.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h 
++filter.lo: filter.moc 
++kview_asyncio.o: kview_asyncio.moc 
diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah
index b8e664ce9df..8728fb9a1b0 100644
--- a/graphics/kdegraphics3/patches/patch-ah
+++ b/graphics/kdegraphics3/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
+$NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
 
---- kuickshow/src/Makefile.in.orig	Tue Aug 27 21:05:03 2002
+--- kuickshow/src/Makefile.in.orig	Tue Dec 31 13:27:55 2002
 +++ kuickshow/src/Makefile.in
-@@ -238,16 +238,15 @@ x_libraries = @x_libraries@
- KDE_CXXFLAGS = $(IMLIB_CFLAGS)
+@@ -237,17 +237,16 @@ x_includes = @x_includes@
+ x_libraries = @x_libraries@
  
  bin_PROGRAMS = kuickshow
 -lib_LTLIBRARIES = kuickshow.la
@@ -11,6 +11,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  
  # set the include path for X, qt and KDE
  INCLUDES = $(all_includes)
+ KDE_CXXFLAGS = $(IMLIB_CFLAGS)
 -CLEANFILES = dummy.cpp
  #>- METASOURCES = AUTO
  
@@ -39,7 +40,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  # if you "make distclean", this files get removed. If you want to remove
-@@ -273,31 +276,36 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -273,30 +276,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -61,14 +62,13 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
 +	filefinder.lo kurlwidget.lo logo.lo filewidget.lo \
 +	logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo
 +#>- libkuickshow_main_la_OBJECTS = $(am_libkuickshow_main_la_OBJECTS)
- #>+ 9
+ #>+ 8
 -kuickshow_la_final_OBJECTS = kuickshow_la.all_cpp.lo 
 -kuickshow_la_nofinal_OBJECTS = kuickshow.lo aboutwidget.lo generalwidget.lo \
 -	kuickconfigdlg.lo main.lo defaultswidget.lo imagewindow.lo \
 -	kuickdata.lo imdata.lo basewidget.lo filefinder.lo \
 -	kurlwidget.lo logo.lo filewidget.lo logotabdialog.lo kuickio.lo \
--	kuick.lo imlibwidget.lo \
--	kuickshow_la_meta_unload.lo 
+-	kuick.lo imlibwidget.lo
 -@KDE_USE_FINAL_FALSE@kuickshow_la_OBJECTS = $(kuickshow_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kuickshow_la_OBJECTS = $(kuickshow_la_final_OBJECTS)
 +libkuickshow_main_la_final_OBJECTS = libkuickshow_main_la.all_cpp.lo 
@@ -76,8 +76,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
 +	generalwidget.lo kuickconfigdlg.lo main.lo defaultswidget.lo \
 +	imagewindow.lo kuickdata.lo imdata.lo basewidget.lo \
 +	filefinder.lo kurlwidget.lo logo.lo filewidget.lo \
-+	logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo \
-+	libkuickshow_main_la_meta_unload.lo 
++	logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo
 +@KDE_USE_FINAL_FALSE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_final_OBJECTS)
  bin_PROGRAMS = kuickshow$(EXEEXT)
@@ -94,30 +93,69 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -307,16 +315,18 @@ LIBS = @LIBS@
+@@ -306,41 +314,47 @@ LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/basewidget.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/generalwidget.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kuickconfigdlg.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/main.Plo
-+	@AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo
+ #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/basewidget.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/generalwidget.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kuickconfigdlg.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/main.Plo
+-#>+ 25
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kuickshow_la.all_cpp.P  $(DEPDIR)/aboutwidget.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo
++#>+ 29
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkuickshow_main_la.all_cpp.P  $(DEPDIR)/aboutwidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/basewidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/generalwidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kuickconfigdlg.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/main.Plo
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/aboutwidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/basewidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/defaultswidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/generalwidget.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kuickconfigdlg.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/main.Plo
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kuickshow_main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
-@@ -336,11 +346,12 @@ CXXLD = $(CXX)
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -361,11 +375,12 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -132,7 +170,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -389,6 +400,8 @@ clean-libLTLIBRARIES:
+@@ -414,6 +429,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kuickshow.la: $(kuickshow_la_OBJECTS) $(kuickshow_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kuickshow_la_LDFLAGS) $(kuickshow_la_OBJECTS) $(kuickshow_la_LIBADD) $(LIBS)
@@ -141,7 +179,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -426,7 +439,6 @@ distclean-compile:
+@@ -451,7 +468,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basewidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/defaultswidget.Plo@am__quote@
@@ -149,7 +187,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filefinder.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filewidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/generalwidget.Plo@am__quote@
-@@ -438,6 +450,8 @@ distclean-compile:
+@@ -463,6 +479,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickdata.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickio.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow.Plo@am__quote@
@@ -158,16 +196,16 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kurlwidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logo.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logotabdialog.Plo@am__quote@
-@@ -517,7 +531,7 @@ distclean-tags:
+@@ -542,7 +560,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=kuickshow.h kuickshow.desktop hi16-app-kuickshow.png filewidget.h imagewindow.h aboutwidget.h kuickio.h mainwidget.h mainwidget.cpp kuickconfigdlg.h logotabdialog.h kuickglobals.h basewidget.h lo32-app-kuickshow.png imdata.h logo.h kurlwidget.h imlibwidget.h version.h generalwidget.h lo16-app-kuickshow.png kuickdata.h hi32-app-kuickshow.png defaultswidget.h filefinder.h kuick.h 
-+KDE_DIST=kuickshow.h kuickshow.desktop kuickio.h kuickshow mainwidget.h lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png logo.h logotabdialog.h generalwidget.h hi32-app-kuickshow.png kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h basewidget.h filefinder.h hi16-app-kuickshow.png filewidget.h imagewindow.h kuick.h dummy.cpp aboutwidget.h 
+-KDE_DIST=kuickshow.h mainwidget.h lo32-app-kuickshow.png kuickglobals.h aboutwidget.h filewidget.h filefinder.h logo.h kurlwidget.h hi16-app-kuickshow.png imagewindow.h lo16-app-kuickshow.png defaultswidget.h imdata.h logotabdialog.h basewidget.h kuick.h imlibwidget.h mainwidget.cpp hi32-app-kuickshow.png kuickconfigdlg.h kuickio.h kuickdata.h version.h kuickshow.desktop generalwidget.h 
++KDE_DIST=kuickshow.h kuickshow.desktop kuickio.h mainwidget.h lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png logo.h logotabdialog.h generalwidget.h hi32-app-kuickshow.png kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h basewidget.h filefinder.h hi16-app-kuickshow.png filewidget.h imagewindow.h kuick.h aboutwidget.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -566,7 +580,6 @@ install-strip:
+@@ -591,7 +609,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -175,7 +213,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-@@ -644,9 +657,6 @@ messages:
+@@ -669,72 +686,69 @@ messages:
  	$(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot
  
   # this is where the kdelnk file will go 
@@ -185,79 +223,123 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 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:
-@@ -739,28 +749,28 @@ force-reedit:
- 
- 
- #>+ 12
--kuickshow_la_meta_unload.cpp:  kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc
--	@echo 'creating kuickshow_la_meta_unload.cpp'
--	@-rm -f kuickshow_la_meta_unload.cpp
-+libkuickshow_main_la_meta_unload.cpp:  kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc
-+	@echo 'creating libkuickshow_main_la_meta_unload.cpp'
-+	@-rm -f libkuickshow_main_la_meta_unload.cpp
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_kuickshow_la[] = {' > kuickshow_la_meta_unload.cpp ;\
--		cat  kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kuickshow_la_meta_unload.cpp ;\
--		echo '0};' >> kuickshow_la_meta_unload.cpp ;\
--		echo '#include <kunload.h>' >> kuickshow_la_meta_unload.cpp ;\
--		echo '_UNLOAD(kuickshow_la)' >> kuickshow_la_meta_unload.cpp ;\
--	else echo > kuickshow_la_meta_unload.cpp; fi
-+		echo 'static const char * _metalist_libkuickshow_main_la[] = {' > libkuickshow_main_la_meta_unload.cpp ;\
-+		cat  kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkuickshow_main_la_meta_unload.cpp ;\
-+		echo '0};' >> libkuickshow_main_la_meta_unload.cpp ;\
-+		echo '#include <kunload.h>' >> libkuickshow_main_la_meta_unload.cpp ;\
-+		echo '_UNLOAD(libkuickshow_main_la)' >> libkuickshow_main_la_meta_unload.cpp ;\
-+	else echo > libkuickshow_main_la_meta_unload.cpp; fi
  
+ #>+ 3
+-logotabdialog.moc: $(srcdir)/logotabdialog.h
+-	$(MOC) $(srcdir)/logotabdialog.h -o logotabdialog.moc
++mainwidget.moc: $(srcdir)/mainwidget.h
++	$(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
  
  #>+ 3
- clean-moc-classes:
--	-rm -f  kuickshow_la_meta_unload.cpp
-+	-rm -f  libkuickshow_main_la_meta_unload.cpp
+-filewidget.moc: $(srcdir)/filewidget.h
+-	$(MOC) $(srcdir)/filewidget.h -o filewidget.moc
++filefinder.moc: $(srcdir)/filefinder.h
++	$(MOC) $(srcdir)/filefinder.h -o filefinder.moc
+ 
+ #>+ 3
+-aboutwidget.moc: $(srcdir)/aboutwidget.h
+-	$(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
++kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
++	$(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
+ 
+ #>+ 3
+-filefinder.moc: $(srcdir)/filefinder.h
+-	$(MOC) $(srcdir)/filefinder.h -o filefinder.moc
++basewidget.moc: $(srcdir)/basewidget.h
++	$(MOC) $(srcdir)/basewidget.h -o basewidget.moc
+ 
+ #>+ 3
+-imagewindow.moc: $(srcdir)/imagewindow.h
+-	$(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
++imlibwidget.moc: $(srcdir)/imlibwidget.h
++	$(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc
+ 
+ #>+ 3
+ generalwidget.moc: $(srcdir)/generalwidget.h
+ 	$(MOC) $(srcdir)/generalwidget.h -o generalwidget.moc
+ 
+ #>+ 3
+-mainwidget.moc: $(srcdir)/mainwidget.h
+-	$(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
++defaultswidget.moc: $(srcdir)/defaultswidget.h
++	$(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc
+ 
+ #>+ 3
+-kurlwidget.moc: $(srcdir)/kurlwidget.h
+-	$(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
++aboutwidget.moc: $(srcdir)/aboutwidget.h
++	$(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
+ 
+ #>+ 3
+-defaultswidget.moc: $(srcdir)/defaultswidget.h
+-	$(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc
++logotabdialog.moc: $(srcdir)/logotabdialog.h
++	$(MOC) $(srcdir)/logotabdialog.h -o logotabdialog.moc
+ 
+ #>+ 3
+-kuickio.moc: $(srcdir)/kuickio.h
+-	$(MOC) $(srcdir)/kuickio.h -o kuickio.moc
++kuickshow.moc: $(srcdir)/kuickshow.h
++	$(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc
+ 
+ #>+ 3
+-imlibwidget.moc: $(srcdir)/imlibwidget.h
+-	$(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc
++kurlwidget.moc: $(srcdir)/kurlwidget.h
++	$(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
+ 
+ #>+ 3
+-kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
+-	$(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
++filewidget.moc: $(srcdir)/filewidget.h
++	$(MOC) $(srcdir)/filewidget.h -o filewidget.moc
+ 
+ #>+ 3
+-basewidget.moc: $(srcdir)/basewidget.h
+-	$(MOC) $(srcdir)/basewidget.h -o basewidget.moc
++imagewindow.moc: $(srcdir)/imagewindow.h
++	$(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
+ 
+ #>+ 3
+-kuickshow.moc: $(srcdir)/kuickshow.h
+-	$(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc
++kuickio.moc: $(srcdir)/kuickio.h
++	$(MOC) $(srcdir)/kuickio.h -o kuickio.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  logotabdialog.moc filewidget.moc aboutwidget.moc filefinder.moc imagewindow.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc basewidget.moc kuickshow.moc
++	-rm -f  mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc
+ 
+ #>+ 2
+ docs-am:
+@@ -764,33 +778,33 @@ force-reedit:
  
- #>+ 11
--kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp kuickshow_la_meta_unload.cpp   mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc 
-+kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow_main.cpp   mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc 
- 	@echo 'creating kuickshow_la.all_cpp.cpp ...'; \
- 	rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
--	for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp kuickshow_la_meta_unload.cpp ; do \
-+	for file in kuickshow_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kuickshow_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow_la.all_cpp.final; \
- 	done; \
-@@ -768,11 +778,23 @@ kuickshow_la.all_cpp.cpp: $(srcdir)/Make
- 	rm -f kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files
  
  #>+ 11
--kuickshow.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libkuickshow_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp libkuickshow_main_la_meta_unload.cpp  
+-kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp  logotabdialog.moc aboutwidget.moc filewidget.moc filefinder.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc basewidget.moc kuickshow.moc
+-	@echo 'creating kuickshow_la.all_cpp.cpp ...'; \
+-	rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \
++libkuickshow_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp  kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc
 +	@echo 'creating libkuickshow_main_la.all_cpp.cpp ...'; \
 +	rm -f libkuickshow_main_la.all_cpp.files libkuickshow_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkuickshow_main_la.all_cpp.final; \
-+	for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp libkuickshow_main_la_meta_unload.cpp ; do \
+ 	for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp ; do \
+-	  echo "#include \"$$file\"" >> kuickshow_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow_la.all_cpp.final; \
 +	  echo "#include \"$$file\"" >> libkuickshow_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkuickshow_main_la.all_cpp.final; \
-+	done; \
-+	cat libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files  > libkuickshow_main_la.all_cpp.cpp; \
-+	rm -f libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files
-+
-+#>+ 11
-+kuickshow.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow_main.cpp  
- 	@echo 'creating kuickshow.all_cpp.cpp ...'; \
- 	rm -f kuickshow.all_cpp.files kuickshow.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kuickshow.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kuickshow_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kuickshow.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow.all_cpp.final; \
  	done; \
-@@ -781,20 +803,20 @@ kuickshow.all_cpp.cpp: $(srcdir)/Makefil
+-	cat kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files > kuickshow_la.all_cpp.cpp; \
+-	rm -f kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files
++	cat libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files > libkuickshow_main_la.all_cpp.cpp; \
++	rm -f libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files
  
  #>+ 3
  clean-final:
--	-rm -f kuickshow_la.all_cpp.cpp kuickshow.all_cpp.cpp
-+	-rm -f kuickshow_la.all_cpp.cpp libkuickshow_main_la.all_cpp.cpp kuickshow.all_cpp.cpp
+-	-rm -f kuickshow_la.all_cpp.cpp
++	-rm -f libkuickshow_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -277,4 +359,56 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $
 +	$(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -800,31 +814,31 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 29
+-basewidget.lo: basewidget.moc 
+-filefinder.lo: filefinder.moc 
+-logotabdialog.o: logotabdialog.moc 
+-filefinder.o: filefinder.moc 
+-kuickconfigdlg.o: kuickconfigdlg.moc 
+-mainwidget.o: mainwidget.moc 
+-kuickio.o: kuickio.moc 
+ basewidget.o: basewidget.moc 
+-kuickconfigdlg.lo: kuickconfigdlg.moc 
+-generalwidget.lo: generalwidget.moc 
++filefinder.o: filefinder.moc 
++filefinder.lo: filefinder.moc 
++mainwidget.lo: mainwidget.moc 
+ defaultswidget.lo: defaultswidget.moc 
+-kuickio.lo: kuickio.moc 
+-imagewindow.lo: imagewindow.moc 
++generalwidget.lo: generalwidget.moc 
+ kurlwidget.lo: kurlwidget.moc 
+-mainwidget.lo: mainwidget.moc 
+-kuickshow.lo: kuickshow.moc 
+-kurlwidget.o: kurlwidget.moc 
++kuickshow.o: kuickshow.moc 
+ aboutwidget.lo: aboutwidget.moc 
+-imlibwidget.lo: imlibwidget.moc 
++filewidget.lo: filewidget.moc 
++kurlwidget.o: kurlwidget.moc 
++filewidget.o: filewidget.moc 
+ imagewindow.o: imagewindow.moc 
++kuickio.lo: kuickio.moc 
++kuickconfigdlg.lo: kuickconfigdlg.moc 
+ aboutwidget.o: aboutwidget.moc 
+-defaultswidget.o: defaultswidget.moc 
+-logotabdialog.lo: logotabdialog.moc 
+-kuickshow.o: kuickshow.moc 
++imagewindow.lo: imagewindow.moc 
++basewidget.lo: basewidget.moc 
++kuickio.o: kuickio.moc 
++kuickshow.lo: kuickshow.moc 
++imlibwidget.lo: imlibwidget.moc 
++mainwidget.o: mainwidget.moc 
+ imlibwidget.o: imlibwidget.moc 
++logotabdialog.o: logotabdialog.moc 
+ generalwidget.o: generalwidget.moc 
+-filewidget.lo: filewidget.moc 
+-filewidget.o: filewidget.moc 
++kuickconfigdlg.o: kuickconfigdlg.moc 
++logotabdialog.lo: logotabdialog.moc 
++defaultswidget.o: defaultswidget.moc