diff --git a/x11/kde/Makefile.inc b/x11/kde/Makefile.inc
index 0eac01dd461..2d4533f7144 100644
--- a/x11/kde/Makefile.inc
+++ b/x11/kde/Makefile.inc
@@ -1,56 +1,52 @@
-# $OpenBSD: Makefile.inc,v 1.39 2008/01/04 17:48:38 espie Exp $
-DIST_SUBDIR?=	kde
-HOMEPAGE?=	http://www.kde.org
-.if defined(VERSION) && ${VERSION} == "3.1.95"
-MASTER_SITES?=	${MASTER_SITE_KDE:S@$@unstable/${VERSION}/src/@}
-.elif defined(VERSION) && ${VERSION} == "3.2.0"
-MASTER_SITES?=	${MASTER_SITE_KDE:S@$@stable/3.2/src/@}
-.elif defined(VERSION) && ${VERSION} == "3.3.0"
-MASTER_SITES?=	${MASTER_SITE_KDE:S@$@stable/3.3/src/@}
-.elif defined(VERSION) && ${VERSION} == "3.4.0"
-MASTER_SITES?=	${MASTER_SITE_KDE:S@$@stable/3.4/src/@}
-.elif defined(VERSION) && ${VERSION} == "3.5.0"
-MASTER_SITES?=	${MASTER_SITE_KDE:S@$@stable/3.5/src/@}
-.else
-MASTER_SITES?=	${MASTER_SITE_KDE:S@$@stable/${VERSION}/src/@}
-.endif
-EXTRACT_SUFX?=	.tar.bz2
-MASTER_SITES0=	${MASTER_SITE_KDE:=security_patches/}
+# $OpenBSD: Makefile.inc,v 1.40 2010/07/08 21:28:48 espie Exp $
+DIST_SUBDIR ?=	kde
+HOMEPAGE ?=	http://www.kde.org
+
+MASTER_SITES ?=	${MASTER_SITE_KDE:S@$@stable/${VERSION}/src/@}
+EXTRACT_SUFX ?=	.tar.bz2
+MASTER_SITES0 =	${MASTER_SITE_KDE:=security_patches/}
 
 # Parts of kde want shared libraries to work, as some symbols are
 # duplicated over the place.
-NOT_FOR_ARCHS?=	${NO_SHARED_ARCHS}
-SHARED_ONLY=Yes
-MODKDE_VERSION?=	3.1
-MODULES?=	x11/kde
+NOT_FOR_ARCHS ?=	${NO_SHARED_ARCHS}
+SHARED_ONLY =		Yes
+MODKDE_VERSION ?=	3.1
+MODULES ?=		x11/kde
 
-MODGNU_CONFIG_GUESS_DIRS?=	${MODKDE_CONFIG_GUESS_DIRS}
+MODGNU_CONFIG_GUESS_DIR	?=	${MODKDE_CONFIG_GUESS_DIRS}
 
-CONFIGURE_STYLE?=	autoconf
+CONFIGURE_STYLE ?=	autoconf
 .if defined(MODKDE_VERSION)
-.  if (${MODKDE_VERSION} == "3.2.3" || ${MODKDE_VERSION} == "3.3.0" || ${MODKDE_VERSION} == "3.4" || ${MODKDE_VERSION} == "3.5" || ${MODKDE_VERSION} == "3.5.2" || ${MODKDE_VERSION} == "3.5.3")
-AUTOCONF_VERSION?=	2.59
+.  if ${MODKDE_VERSION} == "3.5.7"
+AUTOCONF_VERSION ?=	2.60
 .  endif
-.  if (${MODKDE_VERSION} == "3.5.7")
-AUTOCONF_VERSION?=	2.60
-.  endif
-.  if (${MODKDE_VERSION} == "3.5.8")
-AUTOCONF_VERSION?=	2.61
+.  if ${MODKDE_VERSION} == "3.5.8"
+AUTOCONF_VERSION ?=	2.61
 .  endif
 .endif
-AUTOCONF_VERSION?=	2.57
-CONFIGURE_ARGS+=	${MODKDE_CONFIGURE_ARGS}
-USE_GMAKE?=		Yes
+AUTOCONF_VERSION ?=	2.57
+CONFIGURE_ARGS +=	${MODKDE_CONFIGURE_ARGS}
+USE_GMAKE ?=		Yes
 
-PORTHOME?=${WRKDIR}
+PORTHOME ?=		${WRKDIR}
 
-CONFIGURE_ENV+=		${MODKDE_CONFIGURE_ENV}
-MAKE_ENV=		${CONFIGURE_ENV}
+CONFIGURE_ENV +=	${MODKDE_CONFIGURE_ENV}
+MAKE_ENV =		${CONFIGURE_ENV}
 
-MAKE_FLAGS+=		${MODKDE_MAKE_FLAGS}
-FAKE_FLAGS?=		TAR=tar 
+MAKE_FLAGS +=		${MODKDE_MAKE_FLAGS}
+FAKE_FLAGS ?=		TAR=tar 
 # GPL
-PERMIT_DISTFILES_CDROM?=	Yes
-PERMIT_DISTFILES_FTP?=		Yes
-PERMIT_PACKAGE_CDROM?=		Yes
-PERMIT_PACKAGE_FTP?=		Yes
+PERMIT_DISTFILES_CDROM ?=	Yes
+PERMIT_DISTFILES_FTP ?=		Yes
+PERMIT_PACKAGE_CDROM ?=		Yes
+PERMIT_PACKAGE_FTP ?=		Yes
+
+# let's do a sweet little dance for kde4's libs
+post_install_libs = mkdir -p ${PREFIX}/lib/kde3; cd ${PREFIX}/lib/kde3
+.for l v in ${SHARED_LIBS}
+post_install_libs += ;test -e ../lib$l.so.$v && ln -sf ../lib$l.so.$v lib$l.so.$v
+.endfor
+.if !target(post-install)
+post-install:
+	@${post_install_libs}
+.endif
diff --git a/x11/kde/accessibility3/Makefile b/x11/kde/accessibility3/Makefile
index 3d7f0c34f4d..7b12c004b9e 100644
--- a/x11/kde/accessibility3/Makefile
+++ b/x11/kde/accessibility3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.38 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2010/07/08 21:28:48 espie Exp $
 
 COMMENT = 		X11 toolkit, accessibility aids
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdeaccessibility-${VERSION}
-PKGNAME =		${DISTNAME}p5
+PKGNAME =		${DISTNAME}p6
 MODKDE_VERSION ?=	3.5.8
 SHARED_LIBS +=	KTTSD_Lib            1.0      # .0.1
 SHARED_LIBS +=	kttsd                2.0      # .1.0
@@ -12,18 +12,24 @@ SHARED_LIBS +=	kttsd                2.0      # .1.0
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS =	kdecore.>=6,kresources,kwalletclient,ktexteditor,vcard,kabc,kutils,DCOP,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kspell,artskde::x11/kde/libs3 
+LIB_DEPENDS =	::x11/kde/libs3 
 
 FLAVORS =	debug
 
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xrender Xtst art_lgpl_2 c jpeg \
-		m png pthread stdc++ util z ogg \
-		vorbisenc artsflow_idl audiofile mad \
-		vorbisfile qtmcop gmodule-2.0 gthread-2.0 \
-		glib-2.0 soundserver_idl sndio \
-		kmedia2_idl artsflow vorbis mcop idn \
-		Xau Xdmcp fam rpcsvc pcre pthread-stubs xcb
+WANTLIB = ICE SM X11 Xau Xdmcp Xext Xi Xrender Xtst art_lgpl_2 artsflow \
+	artsflow_idl audiofile c fam glib-2.0 gmodule-2.0 gthread-2.0 idn jpeg \
+	kmedia2_idl lib/kde3/DCOP lib/kde3/artskde lib/kde3/kabc \
+	lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/kio lib/kde3/kparts lib/kde3/kresources \
+	lib/kde3/kspell lib/kde3/ktexteditor lib/kde3/kutils \
+	lib/kde3/kwalletclient lib/kde3/vcard m mad mcop ogg pcre png pthread \
+	pthread-stubs qtmcop sndio soundserver_idl stdc++ util vorbis \
+	vorbisenc vorbisfile xcb z
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/accessibility3/pkg/PLIST b/x11/kde/accessibility3/pkg/PLIST
index 0df540c6aa2..83a06a54121 100644
--- a/x11/kde/accessibility3/pkg/PLIST
+++ b/x11/kde/accessibility3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2010/07/08 21:28:48 espie Exp $
 @bin bin/kmag
 @bin bin/kmousetool
 @bin bin/kmouth
@@ -12,6 +12,8 @@ ${KDE}/kcm_kttsd.la
 ${KDE}/kcm_kttsd.so
 ${KDE}/ktexteditor_kttsd.la
 ${KDE}/ktexteditor_kttsd.so
+@lib ${KDE}/libKTTSD_Lib.so.${LIBKTTSD_Lib_VERSION}
+@lib ${KDE}/libkttsd.so.${LIBkttsd_VERSION}
 ${KDE}/libkttsd_artsplugin.la
 ${KDE}/libkttsd_artsplugin.so
 ${KDE}/libkttsd_commandplugin.la
diff --git a/x11/kde/addons3/Makefile b/x11/kde/addons3/Makefile
index 396b82bcc42..d2f9f915d2a 100644
--- a/x11/kde/addons3/Makefile
+++ b/x11/kde/addons3/Makefile
@@ -1,35 +1,48 @@
-# $OpenBSD: Makefile,v 1.58 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2010/07/08 21:28:48 espie Exp $
 
 COMMENT =		K Desktop Environment, addons
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdeaddons-${VERSION}
-PKGNAME =		${DISTNAME}p5
+PKGNAME =		${DISTNAME}p6
 MODKDE_VERSION =	3.5.8
 
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = 	kdecore.>=6,kdnssd,knewstuff,DCOP,artskde,kabc,katepartinterfaces,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kmediaplayer,kparts,kresources,ktexteditor,kutils,kwalletclient,vcard::x11/kde/libs3 \
-		SDL.>=1:sdl-*-!no_x11:devel/sdl \
-		artsbuilder,artsgui,artsgui_idl,artsgui_kde,artsmidi_idl,artsmodules,artsmodulescommon,artsmoduleseffects,artsmodulesmixers,artsmodulessynth,noatun,noatuncontrols,noatuntags::x11/kde/multimedia3 \
-		atlantic,atlantikui,kdegames::x11/kde/games3 \
-		kateinterfaces,kateutils,konq,konqsidebarplugin::x11/kde/base3 \
-		kabinterfaces::x11/kde/pim3 \
-		gdk,gtk::x11/gtk+ \
-		xmms::audio/xmms \
-		lib/db4/db_cxx:db->=4,<5:databases/db/v4
+LIB_DEPENDS = 	::x11/kde/libs3 \
+		:sdl-*-!no_x11:devel/sdl \
+		::x11/kde/multimedia3 \
+		::x11/kde/games3 \
+		::x11/kde/base3 \
+		::x11/kde/pim3 \
+		::x11/gtk+ \
+		::audio/xmms \
+		:db->=4,<5:databases/db/v4
 
 # XXX no version number on noatunarts
 #WANTLIB+=	noatunarts 
 
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xi Xrender art_lgpl_2 artsflow artsflow_idl \
-		audiofile c glib glib-2.0 gmodule gmodule-2.0 \
-		jpeg kimproxy kmedia2_idl m mad mcop ogg \
-		pcre pcreposix png pthread qtmcop sndio soundserver_idl \
-		stdc++ usbhid util vorbis vorbisenc vorbisfile z \
-		gthread-2.0 idn Xau Xdmcp fam rpcsvc Xrandr pthread-stubs xcb
+WANTLIB = ICE SDL.>=1 SM X11 Xau Xdmcp Xext Xi Xrandr Xrender art_lgpl_2 \
+	artsflow artsflow_idl audiofile c fam gdk glib glib-2.0 gmodule \
+	gmodule-2.0 gthread-2.0 gtk idn jpeg kimproxy kmedia2_idl \
+	lib/db4/db_cxx lib/kde3/DCOP lib/kde3/artsbuilder lib/kde3/artsgui \
+	lib/kde3/artsgui_idl lib/kde3/artsgui_kde lib/kde3/artskde \
+	lib/kde3/artsmidi_idl lib/kde3/artsmodules lib/kde3/artsmodulescommon \
+	lib/kde3/artsmoduleseffects lib/kde3/artsmodulesmixers \
+	lib/kde3/artsmodulessynth lib/kde3/atlantic lib/kde3/atlantikui \
+	lib/kde3/kabc lib/kde3/kabinterfaces lib/kde3/kateinterfaces \
+	lib/kde3/katepartinterfaces lib/kde3/kateutils lib/kde3/kdecore.>=6 \
+	lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui \
+	lib/kde3/kdnssd lib/kde3/khtml lib/kde3/kio lib/kde3/kjs \
+	lib/kde3/kmediaplayer lib/kde3/knewstuff lib/kde3/konq \
+	lib/kde3/konqsidebarplugin lib/kde3/kparts lib/kde3/kresources \
+	lib/kde3/ktexteditor lib/kde3/kutils lib/kde3/kwalletclient \
+	lib/kde3/noatun lib/kde3/noatuncontrols lib/kde3/noatuntags \
+	lib/kde3/vcard m mad mcop ogg pcre pcreposix png pthread pthread-stubs \
+	qtmcop rpcsvc sndio soundserver_idl stdc++ usbhid util vorbis \
+	vorbisenc vorbisfile xcb xmms z
 
 .include <bsd.port.mk>
diff --git a/x11/kde/admin3/Makefile b/x11/kde/admin3/Makefile
index 83130ba58ac..3284dd808dd 100644
--- a/x11/kde/admin3/Makefile
+++ b/x11/kde/admin3/Makefile
@@ -1,22 +1,28 @@
-# $OpenBSD: Makefile,v 1.33 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2010/07/08 21:28:48 espie Exp $
 
 COMMENT = 		K Desktop Environment, admin tools
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdeadmin-${VERSION}
-PKGNAME =		${DISTNAME}p3
+PKGNAME =		${DISTNAME}p4
 MODKDE_VERSION ?=	3.5.8
 
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS =	DCOP,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kntlm::x11/kde/libs3
+LIB_DEPENDS =	::x11/kde/libs3
 FLAVORS =	debug
 
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 c jpeg kabc kresources \
-		kwalletclient m png pthread stdc++ util vcard z idn \
-		Xau Xdmcp fam rpcsvc pthread-stubs xcb
+WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam idn jpeg kabc \
+	kresources kwalletclient lib/kde3/DCOP lib/kde3/kdecore.>=6 \
+	lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui \
+	lib/kde3/kio lib/kde3/kntlm lib/kde3/kparts m png pthread \
+	pthread-stubs stdc++ util vcard xcb z
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile
index 6cbc89ea513..843263a3601 100644
--- a/x11/kde/arts3/Makefile
+++ b/x11/kde/arts3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.70 2009/08/27 19:44:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.71 2010/07/08 21:28:48 espie Exp $
 
 COMMENT =		K Desktop Environment, aRTs
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		arts-1.5.10
-MODKDE_VERSION ?=	3.5.8
-PKGNAME =		${DISTNAME}p2
+MODKDE_VERSION =	3.5.8
+PKGNAME =		${DISTNAME}p3
 
 SHARED_LIBS +=	mcop                 2.0      # .1.0
 SHARED_LIBS +=	artsflow_idl         2.0      # .1.0
