Factor out all but one of the build switches of the KDE main module ports

into separate ports. The OPTIONS will remain as of yet and trigger dependencies
now, for easy transition.

Update KOffice to version 1.3.2.

Add patches to fix a number of issues, including:

- fix kxkb on Xorg
- fix kdemultimedia WITH_MPEGLIB (now mpeglib_artsplug) compilation on gcc 3.4.2
  with optimizations greater than -O

Add security related patches and entries to portaudit.txt.

34 files changed, 486 insertions, 344 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 40f40b4fd4a2..2ac2c7c8165b 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -199,6 +199,7 @@
     SUBDIR += k3d
     SUBDIR += kalbum
     SUBDIR += kallery
+    SUBDIR += kamera
     SUBDIR += kbarcode
     SUBDIR += kdc2tiff
     SUBDIR += kdegraphics3
@@ -208,6 +209,8 @@
     SUBDIR += kix-kmod
     SUBDIR += kludge3d
     SUBDIR += kolourpaint
+    SUBDIR += kooka
+    SUBDIR += kuickshow
     SUBDIR += landscape
     SUBDIR += lcms
     SUBDIR += leafpak
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
new file mode 100644
index 000000000000..ffe88592513a
--- /dev/null
+++ b/graphics/kamera-kde4/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	kamera
+# Date created:				July 09 2004
+# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kamera
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+PKGNAMEPREFIX=	kdegraphics-
+DISTNAME=	kdegraphics-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Digital camera support for KDE
+
+LIB_DEPENDS+=	gphoto2:${PORTSDIR}/graphics/libgphoto2
+
+CONFLICTS=	kdegraphics-3.1.* kdegraphics-3.2.[0-3]
+
+USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/kdegraphics-${PORTVERSION}
+
+pre-configure:
+	${ECHO_CMD} ${PORTNAME} doc > ${WRKSRC}/inst-apps
+	${REINPLACE_CMD} \
+	's|^SUBDIRS =.*${PORTNAME}.*$$|SUBDIRS =\. ${PORTNAME}|g' \
+		${WRKSRC}/doc/Makefile.in
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.mk>
diff --git a/graphics/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo
new file mode 100644
index 000000000000..a53ab49a4820
--- /dev/null
+++ b/graphics/kamera-kde4/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kdegraphics-3.2.3.tar.bz2) = af7092f2afc5a8565eb5017ecee6b67e
+SIZE (KDE/kdegraphics-3.2.3.tar.bz2) = 5676995
diff --git a/graphics/kamera-kde4/pkg-descr b/graphics/kamera-kde4/pkg-descr
new file mode 100644
index 000000000000..b37891651f55
--- /dev/null
+++ b/graphics/kamera-kde4/pkg-descr
@@ -0,0 +1,3 @@
+Kamera is an IO slave and a KControl panel module which allows you to access
+folders and images within any digital camera supported by the upcoming gPhoto2
+libraries. 
diff --git a/graphics/kdegraphics4/files/plist.gphoto2 b/graphics/kamera-kde4/pkg-plist
index e7dc2d50bd9b..42bfb7fab42f 100644
--- a/graphics/kdegraphics4/files/plist.gphoto2
+++ b/graphics/kamera-kde4/pkg-plist
@@ -3,9 +3,17 @@ lib/kde3/kcm_kamera.so
 lib/kde3/kio_kamera.la
 lib/kde3/kio_kamera.so
 share/applnk/Settings/Peripherals/kamera.desktop
+share/doc/HTML/en/kamera/common
+share/doc/HTML/en/kamera/index.cache.bz2
+share/doc/HTML/en/kamera/index.docbook
 share/icons/crystalsvg/16x16/actions/camera_test.png
 share/icons/crystalsvg/16x16/apps/camera.png
 share/icons/crystalsvg/16x16/devices/camera.png
 share/icons/crystalsvg/32x32/devices/camera.png
 share/icons/crystalsvg/32x32/filesystems/camera.png
 share/services/kamera.protocol
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/doc/HTML/en/kamera
+@dirrm share/applnk/Settings/Peripherals
+@dirrm share/applnk/Settings
+@dirrm share/applnk
diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
new file mode 100644
index 000000000000..ffe88592513a
--- /dev/null
+++ b/graphics/kamera/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	kamera
+# Date created:				July 09 2004
+# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kamera
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+PKGNAMEPREFIX=	kdegraphics-
+DISTNAME=	kdegraphics-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Digital camera support for KDE
+
+LIB_DEPENDS+=	gphoto2:${PORTSDIR}/graphics/libgphoto2
+
+CONFLICTS=	kdegraphics-3.1.* kdegraphics-3.2.[0-3]
+
+USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/kdegraphics-${PORTVERSION}
+
+pre-configure:
+	${ECHO_CMD} ${PORTNAME} doc > ${WRKSRC}/inst-apps
+	${REINPLACE_CMD} \
+	's|^SUBDIRS =.*${PORTNAME}.*$$|SUBDIRS =\. ${PORTNAME}|g' \
+		${WRKSRC}/doc/Makefile.in
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.mk>
diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo
new file mode 100644
index 000000000000..a53ab49a4820
--- /dev/null
+++ b/graphics/kamera/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kdegraphics-3.2.3.tar.bz2) = af7092f2afc5a8565eb5017ecee6b67e
+SIZE (KDE/kdegraphics-3.2.3.tar.bz2) = 5676995
diff --git a/graphics/kamera/pkg-descr b/graphics/kamera/pkg-descr
new file mode 100644
index 000000000000..b37891651f55
--- /dev/null
+++ b/graphics/kamera/pkg-descr
@@ -0,0 +1,3 @@
+Kamera is an IO slave and a KControl panel module which allows you to access
+folders and images within any digital camera supported by the upcoming gPhoto2
+libraries. 
diff --git a/graphics/kdegraphics3/files/plist.gphoto2 b/graphics/kamera/pkg-plist
index e7dc2d50bd9b..42bfb7fab42f 100644
--- a/graphics/kdegraphics3/files/plist.gphoto2
+++ b/graphics/kamera/pkg-plist
@@ -3,9 +3,17 @@ lib/kde3/kcm_kamera.so
 lib/kde3/kio_kamera.la
 lib/kde3/kio_kamera.so
 share/applnk/Settings/Peripherals/kamera.desktop
