Update to KDE 3.4

Highlights at a glance

* Text-to-speech system with support built into Konqueror, Kate, KPDF
  and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
  PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
  GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
  integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
  on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
  CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
  third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
  websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
  disable ones that are not used. This does not include Netscape-style
  plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
  plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
  documentation added or changed

6 files changed, 59 insertions, 61 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 66b896af0cc..6155642388d 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/12/10 06:29:31 markd Exp $
+# $NetBSD: Makefile,v 1.31 2005/03/23 22:33:47 markd Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
 CATEGORIES=	devel
@@ -16,23 +16,44 @@ USE_PERL5=		run
 
 REPLACE_PERL=	cervisia/change_colors.pl \
 		cervisia/move_repositories.pl \
+		cervisia/cervisia-change_repos_list.pl \
+		cervisia/cervisia-normalize_cvsroot.pl \
+		kapptemplate/admin/am_edit \
+		kapptemplate/admin/bcheck.pl \
+		kapptemplate/admin/cvs-clean.pl \
+		kapptemplate/admin/debianrules \
+		kapptemplate/admin/nmcheck \
 		kcachegrind/converters/dprof2calltree \
 		kcachegrind/converters/memprof2calltree \
 		kcachegrind/converters/op2calltree \
+		scripts/authors2xml.pl \
+		scripts/check_licenses \
+		scripts/colorcvs \
 		scripts/cvs-clean \
-		scripts/cvs2pack \
 		scripts/cvsblame \
 		scripts/cvscheck \
 		scripts/cvslastchange \
+		scripts/cvslastreferenced \
 		scripts/cxxmetric \
 		scripts/extend_dmalloc \
+		scripts/extractattr \
 		scripts/extractrc \
-		scripts/fixincludes \
+		scripts/fixheaders \
 		scripts/fixkdeincludes \
 		scripts/fixuifiles \
 		scripts/includemocs \
+		scripts/kde-spellcheck.pl \
 		scripts/kdemangen.pl \
-		scripts/noncvslist
+		scripts/licensecheck \
+		scripts/noncvslist \
+		scripts/png2mng.pl \
+		scripts/rc2kcfgxt.pl
+
+REPLACE_INTERPRETER+=	bash
+_REPLACE.bash.old=	/bin/bash
+_REPLACE.bash.new=	/bin/sh
+_REPLACE_FILES.bash=	scripts/cvs2dist scripts/makeobj \
+		scripts/package_crystalsvg
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/kdesdk3/PLIST b/devel/kdesdk3/PLIST
index ac7a67b180f..4b962b17223 100644
--- a/devel/kdesdk3/PLIST
+++ b/devel/kdesdk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/12/10 06:29:31 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/03/23 22:33:47 markd Exp $
 bin/adddebug
 bin/build-progress.sh
 bin/catalogmanager
@@ -22,6 +22,7 @@ bin/cvsversion
 bin/cxxmetric
 bin/dprof2calltree
 bin/extend_dmalloc
+bin/extractattr
 bin/extractrc
 bin/findmissingcrystal
 bin/fixkdeincludes
@@ -98,6 +99,8 @@ lib/kde3/kbabel_pluraltool.la
 lib/kde3/kbabel_punctuationtool.la
 lib/kde3/kbabel_setfuzzytool.la
 lib/kde3/kbabel_whitespacetool.la
+lib/kde3/kbabel_xliffexport.la
+lib/kde3/kbabel_xliffimport.la
 lib/kde3/kbabel_xmltool.la
 lib/kde3/kbabeldict_dbsearchengine.la
 lib/kde3/kbabeldict_poauxiliary.la
@@ -108,7 +111,6 @@ lib/kde3/kfile_diff.la
 lib/kde3/kfile_po.la
 lib/kde3/kfile_ts.la
 lib/kde3/libcervisiapart.la
-lib/kde3/libdialogpages.la
 lib/kde3/libkomparenavtreepart.la
 lib/kde3/libkomparepart.la
 lib/kde3/libkuiviewerpart.la
@@ -179,6 +181,7 @@ share/doc/kde/HTML/en/kbabel/glossary.docbook
 share/doc/kde/HTML/en/kbabel/index.cache.bz2
 share/doc/kde/HTML/en/kbabel/index.docbook
 share/doc/kde/HTML/en/kbabel/kbabeldict.docbook
