diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile
index f6b2d6f4221..a0870c388fd 100644
--- a/x11/kde/arts3/Makefile
+++ b/x11/kde/arts3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.66 2008/06/12 19:18:00 tobias Exp $
+# $OpenBSD: Makefile,v 1.67 2008/08/26 16:52:28 espie Exp $
 
-COMMENT=		K Desktop Environment, aRTs
-CATEGORIES=		x11 x11/kde
-VERSION=		3.5.9
-DISTNAME=		arts-1.5.9
-MODKDE_VERSION?=	3.5.8
-PKGNAME=		${DISTNAME}p0
+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}
 
 SHARED_LIBS +=	mcop                 2.0      # .1.0
 SHARED_LIBS +=	artsflow_idl         2.0      # .1.0
@@ -24,20 +24,20 @@ SHARED_LIBS +=	gmcop                2.0      # .1.0
 SHARED_LIBS +=	qtmcop               2.0      # .1.0
 SHARED_LIBS +=	x11globalcomm        2.0      # .1.0
 
-LIB_DEPENDS= 	audiofile::devel/libaudiofile \
+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 \
 		esd::audio/esound
 
-SEPARATE_BUILD=flavored
+SEPARATE_BUILD =	flavored
 
-CONFIGURE_ENV=LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
-CONFIGURE_ARGS+=	${ENABLE_SHARED} \
+CONFIGURE_ENV =	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ARGS +=	${ENABLE_SHARED} \
 			--without-jack
 
-WANTLIB=	ICE SM X11 Xext c iconv intl jpeg m ossaudio png pthread \
+WANTLIB =	ICE SM X11 Xext c iconv intl jpeg m ossaudio png pthread \
 		stdc++ vorbisenc z Xau Xdmcp pcre
 		
 .include <bsd.port.mk>
diff --git a/x11/kde/arts3/distinfo b/x11/kde/arts3/distinfo
index d0b0c3253fe..6cc62d3e616 100644
--- a/x11/kde/arts3/distinfo
+++ b/x11/kde/arts3/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/arts-1.5.9.tar.bz2) = YqXk1SIxS6sZKI5HAkgMkw==
-RMD160 (kde/arts-1.5.9.tar.bz2) = JHZhU7qVcsK2/ck906KsfM0OoZs=
-SHA1 (kde/arts-1.5.9.tar.bz2) = VUOm2CphiNU+7DLAmg0rPMbNTFw=
-SHA256 (kde/arts-1.5.9.tar.bz2) = yA1wNhrqSo4rYgQ7X98cX43zahDHawhoG9eyBlpvAk4=
-SIZE (kde/arts-1.5.9.tar.bz2) = 973190
+MD5 (kde/arts-1.5.10.tar.bz2) = baFyqrKkpEkptf38MPo+/A==
+RMD160 (kde/arts-1.5.10.tar.bz2) = jCN+vQasgriM9zlHIvuNpFmQLuc=
+SHA1 (kde/arts-1.5.10.tar.bz2) = LlUH9kpKSprURsyYff8Vfjj5gnQ=
+SHA256 (kde/arts-1.5.10.tar.bz2) = kuI4OetAQtKhXPWWFIJMrcCiPpL6E5xQ1eO9SYmozDk=
+SIZE (kde/arts-1.5.10.tar.bz2) = 973382
diff --git a/x11/kde/arts3/patches/patch-artsc_artsdsp_in b/x11/kde/arts3/patches/patch-artsc_artsdsp_in
index d6bc5bd4eea..0f9d274957a 100644
--- a/x11/kde/arts3/patches/patch-artsc_artsdsp_in
+++ b/x11/kde/arts3/patches/patch-artsc_artsdsp_in
@@ -1,24 +1,15 @@
-$OpenBSD: patch-artsc_artsdsp_in,v 1.1 2008/06/12 19:18:00 tobias Exp $
---- artsc/artsdsp.in.orig	Sat Sep 10 11:13:34 2005
-+++ artsc/artsdsp.in	Tue Jun 10 01:44:32 2008
-@@ -109,7 +109,7 @@ case $3 in
-        arch_libdir=lib
-        ;;
-     64-bit)
--       arch_libdir=lib64
-+       arch_libdir=lib
-        ;;
-     *)
-        exit 1
-@@ -122,9 +122,9 @@ exec_prefix=@exec_prefix@
- libdir=${prefix}/${arch_libdir}
+$OpenBSD: patch-artsc_artsdsp_in,v 1.2 2008/08/26 16:52:28 espie Exp $
+--- artsc/artsdsp.in.orig	Tue Aug 19 20:10:01 2008
++++ artsc/artsdsp.in	Wed Aug 20 21:43:07 2008
+@@ -93,9 +93,9 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
  
  if test "$single_thread" = 1; then
--  LD_PRELOAD=${libdir}/libartsdsp_st.so.0
-+  LD_PRELOAD=${libdir}/libartsdsp_st.so
+-  LD_PRELOAD=${exec_prefix}/\$LIB/libartsdsp_st.so.0
++  LD_PRELOAD=${exec_prefix}/\$LIB/libartsdsp_st.so
  else
--  LD_PRELOAD=${libdir}/libartsdsp.so.0:${libdir}/libartsc.so.0
-+  LD_PRELOAD=${libdir}/libartsdsp.so:${libdir}/libartsc.so
+-  LD_PRELOAD=${exec_prefix}/\$LIB/libartsdsp.so.0:${exec_prefix}/\$LIB/libartsc.so.0
++  LD_PRELOAD=${exec_prefix}/\$LIB/libartsdsp.so:${exec_prefix}/\$LIB/libartsc.so.0
  fi
- if test -f ${libdir}/libdl.so.2; then
-   LD_PRELOAD=$LD_PRELOAD:${libdir}/libdl.so.2
+ if test -f ${exec_prefix}/\$LIB/libdl.so.2; then
+   LD_PRELOAD=$LD_PRELOAD:${exec_prefix}/\$LIB/libdl.so.2
diff --git a/x11/kde/arts3/pkg/PLIST b/x11/kde/arts3/pkg/PLIST
index 1854de65ce8..a805a2509e1 100644
--- a/x11/kde/arts3/pkg/PLIST
+++ b/x11/kde/arts3/pkg/PLIST
@@ -1,14 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.16 2007/05/25 09:49:54 espie Exp $
+@comment $OpenBSD: PLIST,v 1.17 2008/08/26 16:52:28 espie Exp $
 @conflict kdelibs-<3
 bin/artsc-config
-bin/artscat
-bin/artsd
+@bin bin/artscat
+@bin bin/artsd
 bin/artsdsp
-bin/artsplay
-bin/artsrec
-bin/artsshell
-bin/artswrapper
-bin/mcopidl
+@bin bin/artsplay
+@bin bin/artsrec
+@bin bin/artsshell
+@bin bin/artswrapper
+@bin bin/mcopidl
 include/arts/
 include/arts/anyref.h
 include/arts/arts_export.h
diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile
index ffd311ff661..e0bdeda0ff8 100644
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.85 2008/07/25 20:28:03 kili Exp $
+# $OpenBSD: Makefile,v 1.86 2008/08/26 16:52:28 espie Exp $
 
-COMMENT-main= 		K Desktop Environment, basic applications
-COMMENT-plugins=	Konqueror nsplugins, essentially native JDK
-COMMENT-samba=		K Desktop Environment, samba support
-CATEGORIES=		x11 x11/kde
-VERSION=		3.5.9
-DISTNAME=		kdebase-${VERSION}
-PKGNAME-main=		${DISTNAME}p0
-PKGNAME-samba=		kdesamba-${VERSION}
-MODKDE_VERSION?=	3.5.8
+COMMENT-main = 		K Desktop Environment, basic applications
+COMMENT-plugins =	Konqueror nsplugins, essentially native JDK
+COMMENT-samba =		K Desktop Environment, samba support
+CATEGORIES =		x11 x11/kde
+VERSION =		3.5.10
+DISTNAME =		kdebase-${VERSION}
+PKGNAME-main =		${DISTNAME}
+PKGNAME-samba =		kdesamba-${VERSION}
+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
@@ -23,51 +23,51 @@ SHARED_LIBS +=	taskbar              4.0      # .3.0
 SHARED_LIBS +=	kasbar               2.0      # .1.0
 SHARED_LIBS +=	kfontinst            1.0      # .0.0
 
