Update KDE to 3.1.2.

Changes:

kdegraphics:
* kghostview: Better handling of half-broken Postscript and PDF files
* kghostview: Fix the opening of files on the command line, which was not working
  if the paths contained non-alphanumeric characters or were absolute paths
* kghostview: Work around -dMaxBitmap bug in gs version 6.5x
* kghostview: Reset orientation and paper size selectors after opening a new
  document
* kghostview: Security fix for #56808. The security patch which was present in
  version 3.1.1a caused problems for some users and has been corrected
* kghostview: ghostscript version 8 is now supported

12 files changed, 49 insertions, 355 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index e54ba16e645..52709d5e918 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2003/05/05 12:28:27 markd Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/22 03:01:00 markd Exp $
 
-DISTNAME=	kdegraphics-3.1.1
-PKGREVISION=	4
+DISTNAME=	kdegraphics-3.1.2
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
diff --git a/graphics/kdegraphics3/buildlink2.mk b/graphics/kdegraphics3/buildlink2.mk
index de8d76e048f..21d84cae9cd 100644
--- a/graphics/kdegraphics3/buildlink2.mk
+++ b/graphics/kdegraphics3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:23 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/22 03:01:00 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.1nb3
+BUILDLINK_DEPENDS.kdegraphics?=		kdegraphics>=3.1.2
 BUILDLINK_PKGSRCDIR.kdegraphics?=		../../graphics/kdegraphics3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdegraphics=kdegraphics
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index f1e4f2e0413..983a823f140 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,17 +1,10 @@
-$NetBSD: distinfo,v 1.10 2003/05/05 12:28:27 markd Exp $
+$NetBSD: distinfo,v 1.11 2003/05/22 03:01:00 markd Exp $
 
-SHA1 (kdegraphics-3.1.1.tar.bz2) = 983eb9f17581f19f4062248d8533516188c2e49d
-Size (kdegraphics-3.1.1.tar.bz2) = 4535382 bytes
+SHA1 (kdegraphics-3.1.2.tar.bz2) = e2c64e8e7778f40557f133181022b765ce2d2eda
+Size (kdegraphics-3.1.2.tar.bz2) = 4585032 bytes
 SHA1 (patch-ac) = fb07e0d4b91261dc14bd53925d5a7b98dcbbb570
-SHA1 (patch-ad) = 89088f35b84b74f985555c3a5a931adf6d8c13c0
+SHA1 (patch-ad) = f7867f79af243902aa35eea10927aa7a88d30072
 SHA1 (patch-af) = 854f2f4eac31afd89184871a79dc7f459f866f34
 SHA1 (patch-ag) = ee685c88b0bcbd70256f49190e9b9bb4520d81e0
-SHA1 (patch-ah) = ef2b3242b91ad42a5ff8cf5f92ccb9e0442d340c
+SHA1 (patch-ah) = 1e14e0ca03f9eab6055893b59948c200a54b9104
 SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1
-SHA1 (patch-aj) = 73bec164c9e20fed37f9338f6c0260907d7b626d
-SHA1 (patch-ak) = 0676f089ff362b7fef321a77750e5aa724f4c942
-SHA1 (patch-al) = 0c1bd33fe62faeea42f60b0dcdad669c65d14672
-SHA1 (patch-am) = b0d8c944030575f3f6df194d53465e61ab80bb2c
-SHA1 (patch-an) = 9c72826fff4b1f9dedb4274d9c3a16e404f23249
-SHA1 (patch-ao) = eeaf759ffddb11baba72a3e7668c790bab88ec72
-SHA1 (patch-ap) = 7c03d98f20bcc3c71cbb0713d238360bab9c2c9a
diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad
index 9630c737630..140d9fadf3c 100644
--- a/graphics/kdegraphics3/patches/patch-ad
+++ b/graphics/kdegraphics3/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
+$NetBSD: patch-ad,v 1.4 2003/05/22 03:01:00 markd Exp $
 
---- kview/Makefile.in.orig	Fri Jan 17 08:46:53 2003
+--- kview/Makefile.in.orig	Thu May  8 00:03:04 2003
 +++ kview/Makefile.in