+share/doc/HTML/en/kamera/common
+share/doc/HTML/en/kamera/index.cache.bz2
+share/doc/HTML/en/kamera/index.docbook
 share/icons/crystalsvg/16x16/actions/camera_test.png
 share/icons/crystalsvg/16x16/apps/camera.png
 share/icons/crystalsvg/16x16/devices/camera.png
 share/icons/crystalsvg/32x32/devices/camera.png
 share/icons/crystalsvg/32x32/filesystems/camera.png
 share/services/kamera.protocol
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/doc/HTML/en/kamera
+@dirrm share/applnk/Settings/Peripherals
+@dirrm share/applnk/Settings
+@dirrm share/applnk
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 496f20050a5a..fc11ee62aafa 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -20,13 +21,12 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
 		fribidi:${PORTSDIR}/converters/fribidi \
-		lcms:${PORTSDIR}/graphics/lcms \
-		glut:${PORTSDIR}/graphics/libglut
+		glut:${PORTSDIR}/graphics/libglut \
+		lcms:${PORTSDIR}/graphics/lcms
 RUN_DEPENDS=	pdfinfo:${PORTSDIR}/graphics/xpdf
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
-KDE_BUILD_PLIST=yes
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -36,6 +36,7 @@ USE_GHOSTSCRIPT=yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+DO_NOT_COMPILE+=kooka kuickshow libkscan
 
 OPTIONS=	IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
 		GPHOTO2 "Enable support for digital cameras" off \
@@ -45,31 +46,28 @@ OPTIONS=	IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMLIB)
-USE_GNOME=	imlib
-PLIST_APPEND+=	plist.imlib
-CONFIGURE_ARGS+=--with-imlib-config=${X11BASE}/bin
+RUN_DEPENDS+=	kuickshow:${PORTSDIR}/graphics/kuickshow
 .elseif defined(WITHOUT_IMLIB)
-WITHOUT_IMLIB=	yes
 CONFIGURE_ARGS+=--without-imlib-config
 .endif
 
 .if defined(WITH_GPHOTO2)
-LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-PLIST_APPEND+=	plist.gphoto2
+RUN_DEPENDS+=	${LOCALBASE}/lib/kde3/kcm_kamera.la:${PORTSDIR}/graphics/kamera
 .elseif defined(WITHOUT_GPHOTO2)
 CONFIGURE_ARGS+=--without-kamera
 .endif
 
 .if defined(WITH_SANE)