-MULTI_PACKAGES=		-main -samba
-FLAVORS=		debug
+MULTI_PACKAGES =	-main -samba
+FLAVORS =		debug
 
-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 iconv fam rpcsvc intl stdc++ Xdmcp Xau 
+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 iconv fam rpcsvc intl stdc++ Xdmcp Xau 
 
-RUN_DEPENDS-main=${RUN_DEPENDS} \
+RUN_DEPENDS-main =${RUN_DEPENDS} \
 		:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS-main= ${LIB_DEPENDS} \
+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.*:databases/openldap \
 		sasl2::security/cyrus-sasl2 \
 		usb::devel/libusb \
 		glib-2.0,gmodule-2.0,gthread-2.0::devel/glib2
-WANTLIB-main=	${WANTLIB} \
+WANTLIB-main =	${WANTLIB} \
 		Xcursor Xrandr Xss Xt Xtst Xxf86misc \
 		artsflow artsflow_idl audiofile c crypto esd \
 		freetype kmedia2_idl mad mcop ogg ossaudio \
 		pcre pcreposix qtmcop soundserver_idl ssl \
 		vorbis vorbisenc vorbisfile xkbfile GLU \
 		Xinerama Xft Xfixes fontconfig GL Xcomposite Xdamage \
-		Half Imath IlmImf Iex asn1 com_err gssapi krb5 \
+		Half Imath IlmImf IlmThread Iex asn1 com_err gssapi krb5 \
 		expat pthread 
 
 
-LIB_DEPENDS-samba= ${LIB_DEPENDS} \
+LIB_DEPENDS-samba = ${LIB_DEPENDS} \
 		lib/samba/smbclient:samba->=3:net/samba
 
-SEPARATE_BUILD=	flavored
-EXTRA_CONFIG=	xdg/menus/kde-settings.menu \
+SEPARATE_BUILD =	flavored
+EXTRA_CONFIG =	xdg/menus/kde-settings.menu \
 		xdg/menus/kde-information.menu \
 		xdg/menus/kde-screensavers.menu \
 		xdg/menus/applications-merged/kde-essential.menu \
 		ksysguarddrc
 
 
-CONFIGURE_ENV+= PKG_CONFIG_PATH=${X11BASE}/lib/pkgconfig
+CONFIGURE_ENV += PKG_CONFIG_PATH=${X11BASE}/lib/pkgconfig
 
-SAMPLECONFDIR=${PREFIX}/share/apps/kde-conf-sample
+SAMPLECONFDIR = ${PREFIX}/share/apps/kde-conf-sample
 
-SUBST_VARS=EXTRA_CONFIG SAMPLECONFDIR
+SUBST_VARS = EXTRA_CONFIG SAMPLECONFDIR
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/kdesurc ${PREFIX}/share/config
 
-FAKE_FLAGS=	sysconfdir=${SAMPLECONFDIR}
+FAKE_FLAGS =	sysconfdir=${SAMPLECONFDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/kde/base3/distinfo b/x11/kde/base3/distinfo
index 7b171c3a06d..5570e3a2280 100644
--- a/x11/kde/base3/distinfo
+++ b/x11/kde/base3/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdebase-3.5.9.tar.bz2) = yMNTiaI4qhtz5o71KY6t+A==
-RMD160 (kde/kdebase-3.5.9.tar.bz2) = JVLYUOYu/QRMF44usE79zOkOSjM=
-SHA1 (kde/kdebase-3.5.9.tar.bz2) = pqGeCybteisTikp1lMhIbiZhDeg=
-SHA256 (kde/kdebase-3.5.9.tar.bz2) = bpWIAwVZKM2nMnOZZpbl96qtgDo4VIU/TsREKMScgx4=
-SIZE (kde/kdebase-3.5.9.tar.bz2) = 24239563
+MD5 (kde/kdebase-3.5.10.tar.bz2) = iCNxiCcfvx5rzUAYCnXZUw==
+RMD160 (kde/kdebase-3.5.10.tar.bz2) = WEXpT7uLW2STTWLcm9O1gNJtB7w=
+SHA1 (kde/kdebase-3.5.10.tar.bz2) = GnLkFwoKlT7XDAaToDSUfYe2770=
+SHA256 (kde/kdebase-3.5.10.tar.bz2) = d6qdjyjFMvLnpRV6f0uo3xAB8A+hy3LLcLOIs9Dha2E=
+SIZE (kde/kdebase-3.5.10.tar.bz2) = 24339704
diff --git a/x11/kde/base3/patches/patch-kcontrol_ebrowsing_plugins_localdomain_Makefile_in b/x11/kde/base3/patches/patch-kcontrol_ebrowsing_plugins_localdomain_Makefile_in
deleted file mode 100644
index 9704e85acec..00000000000
--- a/x11/kde/base3/patches/patch-kcontrol_ebrowsing_plugins_localdomain_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kcontrol_ebrowsing_plugins_localdomain_Makefile_in,v 1.1 2007/10/24 21:52:16 espie Exp $
---- kcontrol/ebrowsing/plugins/localdomain/Makefile.in.orig	Tue Oct 23 10:22:42 2007
-+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in	Tue Oct 23 10:22:51 2007
-@@ -477,7 +477,7 @@ xdg_menudir = @xdg_menudir@
- AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
- AM_LDFLAGS = $(all_libraries)
- kde_module_LTLIBRARIES = liblocaldomainurifilter.la
--liblocaldomainurifilter_la_LDFLAGS = -module $(KDE_PLUGIN)
-+liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
- liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE)
- #>- liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel
- #>+ 1
diff --git a/x11/kde/base3/patches/patch-kcontrol_ebrowsing_plugins_shorturi_Makefile_in b/x11/kde/base3/patches/patch-kcontrol_ebrowsing_plugins_shorturi_Makefile_in
deleted file mode 100644
index ab8d9edbbfe..00000000000
--- a/x11/kde/base3/patches/patch-kcontrol_ebrowsing_plugins_shorturi_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kcontrol_ebrowsing_plugins_shorturi_Makefile_in,v 1.1 2007/10/24 21:52:16 espie Exp $
---- kcontrol/ebrowsing/plugins/shorturi/Makefile.in.orig	Tue Oct 23 10:22:18 2007
-+++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in	Tue Oct 23 10:22:31 2007
-@@ -453,7 +453,7 @@ xdg_menudir = @xdg_menudir@
- AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
- AM_LDFLAGS = $(all_libraries)
- kde_module_LTLIBRARIES = libkshorturifilter.la
--libkshorturifilter_la_LDFLAGS = -module $(KDE_PLUGIN)
-+libkshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
- libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
- #>- libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel
- #>+ 1
diff --git a/x11/kde/base3/patches/patch-kioslave_floppy_Makefile_in b/x11/kde/base3/patches/patch-kioslave_floppy_Makefile_in
index b82252623d6..cd70eba1427 100644
--- a/x11/kde/base3/patches/patch-kioslave_floppy_Makefile_in
+++ b/x11/kde/base3/patches/patch-kioslave_floppy_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-kioslave_floppy_Makefile_in,v 1.1 2007/10/24 21:52:16 espie Exp $
---- kioslave/floppy/Makefile.in.orig	Tue Oct 23 10:20:23 2007
-+++ kioslave/floppy/Makefile.in	Tue Oct 23 10:21:15 2007
-@@ -456,7 +456,7 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+$OpenBSD: patch-kioslave_floppy_Makefile_in,v 1.2 2008/08/26 16:52:29 espie Exp $
+--- kioslave/floppy/Makefile.in.orig	Wed Aug 20 18:01:45 2008
++++ kioslave/floppy/Makefile.in	Thu Aug 21 20:22:41 2008
+@@ -456,7 +456,7 @@ AM_LDFLAGS = $(all_libraries)
  kde_module_LTLIBRARIES = kio_floppy.la
  kio_floppy_la_SOURCES = kio_floppy.cpp program.cpp
  kio_floppy_la_LIBADD = $(LIB_KIO)
