The KDE/FreeBSD team is pleased to announce KDE SC 4.7.4, which

concludes the 4.7 series.

The official release notes can be found at:
http://kde.org/announcements/announce-4.7.4.php

PR:		162216
PR:		163662

12 files changed, 13 insertions, 56 deletions

diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 473614973a07..fff32c1606d2 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kde-baseapps-4.7.3.tar.bz2) = e9fb0c5da9e9a255c1a1735dfa518dcadc1ea23c68a467164597ff3dbf51c8df
-SIZE (KDE/kde-baseapps-4.7.3.tar.bz2) = 2685074
+SHA256 (KDE/kde-baseapps-4.7.4.tar.bz2) = 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
+SIZE (KDE/kde-baseapps-4.7.4.tar.bz2) = 2684721
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 0805d7e4c96e..60030685f84c 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kde-runtime-4.7.3.tar.bz2) = 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
-SIZE (KDE/kde-runtime-4.7.3.tar.bz2) = 6026718
+SHA256 (KDE/kde-runtime-4.7.4.tar.bz2) = 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
+SIZE (KDE/kde-runtime-4.7.4.tar.bz2) = 6026460
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index c9d5c3b87801..c56f7f127a22 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,4 +1,4 @@
-SHA256 (KDE/kde-workspace-4.7.3.tar.bz2) = 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
-SIZE (KDE/kde-workspace-4.7.3.tar.bz2) = 20556738
+SHA256 (KDE/kde-workspace-4.7.4.tar.bz2) = 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
+SIZE (KDE/kde-workspace-4.7.4.tar.bz2) = 20557567
 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-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
deleted file mode 100644
index 0bf69a12c2cb..000000000000
--- a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orig	2008-01-30 00:38:06.000000000 +0100
-+++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp	2008-01-30 00:38:38.000000000 +0100
-@@ -30,6 +30,7 @@
- 
- #include <assert.h>
- #include <kmessagebox.h>
-+#include <QWidget>
- #include <QTabWidget>
- #include <QTimer>
- 
diff --git a/x11/kde4-workspace/files/patch-kwin__CMakeLists.txt b/x11/kde4-workspace/files/patch-kwin__CMakeLists.txt
deleted file mode 100644
index 6bf9d34088c0..000000000000
--- a/x11/kde4-workspace/files/patch-kwin__CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kwin/CMakeLists.txt.orig	2010-12-02 10:14:06.151501238 +1000
-+++ ./kwin/CMakeLists.txt	2010-12-02 10:14:30.909493105 +1000
-@@ -189,7 +189,7 @@
- kde4_add_library(kwinnvidiahack SHARED ${kwinnvidiahack_LIB_SRCS})
- 
- set_target_properties(kwinnvidiahack PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}  )
--install(TARGETS kwinnvidiahack ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-+install(TARGETS kwinnvidiahack ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- ########### install files ###############
- 
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 20dbdee965be..947a74d620f1 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -414,7 +414,6 @@ lib/libksignalplotter.so.5.0.1
 lib/libkwineffects.so
 lib/libkwineffects.so.1
 lib/libkwineffects.so.1.0.0
-lib/libkwinnvidiahack.so
 lib/libkwinnvidiahack.so.5
 lib/libkwinnvidiahack.so.5.0.1
 lib/libkworkspace.so
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c2d465fcedfb..7482b3781e85 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 1922804c845e..961092665ba6 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.7.3.tar.bz2) = 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
-SIZE (KDE/kdelibs-4.7.3.tar.bz2) = 12071229
+SHA256 (KDE/kdelibs-4.7.4.tar.bz2) = fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39
+SIZE (KDE/kdelibs-4.7.4.tar.bz2) = 12084560
diff --git a/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp b/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp
deleted file mode 100644
index db7825a11dc8..000000000000
--- a/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-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/kgamma/distinfo b/x11/kgamma/distinfo
index 908c1ea78f3e..a888fdef2719 100644
--- a/x11/kgamma/distinfo
+++ b/x11/kgamma/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kgamma-4.7.3.tar.bz2) = 5e752fc413fe54b4be59ee580bab01c6005cc861c6962b8a343863d757a7e94f
-SIZE (KDE/kgamma-4.7.3.tar.bz2) = 28365
+SHA256 (KDE/kgamma-4.7.4.tar.bz2) = 09a2b3f5f40f2d1041b5befb2ea724c05410bac2c9625aba2d27020ec82a7317
+SIZE (KDE/kgamma-4.7.4.tar.bz2) = 28373
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 8f165172f396..67a2a1fe4fb8 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -22,6 +22,7 @@ KDE4_BUILDENV=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	xml moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xrender
+CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 5debe98c1963..09525bc491e0 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/konsole-4.7.3.tar.bz2) = e18d838ce3a34a60ad61b9fa21b2ba07466491ea81649efa4dff3b96291a4f00
-SIZE (KDE/konsole-4.7.3.tar.bz2) = 462846
+SHA256 (KDE/konsole-4.7.4.tar.bz2) = fe464482d43b2ca33a4f26a978c1959e16b55056e4c32fc5e906d9681e9a02f3
+SIZE (KDE/konsole-4.7.4.tar.bz2) = 463114