-LIB_DEPENDS+=	sane.1:${PORTSDIR}/graphics/sane-backends
-PLIST_APPEND+=	plist.sane
-RUN_DEPENDS+=	${LOCALBASE}/bin/gocr:${PORTSDIR}/graphics/gocr
-.elseif defined(WITHOUT_SANE)
-DO_NOT_COMPILE+=kooka libkscan
+RUN_DEPENDS+=	kooka:${PORTSDIR}/graphics/kooka
 .endif
 
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
+pre-configure:
+	${REINPLACE_CMD} \
+	-E -e '/^SUBDIRS/s/(kamera|kooka|kuickshow)//g' \
+		${WRKSRC}/doc/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/graphics/kdegraphics3/files/plist.base.rm b/graphics/kdegraphics3/files/plist.base.rm
deleted file mode 100644
index 2e2f27ddfbf0..000000000000
--- a/graphics/kdegraphics3/files/plist.base.rm
+++ /dev/null
@@ -1,107 +0,0 @@
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services/kconfiguredialog
-@dirrm share/services
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kview
-@dirrm share/doc/HTML/en/kuickshow
-@dirrm share/doc/HTML/en/ksnapshot
-@dirrm share/doc/HTML/en/kruler
-@dirrm share/doc/HTML/en/kpovmodeler
-@dirrm share/doc/HTML/en/kpdf
-@dirrm share/doc/HTML/en/kpaint
-@dirrm share/doc/HTML/en/kooka
-@dirrm share/doc/HTML/en/kiconedit
-@dirrm share/doc/HTML/en/kghostview
-@dirrm share/doc/HTML/en/kgamma
-@dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/en/kcoloredit
-@dirrm share/doc/HTML/en/kamera
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/kviewviewer/kpartplugins
-@dirrm share/apps/kviewviewer
-@dirrm share/apps/kviewshell
-@dirrm share/apps/kviewerpart
-@dirrm share/apps/kview/kpartplugins
-@dirrm share/apps/kview
-@dirrm share/apps/ksvg
-@dirrm share/apps/kruler/sounds
-@dirrm share/apps/kruler/pics
-@dirrm share/apps/kruler
-@dirrm share/apps/kpovmodeler/icons/locolor/16x16/actions
-@dirrm share/apps/kpovmodeler/icons/locolor/16x16
-@dirrm share/apps/kpovmodeler/icons/locolor
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16
-@dirrm share/apps/kpovmodeler/icons/crystalsvg
-@dirrm share/apps/kpovmodeler/icons
-@dirrm share/apps/kpovmodeler/examples/scenes/objects
-@dirrm share/apps/kpovmodeler/examples/scenes/lights
-@dirrm share/apps/kpovmodeler/examples/scenes/interior
-@dirrm share/apps/kpovmodeler/examples/scenes/csg
-@dirrm share/apps/kpovmodeler/examples/scenes/advanced
-@dirrm share/apps/kpovmodeler/examples/scenes
-@dirrm share/apps/kpovmodeler/examples/includes/original
-@dirrm share/apps/kpovmodeler/examples/includes/inlined
-@dirrm share/apps/kpovmodeler/examples/includes
-@dirrm share/apps/kpovmodeler/examples
-@dirrm share/apps/kpovmodeler
-@dirrm share/apps/kpdfpart
-@dirrm share/apps/kpdf
-@dirrm share/apps/kpaint/toolbar
-@dirrm share/apps/kpaint
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/kiconedit/toolbar
-@dirrm share/apps/kiconedit/pics
-@dirrm share/apps/kiconedit
-@dirrm share/apps/kghostview
-@dirrm share/apps/kgamma/pics
-@dirrm share/apps/kgamma
-@dirrm share/apps/kfax/pics
-@dirrm share/apps/kfax
-@dirrm share/apps/kdvi/toolbar
-@dirrm share/apps/kdvi
-@dirrm share/apps/kcoloredit
-@dirrm share/apps
-@dirrm share/applnk/Graphics
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3
-@dirrm include/libtext2path-0.1
-@dirrm include/ksvg
-@dirrm include/dom
diff --git a/graphics/kdegraphics3/files/plist.gphoto2.rm b/graphics/kdegraphics3/files/plist.gphoto2.rm
deleted file mode 100644
index 38f836bd65ab..000000000000
--- a/graphics/kdegraphics3/files/plist.gphoto2.rm
+++ /dev/null
@@ -1,6 +0,0 @@
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings
diff --git a/graphics/kdegraphics3/files/plist.imlib.rm b/graphics/kdegraphics3/files/plist.imlib.rm
deleted file mode 100644
index dba2396df69e..000000000000
--- a/graphics/kdegraphics3/files/plist.imlib.rm
+++ /dev/null
@@ -1,2 +0,0 @@
-@dirrm share/apps/kuickshow/pics
-@dirrm share/apps/kuickshow
diff --git a/graphics/kdegraphics3/files/plist.sane.rm b/graphics/kdegraphics3/files/plist.sane.rm
deleted file mode 100644
index f75d6030d29b..000000000000
--- a/graphics/kdegraphics3/files/plist.sane.rm
+++ /dev/null
@@ -1,4 +0,0 @@
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/config
-@dirrm share/apps/kooka/pics
-@dirrm share/apps/kooka
diff --git a/graphics/kdegraphics3/files/plist.base b/graphics/kdegraphics3/pkg-plist
index 6e68b721cd34..c4ac456109f2 100644
--- a/graphics/kdegraphics3/files/plist.base
+++ b/graphics/kdegraphics3/pkg-plist
@@ -729,9 +729,6 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc
 share/apps/kviewviewer/kviewpopup.rc
 share/apps/kviewviewer/kviewviewer.rc
 share/apps/kviewviewer/kviewviewer_ro.rc
-share/doc/HTML/en/kamera/common
-share/doc/HTML/en/kamera/index.cache.bz2
-share/doc/HTML/en/kamera/index.docbook
 share/doc/HTML/en/kcoloredit/common
 share/doc/HTML/en/kcoloredit/index.cache.bz2
 share/doc/HTML/en/kcoloredit/index.docbook
@@ -755,18 +752,6 @@ share/doc/HTML/en/kghostview/index.docbook
 share/doc/HTML/en/kiconedit/common
 share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kooka/common
-share/doc/HTML/en/kooka/index.cache.bz2
-share/doc/HTML/en/kooka/index.docbook
-share/doc/HTML/en/kooka/kooka_gocr.png
-share/doc/HTML/en/kooka/kooka_gocr_result.png
-share/doc/HTML/en/kooka/kooka_mainctrl.png
-share/doc/HTML/en/kooka/ocr-select.png
-share/doc/HTML/en/kooka/shortcut0.png
-share/doc/HTML/en/kooka/shortcut1.png
-share/doc/HTML/en/kooka/toolbar.png
-share/doc/HTML/en/kooka/toolbar1.png
-share/doc/HTML/en/kooka/toolbar2.png
 share/doc/HTML/en/kpaint/common
 share/doc/HTML/en/kpaint/index.cache.bz2
 share/doc/HTML/en/kpaint/index.docbook
@@ -833,10 +818,6 @@ share/doc/HTML/en/ksnapshot/index.cache.bz2
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/preview.png
 share/doc/HTML/en/ksnapshot/window.png
-share/doc/HTML/en/kuickshow/common
-share/doc/HTML/en/kuickshow/index.cache.bz2
-share/doc/HTML/en/kuickshow/index.docbook
-share/doc/HTML/en/kuickshow/screenshot.png
 share/doc/HTML/en/kview/common
 share/doc/HTML/en/kview/index.cache.bz2
 share/doc/HTML/en/kview/index.docbook
