Update KDE4 to 4.3.2

KDE 4.3.2 brings a nice number of bugfixes, some critical, some just
fixing small annoyances:
* Many crashers have been fixed in KDE's core libraries, bringing more
  stability to all applications
* KWin's window compositing effects have been further stabilized by fixing
  a number of bugs in effect plugins such as the famous coverswitch window
  switcher
* The biggest number of bugs for this release has been fixed in KMail,
  KDE's email client, making it more reliable and usable by correcting a
  number of display issues
* Saving files over themselves works again in Okular, KDE's document viewer

27 files changed, 378 insertions, 89 deletions

diff --git a/x11/kde4-l10n-de/PLIST b/x11/kde4-l10n-de/PLIST
index 8cc967610bf..e97c8e7fe78 100644
--- a/x11/kde4-l10n-de/PLIST
+++ b/x11/kde4-l10n-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 22:07:58 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 man/de/man1/adddebug.1
 man/de/man1/ark.1
 man/de/man1/cheatmake.1
@@ -1884,7 +1884,6 @@ share/locale/de/LC_MESSAGES/kdat.mo
 share/locale/de/LC_MESSAGES/kde-menu.mo
 share/locale/de/LC_MESSAGES/kdeasciiquarium.mo
 share/locale/de/LC_MESSAGES/kdebugdialog.mo
-share/locale/de/LC_MESSAGES/kded_phononserver.mo
 share/locale/de/LC_MESSAGES/kdelibs4.mo
 share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
 share/locale/de/LC_MESSAGES/kdelirc.mo
@@ -2185,6 +2184,7 @@ share/locale/de/LC_MESSAGES/parley.mo
 share/locale/de/LC_MESSAGES/phonon-xine.mo
 share/locale/de/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/de/LC_MESSAGES/phonon_kde.mo
+share/locale/de/LC_MESSAGES/phononserver.mo
 share/locale/de/LC_MESSAGES/plasma-desktop.mo
 share/locale/de/LC_MESSAGES/plasma-overlay.mo
 share/locale/de/LC_MESSAGES/plasma-shells-common.mo
@@ -2248,9 +2248,9 @@ share/locale/de/LC_MESSAGES/plasma_applet_webbrowser.mo
 share/locale/de/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo
 share/locale/de/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo
 share/locale/de/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo
-share/locale/de/LC_MESSAGES/plasma_engine_applicationjobs.mo
 share/locale/de/LC_MESSAGES/plasma_engine_kalzium.mo
 share/locale/de/LC_MESSAGES/plasma_engine_keystate.mo
+share/locale/de/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/de/LC_MESSAGES/plasma_engine_metadata.mo
 share/locale/de/LC_MESSAGES/plasma_engine_network.mo
 share/locale/de/LC_MESSAGES/plasma_engine_notifications.mo
diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo
index 414b3a529da..4db9be17073 100644
--- a/x11/kde4-l10n-de/distinfo
+++ b/x11/kde4-l10n-de/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 22:07:58 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kde-l10n-de-4.3.1.tar.bz2) = 862ce30f6c28be3891659c7e44c406430483bdc5
-RMD160 (kde-l10n-de-4.3.1.tar.bz2) = 314a0dc12c49867e8679a2ef2c7d6bd42ae45d1b
-Size (kde-l10n-de-4.3.1.tar.bz2) = 20259404 bytes
+SHA1 (kde-l10n-de-4.3.2.tar.bz2) = aa393d26e92670efb4167644720ba2aae6ca41cc
+RMD160 (kde-l10n-de-4.3.2.tar.bz2) = 932e33b6dc91899f648a00581283d77fa6fcc2a1
+Size (kde-l10n-de-4.3.2.tar.bz2) = 20260134 bytes
diff --git a/x11/kde4-l10n-en_GB/PLIST b/x11/kde4-l10n-en_GB/PLIST
index e4090fa91b2..fffdd0de006 100644
--- a/x11/kde4-l10n-en_GB/PLIST
+++ b/x11/kde4-l10n-en_GB/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 22:14:22 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 share/doc/kde/HTML/en_GB/cervisia/common
 share/doc/kde/HTML/en_GB/cervisia/index.cache.bz2
 share/doc/kde/HTML/en_GB/cervisia/index.docbook