--kio_floppy_la_LDFLAGS = -module $(KDE_PLUGIN)
-+kio_floppy_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
++kio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries)
  kdelnk_DATA = floppy.protocol
  kdelnkdir = $(kde_servicesdir)
  #>- METASOURCES = AUTO
diff --git a/x11/kde/base3/patches/patch-kioslave_smb_Makefile_in b/x11/kde/base3/patches/patch-kioslave_smb_Makefile_in
deleted file mode 100644
index af83c889b21..00000000000
--- a/x11/kde/base3/patches/patch-kioslave_smb_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kioslave_smb_Makefile_in,v 1.1 2007/10/24 21:52:16 espie Exp $
---- kioslave/smb/Makefile.in.orig	Tue Oct 23 10:21:31 2007
-+++ kioslave/smb/Makefile.in	Tue Oct 23 10:21:48 2007
-@@ -473,7 +473,7 @@ kio_smb_la_SOURCES = kio_smb.cpp \
- 	     kio_smb_mount.cpp
- 
- kio_smb_la_LIBADD = -lkio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
--kio_smb_la_LDFLAGS = -module $(KDE_PLUGIN)
-+kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
- noinst_HEADERS = kio_smb.h kio_smb_internal.h
- kdelnk_DATA = smb.protocol
- kdelnkdir = $(kde_servicesdir)
diff --git a/x11/kde/base3/patches/patch-startkde b/x11/kde/base3/patches/patch-startkde
index defd766546c..96604016716 100644
--- a/x11/kde/base3/patches/patch-startkde
+++ b/x11/kde/base3/patches/patch-startkde
@@ -1,8 +1,8 @@
-$OpenBSD: patch-startkde,v 1.21 2008/03/25 17:34:14 espie Exp $
---- startkde.orig	Wed Feb 13 10:49:19 2008
-+++ startkde	Fri Feb 15 00:05:14 2008
+$OpenBSD: patch-startkde,v 1.22 2008/08/26 16:52:29 espie Exp $
+--- startkde.orig	Tue Aug 19 21:56:42 2008
++++ startkde	Thu Aug 21 20:20:12 2008
 @@ -3,6 +3,11 @@
- #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.9 )
+ #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.10 )
  #
  
 +case X"$DISPLAY" in
diff --git a/x11/kde/base3/pkg/PLIST-main b/x11/kde/base3/pkg/PLIST-main
index cfb530f73e5..1536cde950b 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.7 2008/07/25 20:28:03 kili Exp $
+@comment $OpenBSD: PLIST-main,v 1.8 2008/08/26 16:52:29 espie Exp $
 @conflict kdeartwork-<=3.4
 @conflict kdeedu-<3.4
 @pkgpath x11/kde/base3
@@ -25,6 +25,7 @@ bin/kcheckpass
 @bin bin/kcontrol
 @bin bin/kcontroledit
 @bin bin/kdcop
+bin/kde3
 @bin bin/kdebugdialog
 bin/kdeeject
 bin/kdeinstallktheme
diff --git a/x11/kde/edu3/Makefile b/x11/kde/edu3/Makefile
index 4807535ef4c..6e01c438620 100644
--- a/x11/kde/edu3/Makefile
+++ b/x11/kde/edu3/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.52 2008/03/25 12:26:02 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2008/08/26 16:52:29 espie Exp $
 
-COMMENT=		K Desktop Environment, edutainment
-CATEGORIES=		x11 x11/kde
-VERSION=		3.5.9
-DISTNAME=		kdeedu-${VERSION}
-PKGNAME=		${DISTNAME}
-MODKDE_VERSION?=	3.5.8
-FLAVORS=debug
+COMMENT =		K Desktop Environment, edutainment
+CATEGORIES =		x11 x11/kde
+VERSION =		3.5.10
+DISTNAME =		kdeedu-${VERSION}
+PKGNAME =		${DISTNAME}
+MODKDE_VERSION ?=	3.5.8
+FLAVORS =	debug
 SHARED_LIBS +=	kdeeducore           4.0      # .3.0
 SHARED_LIBS +=	kdeeduui             4.0      # .3.5
 SHARED_LIBS +=	kdeeduplot           4.0      # .3.0
@@ -14,13 +14,13 @@ SHARED_LIBS +=	extdate              4.0      # .3.0
 SHARED_LIBS +=	kiten                2.0      # .1.0
 SHARED_LIBS +=	kvoctraincore        1.0      # .0.0
 
-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
-SEPARATE_BUILD=flavored
+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
+SEPARATE_BUILD =	flavored
 
-CONFIGURE_ARGS+=--disable-kig-python-scripting
+CONFIGURE_ARGS +=	--disable-kig-python-scripting
 
-WANTLIB=	ICE SM X11 Xext Xrender art_lgpl_2 c jpeg katepartinterfaces \
+WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 c jpeg katepartinterfaces \
 		knewstuff ktexteditor m pcre pcreposix png pthread stdc++ util \
 		z ossaudio qtmcop soundserver_idl artskde kmedia2_idl \
 		artsflow vorbis ogg esd mcop \
diff --git a/x11/kde/edu3/distinfo b/x11/kde/edu3/distinfo
index e718babe66f..607b8a9bf9c 100644
--- a/x11/kde/edu3/distinfo
+++ b/x11/kde/edu3/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdeedu-3.5.9.tar.bz2) = y9q+kWzm+jAPjauXLFy0pA==
-RMD160 (kde/kdeedu-3.5.9.tar.bz2) = ixr6HoDh9oirhq095i6ylCk/yms=
-SHA1 (kde/kdeedu-3.5.9.tar.bz2) = c3T0M1s07QIlz8qvIuDZOeSL7X0=
-SHA256 (kde/kdeedu-3.5.9.tar.bz2) = BjJR5BwZLUG0kC2XSYB/uYvZFX7IzHVRoxieFSas0kA=
-SIZE (kde/kdeedu-3.5.9.tar.bz2) = 30174459
+MD5 (kde/kdeedu-3.5.10.tar.bz2) = GxRmv0ywpZsavYYToliBQg==
+RMD160 (kde/kdeedu-3.5.10.tar.bz2) = MS0DhPvyQ9WAsNPZDj4htGoRfQ0=
+SHA1 (kde/kdeedu-3.5.10.tar.bz2) = xD97zZy3r3x3p4vAvX9RwOVy9Yk=
+SHA256 (kde/kdeedu-3.5.10.tar.bz2) = CmDK87WZ4EQTsIRmRUg7iEqff9YdJM1fEkQ9xM647RE=
+SIZE (kde/kdeedu-3.5.10.tar.bz2) = 30181670
diff --git a/x11/kde/edu3/pkg/PLIST b/x11/kde/edu3/pkg/PLIST
index 1e5a41f4053..c0f05494720 100644
--- a/x11/kde/edu3/pkg/PLIST
+++ b/x11/kde/edu3/pkg/PLIST
@@ -1,42 +1,40 @@
-@comment $OpenBSD: PLIST,v 1.30 2008/03/25 12:26:03 espie Exp $
-bin/apmount
-bin/blinken
-bin/celestrongps
-bin/fliccd
-bin/fliwheel
-bin/indiserver
-bin/kalzium
-bin/kanagram
-bin/kbruch
-bin/keduca
-bin/keducabuilder
-bin/kgeography
-bin/khangman
-bin/kig
-bin/kiten
-bin/kitengen
-bin/klatin
-bin/klettres
-bin/kmplot
-bin/kpercentage
-bin/kstars
-bin/ktouch
-bin/kturtle
-bin/kverbos
-bin/kvoctrain
-bin/kwordquiz
+@comment $OpenBSD: PLIST,v 1.31 2008/08/26 16:52:29 espie Exp $
+@bin bin/apmount
+@bin bin/blinken
+@bin bin/celestrongps
+@bin bin/fliccd
+@bin bin/fliwheel
+@bin bin/indiserver
+@bin bin/kalzium
+@bin bin/kanagram
+@bin bin/kbruch
+@bin bin/keduca
+@bin bin/keducabuilder
+@bin bin/kgeography
+@bin bin/khangman
+@bin bin/kig
+@bin bin/kiten
+@bin bin/kitengen
+@bin bin/klatin
+@bin bin/klettres
+@bin bin/kmplot
+@bin bin/kpercentage
+@bin bin/kstars
+@bin bin/ktouch
+@bin bin/kturtle
+@bin bin/kverbos
+@bin bin/kvoctrain
+@bin bin/kwordquiz
 bin/lx200_16
 bin/lx200autostar