@@ -926,3 +907,84 @@ share/services/svgthumbnail.desktop
 share/servicetypes/kimageviewer.desktop
 share/servicetypes/kimageviewercanvas.desktop
 share/servicetypes/ksvgrenderer.desktop
+@dirrm share/services/kconfiguredialog
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/doc/HTML/en/kview
+@dirrm share/doc/HTML/en/ksnapshot
+@dirrm share/doc/HTML/en/kruler
+@dirrm share/doc/HTML/en/kpovmodeler
+@dirrm share/doc/HTML/en/kpdf
+@dirrm share/doc/HTML/en/kpaint
+@dirrm share/doc/HTML/en/kiconedit
+@dirrm share/doc/HTML/en/kghostview
+@dirrm share/doc/HTML/en/kgamma
+@dirrm share/doc/HTML/en/kdvi
+@dirrm share/doc/HTML/en/kcoloredit
+@dirrm share/apps/kviewviewer/kpartplugins
+@dirrm share/apps/kviewviewer
+@dirrm share/apps/kviewshell
+@dirrm share/apps/kviewerpart
+@dirrm share/apps/kview/kpartplugins
+@dirrm share/apps/kview
+@dirrm share/apps/ksvg
+@dirrm share/apps/kruler/sounds
+@dirrm share/apps/kruler/pics
+@dirrm share/apps/kruler
+@dirrm share/apps/kpovmodeler/icons/locolor/16x16/actions
+@dirrm share/apps/kpovmodeler/icons/locolor/16x16
+@dirrm share/apps/kpovmodeler/icons/locolor
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16
+@dirrm share/apps/kpovmodeler/icons/crystalsvg
+@dirrm share/apps/kpovmodeler/icons
+@dirrm share/apps/kpovmodeler/examples/scenes/objects
+@dirrm share/apps/kpovmodeler/examples/scenes/lights
+@dirrm share/apps/kpovmodeler/examples/scenes/interior
+@dirrm share/apps/kpovmodeler/examples/scenes/csg
+@dirrm share/apps/kpovmodeler/examples/scenes/advanced
+@dirrm share/apps/kpovmodeler/examples/scenes
+@dirrm share/apps/kpovmodeler/examples/includes/original
+@dirrm share/apps/kpovmodeler/examples/includes/inlined
+@dirrm share/apps/kpovmodeler/examples/includes
+@dirrm share/apps/kpovmodeler/examples
+@dirrm share/apps/kpovmodeler
+@dirrm share/apps/kpdfpart
+@dirrm share/apps/kpdf
+@dirrm share/apps/kpaint/toolbar
+@dirrm share/apps/kpaint
+@dirrm share/apps/konqueror/servicemenus
+@dirrm share/apps/konqueror
+@dirrm share/apps/kiconedit/toolbar
+@dirrm share/apps/kiconedit/pics
+@dirrm share/apps/kiconedit
+@dirrm share/apps/kghostview
+@dirrm share/apps/kgamma/pics
+@dirrm share/apps/kgamma
+@dirrm share/apps/kfax/pics
+@dirrm share/apps/kfax
+@dirrm share/apps/kdvi/toolbar
+@dirrm share/apps/kdvi
+@dirrm share/apps/kcoloredit
+@dirrm share/applnk/Graphics
+@dirrm share/applnk/.hidden
+@dirrm share/applnk
+@dirrm include/libtext2path-0.1
+@dirrm include/ksvg
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 496f20050a5a..fc11ee62aafa 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -20,13 +21,12 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
 		fribidi:${PORTSDIR}/converters/fribidi \
-		lcms:${PORTSDIR}/graphics/lcms \
-		glut:${PORTSDIR}/graphics/libglut
+		glut:${PORTSDIR}/graphics/libglut \
+		lcms:${PORTSDIR}/graphics/lcms
 RUN_DEPENDS=	pdfinfo:${PORTSDIR}/graphics/xpdf
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
-KDE_BUILD_PLIST=yes
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -36,6 +36,7 @@ USE_GHOSTSCRIPT=yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+DO_NOT_COMPILE+=kooka kuickshow libkscan
 
 OPTIONS=	IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
 		GPHOTO2 "Enable support for digital cameras" off \
@@ -45,31 +46,28 @@ OPTIONS=	IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMLIB)
-USE_GNOME=	imlib
-PLIST_APPEND+=	plist.imlib
-CONFIGURE_ARGS+=--with-imlib-config=${X11BASE}/bin
+RUN_DEPENDS+=	kuickshow:${PORTSDIR}/graphics/kuickshow
 .elseif defined(WITHOUT_IMLIB)
-WITHOUT_IMLIB=	yes
 CONFIGURE_ARGS+=--without-imlib-config
 .endif
 
 .if defined(WITH_GPHOTO2)
-LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-PLIST_APPEND+=	plist.gphoto2
+RUN_DEPENDS+=	${LOCALBASE}/lib/kde3/kcm_kamera.la:${PORTSDIR}/graphics/kamera
 .elseif defined(WITHOUT_GPHOTO2)
 CONFIGURE_ARGS+=--without-kamera
 .endif
 
 .if defined(WITH_SANE)
