Update to KDE 3.5.6

Kbabel
* Subversion 1.4 support for catalog manager.
* Fix bookmarking.
* Fixed loading of project files with very long lines.
* Avoid endless loop if focus is taken away before "find next" operation.
* Fix broken replacement of marked text with e.g. ctrl-m.
* Work with media:/.
* Use the same project for all Find/Replace in Files operations as
  catalogmanager.
* Fix problems when no default project is found.

Umbrello
* Stereotype selection list for parameter properties dialog.
* Association line nodes don't drag along with multiply-selected
  classes.
* Accessor methods are private instead of public.
* XMI file contains deleted associations.
* Crash when opening a document.
* Shift+Left and Shift+Right causes SIGSEGV.
* Umbrello saves too many copies in XMI.
* XML scheme: mixup of attribute names: *color and *colour.
* Crashes on closing/opening files created with previous umbrello
  versions.
* Faulty behavior when a class inside of a package is modified.
* Artifacts of a component diagram are erroneously placed in
  Deployment folder.
* Fix incorrect export to SQL.
* Saving trashes model, classes lost.
* Fix segfault in UMLClassifier::checkOperationSignature().
* Fix segfault on XMI close when a class uses a template.
* Fix hang/crash in Tcl code generation.
* Fix saving/loading of association widgets for collaboration diagrams.
* Fix crash in ToolBarStateArrow destructor on document close.
* Note widget is now always drawn on top of all widgets.
* Fix display icon for enum literals in list view.
* Optimized printer margins.
* Improved code import for Ada and Pascal.

6 files changed, 241 insertions, 203 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index b28cc55a54d..5c958079d38 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2007/01/17 23:47:18 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2007/01/26 03:28:08 markd Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
@@ -10,7 +9,6 @@ CONFLICTS+=	umbrello-[0-9]*
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		lex perl:run
 
 REPLACE_PERL+=	cervisia/change_colors.pl \
@@ -65,19 +63,7 @@ PLIST_SRC+=	${PKGDIR}/PLIST.kmtrace
 .endif
 PLIST_SRC+=	${PKGDIR}/PLIST
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.kdesdk
-PKG_SUPPORTED_OPTIONS=	svn
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msvn)
-.include "../../devel/subversion-base/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-svn-include="${BUILDLINK_PREFIX.subversion-base}/include"
-CONFIGURE_ARGS+=	--with-svn-lib="${BUILDLINK_PREFIX.subversion-base}/lib"
-PLIST_SUBST+=		HAVE_SVN=""
-.else
-CONFIGURE_ARGS+=	--with-subversion=no
-PLIST_SUBST+=		HAVE_SVN="@comment "
-.endif
+.include "options.mk"
 
 # Makefile{,.am,.in} weren't supposed to be installed so clean up
 post-install:
@@ -89,6 +75,7 @@ post-install:
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdesdk3/PLIST b/devel/kdesdk3/PLIST
index a9687d85896..a327a130178 100644
--- a/devel/kdesdk3/PLIST
+++ b/devel/kdesdk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2006/10/12 11:08:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.25 2007/01/26 03:28:08 markd Exp $
 bin/adddebug
 bin/build-progress.sh
 bin/catalogmanager
@@ -291,6 +291,154 @@ share/doc/kde/HTML/en/umbrello/umbrello-ui.png
 share/doc/kde/HTML/en/umbrello/uml_basics.docbook
 share/doc/kde/HTML/en/umbrello/use-case-diagram.png
 share/doc/kde/HTML/en/umbrello/working_with_umbrello.docbook
