Update KDE to 3.1.

Many bugfixes and functionality enhancements including:

kdegraphics

 KView:
    Added KImageViewer interface
    Added possibility for plugins
    Added Slideshow plugin
    Enhanced Mousewheel support
    Automatic resizing to fit images with varying size
 kviewshell: added statusbar
 kviewshell: usability improvements
 KuickShow: Digital camera jpeg images obey orientaion information
 KuickShow: General UI improvements, now features a menubar
 KuickShow: Ability to browse image collections on remote servers
 KuickShow: Digital camera jpeg images obey orientaion information
 KPovModeler: Implement support for the missing PovRAY 3.1 primitives,
 zehender at kde org.
 KFax: Rewrite all the UI code to be KDE standards compliant, cleanups.
 (Nadeem Hasan <nhasan@kde.org>)
 libkscan: support for halftoning scan mode where available
 kooka: thumbnail view of scanned images added
 kooka: ported to KDockWidgets to provide a customizable GUI
 kooka: inline image renaming and drag and drop
 NEW IN KDE:KPovModeler, a modeling and composition program for creating
 POV-Ray (tm) scenes

10 files changed, 926 insertions, 910 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 8d08a0b0b9b..c9514b2b937 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2003/02/21 07:59:09 skrll Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/11 13:24:56 markd Exp $
 
-DISTNAME=	kdegraphics-3.0.5a
+DISTNAME=	kdegraphics-3.1
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST
index 736ac2f1ae2..96294b68000 100644
--- a/graphics/kdegraphics3/PLIST
+++ b/graphics/kdegraphics3/PLIST
@@ -1,36 +1,69 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/20 10:03:49 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/03/11 13:24:57 markd Exp $
 bin/kcolorchooser
 bin/kcoloredit
 bin/kdvi
 bin/kfax
-bin/kfract
 bin/kghostview
 bin/kiconedit
 bin/kpaint
+bin/kpovmodeler
 bin/kruler
 bin/ksnapshot
 bin/kuickshow
 bin/kview
 bin/kviewshell
+bin/mrmlsearch
 include/kmultipageInterface.h
-lib/kcolorchooser.la
-lib/kcolorchooser.so
+lib/kde3/kcm_kmrml.la
+lib/kde3/kcm_kmrml.so
+lib/kde3/kded_daemonwatcher.la
+lib/kde3/kded_daemonwatcher.so
+lib/kde3/kdvipart.la
+lib/kde3/kdvipart.so
+lib/kde3/kfaxpart.la
+lib/kde3/kfaxpart.so
+lib/kde3/kfile_bmp.la
+lib/kde3/kfile_bmp.so
+lib/kde3/kfile_ico.la
+lib/kde3/kfile_ico.so
+lib/kde3/kfile_jpeg.la
+lib/kde3/kfile_jpeg.so
 lib/kde3/kfile_pdf.la
 lib/kde3/kfile_pdf.so
 lib/kde3/kfile_png.la
 lib/kde3/kfile_png.so
 lib/kde3/kfile_ps.la
 lib/kde3/kfile_ps.so
+lib/kde3/kfile_tga.la
+lib/kde3/kfile_tga.so
+lib/kde3/kfile_tiff.la
+lib/kde3/kfile_tiff.so
+lib/kde3/kfile_xbm.la
+lib/kde3/kfile_xbm.so
+lib/kde3/kio_mrml.la
+lib/kde3/kio_mrml.so
+lib/kde3/kview_browserplugin.la
+lib/kde3/kview_browserplugin.so
+lib/kde3/kview_presenterplugin.la
+lib/kde3/kview_presenterplugin.so
+lib/kde3/kview_scannerplugin.la
+lib/kde3/kview_scannerplugin.so
+lib/kde3/kviewerpart.la
+lib/kde3/kviewerpart.so
+lib/kde3/libkghostviewpart.la
+lib/kde3/libkghostviewpart.so
+lib/kde3/libkmrmlpart.la
+lib/kde3/libkmrmlpart.so
+lib/kde3/libkpovmodelerpart.la
+lib/kde3/libkpovmodelerpart.so
+lib/kde3/libkviewcanvas.la
+lib/kde3/libkviewcanvas.so
+lib/kde3/libkviewviewer.la
+lib/kde3/libkviewviewer.so
 lib/kuickshow.la
 lib/kuickshow.so
 lib/kview.la
 lib/kview.so
-lib/libkdvi.la
-lib/libkdvi.so
-lib/libkfax.la
-lib/libkfax.so
-lib/libkghostview.la
-lib/libkghostview.so
 lib/libkmultipage.la
 lib/libkmultipage.so
 lib/libkmultipage.so.0
@@ -45,10 +78,15 @@ lib/libkview_main.la
 lib/libkview_main.so
 lib/libkview_main.so.0
 lib/libkview_main.so.0.0
-lib/libkviewerpart.la
-lib/libkviewerpart.so
-lib/libkviewpart.la
-lib/libkviewpart.so
+lib/libkviewsupport.la
+lib/libkviewsupport.so
+lib/libkviewsupport.so.0
+lib/libkviewsupport.so.0.0
+lib/mrmlsearch.la
+lib/mrmlsearch.so
+share/doc/kde/HTML/en/kamera/common
+share/doc/kde/HTML/en/kamera/index.cache.bz2
+share/doc/kde/HTML/en/kamera/index.docbook
 share/doc/kde/HTML/en/kcoloredit/common
 share/doc/kde/HTML/en/kcoloredit/index.cache.bz2
 share/doc/kde/HTML/en/kcoloredit/index.docbook
@@ -63,10 +101,6 @@ share/doc/kde/HTML/en/kdvi/optionrequester1.png
 share/doc/kde/HTML/en/kdvi/optionrequester2.png
 share/doc/kde/HTML/en/kdvi/srcltx.sty
 share/doc/kde/HTML/en/kdvi/srctex.sty
-share/doc/kde/HTML/en/kfract/common
-share/doc/kde/HTML/en/kfract/index.cache.bz2
-share/doc/kde/HTML/en/kfract/index.docbook
-share/doc/kde/HTML/en/kfract/kfract.png
 share/doc/kde/HTML/en/kghostview/common
 share/doc/kde/HTML/en/kghostview/index.cache.bz2
 share/doc/kde/HTML/en/kghostview/index.docbook
@@ -79,9 +113,67 @@ share/doc/kde/HTML/en/kooka/index.docbook
 share/doc/kde/HTML/en/kooka/kooka_gocr.png
 share/doc/kde/HTML/en/kooka/kooka_gocr_result.png
 share/doc/kde/HTML/en/kooka/kooka_mainctrl.png
+share/doc/kde/HTML/en/kooka/ocr-select.png
+share/doc/kde/HTML/en/kooka/shortcut0.png
+share/doc/kde/HTML/en/kooka/shortcut1.png
+share/doc/kde/HTML/en/kooka/toolbar.png
+share/doc/kde/HTML/en/kooka/toolbar1.png
+share/doc/kde/HTML/en/kooka/toolbar2.png
 share/doc/kde/HTML/en/kpaint/common
 share/doc/kde/HTML/en/kpaint/index.cache.bz2
 share/doc/kde/HTML/en/kpaint/index.docbook
+share/doc/kde/HTML/en/kpovmodeler/cameraview.png
+share/doc/kde/HTML/en/kpovmodeler/common
+share/doc/kde/HTML/en/kpovmodeler/controlpoints.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcamera.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmfinish.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pminterior.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmlight.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmpigment.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmplane.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmrender.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
+share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsphere.png
+share/doc/kde/HTML/en/kpovmodeler/defaultviewlayout.png
+share/doc/kde/HTML/en/kpovmodeler/dockwidget.png
+share/doc/kde/HTML/en/kpovmodeler/dockwidgettab.png
+share/doc/kde/HTML/en/kpovmodeler/index.cache.bz2
+share/doc/kde/HTML/en/kpovmodeler/index.docbook
+share/doc/kde/HTML/en/kpovmodeler/insertaspopup.png
+share/doc/kde/HTML/en/kpovmodeler/objectpropertiesview.png
+share/doc/kde/HTML/en/kpovmodeler/objecttree.png
+share/doc/kde/HTML/en/kpovmodeler/rendericon.png
+share/doc/kde/HTML/en/kpovmodeler/rendermodeoutput.png
+share/doc/kde/HTML/en/kpovmodeler/rendermodequality.png
+share/doc/kde/HTML/en/kpovmodeler/rendermodesize.png
+share/doc/kde/HTML/en/kpovmodeler/rendermodesselection.png
+share/doc/kde/HTML/en/kpovmodeler/rendermodestoolbar.png
+share/doc/kde/HTML/en/kpovmodeler/rendersettingsicon.png
+share/doc/kde/HTML/en/kpovmodeler/renderwindow.png
+share/doc/kde/HTML/en/kpovmodeler/texturepreview.png
+share/doc/kde/HTML/en/kpovmodeler/topview.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-final-render.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-render.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-dialog.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-graphic.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
+share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
 share/doc/kde/HTML/en/kruler/common
 share/doc/kde/HTML/en/kruler/index.cache.bz2
 share/doc/kde/HTML/en/kruler/index.docbook