@@ -26,11 +26,11 @@ SHARED_LIBS +=	x11globalcomm        2.0      # .1.0
 
 MODULES =	x11/kde devel/gettext
 
-LIB_DEPENDS = 	audiofile::devel/libaudiofile \
-		glib-2.0,gmodule-2.0,gthread-2.0::devel/glib2 \
-		vorbis,vorbisfile::audio/libvorbis \
-		ogg::audio/libogg \
-		mad::audio/libmad
+LIB_DEPENDS = 	::devel/libaudiofile \
+		::devel/glib2 \
+		::audio/libvorbis \
+		::audio/libogg \
+		::audio/libmad
 
 SEPARATE_BUILD =	flavored
 
@@ -39,9 +39,9 @@ CONFIGURE_ARGS +=	${ENABLE_SHARED} \
 			--without-jack \
 			--without-esd
 
-WANTLIB =	ICE SM X11 Xext c jpeg m png pthread \
-		sndio stdc++ vorbisenc z Xau Xdmcp pcre \
-		pthread-stubs xcb
+WANTLIB = ICE SM X11 Xau Xdmcp Xext audiofile c glib-2.0 gmodule-2.0 \
+	gthread-2.0 jpeg m mad ogg pcre png pthread pthread-stubs sndio stdc++ \
+	vorbis vorbisenc vorbisfile xcb z
 
 post-patch:
 	cp ${FILESDIR}/audioiosndio.cc ${WRKSRC}/flow
diff --git a/x11/kde/arts3/pkg/PLIST b/x11/kde/arts3/pkg/PLIST
index a805a2509e1..16cbc5d9d9c 100644
--- a/x11/kde/arts3/pkg/PLIST
+++ b/x11/kde/arts3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2008/08/26 16:52:28 espie Exp $
+@comment $OpenBSD: PLIST,v 1.18 2010/07/08 21:28:48 espie Exp $
 @conflict kdelibs-<3
 bin/artsc-config
 @bin bin/artscat
@@ -95,6 +95,23 @@ include/arts/weakreference.h
 include/artsc/
 include/artsc/artsc.h
 include/artsc/artsc_export.h
+${KDE}/
+@lib ${KDE}/libartsc.so.${LIBartsc_VERSION}
+@lib ${KDE}/libartscbackend.so.${LIBartscbackend_VERSION}
+@lib ${KDE}/libartsdsp.so.${LIBartsdsp_VERSION}
+@lib ${KDE}/libartsdsp_st.so.${LIBartsdsp_st_VERSION}
+@lib ${KDE}/libartsflow.so.${LIBartsflow_VERSION}
+@lib ${KDE}/libartsflow_idl.so.${LIBartsflow_idl_VERSION}
+@lib ${KDE}/libartsgslplayobject.so.${LIBartsgslplayobject_VERSION}
+@lib ${KDE}/libartswavplayobject.so.${LIBartswavplayobject_VERSION}
+@lib ${KDE}/libgmcop.so.${LIBgmcop_VERSION}
+@lib ${KDE}/libkmedia2.so.${LIBkmedia2_VERSION}
+@lib ${KDE}/libkmedia2_idl.so.${LIBkmedia2_idl_VERSION}
+@lib ${KDE}/libmcop.so.${LIBmcop_VERSION}
+@lib ${KDE}/libmcop_mt.so.${LIBmcop_mt_VERSION}
+@lib ${KDE}/libqtmcop.so.${LIBqtmcop_VERSION}
+@lib ${KDE}/libsoundserver_idl.so.${LIBsoundserver_idl_VERSION}
+@lib ${KDE}/libx11globalcomm.so.${LIBx11globalcomm_VERSION}
 lib/libartsc.la
 @lib lib/libartsc.so.${LIBartsc_VERSION}
 lib/libartscbackend.la
diff --git a/x11/kde/artwork3/Makefile b/x11/kde/artwork3/Makefile
index 9af371a6de7..be273d88260 100644
--- a/x11/kde/artwork3/Makefile
+++ b/x11/kde/artwork3/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.59 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2010/07/08 21:28:49 espie Exp $
 
 COMMENT = 		K Desktop Environment, additional artwork
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdeartwork-${VERSION}
-PKGNAME =		${DISTNAME}p5
+PKGNAME =		${DISTNAME}p6
 MODKDE_VERSION =	3.5.8
 
 MODULES =		x11/kde devel/gettext
 
-LIB_DEPENDS =		kdecore.>=6,DCOP,kdefx,kdesu,kdeui,kio,kparts,kscreensaver::x11/kde/libs3 \
-			kdecorations::x11/kde/base3
+LIB_DEPENDS =		::x11/kde/libs3 \
+			::x11/kde/base3
 SEPARATE_BUILD =	flavored
 
 CONFIGURE_ENV +=	XSCREENSAVER=${LOCALBASE}/libexec/xscreensaver
@@ -18,12 +18,14 @@ CONFIGURE_ENV +=	XSCREENSAVER=${LOCALBASE}/libexec/xscreensaver
 BUILD_DEPENDS =		:xscreensaver-data-*:x11/xscreensaver,-data,no_gle
 RUN_DEPENDS =		:xscreensaver-data-*:x11/xscreensaver,-data,no_gle
 
-WANTLIB =	GL GLU ICE SM X11 Xext Xrender Xt art_lgpl_2 artsflow \
-		artsflow_idl artskde audiofile c glib-2.0 \
-		gmodule-2.0 gthread-2.0 jpeg kmedia2_idl \
-		kwalletclient m mad mcop ogg png pthread qtmcop sndio \
-		soundserver_idl stdc++ util vorbis vorbisenc vorbisfile z \
-		idn Xau Xdmcp fam rpcsvc pcre pthread-stubs xcb
+WANTLIB = GL GLU ICE SM X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xt Xxf86vm \
+	art_lgpl_2 artsflow artsflow_idl artskde audiofile c drm fam glib-2.0 \
+	gmodule-2.0 gthread-2.0 idn jpeg kmedia2_idl kwalletclient \
+	lib/kde3/DCOP lib/kde3/kdecorations lib/kde3/kdecore.>=6 \
+	lib/kde3/kdefx lib/kde3/kdesu lib/kde3/kdeui lib/kde3/kio \
+	lib/kde3/kparts lib/kde3/kscreensaver m mad mcop ogg pcre png pthread \
+	pthread-stubs qtmcop rpcsvc sndio soundserver_idl stdc++ util vorbis \
+	vorbisenc vorbisfile xcb z
 
 
 .include <bsd.port.mk>
diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile
index f86ded63542..8b4040e3339 100644
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.96 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.97 2010/07/08 21:28:49 espie Exp $
 
 COMMENT-main = 		K Desktop Environment, basic applications
 COMMENT-plugins =	Konqueror nsplugins, essentially native JDK
@@ -6,9 +6,9 @@ COMMENT-samba =		K Desktop Environment, samba support
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdebase-${VERSION}
-PKGNAME-main =		${DISTNAME}p9
-PKGNAME-samba =		kdesamba-${VERSION}p1
-MODKDE_VERSION ?=	3.5.8
+PKGNAME-main =		${DISTNAME}p10
+PKGNAME-samba =		kdesamba-${VERSION}p2
+MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	konq                 7.0      # .6.0
 SHARED_LIBS +=	kateutils            1.0      # .0.0
 SHARED_LIBS +=	kateinterfaces       1.0      # .0.0
@@ -28,31 +28,39 @@ FLAVORS =		debug
 
 MODULES =	x11/kde devel/gettext
 
-LIB_DEPENDS =	kdecore.>=6,DCOP,kio,kdeui,kdefx,kdesu,kwalletclient::x11/kde/libs3
-WANTLIB =	ICE Xrender SM util X11 m z png jpeg art_lgpl_2 Xext idn \
-		pthread-stubs xcb fam rpcsvc stdc++ Xdmcp Xau 
+LIB_DEPENDS =	::x11/kde/libs3
+WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 fam idn jpeg \
+	lib/kde3/DCOP lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/kio lib/kde3/kwalletclient m png pthread-stubs \
+	stdc++ util xcb z
 
 RUN_DEPENDS-main =${RUN_DEPENDS} \
 		:desktop-file-utils-*:devel/desktop-file-utils
+
 LIB_DEPENDS-main = ${LIB_DEPENDS} \
-		kabc,katepartinterfaces,kdefakes,kdnssd,kdeprint,kdeprint_management,khtml,kjs,knewstuff,kmid,kparts,kresources,kscreensaver,ktexteditor,kutils,vcard,artskde::x11/kde/libs3 \
-		lber,ldap.>=2:openldap-client->=2,<3:databases/openldap \
-		sasl2::security/cyrus-sasl2 \
-		usb::devel/libusb \
-		glib-2.0,gmodule-2.0,gthread-2.0::devel/glib2
-WANTLIB-main =	${WANTLIB} \
-		Xcursor Xrandr Xss Xt Xtst Xxf86misc \
-		artsflow artsflow_idl audiofile c crypto \
-		freetype kmedia2_idl mad mcop ogg \
-		pcre pcreposix qtmcop soundserver_idl sndio ssl \
-		vorbis vorbisenc vorbisfile xkbfile GLU \
-		Xinerama Xft Xfixes fontconfig GL Xcomposite Xdamage \
-		Half Imath IlmImf IlmThread Iex asn1 com_err gssapi krb5 \
-		expat pthread 
+		::x11/kde/libs3 \
+		:openldap-client->=2,<3:databases/openldap \
+		::security/cyrus-sasl2 \
+		::devel/libusb \
+		::devel/glib2
+WANTLIB-main = ${WANTLIB} GL GLU Half Iex IlmImf IlmThread Imath Xcomposite \
+	Xcursor Xdamage Xdamage Xfixes Xfixes Xft Xi Xinerama Xmu Xrandr Xss \
+	Xt Xtst Xxf86misc Xxf86vm Xxf86vm asn1 audiofile c com_err crypto drm \
+	drm expat fontconfig freetype glib-2.0 gmodule-2.0 gssapi gthread-2.0 \
+	krb5 lber-2.3 lcms ldap-2.3 lib/kde3/artsflow lib/kde3/artsflow_idl \
+	lib/kde3/artskde lib/kde3/kabc lib/kde3/katepartinterfaces \
+	lib/kde3/kdefakes lib/kde3/kdeprint lib/kde3/kdeprint_management \
+	lib/kde3/kdnssd lib/kde3/khtml lib/kde3/kjs lib/kde3/kmedia2_idl \
+	lib/kde3/kmid lib/kde3/knewstuff lib/kde3/kparts lib/kde3/kresources \
+	lib/kde3/kscreensaver lib/kde3/ktexteditor lib/kde3/kutils mad mcop \
+	mng ogg pcre pcreposix pthread qtmcop sasl2 sndio soundserver_idl ssl \
+	usb vcard vorbis vorbisenc vorbisfile xkbfile
 
 
 LIB_DEPENDS-samba = ${LIB_DEPENDS} \
-		lib/samba/smbclient:samba->=3:net/samba
+		:samba->=3:net/samba
+WANTLIB-samba = ${WANTLIB} execinfo lib/samba/smbclient pthread talloc tdb \
+	wbclient
 
 SEPARATE_BUILD =	flavored
 EXTRA_CONFIG =	xdg/menus/kde-settings.menu \
@@ -70,6 +78,8 @@ SUBST_VARS = EXTRA_CONFIG SAMPLECONFDIR
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/kdesurc ${PREFIX}/share/config
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 FAKE_FLAGS =	sysconfdir=${SAMPLECONFDIR}
 
diff --git a/x11/kde/base3/pkg/PLIST-main b/x11/kde/base3/pkg/PLIST-main
index 31fbbf52c92..356de50f4cd 100644
--- a/x11/kde/base3/pkg/PLIST-main
+++ b/x11/kde/base3/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.11 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.12 2010/07/08 21:28:49 espie Exp $
 @conflict kdeartwork-<=3.4
 @conflict kdeedu-<3.4
 @pkgpath x11/kde/base3
@@ -16,7 +16,7 @@
 @bin bin/kbookmarkmerger
 @mode u+s
 @owner root
-bin/kcheckpass
+@bin bin/kcheckpass
 @mode
 @owner
 @bin bin/kcheckrunning
@@ -35,9 +35,11 @@ bin/kdeinstallktheme
 @bin bin/kdesktop_lock
 @bin bin/kdesu
 @mode g+s
+@owner root
 @group _kdesud
-bin/kdesud
+@bin bin/kdesud
 @mode
+@owner
 @group
 @bin bin/kdialog
 @bin bin/kdm
@@ -510,20 +512,31 @@ ${KDE}/kxkb.la
 ${KDE}/kxkb.so
 ${KDE}/launcher_panelapplet.la
 ${KDE}/launcher_panelapplet.so
+@lib ${KDE}/libkasbar.so.${LIBkasbar_VERSION}
+@lib ${KDE}/libkateinterfaces.so.${LIBkateinterfaces_VERSION}
+@lib ${KDE}/libkateutils.so.${LIBkateutils_VERSION}
+@lib ${KDE}/libkdecorations.so.${LIBkdecorations_VERSION}
 ${KDE}/libkdeprint_part.la
 ${KDE}/libkdeprint_part.so
 ${KDE}/libkfindpart.la
 ${KDE}/libkfindpart.so
+@lib ${KDE}/libkfontinst.so.${LIBkfontinst_VERSION}
 ${KDE}/libkfontviewpart.la
 ${KDE}/libkfontviewpart.so
+@lib ${KDE}/libkhotkeys_shared.so.${LIBkhotkeys_shared_VERSION}
 ${KDE}/libkhtmlkttsdplugin.la
 ${KDE}/libkhtmlkttsdplugin.so
+@lib ${KDE}/libkickermain.so.${LIBkickermain_VERSION}
 ${KDE}/libkmanpart.la
 ${KDE}/libkmanpart.so
+@lib ${KDE}/libkonq.so.${LIBkonq_VERSION}
+@lib ${KDE}/libkonqsidebarplugin.so.${LIBkonqsidebarplugin_VERSION}
 ${KDE}/libkonsolepart.la
 ${KDE}/libkonsolepart.so
+@lib ${KDE}/libksgrd.so.${LIBksgrd_VERSION}
 ${KDE}/libkshorturifilter.la
 ${KDE}/libkshorturifilter.so
+@lib ${KDE}/libksplashthemes.so.${LIBksplashthemes_VERSION}
 ${KDE}/libkuriikwsfilter.la
 ${KDE}/libkuriikwsfilter.so
 ${KDE}/libkurisearchfilter.la
@@ -532,6 +545,8 @@ ${KDE}/liblocaldomainurifilter.la
 ${KDE}/liblocaldomainurifilter.so
 ${KDE}/libnsplugin.la
 ${KDE}/libnsplugin.so
+@lib ${KDE}/libtaskbar.so.${LIBtaskbar_VERSION}
+@lib ${KDE}/libtaskmanager.so.${LIBtaskmanager_VERSION}
 ${KDE}/lockout_panelapplet.la
 ${KDE}/lockout_panelapplet.so
 ${KDE}/media_panelapplet.la
