Update kdegraphics to 3.1.3.

Changes:
* gcc 3.4+ compile fixes (Dirk Mueller)
* kiconedit: Answering Yes to save the modified file acted as No (Adrian Page)
* kiconedit: Fix off-by-one error in "Select All"
* kamera: fix status output message (Marcus Meissner)
* kruler: do not use hardcoded font names
* kghostview: the mimetype is application/x-gzpostscript actually for .ps.gz
* kghostview: Fix bug #58904
* kfax: Fix format string problem (Dirk Mueller)
* kghostview: Fix bug #59041
* kmrml: null-terminate clipboard data (Dirk Mueller)
* kuickshow: Add license declarations (Carsten Pfeiffer)

5 files changed, 99 insertions, 55 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 2d94bf65aee..420f30a2d7b 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2003/07/13 13:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/30 14:30:15 markd Exp $
 
-DISTNAME=	kdegraphics-3.1.2
-PKGREVISION=	1
+DISTNAME=	kdegraphics-3.1.3
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
-.include "../../x11/kde3/Makefile.kde3"
+.include "../../meta-pkgs/kde3/Makefile.kde3"
 
 #DEPENDS+=	gPhoto2
 #DEPENDS+=	gpio
@@ -22,13 +21,13 @@ FOO_MAIN_FILES= \
 	kview/kview_main.cpp \
 	kuickshow/src/kuickshow_main.cpp
 
-.include "../../x11/kde3/Makefile.foo_main"
+.include "../../meta-pkgs/kde3/Makefile.foo_main"
 
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../graphics/glut/buildlink2.mk"
 .include "../../graphics/imlib/buildlink2.mk"
 .include "../../graphics/sane-backends/buildlink2.mk"
-.include "../../x11/kde3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics3/buildlink2.mk b/graphics/kdegraphics3/buildlink2.mk
index 0069e48dc22..ee780ad5ee3 100644
--- a/graphics/kdegraphics3/buildlink2.mk
+++ b/graphics/kdegraphics3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:52:09 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/07/30 14:30:15 markd Exp $
 #
 # This Makefile fragment is included by packages that use kdegraphics.
 #
@@ -7,7 +7,7 @@
 KDEGRAPHICS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdegraphics
-BUILDLINK_DEPENDS.kdegraphics?=		kdegraphics>=3.1.2nb1
+BUILDLINK_DEPENDS.kdegraphics?=		kdegraphics>=3.1.3
 BUILDLINK_PKGSRCDIR.kdegraphics?=		../../graphics/kdegraphics3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdegraphics=kdegraphics
@@ -30,7 +30,7 @@ BUILDLINK_FILES.kdegraphics+=	lib/libkviewerpart.*
 BUILDLINK_FILES.kdegraphics+=	lib/libkviewpart.*
 
 .include "../../graphics/imlib/buildlink2.mk"
-.include "../../x11/kde3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	kdegraphics-buildlink
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 983a823f140..9fceb7f9b1f 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2003/05/22 03:01:00 markd Exp $
+$NetBSD: distinfo,v 1.12 2003/07/30 14:30:15 markd Exp $
 
-SHA1 (kdegraphics-3.1.2.tar.bz2) = e2c64e8e7778f40557f133181022b765ce2d2eda
-Size (kdegraphics-3.1.2.tar.bz2) = 4585032 bytes
+SHA1 (kdegraphics-3.1.3.tar.bz2) = 876846c072198a58101ec3e717a37dcebac3b67b
+Size (kdegraphics-3.1.3.tar.bz2) = 4591104 bytes
 SHA1 (patch-ac) = fb07e0d4b91261dc14bd53925d5a7b98dcbbb570
-SHA1 (patch-ad) = f7867f79af243902aa35eea10927aa7a88d30072
+SHA1 (patch-ad) = bda94c5d7987298bf6c0314b065ae638a185ea4d
 SHA1 (patch-af) = 854f2f4eac31afd89184871a79dc7f459f866f34
 SHA1 (patch-ag) = ee685c88b0bcbd70256f49190e9b9bb4520d81e0
-SHA1 (patch-ah) = 1e14e0ca03f9eab6055893b59948c200a54b9104
+SHA1 (patch-ah) = 357684649e1903eb74c1f5264896346d1ec36dc2
 SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1
diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad
index 140d9fadf3c..6797fb3114c 100644
--- a/graphics/kdegraphics3/patches/patch-ad
+++ b/graphics/kdegraphics3/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
+$NetBSD: patch-ad,v 1.5 2003/07/30 14:30:16 markd Exp $
 
---- kview/Makefile.in.orig	Thu May  8 00:03:04 2003
+--- kview/Makefile.in.orig	2003-07-15 22:10:06.000000000 +1200
 +++ kview/Makefile.in