-LIB_DEPENDS+=	sane.1:${PORTSDIR}/graphics/sane-backends
-PLIST_APPEND+=	plist.sane
-RUN_DEPENDS+=	${LOCALBASE}/bin/gocr:${PORTSDIR}/graphics/gocr
-.elseif defined(WITHOUT_SANE)
-DO_NOT_COMPILE+=kooka libkscan
+RUN_DEPENDS+=	kooka:${PORTSDIR}/graphics/kooka
 .endif
 
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
+pre-configure:
+	${REINPLACE_CMD} \
+	-E -e '/^SUBDIRS/s/(kamera|kooka|kuickshow)//g' \
+		${WRKSRC}/doc/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/graphics/kdegraphics4/files/plist.base.rm b/graphics/kdegraphics4/files/plist.base.rm
deleted file mode 100644
index 2e2f27ddfbf0..000000000000
--- a/graphics/kdegraphics4/files/plist.base.rm
+++ /dev/null
@@ -1,107 +0,0 @@
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services/kconfiguredialog
-@dirrm share/services
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kview
-@dirrm share/doc/HTML/en/kuickshow
-@dirrm share/doc/HTML/en/ksnapshot
-@dirrm share/doc/HTML/en/kruler
-@dirrm share/doc/HTML/en/kpovmodeler
-@dirrm share/doc/HTML/en/kpdf
-@dirrm share/doc/HTML/en/kpaint
-@dirrm share/doc/HTML/en/kooka
-@dirrm share/doc/HTML/en/kiconedit
-@dirrm share/doc/HTML/en/kghostview
-@dirrm share/doc/HTML/en/kgamma
-@dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/en/kcoloredit
-@dirrm share/doc/HTML/en/kamera
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/kviewviewer/kpartplugins
-@dirrm share/apps/kviewviewer
-@dirrm share/apps/kviewshell
-@dirrm share/apps/kviewerpart
-@dirrm share/apps/kview/kpartplugins
-@dirrm share/apps/kview
-@dirrm share/apps/ksvg
-@dirrm share/apps/kruler/sounds
-@dirrm share/apps/kruler/pics
-@dirrm share/apps/kruler
-@dirrm share/apps/kpovmodeler/icons/locolor/16x16/actions
-@dirrm share/apps/kpovmodeler/icons/locolor/16x16
-@dirrm share/apps/kpovmodeler/icons/locolor
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16
-@dirrm share/apps/kpovmodeler/icons/crystalsvg
-@dirrm share/apps/kpovmodeler/icons
-@dirrm share/apps/kpovmodeler/examples/scenes/objects
-@dirrm share/apps/kpovmodeler/examples/scenes/lights
-@dirrm share/apps/kpovmodeler/examples/scenes/interior
-@dirrm share/apps/kpovmodeler/examples/scenes/csg
-@dirrm share/apps/kpovmodeler/examples/scenes/advanced
-@dirrm share/apps/kpovmodeler/examples/scenes
-@dirrm share/apps/kpovmodeler/examples/includes/original
-@dirrm share/apps/kpovmodeler/examples/includes/inlined
-@dirrm share/apps/kpovmodeler/examples/includes
-@dirrm share/apps/kpovmodeler/examples
-@dirrm share/apps/kpovmodeler
-@dirrm share/apps/kpdfpart
-@dirrm share/apps/kpdf
-@dirrm share/apps/kpaint/toolbar
-@dirrm share/apps/kpaint
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/kiconedit/toolbar
-@dirrm share/apps/kiconedit/pics
-@dirrm share/apps/kiconedit
-@dirrm share/apps/kghostview
-@dirrm share/apps/kgamma/pics
-@dirrm share/apps/kgamma
-@dirrm share/apps/kfax/pics
-@dirrm share/apps/kfax
-@dirrm share/apps/kdvi/toolbar
-@dirrm share/apps/kdvi
-@dirrm share/apps/kcoloredit
-@dirrm share/apps
-@dirrm share/applnk/Graphics
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3
-@dirrm include/libtext2path-0.1
-@dirrm include/ksvg
-@dirrm include/dom
diff --git a/graphics/kdegraphics4/files/plist.gphoto2.rm b/graphics/kdegraphics4/files/plist.gphoto2.rm
deleted file mode 100644
index 38f836bd65ab..000000000000
--- a/graphics/kdegraphics4/files/plist.gphoto2.rm
+++ /dev/null
@@ -1,6 +0,0 @@
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings
diff --git a/graphics/kdegraphics4/files/plist.imlib.rm b/graphics/kdegraphics4/files/plist.imlib.rm
deleted file mode 100644
index dba2396df69e..000000000000
--- a/graphics/kdegraphics4/files/plist.imlib.rm
+++ /dev/null
@@ -1,2 +0,0 @@
-@dirrm share/apps/kuickshow/pics
-@dirrm share/apps/kuickshow
diff --git a/graphics/kdegraphics4/files/plist.sane b/graphics/kdegraphics4/files/plist.sane
deleted file mode 100644
index 6f4557e60204..000000000000
--- a/graphics/kdegraphics4/files/plist.sane
+++ /dev/null
@@ -1,40 +0,0 @@
-bin/kooka
-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
-include/sizeindicator.h
-lib/libkscan.la
-lib/libkscan.so
-lib/libkscan.so.1
-share/applications/kde/kooka.desktop
-share/apps/kooka/kookaui.rc
-share/apps/kooka/pics/gocr.png
-share/apps/kooka/pics/lockzoom.png
-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/ocrad.png
-share/apps/kooka/pics/scaleorig.png
-share/apps/kooka/pics/scaletoheight.png
-share/apps/kooka/pics/scaletowidth.png
-share/apps/kooka/pics/thumbviewtile.png
-share/config/kookarc
-share/icons/crystalsvg/16x16/actions/palette_color.png
-share/icons/crystalsvg/16x16/actions/palette_gray.png
-share/icons/crystalsvg/16x16/actions/palette_halftone.png
-share/icons/crystalsvg/16x16/actions/palette_lineart.png
-share/services/scanservice.desktop
diff --git a/graphics/kdegraphics4/files/plist.sane.rm b/graphics/kdegraphics4/files/plist.sane.rm
deleted file mode 100644
index f75d6030d29b..000000000000
--- a/graphics/kdegraphics4/files/plist.sane.rm
+++ /dev/null
@@ -1,4 +0,0 @@
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/config
-@dirrm share/apps/kooka/pics
-@dirrm share/apps/kooka
diff --git a/graphics/kdegraphics4/files/plist.base b/graphics/kdegraphics4/pkg-plist
index 6e68b721cd34..c4ac456109f2 100644
--- a/graphics/kdegraphics4/files/plist.base
+++ b/graphics/kdegraphics4/pkg-plist
@@ -729,9 +729,6 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc
 share/apps/kviewviewer/kviewpopup.rc
 share/apps/kviewviewer/kviewviewer.rc
 share/apps/kviewviewer/kviewviewer_ro.rc