diff --git a/x11/kde/base3/pkg/PLIST-samba b/x11/kde/base3/pkg/PLIST-samba
index eb9a1ecae5a..1753838c3f8 100644
--- a/x11/kde/base3/pkg/PLIST-samba
+++ b/x11/kde/base3/pkg/PLIST-samba
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST-samba,v 1.1 2005/11/29 14:00:13 espie Exp $
+@comment $OpenBSD: PLIST-samba,v 1.2 2010/07/08 21:28:49 espie Exp $
 @conflict kdebase-<3.5
 ${KDE}/kio_smb.la
 ${KDE}/kio_smb.so
+share/apps/konqueror/
 share/apps/konqueror/dirtree/
 share/apps/konqueror/dirtree/remote/
 share/apps/konqueror/dirtree/remote/smb-network.desktop
diff --git a/x11/kde/bindings3/Makefile b/x11/kde/bindings3/Makefile
index d92e68a08e0..90ba2b817cd 100644
--- a/x11/kde/bindings3/Makefile
+++ b/x11/kde/bindings3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.62 2010/07/08 21:28:49 espie Exp $
 
 BROKEN-powerpc =	gcc spins on x_20.cpp
 
@@ -6,7 +6,7 @@ COMMENT = 		K Desktop Environment, extra language support
 CATEGORIES =		x11 x11/kde devel
 VERSION =		3.5.10
 DISTNAME =		kdebindings-${VERSION}
-PKGNAME =		${DISTNAME}p7
+PKGNAME =		${DISTNAME}p8
 MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	kjsembed             2.0      # .1.0
 SHARED_LIBS +=	smokeqt              4.0      # .3.2
@@ -15,14 +15,17 @@ SHARED_LIBS +=	smokekde             4.0      # .3.2
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS =	DCOP,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kmdi,knewstuff,kparts,kscript,kspell,kutils,kwalletclient::x11/kde/libs3 \
-		qui-mt::x11/qt3 \
-		ruby::lang/ruby
+LIB_DEPENDS =	::x11/kde/libs3 \
+		::x11/qt3 \
+		::lang/ruby
 
-WANTLIB =	GLU Xext stdc++ X11 util m ICE Xrender SM pthread \
-		c fontconfig z GL pthread-stubs xcb \
-		png pcre jpeg art_lgpl_2 pcreposix idn \
-		Xau Xdmcp expat fam freetype rpcsvc
+WANTLIB = GL GLU ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c expat fam \
+	fontconfig freetype idn jpeg lib/kde3/DCOP lib/kde3/kdecore.>=6 \
+	lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui \
+	lib/kde3/khtml lib/kde3/kio lib/kde3/kjs lib/kde3/kmdi \
+	lib/kde3/knewstuff lib/kde3/kparts lib/kde3/kscript lib/kde3/kspell \
+	lib/kde3/kutils lib/kde3/kwalletclient m pcre pcreposix png pthread \
+	pthread-stubs qui-mt ruby stdc++ util xcb z
 
 PYTHON_VER =		2.5
 BUILD_DEPENDS =		:python->=${PYTHON_VER},<2.6:lang/python/${PYTHON_VER}
diff --git a/x11/kde/bindings3/pkg/PLIST b/x11/kde/bindings3/pkg/PLIST
index 51fac779021..14544b1fabe 100644
--- a/x11/kde/bindings3/pkg/PLIST
+++ b/x11/kde/bindings3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.21 2010/07/08 21:28:49 espie Exp $
 @bin bin/embedjs
 @bin bin/jsaccess
 @bin bin/kjscmd
@@ -50,17 +50,18 @@ ${KDE}/libjavascript.la
 ${KDE}/libjavascript.so
 ${KDE}/libjsconsoleplugin.la
 ${KDE}/libjsconsoleplugin.so
+@lib ${KDE}/libkjsembed.so.${LIBkjsembed_VERSION}
 ${KDE}/libqprocessplugin.la
 ${KDE}/libqprocessplugin.so
+@lib ${KDE}/libsmokekde.so.${LIBsmokekde_VERSION}
+@lib ${KDE}/libsmokeqt.so.${LIBsmokeqt_VERSION}
 lib/libkjsembed.la
 @lib lib/libkjsembed.so.${LIBkjsembed_VERSION}
 lib/libsmokekde.la
 @lib lib/libsmokekde.so.${LIBsmokekde_VERSION}
 lib/libsmokeqt.la
 @lib lib/libsmokeqt.so.${LIBsmokeqt_VERSION}
-lib/python2.5/
 lib/python2.5/pydcop.py
-lib/python2.5/site-packages/
 lib/python2.5/site-packages/pcop.la
 lib/python2.5/site-packages/pcop.so
 lib/ruby/site_ruby/1.8/KDE/
diff --git a/x11/kde/edu3/Makefile b/x11/kde/edu3/Makefile
index 72ce9bb9ca9..5948dab1bdb 100644
--- a/x11/kde/edu3/Makefile
+++ b/x11/kde/edu3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.58 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2010/07/08 21:28:49 espie Exp $
 
 COMMENT =		K Desktop Environment, edutainment
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdeedu-${VERSION}
-PKGNAME =		${DISTNAME}p4
+PKGNAME =		${DISTNAME}p5
 MODKDE_VERSION ?=	3.5.8
 FLAVORS =	debug
 SHARED_LIBS +=	kdeeducore           4.0      # .3.0
@@ -17,18 +17,25 @@ SHARED_LIBS +=	kvoctraincore        1.0      # .0.0
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = 	kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kparts,kutils,kjs,kwalletclient,vcard,kabc,kresources::x11/kde/libs3
+LIB_DEPENDS = 	::x11/kde/libs3
 SEPARATE_BUILD =	flavored
 
 CONFIGURE_ARGS +=	--disable-kig-python-scripting
 
-WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 c jpeg katepartinterfaces \
-		knewstuff ktexteditor m pcre pcreposix png pthread stdc++ util \
-		z qtmcop soundserver_idl artskde kmedia2_idl \
-		artsflow vorbis ogg mcop pthread-stubs xcb \
-		artsflow_idl audiofile mad vorbisfile vorbisenc \
-		gthread-2.0.>=800.0 gmodule-2.0.>=800.0 glib-2.0.>=800.0 idn \
-		Xau Xdmcp fam rpcsvc sndio
+WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \
+	Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 artsflow artsflow_idl artskde \
+	audiofile c drm expat fam fontconfig freetype glib-2.0.>=800.0 \
+	gmodule-2.0.>=800.0 gthread-2.0.>=800.0 idn jpeg katepartinterfaces \
+	kmedia2_idl knewstuff ktexteditor lcms lib/kde3/DCOP lib/kde3/kabc \
+	lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/khtml lib/kde3/kio lib/kde3/kjs \
+	lib/kde3/kparts lib/kde3/kresources lib/kde3/kutils \
+	lib/kde3/kwalletclient lib/kde3/vcard m mad mcop mng ogg pcre \
+	pcreposix png pthread pthread-stubs qtmcop sndio \
+	soundserver_idl stdc++ util vorbis vorbisenc vorbisfile xcb z
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/edu3/pkg/PLIST b/x11/kde/edu3/pkg/PLIST
index e3f8244cbbf..4175a8cd1be 100644
--- a/x11/kde/edu3/pkg/PLIST
+++ b/x11/kde/edu3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.33 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.34 2010/07/08 21:28:49 espie Exp $
 @bin bin/apmount
 @bin bin/blinken
 @bin bin/celestrongps
@@ -54,12 +54,18 @@ ${KDE}/kfile_drgeo.la
 ${KDE}/kfile_drgeo.so
 ${KDE}/kfile_kig.la
 ${KDE}/kfile_kig.so
+@lib ${KDE}/libextdate.so.${LIBextdate_VERSION}
+@lib ${KDE}/libkdeeducore.so.${LIBkdeeducore_VERSION}
+@lib ${KDE}/libkdeeduplot.so.${LIBkdeeduplot_VERSION}
+@lib ${KDE}/libkdeeduui.so.${LIBkdeeduui_VERSION}
 ${KDE}/libkeducapart.la
 ${KDE}/libkeducapart.so
 ${KDE}/libkigpart.la
 ${KDE}/libkigpart.so
+@lib ${KDE}/libkiten.so.${LIBkiten_VERSION}
 ${KDE}/libkmplotpart.la
 ${KDE}/libkmplotpart.so
+@lib ${KDE}/libkvoctraincore.so.${LIBkvoctraincore_VERSION}
 lib/libextdate.la
 @lib lib/libextdate.so.${LIBextdate_VERSION}
 lib/libkdeeducore.la
diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile
index da2d380f6b6..4511389cfbd 100644
--- a/x11/kde/games3/Makefile
+++ b/x11/kde/games3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.58 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2010/07/08 21:28:49 espie Exp $
 
 COMMENT =		K Desktop Environment, games
 
 CATEGORIES =		x11 x11/kde games
 VERSION =		3.5.10
 DISTNAME =		kdegames-${VERSION}
-PKGNAME =		${DISTNAME}p4
+PKGNAME =		${DISTNAME}p5
 MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	kdegames             4.0      # .3.0
 SHARED_LIBS +=	atlantic             4.0      # .3.0
@@ -16,14 +16,21 @@ SHARED_LIBS +=	kolf                 4.0      # .3.0
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = 	kdecore.>=6,artskde,DCOP,kdefx,kdeprint,kdesu,kdeui,kdnssd,kio,kparts::x11/kde/libs3
+LIB_DEPENDS = 	::x11/kde/libs3
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 artsflow artsflow_idl \
-		audiofile c glib-2.0 gmodule-2.0 gthread-2.0 \
-		jpeg kmedia2_idl kwalletclient m mad mcop ogg png pthread \
-		qtmcop sndio soundserver_idl stdc++ util vorbis vorbisenc \
-		vorbisfile z idn Xau Xdmcp fam rpcsvc pcre \
-		pthread-stubs xcb
+WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \
+	Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 artsflow artsflow_idl \
+	audiofile c drm expat fam fontconfig freetype glib-2.0 gmodule-2.0 \
+	gthread-2.0 idn jpeg kmedia2_idl kwalletclient lcms lib/kde3/DCOP \
+	lib/kde3/artskde lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdeprint \
+	lib/kde3/kdesu lib/kde3/kdeui lib/kde3/kdnssd lib/kde3/kio \
+	lib/kde3/kparts m mad mcop mng ogg pcre png pthread pthread-stubs \
+	qtmcop sndio soundserver_idl stdc++ util vorbis vorbisenc vorbisfile \
+	xcb z
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/games3/pkg/PLIST b/x11/kde/games3/pkg/PLIST
index c9b813d17df..69c4d5548cc 100644
--- a/x11/kde/games3/pkg/PLIST
+++ b/x11/kde/games3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.25 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.26 2010/07/08 21:28:49 espie Exp $
 @bin bin/atlantik
 @bin bin/kasteroids
 @bin bin/katomic
@@ -107,6 +107,11 @@ ${KDE}/kio_atlantik.la
 ${KDE}/kio_atlantik.so
 ${KDE}/kolf.la
 ${KDE}/kolf.so
+@lib ${KDE}/libatlantic.so.${LIBatlantic_VERSION}
+@lib ${KDE}/libatlantikclient.so.${LIBatlantikclient_VERSION}
+@lib ${KDE}/libatlantikui.so.${LIBatlantikui_VERSION}
+@lib ${KDE}/libkdegames.so.${LIBkdegames_VERSION}
+@lib ${KDE}/libkolf.so.${LIBkolf_VERSION}
 lib/libatlantic.la
 @lib lib/libatlantic.so.${LIBatlantic_VERSION}
 lib/libatlantikclient.la
diff --git a/x11/kde/graphics3/Makefile b/x11/kde/graphics3/Makefile
index 90806f9382c..9a024055213 100644
--- a/x11/kde/graphics3/Makefile
+++ b/x11/kde/graphics3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2010/06/12 14:33:01 landry Exp $
+# $OpenBSD: Makefile,v 1.92 2010/07/08 21:28:49 espie Exp $
 
 COMMENT-main =		K Desktop Environment, graphic applications
 COMMENT-kamera =	KDE interface to digital cameras
@@ -14,10 +14,10 @@ SEPARATE_BUILD =	flavored
 MULTI_PACKAGES =	-main -kpov -kamera -sane
 PKGNAME =		${DISTNAME}
 
-PKGNAME-main =		${DISTNAME}p7
-PKGNAME-kamera =	kamera-${VERSION}p3
-PKGNAME-kpov =		kpovmodeller-${VERSION}p3
-PKGNAME-sane =		ksane-${VERSION}p5
+PKGNAME-main =		${DISTNAME}p8
+PKGNAME-kamera =	kamera-${VERSION}p4
+PKGNAME-kpov =		kpovmodeller-${VERSION}p4
+PKGNAME-sane =		ksane-${VERSION}p6
 
 SHARED_LIBS +=	kghostviewlib        1.0      # .0.0
 SHARED_LIBS +=	kpovmodeler          1.0      # .0.0
@@ -30,47 +30,53 @@ SHARED_LIBS +=	kscan                2.0      # .1.0
 MODULES =		x11/kde devel/gettext
 
 BUILD_DEPENDS =		::print/texlive/base
-WANTLIB =		X11 art_lgpl_2 ICE png util jpeg z SM Xext \
-			m idn Xau Xdmcp fam rpcsvc stdc++ \
-			pthread-stubs qt-mt xcb
-
+WANTLIB = ICE SM X11 Xau Xdmcp Xext art_lgpl_2 fam idn jpeg lib/kde3/DCOP \
+	lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdesu lib/kde3/kdeui \
+	lib/kde3/kio m png pthread-stubs qt-mt stdc++ util xcb z
+LIB_DEPENDS =		${MODGETTEXT_LIB_DEPENDS} \
+			::x11/kde/libs3
 
 RUN_DEPENDS-main =	${RUN_DEPENDS} \
 			:ghostscript-*:print/ghostscript/gnu \
 			:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS-main = 	${MODGETTEXT_LIB_DEPENDS} \
-			kdecore.>=6,DCOP,kio,kwalletclient,kdefx,kdeui,kdesu,kdeprint,khtml,kjs,kparts,kutils::x11/kde/libs3 \
-			Imlib::graphics/imlib \
-			ungif::graphics/libungif \
-			fribidi::devel/fribidi \
-			paper::print/libpaper \
-			poppler::print/poppler \
-			poppler-qt::print/poppler,-qt
-WANTLIB-main =		${WANTLIB} \
-			Half Iex IlmImf IlmThread Imath \
-			tiff fontconfig lcms Xrender ICE c \
-			freetype pcreposix pcre Xxf86vm SM Xext Xft \
-			expat xml2 pthread
+LIB_DEPENDS-main = 	${LIB_DEPENDS} \
+			::graphics/imlib \
+			::graphics/libungif \
+			::devel/fribidi \
+			::print/libpaper \
+			::print/poppler \
+			::print/poppler,-qt
+WANTLIB-main =	 ${WANTLIB} GL Half ICE Iex IlmImf IlmThread Imath Imlib SM \
+	Xcursor Xdamage Xext Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt \
+	Xxf86vm c drm expat fontconfig freetype fribidi lcms lib/kde3/kdeprint \
+	lib/kde3/khtml lib/kde3/kjs lib/kde3/kparts lib/kde3/kutils \
+	lib/kde3/kwalletclient mng openjpeg paper pcre pcreposix poppler \
+	poppler-qt pthread tiff ungif xml2
 
 
-LIB_DEPENDS-kpov =	${MODGETTEXT_LIB_DEPENDS} \
-			kdecore.>=6,DCOP,kio,kwalletclient,kdefx,kdeui,kdesu,kparts::x11/kde/libs3
+
+LIB_DEPENDS-kpov =	${LIB_DEPENDS}
+
 RUN_DEPENDS-kpov =	::graphics/povray \
