Update to KDE 2.2:

 * All patches except sysutils/kdeadmin/files/patch-rpmMessages.c:
	- Either obsoleted or merged into KDE.
 * All pkg-plists:
	- Huge diffs are due to mass conversion from static HTML pages
	  to XML/XSL versions.
 * audio/kdemultimedia2:
	- aRts + Noatun, etc. now work and play MP3s et al properly,
	  using the mpg123 aRtsplugin.  Remove mpeglib[,_artsplug]
	  from compile.
 * converters/kdesupport2:
	- Obsolete.  No longer used in this version of KDE.
 * deskutils/kdepim:
	- Use autoconf and account for brokenness in the configure
	  script by replacing invocations of INSTALL under libical
	  with the proper incantations.
	- Per David O'Brien's request, move libimap to libkimap;
	  this was performed by Rik Hemsley <rikkus@kde.org>.
 * devel/kdesdk:
	- New module with some helpful tools.  One in particular that
	  seems demanded is ``kbabel'', which, as I've been told, is
	  a translator's wet dream.
	- Workaround dumb problem in kbabel's libgettext (which I could
	  not figure out how to remove) by replacing its error() with
	  errc().  KBabel seems to run fine with this patch.
 * devel/kdevelop:
	- Fix lame check for libkdeui.so.* by replacing it with just
	  a check for libkdeui.so.  It's been/being removed from
	  kdevelop after 2.2.
 * editors/koffice:
	- Fix kivio compile errors by substituting in PTHREAD_LIBS
	  in the correct place.  Compensate for kivio's dependency
	  on pthreads by changing kivio to use LD_PRELOAD=/usr/lib/libc_r.so
	  in kivio.desktop.
 * games/kdegames2:
	- Some new games.
 * graphics/kdegraphics2:
	- Fix link errors in libkscan and kamera where they
	  require gettext (ie: add -lintl).
	- Fix compile error in kamera.cpp which is dependent on a
	  correctly done gphoto2.. of course, this will only help
	  people who've manually installed gphoto2 themselves.
 * net/kdenetwork2:
	- Mimelib was moved here (reason for removal of kdesupport2).
 * misc/kdeaddons:
	- New module to FreeBSD ports; some simple addons for KDE2.
	  Suggested by Lauri Watts <lauri@kde.org>.
 * misc/kdeutils2:
	- Added a couple manpages.
 * x11-clocks/kdetoys2:
	- Some new apps.
 * sysutils/kdeadmin:
	- Remove kuser from compile because it has some problems.  ;\
 * x11/kdelibs2:
	- Add libFAM dependency to help people who run FAM; FAM
	  increases the overall desktop responsiveness.
	  Submitted by Lauri Watts <lauri@kde.org>.
	- Add CUPS dependency to bring in KDE's new print system.
	- Add bzip2/libxml2 dependencies to support the new help kioslave.
	- Disable installation of libltdl stuff to prevent conflicts
	  with other stuff.  Submitted by wjv.
	- Add pkg-req script to avoid conflicts with kdelibs11; add
	  to Makefile too.  Submitted by benno.
	- Be sure to remove the pth header conflicts stuff from the
	  arts/mcop_mt section.
	- Fix problem with configure trying to find -lfam in the
	  wrong place.
	- Remove kspell and api subdirs from doc; we don't need them,
	  and there are problems trying to build/install them.
	  Submitted by Lauri Watts <lauri@kde.org>.
 * x11/kdebase2:
	- Solve link permissions problem by changing the modes on
	  files installed by kdesktop/init/Templates to 644.
	  Submitted by Jim Durham <durham@w2xo.pgh.pa.us>.
 * x11/kde2:
	- Bump version; no other changes.

Special thanks to Lauri Watts <lauri@kde.org> for helping me test
packages generated by these changes on a virgin system.  I believe
that this is the best-tested update I've ever done for KDE, and it
really shines this time around.

I just noticed there are a couple other PRs in the PR db that need
to be addressed.  I will take care of those by tomorrow.  Sorry...

PR:			22735, 28549
Blanket approval by:	demon (kdesdk, kdevelop)

12 files changed, 258 insertions, 828 deletions

diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 193b12e8e9e0..95e755a877a1 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,4 +22,11 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in
+	${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in
+	${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp
+	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		"s@GPHOTO2_LIBS =@GPHOTO2_LIBS= -lintl@g"
+
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo
index dbb28870f30f..1d288407ca0d 100644
--- a/graphics/kdegraphics2/distinfo
+++ b/graphics/kdegraphics2/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58
+MD5 (kdegraphics-2.2.tar.bz2) = 32125d00243c884017daa4345b87e2fe
diff --git a/graphics/kdegraphics2/files/patch-ad b/graphics/kdegraphics2/files/patch-ad
deleted file mode 100644
index 643295f42cea..000000000000
--- a/graphics/kdegraphics2/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- pixie/plugins/magick/magick.cpp	Tue Aug  8 03:55:58 2000
-+++ pixie/plugins/magick/magick.cpp.new	Sun Sep 17 19:45:31 2000
-@@ -708,7 +708,7 @@
- 
-     // tell imagemagick what routines to run for messages
-     MonitorHandler oldMonitor;
--    oldMonitor = SetMonitorHandler(runMagickProgress);
-+    oldMonitor = SetMonitorHandler((void (*)(const char *, long long int, long long int))runMagickProgress);
-     
-     ErrorHandler oldError;
-     oldError = SetErrorHandler(runMagickErrorDlg);
diff --git a/graphics/kdegraphics2/pkg-plist b/graphics/kdegraphics2/pkg-plist
index 57aafc2a2140..c228c5e8d3b7 100644
--- a/graphics/kdegraphics2/pkg-plist
+++ b/graphics/kdegraphics2/pkg-plist
@@ -1,37 +1,38 @@
+bin/kcolorchooser
+bin/kcoloredit
 bin/kdvi
 bin/kfax
 bin/kfract
 bin/kghostview
 bin/kiconedit
+bin/kooka
 bin/kpaint
-bin/kpixmap2bitmap
 bin/kruler
 bin/ksnapshot
 bin/kview
 bin/kviewshell
-bin/pixie
-include/ifplugin.h
-include/mini-magick/animate.h
-include/mini-magick/api.h
-include/mini-magick/blob.h
-include/mini-magick/cache.h
-include/mini-magick/cache_io.h
-include/mini-magick/classify.h
-include/mini-magick/compress.h
-include/mini-magick/defines.h
-include/mini-magick/delegates.h
-include/mini-magick/error.h
-include/mini-magick/gems.h
-include/mini-magick/image.h
-include/mini-magick/magick.h
-include/mini-magick/memory.h
-include/mini-magick/monitor.h
-include/mini-magick/quantize.h
-include/mini-magick/timer.h
-include/mini-magick/utility.h
-include/mini-magick/version.h
+include/devselector.h
+include/dispgamma.h
+include/gammadialog.h
+include/img_canvas.h
+include/imgscaledialog.h
+include/kgammatable.h
+include/kscandevice.h
+include/kscanoption.h
+include/kscanoptset.h
+include/kscanslider.h
+include/massscandialog.h
+include/previewer.h
+include/scanparams.h
+include/scansourcedialog.h
+lib/kcolorchooser.la
+lib/kcolorchooser.so
+lib/kio_kamera.la
+lib/kio_kamera.so
 lib/kview.la
 lib/kview.so
+lib/libkcm_kamera.la
+lib/libkcm_kamera.so
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
@@ -39,44 +40,31 @@ lib/libkfax.so
 lib/libkghostview.la
 lib/libkghostview.so
 lib/libkghostview.so.1
-lib/libkif_kdeeffects.la
-lib/libkif_kdeeffects.so
-lib/libkif_kdeeffects.so.1
-lib/libkif_magick.la
-lib/libkif_magick.so
-lib/libkif_magick.so.1
-lib/libkifplugin.la
-lib/libkifplugin.so
-lib/libkifplugin.so.3
 lib/libkmultipage.la
 lib/libkmultipage.so
 lib/libkmultipage.so.0
 lib/libkpagetest.la
 lib/libkpagetest.so
+lib/libkscan.la
+lib/libkscan.so
+lib/libkscan.so.1
 lib/libkviewerpart.la
 lib/libkviewerpart.so
 lib/libkviewpart.la
 lib/libkviewpart.so
-lib/libminimagick.la
-lib/libminimagick.so
-lib/libminimagick.so.5
-lib/libpixie_color.la
-lib/libpixie_color.so
-lib/libpixie_color.so.1
-lib/libpixie_thumb.la
-lib/libpixie_thumb.so
-lib/libpixie_thumb.so.1
+share/applnk/Graphics/kcolorchooser.desktop
+share/applnk/Graphics/kcoloredit.desktop
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
 share/applnk/Graphics/kfract.desktop
 share/applnk/Graphics/kghostview.desktop
 share/applnk/Graphics/kiconedit.desktop
 share/applnk/Graphics/kpaint.desktop
-share/applnk/Graphics/kpixmap2bitmap.desktop
 share/applnk/Graphics/kruler.desktop
 share/applnk/Graphics/ksnapshot.desktop
 share/applnk/Graphics/kview.desktop
-share/applnk/Graphics/pixie.desktop
+share/applnk/Settings/Peripherals/kamera.desktop
+share/applnk/Utilities/kooka.desktop
 share/apps/kdvi/kdvi_part.rc
 share/apps/kdvi/toolbar/forwpage.xpm
 share/apps/kdvi/toolbar/largetext.xpm
@@ -87,6 +75,7 @@ share/apps/kfax/pics/kfaxlogo.xpm
 share/apps/kfract/kfract.rc
 share/apps/kghostview/kghostviewui.rc
 share/apps/kghostview/kgv_part.rc
+share/apps/kghostview/pdf_sec.ps
 share/apps/kiconedit/pics/compressed.png
 share/apps/kiconedit/pics/source.png
 share/apps/kiconedit/pics/standard.png
@@ -116,6 +105,16 @@ share/apps/kiconedit/toolbar/selectrect.png
 share/apps/kiconedit/toolbar/spraycan-cursor.xpm
 share/apps/kiconedit/toolbar/spraycan.png
 share/apps/kiconedit/toolbar/transform.png
+share/apps/kooka/kookaui.rc
+share/apps/kooka/pics/mirror-both.png
+share/apps/kooka/pics/mirror-horiz.png
+share/apps/kooka/pics/mirror-vert.png
+share/apps/kooka/pics/newfromselect.png
+share/apps/kooka/pics/ocr-select.png
+share/apps/kooka/pics/ocr.png
+share/apps/kooka/pics/scaleorig.png
+share/apps/kooka/pics/scaletoheight.png
+share/apps/kooka/pics/scaletowidth.png
 share/apps/kpaint/kpaint.rc
 share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/brush.xpm
@@ -127,10 +126,12 @@ share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
 share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
+share/apps/kruler/eventsrc
 share/apps/kruler/kruler-east.png
 share/apps/kruler/kruler-north.png
 share/apps/kruler/kruler-south.png
 share/apps/kruler/kruler-west.png
+share/apps/kruler/move.wav
 share/apps/kview/kview_part.rc
 share/apps/kview/kview_popup.rc
 share/apps/kview/kviewui.rc
@@ -138,169 +139,38 @@ share/apps/kview/toolbar/rotate.png
 share/apps/kviewerpart/kviewerpart.rc
 share/apps/kviewshell/kviewshell.rc
 share/apps/kviewshell/paper-formats
-share/apps/pixie/dec2.png
-share/apps/pixie/dec2high.png
-share/apps/pixie/inc2.png
-share/apps/pixie/inc2high.png
-share/apps/pixie/logo.png
-share/apps/pixie/plugins/kdeeffects.desktop
-share/apps/pixie/plugins/magick.desktop
-share/apps/pixie/progress1.png
-share/apps/pixie/progress2.png
-share/apps/pixie/thumbwallpaper.png
-share/apps/pixie/toolbar/back.png
-share/apps/pixie/toolbar/brightness+.png
-share/apps/pixie/toolbar/brightness-.png
-share/apps/pixie/toolbar/contrast+.png
-share/apps/pixie/toolbar/contrast-.png
-share/apps/pixie/toolbar/fliph.png
-share/apps/pixie/toolbar/flipv.png
-share/apps/pixie/toolbar/forward.png
-share/apps/pixie/toolbar/kwin.png
-share/apps/pixie/toolbar/mini-ray.png
-share/apps/pixie/toolbar/mini-run.png
-share/apps/pixie/toolbar/play.png
-share/apps/pixie/toolbar/scaledown.png
-share/apps/pixie/toolbar/scaleup.png
-share/apps/pixie/toolbar/stop.png
-share/apps/pixie/toolbar/thumb.png
-share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
 share/doc/HTML/en/kdvi/aboutkde.ps
 share/doc/HTML/en/kdvi/common
-share/doc/HTML/en/kdvi/index.cvlog
+share/doc/HTML/en/kdvi/index.cache.bz2
 share/doc/HTML/en/kdvi/index.docbook
-share/doc/HTML/en/kdvi/index.html
-share/doc/HTML/en/kdvi/opt-rendering.html
 share/doc/HTML/en/kdvi/optionrequester1.png
 share/doc/HTML/en/kdvi/optionrequester2.png
-share/doc/HTML/en/kdvi/options.html
-share/doc/HTML/en/kdvi/printing.html
-share/doc/HTML/en/kdvi/qampa.html
-share/doc/HTML/en/kdvi/usage.html
-share/doc/HTML/en/kfax/.anchors
-share/doc/HTML/en/kfax/command-line-options.html
-share/doc/HTML/en/kfax/common
-share/doc/HTML/en/kfax/compilation-and-installation.html
-share/doc/HTML/en/kfax/copyright.html
-share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
-share/doc/HTML/en/kfax/fax-options.html
-share/doc/HTML/en/kfax/fundamentals.html
-share/doc/HTML/en/kfax/help.html
-share/doc/HTML/en/kfax/how-to-create-fax-files.html
-share/doc/HTML/en/kfax/index.cvlog
-share/doc/HTML/en/kfax/index.docbook
-share/doc/HTML/en/kfax/index.html
-share/doc/HTML/en/kfax/installation.html
-share/doc/HTML/en/kfax/introduction.html
-share/doc/HTML/en/kfax/kfax-key-bindings.html
-share/doc/HTML/en/kfax/options.html
-share/doc/HTML/en/kfax/printing.html
-share/doc/HTML/en/kfax/questionsandanswers.html
-share/doc/HTML/en/kfax/requirements.html
-share/doc/HTML/en/kfax/themenuentries.html
-share/doc/HTML/en/kfax/view.html
-share/doc/HTML/en/kfract/.anchors
 share/doc/HTML/en/kfract/common
-share/doc/HTML/en/kfract/credits-and-license.html
-share/doc/HTML/en/kfract/index.cvlog
+share/doc/HTML/en/kfract/index.cache.bz2
 share/doc/HTML/en/kfract/index.docbook
-share/doc/HTML/en/kfract/index.html
-share/doc/HTML/en/kfract/introduction.html
 share/doc/HTML/en/kfract/kfract.png
-share/doc/HTML/en/kfract/onscreenfundamentals.html
-share/doc/HTML/en/kfract/the-file-menu.html
-share/doc/HTML/en/kfract/the-help-menu.html
-share/doc/HTML/en/kfract/the-options-menu.html
-share/doc/HTML/en/kfract/the-toolbar.html
-share/doc/HTML/en/kfract/the-types-menu.html
-share/doc/HTML/en/kghostview/.anchors
-share/doc/HTML/en/kghostview/authors.html
 share/doc/HTML/en/kghostview/common
-share/doc/HTML/en/kghostview/configure-interpreter.html
-share/doc/HTML/en/kghostview/configure-key-bindings.html
-share/doc/HTML/en/kghostview/copyright.html
-share/doc/HTML/en/kghostview/dialogboxes.html
-share/doc/HTML/en/kghostview/epilogue.html
-share/doc/HTML/en/kghostview/fundamentals.html
-share/doc/HTML/en/kghostview/ghostscript-messages.html
-share/doc/HTML/en/kghostview/go-to-page.html
-share/doc/HTML/en/kghostview/go.html
-share/doc/HTML/en/kghostview/help.html
-share/doc/HTML/en/kghostview/index.cvlog
+share/doc/HTML/en/kghostview/index.cache.bz2
 share/doc/HTML/en/kghostview/index.docbook
-share/doc/HTML/en/kghostview/index.html
-share/doc/HTML/en/kghostview/info.html
-share/doc/HTML/en/kghostview/introduction.html
-share/doc/HTML/en/kghostview/options.html
-share/doc/HTML/en/kghostview/page-list.html
-share/doc/HTML/en/kghostview/primarymenuitems.html
-share/doc/HTML/en/kghostview/tool-bar.html
-share/doc/HTML/en/kghostview/tutorial.html
-share/doc/HTML/en/kghostview/view-control.html
-share/doc/HTML/en/kghostview/view.html
-share/doc/HTML/en/kiconedit/.anchors
 share/doc/HTML/en/kiconedit/common
-share/doc/HTML/en/kiconedit/compilation-and-installation.html
-share/doc/HTML/en/kiconedit/configuration.html
-share/doc/HTML/en/kiconedit/edit.html
-share/doc/HTML/en/kiconedit/grid.html
-share/doc/HTML/en/kiconedit/help.html
-share/doc/HTML/en/kiconedit/index.cvlog
+share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kiconedit/index.html
-share/doc/HTML/en/kiconedit/installation.html
-share/doc/HTML/en/kiconedit/introduction.html
-share/doc/HTML/en/kiconedit/onscreenfundamentals.html
-share/doc/HTML/en/kiconedit/options.html
-share/doc/HTML/en/kiconedit/requirements.html
-share/doc/HTML/en/kiconedit/statusbar.html
-share/doc/HTML/en/kiconedit/themenuentries.html
-share/doc/HTML/en/kiconedit/tools-toolbar.html
-share/doc/HTML/en/kiconedit/tools.html
-share/doc/HTML/en/kiconedit/view.html
-share/doc/HTML/en/kpaint/.anchors
-share/doc/HTML/en/kpaint/Technic.png
 share/doc/HTML/en/kpaint/common
-share/doc/HTML/en/kpaint/index.cvlog
+share/doc/HTML/en/kpaint/index.cache.bz2
 share/doc/HTML/en/kpaint/index.docbook
-share/doc/HTML/en/kpaint/index.html
-share/doc/HTML/en/kpaint/introductiongraphicfilereftechnicpnggraphic.html
-share/doc/HTML/en/kpaint/planned-features.html
-share/doc/HTML/en/ksnapshot/.anchors
-share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/kruler/common
+share/doc/HTML/en/kruler/index.cache.bz2
+share/doc/HTML/en/kruler/index.docbook
 share/doc/HTML/en/ksnapshot/common
-share/doc/HTML/en/ksnapshot/compilation-installation.html
-share/doc/HTML/en/ksnapshot/credits.html
+share/doc/HTML/en/ksnapshot/index.cache.bz2
 share/doc/HTML/en/ksnapshot/index.docbook
-share/doc/HTML/en/ksnapshot/index.html
-share/doc/HTML/en/ksnapshot/installation.html
-share/doc/HTML/en/ksnapshot/introduction.html
 share/doc/HTML/en/ksnapshot/preview.png
-share/doc/HTML/en/ksnapshot/requirements.html
-share/doc/HTML/en/ksnapshot/taking-snapshot.html
-share/doc/HTML/en/ksnapshot/using-ksapshot.html
 share/doc/HTML/en/ksnapshot/window.png
-share/doc/HTML/en/kview/.anchors
-share/doc/HTML/en/kview/cluttering-desktop.html
-share/doc/HTML/en/kview/command-line.html
-share/doc/HTML/en/kview/commands.html
 share/doc/HTML/en/kview/common
-share/doc/HTML/en/kview/credits.html
-share/doc/HTML/en/kview/desktop-menu.html
-share/doc/HTML/en/kview/edit-menu.html
-share/doc/HTML/en/kview/filter-menu.html
-share/doc/HTML/en/kview/help-menu.html
-share/doc/HTML/en/kview/images-menu.html
+share/doc/HTML/en/kview/index.cache.bz2
 share/doc/HTML/en/kview/index.docbook
-share/doc/HTML/en/kview/index.html
-share/doc/HTML/en/kview/installation.html
-share/doc/HTML/en/kview/introduction.html
-share/doc/HTML/en/kview/requirements.html
-share/doc/HTML/en/kview/sample-session.html
-share/doc/HTML/en/kview/selection.html
-share/doc/HTML/en/kview/settings-menu.html
 share/doc/HTML/en/kview/snapshot1.png
 share/doc/HTML/en/kview/snapshot2.png
 share/doc/HTML/en/kview/snapshot3.png
@@ -310,116 +180,57 @@ share/doc/HTML/en/kview/snapshot6.png
 share/doc/HTML/en/kview/snapshot7.png
 share/doc/HTML/en/kview/snapshot8.png
 share/doc/HTML/en/kview/snapshot9.png
-share/doc/HTML/en/kview/stirring-paste.html
-share/doc/HTML/en/kview/transform-menu.html
-share/doc/HTML/en/kview/view-menu.html
-share/doc/HTML/en/pixie/.anchors
-share/doc/HTML/en/pixie/clone.png
-share/doc/HTML/en/pixie/command-line-options.html
-share/doc/HTML/en/pixie/common
-share/doc/HTML/en/pixie/compilation.html
-share/doc/HTML/en/pixie/configure.html
-share/doc/HTML/en/pixie/copy-paste.png
-share/doc/HTML/en/pixie/credits.html
-share/doc/HTML/en/pixie/drag-and-drop.html
-share/doc/HTML/en/pixie/edit-advanced.html
-share/doc/HTML/en/pixie/edit-basics.html
-share/doc/HTML/en/pixie/effects.html
-share/doc/HTML/en/pixie/file.html
-share/doc/HTML/en/pixie/getting-started.html
-share/doc/HTML/en/pixie/help.html
-share/doc/HTML/en/pixie/hotlist.png
-share/doc/HTML/en/pixie/image-edit.png
-share/doc/HTML/en/pixie/image-size.png
-share/doc/HTML/en/pixie/ind-color-edit.png
-share/doc/HTML/en/pixie/index.docbook
-share/doc/HTML/en/pixie/index.html
-share/doc/HTML/en/pixie/installation.html
-share/doc/HTML/en/pixie/introduction.html
-share/doc/HTML/en/pixie/key-bindings.html
-share/doc/HTML/en/pixie/new-win.png
-share/doc/HTML/en/pixie/open-save-print.png
-share/doc/HTML/en/pixie/open.png
-share/doc/HTML/en/pixie/options.png
-share/doc/HTML/en/pixie/pixie.png
-share/doc/HTML/en/pixie/reload.png
-share/doc/HTML/en/pixie/requirements.html
-share/doc/HTML/en/pixie/scale.png
-share/doc/HTML/en/pixie/screenshot.png
-share/doc/HTML/en/pixie/sharp-bright.png
-share/doc/HTML/en/pixie/startup.png
-share/doc/HTML/en/pixie/stop.png
-share/doc/HTML/en/pixie/thumb-fm.png
-share/doc/HTML/en/pixie/thumbgen.png
-share/doc/HTML/en/pixie/thumbnails.png
-share/doc/HTML/en/pixie/thumbs-preview.png
-share/doc/HTML/en/pixie/thumbs-update.png
-share/doc/HTML/en/pixie/toggle.png
-share/doc/HTML/en/pixie/toolbar-menu-entries.html
-share/doc/HTML/en/pixie/windows.html
+share/icons/hicolor/16x16/actions/palette_color.png
+share/icons/hicolor/16x16/actions/palette_gray.png
+share/icons/hicolor/16x16/actions/palette_halftone.png
+share/icons/hicolor/16x16/actions/palette_lineart.png
+share/icons/hicolor/16x16/apps/kcoloredit.png
+share/icons/hicolor/16x16/apps/kdvi.png
+share/icons/hicolor/16x16/apps/kfax.png
+share/icons/hicolor/16x16/apps/kfract.png
+share/icons/hicolor/16x16/apps/kghostview.png
+share/icons/hicolor/16x16/apps/kiconedit.png
+share/icons/hicolor/16x16/apps/kpaint.png
 share/icons/hicolor/16x16/apps/kruler.png
+share/icons/hicolor/16x16/apps/ksnapshot.png
+share/icons/hicolor/16x16/apps/kview.png
+share/icons/hicolor/32x32/apps/kcoloredit.png
 share/icons/hicolor/32x32/apps/kdvi.png
 share/icons/hicolor/32x32/apps/kfax.png
 share/icons/hicolor/32x32/apps/kfract.png
 share/icons/hicolor/32x32/apps/kghostview.png
 share/icons/hicolor/32x32/apps/kiconedit.png
 share/icons/hicolor/32x32/apps/kpaint.png
-share/icons/hicolor/32x32/apps/kpixmap2bitmap.png
 share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
 share/icons/hicolor/32x32/apps/kview.png
-share/icons/hicolor/32x32/apps/pixie.png
 share/icons/hicolor/48x48/apps/kdvi.png
 share/icons/hicolor/48x48/apps/kfax.png
 share/icons/hicolor/48x48/apps/kfract.png
 share/icons/hicolor/48x48/apps/kghostview.png
 share/icons/hicolor/48x48/apps/kiconedit.png
 share/icons/hicolor/48x48/apps/kpaint.png
-share/icons/hicolor/48x48/apps/kpixmap2bitmap.png
 share/icons/hicolor/48x48/apps/kruler.png
 share/icons/hicolor/48x48/apps/ksnapshot.png
 share/icons/hicolor/48x48/apps/kview.png
-share/icons/hicolor/48x48/apps/pixie.png
-share/icons/locolor/16x16/apps/kdvi.png
-share/icons/locolor/16x16/apps/kfax.png
-share/icons/locolor/16x16/apps/kfract.png
-share/icons/locolor/16x16/apps/kghostview.png
-share/icons/locolor/16x16/apps/kiconedit.png
-share/icons/locolor/16x16/apps/kpaint.png
-share/icons/locolor/16x16/apps/kpixmap2bitmap.png
-share/icons/locolor/16x16/apps/kruler.png
-share/icons/locolor/16x16/apps/ksnapshot.png
-share/icons/locolor/16x16/apps/kview.png
-share/icons/locolor/16x16/apps/pixie.png
-share/icons/locolor/32x32/apps/kdvi.png
-share/icons/locolor/32x32/apps/kfax.png
-share/icons/locolor/32x32/apps/kfract.png
-share/icons/locolor/32x32/apps/kghostview.png
-share/icons/locolor/32x32/apps/kiconedit.png
-share/icons/locolor/32x32/apps/kpaint.png
-share/icons/locolor/32x32/apps/kpixmap2bitmap.png
-share/icons/locolor/32x32/apps/kruler.png
-share/icons/locolor/32x32/apps/ksnapshot.png
-share/icons/locolor/32x32/apps/kview.png
-share/icons/locolor/32x32/apps/pixie.png
+share/icons/locolor/16x16/apps/kcoloredit.png
+share/icons/locolor/32x32/apps/kcoloredit.png
+share/services/kamera.protocol
+share/services/scanservice.desktop
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/16x16/apps
-@dirrm share/doc/HTML/en/pixie
+@dirrm share/icons/hicolor/16x16/actions
 @dirrm share/doc/HTML/en/kview
 @dirrm share/doc/HTML/en/ksnapshot
+@dirrm share/doc/HTML/en/kruler
 @dirrm share/doc/HTML/en/kpaint
 @dirrm share/doc/HTML/en/kiconedit
 @dirrm share/doc/HTML/en/kghostview
 @dirrm share/doc/HTML/en/kfract
-@dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/en
-@dirrm share/apps/pixie/toolbar
-@dirrm share/apps/pixie/plugins
-@dirrm share/apps/pixie
 @dirrm share/apps/kviewshell
 @dirrm share/apps/kviewerpart
 @dirrm share/apps/kview/toolbar
@@ -427,6 +238,8 @@ share/icons/locolor/32x32/apps/pixie.png
 @dirrm share/apps/kruler
 @dirrm share/apps/kpaint/toolbar
 @dirrm share/apps/kpaint
+@dirrm share/apps/kooka/pics
+@dirrm share/apps/kooka
 @dirrm share/apps/kiconedit/toolbar
 @dirrm share/apps/kiconedit/pics
 @dirrm share/apps/kiconedit
@@ -437,5 +250,6 @@ share/icons/locolor/32x32/apps/pixie.png
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
 @dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Settings/Peripherals
 @dirrm share/applnk/Graphics
-@dirrm include/mini-magick
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 193b12e8e9e0..95e755a877a1 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,4 +22,11 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in
+	${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in
+	${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp
+	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		"s@GPHOTO2_LIBS =@GPHOTO2_LIBS= -lintl@g"
+
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index dbb28870f30f..1d288407ca0d 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58
+MD5 (kdegraphics-2.2.tar.bz2) = 32125d00243c884017daa4345b87e2fe
diff --git a/graphics/kdegraphics3/files/patch-ad b/graphics/kdegraphics3/files/patch-ad
deleted file mode 100644
index 643295f42cea..000000000000
--- a/graphics/kdegraphics3/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- pixie/plugins/magick/magick.cpp	Tue Aug  8 03:55:58 2000
-+++ pixie/plugins/magick/magick.cpp.new	Sun Sep 17 19:45:31 2000
-@@ -708,7 +708,7 @@
- 
-     // tell imagemagick what routines to run for messages
-     MonitorHandler oldMonitor;
--    oldMonitor = SetMonitorHandler(runMagickProgress);
-+    oldMonitor = SetMonitorHandler((void (*)(const char *, long long int, long long int))runMagickProgress);
-     
-     ErrorHandler oldError;
-     oldError = SetErrorHandler(runMagickErrorDlg);
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 57aafc2a2140..c228c5e8d3b7 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -1,37 +1,38 @@
+bin/kcolorchooser
+bin/kcoloredit
 bin/kdvi
 bin/kfax
 bin/kfract
 bin/kghostview
 bin/kiconedit
+bin/kooka
 bin/kpaint
-bin/kpixmap2bitmap
 bin/kruler
 bin/ksnapshot
 bin/kview
 bin/kviewshell
-bin/pixie
-include/ifplugin.h
-include/mini-magick/animate.h
-include/mini-magick/api.h
-include/mini-magick/blob.h
-include/mini-magick/cache.h
-include/mini-magick/cache_io.h
-include/mini-magick/classify.h
-include/mini-magick/compress.h
-include/mini-magick/defines.h
-include/mini-magick/delegates.h
-include/mini-magick/error.h
-include/mini-magick/gems.h
-include/mini-magick/image.h
-include/mini-magick/magick.h
-include/mini-magick/memory.h
-include/mini-magick/monitor.h
-include/mini-magick/quantize.h
-include/mini-magick/timer.h
-include/mini-magick/utility.h
-include/mini-magick/version.h
+include/devselector.h
+include/dispgamma.h
+include/gammadialog.h
+include/img_canvas.h
+include/imgscaledialog.h
+include/kgammatable.h
+include/kscandevice.h
+include/kscanoption.h
+include/kscanoptset.h
+include/kscanslider.h
+include/massscandialog.h
+include/previewer.h
+include/scanparams.h
+include/scansourcedialog.h
+lib/kcolorchooser.la
+lib/kcolorchooser.so
+lib/kio_kamera.la
+lib/kio_kamera.so
 lib/kview.la
 lib/kview.so
+lib/libkcm_kamera.la
+lib/libkcm_kamera.so
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
@@ -39,44 +40,31 @@ lib/libkfax.so
 lib/libkghostview.la
 lib/libkghostview.so
 lib/libkghostview.so.1
-lib/libkif_kdeeffects.la
-lib/libkif_kdeeffects.so
-lib/libkif_kdeeffects.so.1
-lib/libkif_magick.la
-lib/libkif_magick.so
-lib/libkif_magick.so.1
-lib/libkifplugin.la
-lib/libkifplugin.so
-lib/libkifplugin.so.3
 lib/libkmultipage.la
 lib/libkmultipage.so
 lib/libkmultipage.so.0
 lib/libkpagetest.la
 lib/libkpagetest.so
+lib/libkscan.la
+lib/libkscan.so
+lib/libkscan.so.1
 lib/libkviewerpart.la
 lib/libkviewerpart.so
 lib/libkviewpart.la
 lib/libkviewpart.so
-lib/libminimagick.la
-lib/libminimagick.so
-lib/libminimagick.so.5
-lib/libpixie_color.la
-lib/libpixie_color.so
-lib/libpixie_color.so.1
-lib/libpixie_thumb.la
-lib/libpixie_thumb.so
-lib/libpixie_thumb.so.1
+share/applnk/Graphics/kcolorchooser.desktop
+share/applnk/Graphics/kcoloredit.desktop
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
 share/applnk/Graphics/kfract.desktop
 share/applnk/Graphics/kghostview.desktop
 share/applnk/Graphics/kiconedit.desktop
 share/applnk/Graphics/kpaint.desktop
-share/applnk/Graphics/kpixmap2bitmap.desktop
 share/applnk/Graphics/kruler.desktop
 share/applnk/Graphics/ksnapshot.desktop
 share/applnk/Graphics/kview.desktop
-share/applnk/Graphics/pixie.desktop
+share/applnk/Settings/Peripherals/kamera.desktop
+share/applnk/Utilities/kooka.desktop
 share/apps/kdvi/kdvi_part.rc
 share/apps/kdvi/toolbar/forwpage.xpm
 share/apps/kdvi/toolbar/largetext.xpm
@@ -87,6 +75,7 @@ share/apps/kfax/pics/kfaxlogo.xpm
 share/apps/kfract/kfract.rc
 share/apps/kghostview/kghostviewui.rc
 share/apps/kghostview/kgv_part.rc
+share/apps/kghostview/pdf_sec.ps
 share/apps/kiconedit/pics/compressed.png
 share/apps/kiconedit/pics/source.png
 share/apps/kiconedit/pics/standard.png
@@ -116,6 +105,16 @@ share/apps/kiconedit/toolbar/selectrect.png
 share/apps/kiconedit/toolbar/spraycan-cursor.xpm
 share/apps/kiconedit/toolbar/spraycan.png
 share/apps/kiconedit/toolbar/transform.png
+share/apps/kooka/kookaui.rc
+share/apps/kooka/pics/mirror-both.png
+share/apps/kooka/pics/mirror-horiz.png
+share/apps/kooka/pics/mirror-vert.png
+share/apps/kooka/pics/newfromselect.png
+share/apps/kooka/pics/ocr-select.png
+share/apps/kooka/pics/ocr.png
+share/apps/kooka/pics/scaleorig.png
+share/apps/kooka/pics/scaletoheight.png
+share/apps/kooka/pics/scaletowidth.png
 share/apps/kpaint/kpaint.rc
 share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/brush.xpm
@@ -127,10 +126,12 @@ share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
 share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
+share/apps/kruler/eventsrc
 share/apps/kruler/kruler-east.png
 share/apps/kruler/kruler-north.png
 share/apps/kruler/kruler-south.png
 share/apps/kruler/kruler-west.png
+share/apps/kruler/move.wav
 share/apps/kview/kview_part.rc
 share/apps/kview/kview_popup.rc
 share/apps/kview/kviewui.rc
@@ -138,169 +139,38 @@ share/apps/kview/toolbar/rotate.png
 share/apps/kviewerpart/kviewerpart.rc
 share/apps/kviewshell/kviewshell.rc
 share/apps/kviewshell/paper-formats
-share/apps/pixie/dec2.png
-share/apps/pixie/dec2high.png
-share/apps/pixie/inc2.png
-share/apps/pixie/inc2high.png
-share/apps/pixie/logo.png
-share/apps/pixie/plugins/kdeeffects.desktop
-share/apps/pixie/plugins/magick.desktop
-share/apps/pixie/progress1.png
-share/apps/pixie/progress2.png
-share/apps/pixie/thumbwallpaper.png
-share/apps/pixie/toolbar/back.png
-share/apps/pixie/toolbar/brightness+.png
-share/apps/pixie/toolbar/brightness-.png
-share/apps/pixie/toolbar/contrast+.png
-share/apps/pixie/toolbar/contrast-.png
-share/apps/pixie/toolbar/fliph.png
-share/apps/pixie/toolbar/flipv.png
-share/apps/pixie/toolbar/forward.png
-share/apps/pixie/toolbar/kwin.png
-share/apps/pixie/toolbar/mini-ray.png
-share/apps/pixie/toolbar/mini-run.png
-share/apps/pixie/toolbar/play.png
-share/apps/pixie/toolbar/scaledown.png
-share/apps/pixie/toolbar/scaleup.png
-share/apps/pixie/toolbar/stop.png
-share/apps/pixie/toolbar/thumb.png
-share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
 share/doc/HTML/en/kdvi/aboutkde.ps
 share/doc/HTML/en/kdvi/common
-share/doc/HTML/en/kdvi/index.cvlog
+share/doc/HTML/en/kdvi/index.cache.bz2
 share/doc/HTML/en/kdvi/index.docbook
-share/doc/HTML/en/kdvi/index.html
-share/doc/HTML/en/kdvi/opt-rendering.html
 share/doc/HTML/en/kdvi/optionrequester1.png
 share/doc/HTML/en/kdvi/optionrequester2.png
-share/doc/HTML/en/kdvi/options.html
-share/doc/HTML/en/kdvi/printing.html
-share/doc/HTML/en/kdvi/qampa.html
-share/doc/HTML/en/kdvi/usage.html
-share/doc/HTML/en/kfax/.anchors
-share/doc/HTML/en/kfax/command-line-options.html
-share/doc/HTML/en/kfax/common
-share/doc/HTML/en/kfax/compilation-and-installation.html
-share/doc/HTML/en/kfax/copyright.html
-share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
-share/doc/HTML/en/kfax/fax-options.html
-share/doc/HTML/en/kfax/fundamentals.html
-share/doc/HTML/en/kfax/help.html
-share/doc/HTML/en/kfax/how-to-create-fax-files.html
-share/doc/HTML/en/kfax/index.cvlog
-share/doc/HTML/en/kfax/index.docbook
-share/doc/HTML/en/kfax/index.html
-share/doc/HTML/en/kfax/installation.html
-share/doc/HTML/en/kfax/introduction.html
-share/doc/HTML/en/kfax/kfax-key-bindings.html
-share/doc/HTML/en/kfax/options.html
-share/doc/HTML/en/kfax/printing.html
-share/doc/HTML/en/kfax/questionsandanswers.html
-share/doc/HTML/en/kfax/requirements.html
-share/doc/HTML/en/kfax/themenuentries.html
-share/doc/HTML/en/kfax/view.html
-share/doc/HTML/en/kfract/.anchors
 share/doc/HTML/en/kfract/common
-share/doc/HTML/en/kfract/credits-and-license.html
-share/doc/HTML/en/kfract/index.cvlog
+share/doc/HTML/en/kfract/index.cache.bz2
 share/doc/HTML/en/kfract/index.docbook
-share/doc/HTML/en/kfract/index.html
-share/doc/HTML/en/kfract/introduction.html
 share/doc/HTML/en/kfract/kfract.png
-share/doc/HTML/en/kfract/onscreenfundamentals.html
-share/doc/HTML/en/kfract/the-file-menu.html
-share/doc/HTML/en/kfract/the-help-menu.html
-share/doc/HTML/en/kfract/the-options-menu.html
-share/doc/HTML/en/kfract/the-toolbar.html
-share/doc/HTML/en/kfract/the-types-menu.html
-share/doc/HTML/en/kghostview/.anchors
-share/doc/HTML/en/kghostview/authors.html
 share/doc/HTML/en/kghostview/common
-share/doc/HTML/en/kghostview/configure-interpreter.html
-share/doc/HTML/en/kghostview/configure-key-bindings.html
-share/doc/HTML/en/kghostview/copyright.html
-share/doc/HTML/en/kghostview/dialogboxes.html
-share/doc/HTML/en/kghostview/epilogue.html
-share/doc/HTML/en/kghostview/fundamentals.html
-share/doc/HTML/en/kghostview/ghostscript-messages.html
-share/doc/HTML/en/kghostview/go-to-page.html
-share/doc/HTML/en/kghostview/go.html
-share/doc/HTML/en/kghostview/help.html
-share/doc/HTML/en/kghostview/index.cvlog
+share/doc/HTML/en/kghostview/index.cache.bz2
 share/doc/HTML/en/kghostview/index.docbook
-share/doc/HTML/en/kghostview/index.html
-share/doc/HTML/en/kghostview/info.html
-share/doc/HTML/en/kghostview/introduction.html
-share/doc/HTML/en/kghostview/options.html
-share/doc/HTML/en/kghostview/page-list.html
-share/doc/HTML/en/kghostview/primarymenuitems.html
-share/doc/HTML/en/kghostview/tool-bar.html
-share/doc/HTML/en/kghostview/tutorial.html
-share/doc/HTML/en/kghostview/view-control.html
-share/doc/HTML/en/kghostview/view.html
-share/doc/HTML/en/kiconedit/.anchors
 share/doc/HTML/en/kiconedit/common
-share/doc/HTML/en/kiconedit/compilation-and-installation.html
-share/doc/HTML/en/kiconedit/configuration.html
-share/doc/HTML/en/kiconedit/edit.html
-share/doc/HTML/en/kiconedit/grid.html
-share/doc/HTML/en/kiconedit/help.html
-share/doc/HTML/en/kiconedit/index.cvlog
+share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kiconedit/index.html
-share/doc/HTML/en/kiconedit/installation.html
-share/doc/HTML/en/kiconedit/introduction.html
-share/doc/HTML/en/kiconedit/onscreenfundamentals.html
-share/doc/HTML/en/kiconedit/options.html
-share/doc/HTML/en/kiconedit/requirements.html
-share/doc/HTML/en/kiconedit/statusbar.html
-share/doc/HTML/en/kiconedit/themenuentries.html
-share/doc/HTML/en/kiconedit/tools-toolbar.html
-share/doc/HTML/en/kiconedit/tools.html
-share/doc/HTML/en/kiconedit/view.html
-share/doc/HTML/en/kpaint/.anchors
-share/doc/HTML/en/kpaint/Technic.png
 share/doc/HTML/en/kpaint/common
-share/doc/HTML/en/kpaint/index.cvlog
+share/doc/HTML/en/kpaint/index.cache.bz2
 share/doc/HTML/en/kpaint/index.docbook
-share/doc/HTML/en/kpaint/index.html
-share/doc/HTML/en/kpaint/introductiongraphicfilereftechnicpnggraphic.html
-share/doc/HTML/en/kpaint/planned-features.html
-share/doc/HTML/en/ksnapshot/.anchors
-share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/kruler/common
+share/doc/HTML/en/kruler/index.cache.bz2
+share/doc/HTML/en/kruler/index.docbook
 share/doc/HTML/en/ksnapshot/common
-share/doc/HTML/en/ksnapshot/compilation-installation.html
-share/doc/HTML/en/ksnapshot/credits.html
+share/doc/HTML/en/ksnapshot/index.cache.bz2
 share/doc/HTML/en/ksnapshot/index.docbook
-share/doc/HTML/en/ksnapshot/index.html
-share/doc/HTML/en/ksnapshot/installation.html
-share/doc/HTML/en/ksnapshot/introduction.html
 share/doc/HTML/en/ksnapshot/preview.png
-share/doc/HTML/en/ksnapshot/requirements.html
-share/doc/HTML/en/ksnapshot/taking-snapshot.html
-share/doc/HTML/en/ksnapshot/using-ksapshot.html
 share/doc/HTML/en/ksnapshot/window.png
-share/doc/HTML/en/kview/.anchors
-share/doc/HTML/en/kview/cluttering-desktop.html
-share/doc/HTML/en/kview/command-line.html
-share/doc/HTML/en/kview/commands.html
 share/doc/HTML/en/kview/common
-share/doc/HTML/en/kview/credits.html
-share/doc/HTML/en/kview/desktop-menu.html
-share/doc/HTML/en/kview/edit-menu.html
-share/doc/HTML/en/kview/filter-menu.html
-share/doc/HTML/en/kview/help-menu.html
-share/doc/HTML/en/kview/images-menu.html
+share/doc/HTML/en/kview/index.cache.bz2
 share/doc/HTML/en/kview/index.docbook
-share/doc/HTML/en/kview/index.html
-share/doc/HTML/en/kview/installation.html
-share/doc/HTML/en/kview/introduction.html
-share/doc/HTML/en/kview/requirements.html
-share/doc/HTML/en/kview/sample-session.html
-share/doc/HTML/en/kview/selection.html
-share/doc/HTML/en/kview/settings-menu.html
 share/doc/HTML/en/kview/snapshot1.png
 share/doc/HTML/en/kview/snapshot2.png
 share/doc/HTML/en/kview/snapshot3.png
@@ -310,116 +180,57 @@ share/doc/HTML/en/kview/snapshot6.png
 share/doc/HTML/en/kview/snapshot7.png
 share/doc/HTML/en/kview/snapshot8.png
 share/doc/HTML/en/kview/snapshot9.png
-share/doc/HTML/en/kview/stirring-paste.html
-share/doc/HTML/en/kview/transform-menu.html
-share/doc/HTML/en/kview/view-menu.html
-share/doc/HTML/en/pixie/.anchors
-share/doc/HTML/en/pixie/clone.png
-share/doc/HTML/en/pixie/command-line-options.html
-share/doc/HTML/en/pixie/common
-share/doc/HTML/en/pixie/compilation.html
-share/doc/HTML/en/pixie/configure.html
-share/doc/HTML/en/pixie/copy-paste.png
-share/doc/HTML/en/pixie/credits.html
-share/doc/HTML/en/pixie/drag-and-drop.html
-share/doc/HTML/en/pixie/edit-advanced.html
-share/doc/HTML/en/pixie/edit-basics.html
-share/doc/HTML/en/pixie/effects.html
-share/doc/HTML/en/pixie/file.html
-share/doc/HTML/en/pixie/getting-started.html
-share/doc/HTML/en/pixie/help.html
-share/doc/HTML/en/pixie/hotlist.png
-share/doc/HTML/en/pixie/image-edit.png
-share/doc/HTML/en/pixie/image-size.png
-share/doc/HTML/en/pixie/ind-color-edit.png
-share/doc/HTML/en/pixie/index.docbook
-share/doc/HTML/en/pixie/index.html
-share/doc/HTML/en/pixie/installation.html
-share/doc/HTML/en/pixie/introduction.html
-share/doc/HTML/en/pixie/key-bindings.html
-share/doc/HTML/en/pixie/new-win.png
-share/doc/HTML/en/pixie/open-save-print.png
-share/doc/HTML/en/pixie/open.png
-share/doc/HTML/en/pixie/options.png
-share/doc/HTML/en/pixie/pixie.png
-share/doc/HTML/en/pixie/reload.png
-share/doc/HTML/en/pixie/requirements.html
-share/doc/HTML/en/pixie/scale.png
-share/doc/HTML/en/pixie/screenshot.png
-share/doc/HTML/en/pixie/sharp-bright.png
-share/doc/HTML/en/pixie/startup.png
-share/doc/HTML/en/pixie/stop.png
-share/doc/HTML/en/pixie/thumb-fm.png
-share/doc/HTML/en/pixie/thumbgen.png
-share/doc/HTML/en/pixie/thumbnails.png
-share/doc/HTML/en/pixie/thumbs-preview.png
-share/doc/HTML/en/pixie/thumbs-update.png
-share/doc/HTML/en/pixie/toggle.png
-share/doc/HTML/en/pixie/toolbar-menu-entries.html
-share/doc/HTML/en/pixie/windows.html
+share/icons/hicolor/16x16/actions/palette_color.png
+share/icons/hicolor/16x16/actions/palette_gray.png
+share/icons/hicolor/16x16/actions/palette_halftone.png
+share/icons/hicolor/16x16/actions/palette_lineart.png
+share/icons/hicolor/16x16/apps/kcoloredit.png
+share/icons/hicolor/16x16/apps/kdvi.png
+share/icons/hicolor/16x16/apps/kfax.png
+share/icons/hicolor/16x16/apps/kfract.png
+share/icons/hicolor/16x16/apps/kghostview.png
+share/icons/hicolor/16x16/apps/kiconedit.png
+share/icons/hicolor/16x16/apps/kpaint.png
 share/icons/hicolor/16x16/apps/kruler.png
+share/icons/hicolor/16x16/apps/ksnapshot.png
+share/icons/hicolor/16x16/apps/kview.png
+share/icons/hicolor/32x32/apps/kcoloredit.png
 share/icons/hicolor/32x32/apps/kdvi.png
 share/icons/hicolor/32x32/apps/kfax.png
 share/icons/hicolor/32x32/apps/kfract.png
 share/icons/hicolor/32x32/apps/kghostview.png
 share/icons/hicolor/32x32/apps/kiconedit.png
 share/icons/hicolor/32x32/apps/kpaint.png
-share/icons/hicolor/32x32/apps/kpixmap2bitmap.png
 share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
 share/icons/hicolor/32x32/apps/kview.png
-share/icons/hicolor/32x32/apps/pixie.png
 share/icons/hicolor/48x48/apps/kdvi.png
 share/icons/hicolor/48x48/apps/kfax.png
 share/icons/hicolor/48x48/apps/kfract.png
 share/icons/hicolor/48x48/apps/kghostview.png
 share/icons/hicolor/48x48/apps/kiconedit.png
 share/icons/hicolor/48x48/apps/kpaint.png
-share/icons/hicolor/48x48/apps/kpixmap2bitmap.png
 share/icons/hicolor/48x48/apps/kruler.png
 share/icons/hicolor/48x48/apps/ksnapshot.png
 share/icons/hicolor/48x48/apps/kview.png
-share/icons/hicolor/48x48/apps/pixie.png
-share/icons/locolor/16x16/apps/kdvi.png
-share/icons/locolor/16x16/apps/kfax.png
-share/icons/locolor/16x16/apps/kfract.png
-share/icons/locolor/16x16/apps/kghostview.png
-share/icons/locolor/16x16/apps/kiconedit.png
-share/icons/locolor/16x16/apps/kpaint.png
-share/icons/locolor/16x16/apps/kpixmap2bitmap.png
-share/icons/locolor/16x16/apps/kruler.png
-share/icons/locolor/16x16/apps/ksnapshot.png
-share/icons/locolor/16x16/apps/kview.png
-share/icons/locolor/16x16/apps/pixie.png
-share/icons/locolor/32x32/apps/kdvi.png
-share/icons/locolor/32x32/apps/kfax.png
-share/icons/locolor/32x32/apps/kfract.png
-share/icons/locolor/32x32/apps/kghostview.png
-share/icons/locolor/32x32/apps/kiconedit.png
-share/icons/locolor/32x32/apps/kpaint.png
-share/icons/locolor/32x32/apps/kpixmap2bitmap.png
-share/icons/locolor/32x32/apps/kruler.png
-share/icons/locolor/32x32/apps/ksnapshot.png
-share/icons/locolor/32x32/apps/kview.png
-share/icons/locolor/32x32/apps/pixie.png
+share/icons/locolor/16x16/apps/kcoloredit.png
+share/icons/locolor/32x32/apps/kcoloredit.png
+share/services/kamera.protocol
+share/services/scanservice.desktop
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/16x16/apps
-@dirrm share/doc/HTML/en/pixie
+@dirrm share/icons/hicolor/16x16/actions
 @dirrm share/doc/HTML/en/kview
 @dirrm share/doc/HTML/en/ksnapshot
+@dirrm share/doc/HTML/en/kruler
 @dirrm share/doc/HTML/en/kpaint
 @dirrm share/doc/HTML/en/kiconedit
 @dirrm share/doc/HTML/en/kghostview
 @dirrm share/doc/HTML/en/kfract
-@dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/en
-@dirrm share/apps/pixie/toolbar
-@dirrm share/apps/pixie/plugins
-@dirrm share/apps/pixie
 @dirrm share/apps/kviewshell
 @dirrm share/apps/kviewerpart
 @dirrm share/apps/kview/toolbar
@@ -427,6 +238,8 @@ share/icons/locolor/32x32/apps/pixie.png
 @dirrm share/apps/kruler
 @dirrm share/apps/kpaint/toolbar
 @dirrm share/apps/kpaint
+@dirrm share/apps/kooka/pics
+@dirrm share/apps/kooka
 @dirrm share/apps/kiconedit/toolbar
 @dirrm share/apps/kiconedit/pics
 @dirrm share/apps/kiconedit
@@ -437,5 +250,6 @@ share/icons/locolor/32x32/apps/pixie.png
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
 @dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Settings/Peripherals
 @dirrm share/applnk/Graphics
-@dirrm include/mini-magick
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 193b12e8e9e0..95e755a877a1 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -22,4 +22,11 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in
+	${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in
+	${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp
+	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		"s@GPHOTO2_LIBS =@GPHOTO2_LIBS= -lintl@g"
+
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index dbb28870f30f..1d288407ca0d 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58
+MD5 (kdegraphics-2.2.tar.bz2) = 32125d00243c884017daa4345b87e2fe
diff --git a/graphics/kdegraphics4/files/patch-ad b/graphics/kdegraphics4/files/patch-ad
deleted file mode 100644
index 643295f42cea..000000000000
--- a/graphics/kdegraphics4/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- pixie/plugins/magick/magick.cpp	Tue Aug  8 03:55:58 2000
-+++ pixie/plugins/magick/magick.cpp.new	Sun Sep 17 19:45:31 2000
-@@ -708,7 +708,7 @@
- 
-     // tell imagemagick what routines to run for messages
-     MonitorHandler oldMonitor;
--    oldMonitor = SetMonitorHandler(runMagickProgress);
-+    oldMonitor = SetMonitorHandler((void (*)(const char *, long long int, long long int))runMagickProgress);
-     
-     ErrorHandler oldError;
-     oldError = SetErrorHandler(runMagickErrorDlg);
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 57aafc2a2140..c228c5e8d3b7 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -1,37 +1,38 @@
+bin/kcolorchooser
+bin/kcoloredit
 bin/kdvi
 bin/kfax
 bin/kfract
 bin/kghostview
 bin/kiconedit
+bin/kooka
 bin/kpaint
-bin/kpixmap2bitmap
 bin/kruler
 bin/ksnapshot
 bin/kview
 bin/kviewshell
-bin/pixie
-include/ifplugin.h
-include/mini-magick/animate.h
-include/mini-magick/api.h
-include/mini-magick/blob.h
-include/mini-magick/cache.h
-include/mini-magick/cache_io.h
-include/mini-magick/classify.h
-include/mini-magick/compress.h
-include/mini-magick/defines.h
-include/mini-magick/delegates.h
-include/mini-magick/error.h
-include/mini-magick/gems.h
-include/mini-magick/image.h
-include/mini-magick/magick.h
-include/mini-magick/memory.h
-include/mini-magick/monitor.h
-include/mini-magick/quantize.h
-include/mini-magick/timer.h
-include/mini-magick/utility.h
-include/mini-magick/version.h
+include/devselector.h
+include/dispgamma.h
+include/gammadialog.h
+include/img_canvas.h
+include/imgscaledialog.h
+include/kgammatable.h
+include/kscandevice.h
+include/kscanoption.h
+include/kscanoptset.h
+include/kscanslider.h
+include/massscandialog.h
+include/previewer.h
+include/scanparams.h
+include/scansourcedialog.h
+lib/kcolorchooser.la
+lib/kcolorchooser.so
+lib/kio_kamera.la
+lib/kio_kamera.so
 lib/kview.la
 lib/kview.so
+lib/libkcm_kamera.la
+lib/libkcm_kamera.so
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
@@ -39,44 +40,31 @@ lib/libkfax.so
 lib/libkghostview.la
 lib/libkghostview.so
 lib/libkghostview.so.1
-lib/libkif_kdeeffects.la
-lib/libkif_kdeeffects.so
-lib/libkif_kdeeffects.so.1
-lib/libkif_magick.la
-lib/libkif_magick.so
-lib/libkif_magick.so.1
-lib/libkifplugin.la
-lib/libkifplugin.so
-lib/libkifplugin.so.3
 lib/libkmultipage.la
 lib/libkmultipage.so
 lib/libkmultipage.so.0
 lib/libkpagetest.la
 lib/libkpagetest.so
+lib/libkscan.la
+lib/libkscan.so
+lib/libkscan.so.1
 lib/libkviewerpart.la
 lib/libkviewerpart.so
 lib/libkviewpart.la
 lib/libkviewpart.so
-lib/libminimagick.la
-lib/libminimagick.so
-lib/libminimagick.so.5
-lib/libpixie_color.la
-lib/libpixie_color.so
-lib/libpixie_color.so.1
-lib/libpixie_thumb.la
-lib/libpixie_thumb.so
-lib/libpixie_thumb.so.1
+share/applnk/Graphics/kcolorchooser.desktop
+share/applnk/Graphics/kcoloredit.desktop
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
 share/applnk/Graphics/kfract.desktop
 share/applnk/Graphics/kghostview.desktop
 share/applnk/Graphics/kiconedit.desktop
 share/applnk/Graphics/kpaint.desktop
-share/applnk/Graphics/kpixmap2bitmap.desktop
 share/applnk/Graphics/kruler.desktop
 share/applnk/Graphics/ksnapshot.desktop
 share/applnk/Graphics/kview.desktop
-share/applnk/Graphics/pixie.desktop
+share/applnk/Settings/Peripherals/kamera.desktop
+share/applnk/Utilities/kooka.desktop
 share/apps/kdvi/kdvi_part.rc
 share/apps/kdvi/toolbar/forwpage.xpm
 share/apps/kdvi/toolbar/largetext.xpm
@@ -87,6 +75,7 @@ share/apps/kfax/pics/kfaxlogo.xpm
 share/apps/kfract/kfract.rc
 share/apps/kghostview/kghostviewui.rc
 share/apps/kghostview/kgv_part.rc
+share/apps/kghostview/pdf_sec.ps
 share/apps/kiconedit/pics/compressed.png
 share/apps/kiconedit/pics/source.png
 share/apps/kiconedit/pics/standard.png
@@ -116,6 +105,16 @@ share/apps/kiconedit/toolbar/selectrect.png
 share/apps/kiconedit/toolbar/spraycan-cursor.xpm
 share/apps/kiconedit/toolbar/spraycan.png
 share/apps/kiconedit/toolbar/transform.png
+share/apps/kooka/kookaui.rc
+share/apps/kooka/pics/mirror-both.png
+share/apps/kooka/pics/mirror-horiz.png
+share/apps/kooka/pics/mirror-vert.png
+share/apps/kooka/pics/newfromselect.png
+share/apps/kooka/pics/ocr-select.png
+share/apps/kooka/pics/ocr.png
+share/apps/kooka/pics/scaleorig.png
+share/apps/kooka/pics/scaletoheight.png
+share/apps/kooka/pics/scaletowidth.png
 share/apps/kpaint/kpaint.rc
 share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/brush.xpm
@@ -127,10 +126,12 @@ share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
 share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
+share/apps/kruler/eventsrc
 share/apps/kruler/kruler-east.png
 share/apps/kruler/kruler-north.png
 share/apps/kruler/kruler-south.png
 share/apps/kruler/kruler-west.png
+share/apps/kruler/move.wav
 share/apps/kview/kview_part.rc
 share/apps/kview/kview_popup.rc
 share/apps/kview/kviewui.rc
@@ -138,169 +139,38 @@ share/apps/kview/toolbar/rotate.png
 share/apps/kviewerpart/kviewerpart.rc
 share/apps/kviewshell/kviewshell.rc
 share/apps/kviewshell/paper-formats
-share/apps/pixie/dec2.png
-share/apps/pixie/dec2high.png
-share/apps/pixie/inc2.png
-share/apps/pixie/inc2high.png
-share/apps/pixie/logo.png
-share/apps/pixie/plugins/kdeeffects.desktop
-share/apps/pixie/plugins/magick.desktop
-share/apps/pixie/progress1.png
-share/apps/pixie/progress2.png
-share/apps/pixie/thumbwallpaper.png
-share/apps/pixie/toolbar/back.png
-share/apps/pixie/toolbar/brightness+.png
-share/apps/pixie/toolbar/brightness-.png
-share/apps/pixie/toolbar/contrast+.png
-share/apps/pixie/toolbar/contrast-.png
-share/apps/pixie/toolbar/fliph.png
-share/apps/pixie/toolbar/flipv.png
-share/apps/pixie/toolbar/forward.png
-share/apps/pixie/toolbar/kwin.png
-share/apps/pixie/toolbar/mini-ray.png
-share/apps/pixie/toolbar/mini-run.png
-share/apps/pixie/toolbar/play.png
-share/apps/pixie/toolbar/scaledown.png
-share/apps/pixie/toolbar/scaleup.png
-share/apps/pixie/toolbar/stop.png
-share/apps/pixie/toolbar/thumb.png
-share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
 share/doc/HTML/en/kdvi/aboutkde.ps
 share/doc/HTML/en/kdvi/common
-share/doc/HTML/en/kdvi/index.cvlog
+share/doc/HTML/en/kdvi/index.cache.bz2
 share/doc/HTML/en/kdvi/index.docbook
-share/doc/HTML/en/kdvi/index.html
-share/doc/HTML/en/kdvi/opt-rendering.html
 share/doc/HTML/en/kdvi/optionrequester1.png
 share/doc/HTML/en/kdvi/optionrequester2.png
-share/doc/HTML/en/kdvi/options.html
-share/doc/HTML/en/kdvi/printing.html
-share/doc/HTML/en/kdvi/qampa.html
-share/doc/HTML/en/kdvi/usage.html
-share/doc/HTML/en/kfax/.anchors
-share/doc/HTML/en/kfax/command-line-options.html
-share/doc/HTML/en/kfax/common
-share/doc/HTML/en/kfax/compilation-and-installation.html
-share/doc/HTML/en/kfax/copyright.html
-share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
-share/doc/HTML/en/kfax/fax-options.html
-share/doc/HTML/en/kfax/fundamentals.html
-share/doc/HTML/en/kfax/help.html
-share/doc/HTML/en/kfax/how-to-create-fax-files.html
-share/doc/HTML/en/kfax/index.cvlog
-share/doc/HTML/en/kfax/index.docbook
-share/doc/HTML/en/kfax/index.html
-share/doc/HTML/en/kfax/installation.html
-share/doc/HTML/en/kfax/introduction.html
-share/doc/HTML/en/kfax/kfax-key-bindings.html
-share/doc/HTML/en/kfax/options.html
-share/doc/HTML/en/kfax/printing.html
-share/doc/HTML/en/kfax/questionsandanswers.html
-share/doc/HTML/en/kfax/requirements.html
-share/doc/HTML/en/kfax/themenuentries.html
-share/doc/HTML/en/kfax/view.html
-share/doc/HTML/en/kfract/.anchors
 share/doc/HTML/en/kfract/common
-share/doc/HTML/en/kfract/credits-and-license.html
-share/doc/HTML/en/kfract/index.cvlog
+share/doc/HTML/en/kfract/index.cache.bz2
 share/doc/HTML/en/kfract/index.docbook
-share/doc/HTML/en/kfract/index.html
-share/doc/HTML/en/kfract/introduction.html
 share/doc/HTML/en/kfract/kfract.png
-share/doc/HTML/en/kfract/onscreenfundamentals.html
-share/doc/HTML/en/kfract/the-file-menu.html
-share/doc/HTML/en/kfract/the-help-menu.html
-share/doc/HTML/en/kfract/the-options-menu.html
-share/doc/HTML/en/kfract/the-toolbar.html
-share/doc/HTML/en/kfract/the-types-menu.html
-share/doc/HTML/en/kghostview/.anchors
-share/doc/HTML/en/kghostview/authors.html
 share/doc/HTML/en/kghostview/common
-share/doc/HTML/en/kghostview/configure-interpreter.html
-share/doc/HTML/en/kghostview/configure-key-bindings.html
-share/doc/HTML/en/kghostview/copyright.html
-share/doc/HTML/en/kghostview/dialogboxes.html
-share/doc/HTML/en/kghostview/epilogue.html
-share/doc/HTML/en/kghostview/fundamentals.html
-share/doc/HTML/en/kghostview/ghostscript-messages.html
-share/doc/HTML/en/kghostview/go-to-page.html
-share/doc/HTML/en/kghostview/go.html
-share/doc/HTML/en/kghostview/help.html
-share/doc/HTML/en/kghostview/index.cvlog
+share/doc/HTML/en/kghostview/index.cache.bz2
 share/doc/HTML/en/kghostview/index.docbook
-share/doc/HTML/en/kghostview/index.html
-share/doc/HTML/en/kghostview/info.html
-share/doc/HTML/en/kghostview/introduction.html
-share/doc/HTML/en/kghostview/options.html
-share/doc/HTML/en/kghostview/page-list.html
-share/doc/HTML/en/kghostview/primarymenuitems.html
-share/doc/HTML/en/kghostview/tool-bar.html
-share/doc/HTML/en/kghostview/tutorial.html
-share/doc/HTML/en/kghostview/view-control.html
-share/doc/HTML/en/kghostview/view.html
-share/doc/HTML/en/kiconedit/.anchors
 share/doc/HTML/en/kiconedit/common
-share/doc/HTML/en/kiconedit/compilation-and-installation.html
-share/doc/HTML/en/kiconedit/configuration.html
-share/doc/HTML/en/kiconedit/edit.html
-share/doc/HTML/en/kiconedit/grid.html
-share/doc/HTML/en/kiconedit/help.html
-share/doc/HTML/en/kiconedit/index.cvlog
+share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kiconedit/index.html
-share/doc/HTML/en/kiconedit/installation.html
-share/doc/HTML/en/kiconedit/introduction.html
-share/doc/HTML/en/kiconedit/onscreenfundamentals.html
-share/doc/HTML/en/kiconedit/options.html
-share/doc/HTML/en/kiconedit/requirements.html
-share/doc/HTML/en/kiconedit/statusbar.html
-share/doc/HTML/en/kiconedit/themenuentries.html
-share/doc/HTML/en/kiconedit/tools-toolbar.html
-share/doc/HTML/en/kiconedit/tools.html
-share/doc/HTML/en/kiconedit/view.html
-share/doc/HTML/en/kpaint/.anchors
-share/doc/HTML/en/kpaint/Technic.png
 share/doc/HTML/en/kpaint/common
-share/doc/HTML/en/kpaint/index.cvlog
+share/doc/HTML/en/kpaint/index.cache.bz2
 share/doc/HTML/en/kpaint/index.docbook
-share/doc/HTML/en/kpaint/index.html
-share/doc/HTML/en/kpaint/introductiongraphicfilereftechnicpnggraphic.html
-share/doc/HTML/en/kpaint/planned-features.html
-share/doc/HTML/en/ksnapshot/.anchors
-share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/kruler/common
+share/doc/HTML/en/kruler/index.cache.bz2
+share/doc/HTML/en/kruler/index.docbook
 share/doc/HTML/en/ksnapshot/common
-share/doc/HTML/en/ksnapshot/compilation-installation.html
-share/doc/HTML/en/ksnapshot/credits.html
+share/doc/HTML/en/ksnapshot/index.cache.bz2
 share/doc/HTML/en/ksnapshot/index.docbook
-share/doc/HTML/en/ksnapshot/index.html
-share/doc/HTML/en/ksnapshot/installation.html
-share/doc/HTML/en/ksnapshot/introduction.html
 share/doc/HTML/en/ksnapshot/preview.png
-share/doc/HTML/en/ksnapshot/requirements.html
-share/doc/HTML/en/ksnapshot/taking-snapshot.html
-share/doc/HTML/en/ksnapshot/using-ksapshot.html
 share/doc/HTML/en/ksnapshot/window.png
-share/doc/HTML/en/kview/.anchors
-share/doc/HTML/en/kview/cluttering-desktop.html
-share/doc/HTML/en/kview/command-line.html
-share/doc/HTML/en/kview/commands.html
 share/doc/HTML/en/kview/common
-share/doc/HTML/en/kview/credits.html
-share/doc/HTML/en/kview/desktop-menu.html
-share/doc/HTML/en/kview/edit-menu.html
-share/doc/HTML/en/kview/filter-menu.html
-share/doc/HTML/en/kview/help-menu.html
-share/doc/HTML/en/kview/images-menu.html
+share/doc/HTML/en/kview/index.cache.bz2
 share/doc/HTML/en/kview/index.docbook
-share/doc/HTML/en/kview/index.html
-share/doc/HTML/en/kview/installation.html
-share/doc/HTML/en/kview/introduction.html
-share/doc/HTML/en/kview/requirements.html
-share/doc/HTML/en/kview/sample-session.html
-share/doc/HTML/en/kview/selection.html
-share/doc/HTML/en/kview/settings-menu.html
 share/doc/HTML/en/kview/snapshot1.png
 share/doc/HTML/en/kview/snapshot2.png
 share/doc/HTML/en/kview/snapshot3.png
@@ -310,116 +180,57 @@ share/doc/HTML/en/kview/snapshot6.png
 share/doc/HTML/en/kview/snapshot7.png
 share/doc/HTML/en/kview/snapshot8.png
 share/doc/HTML/en/kview/snapshot9.png
-share/doc/HTML/en/kview/stirring-paste.html
-share/doc/HTML/en/kview/transform-menu.html
-share/doc/HTML/en/kview/view-menu.html
-share/doc/HTML/en/pixie/.anchors
-share/doc/HTML/en/pixie/clone.png
-share/doc/HTML/en/pixie/command-line-options.html
-share/doc/HTML/en/pixie/common
-share/doc/HTML/en/pixie/compilation.html
-share/doc/HTML/en/pixie/configure.html
-share/doc/HTML/en/pixie/copy-paste.png
-share/doc/HTML/en/pixie/credits.html
-share/doc/HTML/en/pixie/drag-and-drop.html
-share/doc/HTML/en/pixie/edit-advanced.html
-share/doc/HTML/en/pixie/edit-basics.html
-share/doc/HTML/en/pixie/effects.html
-share/doc/HTML/en/pixie/file.html
-share/doc/HTML/en/pixie/getting-started.html
-share/doc/HTML/en/pixie/help.html
-share/doc/HTML/en/pixie/hotlist.png
-share/doc/HTML/en/pixie/image-edit.png
-share/doc/HTML/en/pixie/image-size.png
-share/doc/HTML/en/pixie/ind-color-edit.png
-share/doc/HTML/en/pixie/index.docbook
-share/doc/HTML/en/pixie/index.html
-share/doc/HTML/en/pixie/installation.html
-share/doc/HTML/en/pixie/introduction.html
-share/doc/HTML/en/pixie/key-bindings.html
-share/doc/HTML/en/pixie/new-win.png
-share/doc/HTML/en/pixie/open-save-print.png
-share/doc/HTML/en/pixie/open.png
-share/doc/HTML/en/pixie/options.png
-share/doc/HTML/en/pixie/pixie.png
-share/doc/HTML/en/pixie/reload.png
-share/doc/HTML/en/pixie/requirements.html
-share/doc/HTML/en/pixie/scale.png
-share/doc/HTML/en/pixie/screenshot.png
-share/doc/HTML/en/pixie/sharp-bright.png
-share/doc/HTML/en/pixie/startup.png
-share/doc/HTML/en/pixie/stop.png
-share/doc/HTML/en/pixie/thumb-fm.png
-share/doc/HTML/en/pixie/thumbgen.png
-share/doc/HTML/en/pixie/thumbnails.png
-share/doc/HTML/en/pixie/thumbs-preview.png
-share/doc/HTML/en/pixie/thumbs-update.png
-share/doc/HTML/en/pixie/toggle.png
-share/doc/HTML/en/pixie/toolbar-menu-entries.html
-share/doc/HTML/en/pixie/windows.html
+share/icons/hicolor/16x16/actions/palette_color.png
+share/icons/hicolor/16x16/actions/palette_gray.png
+share/icons/hicolor/16x16/actions/palette_halftone.png
+share/icons/hicolor/16x16/actions/palette_lineart.png
+share/icons/hicolor/16x16/apps/kcoloredit.png
+share/icons/hicolor/16x16/apps/kdvi.png
+share/icons/hicolor/16x16/apps/kfax.png
+share/icons/hicolor/16x16/apps/kfract.png
+share/icons/hicolor/16x16/apps/kghostview.png
+share/icons/hicolor/16x16/apps/kiconedit.png
+share/icons/hicolor/16x16/apps/kpaint.png
 share/icons/hicolor/16x16/apps/kruler.png
+share/icons/hicolor/16x16/apps/ksnapshot.png
+share/icons/hicolor/16x16/apps/kview.png
+share/icons/hicolor/32x32/apps/kcoloredit.png
 share/icons/hicolor/32x32/apps/kdvi.png
 share/icons/hicolor/32x32/apps/kfax.png
 share/icons/hicolor/32x32/apps/kfract.png
 share/icons/hicolor/32x32/apps/kghostview.png
 share/icons/hicolor/32x32/apps/kiconedit.png
 share/icons/hicolor/32x32/apps/kpaint.png
-share/icons/hicolor/32x32/apps/kpixmap2bitmap.png
 share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
 share/icons/hicolor/32x32/apps/kview.png
-share/icons/hicolor/32x32/apps/pixie.png
 share/icons/hicolor/48x48/apps/kdvi.png
 share/icons/hicolor/48x48/apps/kfax.png
 share/icons/hicolor/48x48/apps/kfract.png
 share/icons/hicolor/48x48/apps/kghostview.png
 share/icons/hicolor/48x48/apps/kiconedit.png
 share/icons/hicolor/48x48/apps/kpaint.png
-share/icons/hicolor/48x48/apps/kpixmap2bitmap.png
 share/icons/hicolor/48x48/apps/kruler.png
 share/icons/hicolor/48x48/apps/ksnapshot.png
 share/icons/hicolor/48x48/apps/kview.png
-share/icons/hicolor/48x48/apps/pixie.png
-share/icons/locolor/16x16/apps/kdvi.png
-share/icons/locolor/16x16/apps/kfax.png
-share/icons/locolor/16x16/apps/kfract.png
-share/icons/locolor/16x16/apps/kghostview.png
-share/icons/locolor/16x16/apps/kiconedit.png
-share/icons/locolor/16x16/apps/kpaint.png
-share/icons/locolor/16x16/apps/kpixmap2bitmap.png
-share/icons/locolor/16x16/apps/kruler.png
-share/icons/locolor/16x16/apps/ksnapshot.png
-share/icons/locolor/16x16/apps/kview.png
-share/icons/locolor/16x16/apps/pixie.png
-share/icons/locolor/32x32/apps/kdvi.png
-share/icons/locolor/32x32/apps/kfax.png
-share/icons/locolor/32x32/apps/kfract.png
-share/icons/locolor/32x32/apps/kghostview.png
-share/icons/locolor/32x32/apps/kiconedit.png
-share/icons/locolor/32x32/apps/kpaint.png
-share/icons/locolor/32x32/apps/kpixmap2bitmap.png
-share/icons/locolor/32x32/apps/kruler.png
-share/icons/locolor/32x32/apps/ksnapshot.png
-share/icons/locolor/32x32/apps/kview.png
-share/icons/locolor/32x32/apps/pixie.png
+share/icons/locolor/16x16/apps/kcoloredit.png
+share/icons/locolor/32x32/apps/kcoloredit.png
+share/services/kamera.protocol
+share/services/scanservice.desktop
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/16x16/apps
-@dirrm share/doc/HTML/en/pixie
+@dirrm share/icons/hicolor/16x16/actions
 @dirrm share/doc/HTML/en/kview
 @dirrm share/doc/HTML/en/ksnapshot
+@dirrm share/doc/HTML/en/kruler
 @dirrm share/doc/HTML/en/kpaint
 @dirrm share/doc/HTML/en/kiconedit
 @dirrm share/doc/HTML/en/kghostview
 @dirrm share/doc/HTML/en/kfract
-@dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/en
-@dirrm share/apps/pixie/toolbar
-@dirrm share/apps/pixie/plugins
-@dirrm share/apps/pixie
 @dirrm share/apps/kviewshell
 @dirrm share/apps/kviewerpart
 @dirrm share/apps/kview/toolbar
@@ -427,6 +238,8 @@ share/icons/locolor/32x32/apps/pixie.png
 @dirrm share/apps/kruler
 @dirrm share/apps/kpaint/toolbar
 @dirrm share/apps/kpaint
+@dirrm share/apps/kooka/pics
+@dirrm share/apps/kooka
 @dirrm share/apps/kiconedit/toolbar
 @dirrm share/apps/kiconedit/pics
 @dirrm share/apps/kiconedit
@@ -437,5 +250,6 @@ share/icons/locolor/32x32/apps/pixie.png
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
 @dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/Settings/Peripherals
 @dirrm share/applnk/Graphics
-@dirrm include/mini-magick