Update to KDE 3.4.1

7 files changed, 39 insertions, 5 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 0e0fea75104..cb9afe03ebd 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -55,4 +55,9 @@ pre-everything::
 RUN_DEPENDS+=	callgrind:${PORTSDIR}/devel/callgrind
 .endif
 
+post-patch:
+# Breakage might be caused by security/heimdal's broken fnmatch.h
+	@${REINPLACE_CMD} -e 's|<\(fnmatch.h\)>|"/usr/include/\1"|' \
+		${WRKSRC}/cervisia/stringmatcher.cpp
+
 .include <bsd.port.post.mk>
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 8ecddb6bc4b..c165d27b895 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdesdk-3.4.0.tar.bz2) = 5b88692972e65c5e7d3aafc6400bea2c
-SIZE (KDE/kdesdk-3.4.0.tar.bz2) = 4571452
+MD5 (KDE/kdesdk-3.4.1.tar.bz2) = b7073f0f4ac7efe4d6ff33c1ba527668
+SIZE (KDE/kdesdk-3.4.1.tar.bz2) = 4589829
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 523827d068d..4192d9bf7e1 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -83,6 +83,12 @@ include/kbabel/tagextractor.h
 include/kprofilemethod.h
 include/kspy.h
 include/repository_stub.h
+lib/kde3/cervisia.la
+lib/kde3/cervisia.so
+lib/kde3/cvsaskpass.la
+lib/kde3/cvsaskpass.so
+lib/kde3/cvsservice.la
+lib/kde3/cvsservice.so
 lib/kde3/kabcformat_kdeaccounts.la
 lib/kde3/kabcformat_kdeaccounts.so
 lib/kde3/kbabel_accelstool.la
@@ -162,6 +168,12 @@ lib/libkbabelcommon.so.5
 lib/libkbabeldictplugin.la
 lib/libkbabeldictplugin.so
 lib/libkbabeldictplugin.so.3
+lib/libkdeinit_cervisia.la
+lib/libkdeinit_cervisia.so
+lib/libkdeinit_cvsaskpass.la
+lib/libkdeinit_cvsaskpass.so
+lib/libkdeinit_cvsservice.la
+lib/libkdeinit_cvsservice.so
 lib/libkompareinterface.la
 lib/libkompareinterface.so
 lib/libkompareinterface.so.0
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 0e0fea75104..cb9afe03ebd 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -55,4 +55,9 @@ pre-everything::
 RUN_DEPENDS+=	callgrind:${PORTSDIR}/devel/callgrind
 .endif
 
+post-patch:
+# Breakage might be caused by security/heimdal's broken fnmatch.h
+	@${REINPLACE_CMD} -e 's|<\(fnmatch.h\)>|"/usr/include/\1"|' \
+		${WRKSRC}/cervisia/stringmatcher.cpp
+
 .include <bsd.port.post.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 8ecddb6bc4b..c165d27b895 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdesdk-3.4.0.tar.bz2) = 5b88692972e65c5e7d3aafc6400bea2c
-SIZE (KDE/kdesdk-3.4.0.tar.bz2) = 4571452
+MD5 (KDE/kdesdk-3.4.1.tar.bz2) = b7073f0f4ac7efe4d6ff33c1ba527668
+SIZE (KDE/kdesdk-3.4.1.tar.bz2) = 4589829
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 523827d068d..4192d9bf7e1 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -83,6 +83,12 @@ include/kbabel/tagextractor.h
 include/kprofilemethod.h
 include/kspy.h
 include/repository_stub.h
+lib/kde3/cervisia.la
+lib/kde3/cervisia.so
+lib/kde3/cvsaskpass.la
+lib/kde3/cvsaskpass.so
+lib/kde3/cvsservice.la
+lib/kde3/cvsservice.so
 lib/kde3/kabcformat_kdeaccounts.la
 lib/kde3/kabcformat_kdeaccounts.so
 lib/kde3/kbabel_accelstool.la
@@ -162,6 +168,12 @@ lib/libkbabelcommon.so.5
 lib/libkbabeldictplugin.la
 lib/libkbabeldictplugin.so
 lib/libkbabeldictplugin.so.3
+lib/libkdeinit_cervisia.la
+lib/libkdeinit_cervisia.so
+lib/libkdeinit_cvsaskpass.la
+lib/libkdeinit_cvsaskpass.so
+lib/libkdeinit_cvsservice.la
+lib/libkdeinit_cvsservice.so
 lib/libkompareinterface.la
 lib/libkompareinterface.so
 lib/libkompareinterface.so.0
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 87058413a9e..d019b980b4d 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdevelop
 PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION:S/.0//}/src