-share/doc/HTML/en/kamera/common
-share/doc/HTML/en/kamera/index.cache.bz2
-share/doc/HTML/en/kamera/index.docbook
 share/doc/HTML/en/kcoloredit/common
 share/doc/HTML/en/kcoloredit/index.cache.bz2
 share/doc/HTML/en/kcoloredit/index.docbook
@@ -755,18 +752,6 @@ share/doc/HTML/en/kghostview/index.docbook
 share/doc/HTML/en/kiconedit/common
 share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kooka/common
-share/doc/HTML/en/kooka/index.cache.bz2
-share/doc/HTML/en/kooka/index.docbook
-share/doc/HTML/en/kooka/kooka_gocr.png
-share/doc/HTML/en/kooka/kooka_gocr_result.png
-share/doc/HTML/en/kooka/kooka_mainctrl.png
-share/doc/HTML/en/kooka/ocr-select.png
-share/doc/HTML/en/kooka/shortcut0.png
-share/doc/HTML/en/kooka/shortcut1.png
-share/doc/HTML/en/kooka/toolbar.png
-share/doc/HTML/en/kooka/toolbar1.png
-share/doc/HTML/en/kooka/toolbar2.png
 share/doc/HTML/en/kpaint/common
 share/doc/HTML/en/kpaint/index.cache.bz2
 share/doc/HTML/en/kpaint/index.docbook
@@ -833,10 +818,6 @@ share/doc/HTML/en/ksnapshot/index.cache.bz2
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/preview.png
 share/doc/HTML/en/ksnapshot/window.png
-share/doc/HTML/en/kuickshow/common
-share/doc/HTML/en/kuickshow/index.cache.bz2
-share/doc/HTML/en/kuickshow/index.docbook
-share/doc/HTML/en/kuickshow/screenshot.png
 share/doc/HTML/en/kview/common
 share/doc/HTML/en/kview/index.cache.bz2
 share/doc/HTML/en/kview/index.docbook
@@ -926,3 +907,84 @@ share/services/svgthumbnail.desktop
 share/servicetypes/kimageviewer.desktop
 share/servicetypes/kimageviewercanvas.desktop
 share/servicetypes/ksvgrenderer.desktop