-			:desktop-file-utils-*:devel/desktop-file-utils
-WANTLIB-kpov =		${WANTLIB} GL freetype Xrender Xmu GLU c Xi \
-			Xt pthread
+			:desktop-file-utils-*:devel/desktop-file-utils 
 
-LIB_DEPENDS-kamera = 	${MODGETTEXT_LIB_DEPENDS} \
-			gphoto2,gphoto2_port::graphics/libgphoto2 \
-			kdecore.>=6,DCOP,kio,kwalletclient,kdefx,kdeui,kdesu::x11/kde/libs3
-WANTLIB-kamera =	${WANTLIB} exif Xrender ltdl
+WANTLIB-kpov = ${WANTLIB} GL GLU Xdamage Xfixes Xi Xmu Xrender Xt Xxf86vm c \
+	drm freetype lib/kde3/kparts lib/kde3/kwalletclient pthread
+
+LIB_DEPENDS-kamera = 	${LIB_DEPENDS} \
+			::graphics/libgphoto2
+WANTLIB-kamera = ${WANTLIB} Xrender exif gphoto2 gphoto2_port \
+	lib/kde3/kwalletclient ltdl
 
 RUN_DEPENDS-sane =	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS-sane =	${MODGETTEXT_LIB_DEPENDS} \
-			kdecore.>=6,DCOP,kio,kwalletclient,kdefx,kdeui,kdesu,ktexteditor,vcard,kabc,kparts,kresources,kspell,kdeprint::x11/kde/libs3 \
-			sane::graphics/sane-backends
-WANTLIB-sane =		${WANTLIB-kamera} usb tiff c ltdl pthread avahi-client avahi-common dbus-1 \
-			gphoto2 gphoto2_port 
+LIB_DEPENDS-sane =	${LIB_DEPENDS} \
+			::graphics/sane-backends
+WANTLIB-sane =	 ${WANTLIB-kamera} avahi-client avahi-common c dbus-1 \
+	lib/kde3/kabc lib/kde3/kdeprint lib/kde3/kparts lib/kde3/kresources \
+	lib/kde3/kspell lib/kde3/ktexteditor lib/kde3/vcard ltdl pthread sane \
+	tiff usb
+
+			
 
 
 CONFIGURE_ENV +=	\
@@ -82,4 +88,8 @@ post-patch:
 CONFIGURE_ENV +=	TIFF_LIBS='-L${LOCALBASE}/lib -ltiff -ljpeg -lz' \
 			TIFF_CFLAGS='-I${LOCALBASE}/include'
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
+
 .include <bsd.port.mk>
diff --git a/x11/kde/graphics3/pkg/PLIST-kpov b/x11/kde/graphics3/pkg/PLIST-kpov
index c1d4f03e6af..3210cf4c4fa 100644
--- a/x11/kde/graphics3/pkg/PLIST-kpov
+++ b/x11/kde/graphics3/pkg/PLIST-kpov
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-kpov,v 1.10 2009/12/21 20:46:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST-kpov,v 1.11 2010/07/08 21:28:49 espie Exp $
 @conflict kdegraphics-<=3.3.2
 @bin bin/kpovmodeler
 ${KDE}/libkpovmodelerpart.la
 ${KDE}/libkpovmodelerpart.so
+@lib ${KDE}/libkpovmodeler.so.${LIBkpovmodeler_VERSION}
 lib/libkpovmodeler.la
 @lib lib/libkpovmodeler.so.${LIBkpovmodeler_VERSION}
 share/applications/kde/kpovmodeler.desktop
diff --git a/x11/kde/graphics3/pkg/PLIST-main b/x11/kde/graphics3/pkg/PLIST-main
index f3ec85379c5..05f26b6b278 100644
--- a/x11/kde/graphics3/pkg/PLIST-main
+++ b/x11/kde/graphics3/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2010/07/08 21:28:49 espie Exp $
 @pkgpath x11/kde/graphics3
 @bin bin/kcolorchooser
 @bin bin/kcoloredit
@@ -280,12 +280,16 @@ ${KDE}/kviewerpart.la
 ${KDE}/kviewerpart.so
 ${KDE}/libdjvu.la
 ${KDE}/libdjvu.so
+@lib ${KDE}/libkghostviewlib.so.${LIBkghostviewlib_VERSION}
 ${KDE}/libkghostviewpart.la
 ${KDE}/libkghostviewpart.so
+@lib ${KDE}/libkimageviewer.so.${LIBkimageviewer_VERSION}
 ${KDE}/libkmrmlpart.la
 ${KDE}/libkmrmlpart.so
+@lib ${KDE}/libkmultipage.so.${LIBkmultipage_VERSION}
 ${KDE}/libkpdfpart.la
 ${KDE}/libkpdfpart.so
+@lib ${KDE}/libksvg.so.${LIBksvg_VERSION}
 ${KDE}/libksvgplugin.la
 ${KDE}/libksvgplugin.so
 ${KDE}/libksvgrendererlibart.la
@@ -296,6 +300,7 @@ ${KDE}/libkviewviewer.la
 ${KDE}/libkviewviewer.so
 ${KDE}/libphotobook.la
 ${KDE}/libphotobook.so
+@lib ${KDE}/libtext2path.so.${LIBtext2path_VERSION}
 ${KDE}/mrmlsearch.la
 ${KDE}/mrmlsearch.so
 ${KDE}/svgthumbnail.la
diff --git a/x11/kde/graphics3/pkg/PLIST-sane b/x11/kde/graphics3/pkg/PLIST-sane
index 33c42c638e7..8d2b450f046 100644
--- a/x11/kde/graphics3/pkg/PLIST-sane
+++ b/x11/kde/graphics3/pkg/PLIST-sane
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST-sane,v 1.6 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST-sane,v 1.7 2010/07/08 21:28:49 espie Exp $
 @bin bin/kooka
 lib/libkscan.la
+@lib ${KDE}/libkscan.so.${LIBkscan_VERSION}
 @lib lib/libkscan.so.${LIBkscan_VERSION}
 share/applications/kde/kooka.desktop
 share/apps/kooka/
diff --git a/x11/kde/kde.port.mk b/x11/kde/kde.port.mk
index bba964ffb00..faefffaa9f6 100644
--- a/x11/kde/kde.port.mk
+++ b/x11/kde/kde.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: kde.port.mk,v 1.31 2010/07/06 22:52:07 espie Exp $
+# $OpenBSD: kde.port.mk,v 1.32 2010/07/08 21:28:48 espie Exp $
 
 SHARED_ONLY ?=	Yes
 
@@ -14,7 +14,7 @@ FLAVORS +=	debug
 FLAVOR ?=
 
 MODKDE_CONFIGURE_ARGS =${MODQT_CONFIGURE_ARGS}
-MODKDE_CONFIGURE_ARGS +=	--with-extra-libs="${LOCALBASE}/lib/db4:${LOCALBASE}/lib/samba:${LOCALBASE}/lib"
+MODKDE_CONFIGURE_ARGS +=	--with-extra-libs="${LOCALBASE}/lib/kde3:${LOCALBASE}/lib/db4:${LOCALBASE}/lib/samba:${LOCALBASE}/lib"
 MODKDE_CONFIGURE_ARGS +=	--with-extra-includes="${LOCALBASE}/include/db4:${LOCALBASE}/include/libpng:${LOCALBASE}/include"
 MODKDE_CONFIGURE_ARGS +=	--with-xdmdir=/var/X11/kdm
 MODKDE_CONFIGURE_ARGS +=	--enable-mitshm
diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile
index 278097aaf77..8b17ad37670 100644
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.107 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.108 2010/07/08 21:28:49 espie Exp $
 
 COMMENT-main =		K Desktop Environment, libraries
 COMMENT-cups =		K Desktop Environment, cups support
@@ -7,8 +7,8 @@ VERSION =		3.5.10
 DISTNAME =		kdelibs-${VERSION}
 MASTER_SITES0 =  	ftp://ftp.kde.org/pub/kde/security_patches/
 
-PKGNAME-main =		${DISTNAME}p9
-PKGNAME-cups =		kdecups-${VERSION}p5
+PKGNAME-main =		${DISTNAME}p10
+PKGNAME-cups =		kdecups-${VERSION}p6
 MODKDE_VERSION =		3.5.8
 SHARED_LIBS +=	DCOP                 7.0      # .6.0
 SHARED_LIBS +=	kdefx                7.0      # .6.0
@@ -38,7 +38,6 @@ SHARED_LIBS +=	vcard                1.0      # .0.0
 SHARED_LIBS +=	kabc                 4.0      # .3.0
 SHARED_LIBS +=	kabc_file            2.0      # .1.0
 SHARED_LIBS +=	kabc_dir             2.0      # .1.0
-SHARED_LIBS +=	kabc_net             2.0      # .1.0
 SHARED_LIBS +=	kabc_ldapkio         2.0      # .1.0
 SHARED_LIBS +=	kspell2              2.0      # .1.0
 SHARED_LIBS +=	kmdi2                2.0      # .1.0
@@ -60,30 +59,30 @@ CONFIGURE_ARGS += 	--enable-cups
 
 MODULES =	x11/kde devel/gettext
 
-LIB_DEPENDS =	art_lgpl_2::graphics/libart \
-		idn::devel/libidn \
-		fam.>=1::sysutils/gamin 
+LIB_DEPENDS =	::graphics/libart \
+		::devel/libidn \
+		::sysutils/gamin 
+
 WANTLIB =	asn1 crypto gssapi util jpeg krb5 m X11 \
 		ICE Xrender c SM pthread stdc++ Xext z png \
-		Xau Xdmcp pthread-stubs xcb
+		Xau Xdmcp pthread-stubs xcb art_lgpl_2 idn \
+		fam.>=1
 
 LIB_DEPENDS-main =	\
 	${LIB_DEPENDS} \
-	artsflow.>=1.0,artsflow_idl,qtmcop,soundserver_idl,mcop,kmedia2_idl::x11/kde/arts3 \
-	pcreposix,pcre::devel/pcre \
-	xslt.>=1.10:libxslt->=1.0.10:textproc/libxslt \
-	bz2::archivers/bzip2 \
-	tiff.>=35::graphics/tiff \
-	jasper::graphics/jasper \
-	IlmImf.>=4::graphics/openexr \
-	aspell::textproc/aspell/core
+	::x11/kde/arts3 \
+	::devel/pcre \
+	:libxslt->=1.0.10:textproc/libxslt \
+	::archivers/bzip2 \
+	::graphics/tiff \
+	::graphics/jasper \
+	::graphics/openexr \
+	::textproc/aspell/core
 
-WANTLIB-main =	${WANTLIB} \
-		Half Iex IlmThread Imath \
-		audiofile glib-2.0 \
-		gmodule-2.0 gthread-2.0 mad ogg \
-		sndio vorbisenc vorbis vorbisfile \
-		xml2
+WANTLIB-main = ${WANTLIB} Half Iex IlmImf.>=4 IlmThread Imath artsflow.>=1.0 \
+	artsflow_idl aspell audiofile bz2 glib-2.0 gmodule-2.0 gthread-2.0 \
+	jasper kmedia2_idl mad mcop ogg pcre pcreposix qtmcop sndio \
+	soundserver_idl tiff.>=35 vorbis vorbisenc vorbisfile xml2 xslt.>=1.10
 
 
 RUN_DEPENDS-main = \
@@ -93,11 +92,13 @@ RUN_DEPENDS-main = \
 
 LIB_DEPENDS-cups = \
 	${LIB_DEPENDS} \
-	kdecore.>=6,kwalletclient,kdefakes,kdefx,kdeprint,kio,kparts,kdeui,kdesu,kdeprint_management,DCOP::x11/kde/libs3 \
-	cups::print/cups
+	::x11/kde/libs3 \
+	::print/cups
 
-WANTLIB-cups =	${WANTLIB} \
-		ssl
+WANTLIB-cups = ${WANTLIB} DCOP cups lib/kde3/kdecore.>=6 lib/kde3/kdefakes \
+	lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdeprint_management \
+	lib/kde3/kdesu lib/kde3/kdeui lib/kde3/kio lib/kde3/kparts \
+	lib/kde3/kwalletclient ssl
 
 
 SEPARATE_BUILD =	flavored
@@ -114,8 +115,6 @@ pre-configure:
 	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
 		${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKBUILD}/libtool ${PREFIX}/bin/kdelibtool
-
 .include <bsd.port.mk>
+
 MODGNU_AUTOCONF_FILES +=	dcop/dcop-path.h.in
diff --git a/x11/kde/libs3/pkg/PLIST-main b/x11/kde/libs3/pkg/PLIST-main
index 20321649841..bd8f2b9ea00 100644
--- a/x11/kde/libs3/pkg/PLIST-main
+++ b/x11/kde/libs3/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.12 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.13 2010/07/08 21:28:49 espie Exp $
 @conflict kdebase-<3.5
 @conflict kdeartwork-<3.4
 @conflict kdeaddons-<3.4
@@ -34,7 +34,6 @@ bin/imagetops
 @bin bin/kdeinit
 @bin bin/kdeinit_shutdown
 @bin bin/kdeinit_wrapper
-bin/kdelibtool
 @bin bin/kdesu_stub
 @bin bin/kdontchangethehostname
 @bin bin/kdostartupconfig
@@ -780,7 +779,6 @@ include/renamedlgplugin.h
 include/scriptclientinterface.h
 include/scriptinterface.h
 include/scriptmanager.h
-${KDE}/
 ${KDE}/dcopserver.la
 ${KDE}/dcopserver.so
 ${KDE}/kabc_dir.la
@@ -901,18 +899,57 @@ ${KDE}/ktexteditor_isearch.la
 ${KDE}/ktexteditor_isearch.so
 ${KDE}/ktexteditor_kdatatool.la
 ${KDE}/ktexteditor_kdatatool.so
+@lib ${KDE}/libDCOP.so.${LIBDCOP_VERSION}
+@lib ${KDE}/libartskde.so.${LIBartskde_VERSION}
+@lib ${KDE}/libkabc.so.${LIBkabc_VERSION}
+@lib ${KDE}/libkabc_dir.so.${LIBkabc_dir_VERSION}
+@lib ${KDE}/libkabc_file.so.${LIBkabc_file_VERSION}
+@lib ${KDE}/libkabc_ldapkio.so.${LIBkabc_ldapkio_VERSION}
 ${KDE}/libkatepart.la
 ${KDE}/libkatepart.so
+@lib ${KDE}/libkatepartinterfaces.so.${LIBkatepartinterfaces_VERSION}
 ${KDE}/libkcertpart.la
 ${KDE}/libkcertpart.so
