25 files changed, 61 insertions, 229 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index fd3215bc754e..dfa6622e01fe 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index c034d6247d8f..163956993f64 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.3.1.tar.bz2) = 10dae53739f1e8bd6f5f615443649e4f
-SHA256 (KDE/kdebase-4.3.1.tar.bz2) = 94fa8a8c72d85cd317422dd121ca433583b664f77ca297dc6398589a97e984b5
-SIZE (KDE/kdebase-4.3.1.tar.bz2) = 4263214
+MD5 (KDE/kdebase-4.3.3.tar.bz2) = 8072ce9848af28c75c5af2d8c832f985
+SHA256 (KDE/kdebase-4.3.3.tar.bz2) = 9b642f2a720067b15873e92a07d81e092c7e0f70a13490357118266917306f4c
+SIZE (KDE/kdebase-4.3.3.tar.bz2) = 4275500
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 1a7c749095dc..d3d65ac25bf5 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 97cfedccaf0f..098a04ce43cc 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.3.1.tar.bz2) = e51384cef307280f41fa8f39e2ecab8a
-SHA256 (KDE/kdebase-runtime-4.3.1.tar.bz2) = 9a66b5ac6589d8d264cc0383ab77ad345591e84d10f6cfccdddb76bc9962435d
-SIZE (KDE/kdebase-runtime-4.3.1.tar.bz2) = 7260641
+MD5 (KDE/kdebase-runtime-4.3.3.tar.bz2) = 88bf28d42d326c16abceaf3f1c6bffde
+SHA256 (KDE/kdebase-runtime-4.3.3.tar.bz2) = 18938e50630d6e5ddc3bacf1ccb7446419cd7178db88fc8b935f96e7a08f6481
+SIZE (KDE/kdebase-runtime-4.3.3.tar.bz2) = 7329976
diff --git a/x11/kde4-runtime/files/patch-ocert-2009-015-kioslave b/x11/kde4-runtime/files/patch-ocert-2009-015-kioslave
deleted file mode 100644
index 0024b941e34d..000000000000
--- a/x11/kde4-runtime/files/patch-ocert-2009-015-kioslave
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./kioslave/info/info.cc	2009/10/02 15:51:26	1030578
-+++ ./kioslave/info/info.cc	2009/10/02 15:53:30	1030579
-@@ -89,6 +89,13 @@
-         return;
-     }
- 
-+    // '<' in the path looks suspicious, someone is trying info:/dir/<script>alert('xss')</script>
-+    if (url.path().contains('<'))
-+    {
-+        error(KIO::ERR_DOES_NOT_EXIST, url.url());
-+        return;
-+    }
-+
-     mimeType("text/html");
-     // extract the path and node from url
-     decodeURL( url );
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index db52145af50a..0def6db7b49d 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.3.1.tar.bz2) = cf512fce3c8734078a89119334fd5a8a
-SHA256 (KDE/kdebase-workspace-4.3.1.tar.bz2) = 4c4b184615aab07134abbf05ec306f9ef37eb4f02f1e4eb9d4a16e44f859d6ed
-SIZE (KDE/kdebase-workspace-4.3.1.tar.bz2) = 62286316
+MD5 (KDE/kdebase-workspace-4.3.3.tar.bz2) = 0af67c6ee6385cc86f694bc8e1675ddb
+SHA256 (KDE/kdebase-workspace-4.3.3.tar.bz2) = b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
+SIZE (KDE/kdebase-workspace-4.3.3.tar.bz2) = 62496238
diff --git a/x11/kde4-workspace/files/patch-kdm-config.def b/x11/kde4-workspace/files/patch-kdm-config.def
new file mode 100644
index 000000000000..5eabd14494f3
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-kdm-config.def
@@ -0,0 +1,13 @@
+diff -ur kdm~/config.def kdm/config.def
+--- ./kdm/config.def.orig	2009-11-17 12:53:01.000000000 +0200
++++ ./kdm/config.def	2009-11-17 12:55:35.000000000 +0200
+@@ -32,6 +32,9 @@
+ #define KDMCONF KDE_CONFDIR "/kdm"
+ #define KDMDATA KDE_DATADIR "/kdm"
+ 
++#include <sys/param.h>  /* This is required for BSD define (how else will we
++                           known it exists?). */
++
+ #ifdef _AIX
+ # define HALT_CMD	"/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
diff --git a/x11/kde4-workspace/files/patch-plasma-applets-system-monitor-hdd.cpp b/x11/kde4-workspace/files/patch-plasma-applets-system-monitor-hdd.cpp
deleted file mode 100644
index a4685dcdfb1b..000000000000
--- a/x11/kde4-workspace/files/patch-plasma-applets-system-monitor-hdd.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plasma/applets/system-monitor/hdd.cpp.orig	2009-07-21 17:19:25.000000000 +0200
-+++ plasma/applets/system-monitor/hdd.cpp	2009-08-23 16:07:02.000000000 +0200
-@@ -265,8 +265,8 @@
-                             data->value("File System Type").toString() <<
-                             data->value("Size").toString();
-         */
--        if ((data->value("Usage").toString() != "File System" &&
--             data->value("Usage").toString() != "Raid") ||
-+        if ((data->value("Usage").toString() != i18n("File System") &&
-+             data->value("Usage").toString() != i18n("Raid")) ||
-             data->value("File System Type").toString() == "swap") {
-             QStringList list = items();
-             list.removeAll(uuid);
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 997fd21a34cc..e5cc8d272565 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -5,8 +5,8 @@ bin/kblankscrn.kss
 bin/kcheckrunning
 bin/kcminit
 bin/kcminit_startup
-bin/kdm-bin
 bin/kdm
+bin/kdm-bin
 bin/kdmctl
 bin/kdostartupconfig4
 bin/kfontinst
@@ -796,8 +796,10 @@ share/doc/HTML/en/kcontrol/colors/common
 share/doc/HTML/en/kcontrol/colors/index.cache.bz2
 share/doc/HTML/en/kcontrol/colors/index.docbook
 share/doc/HTML/en/kcontrol/desktopthemedetails/common
+share/doc/HTML/en/kcontrol/desktopthemedetails/desktop-settings.png
 share/doc/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2
 share/doc/HTML/en/kcontrol/desktopthemedetails/index.docbook
+share/doc/HTML/en/kcontrol/desktopthemedetails/message.png
 share/doc/HTML/en/kcontrol/energy/common
 share/doc/HTML/en/kcontrol/energy/index.cache.bz2
 share/doc/HTML/en/kcontrol/energy/index.docbook
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 1a7c749095dc..d3d65ac25bf5 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 97cfedccaf0f..098a04ce43cc 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.3.1.tar.bz2) = e51384cef307280f41fa8f39e2ecab8a
-SHA256 (KDE/kdebase-runtime-4.3.1.tar.bz2) = 9a66b5ac6589d8d264cc0383ab77ad345591e84d10f6cfccdddb76bc9962435d
-SIZE (KDE/kdebase-runtime-4.3.1.tar.bz2) = 7260641
+MD5 (KDE/kdebase-runtime-4.3.3.tar.bz2) = 88bf28d42d326c16abceaf3f1c6bffde
+SHA256 (KDE/kdebase-runtime-4.3.3.tar.bz2) = 18938e50630d6e5ddc3bacf1ccb7446419cd7178db88fc8b935f96e7a08f6481
+SIZE (KDE/kdebase-runtime-4.3.3.tar.bz2) = 7329976
diff --git a/x11/kdebase4-runtime/files/patch-ocert-2009-015-kioslave b/x11/kdebase4-runtime/files/patch-ocert-2009-015-kioslave
deleted file mode 100644
index 0024b941e34d..000000000000
--- a/x11/kdebase4-runtime/files/patch-ocert-2009-015-kioslave
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./kioslave/info/info.cc	2009/10/02 15:51:26	1030578
-+++ ./kioslave/info/info.cc	2009/10/02 15:53:30	1030579
-@@ -89,6 +89,13 @@
-         return;
-     }
- 
-+    // '<' in the path looks suspicious, someone is trying info:/dir/<script>alert('xss')</script>
-+    if (url.path().contains('<'))
-+    {
-+        error(KIO::ERR_DOES_NOT_EXIST, url.url());
-+        return;
-+    }
-+
-     mimeType("text/html");
-     // extract the path and node from url
-     decodeURL( url );
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index db52145af50a..0def6db7b49d 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.3.1.tar.bz2) = cf512fce3c8734078a89119334fd5a8a
-SHA256 (KDE/kdebase-workspace-4.3.1.tar.bz2) = 4c4b184615aab07134abbf05ec306f9ef37eb4f02f1e4eb9d4a16e44f859d6ed
-SIZE (KDE/kdebase-workspace-4.3.1.tar.bz2) = 62286316
+MD5 (KDE/kdebase-workspace-4.3.3.tar.bz2) = 0af67c6ee6385cc86f694bc8e1675ddb
+SHA256 (KDE/kdebase-workspace-4.3.3.tar.bz2) = b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
+SIZE (KDE/kdebase-workspace-4.3.3.tar.bz2) = 62496238
diff --git a/x11/kdebase4-workspace/files/patch-kdm-config.def b/x11/kdebase4-workspace/files/patch-kdm-config.def
new file mode 100644
index 000000000000..5eabd14494f3
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kdm-config.def
@@ -0,0 +1,13 @@
+diff -ur kdm~/config.def kdm/config.def
+--- ./kdm/config.def.orig	2009-11-17 12:53:01.000000000 +0200
++++ ./kdm/config.def	2009-11-17 12:55:35.000000000 +0200
+@@ -32,6 +32,9 @@
+ #define KDMCONF KDE_CONFDIR "/kdm"
+ #define KDMDATA KDE_DATADIR "/kdm"
+ 
++#include <sys/param.h>  /* This is required for BSD define (how else will we
++                           known it exists?). */
++
+ #ifdef _AIX
+ # define HALT_CMD	"/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
diff --git a/x11/kdebase4-workspace/files/patch-plasma-applets-system-monitor-hdd.cpp b/x11/kdebase4-workspace/files/patch-plasma-applets-system-monitor-hdd.cpp
deleted file mode 100644
index a4685dcdfb1b..000000000000
--- a/x11/kdebase4-workspace/files/patch-plasma-applets-system-monitor-hdd.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plasma/applets/system-monitor/hdd.cpp.orig	2009-07-21 17:19:25.000000000 +0200
-+++ plasma/applets/system-monitor/hdd.cpp	2009-08-23 16:07:02.000000000 +0200
-@@ -265,8 +265,8 @@
-                             data->value("File System Type").toString() <<
-                             data->value("Size").toString();
-         */
--        if ((data->value("Usage").toString() != "File System" &&
--             data->value("Usage").toString() != "Raid") ||
-+        if ((data->value("Usage").toString() != i18n("File System") &&
-+             data->value("Usage").toString() != i18n("Raid")) ||
-             data->value("File System Type").toString() == "swap") {
-             QStringList list = items();
-             list.removeAll(uuid);
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 997fd21a34cc..e5cc8d272565 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -5,8 +5,8 @@ bin/kblankscrn.kss
 bin/kcheckrunning
 bin/kcminit
 bin/kcminit_startup
-bin/kdm-bin
 bin/kdm
+bin/kdm-bin
 bin/kdmctl
 bin/kdostartupconfig4
 bin/kfontinst
@@ -796,8 +796,10 @@ share/doc/HTML/en/kcontrol/colors/common
 share/doc/HTML/en/kcontrol/colors/index.cache.bz2
 share/doc/HTML/en/kcontrol/colors/index.docbook
 share/doc/HTML/en/kcontrol/desktopthemedetails/common
+share/doc/HTML/en/kcontrol/desktopthemedetails/desktop-settings.png
 share/doc/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2
 share/doc/HTML/en/kcontrol/desktopthemedetails/index.docbook
+share/doc/HTML/en/kcontrol/desktopthemedetails/message.png
 share/doc/HTML/en/kcontrol/energy/common
 share/doc/HTML/en/kcontrol/energy/index.cache.bz2
 share/doc/HTML/en/kcontrol/energy/index.docbook
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index fd3215bc754e..dfa6622e01fe 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index c034d6247d8f..163956993f64 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.3.1.tar.bz2) = 10dae53739f1e8bd6f5f615443649e4f
-SHA256 (KDE/kdebase-4.3.1.tar.bz2) = 94fa8a8c72d85cd317422dd121ca433583b664f77ca297dc6398589a97e984b5
-SIZE (KDE/kdebase-4.3.1.tar.bz2) = 4263214
+MD5 (KDE/kdebase-4.3.3.tar.bz2) = 8072ce9848af28c75c5af2d8c832f985
+SHA256 (KDE/kdebase-4.3.3.tar.bz2) = 9b642f2a720067b15873e92a07d81e092c7e0f70a13490357118266917306f4c
+SIZE (KDE/kdebase-4.3.3.tar.bz2) = 4275500
diff --git a/x11/kdelibs4-experimental/distinfo b/x11/kdelibs4-experimental/distinfo
index 8e3b261091f1..7a36dd7175f8 100644
--- a/x11/kdelibs4-experimental/distinfo
+++ b/x11/kdelibs4-experimental/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-experimental-4.3.1.tar.bz2) = 2fe0a12195bc93848aa7b458c1bfb4af
-SHA256 (KDE/kdelibs-experimental-4.3.1.tar.bz2) = 2591569d29b22325e140a2eaa68feb36ad93b64fa0fd2abf1d072e6739430c1d
-SIZE (KDE/kdelibs-experimental-4.3.1.tar.bz2) = 26920
+MD5 (KDE/kdelibs-experimental-4.3.3.tar.bz2) = b9a048ccf15e90dcfd4790f65e6b54b9
+SHA256 (KDE/kdelibs-experimental-4.3.3.tar.bz2) = 14d368bd9e817970bf2110dad8090dd8b0c12f229d6a59abbc4ffbb5470c1f53
+SIZE (KDE/kdelibs-experimental-4.3.3.tar.bz2) = 26910
diff --git a/x11/kdelibs4-experimental/pkg-plist b/x11/kdelibs4-experimental/pkg-plist
index 6d2a165994c6..a302821793da 100644
--- a/x11/kdelibs4-experimental/pkg-plist
+++ b/x11/kdelibs4-experimental/pkg-plist
@@ -6,5 +6,3 @@ lib/libknotificationitem-1.so.1.0.0
 share/dbus-1/interfaces/org.kde.NotificationItem.xml
 share/dbus-1/interfaces/org.kde.NotificationItemWatcher.xml
 @dirrm include/knotificationitem-1
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 5a07de5f6bcc..e47bfd382267 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -44,7 +44,7 @@ CONFLICTS=	kdebase-workspace-4.1.*
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime
+USE_KDE4=	kdeprefix kdehier automoc4 sharedmime oxygen
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 440e4c71cfb8..4de1a433fdb6 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-4.3.1.tar.bz2) = df6b6d261d46508c7b0abcdd983ffae2
-SHA256 (KDE/kdelibs-4.3.1.tar.bz2) = a06ff50031cf14ba929ad2868b3f19434b7acfdcfbce75d87db625786fab615d
-SIZE (KDE/kdelibs-4.3.1.tar.bz2) = 10510833
+MD5 (KDE/kdelibs-4.3.3.tar.bz2) = 20fd3793d9d23088ecb1d5aed0254216
+SHA256 (KDE/kdelibs-4.3.3.tar.bz2) = bec0b11b9db010fb14e1bc438ef77dd417a429168eb7d14dc5dee50ea23b5fb3
+SIZE (KDE/kdelibs-4.3.3.tar.bz2) = 10516364
diff --git a/x11/kdelibs4/files/patch-kdecore__network__k3socketdevice.cpp b/x11/kdelibs4/files/patch-kdecore__network__k3socketdevice.cpp
deleted file mode 100644
index 92c578bba754..000000000000
--- a/x11/kdelibs4/files/patch-kdecore__network__k3socketdevice.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kdecore/network/k3socketdevice.cpp.orig	2009-03-27 10:47:33.000000000 -0400
-+++ kdecore/network/k3socketdevice.cpp	2009-09-26 16:51:55.000000000 -0400
-@@ -352,9 +352,13 @@
-   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/files/patch-ocert-2009-015-khtml b/x11/kdelibs4/files/patch-ocert-2009-015-khtml
deleted file mode 100644
index 8e0e82c3534c..000000000000
--- a/x11/kdelibs4/files/patch-ocert-2009-015-khtml
+++ /dev/null
@@ -1,117 +0,0 @@
---- ./khtml/ecma/xmlhttprequest.cpp	2009/10/15 10:13:41	1035538
-+++ ./khtml/ecma/xmlhttprequest.cpp	2009/10/15 10:14:38	1035539
-@@ -49,7 +49,7 @@
- 
- using namespace KJS;
- using namespace DOM;
--// 
-+//
- ////////////////////// XMLHttpRequest Object ////////////////////////
- 
- /* Source for XMLHttpRequestProtoTable.
-@@ -269,7 +269,7 @@
- static bool canSetRequestHeader(const QString& name)
- {
-     static QSet<CaseInsensitiveString> forbiddenHeaders;
--    
-+
-     if (forbiddenHeaders.isEmpty()) {
- 	static const char* hdrs[] = {
- 	    "accept-charset",
-@@ -298,12 +298,12 @@
- 	    "transfer-encoding",
- 	    "unlock",
- 	    "upgrade",
--	    "via" 
-+	    "via"
- 	};
- 	for (size_t i = 0; i < sizeof(hdrs)/sizeof(char*); ++i)
- 	    forbiddenHeaders.insert(CaseInsensitiveString(hdrs[i]));
-     }
--    
-+
-     return !forbiddenHeaders.contains(name);
- }
- 
-@@ -326,9 +326,9 @@
- 
- XMLHttpRequest::~XMLHttpRequest()
- {
--  if (onLoadListener) 
-+  if (onLoadListener)
-       onLoadListener->deref();
--  if (onReadyStateChangeListener) 
-+  if (onReadyStateChangeListener)
-       onReadyStateChangeListener->deref();
-   delete qObject;
-   qObject = 0;
-@@ -412,17 +412,18 @@
-       return;
-   }
- 
--  if (method == "post") {
--    QString protocol = url.protocol().toLower();
-+  const QString protocol = url.protocol().toLower();
-+  // Abandon the request when the protocol is other than "http",
-+  // instead of blindly doing a KIO::get on other protocols like file:/.
-+  if (!protocol.startsWith(QLatin1String("http")) &&
-+      !protocol.startsWith(QLatin1String("webdav")))
-+  {
-+    ec = DOMException::INVALID_ACCESS_ERR;
-+    abort();
-+    return;
-+  }
- 
--    // Abondon the request when the protocol is other than "http",
--    // instead of blindly changing it to a "get" request.
--    if (!protocol.startsWith(QLatin1String("http")) &&
--        !protocol.startsWith(QLatin1String("webdav")))
--    {
--      abort();
--      return;
--    }
-+  if (method == "post") {
- 
-     // FIXME: determine post encoding correctly by looking in headers
-     // for charset.
-@@ -580,7 +581,7 @@
-       ec = DOMException::INVALID_STATE_ERR;
-       return jsString("");
-   }
--  
-+
-   // ### test error flag, return jsNull
- 
-   if (responseHeaders.isEmpty()) {
-@@ -809,7 +810,7 @@
-       setDOMException(exec, ec);
-       return ret;
-     }
--  case XMLHttpRequest::GetResponseHeader: 
-+  case XMLHttpRequest::GetResponseHeader:
-     {
-       if (args.size() < 1)
-           return throwError(exec, SyntaxError, "Not enough arguments");
-@@ -852,11 +853,11 @@
-         DOM::NodeImpl* docNode = toNode(args[0]);
-         if (docNode && docNode->isDocumentNode()) {
-           DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl *>(docNode);
--          
-+
-           try {
-             body = doc->toString().string();
-             // FIXME: also need to set content type, including encoding!
--  
-+
-           } catch(DOM::DOMException&) {
-             return throwError(exec, GeneralError, "Exception serializing document");
-           }
-@@ -866,7 +867,7 @@
-       }
- 
-       request->send(body, ec);
--      setDOMException(exec, ec);  
-+      setDOMException(exec, ec);
-       return jsUndefined();
-     }
-   case XMLHttpRequest::SetRequestHeader:
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index d8e7f313b2e6..8fd8cf5cbeed 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -2386,6 +2386,7 @@ share/apps/ksgmltools2/customization/es/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/es/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/es/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/es/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/es/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/es/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/es/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/es/lang.entities
@@ -3957,7 +3958,6 @@ share/mime/application/x-kwordquiz.xml
 share/mime/application/x-mimearchive.xml
 share/mime/application/x-nzb.xml
 share/mime/application/x-ogg.xml
-share/mime/application/x-openraster.xml
 share/mime/application/x-plasma.xml
 share/mime/application/x-quanta.xml
 share/mime/application/x-smb-server.xml
@@ -4143,8 +4143,6 @@ share/mime/video/x-theora.xml
 @dirrm share/apps/kdeui/about
 @dirrm share/apps/kdeui
 @dirrmtry share/apps/katepart/script
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
 @dirrm share/apps/LICENSES
 @dirrm lib/kde4/plugins/script
 @dirrm lib/kde4/plugins/imageformats