-bin/lx200basic
+@bin bin/lx200basic
 bin/lx200classic
-bin/lx200generic
+@bin bin/lx200generic
 bin/lx200gps
 bin/pykig.py
-bin/skycommander
-bin/spotlight2kvtml
-bin/temma
-bin/test_extdate
-bin/test_extdatepicker
+@bin bin/skycommander
+@bin bin/spotlight2kvtml
+@bin bin/temma
 include/kstarsinterface.h
 include/libkdeedu/
 include/libkdeedu/kdeeduglossary.h
@@ -1852,6 +1850,7 @@ share/apps/ktouch/hungarian_expert.ktouch.xml
 share/apps/ktouch/it.keyboard
 share/apps/ktouch/italian.ktouch.xml
 share/apps/ktouch/ktouchui.rc
+share/apps/ktouch/nb.keyboard
 share/apps/ktouch/nederlands.ktouch.xml
 share/apps/ktouch/nederlands_junior.ktouch.xml
 share/apps/ktouch/norwegian.ktouch.xml
diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile
index bbbf8780887..ba06761b497 100644
--- a/x11/kde/games3/Makefile
+++ b/x11/kde/games3/Makefile
@@ -1,27 +1,26 @@
-# $OpenBSD: Makefile,v 1.52 2008/03/25 13:41:35 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2008/08/26 16:52:29 espie Exp $
 
-COMMENT=		K Desktop Environment, games
+COMMENT =		K Desktop Environment, games
 
-CATEGORIES=		x11 x11/kde games
-VERSION=		3.5.9
-DISTNAME=		kdegames-${VERSION}
-PKGNAME=		${DISTNAME}
-MODKDE_VERSION=		3.5.8
+CATEGORIES =		x11 x11/kde games
+VERSION =		3.5.10
+DISTNAME =		kdegames-${VERSION}
+PKGNAME =		${DISTNAME}
+MODKDE_VERSION =	3.5.8
 SHARED_LIBS +=	kdegames             4.0      # .3.0
 SHARED_LIBS +=	atlantic             4.0      # .3.0
 SHARED_LIBS +=	atlantikclient       4.0      # .3.0
 SHARED_LIBS +=	atlantikui           4.0      # .3.0
 SHARED_LIBS +=	kolf                 4.0      # .3.0
 
-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
-SEPARATE_BUILD=flavored
+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
+SEPARATE_BUILD =	flavored
 
-WANTLIB=	ICE SM X11 Xext Xrender art_lgpl_2 artsflow artsflow_idl \
+WANTLIB =	ICE SM X11 Xext Xrender art_lgpl_2 artsflow artsflow_idl \
 		audiofile c esd glib-2.0 gmodule-2.0 gthread-2.0 \
 		jpeg kmedia2_idl kwalletclient m mad mcop ogg ossaudio png \
 		pthread qtmcop soundserver_idl stdc++ util vorbis vorbisenc \
 		vorbisfile z iconv intl idn Xau Xdmcp fam rpcsvc pcre
 
-
 .include <bsd.port.mk>
diff --git a/x11/kde/games3/distinfo b/x11/kde/games3/distinfo
index 1eb655295e8..89dd1e8dccd 100644
--- a/x11/kde/games3/distinfo
+++ b/x11/kde/games3/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdegames-3.5.9.tar.bz2) = RyOF8hppInD7VkPXYXx/8w==
-RMD160 (kde/kdegames-3.5.9.tar.bz2) = Mi/oKnIzLagSlFj0gV146ZVJPDw=
-SHA1 (kde/kdegames-3.5.9.tar.bz2) = +3kNoYpZiyDCtTDPn6ysiBUHAXE=
-SHA256 (kde/kdegames-3.5.9.tar.bz2) = +gMzPBwzsQpYsD26w1XZjyQGi8N6E8FoNGP0u62awT0=
-SIZE (kde/kdegames-3.5.9.tar.bz2) = 10782511
+MD5 (kde/kdegames-3.5.10.tar.bz2) = VTOziGy7dBgJM/4/PSCQMQ==
+RMD160 (kde/kdegames-3.5.10.tar.bz2) = oYUQSwBIsFVPRji0guaUVesQ2qU=
+SHA1 (kde/kdegames-3.5.10.tar.bz2) = KHqg0a4ZuPBNZMREn+1qfOxYhE0=
+SHA256 (kde/kdegames-3.5.10.tar.bz2) = gWtI/2EDTo0CDvpV3zl/iTtjqHpBdEHbi/ui7sPOTCQ=
+SIZE (kde/kdegames-3.5.10.tar.bz2) = 10783059
diff --git a/x11/kde/games3/pkg/PLIST b/x11/kde/games3/pkg/PLIST
index 5d6552c4fe3..3552909e414 100644
--- a/x11/kde/games3/pkg/PLIST
+++ b/x11/kde/games3/pkg/PLIST
@@ -1,38 +1,38 @@
-@comment $OpenBSD: PLIST,v 1.22 2007/12/15 23:47:40 ajacoutot Exp $
-bin/atlantik
-bin/kasteroids
-bin/katomic
-bin/kbackgammon
-bin/kbattleship
-bin/kblackbox
-bin/kbounce
-bin/kenolaba
-bin/kfouleggs
-bin/kgoldrunner
-bin/kjumpingcube
-bin/klickety
-bin/klines
-bin/kmahjongg
-bin/kmines
-bin/knetwalk
-bin/kolf
-bin/konquest
-bin/kpat
-bin/kpoker
-bin/kreversi
-bin/ksame
-bin/kshisen
-bin/ksirtet
-bin/ksmiletris
-bin/ksnake
-bin/ksokoban
-bin/kspaceduel
-bin/ktron
-bin/ktuberling
-bin/kwin4
-bin/kwin4proc
-bin/lskat
-bin/lskatproc
+@comment $OpenBSD: PLIST,v 1.23 2008/08/26 16:52:29 espie Exp $
+@bin bin/atlantik
+@bin bin/kasteroids
+@bin bin/katomic
+@bin bin/kbackgammon
+@bin bin/kbattleship
+@bin bin/kblackbox
+@bin bin/kbounce
+@bin bin/kenolaba
+@bin bin/kfouleggs
+@bin bin/kgoldrunner
+@bin bin/kjumpingcube
+@bin bin/klickety
+@bin bin/klines
+@bin bin/kmahjongg
+@bin bin/kmines
+@bin bin/knetwalk
+@bin bin/kolf
+@bin bin/konquest
+@bin bin/kpat
+@bin bin/kpoker
+@bin bin/kreversi
+@bin bin/ksame
+@bin bin/kshisen
+@bin bin/ksirtet
+@bin bin/ksmiletris
+@bin bin/ksnake
+@bin bin/ksokoban
+@bin bin/kspaceduel
+@bin bin/ktron
+@bin bin/ktuberling
+@bin bin/kwin4
+@bin bin/kwin4proc
+@bin bin/lskat
+@bin bin/lskatproc
 include/atlantic/
 include/atlantic/atlantic_core.h
 include/atlantic/auction.h
diff --git a/x11/kde/graphics3/Makefile b/x11/kde/graphics3/Makefile
index 896a7df7160..cc71178b538 100644
--- a/x11/kde/graphics3/Makefile
+++ b/x11/kde/graphics3/Makefile
@@ -1,23 +1,23 @@
-# $OpenBSD: Makefile,v 1.81 2008/05/21 09:46:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.82 2008/08/26 16:52:29 espie Exp $
 