+@lib ${KDE}/libkdecore.so.${LIBkdecore_VERSION}
+@lib ${KDE}/libkdefakes.so.${LIBkdefakes_VERSION}
+@lib ${KDE}/libkdefx.so.${LIBkdefx_VERSION}
+@lib ${KDE}/libkdeprint.so.${LIBkdeprint_VERSION}
+@lib ${KDE}/libkdeprint_management.so.${LIBkdeprint_management_VERSION}
 ${KDE}/libkdeprint_management_module.la
 ${KDE}/libkdeprint_management_module.so
+@lib ${KDE}/libkdesasl.so.${LIBkdesasl_VERSION}
+@lib ${KDE}/libkdesu.so.${LIBkdesu_VERSION}
+@lib ${KDE}/libkdeui.so.${LIBkdeui_VERSION}
+@lib ${KDE}/libkdnssd.so.${LIBkdnssd_VERSION}
+@lib ${KDE}/libkhtml.so.${LIBkhtml_VERSION}
 ${KDE}/libkhtmlpart.la
 ${KDE}/libkhtmlpart.so
+@lib ${KDE}/libkimproxy.so.${LIBkimproxy_VERSION}
+@lib ${KDE}/libkio.so.${LIBkio_VERSION}
+@lib ${KDE}/libkjava.so.${LIBkjava_VERSION}
+@lib ${KDE}/libkjs.so.${LIBkjs_VERSION}
+@lib ${KDE}/libkmdi.so.${LIBkmdi_VERSION}
+@lib ${KDE}/libkmdi2.so.${LIBkmdi2_VERSION}
+@lib ${KDE}/libkmediaplayer.so.${LIBkmediaplayer_VERSION}
+@lib ${KDE}/libkmid.so.${LIBkmid_VERSION}
 ${KDE}/libkmultipart.la
 ${KDE}/libkmultipart.so
+@lib ${KDE}/libknewstuff.so.${LIBknewstuff_VERSION}
+@lib ${KDE}/libkntlm.so.${LIBkntlm_VERSION}
+@lib ${KDE}/libkparts.so.${LIBkparts_VERSION}
+@lib ${KDE}/libkresources.so.${LIBkresources_VERSION}
+@lib ${KDE}/libkscreensaver.so.${LIBkscreensaver_VERSION}
+@lib ${KDE}/libkscript.so.${LIBkscript_VERSION}
+@lib ${KDE}/libkspell.so.${LIBkspell_VERSION}
+@lib ${KDE}/libkspell2.so.${LIBkspell2_VERSION}
+@lib ${KDE}/libktexteditor.so.${LIBktexteditor_VERSION}
+@lib ${KDE}/libkunittest.so.${LIBkunittest_VERSION}
+@lib ${KDE}/libkutils.so.${LIBkutils_VERSION}
+@lib ${KDE}/libkwalletbackend.so.${LIBkwalletbackend_VERSION}
+@lib ${KDE}/libkwalletclient.so.${LIBkwalletclient_VERSION}
 ${KDE}/libshellscript.la
 ${KDE}/libshellscript.so
+@lib ${KDE}/libvcard.so.${LIBvcard_VERSION}
 ${KDE}/plugins/
 ${KDE}/plugins/designer/
 ${KDE}/plugins/designer/kdewidgets.la
diff --git a/x11/kde/multimedia3/Makefile b/x11/kde/multimedia3/Makefile
index 01d864c67ea..9f612501498 100644
--- a/x11/kde/multimedia3/Makefile
+++ b/x11/kde/multimedia3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.67 2010/07/03 18:00:07 espie Exp $
+# $OpenBSD: Makefile,v 1.68 2010/07/08 21:28:49 espie Exp $
 
 COMMENT = 		K Desktop Environment, multimedia applications
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdemultimedia-${VERSION}
-PKGNAME =		${DISTNAME}p6
+PKGNAME =		${DISTNAME}p7
 MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	artsbuilder          1.0      # .0.0
 SHARED_LIBS +=	artsmidi_idl         1.0      # .0.0
@@ -38,18 +38,18 @@ FLAVORS =	debug
 
 MODULES =	x11/kde devel/gettext
 
-LIB_DEPENDS = 	DCOP,kdecore.>=6,kdefakes,kdefx,kdesu,kdeui,kio,khtml,kmid,kparts,kmediaplayer,kjs,kutils,kwalletclient,kdeprint,artskde::x11/kde/libs3 \
-	artsc,artsflow,artsflow_idl,kmedia2_idl,mcop,qtmcop,soundserver_idl::x11/kde/arts3 \
-		ogg::audio/libogg \
-		FLAC.>=8::audio/flac \
-		vorbis,vorbisenc,vorbisfile::audio/libvorbis \
-		cdda_paranoia,cdda_interface::audio/cdparanoia \
-		tag::audio/taglib \
-		gstreamer-0.10:gstreamer->=0.10,<0.11:multimedia/gstreamer-0.10/core \
-		ltdl::devel/libtool,-ltdl \
-		theora::multimedia/libtheora \
-		akode::audio/akode \
-		xine::multimedia/xine-lib
+LIB_DEPENDS = 	::x11/kde/libs3 \
+		::x11/kde/arts3 \
+		::audio/libogg \
+		::audio/flac \
+		::audio/libvorbis \
+		::audio/cdparanoia \
+		::audio/taglib \
+		:gstreamer->=0.10,<0.11:multimedia/gstreamer-0.10/core \
+		::devel/libtool,-ltdl \
+		::multimedia/libtheora \
+		::audio/akode \
+		::multimedia/xine-lib
 
 EXTRA_CONFIG =	xdg/menus/applications-merged/kde-multimedia-music.menu 
 SAMPLECONFDIR =	${PREFIX}/share/apps/kde-conf-sample
@@ -62,13 +62,25 @@ SEPARATE_BUILD =	flavored
 CONFIGURE_ARGS +=	--without-lame
 CONFIGURE_ENV +=	aktion_has_xanim=yes
 
-WANTLIB =	ICE SM X11 Xau Xdmcp Xext Xrender Xv Xxf86dga Xxf86vm \
-		art_lgpl_2 audiofile c expat fam fontconfig freetype \
-		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 idn \
-		jpeg m mad ossaudio pcre pcreposix png pthread rpcsvc sndio \
-		stdc++ util xml2 z pthread-stubs xcb
+WANTLIB = FLAC.>=8 ICE SM X11 Xau Xdmcp Xext Xrender Xv Xxf86dga Xxf86vm akode \
+	art_lgpl_2 audiofile c cdda_interface cdda_paranoia expat fam \
+	fontconfig freetype glib-2.0 gmodule-2.0 gobject-2.0 gstreamer-0.10 \
+	gthread-2.0 idn jpeg lib/kde3/DCOP lib/kde3/artsc lib/kde3/artsflow \
+	lib/kde3/artsflow_idl lib/kde3/artskde lib/kde3/kdecore.>=6 \
+	lib/kde3/kdefakes lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/khtml lib/kde3/kio lib/kde3/kjs \
+	lib/kde3/kmedia2_idl lib/kde3/kmediaplayer lib/kde3/kmid \
+	lib/kde3/kparts lib/kde3/kutils lib/kde3/kwalletclient lib/kde3/mcop \
+	lib/kde3/qtmcop lib/kde3/soundserver_idl ltdl m mad ogg ossaudio pcre \
+	pcreposix png pthread pthread-stubs sndio stdc++ tag theora \
+	util vorbis vorbisenc vorbisfile xcb xine xml2 z
+
 
 post-extract:
 	cp ${FILESDIR}/audioIO_sndio.cpp ${WRKSRC}/mpeglib/lib/util/audio
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
+
 .include <bsd.port.mk>
diff --git a/x11/kde/multimedia3/pkg/PLIST b/x11/kde/multimedia3/pkg/PLIST
index 7513606cff0..9713b42dda0 100644
--- a/x11/kde/multimedia3/pkg/PLIST
+++ b/x11/kde/multimedia3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.33 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.34 2010/07/08 21:28:49 espie Exp $
 @bin bin/artsbuilder
 @bin bin/artscontrol
 @bin bin/juk
@@ -212,6 +212,25 @@ ${KDE}/kmixctrl.la
 ${KDE}/kmixctrl.so
 ${KDE}/krec.la
 ${KDE}/krec.so
+@lib ${KDE}/libarts_akode.so.${LIBarts_akode_VERSION}
+@lib ${KDE}/libarts_audiofile.so.${LIBarts_audiofile_VERSION}
+@lib ${KDE}/libarts_mpeglib-0.3.0.so.${LIBarts_mpeglib-0.3.0_VERSION}
+@lib ${KDE}/libarts_mpeglib.so.${LIBarts_mpeglib_VERSION}
+@lib ${KDE}/libarts_splay.so.${LIBarts_splay_VERSION}
+@lib ${KDE}/libarts_xine.so.${LIBarts_xine_VERSION}
+@lib ${KDE}/libartsbuilder.so.${LIBartsbuilder_VERSION}
+@lib ${KDE}/libartscontrolapplet.so.${LIBartscontrolapplet_VERSION}
+@lib ${KDE}/libartscontrolsupport.so.${LIBartscontrolsupport_VERSION}
+@lib ${KDE}/libartsgui.so.${LIBartsgui_VERSION}
+@lib ${KDE}/libartsgui_idl.so.${LIBartsgui_idl_VERSION}
+@lib ${KDE}/libartsgui_kde.so.${LIBartsgui_kde_VERSION}
+@lib ${KDE}/libartsmidi.so.${LIBartsmidi_VERSION}
+@lib ${KDE}/libartsmidi_idl.so.${LIBartsmidi_idl_VERSION}
+@lib ${KDE}/libartsmodules.so.${LIBartsmodules_VERSION}
+@lib ${KDE}/libartsmodulescommon.so.${LIBartsmodulescommon_VERSION}
+@lib ${KDE}/libartsmoduleseffects.so.${LIBartsmoduleseffects_VERSION}
+@lib ${KDE}/libartsmodulesmixers.so.${LIBartsmodulesmixers_VERSION}
+@lib ${KDE}/libartsmodulessynth.so.${LIBartsmodulessynth_VERSION}
 ${KDE}/libaudiocd_encoder_flac.la
 ${KDE}/libaudiocd_encoder_flac.so
 ${KDE}/libaudiocd_encoder_lame.la
@@ -220,14 +239,22 @@ ${KDE}/libaudiocd_encoder_vorbis.la
 ${KDE}/libaudiocd_encoder_vorbis.so
 ${KDE}/libaudiocd_encoder_wav.la
 ${KDE}/libaudiocd_encoder_wav.so
+@lib ${KDE}/libaudiocdplugins.so.${LIBaudiocdplugins_VERSION}
 ${KDE}/libkaboodlepart.la
 ${KDE}/libkaboodlepart.so
+@lib ${KDE}/libkcddb.so.${LIBkcddb_VERSION}
+@lib ${KDE}/libkmidlib.so.${LIBkmidlib_VERSION}
 ${KDE}/libkmidpart.la
 ${KDE}/libkmidpart.so
 ${KDE}/libkrecexport_ogg.la
 ${KDE}/libkrecexport_ogg.so
 ${KDE}/libkrecexport_wave.la
 ${KDE}/libkrecexport_wave.so
+@lib ${KDE}/libnoatun.so.${LIBnoatun_VERSION}
+@lib ${KDE}/libnoatuncontrols.so.${LIBnoatuncontrols_VERSION}
+@lib ${KDE}/libnoatuntags.so.${LIBnoatuntags_VERSION}
+@lib ${KDE}/libyafcore.so.${LIByafcore_VERSION}
+@lib ${KDE}/libyafxplayer.so.${LIByafxplayer_VERSION}
 ${KDE}/noatun.la
 ${KDE}/noatun.so
 ${KDE}/noatun_dcopiface.la
diff --git a/x11/kde/network3/Makefile b/x11/kde/network3/Makefile
index 916a8d103f2..ebf239107fd 100644
--- a/x11/kde/network3/Makefile
+++ b/x11/kde/network3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.65 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.66 2010/07/08 21:28:49 espie Exp $
 
 COMMENT = 		K Desktop Environment, network applications
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdenetwork-${VERSION}
-PKGNAME =		${DISTNAME}p4
+PKGNAME =		${DISTNAME}p5
 MODKDE_VERSION =	3.5.8
 FLAVORS =		debug
 SHARED_LIBS +=	kopete               2.0      # .1.0
@@ -16,21 +16,31 @@ SHARED_LIBS +=	rss                  2.0      # .1.0
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = 	kdecore.>=6,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,ktexteditor,kutils,kwalletclient,vcard,kspell,kdnssd,knewstuff::x11/kde/libs3 \
-	xmms::audio/xmms \
-	idn::devel/libidn \
-	meanwhile::net/meanwhile
+LIB_DEPENDS = 	::x11/kde/libs3 \
+		::audio/xmms \
+		::devel/libidn \
+		::net/meanwhile
 RUN_DEPENDS +=	::security/qca-tls
 
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xi Xrender Xss Xtst Xxf86vm art_lgpl_2 c \
-		crypto gdk glib gmodule gtk jpeg m pcre pcreposix \
-		png pthread ssl stdc++ util xml2 xslt z glib-2.0 gmodule-2.0 \
-		Xau Xdmcp fam rpcsvc pthread-stubs xcb
+WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \
+	Xmu Xrandr Xrender Xss Xt Xtst Xxf86vm art_lgpl_2 c crypto drm expat \
+	fam fontconfig freetype gdk glib glib-2.0 gmodule gmodule-2.0 gtk idn \
+	jpeg lcms lib/kde3/DCOP lib/kde3/kabc lib/kde3/kdecore.>=6 \
+	lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui \
+	lib/kde3/kdnssd lib/kde3/khtml lib/kde3/kio lib/kde3/kjs \
+	lib/kde3/knewstuff lib/kde3/kparts lib/kde3/kresources lib/kde3/kspell \
+	lib/kde3/ktexteditor lib/kde3/kutils lib/kde3/kwalletclient \
+	lib/kde3/vcard m meanwhile mng pcre pcreposix png pthread \
+	pthread-stubs ssl stdc++ util xcb xml2 xmms xslt z
+
 
 post-configure:
 	@touch ${WRKSRC}/Makefile.in
 	@touch ${WRKBUILD}/Makefile
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 .include <bsd.port.mk>
diff --git a/x11/kde/network3/pkg/PLIST b/x11/kde/network3/pkg/PLIST
index 1de0d9db778..3ae5effa2dc 100644
--- a/x11/kde/network3/pkg/PLIST
+++ b/x11/kde/network3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.40 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.41 2010/07/08 21:28:49 espie Exp $
 @conflict sirc-*
 bin/dsirc
 @bin bin/feedbrowser
@@ -9,7 +9,7 @@ bin/dsirc
 bin/kopete_latexconvert.sh
 @mode u+s
 @owner root
-bin/kppp
+@bin bin/kppp
 @mode
 @owner
 @bin bin/kppplogview
@@ -233,8 +233,13 @@ ${KDE}/ksirc.la
 ${KDE}/ksirc.so
 ${KDE}/libkntsrcfilepropsdlg.la
 ${KDE}/libkntsrcfilepropsdlg.so