@@ -93,6 +185,7 @@ share/doc/kde/HTML/en/ksnapshot/window.png
 share/doc/kde/HTML/en/kuickshow/common
 share/doc/kde/HTML/en/kuickshow/index.cache.bz2
 share/doc/kde/HTML/en/kuickshow/index.docbook
+share/doc/kde/HTML/en/kuickshow/screenshot.png
 share/doc/kde/HTML/en/kview/common
 share/doc/kde/HTML/en/kview/index.cache.bz2
 share/doc/kde/HTML/en/kview/index.docbook
@@ -105,27 +198,34 @@ share/doc/kde/HTML/en/kview/snapshot6.png
 share/doc/kde/HTML/en/kview/snapshot7.png
 share/doc/kde/HTML/en/kview/snapshot8.png
 share/doc/kde/HTML/en/kview/snapshot9.png
+share/kde/applnk/Graphics/More/kcolorchooser.desktop
+share/kde/applnk/Graphics/More/kcoloredit.desktop
+share/kde/applnk/Graphics/More/kiconedit.desktop
+share/kde/applnk/Graphics/More/kruler.desktop
+share/kde/applnk/Graphics/More/ksnapshot.desktop
 share/kde/applnk/Graphics/kcolorchooser.desktop
 share/kde/applnk/Graphics/kcoloredit.desktop
 share/kde/applnk/Graphics/kdvi.desktop
 share/kde/applnk/Graphics/kfax.desktop
-share/kde/applnk/Graphics/kfract.desktop
 share/kde/applnk/Graphics/kghostview.desktop
 share/kde/applnk/Graphics/kiconedit.desktop
 share/kde/applnk/Graphics/kpaint.desktop
+share/kde/applnk/Graphics/kpovmodeler.desktop
 share/kde/applnk/Graphics/kruler.desktop
 share/kde/applnk/Graphics/ksnapshot.desktop
 share/kde/applnk/Graphics/kuickshow.desktop
 share/kde/applnk/Graphics/kview.desktop
+share/kde/applnk/Settings/System/kcmkmrml.desktop
+share/kde/apps/kcoloredit/kcoloreditui.rc
 share/kde/apps/kdvi/kdvi_part.rc
 share/kde/apps/kdvi/tips
 share/kde/apps/kdvi/toolbar/forwpage.xpm
 share/kde/apps/kdvi/toolbar/largetext.xpm
 share/kde/apps/kdvi/toolbar/smalltext.xpm
 share/kde/apps/kfax/kfax_part.rc
+share/kde/apps/kfax/kfaxui.rc
 share/kde/apps/kfax/pics/kfax.tif
 share/kde/apps/kfax/pics/kfaxlogo.xpm
-share/kde/apps/kfract/kfract.rc
 share/kde/apps/kghostview/kghostviewui.rc
 share/kde/apps/kghostview/kgv_part.rc
 share/kde/apps/kghostview/pdf_sec.ps
@@ -158,23 +258,345 @@ share/kde/apps/kiconedit/toolbar/selectrect.png
 share/kde/apps/kiconedit/toolbar/spraycan-cursor.xpm
 share/kde/apps/kiconedit/toolbar/spraycan.png
 share/kde/apps/kiconedit/toolbar/transform.png
-share/kde/apps/kpaint/kpaint.rc
-share/kde/apps/kpaint/toolbar/areaselect.xpm
-share/kde/apps/kpaint/toolbar/brush.xpm
-share/kde/apps/kpaint/toolbar/circle.xpm
-share/kde/apps/kpaint/toolbar/ellipse.xpm
-share/kde/apps/kpaint/toolbar/largetext.xpm
-share/kde/apps/kpaint/toolbar/line.xpm
-share/kde/apps/kpaint/toolbar/pen.xpm
-share/kde/apps/kpaint/toolbar/rectangle.xpm
-share/kde/apps/kpaint/toolbar/roundangle.xpm
-share/kde/apps/kpaint/toolbar/spraycan.xpm
+share/kde/apps/konqueror/servicemenus/mrml-servicemenu.desktop
+share/kde/apps/kpaint/kpaintui.rc
+share/kde/apps/kpaint/toolbar/areaselect.png
+share/kde/apps/kpaint/toolbar/brush.png
+share/kde/apps/kpaint/toolbar/circle.png
+share/kde/apps/kpaint/toolbar/ellipse.png
+share/kde/apps/kpaint/toolbar/line.png
+share/kde/apps/kpaint/toolbar/rectangle.png
+share/kde/apps/kpaint/toolbar/roundangle.png
+share/kde/apps/kpovmodeler/examples/includes/inlined/chars.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/finish.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/glass.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/golds.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/metals.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/shapes.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/shapes2.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/shapesq.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/skies.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/stars.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/stones1.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/stones2.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/textures.kpm
+share/kde/apps/kpovmodeler/examples/includes/inlined/woods.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/chars.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/finish.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/glass.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/golds.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/metals.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/shapes.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/shapes2.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/shapesq.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/skies.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/stars.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/stones1.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/stones2.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/textures.kpm
+share/kde/apps/kpovmodeler/examples/includes/original/woods.kpm
+share/kde/apps/kpovmodeler/examples/scenes/advanced/ants.kpm
+share/kde/apps/kpovmodeler/examples/scenes/advanced/bee.kpm
+share/kde/apps/kpovmodeler/examples/scenes/advanced/ink.kpm
+share/kde/apps/kpovmodeler/examples/scenes/advanced/table.kpm
+share/kde/apps/kpovmodeler/examples/scenes/csg/cheese.kpm
+share/kde/apps/kpovmodeler/examples/scenes/csg/emptybox.kpm
+share/kde/apps/kpovmodeler/examples/scenes/csg/heightfield.kpm
+share/kde/apps/kpovmodeler/examples/scenes/interior/cubes.kpm
+share/kde/apps/kpovmodeler/examples/scenes/interior/media1.kpm
+share/kde/apps/kpovmodeler/examples/scenes/interior/media2.kpm
+share/kde/apps/kpovmodeler/examples/scenes/interior/media3.kpm
+share/kde/apps/kpovmodeler/examples/scenes/interior/spheres.kpm
+share/kde/apps/kpovmodeler/examples/scenes/lights/arealight.kpm
+share/kde/apps/kpovmodeler/examples/scenes/lights/arealight2.kpm
+share/kde/apps/kpovmodeler/examples/scenes/lights/spotlight.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/allobjects.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/fractals.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/lathe.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/prism.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/sor.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/superellipsoid.kpm
+share/kde/apps/kpovmodeler/examples/scenes/objects/text.kpm
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpoint.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddsubprism.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbicubicpatch.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblendmapmodifiers.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblob.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblobcylinder.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblobsphere.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmboundedby.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbox.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbumpmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcamera.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmclippedby.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolorlist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolormap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolormapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcomment.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcone.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcylinder.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensity.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitydeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitylist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitymap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitymapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdialogview.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdifference.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdisc.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdrag.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinish.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinishdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfog.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfogdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalsettings.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglview.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmheightfield.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmimagemap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminserterrors.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertfirstchild.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertlastchild.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertsibling.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminterior.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriordeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmintersection.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmjuliafractal.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlathe.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlight.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlistpattern.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlookslike.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterial.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterialdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterialmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmatrix.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmedia.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmediadeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmerge.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormal.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormaldeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormallist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectlink.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpattern.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigment.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentlist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmplane.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpolynom.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprism.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmquickcolor.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbow.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbowdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmraw.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmremovepoint.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrender.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrenderpreview.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrendersettings.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrotate.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmscale.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmscene.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmskysphere.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmskyspheredeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslope.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsolidcolor.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsor.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsphere.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsqe.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtext.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexture.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturedeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturelist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturemap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturemapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtorus.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtranslate.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtreeview.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtriangle.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmunion.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmwarp.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbicubicpatch.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblendmapmodifiers.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblob.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblobcylinder.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblobsphere.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmboundedby.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbox.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbumpmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcamera.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmclippedby.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolorlist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcomment.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcone.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcylinder.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensity.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitydeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitylist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitymap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitymapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdifference.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdisc.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdrag.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinish.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinishdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfog.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfogdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalsettings.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmheightfield.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmimagemap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminserterrors.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminterior.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriordeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmintersection.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmjuliafractal.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlathe.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlight.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlistpattern.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlookslike.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterial.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterialdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterialmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmatrix.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmedia.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmediadeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmerge.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormal.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormaldeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormallist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectlink.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpattern.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigment.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentlist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmplane.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpolynom.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprism.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmquickcolor.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbow.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbowdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmraw.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrender.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrenderpreview.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrendersettings.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrotate.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmscale.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmscene.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmskysphere.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmskyspheredeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslope.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsolidcolor.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsor.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsphere.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsqe.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtext.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexture.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturedeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturelist.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturemap.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturemapdeclare.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtorus.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtranslate.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtriangle.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmunion.png
+share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmwarp.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpoint.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddsubprism.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmbicubicpatch.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmblendmapmodifiers.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmblob.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmblobcylinder.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmblobsphere.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmboundedby.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmbox.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmbumpmap.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmcamera.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmclippedby.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmcomment.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmcone.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmcylinder.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensity.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitydeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitylist.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitymap.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitymapdeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdifference.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdisc.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmdrag.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmfog.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmfogdeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmglobalsettings.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmheightfield.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmimagemap.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pminserterrors.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertfirstchild.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertlastchild.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertsibling.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmintersection.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmjuliafractal.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmlathe.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmlight.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmlistpattern.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmlookslike.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmmaterialmap.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmmatrix.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmmerge.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmobjectdeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmobjectlink.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmpigment.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmpigmentdeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmplane.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmpolynom.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmprism.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmquickcolor.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmrainbow.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmrainbowdeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmraw.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmremovepoint.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmrender.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmrenderpreview.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmrendersettings.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmrotate.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmscale.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmscene.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmskysphere.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmskyspheredeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmsolidcolor.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmsor.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmsphere.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmsqr.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmtext.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmtexture.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmtexturedeclare.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmtorus.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmtranslate.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmtriangle.png
+share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmunion.png
+share/kde/apps/kpovmodeler/kpovmodelerbrowser.rc
+share/kde/apps/kpovmodeler/kpovmodelershell.rc
+share/kde/apps/kpovmodeler/kpovmodelerui.rc
+share/kde/apps/kpovmodeler/povraydocmap.xml
 share/kde/apps/kruler/eventsrc