-COMMENT-main=		K Desktop Environment, graphic applications
-COMMENT-kamera=		KDE interface to digital cameras
-COMMENT-kpov=		KDE modeller for povray
-COMMENT-sane=		KDE interface to scanners
-CATEGORIES=		x11 x11/kde
-VERSION=		3.5.9
-DISTNAME=		kdegraphics-${VERSION}
-MODKDE_VERSION=		3.5.8
+COMMENT-main =		K Desktop Environment, graphic applications
+COMMENT-kamera =	KDE interface to digital cameras
+COMMENT-kpov =		KDE modeller for povray
+COMMENT-sane =		KDE interface to scanners
+CATEGORIES =		x11 x11/kde
+VERSION =		3.5.10
+DISTNAME =		kdegraphics-${VERSION}
+MODKDE_VERSION =	3.5.8
 
-FLAVORS=debug
-SEPARATE_BUILD=flavored
-MULTI_PACKAGES=-main -kpov -kamera -sane
+FLAVORS =		debug
+SEPARATE_BUILD =	flavored
+MULTI_PACKAGES =	-main -kpov -kamera -sane
 PKGNAME=${DISTNAME}
 
-PKGNAME-main=	${DISTNAME}p1
-PKGNAME-kamera=	kamera-${VERSION}
-PKGNAME-kpov=	kpovmodeller-${VERSION}
-PKGNAME-sane=	ksane-${VERSION}
+PKGNAME-main =		${DISTNAME}
+PKGNAME-kamera =	kamera-${VERSION}
+PKGNAME-kpov =		kpovmodeller-${VERSION}
+PKGNAME-sane =		ksane-${VERSION}
 
 SHARED_LIBS +=	kghostviewlib        1.0      # .0.0
 SHARED_LIBS +=	kpovmodeler          1.0      # .0.0
@@ -27,16 +27,16 @@ SHARED_LIBS +=	kimageviewer         1.0      # .0.0
 SHARED_LIBS +=	kmultipage           1.0      # .0.0
 SHARED_LIBS +=	kscan                2.0      # .1.0
 
-BUILD_DEPENDS=		::print/texlive/base
-LIB_DEPENDS=		kdecore.>=6,DCOP,kio,kwalletclient,kdefx,kdeui,kdesu::x11/kde/libs3
-WANTLIB=		X11 art_lgpl_2 ICE png util jpeg z SM Xext \
+BUILD_DEPENDS =		::print/texlive/base
+LIB_DEPENDS =		kdecore.>=6,DCOP,kio,kwalletclient,kdefx,kdeui,kdesu::x11/kde/libs3
+WANTLIB =		X11 art_lgpl_2 ICE png util jpeg z SM Xext \
 			m idn iconv Xau Xdmcp fam rpcsvc stdc++
 
 
-RUN_DEPENDS-main=${RUN_DEPENDS} \
-		:ghostscript-*:print/ghostscript/gnu \
-		:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS-main= 	${LIB_DEPENDS} \
+RUN_DEPENDS-main =	${RUN_DEPENDS} \
+			:ghostscript-*:print/ghostscript/gnu \
+			:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS-main = 	${LIB_DEPENDS} \
 			kdeprint,khtml,kjs,kparts,kutils::x11/kde/libs3 \
 			Imlib::graphics/imlib \
 			ungif::graphics/libungif \
@@ -44,42 +44,42 @@ LIB_DEPENDS-main= 	${LIB_DEPENDS} \
 			paper::print/libpaper \
 			poppler::print/poppler \
 			poppler-qt::print/poppler,-qt
-WANTLIB-main=		${WANTLIB} \
+WANTLIB-main =		${WANTLIB} \
 			Half Iex IlmImf IlmThread Imath \
 			tiff fontconfig lcms Xrender ICE c \
 			freetype pcreposix pcre Xxf86vm SM Xext Xft \
 			expat intl xml2 pthread
 
 
-LIB_DEPENDS-kpov=	${LIB_DEPENDS} \
+LIB_DEPENDS-kpov =	${LIB_DEPENDS} \
 			kparts::x11/kde/libs3
-RUN_DEPENDS-kpov=	::graphics/povray \
-		:desktop-file-utils-*:devel/desktop-file-utils
-WANTLIB-kpov=		${WANTLIB} GL freetype Xrender Xmu GLU c Xi \
+RUN_DEPENDS-kpov =	::graphics/povray \
+			:desktop-file-utils-*:devel/desktop-file-utils
+WANTLIB-kpov =		${WANTLIB} GL freetype Xrender Xmu GLU c Xi \
 			Xt intl pthread
 
-LIB_DEPENDS-kamera= 	${LIB_DEPENDS} \
+LIB_DEPENDS-kamera = 	${LIB_DEPENDS} \
 			gphoto2,gphoto2_port::graphics/libgphoto2
-WANTLIB-kamera=		${WANTLIB} exif Xrender intl ltdl
+WANTLIB-kamera =	${WANTLIB} exif Xrender intl ltdl
 
-RUN_DEPENDS-sane=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS-sane= 	${LIB_DEPENDS-kamera} \
+RUN_DEPENDS-sane =	:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS-sane = 	${LIB_DEPENDS-kamera} \
 			ktexteditor,vcard,kabc,kparts,kresources,kspell,kdeprint::x11/kde/libs3 \
 			sane::graphics/sane-backends
-WANTLIB-sane=		${WANTLIB-kamera} usb tiff c ltdl pthread
+WANTLIB-sane =		${WANTLIB-kamera} usb tiff c ltdl pthread
 
 
-CONFIGURE_ENV+=	\
+CONFIGURE_ENV +=	\
 	PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
 
 post-patch:
 	@cp ${FILESDIR}/part_init.cpp ${WRKSRC}/kghostview
 
 .if ${MACHINE_ARCH} == "sparc64"
-SUP_PATCH_LIST=	gcc-*
+SUP_PATCH_LIST =	gcc-*
 .endif
 
-CONFIGURE_ENV+=	TIFF_LIBS='-L${LOCALBASE}/lib -ltiff -ljpeg -lz' \
-		TIFF_CFLAGS='-I${LOCALBASE}/include'
+CONFIGURE_ENV +=	TIFF_LIBS='-L${LOCALBASE}/lib -ltiff -ljpeg -lz' \
+			TIFF_CFLAGS='-I${LOCALBASE}/include'
 
 .include <bsd.port.mk>
diff --git a/x11/kde/graphics3/distinfo b/x11/kde/graphics3/distinfo
index 887db0708cd..23ecb8c23e7 100644
--- a/x11/kde/graphics3/distinfo
+++ b/x11/kde/graphics3/distinfo
@@ -1,10 +1,5 @@
-MD5 (kde/kdegraphics-3.5.9.tar.bz2) = PXXicYBXOk4HfgJFBViRpQ==
-MD5 (kde/post-3.5.8-kdegraphics-kpdf.diff) = 7uCMtWXCStZFqtMTbeUWLQ==
-RMD160 (kde/kdegraphics-3.5.9.tar.bz2) = BHoCNShYMAtr6NtobpX8VdJXrC0=
-RMD160 (kde/post-3.5.8-kdegraphics-kpdf.diff) = 6CArkwmK4FI9Ty+/NmFkiQSmYZs=
-SHA1 (kde/kdegraphics-3.5.9.tar.bz2) = YgYvLgJ0xPs15JiO3hAHKwJnrac=
-SHA1 (kde/post-3.5.8-kdegraphics-kpdf.diff) = /qCCmLj5Io7Vfd8M7/yrEnVcHoA=
-SHA256 (kde/kdegraphics-3.5.9.tar.bz2) = gVFKgjQVhSJECw7NJp2+suNiL3KVb83zjnJoZtgQDLI=
-SHA256 (kde/post-3.5.8-kdegraphics-kpdf.diff) = JmxghYweRnH1VA+nZ9Dv2DpclTDekx3kGxTrrz3PtSk=
-SIZE (kde/kdegraphics-3.5.9.tar.bz2) = 7441533
-SIZE (kde/post-3.5.8-kdegraphics-kpdf.diff) = 17412
+MD5 (kde/kdegraphics-3.5.10.tar.bz2) = oJCUtTV9jNXEnUW10pHc/g==
+RMD160 (kde/kdegraphics-3.5.10.tar.bz2) = lCeORBmrmYhfye+um2ulunh/gx4=
+SHA1 (kde/kdegraphics-3.5.10.tar.bz2) = ljTjqzZNAXFS+21jbvrYgRruxsM=
+SHA256 (kde/kdegraphics-3.5.10.tar.bz2) = vcc/qYAIqmS3JjYoK/DYPHuz5tS6HQgxJ33aRptXQIs=
+SIZE (kde/kdegraphics-3.5.10.tar.bz2) = 7440912
diff --git a/x11/kde/graphics3/pkg/PLIST-kpov b/x11/kde/graphics3/pkg/PLIST-kpov
index fc5fdd01112..ce21baefc58 100644
--- a/x11/kde/graphics3/pkg/PLIST-kpov
+++ b/x11/kde/graphics3/pkg/PLIST-kpov
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST-kpov,v 1.8 2007/12/15 23:47:41 ajacoutot Exp $
+@comment $OpenBSD: PLIST-kpov,v 1.9 2008/08/26 16:52:29 espie Exp $
 @conflict kdegraphics-<=3.3.2