-@@ -298,7 +298,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
+@@ -299,7 +299,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
  #>- METASOURCES = AUTO
  
  bin_PROGRAMS = kview
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  
  noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h
  
-@@ -306,13 +306,17 @@ libkviewsupport_la_SOURCES = kpreference
+@@ -307,13 +307,17 @@ libkviewsupport_la_SOURCES = kpreference
  libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
  libkviewsupport_la_LIBADD = $(LIB_KDEUI)
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  
  lnkdir = $(kde_appsdir)/Graphics
  lnk_DATA = kview.desktop
-@@ -327,14 +331,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -328,14 +332,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -59,7 +59,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  libkviewsupport_la_DEPENDENCIES =
  am_libkviewsupport_la_OBJECTS = kpreferencesdialog.lo \
  	kpreferencesmodule.lo kpluginselector.lo
-@@ -348,35 +357,35 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
+@@ -349,35 +358,35 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
  bin_PROGRAMS = kview$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -107,7 +107,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kviewconfmodules.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Plo
  
-@@ -398,8 +407,8 @@ CXXLD = $(CXX)
+@@ -399,8 +408,8 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -118,7 +118,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  DATA = $(lnk_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -412,7 +421,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -413,7 +422,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -127,7 +127,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -459,6 +468,8 @@ clean-libLTLIBRARIES:
+@@ -460,6 +469,8 @@ clean-libLTLIBRARIES:
  	done
  kview.la: $(kview_la_OBJECTS) $(kview_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kview_la_LDFLAGS) $(kview_la_OBJECTS) $(kview_la_LIBADD) $(LIBS)
@@ -136,7 +136,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  #>- libkviewsupport.la: $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES) 
  #>+ 2
  @KDE_USE_CLOSURE_TRUE@libkviewsupport.la: libkviewsupport.la.closure $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES) 