+@lib ${KDE}/libkopete.so.${LIBkopete_VERSION}
+@lib ${KDE}/libkopete_msn_shared.so.${LIBkopete_msn_shared_VERSION}
+@lib ${KDE}/libkopete_oscar.so.${LIBkopete_oscar_VERSION}
+@lib ${KDE}/libkopete_videodevice.so.${LIBkopete_videodevice_VERSION}
 ${KDE}/libkrichtexteditpart.la
 ${KDE}/libkrichtexteditpart.so
+@lib ${KDE}/librss.so.${LIBrss_VERSION}
 lib/libkdeinit_kdict.la
 lib/libkdeinit_kdict.so
 lib/libkdeinit_ksirc.la
diff --git a/x11/kde/office3/Makefile b/x11/kde/office3/Makefile
index b54f1592648..3cf62e046a2 100644
--- a/x11/kde/office3/Makefile
+++ b/x11/kde/office3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2010/05/15 08:48:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.61 2010/07/08 21:28:49 espie Exp $
 
 COMMENT=		office suite for KDE
 
@@ -8,7 +8,7 @@ VMEM_WARNING=		Yes
 MASTER_SITES?=		${MASTER_SITE_KDE:S@$@stable/koffice-${VERSION}/src/@}
 
 DISTNAME=	koffice-${VERSION}
-PKGNAME=	${DISTNAME}p12
+PKGNAME=	${DISTNAME}p13
 
 MASTER_SITES0=		ftp://ftp.kde.org/pub/kde/security_patches/
 PATCHFILES=		koffice-xpdf-CVE-2007-3387.diff:0 \
@@ -79,33 +79,46 @@ AUTOCONF_VERSION=2.61
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS+=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=	kdecore.>=4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kparts,kspell,kabc,kjs,kresources,ktexteditor,kutils,kwalletclient,vcard,kspell2,knewstuff,kmdi::x11/kde/libs3 \
-		python2.5:python->=2.5,<2.6:lang/python/2.5 \
-		art_lgpl_2.>=5::graphics/libart \
-		wv2::converters/wv2 \
-		MagickCore.>=1,MagickWand.>=1::graphics/ImageMagick \
-		jbig::graphics/jbigkit \
-		mysqlclient::databases/mysql \
-		ruby::lang/ruby \
-		exif.>=12::graphics/libexif \
-		paper::print/libpaper \
-		poppler-qt::print/poppler,-qt \
-		GraphicsMagick.>=1::graphics/GraphicsMagick \
-		wpd::textproc/libwpd
+LIB_DEPENDS=	::x11/kde/libs3 \
+		:python->=2.5,<2.6:lang/python/2.5 \
+		::graphics/libart \
+		::converters/wv2 \
+		::graphics/ImageMagick \
+		::graphics/jbigkit \
+		::databases/mysql \
+		::lang/ruby \
+		::graphics/libexif \
+		::print/libpaper \
+		::print/poppler,-qt \
+		::graphics/GraphicsMagick \
+		::textproc/libwpd \
+		::databases/libpqxx \
+		::databases/postgresql
 
 
-WANTLIB=	ICE SM X11 Xext Xrender artsflow artsflow_idl audiofile bz2 c \
-		freetype glib-2.0 gmodule-2.0 gobject-2.0 \
-		gsf-1 gthread-2.0 jasper jpeg kmedia2_idl lcms \
-		m mad mcop ogg pcre pcreposix png pthread qtmcop sndio \
-		soundserver_idl stdc++ tiff util vorbis vorbisenc vorbisfile \
-		xml2 xslt z Xt termcap Xi fontconfig crypto readline ssl \
-		IlmImf Half Imath Iex idn GL GLU poppler pthread-stubs xcb \
-		Xau Xdmcp expat fam rpcsvc IlmThread gio-2.0 wmflite
+WANTLIB= GL GLU GraphicsMagick.>=1 Half ICE Iex IlmImf IlmThread Imath \
+	MagickCore.>=1 MagickWand.>=1 SM X11 Xau Xcursor Xdamage Xdmcp Xext \
+	Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2.>=5 \
+	artsflow artsflow_idl audiofile bz2 c crypto drm exif.>=12 expat fam \
+	fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsf-1 \
+	gthread-2.0 idn jasper jbig jpeg kmedia2_idl lcms lib/kde3/DCOP \
+	lib/kde3/artskde lib/kde3/kabc lib/kde3/kdecore.>=4 lib/kde3/kdefx \
+	lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui lib/kde3/khtml \
+	lib/kde3/kio lib/kde3/kjs lib/kde3/kmdi lib/kde3/knewstuff \
+	lib/kde3/kparts lib/kde3/kresources lib/kde3/kspell lib/kde3/kspell2 \
+	lib/kde3/ktexteditor lib/kde3/kutils lib/kde3/kwalletclient \
+	lib/kde3/vcard m mad mcop mng mysqlclient ogg openjpeg paper pcre \
+	pcreposix png poppler poppler-qt pq pqxx pthread pthread-stubs \
+	python2.5 qtmcop readline ruby sndio soundserver_idl ssl stdc++ \
+	termcap tiff util vorbis vorbisenc vorbisfile wmflite-0.2 wpd \
+	wv2 xcb xml2 xslt z
 
 
 CONFIGURE_ARGS+= --with-pgsqlincdir=${LOCALBASE}/include/postgresql
-LIB_DEPENDS+=	pqxx::databases/libpqxx \
-		pq::databases/postgresql
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
+
 
 .include <bsd.port.mk>
diff --git a/x11/kde/office3/pkg/PLIST b/x11/kde/office3/pkg/PLIST
index d6615306c71..a20e9c86f60 100644
--- a/x11/kde/office3/pkg/PLIST
+++ b/x11/kde/office3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.29 2010/05/15 08:48:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.30 2010/07/08 21:28:49 espie Exp $
 @bin bin/karbon
 @bin bin/kchart
 @bin bin/kexi
@@ -608,6 +608,7 @@ ${KDE}/libhtmlimport.la
 ${KDE}/libhtmlimport.so
 ${KDE}/libkarbonaiimport.la
 ${KDE}/libkarbonaiimport.so
+@lib ${KDE}/libkarboncommon.so.${LIBkarboncommon_VERSION}
 ${KDE}/libkarbonepsexport.la
 ${KDE}/libkarbonepsexport.so
 ${KDE}/libkarbonepsimport.la
@@ -628,6 +629,8 @@ ${KDE}/libkarbonxcfexport.la
 ${KDE}/libkarbonxcfexport.so
 ${KDE}/libkchartbmpexport.la
 ${KDE}/libkchartbmpexport.so
+@lib ${KDE}/libkchartcommon.so.${LIBkchartcommon_VERSION}
+@lib ${KDE}/libkchartimageexport.so.${LIBkchartimageexport_VERSION}
 ${KDE}/libkchartjpegexport.la
 ${KDE}/libkchartjpegexport.so
 ${KDE}/libkchartmngexport.la
@@ -642,6 +645,20 @@ ${KDE}/libkchartxbmexport.la
 ${KDE}/libkchartxbmexport.so
 ${KDE}/libkchartxpmexport.la
 ${KDE}/libkchartxpmexport.so
+@lib ${KDE}/libkdchart.so.${LIBkdchart_VERSION}
+@lib ${KDE}/libkexicore.so.${LIBkexicore_VERSION}
+@lib ${KDE}/libkexidatatable.so.${LIBkexidatatable_VERSION}
+@lib ${KDE}/libkexidb.so.${LIBkexidb_VERSION}
+@lib ${KDE}/libkexidbparser.so.${LIBkexidbparser_VERSION}
+@lib ${KDE}/libkexiextendedwidgets.so.${LIBkexiextendedwidgets_VERSION}
+@lib ${KDE}/libkexiformutils.so.${LIBkexiformutils_VERSION}
+@lib ${KDE}/libkexiguiutils.so.${LIBkexiguiutils_VERSION}
+@lib ${KDE}/libkeximain.so.${LIBkeximain_VERSION}
+@lib ${KDE}/libkeximigrate.so.${LIBkeximigrate_VERSION}
+@lib ${KDE}/libkexirelationsview.so.${LIBkexirelationsview_VERSION}
+@lib ${KDE}/libkexisql2.so.${LIBkexisql2_VERSION}
+@lib ${KDE}/libkexisql3.so.${LIBkexisql3_VERSION}
+@lib ${KDE}/libkexiutils.so.${LIBkexiutils_VERSION}
 ${KDE}/libkfolatexexport.la
 ${KDE}/libkfolatexexport.so
 ${KDE}/libkfomathmlexport.la
@@ -650,10 +667,13 @@ ${KDE}/libkfomathmlimport.la
 ${KDE}/libkfomathmlimport.so
 ${KDE}/libkfopngexport.la
 ${KDE}/libkfopngexport.so
+@lib ${KDE}/libkformdesigner.so.${LIBkformdesigner_VERSION}
+@lib ${KDE}/libkformulalib.so.${LIBkformulalib_VERSION}
 ${KDE}/libkformulapart.la
 ${KDE}/libkformulapart.so
 ${KDE}/libkfosvgexport.la
 ${KDE}/libkfosvgexport.so
+@lib ${KDE}/libkiviocommon.so.${LIBkiviocommon_VERSION}
 ${KDE}/libkivioconnectortool.la
 ${KDE}/libkivioconnectortool.so
 ${KDE}/libkivioimageexport.la
@@ -668,12 +688,21 @@ ${KDE}/libkiviotexttool.la
 ${KDE}/libkiviotexttool.so
 ${KDE}/libkiviozoomtool.la
 ${KDE}/libkiviozoomtool.so
+@lib ${KDE}/libkochart.so.${LIBkochart_VERSION}
+@lib ${KDE}/libkofficecore.so.${LIBkofficecore_VERSION}
+@lib ${KDE}/libkofficeui.so.${LIBkofficeui_VERSION}
+@lib ${KDE}/libkopainter.so.${LIBkopainter_VERSION}
+@lib ${KDE}/libkopalette.so.${LIBkopalette_VERSION}
+@lib ${KDE}/libkoproperty.so.${LIBkoproperty_VERSION}
+@lib ${KDE}/libkotext.so.${LIBkotext_VERSION}
 ${KDE}/libkounavailpart.la
 ${KDE}/libkounavailpart.so
+@lib ${KDE}/libkowmf.so.${LIBkowmf_VERSION}
 ${KDE}/libkplatopart.la
 ${KDE}/libkplatopart.so
 ${KDE}/libkpresenterbmpexport.la
 ${KDE}/libkpresenterbmpexport.so
+@lib ${KDE}/libkpresenterimageexport.so.${LIBkpresenterimageexport_VERSION}
 ${KDE}/libkpresenterjpegexport.la
 ${KDE}/libkpresenterjpegexport.so
 ${KDE}/libkpresentermngexport.la
@@ -682,6 +711,7 @@ ${KDE}/libkpresenterpart.la
 ${KDE}/libkpresenterpart.so
 ${KDE}/libkpresenterpngexport.la
 ${KDE}/libkpresenterpngexport.so
+@lib ${KDE}/libkpresenterprivate.so.${LIBkpresenterprivate_VERSION}
 ${KDE}/libkpresentersvgexport.la
 ${KDE}/libkpresentersvgexport.so
 ${KDE}/libkpresenterxbmexport.la
@@ -690,16 +720,28 @@ ${KDE}/libkpresenterxpmexport.la
 ${KDE}/libkpresenterxpmexport.so
 ${KDE}/libkprkword.la
 ${KDE}/libkprkword.so
+@lib ${KDE}/libkrita_cmyk_u16.so.${LIBkrita_cmyk_u16_VERSION}
+@lib ${KDE}/libkrita_gray_u16.so.${LIBkrita_gray_u16_VERSION}
+@lib ${KDE}/libkrita_lms_f32.so.${LIBkrita_lms_f32_VERSION}
 ${KDE}/libkrita_openexr_export.la
 ${KDE}/libkrita_openexr_export.so
 ${KDE}/libkrita_openexr_import.la
 ${KDE}/libkrita_openexr_import.so
 ${KDE}/libkrita_raw_import.la
 ${KDE}/libkrita_raw_import.so
+@lib ${KDE}/libkrita_rgb_f16half.so.${LIBkrita_rgb_f16half_VERSION}
+@lib ${KDE}/libkrita_rgb_f32.so.${LIBkrita_rgb_f32_VERSION}
+@lib ${KDE}/libkrita_rgb_u16.so.${LIBkrita_rgb_u16_VERSION}
+@lib ${KDE}/libkrita_ycbcr_u16.so.${LIBkrita_ycbcr_u16_VERSION}
+@lib ${KDE}/libkrita_ycbcr_u8.so.${LIBkrita_ycbcr_u8_VERSION}
+@lib ${KDE}/libkritacolor.so.${LIBkritacolor_VERSION}
+@lib ${KDE}/libkritacommon.so.${LIBkritacommon_VERSION}
 ${KDE}/libkritagmagickexport.la
 ${KDE}/libkritagmagickexport.so
 ${KDE}/libkritagmagickimport.la
 ${KDE}/libkritagmagickimport.so
+@lib ${KDE}/libkritagrayscale.so.${LIBkritagrayscale_VERSION}
+@lib ${KDE}/libkritaimage.so.${LIBkritaimage_VERSION}
 ${KDE}/libkritajpegexport.la
 ${KDE}/libkritajpegexport.so
 ${KDE}/libkritajpegimport.la
@@ -712,10 +754,16 @@ ${KDE}/libkritapngexport.la
 ${KDE}/libkritapngexport.so
 ${KDE}/libkritapngimport.la
 ${KDE}/libkritapngimport.so
+@lib ${KDE}/libkritargb.so.${LIBkritargb_VERSION}
+@lib ${KDE}/libkritascripting.so.${LIBkritascripting_VERSION}
 ${KDE}/libkritatiffexport.la
 ${KDE}/libkritatiffexport.so
 ${KDE}/libkritatiffimport.la
 ${KDE}/libkritatiffimport.so
+@lib ${KDE}/libkritaui.so.${LIBkritaui_VERSION}
+@lib ${KDE}/libkrossapi.so.${LIBkrossapi_VERSION}
+@lib ${KDE}/libkrossmain.so.${LIBkrossmain_VERSION}
+@lib ${KDE}/libkspreadcommon.so.${LIBkspreadcommon_VERSION}
 ${KDE}/libkspreadhtmlexport.la
 ${KDE}/libkspreadhtmlexport.so
 ${KDE}/libkspreadinsertcalendar.la
@@ -726,18 +774,24 @@ ${KDE}/libkspreadlatexexport.la
 ${KDE}/libkspreadlatexexport.so
 ${KDE}/libkspreadpart.la
 ${KDE}/libkspreadpart.so
+@lib ${KDE}/libkstore.so.${LIBkstore_VERSION}
 ${KDE}/libkudesignerpart.la
 ${KDE}/libkudesignerpart.so
+@lib ${KDE}/libkugarlib.so.${LIBkugarlib_VERSION}
 ${KDE}/libkugarnopimport.la
 ${KDE}/libkugarnopimport.so
 ${KDE}/libkugarpart.la
 ${KDE}/libkugarpart.so