-@@ -265,7 +265,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
+@@ -298,7 +298,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
  #>- METASOURCES = AUTO
  
  bin_PROGRAMS = kview
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  
  noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h
  
-@@ -273,13 +273,17 @@ libkviewsupport_la_SOURCES = kpreference
+@@ -306,13 +306,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.3 2003/03/11 13:24:59 markd Exp $
  
  lnkdir = $(kde_appsdir)/Graphics
  lnk_DATA = kview.desktop
-@@ -294,14 +298,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -327,14 +331,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -59,7 +59,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  libkviewsupport_la_DEPENDENCIES =
  am_libkviewsupport_la_OBJECTS = kpreferencesdialog.lo \
  	kpreferencesmodule.lo kpluginselector.lo
-@@ -315,11 +324,11 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
+@@ -348,35 +357,35 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
  bin_PROGRAMS = kview$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -72,10 +72,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
 +kview_OBJECTS = kview_main.$(OBJEXT)
 +kview_DEPENDENCIES = libkview_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -328,26 +337,26 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
 -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
@@ -110,10 +107,10 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kviewconfmodules.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Plo
  
-@@ -370,8 +379,8 @@ CXXLD = $(CXX)
+@@ -398,8 +407,8 @@ CXXLD = $(CXX)
+ #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
 -DIST_SOURCES = $(kview_la_SOURCES) $(libkviewsupport_la_SOURCES) \
 -	$(kview_SOURCES)
 +DIST_SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) \
@@ -121,8 +118,8 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  DATA = $(lnk_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -383,7 +392,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	uninstall-recursive check-recursive installcheck-recursive
+@@ -412,7 +421,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(kview_la_SOURCES) $(libkviewsupport_la_SOURCES) $(kview_SOURCES)
@@ -130,7 +127,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -430,6 +439,8 @@ clean-libLTLIBRARIES:
+@@ -459,6 +468,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)
@@ -139,7 +136,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 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) 
-@@ -474,11 +485,12 @@ mostlyclean-compile:
+@@ -503,11 +514,12 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -153,16 +150,16 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kviewconfmodules.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  
-@@ -647,7 +659,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -712,7 +724,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=Makefile.am.rej 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 cr16-app-kview.png cr32-app-kview.png 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -798,18 +810,11 @@ uninstall-info: uninstall-info-recursive
+@@ -878,18 +890,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
@@ -181,7 +178,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  kpluginselector.moc: $(srcdir)/kpluginselector.h
  	$(MOC) $(srcdir)/kpluginselector.h -o kpluginselector.moc
  
-@@ -822,6 +827,10 @@ kview.moc: $(srcdir)/kview.h
+@@ -902,6 +907,10 @@ kview.moc: $(srcdir)/kview.h
  	$(MOC) $(srcdir)/kview.h -o kview.moc
  
  #>+ 3
@@ -192,7 +189,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  kpreferencesdialog.moc: $(srcdir)/kpreferencesdialog.h
  	$(MOC) $(srcdir)/kpreferencesdialog.h -o kpreferencesdialog.moc
  