-share/kde/apps/kruler/kruler-east.png
-share/kde/apps/kruler/kruler-north.png
-share/kde/apps/kruler/kruler-south.png
-share/kde/apps/kruler/kruler-west.png
-share/kde/apps/kruler/move.wav
+share/kde/apps/kruler/pics/kruler-east.png
+share/kde/apps/kruler/pics/kruler-north.png
+share/kde/apps/kruler/pics/kruler-south.png
+share/kde/apps/kruler/pics/kruler-west.png
+share/kde/apps/kruler/sounds/move.wav
 share/kde/apps/kuickshow/im_palette.pal
 share/kde/apps/kuickshow/pics/about.png
 share/kde/apps/kuickshow/pics/calibrate.png
@@ -185,90 +607,148 @@ share/kde/apps/kuickshow/pics/ksslide.png
 share/kde/apps/kuickshow/pics/kuickshow-day.jpg
 share/kde/apps/kuickshow/pics/kuickshow-night.jpg
 share/kde/apps/kuickshow/pics/logo.png
-share/kde/apps/kview/kview_part.rc
-share/kde/apps/kview/kview_popup.rc
+share/kde/apps/kview/kpartplugins/kviewpresenter.desktop
+share/kde/apps/kview/kpartplugins/kviewpresenter.rc
+share/kde/apps/kview/kpartplugins/kviewscanner.desktop
+share/kde/apps/kview/kpartplugins/kviewscanner.rc
 share/kde/apps/kview/kviewui.rc
-share/kde/apps/kview/toolbar/rotate.png
 share/kde/apps/kviewerpart/kviewerpart.rc
 share/kde/apps/kviewshell/kviewshell.rc
-share/kde/apps/kviewshell/paper-formats
-share/kde/icons/hicolor/16x16/apps/kcoloredit.png
-share/kde/icons/hicolor/16x16/apps/kdvi.png
-share/kde/icons/hicolor/16x16/apps/kfax.png
-share/kde/icons/hicolor/16x16/apps/kfract.png
-share/kde/icons/hicolor/16x16/apps/kghostview.png
-share/kde/icons/hicolor/16x16/apps/kiconedit.png
-share/kde/icons/hicolor/16x16/apps/kpaint.png
-share/kde/icons/hicolor/16x16/apps/kruler.png
-share/kde/icons/hicolor/16x16/apps/ksnapshot.png
-share/kde/icons/hicolor/16x16/apps/kuickshow.png
-share/kde/icons/hicolor/16x16/apps/kview.png
-share/kde/icons/hicolor/16x16/apps/kviewshell.png
-share/kde/icons/hicolor/32x32/apps/kcoloredit.png
-share/kde/icons/hicolor/32x32/apps/kdvi.png
-share/kde/icons/hicolor/32x32/apps/kfax.png
-share/kde/icons/hicolor/32x32/apps/kfract.png
-share/kde/icons/hicolor/32x32/apps/kghostview.png
-share/kde/icons/hicolor/32x32/apps/kiconedit.png
-share/kde/icons/hicolor/32x32/apps/kpaint.png
-share/kde/icons/hicolor/32x32/apps/kruler.png
-share/kde/icons/hicolor/32x32/apps/ksnapshot.png
-share/kde/icons/hicolor/32x32/apps/kuickshow.png
-share/kde/icons/hicolor/32x32/apps/kview.png
-share/kde/icons/hicolor/32x32/apps/kviewshell.png
-share/kde/icons/hicolor/48x48/apps/kdvi.png
-share/kde/icons/hicolor/48x48/apps/kfax.png
-share/kde/icons/hicolor/48x48/apps/kfract.png
-share/kde/icons/hicolor/48x48/apps/kghostview.png
-share/kde/icons/hicolor/48x48/apps/kiconedit.png
-share/kde/icons/hicolor/48x48/apps/kpaint.png
-share/kde/icons/hicolor/48x48/apps/kruler.png
-share/kde/icons/hicolor/48x48/apps/ksnapshot.png
-share/kde/icons/hicolor/48x48/apps/kview.png
-share/kde/icons/hicolor/48x48/apps/kviewshell.png
+share/kde/apps/kviewviewer/kpartplugins/kviewbrowser.desktop
+share/kde/apps/kviewviewer/kpartplugins/kviewbrowser.rc
+share/kde/apps/kviewviewer/kviewpopup.rc
+share/kde/apps/kviewviewer/kviewviewer.rc
+share/kde/apps/kviewviewer/kviewviewer_ro.rc
+share/kde/icons/crystalsvg/128x128/apps/kghostview.png
+share/kde/icons/crystalsvg/16x16/apps/kcoloredit.png
+share/kde/icons/crystalsvg/16x16/apps/kdvi.png
+share/kde/icons/crystalsvg/16x16/apps/kfax.png
+share/kde/icons/crystalsvg/16x16/apps/kghostview.png
+share/kde/icons/crystalsvg/16x16/apps/kiconedit.png
+share/kde/icons/crystalsvg/16x16/apps/kpaint.png
+share/kde/icons/crystalsvg/16x16/apps/kpovmodeler.png
+share/kde/icons/crystalsvg/16x16/apps/kruler.png
+share/kde/icons/crystalsvg/16x16/apps/ksnapshot.png
+share/kde/icons/crystalsvg/16x16/apps/kuickshow.png
+share/kde/icons/crystalsvg/16x16/apps/kview.png
+share/kde/icons/crystalsvg/16x16/apps/kviewshell.png
+share/kde/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+share/kde/icons/crystalsvg/32x32/apps/kcoloredit.png
+share/kde/icons/crystalsvg/32x32/apps/kdvi.png
+share/kde/icons/crystalsvg/32x32/apps/kfax.png
+share/kde/icons/crystalsvg/32x32/apps/kghostview.png
+share/kde/icons/crystalsvg/32x32/apps/kiconedit.png
+share/kde/icons/crystalsvg/32x32/apps/kpaint.png
+share/kde/icons/crystalsvg/32x32/apps/kpovmodeler.png
+share/kde/icons/crystalsvg/32x32/apps/kruler.png
+share/kde/icons/crystalsvg/32x32/apps/ksnapshot.png
+share/kde/icons/crystalsvg/32x32/apps/kuickshow.png
+share/kde/icons/crystalsvg/32x32/apps/kview.png
+share/kde/icons/crystalsvg/32x32/apps/kviewshell.png
+share/kde/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+share/kde/icons/crystalsvg/48x48/apps/kdvi.png
+share/kde/icons/crystalsvg/48x48/apps/kfax.png
+share/kde/icons/crystalsvg/48x48/apps/kghostview.png
+share/kde/icons/crystalsvg/48x48/apps/kiconedit.png
+share/kde/icons/crystalsvg/48x48/apps/kpaint.png
+share/kde/icons/crystalsvg/48x48/apps/kruler.png
+share/kde/icons/crystalsvg/48x48/apps/ksnapshot.png
+share/kde/icons/crystalsvg/48x48/apps/kview.png
+share/kde/icons/crystalsvg/48x48/apps/kviewshell.png
+share/kde/icons/crystalsvg/64x64/apps/kghostview.png
 share/kde/icons/locolor/16x16/apps/kcoloredit.png