+share/doc/kde/HTML/en_GB/common/fdl-translated.html
+share/doc/kde/HTML/en_GB/common/gpl-translated.html
+share/doc/kde/HTML/en_GB/common/kde-localised.css
+share/doc/kde/HTML/en_GB/common/lgpl-translated.html
 share/doc/kde/HTML/en_GB/kaddressbook/common
 share/doc/kde/HTML/en_GB/kaddressbook/index.cache.bz2
 share/doc/kde/HTML/en_GB/kaddressbook/index.docbook
@@ -700,7 +704,6 @@ share/locale/en_GB/LC_MESSAGES/kdat.mo
 share/locale/en_GB/LC_MESSAGES/kde-menu.mo
 share/locale/en_GB/LC_MESSAGES/kdeasciiquarium.mo
 share/locale/en_GB/LC_MESSAGES/kdebugdialog.mo
-share/locale/en_GB/LC_MESSAGES/kded_phononserver.mo
 share/locale/en_GB/LC_MESSAGES/kdelibs4.mo
 share/locale/en_GB/LC_MESSAGES/kdelibs_colors4.mo
 share/locale/en_GB/LC_MESSAGES/kdelirc.mo
@@ -1000,6 +1003,7 @@ share/locale/en_GB/LC_MESSAGES/parley.mo
 share/locale/en_GB/LC_MESSAGES/phonon-xine.mo
 share/locale/en_GB/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/en_GB/LC_MESSAGES/phonon_kde.mo
+share/locale/en_GB/LC_MESSAGES/phononserver.mo
 share/locale/en_GB/LC_MESSAGES/plasma-desktop.mo
 share/locale/en_GB/LC_MESSAGES/plasma-overlay.mo
 share/locale/en_GB/LC_MESSAGES/plasma-shells-common.mo
@@ -1063,8 +1067,8 @@ share/locale/en_GB/LC_MESSAGES/plasma_applet_webbrowser.mo
 share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo
 share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo
 share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo
-share/locale/en_GB/LC_MESSAGES/plasma_engine_applicationjobs.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_kalzium.mo
+share/locale/en_GB/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_metadata.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_network.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_notifications.mo
diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo
index e2601bd160b..01e273cad09 100644
--- a/x11/kde4-l10n-en_GB/distinfo
+++ b/x11/kde4-l10n-en_GB/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 22:14:22 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kde-l10n-en_GB-4.3.1.tar.bz2) = e8373c53b310215b73417417c0403a1662a5dbd1
-RMD160 (kde-l10n-en_GB-4.3.1.tar.bz2) = 53c78fef13e7b17d45c04aa371232b112ad12053
-Size (kde-l10n-en_GB-4.3.1.tar.bz2) = 3856885 bytes
+SHA1 (kde-l10n-en_GB-4.3.2.tar.bz2) = 45fc26b7a30ac618571acf72501bd1a99f212cbf
+RMD160 (kde-l10n-en_GB-4.3.2.tar.bz2) = c9b18b0f63dfa46c926b9d93a942a744b42b04f7
+Size (kde-l10n-en_GB-4.3.2.tar.bz2) = 3876532 bytes
diff --git a/x11/kde4-l10n-nl/PLIST b/x11/kde4-l10n-nl/PLIST
index fef85a48902..a64a0f0cecc 100644
--- a/x11/kde4-l10n-nl/PLIST
+++ b/x11/kde4-l10n-nl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 22:26:20 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 man/nl/man1/fixincludes.1
 man/nl/man1/kalzium.1
 man/nl/man1/kappfinder.1
@@ -14,6 +14,10 @@ man/nl/man1/qtdoc.1
 man/nl/man1/split2po.1
 man/nl/man1/swappo.1
 man/nl/man6/kpat.6
+share/doc/kde/HTML/nl/common/fdl-translated.html
+share/doc/kde/HTML/nl/common/gpl-translated.html
+share/doc/kde/HTML/nl/common/kde-localised.css
+share/doc/kde/HTML/nl/common/lgpl-translated.html
 share/doc/kde/HTML/nl/irkick/common
 share/doc/kde/HTML/nl/irkick/index.cache.bz2
 share/doc/kde/HTML/nl/irkick/index.docbook