-@@ -836,7 +845,7 @@ libkviewsupport.la.closure: $(libkviewsu
+@@ -916,7 +925,7 @@ libkviewsupport.la.closure: $(libkviewsu
  
  #>+ 3
  clean-metasources:
@@ -201,7 +198,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -867,16 +876,16 @@ force-reedit:
+@@ -947,16 +956,16 @@ force-reedit:
  
  
  #>+ 11
@@ -226,7 +223,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 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
-@@ -892,20 +901,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir
+@@ -972,20 +981,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir
  
  #>+ 3
  clean-final:
@@ -252,7 +249,7 @@ $NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -916,12 +925,12 @@ kde-rpo-clean:
+@@ -996,12 +1005,12 @@ kde-rpo-clean:
  
  #>+ 11
  kpreferencesdialog.o: kpreferencesdialog.moc 
diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah
index 82eeda015db..38a69a84aae 100644
--- a/graphics/kdegraphics3/patches/patch-ah
+++ b/graphics/kdegraphics3/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
+$NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
 
---- kuickshow/src/Makefile.in.orig	Fri Jan 17 08:46:53 2003
+--- kuickshow/src/Makefile.in.orig	Thu May  8 00:03:04 2003
 +++ kuickshow/src/Makefile.in
-@@ -260,26 +260,29 @@ x_includes = @x_includes@
+@@ -293,26 +293,29 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  
  bin_PROGRAMS = kuickshow
@@ -39,7 +39,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  # if you "make distclean", this files get removed. If you want to remove
-@@ -295,30 +298,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -328,36 +331,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -89,9 +89,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
 +kuickshow_OBJECTS = kuickshow_main.$(OBJEXT)
 +kuickshow_DEPENDENCIES = libkuickshow_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -328,7 +336,7 @@ LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \
@@ -100,7 +98,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  #>- @AMDEP_TRUE@	./$(DEPDIR)/filefinder.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/filewidget.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/generalwidget.Plo \
-@@ -337,12 +345,14 @@ am__depfiles_maybe = depfiles
+@@ -366,12 +374,14 @@ am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickconfigdlg.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickshow.Plo \
@@ -118,7 +116,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 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 \
-@@ -351,11 +361,13 @@ am__depfiles_maybe = depfiles
+@@ -380,11 +390,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 \
@@ -133,7 +131,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 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 \
-@@ -364,6 +376,8 @@ am__depfiles_maybe = depfiles
+@@ -393,6 +405,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 \
@@ -142,10 +140,10 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 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
-@@ -387,11 +401,12 @@ CXXLD = $(CXX)
+@@ -415,11 +429,12 @@ CXXLD = $(CXX)
+ #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
 -DIST_SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES)
 +DIST_SOURCES = $(kuickshow_la_SOURCES) $(libkuickshow_main_la_SOURCES) \
 +	$(kuickshow_SOURCES)
@@ -157,7 +155,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -438,6 +453,8 @@ clean-libLTLIBRARIES:
+@@ -466,6 +481,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)
@@ -166,7 +164,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -479,7 +496,6 @@ distclean-compile:
+@@ -507,7 +524,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@
@@ -174,7 +172,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 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@
-@@ -491,6 +507,8 @@ distclean-compile:
+@@ -519,6 +535,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@
@@ -183,16 +181,16 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 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@
-@@ -583,7 +601,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -643,7 +661,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 Makefile.am.rej 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 kuickglobals.h defaultswidget.h filefinder.h filewidget.h imagewindow.h kuick.h aboutwidget.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -638,7 +656,6 @@ install-strip:
+@@ -704,7 +722,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -200,7 +198,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -716,72 +733,69 @@ messages:
+@@ -790,72 +807,69 @@ messages:
  	$(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot
  
   # this is where the kdelnk file will go 
@@ -300,7 +298,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -811,33 +825,33 @@ force-reedit:
+@@ -885,33 +899,33 @@ force-reedit:
  
  
  #>+ 11
@@ -347,7 +345,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -847,31 +861,31 @@ kde-rpo-clean:
+@@ -921,31 +935,31 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 29
diff --git a/graphics/kdegraphics3/patches/patch-aj b/graphics/kdegraphics3/patches/patch-aj
deleted file mode 100644
index 7acec326c6b..00000000000
--- a/graphics/kdegraphics3/patches/patch-aj
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2003/04/10 13:13:24 markd Exp $
-
---- kdvi/dviwin.cpp.orig	Mon Mar  3 07:57:19 2003
-+++ kdvi/dviwin.cpp
-@@ -37,7 +37,7 @@
- #include <klocale.h>
- #include <kprinter.h>
- #include <kprocess.h>
--
-+#include <kstandarddirs.h>
- 
- #include "dviwin.h"
- #include "fontpool.h"
-@@ -503,6 +503,28 @@ bool dviWindow::setFile(QString fname, Q
-   // specials in PostScriptDirectory, and the headers in the
-   // PostScriptHeaderString.
-   PS_interface->clear();
-+
-+  // Files that reside under "tmp" or under the "data" resource are most
-+  // likely remote files. We limit the files they are able to read to
-+  // the directory they are in in order to limit the possibilities of a 
-+  // denial of service attack.
-+  bool restrictIncludePath = true;
-+  QString tmp = KGlobal::dirs()->saveLocation("tmp", QString::null);
-+  if (!filename.startsWith(tmp))
-+  {
-+     tmp = KGlobal::dirs()->saveLocation("data", QString::null);
-+     if (!filename.startsWith(tmp))
-+        restrictIncludePath = false;
-+  }
-+  
-+  QString includePath;
-+  if (restrictIncludePath)
-+  {
-+     includePath = filename;
-+     includePath.truncate(includePath.findRev('/'));
-+  }
-+
-+  PS_interface->setIncludePath(includePath);     
- 
-   // We will also generate a list of hyperlink-anchors in the
-   // document. So declare the existing list empty.
diff --git a/graphics/kdegraphics3/patches/patch-ak b/graphics/kdegraphics3/patches/patch-ak
deleted file mode 100644
index 1e5e320d698..00000000000
--- a/graphics/kdegraphics3/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/04/10 13:13:24 markd Exp $
-
---- kdvi/psgs.cpp.orig	Mon Sep 16 09:12:40 2002
-+++ kdvi/psgs.cpp
-@@ -59,6 +59,12 @@ void ghostscript_interface::setSize(doub
-   DiskCache->clear();
- }
- 
-+void ghostscript_interface::setIncludePath(const QString &_includePath) {
-+  if (_includePath.isEmpty())
-+     includePath = "*"; // Allow all files
-+  else
-+     includePath = _includePath+"/*";
-+}
- 
- void ghostscript_interface::setPostScript(int page, QString PostScript) {
-   pageInfo *info = new pageInfo(PostScript);
-@@ -125,11 +131,13 @@ void ghostscript_interface::gs_generate_
-   // Step 2: Call GS with the File
-   KProcess proc;
-   proc << "gs";
--  proc << "-dNOPAUSE" << "-dBATCH" << "-sDEVICE=png256";
-+  proc << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH" << "-sDEVICE=png256";
-   proc << QString("-sOutputFile=%1").arg(filename);
-+  proc << QString("-sExtraIncludePath=%1").arg(includePath);
-   proc << QString("-g%1x%2").arg(pixel_page_w).arg(pixel_page_h); // page size in pixels
-   proc << QString("-r%1").arg(resolution);                       // resolution in dpi
--  proc << PSfile.name();
-+  proc << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
-+  proc << "-f" << PSfile.name();
-   proc.start(KProcess::Block);
-   PSfile.unlink();
-   emit(setStatusBarText(QString::null));
diff --git a/graphics/kdegraphics3/patches/patch-al b/graphics/kdegraphics3/patches/patch-al
deleted file mode 100644
index 0718a016790..00000000000
--- a/graphics/kdegraphics3/patches/patch-al
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-al,v 1.1 2003/04/10 13:13:24 markd Exp $
-
---- kdvi/psgs.h.orig	Mon Sep 16 09:12:40 2002
-+++ kdvi/psgs.h
-@@ -42,6 +42,9 @@ public:
-   // 
-   void setPostScript(int page, QString PostScript);
- 
-+  // sets path from additional postscript files may be read
-+  void setIncludePath(const QString &_includePath);
-+
-   // Returns the graphics of the page, if possible. The functions
-   // returns a pointer to a QPixmap, or null. The referred QPixmap
-   // should be deleted after use.
-@@ -64,6 +67,8 @@ private:
-   double                resolution;    // in dots per inch
-   int                   pixel_page_w; // in pixels
-   int                   pixel_page_h; // in pixels
-+
-+  QString               includePath;
- 
- signals:
-   /** Passed through to the top-level kpart. */
diff --git a/graphics/kdegraphics3/patches/patch-am b/graphics/kdegraphics3/patches/patch-am
deleted file mode 100644
index d87a5fe97a5..00000000000
--- a/graphics/kdegraphics3/patches/patch-am
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/04/10 13:13:25 markd Exp $
-
---- kghostview/kgv_miniwidget.cpp.orig	Fri Jan  3 17:55:05 2003
-+++ kghostview/kgv_miniwidget.cpp
-@@ -293,23 +293,22 @@ void KGVMiniWidget::openPDFFileContinue(
-     }
- 
-     _tmpDSC->close();
--    _pdfFileName = _fileName;
--    _fileName = _tmpDSC->name();
-     _format = PDF;
- 
--    openPSFile();
-+    openPSFile(_tmpDSC->name());
- }
- 
--void KGVMiniWidget::openPSFile()
-+void KGVMiniWidget::openPSFile(const QString &file)
- {
-+    QString fileName = file.isEmpty() ? _fileName : file;
-     kdDebug(4500) << "KGVMiniWidget::openPSFile" << endl;
-     
--    FILE* fp = fopen( QFile::encodeName( _fileName ), "r");
-+    FILE* fp = fopen( QFile::encodeName( fileName ), "r");
-     if( fp == 0 ) 
-     {
- 	KMessageBox::error( _part->widget(),
- 		i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
--		.arg( _fileName )
-+		.arg( fileName )
- 		.arg( strerror( errno ) ) );
- 	emit canceled( "" );
- 	return;
-@@ -320,9 +319,7 @@ void KGVMiniWidget::openPSFile()
- 	_isFileOpen = true;    
- 	scanDSC();
- 	buildTOC();
--	_psWidget->setFileName( dsc()->isStructured() 
--	                            ? QString::null 
--				    : _fileName );
-+	_psWidget->setFileName( _fileName, dsc()->isStructured() );
- 	emit completed();
-     }
- }
-@@ -859,6 +856,7 @@ bool KGVMiniWidget::convertFromPDF( cons
-             << "-dNOPAUSE"
-             << "-dBATCH"
-             << "-dSAFER"
-+            << "-dPARANOIDSAFER"
-             << "-sDEVICE=pswrite"
-             << ( QCString("-sOutputFile=")+QFile::encodeName(saveFileName) )
-             << ( QString("-dFirstPage=")+QString::number( firstPage ) )
-@@ -867,7 +865,7 @@ bool KGVMiniWidget::convertFromPDF( cons
-             << "save"
-             << "pop"
-             << "-f"
--            << QFile::encodeName(_pdfFileName);
-+            << QFile::encodeName(_fileName);
- 
-     /*QValueList<QCString> args = process.args();
-     QValueList<QCString>::Iterator it = args.begin();
-@@ -1074,7 +1072,7 @@ void KGVMiniWidget::saveAs()
-                           QString::null, 
-                           _part->widget(), 
-                           QString::null );
--    if( !KIO::NetAccess::upload( _format == PDF ? _pdfFileName : _fileName,
-+    if( !KIO::NetAccess::upload( _fileName,
- 				 saveURL ) )
- 	; // TODO: Proper error dialog
- }
-@@ -1311,10 +1309,16 @@ void Pdf2dsc::run( const QString& pdfNam
-     
-     _process = new KProcess;
-     *_process << _ghostscriptPath
-+              << "-dSAFER"
-+              << "-dPARANOIDSAFER"
-+              << "-dDELAYSAFER"
-               << "-dNODISPLAY"
-               << "-dQUIET"
-               << QString( "-sPDFname=%1" ).arg( pdfName )
-               << QString( "-sDSCname=%1" ).arg( dscName )
-+              << "-c"
-+              << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
-+              << "-f"
-               << "pdf2dsc.ps"
-               << "-c"
-               << "quit";
diff --git a/graphics/kdegraphics3/patches/patch-an b/graphics/kdegraphics3/patches/patch-an
deleted file mode 100644
index 8dc8c949e72..00000000000
--- a/graphics/kdegraphics3/patches/patch-an
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-an,v 1.1 2003/04/10 13:13:25 markd Exp $
-
---- kghostview/kgv_miniwidget.h.orig	Mon Sep 16 09:12:40 2002
-+++ kghostview/kgv_miniwidget.h
-@@ -85,7 +85,7 @@ protected:
-     void clearTemporaryFiles();
-     
-     void uncompressFile();
--    void openPSFile();
-+    void openPSFile(const QString &file=QString::null);
- 
- protected slots:
-     void doOpenFile();
-@@ -116,7 +116,7 @@ protected:
- /*- PRINTING and SAVING ---------------------------------------------------*/
- 
- // private data used: 
--//   Document specific: _dsc, _fileName, _pdfFileName, _format, _origurl
-+//   Document specific: _dsc, _fileName, _format, _origurl
- //   View specific:     _currentPage, _marklist 
- //   This section only: _printer, _tmpFromPDF
-     
-@@ -267,7 +267,6 @@ private:
-     int _visiblePage;
- 
-     QString _fileName;
--    QString _pdfFileName;
-     QString _mimetype;
- 
-     MarkList* _marklist;
diff --git a/graphics/kdegraphics3/patches/patch-ao b/graphics/kdegraphics3/patches/patch-ao
deleted file mode 100644
index 2c821c7c990..00000000000
--- a/graphics/kdegraphics3/patches/patch-ao
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2003/05/05 12:28:27 markd Exp $
-
---- kghostview/kpswidget.cpp.orig	Mon Sep 16 09:12:40 2002
-+++ kghostview/kpswidget.cpp
-@@ -309,10 +309,11 @@ void KPSWidget::setGhostscriptArguments(
-     }
- }
- 
--void KPSWidget::setFileName( const QString& fileName )
-+void KPSWidget::setFileName( const QString& fileName, bool usePipe )
- {
--    if( _fileName != fileName )
-+    if(( _fileName != fileName ) || (_usePipe != usePipe))
-     {
-+        _usePipe = usePipe;
- 	_fileName = fileName;
- 	stopInterpreter();
- 	_ghostscriptDirty = true;
-@@ -508,8 +509,12 @@ void KPSWidget::startInterpreter()
-     for( ; it != _ghostscriptArguments.end(); ++it )
- 	*_process << (*it);
-     
--    if( _fileName.isEmpty() )
--	*_process << "-";
-+    if( _usePipe )
-+        *_process <<
-+        // The following two lines are their to ensure that we are allowed to read _fileName
-+        "-dDELAYSAFER" << "-sInputFile="+_fileName << "-c" <<
-+        "<< /PermitFileReading [ InputFile ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe" <<
-+	"-";
-     else
- 	*_process << _fileName << "-c" << "quit";
- 
-@@ -527,7 +532,7 @@ void KPSWidget::startInterpreter()
-     // Finally fire up the interpreter.
-     kdDebug(4500) << "KPSWidget: starting interpreter" << endl;
-     if( _process->start( KProcess::NotifyOnExit, 
--              _fileName.isEmpty() ? KProcess::All : KProcess::AllOutput ) ) 
-+              _usePipe ? KProcess::All : KProcess::AllOutput ) ) 
-     {
- 	_interpreterBusy = true;
- 	setCursor( waitCursor );
-@@ -648,7 +653,7 @@ void KPSWidget::readSettings()
-     if( !intConfig->platformFonts() )
- 	arguments << "-dNOPLATFONTS";
-     
--    arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER";
-+    arguments << "-dNOPAUSE" << "-dQUIET" << "-dSAFER" << "-dPARANOIDSAFER";
- 
-     setGhostscriptArguments( arguments );
- 
diff --git a/graphics/kdegraphics3/patches/patch-ap b/graphics/kdegraphics3/patches/patch-ap
deleted file mode 100644
index 9a58bfdb6dd..00000000000
--- a/graphics/kdegraphics3/patches/patch-ap
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2003/04/10 13:13:25 markd Exp $
-
---- kghostview/kpswidget.h.orig	Mon Sep 16 09:12:40 2002
-+++ kghostview/kpswidget.h
-@@ -134,10 +134,11 @@ public:
-     bool sendPS( FILE*, unsigned int begin, unsigned int end );
-    
-     /**
--     * Sets the filename of the ghostscript input. Usually we use a pipe for
--     * communication and no filename will be needed.
-+     * Sets the filename of the ghostscript input. 
-+     * @p usePipe indicates whether we use a pipe for
-+     * communication or let ghoscript read the file itself.
-      */
--    void setFileName( const QString& );
-+    void setFileName( const QString&, bool usePipe );
- 
-     /**
-      * Set the bounding box of the drawable. See my comment in the source
-@@ -243,6 +244,7 @@ private:
-     QString     _ghostscriptPath;
-     QStringList _ghostscriptArguments;
-     QString     _fileName;
-+    bool        _usePipe;
- 
-     /**
-      * Flag set when one of the properties _ghostscriptPath,