-bin/kpovmodeler
+@bin bin/kpovmodeler
 ${KDE}/libkpovmodelerpart.la
 ${KDE}/libkpovmodelerpart.so
 lib/libkpovmodeler.la
diff --git a/x11/kde/graphics3/pkg/PLIST-main b/x11/kde/graphics3/pkg/PLIST-main
index 80f7014a130..6c203f8b064 100644
--- a/x11/kde/graphics3/pkg/PLIST-main
+++ b/x11/kde/graphics3/pkg/PLIST-main
@@ -1,23 +1,23 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2007/12/15 23:47:41 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2008/08/26 16:52:29 espie Exp $
 @pkgpath x11/kde/graphics3
-bin/kcolorchooser
-bin/kcoloredit
-bin/kdvi
-bin/kfax
-bin/kfaxview
-bin/kghostview
-bin/kiconedit
-bin/kolourpaint
-bin/kpdf
-bin/kruler
-bin/ksnapshot
-bin/kuickshow
-bin/kview
-bin/kviewshell
-bin/mrmlsearch
-bin/printnodetest
-bin/svgdisplay
-bin/xf86gammacfg
+@bin bin/kcolorchooser
+@bin bin/kcoloredit
+@bin bin/kdvi
+@bin bin/kfax
+@bin bin/kfaxview
+@bin bin/kghostview
+@bin bin/kiconedit
+@bin bin/kolourpaint
+@bin bin/kpdf
+@bin bin/kruler
+@bin bin/ksnapshot
+@bin bin/kuickshow
+@bin bin/kview
+@bin bin/kviewshell
+@bin bin/mrmlsearch
+@bin bin/printnodetest
+@bin bin/svgdisplay
+@bin bin/xf86gammacfg
 include/dom/SVGAElement.h
 include/dom/SVGAltGlyphDefElement.h
 include/dom/SVGAltGlyphElement.h
diff --git a/x11/kde/graphics3/pkg/PLIST-sane b/x11/kde/graphics3/pkg/PLIST-sane
index 1d999168fbd..e1ad58ab7c4 100644
--- a/x11/kde/graphics3/pkg/PLIST-sane
+++ b/x11/kde/graphics3/pkg/PLIST-sane
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-sane,v 1.3 2007/12/15 23:47:41 ajacoutot Exp $
-bin/kooka
+@comment $OpenBSD: PLIST-sane,v 1.4 2008/08/26 16:52:29 espie Exp $
+@bin bin/kooka
 lib/libkscan.la
 @lib lib/libkscan.so.${LIBkscan_VERSION}
 share/applications/kde/kooka.desktop
diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile
index af413929455..b4b15537d6f 100644
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.94 2008/07/25 20:25:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.95 2008/08/26 16:52:29 espie Exp $
 
-COMMENT-main=		K Desktop Environment, libraries
-COMMENT-cups=		K Desktop Environment, cups support
-CATEGORIES=		x11 x11/kde
-VERSION=		3.5.9
-DISTNAME=		kdelibs-${VERSION}
-MASTER_SITES0=  ftp://ftp.kde.org/pub/kde/security_patches/
+COMMENT-main =		K Desktop Environment, libraries
+COMMENT-cups =		K Desktop Environment, cups support
+CATEGORIES =		x11 x11/kde
+VERSION =		3.5.10
+DISTNAME =		kdelibs-${VERSION}
+MASTER_SITES0 =  	ftp://ftp.kde.org/pub/kde/security_patches/
 
-PKGNAME-main=		${DISTNAME}p1
-PKGNAME-cups=		kdecups-${VERSION}
-MODKDE_VERSION=		3.5.8
+PKGNAME-main =		${DISTNAME}
+PKGNAME-cups =		kdecups-${VERSION}
+MODKDE_VERSION =		3.5.8
 SHARED_LIBS +=	DCOP                 7.0      # .6.0
 SHARED_LIBS +=	kdefx                7.0      # .6.0
 SHARED_LIBS +=	kdefakes             7.0      # .6.0
@@ -51,30 +51,31 @@ SHARED_LIBS +=	kmediaplayer         1.0      # .0.0
 SHARED_LIBS +=	kimproxy             1.0      # .0.0
 SHARED_LIBS +=	katepartinterfaces   1.0      # .0.0
 
-FLAVORS=debug
-VMEM_WARNING=	Yes
+FLAVORS =	debug
+VMEM_WARNING =	Yes
 
 
-MULTI_PACKAGES=	-main -cups
-CONFIGURE_ARGS+= --enable-cups
+MULTI_PACKAGES =	-main -cups
+CONFIGURE_ARGS += 	--enable-cups
 
-LIB_DEPENDS=	art_lgpl_2::graphics/libart \
+LIB_DEPENDS =	art_lgpl_2::graphics/libart \
 		idn::devel/libidn \
 		fam::sysutils/fam
-WANTLIB=	iconv intl util jpeg m X11 ICE Xrender c SM pthread \
+WANTLIB =	iconv intl util jpeg m X11 ICE Xrender c SM pthread \
 		stdc++ Xext z png rpcsvc Xau Xdmcp
 
-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
+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
 
-WANTLIB-main=	${WANTLIB} \
+WANTLIB-main =	${WANTLIB} \
 		Half Iex IlmThread Imath \
 		audiofile esd glib-2.0 \
 		gmodule-2.0 gthread-2.0 mad ogg \
@@ -82,23 +83,25 @@ WANTLIB-main=	${WANTLIB} \
 		xml2 krb5 gssapi crypto asn1
 
 
-RUN_DEPENDS-main=${RUN_DEPENDS} \
-		::x11/hicolor-icon-theme \
-		:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS-main = \
+	${RUN_DEPENDS} \
+	::x11/hicolor-icon-theme \
+	:desktop-file-utils-*:devel/desktop-file-utils
 
-LIB_DEPENDS-cups=${LIB_DEPENDS} \
-		kdecore.>=6,kwalletclient,kdefakes,kdefx,kdeprint,kio,kparts,kdeui,kdesu,kdeprint_management,DCOP::x11/kde/libs3 \
-		cups::print/cups
+LIB_DEPENDS-cups = \
+	${LIB_DEPENDS} \
+	kdecore.>=6,kwalletclient,kdefakes,kdefx,kdeprint,kio,kparts,kdeui,kdesu,kdeprint_management,DCOP::x11/kde/libs3 \
+	cups::print/cups
 
-WANTLIB-cups=	${WANTLIB} \
+WANTLIB-cups =	${WANTLIB} \
 		crypto ssl
 
 
-SEPARATE_BUILD=	flavored
-SAMPLECONFDIR=${TRUEPREFIX}/share/apps/kde-conf-sample
-EXTRA_CONFIG=xdg/menus/applications.menu
+SEPARATE_BUILD =	flavored
+SAMPLECONFDIR =		${TRUEPREFIX}/share/apps/kde-conf-sample
+EXTRA_CONFIG =		xdg/menus/applications.menu
 