+share/doc/kde/HTML/en/kbabel/man-catalogmanager.1.docbook
 share/doc/kde/HTML/en/kbabel/menu.docbook
 share/doc/kde/HTML/en/kbabel/msgid2msgstr.png
 share/doc/kde/HTML/en/kbabel/next.png
@@ -242,6 +245,7 @@ share/doc/kde/HTML/en/umbrello/use-case-diagram.png
 share/doc/kde/HTML/en/umbrello/working_with_umbrello.docbook
 share/kde/apps/catalogmanager/catalogmanagerui.rc
 share/kde/apps/cervisia/cervisiashellui.rc
+share/kde/apps/cervisia/eventsrc
 share/kde/apps/cervisiapart/cervisiaui.rc
 share/kde/apps/kabc/formats/kdeaccountsplugin.desktop
 share/kde/apps/kapptemplate/admin/Doxyfile.am
@@ -273,6 +277,7 @@ share/kde/apps/kapptemplate/admin/missing
 share/kde/apps/kapptemplate/admin/mkinstalldirs
 share/kde/apps/kapptemplate/admin/nmcheck
 share/kde/apps/kapptemplate/admin/oldinclude.m4.in
+share/kde/apps/kapptemplate/admin/pkg.m4.in
 share/kde/apps/kapptemplate/admin/ylwrap
 share/kde/apps/kapptemplate/appframework/AUTHORS
 share/kde/apps/kapptemplate/appframework/COPYING
@@ -503,6 +508,7 @@ share/kde/apps/kbugbuster/kbugbusterui.rc
 share/kde/apps/kbugbuster/pics/bars.png
 share/kde/apps/kbugbuster/pics/logo.png
 share/kde/apps/kbugbuster/pics/tools.png
+share/kde/apps/kbugbuster/pics/top-right.png
 share/kde/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png
 share/kde/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
 share/kde/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png
@@ -511,14 +517,17 @@ share/kde/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
 share/kde/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
 share/kde/apps/kcachegrind/kcachegrindui.rc
 share/kde/apps/kcachegrind/tips
+share/kde/apps/kconf_update/cervisia-change_repos_list.pl
+share/kde/apps/kconf_update/cervisia-normalize_cvsroot.pl
 share/kde/apps/kconf_update/cervisia.upd
 share/kde/apps/kconf_update/change_colors.pl
 share/kde/apps/kconf_update/kbabel-project.upd
+share/kde/apps/kconf_update/kbabel-projectrename.upd
 share/kde/apps/kconf_update/move_repositories.pl
 share/kde/apps/kompare/komparepartui.rc
 share/kde/apps/kompare/kompareui.rc
 share/kde/apps/kstyle/themes/scheck.themerc
-share/kde/apps/kuiviewer/kuiviewer.rc
+share/kde/apps/kuiviewer/kuiviewerui.rc
 share/kde/apps/kuiviewerpart/kuiviewer_part.rc
 share/kde/apps/umbrello/headings/heading.adb
 share/kde/apps/umbrello/headings/heading.ads
@@ -582,6 +591,7 @@ share/kde/apps/umbrello/pics/cursor-containment.png
 share/kde/apps/umbrello/pics/cursor-datatype.png
 share/kde/apps/umbrello/pics/cursor-dependency.png
 share/kde/apps/umbrello/pics/cursor-end-state.png
+share/kde/apps/umbrello/pics/cursor-entity.png
 share/kde/apps/umbrello/pics/cursor-enum.png
 share/kde/apps/umbrello/pics/cursor-fork.png
 share/kde/apps/umbrello/pics/cursor-generalisation.png
@@ -593,12 +603,14 @@ share/kde/apps/umbrello/pics/cursor-node.png
 share/kde/apps/umbrello/pics/cursor-note.png
 share/kde/apps/umbrello/pics/cursor-object.png
 share/kde/apps/umbrello/pics/cursor-package.png
+share/kde/apps/umbrello/pics/cursor-relationship.png
 share/kde/apps/umbrello/pics/cursor-text.png
 share/kde/apps/umbrello/pics/cursor-uniassociation.png
 share/kde/apps/umbrello/pics/cursor-usecase.png
 share/kde/apps/umbrello/pics/datatype.png
 share/kde/apps/umbrello/pics/dependency.png
 share/kde/apps/umbrello/pics/end_state.png
+share/kde/apps/umbrello/pics/entity.png
 share/kde/apps/umbrello/pics/enum.png
 share/kde/apps/umbrello/pics/fork.png
 share/kde/apps/umbrello/pics/generalisation.png