-@@ -503,11 +514,12 @@ mostlyclean-compile:
+@@ -504,11 +515,12 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -150,16 +150,16 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kviewconfmodules.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  
-@@ -712,7 +724,7 @@ distclean-tags:
+@@ -713,7 +725,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=kviewui.rc cr48-app-kview.png cr16-app-kview.png cr32-app-kview.png kview.desktop version.h 
-+KDE_DIST=kview.desktop cr48-app-kview.png kviewui.rc version.h cr16-app-kview.png cr32-app-kview.png 
++KDE_DIST=kview.desktop cr48-app-kview.png kviewui.rc version.h Makefile.in.rej cr16-app-kview.png cr32-app-kview.png 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -878,18 +890,11 @@ uninstall-info: uninstall-info-recursive
+@@ -879,20 +891,11 @@ uninstall-info: uninstall-info-recursive
  messages: rc.cpp
  	$(EXTRACTRC) kviewviewer/*.rc kviewviewer/*.ui >> rc.cpp
  	$(XGETTEXT) kviewviewer/*.cpp kviewcanvas/*.cpp *.cpp *.h -o $(podir)/kview.pot
@@ -174,22 +174,26 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
 -kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h
 -	$(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc
 -
+-#>+ 1
+-mocs: kviewconfmodules.moc
 -#>+ 3
  kpluginselector.moc: $(srcdir)/kpluginselector.h
  	$(MOC) $(srcdir)/kpluginselector.h -o kpluginselector.moc
  
-@@ -902,6 +907,10 @@ kview.moc: $(srcdir)/kview.h
- 	$(MOC) $(srcdir)/kview.h -o kview.moc
- 
+@@ -911,6 +914,12 @@ kview.moc: $(srcdir)/kview.h
+ #>+ 1
+ mocs: kview.moc
  #>+ 3
 +kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h
 +	$(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc
 +
++#>+ 1
++mocs: kviewconfmodules.moc
 +#>+ 3
  kpreferencesdialog.moc: $(srcdir)/kpreferencesdialog.h
  	$(MOC) $(srcdir)/kpreferencesdialog.h -o kpreferencesdialog.moc
  
-@@ -916,7 +925,7 @@ libkviewsupport.la.closure: $(libkviewsu
+@@ -927,7 +936,7 @@ libkviewsupport.la.closure: $(libkviewsu
  
  #>+ 3
  clean-metasources:
@@ -198,7 +202,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -947,16 +956,16 @@ force-reedit:
+@@ -958,16 +967,16 @@ force-reedit:
  
  
  #>+ 11
@@ -223,7 +227,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  
  #>+ 11
  libkviewsupport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpreferencesdialog.cpp $(srcdir)/kpreferencesmodule.cpp $(srcdir)/kpluginselector.cpp  kpluginselector.moc kpreferencesmodule.moc kpreferencesdialog.moc
-@@ -972,20 +981,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir
+@@ -983,20 +992,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir
  
  #>+ 3
  clean-final:
@@ -249,7 +253,7 @@ $NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -996,12 +1005,12 @@ kde-rpo-clean:
+@@ -1007,12 +1016,12 @@ kde-rpo-clean:
  
  #>+ 11
  kpreferencesdialog.o: kpreferencesdialog.moc 
diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah
index 38a69a84aae..06cf4c7cdde 100644
--- a/graphics/kdegraphics3/patches/patch-ah
+++ b/graphics/kdegraphics3/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
+$NetBSD: patch-ah,v 1.5 2003/07/30 14:30:16 markd Exp $
 
---- kuickshow/src/Makefile.in.orig	Thu May  8 00:03:04 2003
+--- kuickshow/src/Makefile.in.orig	2003-07-15 22:10:06.000000000 +1200
 +++ kuickshow/src/Makefile.in
-@@ -293,26 +293,29 @@ x_includes = @x_includes@
+@@ -294,26 +294,29 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  
  bin_PROGRAMS = kuickshow
@@ -39,7 +39,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  # if you "make distclean", this files get removed. If you want to remove
-@@ -328,36 +331,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -329,36 +332,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -98,7 +98,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  #>- @AMDEP_TRUE@	./$(DEPDIR)/filefinder.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/filewidget.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/generalwidget.Plo \
-@@ -366,12 +374,14 @@ am__depfiles_maybe = depfiles
+@@ -367,12 +375,14 @@ am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickconfigdlg.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickshow.Plo \
@@ -116,7 +116,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filefinder.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filewidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/generalwidget.Plo \
-@@ -380,11 +390,13 @@ am__depfiles_maybe = depfiles
+@@ -381,11 +391,13 @@ am__depfiles_maybe = depfiles
  @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 \
@@ -131,7 +131,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filefinder.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filewidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/generalwidget.Plo \
-@@ -393,6 +405,8 @@ am__depfiles_maybe = depfiles
+@@ -394,6 +406,8 @@ am__depfiles_maybe = depfiles
  @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 \
@@ -140,7 +140,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kurlwidget.Plo ./$(DEPDIR)/main.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/printing.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshowwidget.Plo
-@@ -415,11 +429,12 @@ CXXLD = $(CXX)
+@@ -416,11 +430,12 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -155,7 +155,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -466,6 +481,8 @@ clean-libLTLIBRARIES:
+@@ -467,6 +482,8 @@ clean-libLTLIBRARIES:
  	done
  kuickshow.la: $(kuickshow_la_OBJECTS) $(kuickshow_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kuickshow_la_LDFLAGS) $(kuickshow_la_OBJECTS) $(kuickshow_la_LIBADD) $(LIBS)
@@ -164,7 +164,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -507,7 +524,6 @@ distclean-compile:
+@@ -508,7 +525,6 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutwidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defaultswidget.Plo@am__quote@
@@ -172,7 +172,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd 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@
-@@ -519,6 +535,8 @@ distclean-compile:
+@@ -520,6 +536,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@
@@ -181,16 +181,16 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlwidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printing.Plo@am__quote@
-@@ -643,7 +661,7 @@ distclean-tags:
+@@ -644,7 +662,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=aboutwidget.h imagewindow.h imlibwidget.h kuickconfigdlg.h mainwidget.h mainwidget.cpp kuickdata.h printing.h generalwidget.h cr32-app-kuickshow.png filefinder.h defaultswidget.h imdata.h cr16-app-kuickshow.png slideshowwidget.h kuickshow.desktop kuickshow.h lo32-app-kuickshow.png kuickglobals.h filewidget.h kurlwidget.h lo16-app-kuickshow.png kuick.h kuickio.h version.h 
-+KDE_DIST=slideshowwidget.h printing.h kuickshow.h kuickshow.desktop kuickio.h cr32-app-kuickshow.png mainwidget.h cr16-app-kuickshow.png lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png generalwidget.h kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h filefinder.h filewidget.h imagewindow.h kuick.h aboutwidget.h 
++KDE_DIST=slideshowwidget.h printing.h kuickshow.h kuickshow.desktop kuickio.h cr32-app-kuickshow.png mainwidget.h cr16-app-kuickshow.png lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png generalwidget.h kurlwidget.h kuickdata.h Makefile.in.rej kuickglobals.h defaultswidget.h filefinder.h filewidget.h imagewindow.h kuick.h aboutwidget.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -704,7 +722,6 @@ install-strip:
+@@ -705,7 +723,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -198,7 +198,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -790,72 +807,69 @@ messages:
+@@ -791,25 +808,28 @@ messages:
  	$(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot
  
   # this is where the kdelnk file will go 
@@ -215,82 +215,123 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
 +mainwidget.moc: $(srcdir)/mainwidget.h
 +	$(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
  
+ #>+ 1
+-mocs: filewidget.moc
++mocs: mainwidget.moc
  #>+ 3
 -aboutwidget.moc: $(srcdir)/aboutwidget.h
 -	$(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
 +filefinder.moc: $(srcdir)/filefinder.h
 +	$(MOC) $(srcdir)/filefinder.h -o filefinder.moc
-+
+ 
+ #>+ 1
+-mocs: aboutwidget.moc
++mocs: filefinder.moc
 +#>+ 3
 +kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
 +	$(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
- 
++
++#>+ 1
++mocs: kuickconfigdlg.moc
  #>+ 3
  printing.moc: $(srcdir)/printing.h
  	$(MOC) $(srcdir)/printing.h -o printing.moc
- 
+@@ -817,35 +837,35 @@ printing.moc: $(srcdir)/printing.h
+ #>+ 1
+ mocs: printing.moc
  #>+ 3
 -filefinder.moc: $(srcdir)/filefinder.h
 -	$(MOC) $(srcdir)/filefinder.h -o filefinder.moc
 +imlibwidget.moc: $(srcdir)/imlibwidget.h
 +	$(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc
  
+ #>+ 1
+-mocs: filefinder.moc
++mocs: imlibwidget.moc
  #>+ 3
 -imagewindow.moc: $(srcdir)/imagewindow.h
 -	$(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
 +generalwidget.moc: $(srcdir)/generalwidget.h
 +	$(MOC) $(srcdir)/generalwidget.h -o generalwidget.moc
  
+ #>+ 1
+-mocs: imagewindow.moc
++mocs: generalwidget.moc
  #>+ 3
 -slideshowwidget.moc: $(srcdir)/slideshowwidget.h
 -	$(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.moc
 +defaultswidget.moc: $(srcdir)/defaultswidget.h
 +	$(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc
  
+ #>+ 1
+-mocs: slideshowwidget.moc
++mocs: defaultswidget.moc
  #>+ 3
 -generalwidget.moc: $(srcdir)/generalwidget.h
 -	$(MOC) $(srcdir)/generalwidget.h -o generalwidget.moc
 +aboutwidget.moc: $(srcdir)/aboutwidget.h
 +	$(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
  
+ #>+ 1
+-mocs: generalwidget.moc
++mocs: aboutwidget.moc
  #>+ 3
 -mainwidget.moc: $(srcdir)/mainwidget.h
 -	$(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc
 +kuickshow.moc: $(srcdir)/kuickshow.h
 +	$(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc
  
+ #>+ 1
+-mocs: mainwidget.moc
++mocs: kuickshow.moc
  #>+ 3
  kurlwidget.moc: $(srcdir)/kurlwidget.h
  	$(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc
- 
+@@ -853,38 +873,32 @@ kurlwidget.moc: $(srcdir)/kurlwidget.h
+ #>+ 1
+ mocs: kurlwidget.moc
  #>+ 3
 -defaultswidget.moc: $(srcdir)/defaultswidget.h
 -	$(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc
 -
+-#>+ 1
+-mocs: defaultswidget.moc
 -#>+ 3
 -kuickio.moc: $(srcdir)/kuickio.h
 -	$(MOC) $(srcdir)/kuickio.h -o kuickio.moc
 +filewidget.moc: $(srcdir)/filewidget.h
 +	$(MOC) $(srcdir)/filewidget.h -o filewidget.moc
  
+ #>+ 1
+-mocs: kuickio.moc
++mocs: filewidget.moc
  #>+ 3
 -kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
 -	$(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
 +slideshowwidget.moc: $(srcdir)/slideshowwidget.h
 +	$(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.moc
  
+ #>+ 1
+-mocs: kuickconfigdlg.moc
++mocs: slideshowwidget.moc
  #>+ 3
 -imlibwidget.moc: $(srcdir)/imlibwidget.h
 -	$(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc
 +imagewindow.moc: $(srcdir)/imagewindow.h
 +	$(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
  
+ #>+ 1
+-mocs: imlibwidget.moc
++mocs: 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
  
+ #>+ 1
+-mocs: kuickshow.moc
++mocs: kuickio.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  filewidget.moc aboutwidget.moc printing.moc filefinder.moc imagewindow.moc slideshowwidget.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc kuickshow.moc
@@ -298,7 +339,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -885,33 +899,33 @@ force-reedit:
+@@ -914,33 +928,33 @@ force-reedit:
  
  
  #>+ 11
@@ -345,7 +386,7 @@ $NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -921,31 +935,31 @@ kde-rpo-clean:
+@@ -950,31 +964,31 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 29