+@lib ${KDE}/libkwmailmerge_interface.so.${LIBkwmailmerge_interface_VERSION}
+@lib ${KDE}/libkwmf.so.${LIBkwmf_VERSION}
+@lib ${KDE}/libkwordexportfilters.so.${LIBkwordexportfilters_VERSION}
 ${KDE}/libkwordkword1dot3import.la
 ${KDE}/libkwordkword1dot3import.so
 ${KDE}/libkwordlatexexport.la
 ${KDE}/libkwordlatexexport.so
 ${KDE}/libkwordpart.la
 ${KDE}/libkwordpart.so
+@lib ${KDE}/libkwordprivate.so.${LIBkwordprivate_VERSION}
 ${KDE}/libmswordimport.la
 ${KDE}/libmswordimport.so
 ${KDE}/libmswriteexport.la
diff --git a/x11/kde/okle/Makefile b/x11/kde/okle/Makefile
index af599310159..2613e7df310 100644
--- a/x11/kde/okle/Makefile
+++ b/x11/kde/okle/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.15 2009/12/21 20:46:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/07/08 21:28:49 espie Exp $
 
 COMMENT= 		kde front end for ogle
 CATEGORIES=		x11 x11/kde 
 VERSION=		3.0
 DISTNAME=		okle-0.3
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 HOMEPAGE=		http://okle.sourceforge.net/
 MASTER_SITES=		http://okle.sourceforge.net/src/
 EXTRACT_SUFX=		.tar.gz
-LIB_DEPENDS=	kdecore.>=4,DCOP,kdefx,kdesu,kdeui,kio,kwalletclient::x11/kde/libs3 \
-		dvdcontrol,msgevents::x11/ogle
+LIB_DEPENDS=	::x11/kde/libs3 \
+		::x11/ogle
 
 CONFIGURE_ARGS+=--with-ogle-libs='${LOCALBASE}/lib/ogle -L${LOCALBASE}/lib'
 CONFIGURE_ARGS+=--with-ogle-includes=${LOCALBASE}/include
@@ -19,8 +19,9 @@ USE_LIBTOOL=	Yes
 
 MODULES=	x11/kde devel/gettext
 
-WANTLIB += ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam
-WANTLIB += idn jpeg m png pthread qt-mt rpcsvc stdc++ util xml2
-WANTLIB += z pthread-stubs xcb
+WANTLIB += ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c dvdcontrol fam idn \
+	jpeg lib/kde3/DCOP lib/kde3/kdecore.>=4 lib/kde3/kdefx lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/kio lib/kde3/kwalletclient m msgevents png \
+	pthread pthread-stubs qt-mt stdc++ util xcb xml2 z
 
 .include <bsd.port.mk>
diff --git a/x11/kde/pim3/Makefile b/x11/kde/pim3/Makefile
index bb85fb95c62..75fa37c34de 100644
--- a/x11/kde/pim3/Makefile
+++ b/x11/kde/pim3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.63 2010/07/03 10:13:28 espie Exp $
+# $OpenBSD: Makefile,v 1.64 2010/07/08 21:28:49 espie Exp $
 
 COMMENT = 		KDE personal information applications
 COMMENT-kpilot =	KDE interface to sync with Palm Pilot
 CATEGORIES =		x11 x11/kde productivity
 VERSION =		3.5.10
 DISTNAME =		kdepim-${VERSION}
-PKGNAME =		${DISTNAME}p4
+PKGNAME =		${DISTNAME}p5
 MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	index                1.0      # .0.0
 SHARED_LIBS +=	kgantt               1.0      # .0.2
@@ -22,14 +22,9 @@ SHARED_LIBS +=	kcal                 4.0      # .2.0
 SHARED_LIBS +=	kleopatra            2.0      # .1.0
 SHARED_LIBS +=	kdepim               2.0      # .1.0
 SHARED_LIBS +=	kpilot               1.0      # .0.0
-SHARED_LIBS +=	ksync                2.0      # .1.0
 SHARED_LIBS +=	kpimidentities       2.0      # .1.0
 SHARED_LIBS +=	kpimexchange         2.0      # .1.0
 SHARED_LIBS +=	knodecommon          0.0      # .3.0
-SHARED_LIBS +=	ksync2               1.0      # .0.0
-SHARED_LIBS +=	konnector            1.0      # .0.0
-SHARED_LIBS +=	kitchensyncui        1.0      # .0.0
-SHARED_LIBS +=	multisynk            1.0      # .0.0
 SHARED_LIBS +=	kocorehelper         2.0      # .1.0
 SHARED_LIBS +=	korg_stdprinting     2.0      # .1.0
 SHARED_LIBS +=	korganizer_eventviewer 2.0      # .1.0
@@ -65,26 +60,36 @@ SHARED_LIBS +=	kontact              2.0      # .1.0
 
 MODULES =	x11/kde devel/gettext
 
-LIB_DEPENDS +=	kdecore.>=6,artskde,knewstuff,DCOP,kabc,kabc_file,kimproxy,kdefakes,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,kutils,kwalletclient,vcard::x11/kde/libs3
+LIB_DEPENDS +=	::x11/kde/libs3
+
+WANTLIB = GL GLU ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi \
+	Xinerama Xmu Xpm Xrandr Xrender Xss Xt Xxf86vm art_lgpl_2 artsflow \
+	artsflow_idl audiofile c drm expat fam fontconfig freetype glib-2.0 \
+	gmodule-2.0 gnokii gpg-error gpgme gthread-2.0 ical idn jpeg \
+	kmedia2_idl lcms lib/kde3/DCOP lib/kde3/artskde lib/kde3/kabc \
+	lib/kde3/kabc_file lib/kde3/kdecore.>=6 lib/kde3/kdefakes \
+	lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui \
+	lib/kde3/khtml lib/kde3/kimproxy lib/kde3/kio lib/kde3/kjs \
+	lib/kde3/knewstuff lib/kde3/kparts lib/kde3/kresources lib/kde3/kspell \
+	lib/kde3/kutils lib/kde3/kwalletclient lib/kde3/vcard m mad mal.>=1 \
+	mcop mng ogg pcre pcreposix pisock png pthread pthread-stubs qtmcop \
+	qui sasl2 sasl2 sndio soundserver_idl stdc++ usb util vorbis vorbisenc \
+	vorbisfile xcb z
+
 
-WANTLIB =	Xss audiofile stdc++ sndio X11 jpeg util m \
-		vorbisfile gmodule-2.0 gthread-2.0 \
-		pcreposix vorbisenc qui SM pthread \
-		c artsflow ogg mcop png Xext \
-		artsflow_idl art_lgpl_2 mad qtmcop \
-		glib-2.0 ICE soundserver_idl Xrender \
-		gpg-error vorbis pcre z sasl2 idn \
-		Xau Xdmcp fam rpcsvc Xpm usb ical \
-		pthread-stubs xcb kmedia2_idl
 
 FLAVORS =	debug
-LIB_DEPENDS +=	pisock::comms/pilot-link
+LIB_DEPENDS +=	::comms/pilot-link
 RUN_DEPENDS +=	::x11/kde/base3 \
 		:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS +=	gpgme:gpgme->=0.4.5:security/gpgme \
-		sasl2::security/cyrus-sasl2 \
-		mal.>=1::comms/libmal \
-		gnokii::comms/gnokii
+LIB_DEPENDS +=	:gpgme->=0.4.5:security/gpgme \
+		::security/cyrus-sasl2 \
+		::comms/libmal \
+		::comms/gnokii
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 #MULTI_PACKAGES=-kpilot
 FULLPKGNAME-kpilot = kpilot-${VERSION}p0
diff --git a/x11/kde/pim3/pkg/PLIST b/x11/kde/pim3/pkg/PLIST
index ec13c4e14f5..6720ee1fc55 100644
--- a/x11/kde/pim3/pkg/PLIST
+++ b/x11/kde/pim3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.33 2010/05/15 08:48:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.34 2010/07/08 21:28:49 espie Exp $
 @conflict kdelibs-<3.4
 @conflict kdebase-<3.4
 @conflict kpilot-*
@@ -398,8 +398,19 @@ ${KDE}/libegroupwarewizard.la
 ${KDE}/libegroupwarewizard.so
 ${KDE}/libexchangewizard.la
 ${KDE}/libexchangewizard.so
+@lib ${KDE}/libgpgme++.so.${LIBgpgme++_VERSION}
 ${KDE}/libgroupwisewizard.la
 ${KDE}/libgroupwisewizard.so
+@lib ${KDE}/libgwsoap.so.${LIBgwsoap_VERSION}
+@lib ${KDE}/libindex.so.${LIBindex_VERSION}
+@lib ${KDE}/libkabc_groupdav.so.${LIBkabc_groupdav_VERSION}
+@lib ${KDE}/libkabc_groupwise.so.${LIBkabc_groupwise_VERSION}
+@lib ${KDE}/libkabc_newexchange.so.${LIBkabc_newexchange_VERSION}
+@lib ${KDE}/libkabc_slox.so.${LIBkabc_slox_VERSION}
+@lib ${KDE}/libkabc_xmlrpc.so.${LIBkabc_xmlrpc_VERSION}
+@lib ${KDE}/libkabckolab.so.${LIBkabckolab_VERSION}
+@lib ${KDE}/libkabcscalix.so.${LIBkabcscalix_VERSION}
+@lib ${KDE}/libkabinterfaces.so.${LIBkabinterfaces_VERSION}
 ${KDE}/libkaddrbk_bookmark_xxport.la
 ${KDE}/libkaddrbk_bookmark_xxport.so
 ${KDE}/libkaddrbk_cardview.la
@@ -430,10 +441,27 @@ ${KDE}/libkaddrbk_tableview.la
 ${KDE}/libkaddrbk_tableview.so
 ${KDE}/libkaddrbk_vcard_xxport.la
 ${KDE}/libkaddrbk_vcard_xxport.so
+@lib ${KDE}/libkaddressbook.so.${LIBkaddressbook_VERSION}
 ${KDE}/libkaddressbookpart.la
 ${KDE}/libkaddressbookpart.so
 ${KDE}/libkarmpart.la
 ${KDE}/libkarmpart.so
+@lib ${KDE}/libkcal.so.${LIBkcal_VERSION}
+@lib ${KDE}/libkcal_groupdav.so.${LIBkcal_groupdav_VERSION}
+@lib ${KDE}/libkcal_groupwise.so.${LIBkcal_groupwise_VERSION}
+@lib ${KDE}/libkcal_newexchange.so.${LIBkcal_newexchange_VERSION}
+@lib ${KDE}/libkcal_resourcefeatureplan.so.${LIBkcal_resourcefeatureplan_VERSION}
+@lib ${KDE}/libkcal_resourceremote.so.${LIBkcal_resourceremote_VERSION}
+@lib ${KDE}/libkcal_slox.so.${LIBkcal_slox_VERSION}
+@lib ${KDE}/libkcal_xmlrpc.so.${LIBkcal_xmlrpc_VERSION}
+@lib ${KDE}/libkcalkolab.so.${LIBkcalkolab_VERSION}
+@lib ${KDE}/libkcalscalix.so.${LIBkcalscalix_VERSION}
+@lib ${KDE}/libkdepim.so.${LIBkdepim_VERSION}
+@lib ${KDE}/libkgantt.so.${LIBkgantt_VERSION}
+@lib ${KDE}/libkgroupwarebase.so.${LIBkgroupwarebase_VERSION}
+@lib ${KDE}/libkgroupwaredav.so.${LIBkgroupwaredav_VERSION}
+@lib ${KDE}/libkholidays.so.${LIBkholidays_VERSION}
+@lib ${KDE}/libkleopatra.so.${LIBkleopatra_VERSION}
 ${KDE}/libkmail_bodypartformatter_application_octetstream.la
 ${KDE}/libkmail_bodypartformatter_application_octetstream.so
 ${KDE}/libkmail_bodypartformatter_text_calendar.la
@@ -444,10 +472,18 @@ ${KDE}/libkmail_bodypartformatter_text_xdiff.la
 ${KDE}/libkmail_bodypartformatter_text_xdiff.so
 ${KDE}/libkmailpart.la
 ${KDE}/libkmailpart.so
+@lib ${KDE}/libkmime.so.${LIBkmime_VERSION}
+@lib ${KDE}/libknodecommon.so.${LIBknodecommon_VERSION}
 ${KDE}/libknodepart.la
 ${KDE}/libknodepart.so
+@lib ${KDE}/libknotes_xmlrpc.so.${LIBknotes_xmlrpc_VERSION}
+@lib ${KDE}/libknoteskolab.so.${LIBknoteskolab_VERSION}
+@lib ${KDE}/libknotesscalix.so.${LIBknotesscalix_VERSION}
+@lib ${KDE}/libkocorehelper.so.${LIBkocorehelper_VERSION}
+@lib ${KDE}/libkode.so.${LIBkode_VERSION}
 ${KDE}/libkolabwizard.la
 ${KDE}/libkolabwizard.so
+@lib ${KDE}/libkontact.so.${LIBkontact_VERSION}
 ${KDE}/libkontact_akregator.la
 ${KDE}/libkontact_akregator.so
 ${KDE}/libkontact_journalplugin.la
@@ -484,10 +520,24 @@ ${KDE}/libkorg_hebrew.la
 ${KDE}/libkorg_hebrew.so
 ${KDE}/libkorg_journalprint.la
 ${KDE}/libkorg_journalprint.so
+@lib ${KDE}/libkorg_stdprinting.so.${LIBkorg_stdprinting_VERSION}
 ${KDE}/libkorg_yearlyprint.la
 ${KDE}/libkorg_yearlyprint.so
+@lib ${KDE}/libkorganizer.so.${LIBkorganizer_VERSION}
+@lib ${KDE}/libkorganizer_calendar.so.${LIBkorganizer_calendar_VERSION}
+@lib ${KDE}/libkorganizer_eventviewer.so.${LIBkorganizer_eventviewer_VERSION}
 ${KDE}/libkorganizerpart.la
 ${KDE}/libkorganizerpart.so
+@lib ${KDE}/libkpgp.so.${LIBkpgp_VERSION}
+@lib ${KDE}/libkpilot.so.${LIBkpilot_VERSION}
+@lib ${KDE}/libkpimexchange.so.${LIBkpimexchange_VERSION}
+@lib ${KDE}/libkpimidentities.so.${LIBkpimidentities_VERSION}
+@lib ${KDE}/libkpinterfaces.so.${LIBkpinterfaces_VERSION}
+@lib ${KDE}/libksieve.so.${LIBksieve_VERSION}
+@lib ${KDE}/libkslox.so.${LIBkslox_VERSION}
+@lib ${KDE}/libktnef.so.${LIBktnef_VERSION}
+@lib ${KDE}/libmimelib.so.${LIBmimelib_VERSION}
+@lib ${KDE}/libqgpgme.so.${LIBqgpgme_VERSION}
 ${KDE}/libscalixwizard.la
 ${KDE}/libscalixwizard.so
 ${KDE}/libsloxwizard.la
diff --git a/x11/kde/sdk3/Makefile b/x11/kde/sdk3/Makefile
index 937aea4f48a..ca5d84c9156 100644
--- a/x11/kde/sdk3/Makefile
+++ b/x11/kde/sdk3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2010/05/15 08:48:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2010/07/08 21:28:49 espie Exp $
 
 COMMENT-main = 		K Desktop Environment, developer extensions
 COMMENT-svn = 		K Desktop Environment, svn extensions