@@ -1101,7 +1105,6 @@ share/locale/nl/LC_MESSAGES/kdat.mo
 share/locale/nl/LC_MESSAGES/kde-menu.mo
 share/locale/nl/LC_MESSAGES/kdeasciiquarium.mo
 share/locale/nl/LC_MESSAGES/kdebugdialog.mo
-share/locale/nl/LC_MESSAGES/kded_phononserver.mo
 share/locale/nl/LC_MESSAGES/kdelibs4.mo
 share/locale/nl/LC_MESSAGES/kdelibs_colors4.mo
 share/locale/nl/LC_MESSAGES/kdelirc.mo
@@ -1402,6 +1405,7 @@ share/locale/nl/LC_MESSAGES/parley.mo
 share/locale/nl/LC_MESSAGES/phonon-xine.mo
 share/locale/nl/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/nl/LC_MESSAGES/phonon_kde.mo
+share/locale/nl/LC_MESSAGES/phononserver.mo
 share/locale/nl/LC_MESSAGES/plasma-desktop.mo
 share/locale/nl/LC_MESSAGES/plasma-overlay.mo
 share/locale/nl/LC_MESSAGES/plasma-shells-common.mo
@@ -1465,9 +1469,9 @@ share/locale/nl/LC_MESSAGES/plasma_applet_webbrowser.mo
 share/locale/nl/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo
 share/locale/nl/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo
 share/locale/nl/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo
-share/locale/nl/LC_MESSAGES/plasma_engine_applicationjobs.mo
 share/locale/nl/LC_MESSAGES/plasma_engine_kalzium.mo
 share/locale/nl/LC_MESSAGES/plasma_engine_keystate.mo
+share/locale/nl/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/nl/LC_MESSAGES/plasma_engine_metadata.mo
 share/locale/nl/LC_MESSAGES/plasma_engine_network.mo
 share/locale/nl/LC_MESSAGES/plasma_engine_notifications.mo
diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo
index be42c9b8e6d..66444ca7be9 100644
--- a/x11/kde4-l10n-nl/distinfo
+++ b/x11/kde4-l10n-nl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 22:26:20 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kde-l10n-nl-4.3.1.tar.bz2) = b3d1a714dc4ed767c0a3cc9fbce0512757a3656e
-RMD160 (kde-l10n-nl-4.3.1.tar.bz2) = 93a478f0f75d56570a663465462b5dff1a9d9761
-Size (kde-l10n-nl-4.3.1.tar.bz2) = 12966042 bytes
+SHA1 (kde-l10n-nl-4.3.2.tar.bz2) = 4d0eb15547ecaafc717337f9ac91472fb277bb27
+RMD160 (kde-l10n-nl-4.3.2.tar.bz2) = fca6b9a97dc2348bc95110c9d04dbbb8a7bdc2e9
+Size (kde-l10n-nl-4.3.2.tar.bz2) = 12994611 bytes
diff --git a/x11/kdebase-runtime4/Makefile b/x11/kdebase-runtime4/Makefile
index 1c3bb4994ef..95f46d909fa 100644
--- a/x11/kdebase-runtime4/Makefile
+++ b/x11/kdebase-runtime4/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2009/10/06 14:06:27 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/11 08:13:40 markd Exp $
 
 DISTNAME=	kdebase-runtime-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Runtime requirements for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=off
 
diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo
index 29ce9178c46..4597fabe15d 100644
--- a/x11/kdebase-runtime4/distinfo
+++ b/x11/kdebase-runtime4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kdebase-runtime-4.3.1.tar.bz2) = 4cb7a4ed093bacf01d5ecff1cbc60a8934dea59c
-RMD160 (kdebase-runtime-4.3.1.tar.bz2) = febfcff745a5021d9ad793fac4d3067c2bbeb846
-Size (kdebase-runtime-4.3.1.tar.bz2) = 7260641 bytes
+SHA1 (kdebase-runtime-4.3.2.tar.bz2) = 33bb1da691d1ab75d1fbe5bcac38f105cddab709
+RMD160 (kdebase-runtime-4.3.2.tar.bz2) = e3694468e6056ffea03a922a3b7fb01db3c6fc4f
+Size (kdebase-runtime-4.3.2.tar.bz2) = 7331247 bytes
 SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
 SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40
 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile
index 3345a578f6d..61c1bf26498 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kdebase-workspace4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 DISTNAME=	kdebase-workspace-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -14,8 +14,6 @@ SITES.NetBSD-flag-1.0.png=	${MASTER_SITE_LOCAL}
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 USE_TOOLS+=		mkfontdir bdftopcf
diff --git a/x11/kdebase-workspace4/PLIST b/x11/kdebase-workspace4/PLIST
index ad658f8e534..c8ab5d40a82 100644
--- a/x11/kdebase-workspace4/PLIST
+++ b/x11/kdebase-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -417,8 +417,10 @@ share/doc/kde/HTML/en/kcontrol/colors/common
 share/doc/kde/HTML/en/kcontrol/colors/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/colors/index.docbook
 share/doc/kde/HTML/en/kcontrol/desktopthemedetails/common
+share/doc/kde/HTML/en/kcontrol/desktopthemedetails/desktop-settings.png
 share/doc/kde/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/desktopthemedetails/index.docbook
+share/doc/kde/HTML/en/kcontrol/desktopthemedetails/message.png
 share/doc/kde/HTML/en/kcontrol/energy/common
 share/doc/kde/HTML/en/kcontrol/energy/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/energy/index.docbook
diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo
index 2a8db7318fa..088ad02f8cf 100644
--- a/x11/kdebase-workspace4/distinfo
+++ b/x11/kdebase-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:37:19 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kdebase-workspace-4.3.1.tar.bz2) = c21a6e8028aa993878cccccb26b2611b3337eac9
-RMD160 (kdebase-workspace-4.3.1.tar.bz2) = 1db4e5428a497efff6910b5e1442eaffd2d0bad0
-Size (kdebase-workspace-4.3.1.tar.bz2) = 62286316 bytes
+SHA1 (kdebase-workspace-4.3.2.tar.bz2) = 3a07f3e64abd324e0b8a3aeab1ae2c13e75ea026
+RMD160 (kdebase-workspace-4.3.2.tar.bz2) = e3dc7959e8a51091cf5e32c367549d7666453efb
+Size (kdebase-workspace-4.3.2.tar.bz2) = 62494257 bytes
 SHA1 (patch-ab) = a1dc303cdb27bb4cb3067d347baedabefbca8353
 SHA1 (patch-ac) = 5420c39a055e6208097cf48db5513f7c9db09bef
 SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 6135d39a89d..1b37ae769a5 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:43:39 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -13,8 +13,6 @@ COMMENT=	Base modules for the KDE 4 integrated X11 desktop
 # .../kdebase-4.2.2/apps/konsole/src/ColorSchemeEditor.cpp:36:34: error: ui_ColorSchemeEditor.h: No such file or directory     
 MAKE_JOBS_SAFE=	no
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 2af78438605..862e1aac25e 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:43:39 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kdebase-4.3.1.tar.bz2) = 005681277615a0a3ec737bdd07989763fa1ae781
-RMD160 (kdebase-4.3.1.tar.bz2) = 442706f75ba6da90cb38677c49046b313ce6b7d1
-Size (kdebase-4.3.1.tar.bz2) = 4263214 bytes
+SHA1 (kdebase-4.3.2.tar.bz2) = c9c65dc596c8c48974fbe4099f340371de147fa8
+RMD160 (kdebase-4.3.2.tar.bz2) = 9d34189746ee7b99840388d1a45d6ffaef795f19
+Size (kdebase-4.3.2.tar.bz2) = 4273532 bytes
+SHA1 (patch-aa) = a25428863150185b0a389ed260e186a6b30cb6fb
diff --git a/x11/kdebase4/patches/patch-aa b/x11/kdebase4/patches/patch-aa
new file mode 100644
index 00000000000..fb0b6f5265a
--- /dev/null
+++ b/x11/kdebase4/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032180
+
+--- apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig	2009-08-27 20:17:51.000000000 +1200
++++ apps/dolphin/src/panels/terminal/terminalpanel.cpp
+@@ -23,7 +23,6 @@
+ #include <kde_terminal_interface_v2.h>
+ #include <kparts/part.h>
+ #include <kshell.h>
+-#include <kio/netaccess.h>
+ 
+ #include <QBoxLayout>
+ #include <QShowEvent>
+@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
+     }
+ 
+     Panel::setUrl(url);
+-    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
+     const bool sendInput = (m_terminal != 0)
+                            && (m_terminal->foregroundProcessId() == -1)
+                            && isVisible()
+-                           && mostLocalUrl.isLocalFile();
++                           && url.isLocalFile();
+     if (sendInput) {
+-        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
++        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
+     }
+ 
+ }
diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
index 1509fca917d..4acae8a2e09 100644
--- a/x11/kdebindings4-python/Makefile
+++ b/x11/kdebindings4-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 PKGNAME=	kdebindings4-python-${_KDE_VERSION}
 DISTNAME=	kdebindings-${_KDE_VERSION}