@@ -610,6 +622,7 @@ share/kde/apps/umbrello/pics/node.png
 share/kde/apps/umbrello/pics/note.png
 share/kde/apps/umbrello/pics/object.png
 share/kde/apps/umbrello/pics/package.png
+share/kde/apps/umbrello/pics/relationship.png
 share/kde/apps/umbrello/pics/startlogo.png
 share/kde/apps/umbrello/pics/template.png
 share/kde/apps/umbrello/pics/text.png
@@ -619,6 +632,8 @@ share/kde/apps/umbrello/tips
 share/kde/apps/umbrello/umbrelloui.rc
 share/kde/config.kcfg/cervisiapart.kcfg
 share/kde/config.kcfg/kbabel.kcfg
+share/kde/config.kcfg/kbprojectsettings.kcfg
+share/kde/icons/crystalsvg/128x128/apps/kbugbuster.png
 share/kde/icons/crystalsvg/128x128/apps/kompare.png
 share/kde/icons/crystalsvg/128x128/apps/umbrello.png
 share/kde/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
@@ -632,6 +647,7 @@ share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_state.png
 share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
 share/kde/icons/crystalsvg/16x16/actions/vcs_add.png
 share/kde/icons/crystalsvg/16x16/actions/vcs_commit.png
+share/kde/icons/crystalsvg/16x16/actions/vcs_diff.png
 share/kde/icons/crystalsvg/16x16/actions/vcs_remove.png
 share/kde/icons/crystalsvg/16x16/actions/vcs_status.png
 share/kde/icons/crystalsvg/16x16/actions/vcs_update.png
@@ -648,20 +664,24 @@ share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_class.png
 share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
 share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_component.png
 share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_deployment.png
+share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_entityrelationship.png
 share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
 share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_state.png
 share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
 share/kde/icons/crystalsvg/22x22/actions/vcs_add.png
 share/kde/icons/crystalsvg/22x22/actions/vcs_commit.png
+share/kde/icons/crystalsvg/22x22/actions/vcs_diff.png
 share/kde/icons/crystalsvg/22x22/actions/vcs_remove.png
 share/kde/icons/crystalsvg/22x22/actions/vcs_status.png
 share/kde/icons/crystalsvg/22x22/actions/vcs_update.png
 share/kde/icons/crystalsvg/22x22/apps/catalogmanager.png
 share/kde/icons/crystalsvg/22x22/apps/cervisia.png
+share/kde/icons/crystalsvg/22x22/apps/kbugbuster.png
 share/kde/icons/crystalsvg/22x22/apps/umbrello.png
 share/kde/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
 share/kde/icons/crystalsvg/32x32/actions/vcs_add.png
 share/kde/icons/crystalsvg/32x32/actions/vcs_commit.png
+share/kde/icons/crystalsvg/32x32/actions/vcs_diff.png
 share/kde/icons/crystalsvg/32x32/actions/vcs_remove.png
 share/kde/icons/crystalsvg/32x32/actions/vcs_status.png
 share/kde/icons/crystalsvg/32x32/actions/vcs_update.png
@@ -675,6 +695,7 @@ share/kde/icons/crystalsvg/32x32/apps/umbrello.png
 share/kde/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
 share/kde/icons/crystalsvg/48x48/actions/vcs_add.png
 share/kde/icons/crystalsvg/48x48/actions/vcs_commit.png
+share/kde/icons/crystalsvg/48x48/actions/vcs_diff.png
 share/kde/icons/crystalsvg/48x48/actions/vcs_remove.png
 share/kde/icons/crystalsvg/48x48/actions/vcs_status.png
 share/kde/icons/crystalsvg/48x48/actions/vcs_update.png
@@ -686,10 +707,12 @@ share/kde/icons/crystalsvg/48x48/apps/kbugbuster.png
 share/kde/icons/crystalsvg/48x48/apps/kompare.png
 share/kde/icons/crystalsvg/48x48/apps/umbrello.png
 share/kde/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
+share/kde/icons/crystalsvg/64x64/apps/kbugbuster.png
 share/kde/icons/crystalsvg/64x64/apps/umbrello.png
 share/kde/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
 share/kde/icons/crystalsvg/scalable/actions/vcs_add.svgz
 share/kde/icons/crystalsvg/scalable/actions/vcs_commit.svgz