-FAKE_FLAGS=	sysconfdir=${SAMPLECONFDIR}
+FAKE_FLAGS =		sysconfdir=${SAMPLECONFDIR}
 
 post-extract:
 	cp ${FILESDIR}/krb5-config ${WRKDIR}/bin
@@ -112,4 +115,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKBUILD}/libtool ${PREFIX}/bin/kdelibtool
 
 .include <bsd.port.mk>
-MODGNU_AUTOCONF_FILES+= dcop/dcop-path.h.in
+MODGNU_AUTOCONF_FILES +=	dcop/dcop-path.h.in
diff --git a/x11/kde/libs3/distinfo b/x11/kde/libs3/distinfo
index fdddec3172d..33db14e7ba0 100644
--- a/x11/kde/libs3/distinfo
+++ b/x11/kde/libs3/distinfo
@@ -1,5 +1,5 @@
-MD5 (kde/kdelibs-3.5.9.tar.bz2) = VeXwCHSTPRp7p8leNpogXg==
-RMD160 (kde/kdelibs-3.5.9.tar.bz2) = msAr8jFN44eyqpZkcDxysGE/y7M=
-SHA1 (kde/kdelibs-3.5.9.tar.bz2) = uBl9lAdaVPkPCKnve+2VzPU+Eq0=
-SHA256 (kde/kdelibs-3.5.9.tar.bz2) = T5JVPz/1Deh6g0NfzjuuRAxD8NN6joChc20Af4DY91U=
-SIZE (kde/kdelibs-3.5.9.tar.bz2) = 15568675
+MD5 (kde/kdelibs-3.5.10.tar.bz2) = Q81V7RX2O1c41iDvn5/VaA==
+RMD160 (kde/kdelibs-3.5.10.tar.bz2) = TJYGZCg8g+vI5okyypBEM2/P8iM=
+SHA1 (kde/kdelibs-3.5.10.tar.bz2) = yTCiX0QZE03vVbhGbDpvc3In+4I=
+SHA256 (kde/kdelibs-3.5.10.tar.bz2) = YX6csBxw7UwbVUs3P1Xe/70OEuLN/qzXs9lAk3IoXHI=
+SIZE (kde/kdelibs-3.5.10.tar.bz2) = 15614607
diff --git a/x11/kde/libs3/patches/patch-dcop_dcopidl2cpp_Makefile_in b/x11/kde/libs3/patches/patch-dcop_dcopidl2cpp_Makefile_in
index 389c672411b..323d90d12fa 100644
--- a/x11/kde/libs3/patches/patch-dcop_dcopidl2cpp_Makefile_in
+++ b/x11/kde/libs3/patches/patch-dcop_dcopidl2cpp_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-dcop_dcopidl2cpp_Makefile_in,v 1.1 2007/10/24 21:52:18 espie Exp $
---- dcop/dcopidl2cpp/Makefile.in.orig	Mon Oct 22 22:48:57 2007
-+++ dcop/dcopidl2cpp/Makefile.in	Mon Oct 22 22:53:31 2007
+$OpenBSD: patch-dcop_dcopidl2cpp_Makefile_in,v 1.2 2008/08/26 16:52:29 espie Exp $
+--- dcop/dcopidl2cpp/Makefile.in.orig	Wed Aug 20 18:05:55 2008
++++ dcop/dcopidl2cpp/Makefile.in	Thu Aug 21 00:03:29 2008
 @@ -410,7 +410,7 @@ INCLUDES = $(all_includes)
  AM_LDFLAGS = $(all_libraries)
  dcopidl2cpp_SOURCES = main.cpp skel.cpp stub.cpp stubimpl.cpp
  noinst_HEADERS = main.h
 -dcopidl2cpp_LDADD = $(LIB_QT)
 +dcopidl2cpp_LDADD = $(all_libraries) $(LIB_QT)
- dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
+ dcopidl2cpp_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
  #>- all: all-am
  #>+ 1
diff --git a/x11/kde/libs3/patches/patch-dcop_dcopidl_Makefile_in b/x11/kde/libs3/patches/patch-dcop_dcopidl_Makefile_in
index a506af9f357..63d4e7c577c 100644
--- a/x11/kde/libs3/patches/patch-dcop_dcopidl_Makefile_in
+++ b/x11/kde/libs3/patches/patch-dcop_dcopidl_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-dcop_dcopidl_Makefile_in,v 1.1 2007/10/24 21:52:18 espie Exp $
---- dcop/dcopidl/Makefile.in.orig	Mon Oct 22 22:48:28 2007
-+++ dcop/dcopidl/Makefile.in	Mon Oct 22 22:53:28 2007
+$OpenBSD: patch-dcop_dcopidl_Makefile_in,v 1.2 2008/08/26 16:52:29 espie Exp $
+--- dcop/dcopidl/Makefile.in.orig	Wed Aug 20 18:05:55 2008
++++ dcop/dcopidl/Makefile.in	Thu Aug 21 00:03:57 2008
 @@ -409,7 +409,7 @@ AM_LDFLAGS = $(all_libraries)
  AM_CPPFLAGS = -DYYDEBUG
  dcopidl_SOURCES = main.cpp yacc.cc scanner.cc
  noinst_HEADERS = yacc.cc.h
 -dcopidl_LDADD = $(LIB_QT)
 +dcopidl_LDADD = $(all_libraries) $(LIB_QT)
- dcopidl_LDFLAGS = $(KDE_RPATH)
+ dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
  EXTRA_DIST = dcopidl_test.h scanner.ll yacc.yy
  MAINTAINERCLEANFILES = yacc.cc.output
