16 files changed, 149 insertions, 178 deletions

diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 7578a9ee8fdc..473614973a07 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kde-baseapps-4.7.2.tar.bz2) = 1104284ad9cfc9757b0bbd2516dfdcbe4119ea6a6e6daf3c9d7eb66c43760bfa
-SIZE (KDE/kde-baseapps-4.7.2.tar.bz2) = 2685060
+SHA256 (KDE/kde-baseapps-4.7.3.tar.bz2) = e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
+SIZE (KDE/kde-baseapps-4.7.3.tar.bz2) = 2685074
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 16c0eca69149..0805d7e4c96e 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kde-runtime-4.7.2.tar.bz2) = 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
-SIZE (KDE/kde-runtime-4.7.2.tar.bz2) = 6026223
+SHA256 (KDE/kde-runtime-4.7.3.tar.bz2) = 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
+SIZE (KDE/kde-runtime-4.7.3.tar.bz2) = 6026718
diff --git a/x11/kde4-runtime/files/patch-nepomuk__services__storage__datamanagementmodel.h b/x11/kde4-runtime/files/patch-nepomuk__services__storage__datamanagementmodel.h
deleted file mode 100644
index a67a3dca926f..000000000000
--- a/x11/kde4-runtime/files/patch-nepomuk__services__storage__datamanagementmodel.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./nepomuk/services/storage/datamanagementmodel.h.orig	2011-09-10 03:15:36.003035686 +0200
-+++ ./nepomuk/services/storage/datamanagementmodel.h	2011-09-10 03:17:46.033066393 +0200
-@@ -156,7 +156,7 @@
-                         const QString& app,
-                         Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew,
-                         Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags,
--                        const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>() );
-+                        const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()) );
- 
-     /**
-      * Merges two resources into one. Properties from \p resource1
-@@ -188,7 +188,7 @@
-                          const QString& userSerialization = QString(),
-                          Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew,
-                          Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags,
--                         const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>());
-+                         const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
- 
-     /**
-      * Describe a set of resources, i.e. retrieve all their properties.
-@@ -200,7 +200,7 @@
-     //@}
- 
- private:
--    QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>());
-+    QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
-     QUrl createGraph(const QString& app, const QMultiHash<QUrl, Soprano::Node>& additionalMetadata);
- 
-     /**
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index bbe07cfb7b04..ea40e951f9ac 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE_kde} \
 		${MASTER_SITE_LOCAL} \
@@ -34,7 +33,7 @@ LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		ttf.4:${PORTSDIR}/print/freetype \
+		freetype.9:${PORTSDIR}/print/freetype2 \
 		png.6:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
@@ -57,7 +56,7 @@ RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 
 CONFLICTS=	kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].*
 
-SUB_FILES=	kdm pkg-message
+SUB_FILES=	pkg-message
 USE_RC_SUBR=	kdm4
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -95,6 +94,7 @@ OPTIONS=	GPS "Support for GPS geolocation dataengine" on \
 		PHONON_VLC "VLC backend for Phonon" off \
 		PLASMA_PYTHON "Support for plasmoids written in Python" off \
 		PLASMA_RUBY "Support for plasmoids written in Ruby" off \
+		UPOWER "Support for power management" on \
 		WALLPAPERS "Official KDE wallpapers" on
 
 .include <bsd.port.options.mk>
@@ -125,6 +125,10 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_import
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby
 .endif
 
+.if !defined(WITHOUT_UPOWER)
+RUN_DEPENDS+=	${LOCALBASE}/libexec/upowerd:${PORTSDIR}/sysutils/upower
+.endif
+
 .if !defined(WITHOUT_WALLPAPERS)
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers
 .endif
@@ -160,10 +164,6 @@ pre-configure:
 
 post-install:
 	${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4
-	${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin
-	${MV} ${PREFIX}/lib/kde4/libexec/kdm_config ${PREFIX}/lib/kde4/libexec/kdm-bin_config
-	${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet
-	${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin
 	${INSTALL_DATA} ${FILESDIR}/05-freebsdWallpaper.js ${PREFIX}/share/apps/plasma-desktop/init
 	cd ${WRKDIR}/stripes-freebsd-1.0 && \
 		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index e8cdcba0568d..c9d5c3b87801 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,4 +1,4 @@
-SHA256 (KDE/kde-workspace-4.7.2.tar.bz2) = 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
-SIZE (KDE/kde-workspace-4.7.2.tar.bz2) = 20556305
+SHA256 (KDE/kde-workspace-4.7.3.tar.bz2) = 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
+SIZE (KDE/kde-workspace-4.7.3.tar.bz2) = 20556738
 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/kdm.in b/x11/kde4-workspace/files/kdm.in
deleted file mode 100644
index 69162f32924d..000000000000
--- a/x11/kde4-workspace/files/kdm.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-# Some definitions.
-GENKDMCONF=%%PREFIX%%/bin/genkdmconf
-KDMCONFDIR=%%PREFIX%%/share/config/kdm
-
-# Configure KDM if needed.
-if [ ! -r ${KDMCONFDIR}/kdmrc ]; then
-	echo "Generating KDM configuration.";
-	${GENKDMCONF} --no-old --in ${KDMCONFDIR};
-else
-	echo "Updating KDM configuration.";
-	${GENKDMCONF} --in ${KDMCONFDIR};
-fi
-
-# Run KDM.
-exec "%%PREFIX%%/bin/kdm-bin" "$@"
diff --git a/x11/kde4-workspace/files/kdm4.in b/x11/kde4-workspace/files/kdm4.in
index 5ef3706a987e..8908394b3312 100644
--- a/x11/kde4-workspace/files/kdm4.in
+++ b/x11/kde4-workspace/files/kdm4.in
@@ -1,62 +1,75 @@
 #!/bin/sh
-#
+
 # $FreeBSD$
 #
 # PROVIDE: kdm4
 # REQUIRE: LOGIN cleanvar moused syscons dbus hald
+# KEYWORD: shutdown
 #
 # Add the following to /etc/rc.conf to start KDM at boot time:
 #
 # kdm4_enable="YES"
 #
+# # Optional variables
+# kdm4_lang="en_US"	# Default language. Note that language settings
+#			# in %%PREFIX%%/share/config/kdm/kdmrc has
+#			# higher priority.
 
 . /etc/rc.subr
 
-kdm4_enable=${kdm4_enable-"NO"}
+name=kdm4
+rcvar=`set_rcvar`
+
+load_rc_config ${name}
+
+: ${kdm4_enable:="NO"}
+: ${kdm4_lang="en_US"} # .UTF-8 suffix will be added later to comply with locale format
 
 GENKDMCONF=%%PREFIX%%/bin/genkdmconf
 KDMCONFDIR=%%PREFIX%%/share/config/kdm
 
-name=kdm4
-rcvar=`set_rcvar`
-command="%%PREFIX%%/bin/kdm-bin"
+command="%%PREFIX%%/bin/kdm"
 pidfile="/var/run/kdm.pid"
 start_cmd="kdm_start"
 
+kdm_genkdmconf()
+{
+	# Configure KDM if needed.
+	if [ ! -r ${KDMCONFDIR}/kdmrc ]; then
+		echo "Generating KDM configuration."
+		${GENKDMCONF} --no-old --in ${KDMCONFDIR}
+	else
+		echo "Updating KDM configuration."
+		${GENKDMCONF} --in ${KDMCONFDIR}
+	fi
+}
+
 kdm_start()
 {
-    if ! checkyesno kdm4_enable; then
-        return 0
-    fi
-    echo "Starting ${name}."
-
-    # Configure KDM if needed.
-    if [ ! -r ${KDMCONFDIR}/kdmrc ]; then
-        echo "Generating KDM configuration."
-        ${GENKDMCONF} --no-old --in ${KDMCONFDIR}
-    else
-        echo "Updating KDM configuration."
-        ${GENKDMCONF} --in ${KDMCONFDIR}
-    fi
-
-    ( iter=0
-    while ! pgrep -f "^/usr/libexec/getty " > /dev/null 2>&1; do
-        if [ ${iter} -ge 600 ]; then
-            return 1
-        fi
-        sleep 1
-        iter=$(expr ${iter} + 1)
-    done
-    if checkyesno hald_enable; then
-        iter=0
-        while [ ${iter} -lt 60 ] &&
-          ! %%LOCALBASE%%/bin/lshal > /dev/null 2>&1; do
-            sleep 1
-            iter=$(expr ${iter} + 1)
-        done
-    fi
-    ${command} ${kdm4_flags} ) &
+	kdm_genkdmconf
+
+	local iter
+
+	( iter=0
+	while ! pgrep -f "^/usr/libexec/getty " > /dev/null 2>&1; do
+		if [ ${iter} -ge 600 ]; then
+			return 1
+		fi
+		sleep 1
+		iter=$((${iter} + 1))
+	done
+	if checkyesno hald_enable; then
+		if [ ! -x %%LOCALBASE%%/sbin/hald ]; then
+			err 1 "%%LOCALBASE%%/sbin/hald is not installed"
+		fi
+		iter=0
+		while [ ${iter} -lt 60 ] &&
+			! pgrep -f "^%%LOCALBASE%%/sbin/hald" > /dev/null 2>&1; do
+			sleep 1
+			iter=$((${iter} + 1))
+		done
+	fi
+	LANG=${kdm4_lang}.UTF-8 ${command} ${kdm4_flags} ) &
 }
 
-load_rc_config ${name}
 run_rc_command "$1"
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 304e57f7252e..20dbdee965be 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -6,7 +6,6 @@ bin/kcheckrunning
 bin/kcminit
 bin/kcminit_startup
 bin/kdm
-bin/kdm-bin
 bin/kdmctl
 bin/kdostartupconfig4
 bin/kfontinst
@@ -266,8 +265,8 @@ lib/kde4/libexec/fontinst_x11
 lib/kde4/libexec/kcheckpass
 lib/kde4/libexec/kcmdatetimehelper
 lib/kde4/libexec/kcmkdmhelper
-lib/kde4/libexec/kdm-bin_config
-lib/kde4/libexec/kdm-bin_greet
+lib/kde4/libexec/kdm_config
+lib/kde4/libexec/kdm_greet
 lib/kde4/libexec/kfontprint
 lib/kde4/libexec/krootimage
 lib/kde4/libexec/kscreenlocker
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 126b5abcdcb6..1ea63e44da67 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	kde4
+PORTNAME=	kde
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -15,6 +14,11 @@ DISTFILES=	# none
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	The meta-port for KDE Software Compilation 4
 
+LATEST_LINK=	kde4
+
+USE_KDE4=	baseapps kdelibs kdeprefix oxygen pimlibs runtime workspace
+NO_BUILD=	yes
+
 OPTIONS=	KDEACCESSIBILITY "Accessibility applications" on \
 		KDEADMIN "Administration utilities" on \
     		KDEARTWORK "Additional screensavers and wallpapers" on \
@@ -31,9 +35,6 @@ OPTIONS=	KDEACCESSIBILITY "Accessibility applications" on \
 		KDEUTILS "Set of generic utilities" on \
 		KDEWEBDEV "Web development environment" on
 
-USE_KDE4=	baseapps kdelibs kdeprefix oxygen pimlibs runtime workspace
-NO_BUILD=	yes
-
 .include <bsd.port.options.mk>
 
 .ifndef(WITHOUT_KDEACCESSIBILITY)
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 24c7a546bfdd..1922804c845e 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.7.2.tar.bz2) = bfa70b33d2153c209a21735d73ae061772c59696c1715881191da7a3993f8b38
-SIZE (KDE/kdelibs-4.7.2.tar.bz2) = 12066803
+SHA256 (KDE/kdelibs-4.7.3.tar.bz2) = 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
+SIZE (KDE/kdelibs-4.7.3.tar.bz2) = 12071229
diff --git a/x11/kdelibs4/files/patch-kio__CMakeLists.txt b/x11/kdelibs4/files/patch-kio__CMakeLists.txt
new file mode 100644
index 000000000000..67a570c2f1fa
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kio__CMakeLists.txt
@@ -0,0 +1,49 @@
+--- ./kio/CMakeLists.txt.orig	2011-10-28 00:41:28.000000000 -0700
++++ ./kio/CMakeLists.txt	2011-11-03 01:06:07.267271376 -0700
+@@ -17,22 +17,6 @@
+    set(KIO_NO_SOPRANO TRUE)
+ endif(NOT SOPRANO_FOUND)
+ 
+-if(OPENSSL_FOUND)
+-   set(KSSL_HAVE_SSL 1)
+-   include_directories(${OPENSSL_INCLUDE_DIR})
+-endif(OPENSSL_FOUND)
+-
+-if(NOT KIO_NO_NEPOMUK)
+-    include_directories(
+-       ${SOPRANO_INCLUDE_DIR}
+-       ${CMAKE_SOURCE_DIR}/nepomuk/
+-       ${CMAKE_SOURCE_DIR}/nepomuk/core/
+-       ${CMAKE_SOURCE_DIR}/nepomuk/types/    
+-       ${CMAKE_SOURCE_DIR}/nepomuk/ui/
+-       ${CMAKE_SOURCE_DIR}/nepomuk/query/
+-    )
+-endif(NOT KIO_NO_NEPOMUK)
+-
+ # This applies to all subdirs; let's put kio's dependencies (and own dirs) here, once and for all
+ include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks
+@@ -48,6 +32,23 @@
+    ${ZLIB_INCLUDE_DIR}
+ 
+    )
++
++if(OPENSSL_FOUND)
++   set(KSSL_HAVE_SSL 1)
++   include_directories(${OPENSSL_INCLUDE_DIR})
++endif(OPENSSL_FOUND)
++
++if(NOT KIO_NO_NEPOMUK)
++    include_directories(
++       ${SOPRANO_INCLUDE_DIR}
++       ${CMAKE_SOURCE_DIR}/nepomuk/
++       ${CMAKE_SOURCE_DIR}/nepomuk/core/
++       ${CMAKE_SOURCE_DIR}/nepomuk/types/
++       ${CMAKE_SOURCE_DIR}/nepomuk/ui/
++       ${CMAKE_SOURCE_DIR}/nepomuk/query/
++    )
++endif(NOT KIO_NO_NEPOMUK)
++
+ if (NOT KIO_NO_STRIGI)
+    include_directories(${STRIGI_INCLUDE_DIR})
+    set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY})
diff --git a/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp b/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp
new file mode 100644
index 000000000000..db7825a11dc8
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp
@@ -0,0 +1,21 @@
+commit 999eac446a49e6126df04aa8717f95e6aef136fc
+Author: Andras Mantia <amantia@kde.org>
+Date:   Thu Nov 10 11:40:22 2011 +0200
+
+    Don't try to access the parent() from the destructor, fixes crash on destruction.
+    BUG: 283657
+    REVIEW: 103098
+
+diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
+index 7689360..96eb277 100644
+--- ./kparts/statusbarextension.cpp
++++ ./kparts/statusbarextension.cpp
+@@ -96,7 +96,7 @@ StatusBarExtension::StatusBarExtension(KParts::ReadOnlyPart *parent)
+ 
+ StatusBarExtension::~StatusBarExtension()
+ {
+-  KStatusBar * sb = statusBar();
++  KStatusBar * sb = d->m_statusBar;
+   for ( int i = d->m_statusBarItems.count () - 1; i >= 0 ; --i ) {
+     if ( d->m_statusBarItems[i].widget() ) {
+       if ( sb ) {
diff --git a/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h b/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
deleted file mode 100644
index bfe1c2b4bf16..000000000000
--- a/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
---- ./nepomuk/query/querybuilderdata_p.h
-+++ ./nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index b0bd253f06fd..4d0b69cb3e1c 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -261,6 +261,7 @@ include/KDE/KCategoryDrawer
 include/KDE/KCharMacroExpander
 include/KDE/KCharSelect
 include/KDE/KCharsets
+include/KDE/KCheckableProxyModel
 include/KDE/KCmdLineArgs
 include/KDE/KCmdLineOptions
 include/KDE/KCodecs
@@ -759,6 +760,7 @@ include/KDE/KUrlRequesterDialog
 include/KDE/KUser
 include/KDE/KUserGroup
 include/KDE/KVBox
+include/KDE/KViewStateMaintainer
 include/KDE/KWallet/Wallet
 include/KDE/KWebPage
 include/KDE/KWebPluginFactory
@@ -2147,9 +2149,6 @@ share/apps/cmake/modules/FindHUpnp.cmake
 share/apps/cmake/modules/FindIOKit.cmake
 share/apps/cmake/modules/FindKDE4Internal.cmake
 share/apps/cmake/modules/FindKDE4Workspace.cmake
-share/apps/cmake/modules/FindKDEWIN32.cmake
-share/apps/cmake/modules/FindKDEWIN_Packager.cmake
-share/apps/cmake/modules/FindKDEWin.cmake
 share/apps/cmake/modules/FindKDevPlatform.cmake
 share/apps/cmake/modules/FindKdcraw.cmake
 share/apps/cmake/modules/FindKdeMultimedia.cmake
diff --git a/x11/kgamma/distinfo b/x11/kgamma/distinfo
index 96d714d0b2b4..908c1ea78f3e 100644
--- a/x11/kgamma/distinfo
+++ b/x11/kgamma/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kgamma-4.7.2.tar.bz2) = e460c7acd51853fd4ecaeec20e7b03f52d6f5d5709a0cb73501f3d4f1befe592
-SIZE (KDE/kgamma-4.7.2.tar.bz2) = 28294
+SHA256 (KDE/kgamma-4.7.3.tar.bz2) = 5e752fc413fe54b4be59ee580bab01c6005cc861c6962b8a343863d757a7e94f
+SIZE (KDE/kgamma-4.7.3.tar.bz2) = 28365
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index b0bdfe67dd76..5debe98c1963 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/konsole-4.7.2.tar.bz2) = 4a5c7f8ad9258f61809a7ef587029021315f36c8877e09b1c740e1cc1ce76d38
-SIZE (KDE/konsole-4.7.2.tar.bz2) = 462175
+SHA256 (KDE/konsole-4.7.3.tar.bz2) = e18d838ce3a34a60ad61b9fa21b2ba07466491ea81649efa4dff3b96291a4f00
+SIZE (KDE/konsole-4.7.3.tar.bz2) = 462846