+@dirrm share/services/kconfiguredialog
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/doc/HTML/en/kview
+@dirrm share/doc/HTML/en/ksnapshot
+@dirrm share/doc/HTML/en/kruler
+@dirrm share/doc/HTML/en/kpovmodeler
+@dirrm share/doc/HTML/en/kpdf
+@dirrm share/doc/HTML/en/kpaint
+@dirrm share/doc/HTML/en/kiconedit
+@dirrm share/doc/HTML/en/kghostview
+@dirrm share/doc/HTML/en/kgamma
+@dirrm share/doc/HTML/en/kdvi
+@dirrm share/doc/HTML/en/kcoloredit
+@dirrm share/apps/kviewviewer/kpartplugins
+@dirrm share/apps/kviewviewer
+@dirrm share/apps/kviewshell
+@dirrm share/apps/kviewerpart
+@dirrm share/apps/kview/kpartplugins
+@dirrm share/apps/kview
+@dirrm share/apps/ksvg
+@dirrm share/apps/kruler/sounds
+@dirrm share/apps/kruler/pics
+@dirrm share/apps/kruler
+@dirrm share/apps/kpovmodeler/icons/locolor/16x16/actions
+@dirrm share/apps/kpovmodeler/icons/locolor/16x16
+@dirrm share/apps/kpovmodeler/icons/locolor
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16
+@dirrm share/apps/kpovmodeler/icons/crystalsvg
+@dirrm share/apps/kpovmodeler/icons
+@dirrm share/apps/kpovmodeler/examples/scenes/objects
+@dirrm share/apps/kpovmodeler/examples/scenes/lights
+@dirrm share/apps/kpovmodeler/examples/scenes/interior
+@dirrm share/apps/kpovmodeler/examples/scenes/csg
+@dirrm share/apps/kpovmodeler/examples/scenes/advanced
+@dirrm share/apps/kpovmodeler/examples/scenes
+@dirrm share/apps/kpovmodeler/examples/includes/original
+@dirrm share/apps/kpovmodeler/examples/includes/inlined
+@dirrm share/apps/kpovmodeler/examples/includes
+@dirrm share/apps/kpovmodeler/examples
+@dirrm share/apps/kpovmodeler
+@dirrm share/apps/kpdfpart
+@dirrm share/apps/kpdf
+@dirrm share/apps/kpaint/toolbar
+@dirrm share/apps/kpaint
+@dirrm share/apps/konqueror/servicemenus
+@dirrm share/apps/konqueror
+@dirrm share/apps/kiconedit/toolbar
+@dirrm share/apps/kiconedit/pics
+@dirrm share/apps/kiconedit
+@dirrm share/apps/kghostview
+@dirrm share/apps/kgamma/pics
+@dirrm share/apps/kgamma
+@dirrm share/apps/kfax/pics
+@dirrm share/apps/kfax
+@dirrm share/apps/kdvi/toolbar
+@dirrm share/apps/kdvi
+@dirrm share/apps/kcoloredit
+@dirrm share/applnk/Graphics
+@dirrm share/applnk/.hidden
+@dirrm share/applnk
+@dirrm include/libtext2path-0.1
+@dirrm include/ksvg
diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile
new file mode 100644
index 000000000000..46c5f5fdff35
--- /dev/null
+++ b/graphics/kooka/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	kooka
+# Date created:				July 09 2004
+# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kooka
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+PKGNAMEPREFIX=	kdegraphics-
+DISTNAME=	kdegraphics-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Raster image scan program for KDE
+
+LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends
+RUN_DEPENDS=	${LOCALBASE}/bin/gocr:${PORTSDIR}/graphics/gocr
+
+CONFLICTS=	kdegraphics-3.1.* kdegraphics-3.2.[0-3]
+
+USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/kdegraphics-${PORTVERSION}
+INSTALLS_SHLIB=	yes
+
+pre-configure:
+	${ECHO_CMD} libkscan ${PORTNAME} doc > ${WRKSRC}/inst-apps
+	${REINPLACE_CMD} \
+	's|^SUBDIRS =.*${PORTNAME}.*$$|SUBDIRS =\. ${PORTNAME}|g' \
+		${WRKSRC}/doc/Makefile.in
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.mk>
diff --git a/graphics/kooka/distinfo b/graphics/kooka/distinfo
new file mode 100644
index 000000000000..a53ab49a4820
--- /dev/null
+++ b/graphics/kooka/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kdegraphics-3.2.3.tar.bz2) = af7092f2afc5a8565eb5017ecee6b67e
+SIZE (KDE/kdegraphics-3.2.3.tar.bz2) = 5676995
diff --git a/graphics/kooka/pkg-descr b/graphics/kooka/pkg-descr
new file mode 100644
index 000000000000..f3f3d8c8cb39
--- /dev/null
+++ b/graphics/kooka/pkg-descr
@@ -0,0 +1,11 @@
+Kooka is an intuitive, easy to use open source GNU/Linux scan program
+which is released under the GNU General Public License with exceptions.
+
+Kooka is the scan application of choice for the KDE project and
+thus it is official part of the KDE Graphics Package.
+
+Kooka helps you to handle the most important scan parameters, find
+the correct image file format to save and manage your scanned images.
+It offers support for different OCR modules. Libkscan, a autonomous
+part of Kooka, provides a scan service for easy and consistent use
+to all KDE applications.
diff --git a/graphics/kdegraphics3/files/plist.sane b/graphics/kooka/pkg-plist
index 6f4557e60204..907d6cf5dd4d 100644
--- a/graphics/kdegraphics3/files/plist.sane
+++ b/graphics/kooka/pkg-plist
@@ -33,8 +33,23 @@ share/apps/kooka/pics/scaletoheight.png
 share/apps/kooka/pics/scaletowidth.png
 share/apps/kooka/pics/thumbviewtile.png
 share/config/kookarc
+share/doc/HTML/en/kooka/common
+share/doc/HTML/en/kooka/index.cache.bz2
+share/doc/HTML/en/kooka/index.docbook
+share/doc/HTML/en/kooka/kooka_gocr.png
+share/doc/HTML/en/kooka/kooka_gocr_result.png
+share/doc/HTML/en/kooka/kooka_mainctrl.png
+share/doc/HTML/en/kooka/ocr-select.png
+share/doc/HTML/en/kooka/shortcut0.png
+share/doc/HTML/en/kooka/shortcut1.png
+share/doc/HTML/en/kooka/toolbar.png
+share/doc/HTML/en/kooka/toolbar1.png
+share/doc/HTML/en/kooka/toolbar2.png
 share/icons/crystalsvg/16x16/actions/palette_color.png
 share/icons/crystalsvg/16x16/actions/palette_gray.png
 share/icons/crystalsvg/16x16/actions/palette_halftone.png
 share/icons/crystalsvg/16x16/actions/palette_lineart.png
 share/services/scanservice.desktop