diff --git a/x11/kde/libs3/patches/patch-kdecore_kpty_cpp b/x11/kde/libs3/patches/patch-kdecore_kpty_cpp
index 7beaa91ec07..df5d0a00756 100644
--- a/x11/kde/libs3/patches/patch-kdecore_kpty_cpp
+++ b/x11/kde/libs3/patches/patch-kdecore_kpty_cpp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-kdecore_kpty_cpp,v 1.2 2006/06/03 12:47:30 espie Exp $
---- kdecore/kpty.cpp.orig	Mon May 22 20:14:21 2006
-+++ kdecore/kpty.cpp	Sun May 28 13:23:43 2006
+$OpenBSD: patch-kdecore_kpty_cpp,v 1.3 2008/08/26 16:52:29 espie Exp $
+--- kdecore/kpty.cpp.orig	Tue Aug 19 20:18:18 2008
++++ kdecore/kpty.cpp	Thu Aug 21 00:02:14 2008
 @@ -95,20 +95,20 @@ extern "C" {
  # endif
  #endif
@@ -26,7 +26,7 @@ $OpenBSD: patch-kdecore_kpty_cpp,v 1.2 2006/06/03 12:47:30 espie Exp $
  #  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) 
  # else
  #  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
-@@ -201,6 +201,19 @@ bool KPty::open()
+@@ -206,6 +206,19 @@ bool KPty::open()
    if (d->masterFd >= 0)
      return true;
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-kdecore_kpty_cpp,v 1.2 2006/06/03 12:47:30 espie Exp $
    QCString ptyName;
  
    // Find a master pty that we can open ////////////////////////////////
-@@ -314,6 +327,7 @@ bool KPty::open()
+@@ -319,6 +332,7 @@ bool KPty::open()
    ioctl(d->slaveFd, I_PUSH, "ldterm");
  #endif
  
@@ -54,7 +54,7 @@ $OpenBSD: patch-kdecore_kpty_cpp,v 1.2 2006/06/03 12:47:30 espie Exp $
      // set xon/xoff & control keystrokes
    // without the '::' some version of HP-UX thinks, this declares
    // the struct in this class, in this method, and fails to find
-@@ -529,8 +543,10 @@ int KPty::slaveFd() const
+@@ -534,8 +548,10 @@ int KPty::slaveFd() const
  // private
  bool KPty::chownpty(bool grant)
  {
diff --git a/x11/kde/libs3/patches/patch-kdecore_tests_kurltest_cpp b/x11/kde/libs3/patches/patch-kdecore_tests_kurltest_cpp
index 039adcf264f..52c048937bb 100644
--- a/x11/kde/libs3/patches/patch-kdecore_tests_kurltest_cpp
+++ b/x11/kde/libs3/patches/patch-kdecore_tests_kurltest_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-kdecore_tests_kurltest_cpp,v 1.3 2008/03/25 11:45:08 espie Exp $
---- kdecore/tests/kurltest.cpp.orig	Wed Feb 13 10:41:08 2008
-+++ kdecore/tests/kurltest.cpp	Thu Feb 14 21:09:53 2008
-@@ -312,6 +312,16 @@ int main(int argc, char *argv[])
+$OpenBSD: patch-kdecore_tests_kurltest_cpp,v 1.4 2008/08/26 16:52:29 espie Exp $
+--- kdecore/tests/kurltest.cpp.orig	Tue Aug 19 20:18:16 2008
++++ kdecore/tests/kurltest.cpp	Thu Aug 21 00:02:14 2008
+@@ -317,6 +317,16 @@ int main(int argc, char *argv[])
    check("KURL::prettyURL()", whitespaceInPath2.prettyURL(),
            "http://www.google.com/foo%20%20%20%20%20%20 bar/");
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-kdecore_tests_kurltest_cpp,v 1.3 2008/03/25 11:45:08 espie Exp $
    KURL carsten;
    carsten.setPath("/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
    check("KURL::path()", carsten.path(), "/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
-@@ -617,6 +627,15 @@ int main(int argc, char *argv[])
+@@ -622,6 +632,15 @@ int main(int argc, char *argv[])
          "http://meine.db24.de#link=home_c_login_login");
    check("http: URL with empty path string path", waba1.path(),
          "");
diff --git a/x11/kde/libs3/patches/patch-kdesu_process_cpp b/x11/kde/libs3/patches/patch-kdesu_process_cpp
index 0e28576566c..55655119b71 100644
--- a/x11/kde/libs3/patches/patch-kdesu_process_cpp
+++ b/x11/kde/libs3/patches/patch-kdesu_process_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-kdesu_process_cpp,v 1.9 2006/10/12 23:12:19 espie Exp $
---- kdesu/process.cpp.orig	Sun Oct  1 19:33:34 2006
-+++ kdesu/process.cpp	Tue Oct  3 01:00:17 2006
-@@ -438,8 +438,13 @@ int PtyProcess::waitForChild()
+$OpenBSD: patch-kdesu_process_cpp,v 1.10 2008/08/26 16:52:29 espie Exp $
+--- kdesu/process.cpp.orig	Tue Aug 19 20:18:14 2008
++++ kdesu/process.cpp	Thu Aug 21 00:02:14 2008
+@@ -492,8 +492,13 @@ int PtyProcess::waitForChild()
  
      while (1) 
      {
diff --git a/x11/kde/libs3/pkg/PLIST-cups b/x11/kde/libs3/pkg/PLIST-cups
index ef890f967b9..e5aaf7f9d52 100644
--- a/x11/kde/libs3/pkg/PLIST-cups
+++ b/x11/kde/libs3/pkg/PLIST-cups
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-cups,v 1.1 2005/11/29 14:00:12 espie Exp $
+@comment $OpenBSD: PLIST-cups,v 1.2 2008/08/26 16:52:29 espie Exp $
 @conflict kdelibs-<3.5
-bin/cupsdconf
-bin/cupsdoprint
-bin/make_driver_db_cups
+@bin bin/cupsdconf
+@bin bin/cupsdoprint
+@bin bin/make_driver_db_cups
 ${KDE}/cupsdconf.la
 ${KDE}/cupsdconf.so
 ${KDE}/kdeprint_cups.la
diff --git a/x11/kde/libs3/pkg/PLIST-main b/x11/kde/libs3/pkg/PLIST-main
index 0f86134c976..e9ae0410b74 100644
--- a/x11/kde/libs3/pkg/PLIST-main
+++ b/x11/kde/libs3/pkg/PLIST-main
@@ -1,70 +1,70 @@
-@comment $OpenBSD: PLIST-main,v 1.8 2008/03/25 11:45:08 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.9 2008/08/26 16:52:29 espie Exp $
 @conflict kdebase-<3.5
 @conflict kdeartwork-<3.4
 @conflict kdeaddons-<3.4
 @conflict kdeadmin-<3.4
 @pkgpath x11/kde/libs3
-bin/artsmessage
+@bin bin/artsmessage
 bin/checkXML
-bin/dcop
-bin/dcopclient
-bin/dcopfind
-bin/dcopidl
-bin/dcopidl2cpp
+@bin bin/dcop
+@bin bin/dcopclient
+@bin bin/dcopfind
+@bin bin/dcopidl
+@bin bin/dcopidl2cpp
 bin/dcopidlng
-bin/dcopobject
-bin/dcopquit
-bin/dcopref
-bin/dcopserver
-bin/dcopserver_shutdown
-bin/dcopstart
+@bin bin/dcopobject
+@bin bin/dcopquit
+@bin bin/dcopref
+@bin bin/dcopserver
+@bin bin/dcopserver_shutdown
+@bin bin/dcopstart
 @comment bin/filesharelist
 @comment bin/fileshareset
 bin/imagetops
-bin/kab2kabc
-bin/kaddprinterwizard
-bin/kbuildsycoca
-bin/kcmshell
-bin/kconf_update
-bin/kconfig_compiler
-bin/kcookiejar
-bin/kde-config
-bin/kde-menu
-bin/kded
-bin/kdeinit
-bin/kdeinit_shutdown
-bin/kdeinit_wrapper
+@bin bin/kab2kabc
+@bin bin/kaddprinterwizard
+@bin bin/kbuildsycoca
+@bin bin/kcmshell
+@bin bin/kconf_update
+@bin bin/kconfig_compiler
+@bin bin/kcookiejar
+@bin bin/kde-config
+@bin bin/kde-menu
+@bin bin/kded
+@bin bin/kdeinit
+@bin bin/kdeinit_shutdown
+@bin bin/kdeinit_wrapper
 bin/kdelibtool
-bin/kdesu_stub
-bin/kdontchangethehostname
-bin/kdostartupconfig
-bin/kfile
+@bin bin/kdesu_stub
+@bin bin/kdontchangethehostname
+@bin bin/kdostartupconfig
+@bin bin/kfile
 bin/kfmexec
 @comment bin/kgrantpty
-bin/khotnewstuff
-bin/kinstalltheme
-bin/kio_http_cache_cleaner
-bin/kio_uiserver
-bin/kioexec
-bin/kioslave
-bin/klauncher
-bin/kmailservice
+@bin bin/khotnewstuff
+@bin bin/kinstalltheme
+@bin bin/kio_http_cache_cleaner
+@bin bin/kio_uiserver
+@bin bin/kioexec
+@bin bin/kioslave
+@bin bin/klauncher
+@bin bin/kmailservice
 @comment bin/kpac_dhcp_helper
-bin/ksendbugmail
-bin/kshell
-bin/kstartupconfig
-bin/ksvgtopng
-bin/ktelnetservice
-bin/ktradertest
-bin/kunittestmodrunner
-bin/kwrapper
-bin/lnusertemp
-bin/make_driver_db_lpr
-bin/makekdewidgets
-bin/meinproc
+@bin bin/ksendbugmail
+@bin bin/kshell
+@bin bin/kstartupconfig
+@bin bin/ksvgtopng
+@bin bin/ktelnetservice
+@bin bin/ktradertest
+@bin bin/kunittestmodrunner
+@bin bin/kwrapper
+@bin bin/lnusertemp
+@bin bin/make_driver_db_lpr
+@bin bin/makekdewidgets
+@bin bin/meinproc
 bin/preparetips
-bin/start_kdeinit
-bin/start_kdeinit_wrapper
+@bin bin/start_kdeinit
+@bin bin/start_kdeinit_wrapper
 include/arts/artskde.h
 include/arts/kartsdispatcher.h
 include/arts/kartsfloatwatch.h