+share/kde/icons/locolor/16x16/apps/kpovmodeler.png
 share/kde/icons/locolor/16x16/apps/kuickshow.png
 share/kde/icons/locolor/32x32/apps/kcoloredit.png
+share/kde/icons/locolor/32x32/apps/kpovmodeler.png
 share/kde/icons/locolor/32x32/apps/kuickshow.png
+share/kde/mimelnk/text/mrml.desktop
+share/kde/services/kded/daemonwatcher.desktop
+share/kde/services/kfile_bmp.desktop
+share/kde/services/kfile_ico.desktop
+share/kde/services/kfile_jpeg.desktop
 share/kde/services/kfile_pdf.desktop
 share/kde/services/kfile_png.desktop
 share/kde/services/kfile_ps.desktop
+share/kde/services/kfile_tga.desktop
+share/kde/services/kfile_tiff.desktop
+share/kde/services/kfile_xbm.desktop
+share/kde/services/kviewcanvas.desktop
+share/kde/services/kviewviewer.desktop
+share/kde/services/mrml.protocol
+share/kde/services/mrml_part.desktop
+share/kde/servicetypes/kimageviewer.desktop
+share/kde/servicetypes/kimageviewercanvas.desktop
+@comment dirrm share/kde/servicetypes
+@comment dirrm share/kde/services/kded
 @comment dirrm share/kde/services
+@comment dirrm share/kde/mimelnk/text
 @comment dirrm share/kde/icons/locolor/32x32/apps
 @comment dirrm share/kde/icons/locolor/16x16/apps
-@comment dirrm share/kde/icons/hicolor/48x48/apps
-@comment dirrm share/kde/icons/hicolor/32x32/apps
-@comment dirrm share/kde/icons/hicolor/16x16/apps
+@comment dirrm share/kde/icons/crystalsvg/64x64/apps
+@comment dirrm share/kde/icons/crystalsvg/48x48/apps
+@comment dirrm share/kde/icons/crystalsvg/32x32/mimetypes
+@comment dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment dirrm share/kde/icons/crystalsvg/16x16/mimetypes
+@comment dirrm share/kde/icons/crystalsvg/16x16/apps
+@comment dirrm share/kde/icons/crystalsvg/128x128/apps
+@dirrm share/kde/apps/kviewviewer/kpartplugins
+@dirrm share/kde/apps/kviewviewer
 @dirrm share/kde/apps/kviewshell
 @dirrm share/kde/apps/kviewerpart
-@dirrm share/kde/apps/kview/toolbar
+@dirrm share/kde/apps/kview/kpartplugins
 @dirrm share/kde/apps/kview
 @dirrm share/kde/apps/kuickshow/pics
 @dirrm share/kde/apps/kuickshow
+@dirrm share/kde/apps/kruler/sounds
+@dirrm share/kde/apps/kruler/pics
 @dirrm share/kde/apps/kruler
+@dirrm share/kde/apps/kpovmodeler/icons/locolor/16x16/actions
+@dirrm share/kde/apps/kpovmodeler/icons/locolor/16x16
+@dirrm share/kde/apps/kpovmodeler/icons/locolor
+@dirrm share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kpovmodeler/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kpovmodeler/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kpovmodeler/icons/crystalsvg
+@dirrm share/kde/apps/kpovmodeler/icons
+@dirrm share/kde/apps/kpovmodeler/examples/scenes/objects
+@dirrm share/kde/apps/kpovmodeler/examples/scenes/lights
+@dirrm share/kde/apps/kpovmodeler/examples/scenes/interior
+@dirrm share/kde/apps/kpovmodeler/examples/scenes/csg
+@dirrm share/kde/apps/kpovmodeler/examples/scenes/advanced
+@dirrm share/kde/apps/kpovmodeler/examples/scenes
+@dirrm share/kde/apps/kpovmodeler/examples/includes/original
+@dirrm share/kde/apps/kpovmodeler/examples/includes/inlined
+@dirrm share/kde/apps/kpovmodeler/examples/includes
+@dirrm share/kde/apps/kpovmodeler/examples
+@dirrm share/kde/apps/kpovmodeler
 @dirrm share/kde/apps/kpaint/toolbar
 @dirrm share/kde/apps/kpaint
+@dirrm share/kde/apps/konqueror/servicemenus
 @dirrm share/kde/apps/kiconedit/toolbar
 @dirrm share/kde/apps/kiconedit/pics
 @dirrm share/kde/apps/kiconedit
 @dirrm share/kde/apps/kghostview
-@dirrm share/kde/apps/kfract
 @dirrm share/kde/apps/kfax/pics
 @dirrm share/kde/apps/kfax
 @dirrm share/kde/apps/kdvi/toolbar
 @dirrm share/kde/apps/kdvi
+@dirrm share/kde/apps/kcoloredit
 @comment dirrm share/kde/apps
+@comment dirrm share/kde/applnk/Settings/System
+@comment dirrm share/kde/applnk/Graphics/More
 @comment dirrm share/kde/applnk/Graphics
 @dirrm share/doc/kde/HTML/en/kview
 @dirrm share/doc/kde/HTML/en/kuickshow
 @dirrm share/doc/kde/HTML/en/ksnapshot
 @dirrm share/doc/kde/HTML/en/kruler
+@dirrm share/doc/kde/HTML/en/kpovmodeler
 @dirrm share/doc/kde/HTML/en/kpaint
 @dirrm share/doc/kde/HTML/en/kooka
 @dirrm share/doc/kde/HTML/en/kiconedit
 @dirrm share/doc/kde/HTML/en/kghostview
-@dirrm share/doc/kde/HTML/en/kfract
 @dirrm share/doc/kde/HTML/en/kdvi
 @dirrm share/doc/kde/HTML/en/kcoloredit
+@dirrm share/doc/kde/HTML/en/kamera
 @comment dirrm share/doc/kde/HTML/en
-@comment dirrm lib/kde3
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index e3bc59d4931..b751f4e35d4 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.6 2003/01/20 10:03:49 skrll Exp $
+$NetBSD: distinfo,v 1.7 2003/03/11 13:24:57 markd Exp $
 
-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) = d66a8749a0c7c6ac76ba2e196f1bd6bb94d5f66a
-SHA1 (patch-af) = 9dd124174938f41124b98540da3d3548ebedbb48
-SHA1 (patch-ag) = 81c4a846763534c9fe3366bf8d571208d337e2c4
-SHA1 (patch-ah) = 551a85ead5c295e9342134478062abfb9700b4d4
+SHA1 (kdegraphics-3.1.tar.bz2) = 5950f4caa6c955c54969723d86e4b3d05836b247
+Size (kdegraphics-3.1.tar.bz2) = 4533221 bytes
+SHA1 (patch-ac) = fb07e0d4b91261dc14bd53925d5a7b98dcbbb570
+SHA1 (patch-ad) = 89088f35b84b74f985555c3a5a931adf6d8c13c0
+SHA1 (patch-af) = 854f2f4eac31afd89184871a79dc7f459f866f34
+SHA1 (patch-ag) = ee685c88b0bcbd70256f49190e9b9bb4520d81e0
+SHA1 (patch-ah) = ef2b3242b91ad42a5ff8cf5f92ccb9e0442d340c
 SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1
diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa
deleted file mode 100644
index 2a161bfd2f9..00000000000
--- a/graphics/kdegraphics3/patches/patch-aa
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
-
---- kfile-plugins/ps/dscparse_adapter.h.orig	Thu Feb 14 20:56:51 2002
-+++ kfile-plugins/ps/dscparse_adapter.h
-@@ -29,6 +29,50 @@
- #include "dscparse.h"
- #undef min
- 
-+#if defined(__GNUC__)
-+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)
-+/*
-+ * We add a quick 'n' dirty inline implementation of auto_ptr for older
-+ * releases of GCC, which don't include an auto_ptr implementation in
-+ * <memory>.
-+ */
-+
-+template <class T> class auto_ptr {
-+private:
-+	T* _ptr;
-+
-+public:
-+	typedef T element_type;
-+	explicit auto_ptr(T* p = 0) : _ptr(p) {}
-+	auto_ptr(auto_ptr& a) : _ptr(a.release()) {}
-+	template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {}
-+	auto_ptr& operator=(auto_ptr& a) {
-+		if (&a != this) {
-+			delete _ptr;
-+			_ptr = a.release();
-+		}
-+		return *this;
-+	}
-+	template <class T1>
-+	auto_ptr& operator=(auto_ptr<T1>& a) {
-+		if (a.get() != this->get()) {
-+			delete _ptr;
-+			_ptr = a.release();
-+		}
-+		return *this;
-+	}
-+	~auto_ptr() { delete _ptr; }
-+
-+	T& operator*() const { return *_ptr; }
-+	T* operator->() const { return _ptr; }
-+	T* get() const { return _ptr; }
-+	T* release() { T* tmp = _ptr; _ptr = 0; return tmp; }
-+	void reset(T* p = 0) { delete _ptr; _ptr = p; }
-+};
-+
-+#endif
-+#endif
-+
- 
- class KDSCBBOX
- {
-@@ -259,8 +303,13 @@
-     CDSCMEDIA** media()           const;
-     const CDSCMEDIA* page_media() const;
- 
-+#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93))
-+    auto_ptr<KDSCBBOX> bbox()      const;
-+    auto_ptr<KDSCBBOX> page_bbox() const;
-+#else
-     std::auto_ptr<KDSCBBOX> bbox()      const;
-     std::auto_ptr<KDSCBBOX> page_bbox() const;
-+#endif
- 
-     // CDSCDOSEPS *doseps;
- 
diff --git a/graphics/kdegraphics3/patches/patch-ab b/graphics/kdegraphics3/patches/patch-ab
deleted file mode 100644
index c53832bca74..00000000000
--- a/graphics/kdegraphics3/patches/patch-ab
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
-
---- kghostview/dscparse_adapter.h.orig	Thu Feb 14 20:56:52 2002
-+++ kghostview/dscparse_adapter.h
-@@ -29,6 +29,50 @@
- #include "dscparse.h"
- #undef min
- 
-+#if defined(__GNUC__)
-+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)
-+/*
-+ * We add a quick 'n' dirty inline implementation of auto_ptr for older
-+ * releases of GCC, which don't include an auto_ptr implementation in
-+ * <memory>.
-+ */
-+
-+template <class T> class auto_ptr {
-+private:
-+	T* _ptr;
-+
-+public:
-+	typedef T element_type;
-+	explicit auto_ptr(T* p = 0) : _ptr(p) {}
-+	auto_ptr(auto_ptr& a) : _ptr(a.release()) {}
-+	template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {}
-+	auto_ptr& operator=(auto_ptr& a) {
-+		if (&a != this) {
-+			delete _ptr;
-+			_ptr = a.release();
-+		}
-+		return *this;
-+	}
-+	template <class T1>
-+	auto_ptr& operator=(auto_ptr<T1>& a) {
-+		if (a.get() != this->get()) {
-+			delete _ptr;
-+			_ptr = a.release();
-+		}
-+		return *this;
-+	}
-+	~auto_ptr() { delete _ptr; }
-+
-+	T& operator*() const { return *_ptr; }
-+	T* operator->() const { return _ptr; }
-+	T* get() const { return _ptr; }
-+	T* release() { T* tmp = _ptr; _ptr = 0; return tmp; }
-+	void reset(T* p = 0) { delete _ptr; _ptr = p; }
-+};
-+
-+#endif
-+#endif
-+
- 
- class KDSCBBOX
- {
-@@ -259,8 +303,13 @@
-     CDSCMEDIA** media()           const;
-     const CDSCMEDIA* page_media() const;
- 
-+#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93))
-+    auto_ptr<KDSCBBOX> bbox()      const;
-+    auto_ptr<KDSCBBOX> page_bbox() const;
-+#else
-     std::auto_ptr<KDSCBBOX> bbox()      const;
-     std::auto_ptr<KDSCBBOX> page_bbox() const;
-+#endif
- 
-     // CDSCDOSEPS *doseps;
- 
diff --git a/graphics/kdegraphics3/patches/patch-ac b/graphics/kdegraphics3/patches/patch-ac
index 7e0a0185afe..5319437f802 100644
--- a/graphics/kdegraphics3/patches/patch-ac
+++ b/graphics/kdegraphics3/patches/patch-ac
@@ -1,50 +1,42 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2003/03/11 13:24:59 markd Exp $
 
---- kview/Makefile.am.orig	Tue May 15 20:54:32 2001
+--- kview/Makefile.am.orig	Sun Oct 27 11:15:54 2002
 +++ kview/Makefile.am
-@@ -7,25 +7,29 @@
- 
+@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
  METASOURCES = AUTO
  
--lib_LTLIBRARIES = libkviewpart.la kview.la
-+lib_LTLIBRARIES = libkviewpart.la libkview_main.la kview.la
+ bin_PROGRAMS = kview
+-lib_LTLIBRARIES = kview.la libkviewsupport.la
++lib_LTLIBRARIES = libkview_main.la kview.la libkviewsupport.la
+ 
+ noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h
  
- libkviewpart_la_SOURCES = canvas.cpp kview_view.cc kview_asyncio.cc
- libkviewpart_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
- libkviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
+@@ -13,13 +13,17 @@ libkviewsupport_la_SOURCES = kpreference
+ libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
+ libkviewsupport_la_LIBADD  = $(LIB_KDEUI)
  
--kview_SOURCES = dummy.C
+-kview_SOURCES = dummy.cpp
 +kview_SOURCES = kview_main.cpp
  kview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -kview_LDADD = kview.la
 +kview_LDADD = libkview_main.la
  
--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
- 
--kview_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kview_la_LIBADD = libkviewpart.la
-+libkview_main_la_LDFLAGS = $(all_libraries)
-+libkview_main_la_LIBADD = libkviewpart.la
+-kview_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp
++libkview_main_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp
++libkview_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkview_main_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la
 +
 +kview_la_SOURCES = kview_main.cpp
-+kview_la_LDFLAGS = $(all_libraries) -avoid-version -module
+ kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kview_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la
 +kview_la_LIBADD = libkview_main.la
  
- test_SOURCES = libkview.la test.cpp
- test_LDFLAGS  = $(all_libraries) -module -avoid-version
-@@ -52,9 +56,6 @@
- 
- srcdoc:
- 	kdoc -a -p -H -d $(HOME)/web/src/kview kview *.h -lqt -lkdecore -lkdeui -lkfile
+ lnkdir = $(kde_appsdir)/Graphics
+ lnk_DATA = kview.desktop
+@@ -32,6 +36,3 @@ rc_DATA = kviewui.rc
+ messages: rc.cpp
+ 	$(EXTRACTRC) kviewviewer/*.rc kviewviewer/*.ui >> rc.cpp
+ 	$(XGETTEXT) kviewviewer/*.cpp kviewcanvas/*.cpp *.cpp *.h -o $(podir)/kview.pot
 -
--dummy.C:
--	echo > dummy.C
- 
- ###KMAKE-start (don't edit or delete this block)
- 
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad
index dcc4b2ab1b1..9630c737630 100644
--- a/graphics/kdegraphics3/patches/patch-ad
+++ b/graphics/kdegraphics3/patches/patch-ad
@@ -1,95 +1,66 @@
-$NetBSD: patch-ad,v 1.2 2003/01/02 09:12:26 skrll Exp $
+$NetBSD: patch-ad,v 1.3 2003/03/11 13:24:59 markd Exp $
 
---- kview/Makefile.in.orig	Tue Dec 31 13:27:55 2002
+--- kview/Makefile.in.orig	Fri Jan 17 08:46:53 2003
 +++ kview/Makefile.in
-@@ -245,33 +245,37 @@ INCLUDES = $(all_includes)
- 
+@@ -265,7 +265,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
  #>- METASOURCES = AUTO
  
--lib_LTLIBRARIES = libkviewpart.la kview.la
-+lib_LTLIBRARIES = libkviewpart.la libkview_main.la kview.la
+ bin_PROGRAMS = kview
+-lib_LTLIBRARIES = kview.la libkviewsupport.la
++lib_LTLIBRARIES = libkview_main.la kview.la libkviewsupport.la
+ 
+ noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h
  
- libkviewpart_la_SOURCES = canvas.cpp kview_view.cc kview_asyncio.cc
- libkviewpart_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
- libkviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
+@@ -273,13 +273,17 @@ libkviewsupport_la_SOURCES = kpreference
+ libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
+ libkviewsupport_la_LIBADD = $(LIB_KDEUI)
  
--kview_SOURCES = dummy.C
+-kview_SOURCES = dummy.cpp
 +kview_SOURCES = kview_main.cpp
  kview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -kview_LDADD = kview.la
 +kview_LDADD = libkview_main.la
  
--#>- 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
- #>+ 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
- 
- 
--kview_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kview_la_LIBADD = libkviewpart.la
-+libkview_main_la_LDFLAGS = $(all_libraries)
-+libkview_main_la_LIBADD = libkviewpart.la
+-kview_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp
++libkview_main_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp
++libkview_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkview_main_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la
 +
 +kview_la_SOURCES = kview_main.cpp
-+kview_la_LDFLAGS = $(all_libraries) -avoid-version -module
+ kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kview_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la
 +kview_la_LIBADD = libkview_main.la
  
- test_SOURCES = libkview.la test.cpp
- test_LDFLAGS = $(all_libraries) -module -avoid-version
-@@ -295,23 +299,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ lnkdir = $(kde_appsdir)/Graphics
+ lnk_DATA = kview.desktop
+@@ -294,14 +298,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
--kview_la_DEPENDENCIES = libkviewpart.la
--am_kview_la_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
+-kview_la_DEPENDENCIES = libkviewsupport.la
+-am_kview_la_OBJECTS = kviewconfmodules.lo kview.lo main.lo
 +kview_la_DEPENDENCIES = libkview_main.la
 +am_kview_la_OBJECTS = kview_main.lo
  #>- kview_la_OBJECTS = $(am_kview_la_OBJECTS)
 +#>+ 1
 +kview_la_OBJECTS = kview_main.lo
-+libkview_main_la_DEPENDENCIES = libkviewpart.la
-+am_libkview_main_la_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
++libkview_main_la_DEPENDENCIES = libkviewsupport.la
++am_libkview_main_la_OBJECTS = kviewconfmodules.lo kview.lo main.lo
 +#>- libkview_main_la_OBJECTS = $(am_libkview_main_la_OBJECTS)
- #>+ 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
+ #>+ 4
+-kview_la_final_OBJECTS = kview_la.all_cpp.lo 
+-kview_la_nofinal_OBJECTS = kviewconfmodules.lo kview.lo main.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_final_OBJECTS = libkview_main_la.all_cpp.lo 
++libkview_main_la_nofinal_OBJECTS = kviewconfmodules.lo kview.lo main.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)
- #>+ 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)
- @KDE_USE_FINAL_TRUE@libkviewpart_la_OBJECTS = $(libkviewpart_la_final_OBJECTS)
-@@ -319,11 +328,11 @@ bin_PROGRAMS = kview$(EXEEXT)
- check_PROGRAMS = test$(EXEEXT)
+ libkviewsupport_la_DEPENDENCIES =
+ am_libkviewsupport_la_OBJECTS = kpreferencesdialog.lo \
+ 	kpreferencesmodule.lo kpluginselector.lo
+@@ -315,11 +324,11 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
+ bin_PROGRAMS = kview$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
 -am_kview_OBJECTS = dummy.$(OBJEXT)
@@ -100,475 +71,202 @@ $NetBSD: patch-ad,v 1.2 2003/01/02 09:12:26 skrll Exp $
 -kview_DEPENDENCIES = kview.la
 +kview_OBJECTS = kview_main.$(OBJEXT)
 +kview_DEPENDENCIES = libkview_main.la
- am_test_OBJECTS = test.$(OBJEXT)
- #>- test_OBJECTS = $(am_test_OBJECTS)
- #>+ 1
-@@ -337,33 +346,33 @@ LDFLAGS = @LDFLAGS@
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+@@ -328,26 +337,26 @@ 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
- #>+ 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__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kpluginselector.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kpluginselector.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kpreferencesdialog.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kpreferencesmodule.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kview.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kview.Plo ./$(DEPDIR)/kview_main.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kview_main.Po \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kviewconfmodules.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/main.Plo
+ #>+ 15
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kview_la.all_cpp.P $(DEPDIR)/libkviewsupport_la.all_cpp.P  ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kpluginselector.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkview_main_la.all_cpp.P $(DEPDIR)/libkviewsupport_la.all_cpp.P  ./$(DEPDIR)/kpluginselector.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kpreferencesdialog.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kpreferencesmodule.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kview.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kview.Plo ./$(DEPDIR)/kview_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kview_main.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kviewconfmodules.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kpluginselector.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/kpluginselector.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kpreferencesdialog.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kpreferencesmodule.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kview.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kview.Plo ./$(DEPDIR)/kview_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kview_main.Po \
+ @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)
+ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(kview_la_SOURCES) $(libkviewpart_la_SOURCES) \
--	$(kview_SOURCES) $(test_SOURCES)
+ CXXFLAGS = @CXXFLAGS@
+-DIST_SOURCES = $(kview_la_SOURCES) $(libkviewsupport_la_SOURCES) \
+-	$(kview_SOURCES)
 +DIST_SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) \
-+	$(libkviewpart_la_SOURCES) $(kview_SOURCES) $(test_SOURCES)
- DATA = $(lnk_DATA) $(part_DATA) $(rc_DATA)
- 
++	$(libkviewsupport_la_SOURCES) $(kview_SOURCES)
+ DATA = $(lnk_DATA) $(rc_DATA)
  
-@@ -406,14 +415,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ HEADERS = $(noinst_HEADERS)
+@@ -383,7 +392,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README AUTHORS Makefile.am Makefile.in TODO
+ DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(kview_la_SOURCES) $(libkviewpart_la_SOURCES) $(kview_SOURCES) $(test_SOURCES)
-+SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) $(libkviewpart_la_SOURCES) $(kview_SOURCES) $(test_SOURCES)
+-SOURCES = $(kview_la_SOURCES) $(libkviewsupport_la_SOURCES) $(kview_SOURCES)
++SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) $(libkviewsupport_la_SOURCES) $(kview_SOURCES)
  
  #>- all: all-recursive
  #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--.SUFFIXES: .C .cc .cpp .lo .o .obj
-+.SUFFIXES: .cc .cpp .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -455,6 +464,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -430,6 +439,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)
 +libkview_main.la: $(libkview_main_la_OBJECTS) $(libkview_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkview_main_la_LDFLAGS) $(libkview_main_la_OBJECTS) $(libkview_main_la_LIBADD) $(LIBS)
- #>- libkviewpart.la: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) 
+ #>- libkviewsupport.la: $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES) 
  #>+ 2
- @KDE_USE_CLOSURE_TRUE@libkviewpart.la: libkviewpart.la.closure $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) 
-@@ -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@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @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@
-@@ -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@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_main.Po@am__quote@
- @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@
-@@ -521,25 +533,6 @@ distclean-compile:
- distclean-depend:
- 	-rm -rf $(DEPDIR)
- 
--.C.o:
--@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--	$(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
--
--.C.obj:
--@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
--
--.C.lo:
--@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
--CXXDEPMODE = @CXXDEPMODE@
--
- .cc.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@@ -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)/'`$<
-+CXXDEPMODE = @CXXDEPMODE@
- 
- .cpp.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@@ -722,7 +716,7 @@ distclean-tags:
- 
+ @KDE_USE_CLOSURE_TRUE@libkviewsupport.la: libkviewsupport.la.closure $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES) 
+@@ -474,11 +485,12 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpluginselector.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpreferencesdialog.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpreferencesmodule.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kview.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kview_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kview_main.Po@am__quote@
+ @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
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--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 
+-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 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -876,9 +870,6 @@ messages: rc.cpp
- srcdoc:
- 	kdoc -a -p -H -d $(HOME)/web/src/kview kview *.h -lqt -lkdecore -lkdeui -lkfile
- 
--dummy.C:
--	echo > dummy.C
+@@ -798,18 +810,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
 -
- ###KMAKE-start (don't edit or delete this block)
- 
- ###KMAKE-end
-@@ -886,63 +877,13 @@ dummy.C:
+-dummy.cpp:
+-	echo > dummy.cpp
+ # 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:
  
--#>+ 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 > 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
--
--kviewconfdialog_base.moc: kviewconfdialog_base.h
--	$(MOC) kviewconfdialog_base.h -o kviewconfdialog_base.moc
--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 > 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
--
--imagelistdialog_base.moc: imagelistdialog_base.h
--	$(MOC) imagelistdialog_base.h -o imagelistdialog_base.moc
--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 > 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
--
--knumdialog_base.moc: knumdialog_base.h
--	$(MOC) knumdialog_base.h -o knumdialog_base.moc
--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 > 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
+-kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h
+-	$(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc
+-
+-#>+ 3
+ kpluginselector.moc: $(srcdir)/kpluginselector.h
+ 	$(MOC) $(srcdir)/kpluginselector.h -o kpluginselector.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
+@@ -822,6 +827,10 @@ kview.moc: $(srcdir)/kview.h
+ 	$(MOC) $(srcdir)/kview.h -o kview.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
++kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h
++	$(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc
 +
 +#>+ 3
-+imagelistdialog.moc: $(srcdir)/imagelistdialog.h
-+	$(MOC) $(srcdir)/imagelistdialog.h -o imagelistdialog.moc
+ kpreferencesdialog.moc: $(srcdir)/kpreferencesdialog.h
+ 	$(MOC) $(srcdir)/kpreferencesdialog.h -o kpreferencesdialog.moc
  
- #>+ 3
- 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
- 
--#>+ 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 > 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 > 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
-+
-+imagelistdialog_base.moc: imagelistdialog_base.h
-+	$(MOC) imagelistdialog_base.h -o imagelistdialog_base.moc
-+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 > 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
-+
-+knumdialog_base.moc: knumdialog_base.h
-+	$(MOC) knumdialog_base.h -o knumdialog_base.moc
-+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 > 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
--	@$(LTCXXCOMPILE) -c libkviewpart_la_closure.C
-+	@echo "int main() {return 0;}" > libkviewpart_la_closure.cc
-+	@$(LTCXXCOMPILE) -c libkviewpart_la_closure.cc
- 	$(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
-@@ -991,15 +982,15 @@ libkviewpart.la.closure: $(libkviewpart_
+@@ -836,7 +845,7 @@ libkviewsupport.la.closure: $(libkviewsu
  
  #>+ 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 \
--	kviewconfdialog_base.C kviewconfdialog_base.h kviewconfdialog_base.moc \
--	imagelistdialog_base.C imagelistdialog_base.h imagelistdialog_base.moc \
--	knumdialog_base.C knumdialog_base.h knumdialog_base.moc \
--	infowin_base.C infowin_base.h infowin_base.moc 
-+	kviewconfdialog_base.cc kviewconfdialog_base.h kviewconfdialog_base.moc \
-+	imagelistdialog_base.cc imagelistdialog_base.h imagelistdialog_base.moc \
-+	knumdialog_base.cc knumdialog_base.h knumdialog_base.moc \
-+	infowin_base.cc infowin_base.h infowin_base.moc 
+-	-rm -f  kviewconfmodules.moc kpluginselector.moc kpreferencesmodule.moc kview.moc kpreferencesdialog.moc
++	-rm -f  kpluginselector.moc kpreferencesmodule.moc kview.moc kviewconfmodules.moc kpreferencesdialog.moc
  
  #>+ 3
  clean-closures:
-@@ -1030,31 +1021,31 @@ force-reedit:
+@@ -867,16 +876,16 @@ force-reedit:
  
  
  #>+ 11
--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 ; 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  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 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
--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
+-kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kviewconfmodules.cpp $(srcdir)/kview.cpp $(srcdir)/main.cpp  kviewconfmodules.moc kview.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 \
++libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kviewconfmodules.cpp $(srcdir)/kview.cpp $(srcdir)/main.cpp  kview.moc kviewconfmodules.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 kviewconfmodules.cpp kview.cpp 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; \
-+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 ; 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; \
++	  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 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
++	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
--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; \
-@@ -1067,20 +1058,20 @@ libkviewpart_la.all_cc.cc: $(srcdir)/Mak
+ 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
  
  #>+ 3
  clean-final:
--	-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
+-	-rm -f kview_la.all_cpp.cpp libkviewsupport_la.all_cpp.cpp
++	-rm -f libkview_main_la.all_cpp.cpp libkviewsupport_la.all_cpp.cpp
  
  #>+ 2
  final:
--	$(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" all-am
-+	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" all-am
+-	$(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" all-am
++	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" all-am
  #>+ 2
  final-install:
--	$(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" install-am
-+	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_final_OBJECTS)" install-am
+-	$(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" install-am
++	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" install-am
  #>+ 2
  no-final:
--	$(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" all-am
+-	$(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" all-am
  #>+ 2
  no-final-install:
--	$(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_la_nofinal_OBJECTS)" install-am
+-	$(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" install-am
++	$(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" install-am
  #>+ 3
  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
+@@ -916,12 +925,12 @@ kde-rpo-clean:
  
- #>+ 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 
+ #>+ 11
+ kpreferencesdialog.o: kpreferencesdialog.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.lo: kview.moc 
+ kviewconfmodules.o: kviewconfmodules.moc 
+-kpreferencesdialog.lo: kpreferencesdialog.moc 
+-kviewconfmodules.lo: kviewconfmodules.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 
++kpreferencesmodule.o: kpreferencesmodule.moc 
+ kpluginselector.lo: kpluginselector.moc 
+ kpreferencesmodule.lo: kpreferencesmodule.moc 
++kpreferencesdialog.lo: kpreferencesdialog.moc 
++kviewconfmodules.lo: kviewconfmodules.moc 
+ kpluginselector.o: kpluginselector.moc 
+-kpreferencesmodule.o: kpreferencesmodule.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-af b/graphics/kdegraphics3/patches/patch-af
index 2cefc47f59f..ce3ee8a9e10 100644
--- a/graphics/kdegraphics3/patches/patch-af
+++ b/graphics/kdegraphics3/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/06/05 08:58:03 skrll Exp $
+$NetBSD: patch-af,v 1.2 2003/03/11 13:25:00 markd Exp $
 
---- kview/main.cpp.orig	Wed Dec  5 12:00:13 2001
+--- kview/main.cpp.orig	Mon Sep 16 09:12:50 2002
 +++ kview/main.cpp
-@@ -11,7 +11,9 @@
-   { 0, 0, 0 }
+@@ -32,7 +32,9 @@ static KCmdLineOptions options[] =
+ 	{ 0, 0, 0 }
  };
  
--int main( int argc, char *argv[] )
+-int main( int argc, char ** argv )
 +extern "C" int kdemain( int, char *[] );
 +
 +int kdemain( int argc, char *argv[] )
  {
-   KCmdLineArgs::init( argc, argv, KViewPart::createAboutData() );
-   KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ 	KAboutData about( "kview", I18N_NOOP( "KView" ),
+ 			KVIEW_VERSION, description,
diff --git a/graphics/kdegraphics3/patches/patch-ag b/graphics/kdegraphics3/patches/patch-ag
index 6410ca5cc83..778098af0a1 100644
--- a/graphics/kdegraphics3/patches/patch-ag
+++ b/graphics/kdegraphics3/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2002/08/28 07:15:30 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2003/03/11 13:25:00 markd Exp $
 
---- kuickshow/src/Makefile.am.orig	Fri Mar 22 01:31:08 2002
+--- kuickshow/src/Makefile.am.orig	Mon Sep 16 09:12:49 2002
 +++ kuickshow/src/Makefile.am
-@@ -1,26 +1,29 @@
+@@ -1,25 +1,28 @@
  ## Makefile.am for kuickshow
  
  bin_PROGRAMS = kuickshow
@@ -23,9 +23,8 @@ $NetBSD: patch-ag,v 1.1 2002/08/28 07:15:30 skrll Exp $
 +libkuickshow_main_la_SOURCES =	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
+ 	imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp \
+ 	kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp
  
 +kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
 +kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB) libkuickshow_main.la
@@ -39,7 +38,7 @@ $NetBSD: patch-ag,v 1.1 2002/08/28 07:15:30 skrll Exp $
  kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  
-@@ -36,6 +39,3 @@ KDE_ICON = kuickshow
+@@ -35,6 +38,3 @@ KDE_ICON = kuickshow
   # this is where the kdelnk file will go 
  appsdir   = $(kde_appsdir)/Graphics
  apps_DATA = kuickshow.desktop
diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah
index 8728fb9a1b0..82eeda015db 100644
--- a/graphics/kdegraphics3/patches/patch-ah
+++ b/graphics/kdegraphics3/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
+$NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
 
---- kuickshow/src/Makefile.in.orig	Tue Dec 31 13:27:55 2002
+--- kuickshow/src/Makefile.in.orig	Fri Jan 17 08:46:53 2003
 +++ kuickshow/src/Makefile.in
-@@ -237,17 +237,16 @@ x_includes = @x_includes@
+@@ -260,26 +260,29 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  
  bin_PROGRAMS = kuickshow
@@ -23,9 +23,8 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
 +libkuickshow_main_la_SOURCES = kuickshow.cpp \
  	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp  main.cpp \
  	defaultswidget.cpp  imagewindow.cpp    kuickdata.cpp  \
- 	imdata.cpp          basewidget.cpp \
-@@ -255,9 +254,13 @@ kuickshow_la_SOURCES = kuickshow.cpp \
- 	logotabdialog.cpp  kuickio.cpp    kuick.cpp imlibwidget.cpp
+ 	imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp \
+ 	kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp
  
  
 +kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -40,16 +39,16 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  # if you "make distclean", this files get removed. If you want to remove
-@@ -273,30 +276,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -295,30 +298,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
 -kuickshow_la_DEPENDENCIES =
 -am_kuickshow_la_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
+-	kuickdata.lo imdata.lo filefinder.lo kurlwidget.lo \
+-	filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \
+-	slideshowwidget.lo printing.lo
 +kuickshow_la_DEPENDENCIES = libkuickshow_main.la
 +am_kuickshow_la_OBJECTS = kuickshow_main.lo
  #>- kuickshow_la_OBJECTS = $(am_kuickshow_la_OBJECTS)
@@ -58,25 +57,24 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
 +libkuickshow_main_la_DEPENDENCIES =
 +am_libkuickshow_main_la_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
++	imagewindow.lo kuickdata.lo imdata.lo filefinder.lo \
++	kurlwidget.lo filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \
++	slideshowwidget.lo printing.lo
 +#>- libkuickshow_main_la_OBJECTS = $(am_libkuickshow_main_la_OBJECTS)
  #>+ 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
--@KDE_USE_FINAL_FALSE@kuickshow_la_OBJECTS = $(kuickshow_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@kuickshow_la_OBJECTS = $(kuickshow_la_final_OBJECTS)
+-	kuickdata.lo imdata.lo filefinder.lo kurlwidget.lo \
+-	filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \
 +libkuickshow_main_la_final_OBJECTS = libkuickshow_main_la.all_cpp.lo 
 +libkuickshow_main_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
++	imagewindow.lo kuickdata.lo imdata.lo filefinder.lo \
++	kurlwidget.lo filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \
+ 	slideshowwidget.lo printing.lo
+-@KDE_USE_FINAL_FALSE@kuickshow_la_OBJECTS = $(kuickshow_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kuickshow_la_OBJECTS = $(kuickshow_la_final_OBJECTS)
 +@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)
@@ -93,69 +91,58 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -306,41 +314,47 @@ LIBS = @LIBS@
+@@ -328,7 +336,7 @@ 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
--#>+ 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)
-@@ -361,11 +375,12 @@ CXXLD = $(CXX)
+ am__depfiles_maybe = depfiles
+ #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/defaultswidget.Plo ./$(DEPDIR)/dummy.Po \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/defaultswidget.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/filefinder.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/filewidget.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/generalwidget.Plo \
+@@ -337,12 +345,14 @@ am__depfiles_maybe = depfiles
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickconfigdlg.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kuickshow.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kuickshow_main.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kuickshow_main.Po \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/kurlwidget.Plo ./$(DEPDIR)/main.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/printing.Plo \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/slideshowwidget.Plo
+-#>+ 27
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kuickshow_la.all_cpp.P  ./$(DEPDIR)/aboutwidget.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/defaultswidget.Plo ./$(DEPDIR)/dummy.Po \
++#>+ 31
++@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)/defaultswidget.Plo \
+ @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
+ @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 \
++@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)/main.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/printing.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/slideshowwidget.Plo
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/aboutwidget.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 \
+ @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
+ @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 \
++@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)/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)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -170,50 +157,50 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -414,6 +429,8 @@ clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+@@ -438,6 +453,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)
 +libkuickshow_main.la: $(libkuickshow_main_la_OBJECTS) $(libkuickshow_main_la_DEPENDENCIES) 
 +	$(CXXLINK) -rpath $(libdir) $(libkuickshow_main_la_LDFLAGS) $(libkuickshow_main_la_OBJECTS) $(libkuickshow_main_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -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@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
- @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@
-@@ -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@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow_main.Po@am__quote@
- @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@
-@@ -542,7 +560,7 @@ distclean-tags:
- 
+@@ -479,7 +496,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@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+ @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:
+ @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@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickshow_main.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickshow_main.Po@am__quote@
+ @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
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--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 
+-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 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -591,7 +609,6 @@ install-strip:
+@@ -638,7 +656,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
 -	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
  
  distclean-generic:
- 	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-@@ -669,72 +686,69 @@ messages:
+ 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+@@ -716,72 +733,69 @@ messages:
  	$(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot
  
   # this is where the kdelnk file will go 
@@ -225,78 +212,78 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  .NOEXPORT:
  
  #>+ 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
 -filewidget.moc: $(srcdir)/filewidget.h
 -	$(MOC) $(srcdir)/filewidget.h -o filewidget.moc
-+filefinder.moc: $(srcdir)/filefinder.h
-+	$(MOC) $(srcdir)/filefinder.h -o filefinder.moc
++mainwidget.moc: $(srcdir)/mainwidget.h
++	$(MOC) $(srcdir)/mainwidget.h -o 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
++
++#>+ 3
 +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
+ printing.moc: $(srcdir)/printing.h
+ 	$(MOC) $(srcdir)/printing.h -o printing.moc
  
  #>+ 3
--imagewindow.moc: $(srcdir)/imagewindow.h
--	$(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
+-filefinder.moc: $(srcdir)/filefinder.h
+-	$(MOC) $(srcdir)/filefinder.h -o filefinder.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
+-imagewindow.moc: $(srcdir)/imagewindow.h
+-	$(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc
++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
+-slideshowwidget.moc: $(srcdir)/slideshowwidget.h
+-	$(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.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
+-generalwidget.moc: $(srcdir)/generalwidget.h
+-	$(MOC) $(srcdir)/generalwidget.h -o generalwidget.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
+-mainwidget.moc: $(srcdir)/mainwidget.h
+-	$(MOC) $(srcdir)/mainwidget.h -o mainwidget.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
+ 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
+-defaultswidget.moc: $(srcdir)/defaultswidget.h
+-	$(MOC) $(srcdir)/defaultswidget.h -o 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
  
  #>+ 3
--basewidget.moc: $(srcdir)/basewidget.h
--	$(MOC) $(srcdir)/basewidget.h -o basewidget.moc
+-kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h
+-	$(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc
++slideshowwidget.moc: $(srcdir)/slideshowwidget.h
++	$(MOC) $(srcdir)/slideshowwidget.h -o 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
  
@@ -308,24 +295,24 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  
  #>+ 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
+-	-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
++	-rm -f  mainwidget.moc filefinder.moc kuickconfigdlg.moc printing.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc kuickshow.moc kurlwidget.moc filewidget.moc slideshowwidget.moc imagewindow.moc kuickio.moc
  
  #>+ 2
  docs-am:
-@@ -764,33 +778,33 @@ force-reedit:
+@@ -811,33 +825,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  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
+-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)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp  aboutwidget.moc filewidget.moc filefinder.moc printing.moc slideshowwidget.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.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
++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)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp  kuickconfigdlg.moc filefinder.moc printing.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc kuickshow.moc filewidget.moc kurlwidget.moc slideshowwidget.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 ; do \
+ 	for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.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; \
@@ -360,28 +347,29 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -800,31 +814,31 @@ kde-rpo-clean:
+@@ -847,31 +861,31 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 29
--basewidget.lo: basewidget.moc 
 -filefinder.lo: filefinder.moc 
--logotabdialog.o: logotabdialog.moc 
--filefinder.o: filefinder.moc 
+ filefinder.o: filefinder.moc 
+-printing.lo: printing.moc 
 -kuickconfigdlg.o: kuickconfigdlg.moc 
 -mainwidget.o: mainwidget.moc 
 -kuickio.o: kuickio.moc 
- basewidget.o: basewidget.moc 
+-slideshowwidget.o: slideshowwidget.moc 
 -kuickconfigdlg.lo: kuickconfigdlg.moc 
 -generalwidget.lo: generalwidget.moc 
-+filefinder.o: filefinder.moc 
+-printing.o: printing.moc 
+-kuickio.lo: kuickio.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 
++slideshowwidget.o: slideshowwidget.moc 
  kurlwidget.lo: kurlwidget.moc 
+-imagewindow.lo: imagewindow.moc 
+-slideshowwidget.lo: slideshowwidget.moc 
 -mainwidget.lo: mainwidget.moc 
 -kuickshow.lo: kuickshow.moc 
 -kurlwidget.o: kurlwidget.moc 
@@ -389,6 +377,7 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
  aboutwidget.lo: aboutwidget.moc 
 -imlibwidget.lo: imlibwidget.moc 
 +filewidget.lo: filewidget.moc 
++printing.lo: printing.moc 
 +kurlwidget.o: kurlwidget.moc 
 +filewidget.o: filewidget.moc 
  imagewindow.o: imagewindow.moc 
@@ -396,19 +385,17 @@ $NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $
 +kuickconfigdlg.lo: kuickconfigdlg.moc 
  aboutwidget.o: aboutwidget.moc 
 -defaultswidget.o: defaultswidget.moc 
--logotabdialog.lo: logotabdialog.moc 
 -kuickshow.o: kuickshow.moc 
++slideshowwidget.lo: slideshowwidget.moc 
 +imagewindow.lo: imagewindow.moc 
-+basewidget.lo: basewidget.moc 
++printing.o: printing.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