+@dirrm share/doc/HTML/en/kooka
+@dirrm share/apps/kooka/pics
+@dirrm share/apps/kooka
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
new file mode 100644
index 000000000000..9db1682b7a85
--- /dev/null
+++ b/graphics/kuickshow-kde4/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	kuickshow
+# Date created:				July 09 2004
+# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kuickshow
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+PKGNAMEPREFIX=	kdegraphics-
+DISTNAME=	kdegraphics-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE image viewer
+
+CONFLICTS=	kdegraphics-3.1.* kdegraphics-3.2.[0-3]
+
+USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/kdegraphics-${PORTVERSION}
+INSTALLS_SHLIB=	yes
+
+USE_GNOME=	imlib
+
+pre-configure:
+	${ECHO_CMD} ${PORTNAME} doc > ${WRKSRC}/inst-apps
+	${REINPLACE_CMD} \
+	's|^SUBDIRS =.*${PORTNAME}.*$$|SUBDIRS =\. ${PORTNAME}|g' \
+		${WRKSRC}/doc/Makefile.in
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.mk>
diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo
new file mode 100644
index 000000000000..a53ab49a4820
--- /dev/null
+++ b/graphics/kuickshow-kde4/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kdegraphics-3.2.3.tar.bz2) = af7092f2afc5a8565eb5017ecee6b67e
+SIZE (KDE/kdegraphics-3.2.3.tar.bz2) = 5676995
diff --git a/graphics/kuickshow-kde4/pkg-descr b/graphics/kuickshow-kde4/pkg-descr
new file mode 100644
index 000000000000..125ad6e90d7e
--- /dev/null
+++ b/graphics/kuickshow-kde4/pkg-descr
@@ -0,0 +1,6 @@
+KuickShow is an image browser/viewer with a nice filebrowser to
+select images to be shown, slideshow support and the ability to
+display the following image formats: jpg, gif, tiff, png, bmp, psd,
+xpm, xbm, pbm and eim. Images can be displayed either in their own
+window, as large as the image, or fullscreen (which shrinks images
+too large to display).  KuickShow also has a slideshow mode.
diff --git a/graphics/kdegraphics3/files/plist.imlib b/graphics/kuickshow-kde4/pkg-plist
index 4a85b7b67e47..c12a14183df8 100644
--- a/graphics/kdegraphics3/files/plist.imlib
+++ b/graphics/kuickshow-kde4/pkg-plist
@@ -14,7 +14,21 @@ share/apps/kuickshow/pics/ksslide.png
 share/apps/kuickshow/pics/kuickshow-day.jpg
 share/apps/kuickshow/pics/kuickshow-night.jpg
 share/apps/kuickshow/pics/logo.png
+share/doc/HTML/en/kuickshow/common
+share/doc/HTML/en/kuickshow/index.cache.bz2
+share/doc/HTML/en/kuickshow/index.docbook
+share/doc/HTML/en/kuickshow/screenshot.png
 share/icons/crystalsvg/16x16/apps/kuickshow.png
 share/icons/crystalsvg/32x32/apps/kuickshow.png
 share/icons/locolor/16x16/apps/kuickshow.png
 share/icons/locolor/32x32/apps/kuickshow.png
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/doc/HTML/en/kuickshow
+@dirrm share/apps/kuickshow/pics
+@dirrm share/apps/kuickshow
diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile
new file mode 100644
index 000000000000..9db1682b7a85
--- /dev/null
+++ b/graphics/kuickshow/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	kuickshow
+# Date created:				July 09 2004
+# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kuickshow
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+PKGNAMEPREFIX=	kdegraphics-
+DISTNAME=	kdegraphics-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE image viewer
+
+CONFLICTS=	kdegraphics-3.1.* kdegraphics-3.2.[0-3]
+
+USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/kdegraphics-${PORTVERSION}
+INSTALLS_SHLIB=	yes
+
+USE_GNOME=	imlib
+
+pre-configure:
+	${ECHO_CMD} ${PORTNAME} doc > ${WRKSRC}/inst-apps
+	${REINPLACE_CMD} \
+	's|^SUBDIRS =.*${PORTNAME}.*$$|SUBDIRS =\. ${PORTNAME}|g' \
+		${WRKSRC}/doc/Makefile.in
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.mk>
diff --git a/graphics/kuickshow/distinfo b/graphics/kuickshow/distinfo
new file mode 100644
index 000000000000..a53ab49a4820
--- /dev/null
+++ b/graphics/kuickshow/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kdegraphics-3.2.3.tar.bz2) = af7092f2afc5a8565eb5017ecee6b67e
+SIZE (KDE/kdegraphics-3.2.3.tar.bz2) = 5676995
diff --git a/graphics/kuickshow/pkg-descr b/graphics/kuickshow/pkg-descr
new file mode 100644
index 000000000000..125ad6e90d7e
--- /dev/null
+++ b/graphics/kuickshow/pkg-descr
@@ -0,0 +1,6 @@
+KuickShow is an image browser/viewer with a nice filebrowser to
+select images to be shown, slideshow support and the ability to
+display the following image formats: jpg, gif, tiff, png, bmp, psd,
+xpm, xbm, pbm and eim. Images can be displayed either in their own
+window, as large as the image, or fullscreen (which shrinks images
+too large to display).  KuickShow also has a slideshow mode.
diff --git a/graphics/kdegraphics4/files/plist.imlib b/graphics/kuickshow/pkg-plist
index 4a85b7b67e47..c12a14183df8 100644
--- a/graphics/kdegraphics4/files/plist.imlib
+++ b/graphics/kuickshow/pkg-plist
@@ -14,7 +14,21 @@ share/apps/kuickshow/pics/ksslide.png
 share/apps/kuickshow/pics/kuickshow-day.jpg
 share/apps/kuickshow/pics/kuickshow-night.jpg
 share/apps/kuickshow/pics/logo.png
+share/doc/HTML/en/kuickshow/common
+share/doc/HTML/en/kuickshow/index.cache.bz2
+share/doc/HTML/en/kuickshow/index.docbook
+share/doc/HTML/en/kuickshow/screenshot.png
 share/icons/crystalsvg/16x16/apps/kuickshow.png
 share/icons/crystalsvg/32x32/apps/kuickshow.png
 share/icons/locolor/16x16/apps/kuickshow.png
 share/icons/locolor/32x32/apps/kuickshow.png
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/doc/HTML/en/kuickshow
+@dirrm share/apps/kuickshow/pics
+@dirrm share/apps/kuickshow