@@ -7,8 +7,6 @@ COMMENT=	Python bindings for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 CMAKE_ARGS+=	-DENABLE_SMOKE=off
diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo
index 783952b259d..91728601e6e 100644
--- a/x11/kdebindings4-python/distinfo
+++ b/x11/kdebindings4-python/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kdebindings-4.3.1.tar.bz2) = bb414b1ab28b51d9bbbfaa2d9c8474b27c325c32
-RMD160 (kdebindings-4.3.1.tar.bz2) = bddbc6845c294fb10acd189b2c9e7575f97bd8b5
-Size (kdebindings-4.3.1.tar.bz2) = 4881053 bytes
+SHA1 (kdebindings-4.3.2.tar.bz2) = 72416301dce5362535bd3c09ffd6d2f884409fc4
+RMD160 (kdebindings-4.3.2.tar.bz2) = 038aaddf18e2dee9f48ea48f767f77bec1799ec5
+Size (kdebindings-4.3.2.tar.bz2) = 4878928 bytes
 SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158
 SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec
diff --git a/x11/kdelibs-experimental4/Makefile b/x11/kdelibs-experimental4/Makefile
index 2a2d884856f..3ffc717e267 100644
--- a/x11/kdelibs-experimental4/Makefile
+++ b/x11/kdelibs-experimental4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:23:22 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 DISTNAME=	kdelibs-experimental-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -6,8 +6,6 @@ COMMENT=	Experimental libraries for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/x11/kdelibs-experimental4/PLIST b/x11/kdelibs-experimental4/PLIST
index 74173f2b6c2..0bfe488d3d4 100644
--- a/x11/kdelibs-experimental4/PLIST
+++ b/x11/kdelibs-experimental4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:23:22 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 include/knotificationitem-1/knotificationitem.h
 include/knotificationitem-1/knotificationitem_export.h
 lib/libknotificationitem-1.so
@@ -6,4 +6,3 @@ lib/libknotificationitem-1.so.1
 lib/libknotificationitem-1.so.1.0.0
 share/dbus-1/interfaces/org.kde.NotificationItem.xml
 share/dbus-1/interfaces/org.kde.NotificationItemWatcher.xml
-
diff --git a/x11/kdelibs-experimental4/distinfo b/x11/kdelibs-experimental4/distinfo
index f88f74d18eb..f9f7c4b4ba9 100644
--- a/x11/kdelibs-experimental4/distinfo
+++ b/x11/kdelibs-experimental4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:23:22 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kdelibs-experimental-4.3.1.tar.bz2) = 7d560817a186c4b7099d321ee4a58705962a59d3
-RMD160 (kdelibs-experimental-4.3.1.tar.bz2) = a9c5c9882ed42d9d40c401b299588a5ecc8c59b3
-Size (kdelibs-experimental-4.3.1.tar.bz2) = 26920 bytes
+SHA1 (kdelibs-experimental-4.3.2.tar.bz2) = 79e34cff9fdcca8fc0e06a0bf524b08abf815705
+RMD160 (kdelibs-experimental-4.3.2.tar.bz2) = 49c9005ffd4124f940c0c3088857e0add44afcfb
+Size (kdelibs-experimental-4.3.2.tar.bz2) = 26904 bytes
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 435aa93a2e2..25f2c3703c3 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -11,7 +11,6 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
 CONFLICTS=	kdelibs-[0-9]*
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index 8c44a0a3268..dd4ad03b6cd 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -2501,6 +2501,7 @@ share/kde/apps/ksgmltools2/customization/es/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/es/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/es/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/es/lang.entities
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 22709ac1974..51b934b530a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:18:56 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kdelibs-4.3.1.tar.bz2) = 511532852caca9302c643fded4013ef1f57d5433
-RMD160 (kdelibs-4.3.1.tar.bz2) = 25c8d6225813a677d4f1e1006f18b0d5c14f9003
-Size (kdelibs-4.3.1.tar.bz2) = 10510833 bytes
+SHA1 (kdelibs-4.3.2.tar.bz2) = 37f8dd8275bffbcb0e01f9f133a20856329dfa0c
+RMD160 (kdelibs-4.3.2.tar.bz2) = 93a5c29a470023585006c26c956146e21d1bcdfb
+Size (kdelibs-4.3.2.tar.bz2) = 10515372 bytes
 SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977
 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d
 SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7