+${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_add.png
+${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_branch.png
+${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_merge.png
+${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_remove.png
+${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_status.png
+${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_switch.png
+share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
+${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_add.png
+${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_branch.png
+${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_merge.png
+${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_remove.png
+${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_status.png
+${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_switch.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_activity.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_class.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_component.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_sequence.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_state.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
+share/icons/crystalsvg/16x16/actions/vcs_add.png
+share/icons/crystalsvg/16x16/actions/vcs_commit.png
+share/icons/crystalsvg/16x16/actions/vcs_diff.png
+share/icons/crystalsvg/16x16/actions/vcs_remove.png
+share/icons/crystalsvg/16x16/actions/vcs_status.png
+share/icons/crystalsvg/16x16/actions/vcs_update.png
+share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
+${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_add.png
+${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_branch.png
+${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_merge.png
+${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_remove.png
+${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_status.png
+${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_switch.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_activity.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_class.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_component.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_deployment.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_entityrelationship.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_state.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
+share/icons/crystalsvg/22x22/actions/vcs_add.png
+share/icons/crystalsvg/22x22/actions/vcs_commit.png
+share/icons/crystalsvg/22x22/actions/vcs_diff.png
+share/icons/crystalsvg/22x22/actions/vcs_remove.png
+share/icons/crystalsvg/22x22/actions/vcs_status.png
+share/icons/crystalsvg/22x22/actions/vcs_update.png
+share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
+${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_add.png
+${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_branch.png
+${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_merge.png
+${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_remove.png
+${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_status.png
+${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_switch.png
+share/icons/crystalsvg/32x32/actions/vcs_add.png
+share/icons/crystalsvg/32x32/actions/vcs_commit.png
+share/icons/crystalsvg/32x32/actions/vcs_diff.png
+share/icons/crystalsvg/32x32/actions/vcs_remove.png
+share/icons/crystalsvg/32x32/actions/vcs_status.png
+share/icons/crystalsvg/32x32/actions/vcs_update.png
+share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
+${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_add.png
+${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_branch.png
+${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_merge.png
+${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_remove.png
+${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_status.png
+${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_switch.png
+share/icons/crystalsvg/48x48/actions/vcs_add.png
+share/icons/crystalsvg/48x48/actions/vcs_commit.png
+share/icons/crystalsvg/48x48/actions/vcs_diff.png
+share/icons/crystalsvg/48x48/actions/vcs_remove.png
+share/icons/crystalsvg/48x48/actions/vcs_status.png
+share/icons/crystalsvg/48x48/actions/vcs_update.png
+share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
+${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_add.png
+${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_branch.png
+${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_merge.png
+${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_remove.png
+${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_status.png
+${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_switch.png
+share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
+${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_add.svgz
+${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_branch.svgz
+${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_merge.svgz
+${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_remove.svgz
+${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_status.svgz
+${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_switch.svgz
+share/icons/crystalsvg/scalable/actions/vcs_add.svgz
+share/icons/crystalsvg/scalable/actions/vcs_commit.svgz
+share/icons/crystalsvg/scalable/actions/vcs_diff.svgz
+share/icons/crystalsvg/scalable/actions/vcs_remove.svgz
+share/icons/crystalsvg/scalable/actions/vcs_status.svgz
+share/icons/crystalsvg/scalable/actions/vcs_update.svgz
+share/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
+share/icons/hicolor/128x128/apps/kbugbuster.png
+share/icons/hicolor/128x128/apps/kompare.png
+share/icons/hicolor/128x128/apps/umbrello.png
+share/icons/hicolor/16x16/apps/catalogmanager.png
+share/icons/hicolor/16x16/apps/cervisia.png
+share/icons/hicolor/16x16/apps/kbabel.png
+share/icons/hicolor/16x16/apps/kbabeldict.png
+share/icons/hicolor/16x16/apps/kbugbuster.png
+share/icons/hicolor/16x16/apps/kompare.png
+share/icons/hicolor/16x16/apps/kuiviewer.png
+share/icons/hicolor/16x16/apps/umbrello.png
+share/icons/hicolor/16x16/mimetypes/umbrellofile.png
+share/icons/hicolor/22x22/apps/catalogmanager.png
+share/icons/hicolor/22x22/apps/cervisia.png
+share/icons/hicolor/22x22/apps/kbugbuster.png
+share/icons/hicolor/22x22/apps/kompare.png
+share/icons/hicolor/22x22/apps/umbrello.png
+share/icons/hicolor/32x32/apps/catalogmanager.png
+share/icons/hicolor/32x32/apps/cervisia.png
+share/icons/hicolor/32x32/apps/kbabel.png
+share/icons/hicolor/32x32/apps/kbabeldict.png
+share/icons/hicolor/32x32/apps/kbugbuster.png
+share/icons/hicolor/32x32/apps/kcachegrind.png
+share/icons/hicolor/32x32/apps/kompare.png
+share/icons/hicolor/32x32/apps/kuiviewer.png
+share/icons/hicolor/32x32/apps/umbrello.png
+share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+share/icons/hicolor/48x48/apps/catalogmanager.png
+share/icons/hicolor/48x48/apps/cervisia.png
+share/icons/hicolor/48x48/apps/kbabel.png
+share/icons/hicolor/48x48/apps/kbabeldict.png
+share/icons/hicolor/48x48/apps/kbugbuster.png
+share/icons/hicolor/48x48/apps/kcachegrind.png
+share/icons/hicolor/48x48/apps/kompare.png
+share/icons/hicolor/48x48/apps/kuiviewer.png
+share/icons/hicolor/48x48/apps/umbrello.png
+share/icons/hicolor/64x64/apps/kbugbuster.png
+share/icons/hicolor/64x64/apps/umbrello.png
+share/icons/hicolor/scalable/apps/kompare.svgz
+share/icons/hicolor/scalable/apps/umbrello.svgz
+share/icons/locolor/16x16/apps/catalogmanager.png
+share/icons/locolor/16x16/apps/kbabel.png
+share/icons/locolor/16x16/apps/kbabeldict.png
+share/icons/locolor/16x16/apps/kbugbuster.png
+share/icons/locolor/16x16/apps/kcachegrind.png
+share/icons/locolor/16x16/apps/kuiviewer.png
+share/icons/locolor/32x32/apps/catalogmanager.png
+share/icons/locolor/32x32/apps/kbabel.png
+share/icons/locolor/32x32/apps/kbabeldict.png
+share/icons/locolor/32x32/apps/kbugbuster.png
+share/icons/locolor/32x32/apps/kcachegrind.png
+share/icons/locolor/32x32/apps/kuiviewer.png
 share/kde/apps/catalogmanager/catalogmanagerui.rc
 share/kde/apps/cervisia/cervisiashellui.rc
 share/kde/apps/cervisia/eventsrc
@@ -709,154 +857,6 @@ share/kde/apps/umbrello/xmi2docbook.xsl
 share/kde/config.kcfg/cervisiapart.kcfg
 share/kde/config.kcfg/kbabel.kcfg
 share/kde/config.kcfg/kbprojectsettings.kcfg
-${HAVE_SVN}share/kde/icons/crystalsvg/128x128/actions/svn_add.png
-${HAVE_SVN}share/kde/icons/crystalsvg/128x128/actions/svn_branch.png
-${HAVE_SVN}share/kde/icons/crystalsvg/128x128/actions/svn_merge.png
-${HAVE_SVN}share/kde/icons/crystalsvg/128x128/actions/svn_remove.png
-${HAVE_SVN}share/kde/icons/crystalsvg/128x128/actions/svn_status.png
-${HAVE_SVN}share/kde/icons/crystalsvg/128x128/actions/svn_switch.png
-share/kde/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
-${HAVE_SVN}share/kde/icons/crystalsvg/16x16/actions/svn_add.png
-${HAVE_SVN}share/kde/icons/crystalsvg/16x16/actions/svn_branch.png
-${HAVE_SVN}share/kde/icons/crystalsvg/16x16/actions/svn_merge.png
-${HAVE_SVN}share/kde/icons/crystalsvg/16x16/actions/svn_remove.png
-${HAVE_SVN}share/kde/icons/crystalsvg/16x16/actions/svn_status.png
-${HAVE_SVN}share/kde/icons/crystalsvg/16x16/actions/svn_switch.png
-share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_activity.png
-share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_class.png
-share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
-share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_component.png
-share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
-share/kde/icons/crystalsvg/16x16/actions/umbrello_diagram_sequence.png
-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
-share/kde/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
-${HAVE_SVN}share/kde/icons/crystalsvg/22x22/actions/svn_add.png
-${HAVE_SVN}share/kde/icons/crystalsvg/22x22/actions/svn_branch.png
-${HAVE_SVN}share/kde/icons/crystalsvg/22x22/actions/svn_merge.png
-${HAVE_SVN}share/kde/icons/crystalsvg/22x22/actions/svn_remove.png
-${HAVE_SVN}share/kde/icons/crystalsvg/22x22/actions/svn_status.png
-${HAVE_SVN}share/kde/icons/crystalsvg/22x22/actions/svn_switch.png
-share/kde/icons/crystalsvg/22x22/actions/umbrello_diagram_activity.png
-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/mimetypes/umbrellofile.png
-${HAVE_SVN}share/kde/icons/crystalsvg/32x32/actions/svn_add.png
-${HAVE_SVN}share/kde/icons/crystalsvg/32x32/actions/svn_branch.png
-${HAVE_SVN}share/kde/icons/crystalsvg/32x32/actions/svn_merge.png
-${HAVE_SVN}share/kde/icons/crystalsvg/32x32/actions/svn_remove.png
-${HAVE_SVN}share/kde/icons/crystalsvg/32x32/actions/svn_status.png
-${HAVE_SVN}share/kde/icons/crystalsvg/32x32/actions/svn_switch.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
-share/kde/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
-${HAVE_SVN}share/kde/icons/crystalsvg/48x48/actions/svn_add.png
-${HAVE_SVN}share/kde/icons/crystalsvg/48x48/actions/svn_branch.png
-${HAVE_SVN}share/kde/icons/crystalsvg/48x48/actions/svn_merge.png
-${HAVE_SVN}share/kde/icons/crystalsvg/48x48/actions/svn_remove.png
-${HAVE_SVN}share/kde/icons/crystalsvg/48x48/actions/svn_status.png
-${HAVE_SVN}share/kde/icons/crystalsvg/48x48/actions/svn_switch.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
-share/kde/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
-${HAVE_SVN}share/kde/icons/crystalsvg/64x64/actions/svn_add.png
-${HAVE_SVN}share/kde/icons/crystalsvg/64x64/actions/svn_branch.png
-${HAVE_SVN}share/kde/icons/crystalsvg/64x64/actions/svn_merge.png
-${HAVE_SVN}share/kde/icons/crystalsvg/64x64/actions/svn_remove.png
-${HAVE_SVN}share/kde/icons/crystalsvg/64x64/actions/svn_status.png
-${HAVE_SVN}share/kde/icons/crystalsvg/64x64/actions/svn_switch.png
-share/kde/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
-${HAVE_SVN}share/kde/icons/crystalsvg/scalable/actions/svn_add.svgz
-${HAVE_SVN}share/kde/icons/crystalsvg/scalable/actions/svn_branch.svgz
-${HAVE_SVN}share/kde/icons/crystalsvg/scalable/actions/svn_merge.svgz
-${HAVE_SVN}share/kde/icons/crystalsvg/scalable/actions/svn_remove.svgz
-${HAVE_SVN}share/kde/icons/crystalsvg/scalable/actions/svn_status.svgz
-${HAVE_SVN}share/kde/icons/crystalsvg/scalable/actions/svn_switch.svgz
-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
-share/kde/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-share/kde/icons/hicolor/128x128/apps/kbugbuster.png
-share/kde/icons/hicolor/128x128/apps/kompare.png
-share/kde/icons/hicolor/128x128/apps/umbrello.png
-share/kde/icons/hicolor/16x16/apps/catalogmanager.png
-share/kde/icons/hicolor/16x16/apps/cervisia.png
-share/kde/icons/hicolor/16x16/apps/kbabel.png
-share/kde/icons/hicolor/16x16/apps/kbabeldict.png
-share/kde/icons/hicolor/16x16/apps/kbugbuster.png
-share/kde/icons/hicolor/16x16/apps/kompare.png
-share/kde/icons/hicolor/16x16/apps/kuiviewer.png
-share/kde/icons/hicolor/16x16/apps/umbrello.png
-share/kde/icons/hicolor/16x16/mimetypes/umbrellofile.png
-share/kde/icons/hicolor/22x22/apps/catalogmanager.png
-share/kde/icons/hicolor/22x22/apps/cervisia.png
-share/kde/icons/hicolor/22x22/apps/kbugbuster.png
-share/kde/icons/hicolor/22x22/apps/kompare.png
-share/kde/icons/hicolor/22x22/apps/umbrello.png
-share/kde/icons/hicolor/32x32/apps/catalogmanager.png
-share/kde/icons/hicolor/32x32/apps/cervisia.png
-share/kde/icons/hicolor/32x32/apps/kbabel.png
-share/kde/icons/hicolor/32x32/apps/kbabeldict.png
-share/kde/icons/hicolor/32x32/apps/kbugbuster.png
-share/kde/icons/hicolor/32x32/apps/kcachegrind.png
-share/kde/icons/hicolor/32x32/apps/kompare.png
-share/kde/icons/hicolor/32x32/apps/kuiviewer.png
-share/kde/icons/hicolor/32x32/apps/umbrello.png
-share/kde/icons/hicolor/32x32/mimetypes/umbrellofile.png
-share/kde/icons/hicolor/48x48/apps/catalogmanager.png
-share/kde/icons/hicolor/48x48/apps/cervisia.png
-share/kde/icons/hicolor/48x48/apps/kbabel.png
-share/kde/icons/hicolor/48x48/apps/kbabeldict.png
-share/kde/icons/hicolor/48x48/apps/kbugbuster.png
-share/kde/icons/hicolor/48x48/apps/kcachegrind.png
-share/kde/icons/hicolor/48x48/apps/kompare.png
-share/kde/icons/hicolor/48x48/apps/kuiviewer.png
-share/kde/icons/hicolor/48x48/apps/umbrello.png
-share/kde/icons/hicolor/64x64/apps/kbugbuster.png
-share/kde/icons/hicolor/64x64/apps/umbrello.png
-share/kde/icons/hicolor/scalable/apps/kompare.svgz
-share/kde/icons/hicolor/scalable/apps/umbrello.svgz
-share/kde/icons/locolor/16x16/apps/catalogmanager.png
-share/kde/icons/locolor/16x16/apps/kbabel.png
-share/kde/icons/locolor/16x16/apps/kbabeldict.png
-share/kde/icons/locolor/16x16/apps/kbugbuster.png
-share/kde/icons/locolor/16x16/apps/kcachegrind.png
-share/kde/icons/locolor/16x16/apps/kuiviewer.png
-share/kde/icons/locolor/32x32/apps/catalogmanager.png
-share/kde/icons/locolor/32x32/apps/kbabel.png
-share/kde/icons/locolor/32x32/apps/kbabeldict.png
-share/kde/icons/locolor/32x32/apps/kbugbuster.png
-share/kde/icons/locolor/32x32/apps/kcachegrind.png
-share/kde/icons/locolor/32x32/apps/kuiviewer.png
 share/kde/mimelnk/application/x-kcachegrind.desktop
 share/kde/mimelnk/application/x-umbrello.desktop
 share/kde/services/cvsservice.desktop
@@ -908,40 +908,6 @@ share/kde/servicetypes/kompareviewpart.desktop
 @comment in kde: @dirrm share/kde/services/kded
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/locolor/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/locolor/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/actions
 @comment in kde: @dirrm share/kde/config.kcfg
 @dirrm share/kde/apps/umbrello/pics
 @dirrm share/kde/apps/umbrello/headings
@@ -999,6 +965,40 @@ share/kde/servicetypes/kompareviewpart.desktop
 @dirrm share/kde/apps/cervisia
 @dirrm share/kde/apps/catalogmanager
 @comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/icons/locolor/32x32/mimetypes
+@comment in kde: @dirrm share/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/icons/locolor/16x16/mimetypes
+@comment in kde: @dirrm share/icons/locolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in kde: @dirrm share/icons/crystalsvg/scalable/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/scalable/apps
+@comment in kde: @dirrm share/icons/crystalsvg/scalable/actions
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/actions
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/actions
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/apps
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/apps
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/actions
 @dirrm share/doc/kde/HTML/en/umbrello
 @dirrm share/doc/kde/HTML/en/kompare
 @dirrm share/doc/kde/HTML/en/kdesvn-build
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 41236445c98..19cc695466e 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.30 2006/10/18 08:24:55 markd Exp $
+$NetBSD: distinfo,v 1.31 2007/01/26 03:28:08 markd Exp $
 
-SHA1 (kdesdk-3.5.5.tar.bz2) = 0994e8eef41ab4e0237a78f1c761d7133998a712
-RMD160 (kdesdk-3.5.5.tar.bz2) = 6151d938607bdd31f69ab1ca78ec7aec7bb14187
-Size (kdesdk-3.5.5.tar.bz2) = 5043560 bytes
+SHA1 (kdesdk-3.5.6.tar.bz2) = 5c1f3478b72fde8b117d9458072d471eb8be5cbe
+RMD160 (kdesdk-3.5.6.tar.bz2) = 96e96a0ca87aadf8940ceb1dfead385503096a4f
+Size (kdesdk-3.5.6.tar.bz2) = 5046602 bytes
 SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1
 SHA1 (patch-ab) = 436454d5f54cdf783a5a1cb3d70a2e8398695f60
 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307
+SHA1 (patch-ad) = 9f8b6869ac5e107047c65230a52a88cfc31f71f4
+SHA1 (patch-ae) = 104cc8b3aba94d82a6df2a5366292eff59b31b52
diff --git a/devel/kdesdk3/options.mk b/devel/kdesdk3/options.mk
new file mode 100644
index 00000000000..e7796dc781d
--- /dev/null
+++ b/devel/kdesdk3/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2007/01/26 03:28:08 markd Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdesdk
+PKG_SUPPORTED_OPTIONS=	svn
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msvn)
+.include "../../devel/subversion-base/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-svn-include="${BUILDLINK_PREFIX.subversion-base}/include"
+CONFIGURE_ARGS+=	--with-svn-lib="${BUILDLINK_PREFIX.subversion-base}/lib"
+PLIST_SUBST+=		HAVE_SVN=""
+.else
+CONFIGURE_ARGS+=	--with-subversion=no
+PLIST_SUBST+=		HAVE_SVN="@comment "
+.endif
diff --git a/devel/kdesdk3/patches/patch-ad b/devel/kdesdk3/patches/patch-ad
new file mode 100644
index 00000000000..156046e0b81
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.5 2007/01/26 03:28:08 markd Exp $
+
+kde svn patch 624935
+
+--- kbabel/catalogmanager/libsvn/svnhandler.cpp.orig	2007-01-20 23:56:24.000000000 +1300
++++ kbabel/catalogmanager/libsvn/svnhandler.cpp
+@@ -148,7 +148,7 @@ SVNHandler::FileStatus SVNHandler::fstat
+   QDomElement entry, wcStatus;
+ 
+   // Parse the output.
+-  if ( !doc.setContent( out.output(), &errorMsg, &errorLine, &errorCol ) ) {
++  if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
+     kdDebug(8109) << "Cannot parse \"svn status -v --xml\" output for"
+         << filename << endl << "Line: " << errorLine << " Column: "
+         << errorCol << " Error: " << errorMsg << endl;
diff --git a/devel/kdesdk3/patches/patch-ae b/devel/kdesdk3/patches/patch-ae
new file mode 100644
index 00000000000..92d00c36cfb
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.3 2007/01/26 03:28:08 markd Exp $
+
+kde svn patch 624935
+
+--- kbabel/catalogmanager/libsvn/svnhandler.h.orig	2007-01-20 23:57:12.000000000 +1300
++++ kbabel/catalogmanager/libsvn/svnhandler.h
+@@ -120,9 +120,9 @@ class SVNOutputCollector: public QObject
+   SVNOutputCollector( KProcess* );
+   void setProcess( KProcess* );
+ 
+-  const QString& output() const { return m_gatheredOutput; }
+-  const QString& stderr() const { return m_stderrOutput; }
+-  const QString& stdout() const { return m_stdoutOutput; }
++  const QString& getOutput() const { return m_gatheredOutput; }
++  const QString& getStderr() const { return m_stderrOutput; }
++  const QString& getStdout() const { return m_stdoutOutput; }
+ 
+  private slots:
+   void slotGatherStderr( KProcess*, char*, int );