+share/kde/icons/crystalsvg/scalable/actions/vcs_diff.svgz
 share/kde/icons/crystalsvg/scalable/actions/vcs_remove.svgz
 share/kde/icons/crystalsvg/scalable/actions/vcs_status.svgz
 share/kde/icons/crystalsvg/scalable/actions/vcs_update.svgz
@@ -740,6 +763,8 @@ share/kde/services/kbabel_pluralformstool.desktop
 share/kde/services/kbabel_punctuationtool.desktop
 share/kde/services/kbabel_setfuzzytool.desktop
 share/kde/services/kbabel_whitespacetool.desktop
+share/kde/services/kbabel_xliff_export.desktop
+share/kde/services/kbabel_xliff_import.desktop
 share/kde/services/kbabel_xmltool.desktop
 share/kde/services/kfile_cpp.desktop
 share/kde/services/kfile_diff.desktop
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index d817cd9a131..4b7bc5c5eb4 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:54:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 22:33:47 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	kdesdk
 
 .if !empty(KDESDK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdesdk+=	kdesdk>=3.2.0
-BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.3.0nb1
+BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.4.0
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 .endif	# KDESDK_BUILDLINK3_MK
 
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 0773db2e9c6..33dd9f46f04 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.19 2005/02/23 22:24:17 agc Exp $
+$NetBSD: distinfo,v 1.20 2005/03/23 22:33:47 markd Exp $
 
-SHA1 (kdesdk-3.3.2.tar.bz2) = a4e037661765b590ea1f64fd7182e835e52a1374
-RMD160 (kdesdk-3.3.2.tar.bz2) = d9577986e2f6c811f7847e33e03aaaddca2a1aab
-Size (kdesdk-3.3.2.tar.bz2) = 4358995 bytes
-SHA1 (patch-ab) = a975fd30cbee8107856774161f9216cde2548a10
+SHA1 (kdesdk-3.4.0.tar.bz2) = b14f6085538658af0c78673850d3f0432ccc3a6b
+RMD160 (kdesdk-3.4.0.tar.bz2) = 9d96cc4c4ebb34b2c5df844c905f54f1f4800bc1
+Size (kdesdk-3.4.0.tar.bz2) = 4571452 bytes
 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307
-SHA1 (patch-ad) = bbc3675b927a2cef5879a38eac34796a52999702
diff --git a/devel/kdesdk3/patches/patch-ab b/devel/kdesdk3/patches/patch-ab
deleted file mode 100644
index 509cece0c22..00000000000
--- a/devel/kdesdk3/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/17 11:06:50 skrll Exp $
-
---- kbabel/common/libgettext/xmalloc.c.orig	Thu Dec  6 20:58:00 2001
-+++ kbabel/common/libgettext/xmalloc.c
-@@ -62,7 +62,11 @@
-    The caller may set it to some other value.  */
- int xmalloc_exit_failure = EXIT_FAILURE;
- 
-+#ifdef __NetBSD__
-+#include <err.h>
-+#else
- void error (int, int, const char *, ...);
-+#endif
- 
- static VOID *
- fixup_null_alloc (n)
diff --git a/devel/kdesdk3/patches/patch-ad b/devel/kdesdk3/patches/patch-ad
deleted file mode 100644
index 678724d659c..00000000000
--- a/devel/kdesdk3/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/01/02 21:59:23 markd Exp $
-
---- kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig	2005-01-03 00:39:59.000000000 +1300
-+++ kbabel/kbabeldict/modules/dbsearchengine/database.cpp
-@@ -728,7 +728,11 @@ int
- DataBaseManager::count ()
- {
-     DB_BTREE_STAT *dstat = 0;
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
-+    db->stat (db, NULL, &dstat, DB_FAST_STAT);
-+#else
-     db->stat (db, &dstat, DB_FAST_STAT);
-+#endif
-     int ret = dstat->bt_nkeys;
-     free (dstat);
- 
-@@ -963,8 +967,13 @@ DataBaseManager::loadInfo ()
-     int nrec;
-     DB_BTREE_STAT *stat;
- // memset(&stat,0,sizeof(DB_BTREE_STAT));
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
-+    if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT))
-+        fprintf (stderr, "Cannot stat\n");
-+#else
-     if (infoDb->stat (infoDb, &stat, DB_FAST_STAT))
- 	fprintf (stderr, "Cannot stat\n");
-+#endif
-     nrec = stat->bt_nkeys;
-     free (stat);
-