@@ -11,4 +11,7 @@ SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
 SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4
 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
-SHA1 (patch-ak) = ef85a1a01e902f98db5fda5b7b27c6a3739dbfd8
+SHA1 (patch-ba) = 9e980afeb09d5b4561638efb339f981b6273d18e
+SHA1 (patch-bb) = df8e42a167d1fa46dfe2cef5b92e6c9aae5b565d
+SHA1 (patch-bc) = 97ba6045f4ff28423d2a565487305a1f6420ce57
+SHA1 (patch-bd) = dd08b9f7c4c158db5b9e5cdd7777bff6979cb26c
diff --git a/x11/kdelibs4/patches/patch-ak b/x11/kdelibs4/patches/patch-ak
deleted file mode 100644
index 8707889397c..00000000000
--- a/x11/kdelibs4/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2009/10/02 19:19:00 markd Exp $
-
-SVN commit 1028997.
-
---- kdecore/network/k3socketdevice.cpp.orig	2009-09-24 09:21:38.000000000 -0600
-+++ kdecore/network/k3socketdevice.cpp	2009-09-24 09:23:15.000000000 -0600
-@@ -352,9 +352,13 @@ bool KSocketDevice::connect(const KResol
-   if (kde_connect(m_sockfd, address.address(), address.length()) == -1)
-     {
-       if (errno == EISCONN)
--	return true;		// we're already connected
-+	{
-+	  KActiveSocketBase::open(Unbuffered | mode);
-+	  return true;		// we're already connected
-+	}
-       else if (errno == EALREADY || errno == EINPROGRESS)
- 	{
-+	  KActiveSocketBase::open(Unbuffered | mode);
- 	  setError(InProgress);
- 	  return true;
- 	}
diff --git a/x11/kdelibs4/patches/patch-ba b/x11/kdelibs4/patches/patch-ba
new file mode 100644
index 00000000000..cd9a462d77a
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032787
+
+--- khtml/khtml_part.cpp.orig	2009-10-02 21:18:12.000000000 +1300
++++ khtml/khtml_part.cpp
+@@ -609,8 +609,7 @@ KHTMLPart::~KHTMLPart()
+ 
+   if ( d->m_view )
+   {
+-    d->m_view->hide();
+-    d->m_view->viewport()->hide();
++    widget()->hide();
+     d->m_view->m_part = 0;
+   }
+ 
diff --git a/x11/kdelibs4/patches/patch-bb b/x11/kdelibs4/patches/patch-bb
new file mode 100644
index 00000000000..ddad55f73bc
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-bb
@@ -0,0 +1,138 @@
+$NetBSD: patch-bb,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032185
+
+--- kdecore/localization/klocale.cpp.orig	2009-10-02 21:18:08.000000000 +1300
++++ kdecore/localization/klocale.cpp
+@@ -22,6 +22,7 @@
+ */
+ 
+ #include "klocale.h"
++#include "klocale_p.h"
+ 
+ #include <config.h>
+ 
+@@ -242,7 +243,6 @@ public:
+   // Handling of translation catalogs
+   QStringList languageList;
+ 
+-  QMutex* mutex;
+   QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language)
+   QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language
+   int numberOfSysCatalogs; // number of catalogs that each app draws from
+@@ -276,7 +276,6 @@ public:
+ KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_)
+     : language(language_),
+       country(country_),
+-      mutex(new QMutex(QMutex::Recursive)),
+       useTranscript(false),
+       codecForEncoding(0),
+       languages(0), calendar(0),
+@@ -311,7 +310,7 @@ KLocale::KLocale(const QString& catalog,
+ void KLocalePrivate::initMainCatalogs()
+ {
+   KLocaleStaticData *s = staticData;
+-  QMutexLocker lock(mutex);
++  QMutexLocker lock(kLocaleMutex());
+ 
+   if (!s->maincatalog.isEmpty()) {
+       // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po)
+@@ -541,7 +540,7 @@ bool KLocale::setLanguage(const QString 
+ 
+ bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config)
+ {
+-  QMutexLocker lock(mutex);
++  QMutexLocker lock(kLocaleMutex());
+   languageList.removeAll( _language );
+   languageList.prepend( _language ); // let us consider this language to be the most important one
+ 
+@@ -563,7 +562,7 @@ bool KLocale::setLanguage(const QStringL
+ 
+ bool KLocalePrivate::setLanguage(const QStringList & languages)
+ {
+-  QMutexLocker lock(mutex);
++  QMutexLocker lock(kLocaleMutex());
+   // This list might contain
+   // 1) some empty strings that we have to eliminate
+   // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order
+@@ -685,7 +684,7 @@ QString KLocale::country() const
+ 
+ void KLocale::insertCatalog( const QString & catalog )
+ {
+-  QMutexLocker lock(d->mutex);
++  QMutexLocker lock(kLocaleMutex());
+     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
+     if (pos != -1) {
+         ++d->catalogNames[pos].loadCount;
+@@ -736,7 +735,7 @@ void KLocalePrivate::updateCatalogs( )
+ 
+ void KLocale::removeCatalog(const QString &catalog)
+ {
+-    QMutexLocker lock(d->mutex);
++    QMutexLocker lock(kLocaleMutex());
+     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
+     if (pos == -1)
+         return;
+@@ -749,7 +748,7 @@ void KLocale::removeCatalog(const QStrin
+ 
+ void KLocale::setActiveCatalog(const QString &catalog)
+ {
+-    QMutexLocker lock(d->mutex);
++    QMutexLocker lock(kLocaleMutex());
+     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
+     if (pos == -1)
+         return;
+@@ -759,7 +758,6 @@ void KLocale::setActiveCatalog(const QSt
+ 
+ KLocale::~KLocale()
+ {
+-    delete d->mutex;
+     delete d->calendar;
+     delete d->languages;
+     delete d;
+@@ -788,7 +786,7 @@ void KLocalePrivate::translate_priv(cons
+                 << "Fix the program" << endl;
+   }
+ 
+-  QMutexLocker locker(mutex);
++  QMutexLocker locker(kLocaleMutex());
+   // determine the fallback string
+   QString fallback;
+   if ( msgid_plural == NULL )
+@@ -1370,7 +1368,7 @@ QString KLocale::formatByteSize( double 
+     //Kibi-byte             KiB             2^10    1,024 bytes
+ 
+     if (d->byteSizeFmt.size() == 0) {
+-        QMutexLocker lock(d->mutex);
++        QMutexLocker lock(kLocaleMutex());
+         // Pretranslated format strings for byte sizes.
+         #define CACHEBYTEFMT(x) { \
+             QString s; \
+@@ -2568,7 +2566,6 @@ KLocale::KLocale(const KLocale & rhs) : 
+ {
+   d->languages = 0; // Don't copy languages
+   d->calendar = 0; // Don't copy the calendar
+-  d->mutex = 0; // Don't copy the mutex
+ }
+ 
+ KLocale & KLocale::operator=(const KLocale & rhs)
+@@ -2583,8 +2580,7 @@ KLocale & KLocale::operator=(const KLoca
+ 
+ void KLocale::copyCatalogsTo(KLocale *locale)
+ {
+-    QMutexLocker lock(d->mutex);
+-    QMutexLocker lockOther(locale->d->mutex);
++    QMutexLocker lock(kLocaleMutex());
+     locale->d->catalogNames = d->catalogNames;
+     locale->d->updateCatalogs();
+ }
+@@ -2656,3 +2652,9 @@ KLocale::DigitSet KLocale::dateTimeDigit
+ {
+     return d->dateTimeDigitSet;
+ }
++
++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive))
++QMutex* kLocaleMutex()
++{
++    return s_kLocaleMutex();
++}
diff --git a/x11/kdelibs4/patches/patch-bc b/x11/kdelibs4/patches/patch-bc
new file mode 100644
index 00000000000..b12abf376da
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-bc
@@ -0,0 +1,107 @@
+$NetBSD: patch-bc,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032185
+
+--- kdecore/localization/klocalizedstring.cpp.orig	2009-07-22 03:16:08.000000000 +1200
++++ kdecore/localization/klocalizedstring.cpp
+@@ -24,6 +24,7 @@
+ #include <kglobal.h>
+ #include <kdebug.h>
+ #include <klocale.h>
++#include <klocale_p.h>
+ #include <kcomponentdata.h>
+ #include <klibrary.h>
+ #include <kstandarddirs.h>
+@@ -126,8 +127,6 @@ class KLocalizedStringPrivateStatics
+ 
+     QHash<QString, KuitSemantics*> formatters;
+ 
+-    QMutex mutex;
+-
+     KLocalizedStringPrivateStatics () :
+         theFence("|/|"),
+         startInterp("$["),
+@@ -144,9 +143,7 @@ class KLocalizedStringPrivateStatics
+ 
+         translits(),
+ 
+-        formatters(),
+-
+-        mutex(QMutex::Recursive)
++        formatters()
+     {}
+ 
+     ~KLocalizedStringPrivateStatics ()
+@@ -216,7 +213,7 @@ QString KLocalizedString::toString (cons
+ QString KLocalizedStringPrivate::toString (const KLocale *locale) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     // Assure the message has been supplied.
+     if (msg.isEmpty())
+@@ -474,7 +471,7 @@ QString KLocalizedStringPrivate::postFor
+                                              const QString &ctxt) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     QString final = text;
+ 
+@@ -499,7 +496,7 @@ QString KLocalizedStringPrivate::substit
+                                                        bool &fallback) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     if (s->ktrs == NULL)
+         // Scripting engine not available.
+@@ -564,7 +561,7 @@ int KLocalizedStringPrivate::resolveInte
+     // fallback is set to true if Transcript evaluation requested so.
+ 
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     result.clear();
+     fallback = false;
+@@ -716,7 +713,7 @@ int KLocalizedStringPrivate::resolveInte
+ QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     // Return invalid variant if segment is either not a proper
+     // value reference, or the reference is out of bounds.
+@@ -751,7 +748,7 @@ QString KLocalizedStringPrivate::postTra
+                                                  const QString &final) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     if (s->ktrs == NULL)
+         // Scripting engine not available.
+@@ -945,7 +942,7 @@ extern "C"
+ void KLocalizedStringPrivate::loadTranscript ()
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     s->loadTranscriptCalled = true;
+     s->ktrs = NULL; // null indicates that Transcript is not available
+@@ -979,7 +976,8 @@ void KLocalizedStringPrivate::notifyCata
+         return;
+     }
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    // Very important: do not the mutex here.
++    //QMutexLocker lock(kLocaleMutex());
+ 
+     // Find script modules for all included language/catalogs that have them,
+     // and remember their paths.
diff --git a/x11/kdelibs4/patches/patch-bd b/x11/kdelibs4/patches/patch-bd
new file mode 100644
index 00000000000..d2315f0a01d
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-bd
@@ -0,0 +1,17 @@
+$NetBSD: patch-bd,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032185
+
+--- /dev/null	2009-10-11 17:43:10.000000000 +1300
++++ kdecore/localization/klocale_p.h
+@@ -0,0 +1,10 @@
++#ifndef KLOCALE_P_H
++#define KLOCALE_P_H
++
++class QMutex;
++
++// Used by both KLocale and KLocalizedString, since they call each other.
++QMutex* kLocaleMutex();
++
++#endif /* KLOCALE_P_H */
++