28 files changed, 177 insertions, 144 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 53a0c3a31df4..558117d26bdb 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Basic applications for the KDE system
 
 LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		soprano.4:${PORTSDIR}/textproc/soprano \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		kwebkit.1:${PORTSDIR}/www/kwebkitpart
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 
 LATEST_LINK=	${PORTNAME}4
 
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index ac511ca41a49..fe609de0b51e 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-4.6.2.tar.bz2) = 1f797f386ddac4eb1974cb8090dec4a0e86b9a40b834ed8cf210e3bc160c15f9
-SIZE (KDE/kdebase-4.6.2.tar.bz2) = 2681254
+SHA256 (KDE/kdebase-4.6.3.tar.bz2) = 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
+SIZE (KDE/kdebase-4.6.3.tar.bz2) = 2682586
diff --git a/x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp b/x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp
deleted file mode 100644
index 04ddd15939e3..000000000000
--- a/x11/kde4-baseapps/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- dolphin/src/panels/terminal/terminalpanel.cpp~	2011-02-26 00:33:12.000000000 +0200
-+++ dolphin/src/panels/terminal/terminalpanel.cpp	2011-03-14 17:41:58.000000000 +0200
-@@ -19,6 +19,8 @@
- 
- #include "terminalpanel.h"
- 
-+#include <signal.h>
-+
- #include <kpluginloader.h>
- #include <kpluginfactory.h>
- #include <kde_terminal_interface_v2.h>
-@@ -111,16 +113,12 @@
- 
- void TerminalPanel::sendCdToTerminal(const QString& dir)
- {
--    if (!m_clearTerminal) {
-+    if (!m_clearTerminal)
-         // The TerminalV2 interface does not provide a way to delete the
-         // current line before sending a new input. This is mandatory,
-         // otherwise sending a 'cd x' to a existing 'rm -rf *' might
--        // result in data loss. As workaround Ctrl+C is send.
--        QString cancel;
--        cancel.append(QChar(3));
--        cancel.append(QChar('c'));
--        m_terminal->sendInput(cancel);
--    }
-+        // result in data loss. As workaround SIGINT is send.
-+        ::kill(m_terminal->terminalProcessId(), SIGINT);
- 
-     m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n');
- 
diff --git a/x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt b/x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt
deleted file mode 100644
index 13a1cb556339..000000000000
--- a/x11/kde4-baseapps/files/patch-konqueror__src__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./konqueror/src/CMakeLists.txt.orig	2011-02-25 22:55:12.000000000 +0100
-+++ ./konqueror/src/CMakeLists.txt	2011-03-04 12:09:23.643348069 +0100
-@@ -33,7 +33,7 @@
- kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
- target_link_libraries(konquerorprivate konq ${KDE4_KPARTS_LIBS} ${ZLIB_LIBRARY})
- set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
--install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-+install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- ########### konqueror ###############
- if (WIN32)
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 12fb85f8c61b..c761f3c317f6 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -76,7 +76,6 @@ lib/libkonq.so.7.0.1
 lib/libkonqsidebarplugin.so
 lib/libkonqsidebarplugin.so.5
 lib/libkonqsidebarplugin.so.5.0.1
-lib/libkonquerorprivate.so
 lib/libkonquerorprivate.so.5
 lib/libkonquerorprivate.so.5.0.1
 lib/libkonsoleprivate.so
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 4ab2d81fded6..2b8c01729691 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -32,6 +31,7 @@ CONFLICTS=	kdebase-workspace-4.5.[0-5]
 
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib opengl dbus phonon \
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 6aa73ef05bc2..98cd3e2aa75c 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-runtime-4.6.2.tar.bz2) = 28ad78488f3202b7a999b19e773dde987892528b9386c2a6aa63574939af8933
-SIZE (KDE/kdebase-runtime-4.6.2.tar.bz2) = 5834267
+SHA256 (KDE/kdebase-runtime-4.6.3.tar.bz2) = 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
+SIZE (KDE/kdebase-runtime-4.6.3.tar.bz2) = 5835360
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 55b6d2edd17d..02f198187678 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -42,10 +42,11 @@ RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 		${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde \
 		${KDE4_PREFIX}/bin/nepomukcontroller:${PORTSDIR}/misc/nepomukcontroller
 
-SUB_FILES=	kdm layout.js
+SUB_FILES=	kdm layout.js pkg-message
 USE_RC_SUBR=	kdm4
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 oxygen
 KDE4_BUILDENV=	yes
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	assistant corelib dbus designer gui network opengl  \
@@ -65,10 +66,8 @@ CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DWITH_NetworkManager:BOOL=OFF \
 		-DWITH_Xmms:BOOL=OFF \
 		-DWITH_Googlegadgets:BOOL=OFF \
-		-DWITH_QEdje:BOOL=OFF \
 		-DWITH_PyKDE4:BOOL=OFF
 #PyKDE4, Xmms and Googlegadgets could be enabled,
-#QEdje has not been ported yet.
 
 OPTIONS=	PLASMA_PYTHON "Support for plasmoids written in Python" off \
 		PLASMA_RUBY "Support for plasmoids written in Ruby" off
@@ -92,9 +91,6 @@ LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/lib/X11,${LOCALBASE}/lib/X11,g' \
-			  -e 's,/usr/share/X11,${LOCALBASE}/share/X11,g' \
-		${PATCH_WRKSRC}/kcontrol/keyboard/xkb_rules.cpp
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${PATCH_WRKSRC}/startkde.cmake \
 		${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \
@@ -103,8 +99,6 @@ post-patch:
 		${PATCH_WRKSRC}/kdm/backend/client.c \
 		${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \
 		${PATCH_WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's,resolv,c,g' \
-		${PATCH_WRKSRC}/cmake/modules/FindPCIUTILS.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e '/ksysguardd/ d' \
@@ -124,5 +118,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/layout.js ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents
 	cd ${WRKDIR}/stripes-freebsd-1.0 && \
 		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 2b54b9aa4f8a..d47a4c30c331 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,4 +1,4 @@
-SHA256 (KDE/kdebase-workspace-4.6.2.tar.bz2) = 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
-SIZE (KDE/kdebase-workspace-4.6.2.tar.bz2) = 69356153
+SHA256 (KDE/kdebase-workspace-4.6.3.tar.bz2) = ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
+SIZE (KDE/kdebase-workspace-4.6.3.tar.bz2) = 69349331
 SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127
 SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348
diff --git a/x11/kde4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt b/x11/kde4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt
deleted file mode 100644
index 72261776035d..000000000000
--- a/x11/kde4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./khotkeys/libkhotkeysprivate/CMakeLists.txt.orig	2010-12-02 10:16:38.017500408 +1000
-+++ ./khotkeys/libkhotkeysprivate/CMakeLists.txt	2010-12-02 10:16:45.839492868 +1000
-@@ -75,5 +75,5 @@
-   target_link_libraries(khotkeysprivate ${X11_XTest_LIB})
- endif(X11_XTest_FOUND)
- set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
--install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-+install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde4-workspace/files/pkg-message.in
new file mode 100644
index 000000000000..d48b4affeea0
--- /dev/null
+++ b/x11/kde4-workspace/files/pkg-message.in
@@ -0,0 +1,10 @@
+=====================================================================
+
+To enable KDE Display Manager (KDM), add the following lines
+to /etc/rc.conf:
+local_startup="${local_startup} %%PREFIX%%/etc/rc.d"
+kdm4_enable="YES"
+
+You also need procfs to be mounted. See man procfs for details.
+
+=====================================================================
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 4d23a847675c..2a2aaf5bad76 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -399,7 +399,6 @@ lib/libkfontinst.so.5.0.1
 lib/libkfontinstui.so
 lib/libkfontinstui.so.5
 lib/libkfontinstui.so.5.0.1
-lib/libkhotkeysprivate.so
 lib/libkhotkeysprivate.so.5
 lib/libkhotkeysprivate.so.5.0.1
 lib/libkickoff.so
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index f2cfe7440566..aaf173c01d48 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -7,14 +7,13 @@
 
 PORTNAME=	kde4
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	The "meta-port" for KDE
+COMMENT=	The "meta-port" for KDE Software Compilation
 
 OPTIONS=	KDEACCESSIBILITY "Accessibility applications" on \
 		KDEADMIN "KDE Administration applications" on \
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 4ab2d81fded6..2b8c01729691 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -32,6 +31,7 @@ CONFLICTS=	kdebase-workspace-4.5.[0-5]
 
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib opengl dbus phonon \
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 6aa73ef05bc2..98cd3e2aa75c 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-runtime-4.6.2.tar.bz2) = 28ad78488f3202b7a999b19e773dde987892528b9386c2a6aa63574939af8933
-SIZE (KDE/kdebase-runtime-4.6.2.tar.bz2) = 5834267
+SHA256 (KDE/kdebase-runtime-4.6.3.tar.bz2) = 96418d3bce773b96bd5594e92f8f45e05131090c9afa93a7588e1739b86f1598
+SIZE (KDE/kdebase-runtime-4.6.3.tar.bz2) = 5835360
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 55b6d2edd17d..02f198187678 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -42,10 +42,11 @@ RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 		${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde \
 		${KDE4_PREFIX}/bin/nepomukcontroller:${PORTSDIR}/misc/nepomukcontroller
 
-SUB_FILES=	kdm layout.js
+SUB_FILES=	kdm layout.js pkg-message
 USE_RC_SUBR=	kdm4
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 oxygen
 KDE4_BUILDENV=	yes
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	assistant corelib dbus designer gui network opengl  \
@@ -65,10 +66,8 @@ CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DWITH_NetworkManager:BOOL=OFF \
 		-DWITH_Xmms:BOOL=OFF \
 		-DWITH_Googlegadgets:BOOL=OFF \
-		-DWITH_QEdje:BOOL=OFF \
 		-DWITH_PyKDE4:BOOL=OFF
 #PyKDE4, Xmms and Googlegadgets could be enabled,
-#QEdje has not been ported yet.
 
 OPTIONS=	PLASMA_PYTHON "Support for plasmoids written in Python" off \
 		PLASMA_RUBY "Support for plasmoids written in Ruby" off
@@ -92,9 +91,6 @@ LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/lib/X11,${LOCALBASE}/lib/X11,g' \
-			  -e 's,/usr/share/X11,${LOCALBASE}/share/X11,g' \
-		${PATCH_WRKSRC}/kcontrol/keyboard/xkb_rules.cpp
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${PATCH_WRKSRC}/startkde.cmake \
 		${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \
@@ -103,8 +99,6 @@ post-patch:
 		${PATCH_WRKSRC}/kdm/backend/client.c \
 		${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \
 		${PATCH_WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's,resolv,c,g' \
-		${PATCH_WRKSRC}/cmake/modules/FindPCIUTILS.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e '/ksysguardd/ d' \
@@ -124,5 +118,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/layout.js ${PREFIX}/share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents
 	cd ${WRKDIR}/stripes-freebsd-1.0 && \
 		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 2b54b9aa4f8a..d47a4c30c331 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,4 +1,4 @@
-SHA256 (KDE/kdebase-workspace-4.6.2.tar.bz2) = 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
-SIZE (KDE/kdebase-workspace-4.6.2.tar.bz2) = 69356153
+SHA256 (KDE/kdebase-workspace-4.6.3.tar.bz2) = ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
+SIZE (KDE/kdebase-workspace-4.6.3.tar.bz2) = 69349331
 SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127
 SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348
diff --git a/x11/kdebase4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt b/x11/kdebase4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt
deleted file mode 100644
index 72261776035d..000000000000
--- a/x11/kdebase4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./khotkeys/libkhotkeysprivate/CMakeLists.txt.orig	2010-12-02 10:16:38.017500408 +1000
-+++ ./khotkeys/libkhotkeysprivate/CMakeLists.txt	2010-12-02 10:16:45.839492868 +1000
-@@ -75,5 +75,5 @@
-   target_link_libraries(khotkeysprivate ${X11_XTest_LIB})
- endif(X11_XTest_FOUND)
- set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
--install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-+install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
diff --git a/x11/kdebase4-workspace/files/pkg-message.in b/x11/kdebase4-workspace/files/pkg-message.in
new file mode 100644
index 000000000000..d48b4affeea0
--- /dev/null
+++ b/x11/kdebase4-workspace/files/pkg-message.in
@@ -0,0 +1,10 @@
+=====================================================================
+
+To enable KDE Display Manager (KDM), add the following lines
+to /etc/rc.conf:
+local_startup="${local_startup} %%PREFIX%%/etc/rc.d"
+kdm4_enable="YES"
+
+You also need procfs to be mounted. See man procfs for details.
+
+=====================================================================
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 4d23a847675c..2a2aaf5bad76 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -399,7 +399,6 @@ lib/libkfontinst.so.5.0.1
 lib/libkfontinstui.so
 lib/libkfontinstui.so.5
 lib/libkfontinstui.so.5.0.1
-lib/libkhotkeysprivate.so
 lib/libkhotkeysprivate.so.5
 lib/libkhotkeysprivate.so.5.0.1
 lib/libkickoff.so
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 53a0c3a31df4..558117d26bdb 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Basic applications for the KDE system
 
 LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		soprano.4:${PORTSDIR}/textproc/soprano \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		kwebkit.1:${PORTSDIR}/www/kwebkitpart
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 
 LATEST_LINK=	${PORTNAME}4
 
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index ac511ca41a49..fe609de0b51e 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-4.6.2.tar.bz2) = 1f797f386ddac4eb1974cb8090dec4a0e86b9a40b834ed8cf210e3bc160c15f9
-SIZE (KDE/kdebase-4.6.2.tar.bz2) = 2681254
+SHA256 (KDE/kdebase-4.6.3.tar.bz2) = 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
+SIZE (KDE/kdebase-4.6.3.tar.bz2) = 2682586
diff --git a/x11/kdebase4/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp b/x11/kdebase4/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp
deleted file mode 100644
index 04ddd15939e3..000000000000
--- a/x11/kdebase4/files/patch-dolphin__src__panels__terminal__terminalpanel.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- dolphin/src/panels/terminal/terminalpanel.cpp~	2011-02-26 00:33:12.000000000 +0200
-+++ dolphin/src/panels/terminal/terminalpanel.cpp	2011-03-14 17:41:58.000000000 +0200
-@@ -19,6 +19,8 @@
- 
- #include "terminalpanel.h"
- 
-+#include <signal.h>
-+
- #include <kpluginloader.h>
- #include <kpluginfactory.h>
- #include <kde_terminal_interface_v2.h>
-@@ -111,16 +113,12 @@
- 
- void TerminalPanel::sendCdToTerminal(const QString& dir)
- {
--    if (!m_clearTerminal) {
-+    if (!m_clearTerminal)
-         // The TerminalV2 interface does not provide a way to delete the
-         // current line before sending a new input. This is mandatory,
-         // otherwise sending a 'cd x' to a existing 'rm -rf *' might
--        // result in data loss. As workaround Ctrl+C is send.
--        QString cancel;
--        cancel.append(QChar(3));
--        cancel.append(QChar('c'));
--        m_terminal->sendInput(cancel);
--    }
-+        // result in data loss. As workaround SIGINT is send.
-+        ::kill(m_terminal->terminalProcessId(), SIGINT);
- 
-     m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n');
- 
diff --git a/x11/kdebase4/files/patch-konqueror__src__CMakeLists.txt b/x11/kdebase4/files/patch-konqueror__src__CMakeLists.txt
deleted file mode 100644
index 13a1cb556339..000000000000
--- a/x11/kdebase4/files/patch-konqueror__src__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./konqueror/src/CMakeLists.txt.orig	2011-02-25 22:55:12.000000000 +0100
-+++ ./konqueror/src/CMakeLists.txt	2011-03-04 12:09:23.643348069 +0100
-@@ -33,7 +33,7 @@
- kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
- target_link_libraries(konquerorprivate konq ${KDE4_KPARTS_LIBS} ${ZLIB_LIBRARY})
- set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
--install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-+install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- ########### konqueror ###############
- if (WIN32)
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 12fb85f8c61b..c761f3c317f6 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -76,7 +76,6 @@ lib/libkonq.so.7.0.1
 lib/libkonqsidebarplugin.so
 lib/libkonqsidebarplugin.so.5
 lib/libkonqsidebarplugin.so.5.0.1
-lib/libkonquerorprivate.so
 lib/libkonquerorprivate.so.5
 lib/libkonquerorprivate.so.5.0.1
 lib/libkonsoleprivate.so
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 7057739151be..24dbde019e76 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.6.2.tar.bz2) = 61d8d73d56f2e0198e590d1c6f5615dea9aa955fa69676265852744a1133b561
-SIZE (KDE/kdelibs-4.6.2.tar.bz2) = 12917847
+SHA256 (KDE/kdelibs-4.6.3.tar.bz2) = b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
+SIZE (KDE/kdelibs-4.6.3.tar.bz2) = 12916816
diff --git a/x11/kdelibs4/files/patch-kdeui-icons-kiconengine.cpp b/x11/kdelibs4/files/patch-kdeui-icons-kiconengine.cpp
new file mode 100644
index 000000000000..210bd5d367e5
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdeui-icons-kiconengine.cpp
@@ -0,0 +1,99 @@
+commit e7951201a19a4439b6ad95440c6de9b6b3620e45
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Fri May 6 15:19:09 2011 +0200
+
+    use a QWeakPointer on the KIconLoader passed in as there are no lifetime guarantees
+    
+    usually KGlobal::iconLoader() is used, so this isn't an issue seen very often.
+    however, when a local KIconLoader is created, it is easy to get QIcons with a
+    KIconEngine that has a bad KIconLoader pointer in them. particularly as QIcon
+    is implicitly shared and easily passed around. the StatusNotifier Plasma DataEngine
+    was triggering this, though it would be trivial to run into this problem again
+    anytime a KIconLoader is created locally
+    
+    thankfully, QWeakPointer does the job and is very fast and light. (confirmed
+    both with my own testing and confirmation from Thiago).
+    
+    massive thanks to Michael Pyne for detecting the cause of the problem via Valgrind.
+    
+    BUG:258706
+
+--- kdeui/icons/kiconengine.cpp
++++ kdeui/icons/kiconengine.cpp
+@@ -27,16 +27,16 @@
+ 
+ 
+ KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader, const QStringList& overlays)
++    : mIconName(iconName),
++      mIconLoader(iconLoader),
++      mOverlays(overlays)
+ {
+-    mIconName = iconName;
+-    mIconLoader = iconLoader;
+-    mOverlays = overlays;
+ }
+ 
+ KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader)
++    : mIconName(iconName),
++      mIconLoader(iconLoader)
+ {
+-    mIconName = iconName;
+-    mIconLoader = iconLoader;
+ }
+ 
+ static inline int qIconModeToKIconState( QIcon::Mode mode )
+@@ -65,8 +65,12 @@ QSize KIconEngine::actualSize( const QSize & size, QIcon::Mode mode, QIcon::Stat
+     return QSize(iconSize, iconSize);
+ }
+ 
+-void KIconEngine::paint( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state )
++void KIconEngine::paint(QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state)
+ {
++    if (!mIconLoader) {
++        return;
++    }
++
+     Q_UNUSED(state)
+ 
+     const int kstate = qIconModeToKIconState(mode);
+@@ -80,20 +84,27 @@ void KIconEngine::paint( QPainter * painter, const QRect & rect, QIcon::Mode mod
+     }
+ 
+     const int iconSize = qMin(rect.width(), rect.height());
+-    const QPixmap pix = mIconLoader->loadIcon(mIconName, group, iconSize, kstate, mOverlays);
++    const QPixmap pix = mIconLoader.data()->loadIcon(mIconName, group, iconSize, kstate, mOverlays);
+     painter->drawPixmap(rect, pix);
+ }
+ 
+-QPixmap KIconEngine::pixmap( const QSize & size, QIcon::Mode mode, QIcon::State state )
++QPixmap KIconEngine::pixmap(const QSize & size, QIcon::Mode mode, QIcon::State state)
+ {
+     Q_UNUSED(state)
+ 
++    if (!mIconLoader) {
++        QPixmap pm(size);
++        pm.fill(Qt::transparent);
++        return pm;
++    }
++
+     const int kstate = qIconModeToKIconState(mode);
+     const int iconSize = qMin(size.width(), size.height());
+-    QPixmap pix = mIconLoader->loadIcon(mIconName, KIconLoader::Desktop, iconSize, kstate, mOverlays);
++    QPixmap pix = mIconLoader.data()->loadIcon(mIconName, KIconLoader::Desktop, iconSize, kstate, mOverlays);
+ 
+-    if(pix.size() == size)
++    if (pix.size() == size) {
+         return pix;
++    }
+ 
+     QPixmap pix2(size);
+     pix2.fill(QColor(0,0,0,0));
+@@ -111,7 +122,7 @@ QString KIconEngine::key() const
+ 
+ QIconEngineV2 *KIconEngine::clone() const
+ {
+-    return new KIconEngine(mIconName, mIconLoader, mOverlays);
++    return new KIconEngine(mIconName, mIconLoader.data(), mOverlays);
+ }
+ 
+ bool KIconEngine::read(QDataStream &in)
diff --git a/x11/kdelibs4/files/patch-kdeui-icons-kiconengine_p.h b/x11/kdelibs4/files/patch-kdeui-icons-kiconengine_p.h
new file mode 100644
index 000000000000..8fd0d0d95943
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdeui-icons-kiconengine_p.h
@@ -0,0 +1,33 @@
+commit e7951201a19a4439b6ad95440c6de9b6b3620e45
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Fri May 6 15:19:09 2011 +0200
+
+    use a QWeakPointer on the KIconLoader passed in as there are no lifetime guarantees
+    
+    usually KGlobal::iconLoader() is used, so this isn't an issue seen very often.
+    however, when a local KIconLoader is created, it is easy to get QIcons with a
+    KIconEngine that has a bad KIconLoader pointer in them. particularly as QIcon
+    is implicitly shared and easily passed around. the StatusNotifier Plasma DataEngine
+    was triggering this, though it would be trivial to run into this problem again
+    anytime a KIconLoader is created locally
+    
+    thankfully, QWeakPointer does the job and is very fast and light. (confirmed
+    both with my own testing and confirmation from Thiago).
+    
+    massive thanks to Michael Pyne for detecting the cause of the problem via Valgrind.
+    
+    BUG:258706
+
+diff --git a/kdeui/icons/kiconengine_p.h b/kdeui/icons/kiconengine_p.h
+index 8095d2a..9fba63c 100644
+--- kdeui/icons/kiconengine_p.h
++++ kdeui/icons/kiconengine_p.h
+@@ -75,7 +75,7 @@ class KIconEngine : public QIconEngineV2
+   private:
+     QString mIconName;
+     QStringList mOverlays;
+-    KIconLoader* mIconLoader;
++    QWeakPointer<KIconLoader> mIconLoader;
+ };
+ 
+ inline KIconEngine::~KIconEngine()