@@ -6,8 +6,8 @@ CATEGORIES =		x11 x11/kde devel
 VERSION =		3.5.10
 DISTNAME =		kdesdk-${VERSION}
 
-PKGNAME-main =		${DISTNAME}p4
-PKGNAME-svn =		kdesvn-${VERSION}p5
+PKGNAME-main =		${DISTNAME}p5
+PKGNAME-svn =		kdesvn-${VERSION}p6
 
 MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	cvsservice           1.0      # .0.1
@@ -22,32 +22,37 @@ MODULES =		x11/kde devel/gettext
 
 RUN_DEPENDS-main +=	:desktop-file-utils-*:devel/desktop-file-utils
 
-LIB_DEPENDS =		kdecore.>=6,DCOP,kdefx,kdesu,kdeui,kio,kwalletclient::x11/kde/libs3
+LIB_DEPENDS =		::x11/kde/libs3
 
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
-			kcal,kmime::x11/kde/pim3
+			::x11/kde/pim3
 
 LIB_DEPENDS-svn = 	${LIB_DEPENDS} \
-			svn_client-1,svn_diff-1,svn_delta-1,svn_fs-1,svn_fs_base-1,svn_fs_fs-1,svn_fs_util-1,svn_ra-1,svn_ra_local-1,svn_ra_neon-1,svn_ra_svn-1,svn_repos-1,svn_subr-1,svn_wc-1::devel/subversion
+			::devel/subversion
 
 FLAVORS =		debug
 SEPARATE_BUILD =	flavored
 
-WANTLIB	=	ICE SM X11 Xext Xrender art_lgpl_2 c jpeg m \
-		png pthread stdc++ util z idn \
-		Xau Xdmcp fam rpcsvc pthread-stubs xcb
+WANTLIB	= ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam idn jpeg \
+	lib/kde3/DCOP lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/kio lib/kde3/kwalletclient m png pthread \
+	pthread-stubs rpcsvc stdc++ util xcb z
 
-WANTLIB-main =	${WANTLIB} \
-		kabc kdeprint khtml kutils vcard kresources kparts kspell kjs \
-		ktexteditor ktnef kunittest ktnef \
-		pcre pcreposix qui-mt xml2 xslt
+WANTLIB-main = ${WANTLIB} Xfixes Xt expat fontconfig freetype kabc kdeprint \
+	khtml kjs kparts kresources kspell ktexteditor ktnef ktnef kunittest \
+	kutils lib/kde3/kcal lib/kde3/kmime pcre pcreposix qui-mt vcard xml2 \
+	xslt
 
 
-WANTLIB-svn =	${WANTLIB} \
-		apr-1 aprutil-1 crypto db expat neon sasl2 ssl \
-		asn1 gssapi krb5 sqlite3
+
+WANTLIB-svn = ${WANTLIB} apr-1 aprutil-1 asn1 crypto db expat gssapi krb5 \
+	neon sasl2 sqlite3 ssl svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
+	svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 svn_ra_local-1 \
+	svn_ra_neon-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1
 
 post-install:
 	cd ${PREFIX}/bin && mv cvscheck kcvscheck
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/sdk3/pkg/PLIST-main b/x11/kde/sdk3/pkg/PLIST-main
index b734fe24d52..52621614064 100644
--- a/x11/kde/sdk3/pkg/PLIST-main
+++ b/x11/kde/sdk3/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2010/05/15 08:48:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2010/07/08 21:28:49 espie Exp $
 @pkgpath x11/kde/sdk3
 bin/adddebug
 bin/build-progress.sh
@@ -169,12 +169,18 @@ ${KDE}/kfile_ts.la
 ${KDE}/kfile_ts.so
 ${KDE}/libcervisiapart.la
 ${KDE}/libcervisiapart.so
+@lib ${KDE}/libcvsservice.so.${LIBcvsservice_VERSION}
+@lib ${KDE}/libkbabelcommon.so.${LIBkbabelcommon_VERSION}
+@lib ${KDE}/libkbabeldictplugin.so.${LIBkbabeldictplugin_VERSION}
+@lib ${KDE}/libkompareinterface.so.${LIBkompareinterface_VERSION}
 ${KDE}/libkomparenavtreepart.la
 ${KDE}/libkomparenavtreepart.so
 ${KDE}/libkomparepart.la
 ${KDE}/libkomparepart.so
+@lib ${KDE}/libkspy.so.${LIBkspy_VERSION}
 ${KDE}/libkuiviewerpart.la
 ${KDE}/libkuiviewerpart.so
+@lib ${KDE}/libkunittestgui.so.${LIBkunittestgui_VERSION}
 ${KDE}/plugins/styles/scheck.la
 ${KDE}/plugins/styles/scheck.so
 ${KDE}/pothumbnail.la
diff --git a/x11/kde/sdk3/pkg/PLIST-svn b/x11/kde/sdk3/pkg/PLIST-svn
index 575ab685448..52f4ff49342 100644
--- a/x11/kde/sdk3/pkg/PLIST-svn
+++ b/x11/kde/sdk3/pkg/PLIST-svn
@@ -1,11 +1,14 @@
-@comment $OpenBSD: PLIST-svn,v 1.2 2010/05/15 08:48:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST-svn,v 1.3 2010/07/08 21:28:49 espie Exp $
 @bin bin/kio_svn_helper
 ${KDE}/kded_ksvnd.la
 ${KDE}/kded_ksvnd.so
 ${KDE}/kio_svn.la
 ${KDE}/kio_svn.so
+share/apps/konqueror/
+share/apps/konqueror/servicemenus/
 share/apps/konqueror/servicemenus/subversion.desktop
 share/apps/konqueror/servicemenus/subversion_toplevel.desktop
+share/config.kcfg/
 share/icons/crystalsvg/128x128/actions/svn_add.png
 share/icons/crystalsvg/128x128/actions/svn_branch.png
 share/icons/crystalsvg/128x128/actions/svn_merge.png
@@ -14,3 +17,9 @@ share/icons/crystalsvg/128x128/actions/svn_status.png
 share/icons/crystalsvg/128x128/actions/svn_switch.png
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/crystalsvg 2> /dev/null || true
 @unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/crystalsvg 2> /dev/null || true
+share/icons/locolor/
+share/icons/locolor/16x16/
+share/icons/locolor/16x16/apps/
+share/icons/locolor/32x32/
+share/icons/locolor/32x32/apps/
+share/services/kresources/kcal/
diff --git a/x11/kde/toys3/Makefile b/x11/kde/toys3/Makefile
index f2d7ed22ef5..03d9606267b 100644
--- a/x11/kde/toys3/Makefile
+++ b/x11/kde/toys3/Makefile
@@ -1,21 +1,27 @@
-# $OpenBSD: Makefile,v 1.47 2010/05/15 08:48:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2010/07/08 21:28:49 espie Exp $
 
 COMMENT = 		some useless KDE applications
 CATEGORIES =		x11 x11/kde games
 VERSION =		3.5.10
 DISTNAME =		kdetoys-${VERSION}
-PKGNAME =		${DISTNAME}p3
+PKGNAME =		${DISTNAME}p4
 MODKDE_VERSION ?=	3.5.8
 
 MODULES =		x11/kde devel/gettext
 
 RUN_DEPENDS +=		:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = 		kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kscreensaver,kutils,kwalletclient::x11/kde/libs3
+LIB_DEPENDS = 		::x11/kde/libs3
 
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 c jpeg m pcre pcreposix png \
-		pthread stdc++ util z idn Xau Xdmcp fam rpcsvc \
-		pthread-stubs xcb
+WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam idn jpeg \
+	lib/kde3/DCOP lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdeprint \
+	lib/kde3/kdesu lib/kde3/kdeui lib/kde3/khtml lib/kde3/kio lib/kde3/kjs \
+	lib/kde3/kparts lib/kde3/kscreensaver lib/kde3/kutils \
+	lib/kde3/kwalletclient m pcre pcreposix png pthread pthread-stubs \
+	stdc++ util xcb z
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 .include <bsd.port.mk>
diff --git a/x11/kde/utils3/Makefile b/x11/kde/utils3/Makefile
index 9be0a0ce94b..cc44f9b78c1 100644
--- a/x11/kde/utils3/Makefile
+++ b/x11/kde/utils3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.63 2010/05/15 08:48:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.64 2010/07/08 21:28:49 espie Exp $
 
 COMMENT = 		K Desktop Environment, utilities
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdeutils-${VERSION}
-PKGNAME =		${DISTNAME}p5
+PKGNAME =		${DISTNAME}p6
 MODKDE_VERSION =		3.5.8
 SHARED_LIBS +=	khexeditcommon       1.0      # .0.0
 SHARED_LIBS +=	kcmlaptop            1.0      # .0.0
@@ -15,19 +15,25 @@ SHARED_LIBS +=	ksimcore             2.0      # .1.0
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS =	DCOP,kabc,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kresources,kutils,kwalletclient,vcard::x11/kde/libs3 \
-		netsnmp::net/net-snmp \
-		gmp::devel/gmp \
-		python2.5:python->=2.5,<2.6:lang/python/2.5 \
-		xmms::audio/xmms \
-		gtk,gdk::x11/gtk+
+LIB_DEPENDS =	::x11/kde/libs3 \
+		::net/net-snmp \
+		::devel/gmp \
+		:python->=2.5,<2.6:lang/python/2.5 \
+		::audio/xmms \
+		::x11/gtk+
 
 
 SEPARATE_BUILD =	flavored
 
-WANTLIB =	ICE SM X11 Xext Xrender Xtst art_lgpl_2 c crypto jpeg m \
-		png pthread stdc++ util z gmodule Xi kvm glib \
-		idn Xau Xdmcp fam rpcsvc Xss pthread-stubs xcb
+WANTLIB = ICE SM X11 Xau Xdmcp Xext Xi Xrender Xss Xtst art_lgpl_2 c crypto \
+	fam gdk glib gmodule gmp gtk idn jpeg kvm lib/kde3/DCOP lib/kde3/kabc \
+	lib/kde3/kdecore.>=6 lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu \
+	lib/kde3/kdeui lib/kde3/kio lib/kde3/kparts lib/kde3/kresources \
+	lib/kde3/kutils lib/kde3/kwalletclient lib/kde3/vcard m netsnmp png \
+	pthread pthread-stubs python2.5 stdc++ util xcb xmms z
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/utils3/pkg/PLIST b/x11/kde/utils3/pkg/PLIST
index bb81fe2c916..8a6a83e14a2 100644
--- a/x11/kde/utils3/pkg/PLIST
+++ b/x11/kde/utils3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.26 2010/05/15 08:48:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.27 2010/07/08 21:28:50 espie Exp $
 @bin bin/ark
 @bin bin/irkick
 @bin bin/kcalc
@@ -81,10 +81,15 @@ ${KDE}/libarkpart.la
 ${KDE}/libarkpart.so
 ${KDE}/libkbyteseditwidget.la
 ${KDE}/libkbyteseditwidget.so
+@lib ${KDE}/libkcmlaptop.so.${LIBkcmlaptop_VERSION}
 ${KDE}/libkhexedit2part.la
 ${KDE}/libkhexedit2part.so
+@lib ${KDE}/libkhexeditcommon.so.${LIBkhexeditcommon_VERSION}
+@lib ${KDE}/libkmilo.so.${LIBkmilo_VERSION}
+@lib ${KDE}/libkregexpeditorcommon.so.${LIBkregexpeditorcommon_VERSION}
 ${KDE}/libkregexpeditorgui.la
 ${KDE}/libkregexpeditorgui.so
+@lib ${KDE}/libksimcore.so.${LIBksimcore_VERSION}
 lib/libkcmlaptop.la
 @lib lib/libkcmlaptop.so.${LIBkcmlaptop_VERSION}
 lib/libkdeinit_ark.la
diff --git a/x11/kde/webdev/Makefile b/x11/kde/webdev/Makefile
index 0b4c741b26c..d32fc1d2bfc 100644
--- a/x11/kde/webdev/Makefile
+++ b/x11/kde/webdev/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.32 2010/05/15 08:48:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2010/07/08 21:28:50 espie Exp $
 
 COMMENT = 		web development tool
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
 DISTNAME =		kdewebdev-${VERSION}
-PKGNAME =		${DISTNAME}p3
+PKGNAME =		${DISTNAME}p4
 MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	kommanderplugin      1.0      # .0.0
 SHARED_LIBS +=	kommanderwidget      1.0      # .0.0
@@ -13,15 +13,23 @@ SHARED_LIBS +=	kommanderwidgets     1.0      # .0.0
 MODULES =	x11/kde devel/gettext
 
 RUN_DEPENDS +=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = 	kdecore.>=6,DCOP,kabc,katepartinterfaces,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,ktexteditor,kutils,kwalletclient,vcard::x11/kde/libs3 \
-    		exslt::textproc/libxslt \
-    		cvsservice::x11/kde/sdk3
+LIB_DEPENDS =	::x11/kde/libs3 \
+    		::textproc/libxslt \
+    		::x11/kde/sdk3
 
 SEPARATE_BUILD = 	flavored
 
-WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 c gcrypt gpg-error \
-		jpeg kmdi knewstuff m pcre pcreposix png pthread stdc++ \
-		util xml2 xslt z idn Xau Xdmcp fam rpcsvc pthread-stubs xcb
+WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c cvsservice exslt fam \
+	gcrypt gpg-error idn jpeg kmdi knewstuff lib/kde3/DCOP lib/kde3/kabc \
+	lib/kde3/katepartinterfaces lib/kde3/kdecore.>=6 lib/kde3/kdefx \
+	lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui lib/kde3/khtml \
+	lib/kde3/kio lib/kde3/kjs lib/kde3/kparts lib/kde3/kresources \
+	lib/kde3/kspell lib/kde3/ktexteditor lib/kde3/kutils \
+	lib/kde3/kwalletclient lib/kde3/vcard m pcre pcreposix png pthread \
+	pthread-stubs stdc++ util xcb xml2 xslt z
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/HTML/en/common
+	@${post_install_libs}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/webdev/pkg/PLIST b/x11/kde/webdev/pkg/PLIST
index 690368db6f1..d18fa588704 100644
--- a/x11/kde/webdev/pkg/PLIST
+++ b/x11/kde/webdev/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2010/05/15 08:48:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.19 2010/07/08 21:28:50 espie Exp $
 @conflict quanta-*
 @pkgpath x11/kde/quanta
 @bin bin/kfilereplace
@@ -23,6 +23,9 @@ ${KDE}/libklinkstatuspart.la
 ${KDE}/libklinkstatuspart.so
 ${KDE}/libkommander_part.la
 ${KDE}/libkommander_part.so
+@lib ${KDE}/libkommanderplugin.so.${LIBkommanderplugin_VERSION}
+@lib ${KDE}/libkommanderwidget.so.${LIBkommanderwidget_VERSION}
+@lib ${KDE}/libkommanderwidgets.so.${LIBkommanderwidgets_VERSION}
 ${KDE}/libkxsldbgpart.la
 ${KDE}/libkxsldbgpart.so
 ${KDE}/quantadebuggerdbgp.la