Update to KDE 3.5.0

9 files changed, 381 insertions, 131 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 77206f3..2fe3c5a 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -33,12 +33,12 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-CONFIGURE_ARGS+=--with-db-include-dir=/usr/local/include/db4 \
-		--with-db-lib-dir=/usr/local/lib --with-db-name=db4 \
+CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \
+		--with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \
 		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
 		--with-apu-config=${LOCALBASE}/bin/apu-1-config
 
-MAN1=		cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 noncvslist.1
+MAN1=		cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 kdesvn-build.1 noncvslist.1
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 9916970..6cabb58 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdesdk-3.4.3.tar.bz2) = d0d51c35769709b00b2ff7d59ed90631
-SIZE (KDE/kdesdk-3.4.3.tar.bz2) = 4584263
+MD5 (KDE/kdesdk-3.5.0.tar.bz2) = dc91ffcfa8114cf4f9d40bc9ffe47d97
+SHA256 (KDE/kdesdk-3.5.0.tar.bz2) = d8562422c6b7bd7992bd3e049d194cb9620f3499911c256a11b3ad0cb0400214
+SIZE (KDE/kdesdk-3.5.0.tar.bz2) = 4832117
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 4192d9b..214dc69 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -3,9 +3,11 @@ bin/build-progress.sh
 bin/catalogmanager
 bin/cervisia
 bin/cheatmake
+bin/colorsvn
 bin/create_cvsignore
 bin/create_makefile
 bin/create_makefiles
+bin/create_svnignore
 bin/cvs-clean
 bin/cvs2dist
 bin/cvsaskpass
@@ -38,12 +40,19 @@ bin/kdedoc
 bin/kdekillall
 bin/kdelnk2desktop.py
 bin/kdemangen.pl
+bin/kdesvn-build
+bin/kio_svn_helper
 bin/kompare
 bin/kuiviewer
+bin/kunittest
+bin/kunittest_debughelper
+bin/kunittestguimodrunner
+bin/kunittestmod
 bin/licensecheck
 bin/makeobj
 bin/memprof2calltree
 bin/noncvslist
+bin/nonsvnlist
 bin/op2calltree
 bin/package_crystalsvg
 bin/png2mng.pl
@@ -52,6 +61,17 @@ bin/pprof2calltree
 bin/pruneemptydirs
 bin/qtdoc
 bin/split2po
+bin/svn-clean
+bin/svn2dist
+bin/svnaddcurrentdir
+bin/svnbackport
+bin/svnchangesince
+bin/svnforwardport
+bin/svngettags
+bin/svnlastchange
+bin/svnlastlog
+bin/svnrevertlast
+bin/svnversions
 bin/swappo
 bin/transxx
 bin/umbrello
@@ -82,6 +102,7 @@ include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
 include/kprofilemethod.h
 include/kspy.h
+include/kunittest/runnergui.h
 include/repository_stub.h
 lib/kde3/cervisia.la
 lib/kde3/cervisia.so
@@ -115,6 +136,8 @@ lib/kde3/kbabel_pluraltool.la
 lib/kde3/kbabel_pluraltool.so
 lib/kde3/kbabel_punctuationtool.la
 lib/kde3/kbabel_punctuationtool.so
+lib/kde3/kbabel_regexptool.la
+lib/kde3/kbabel_regexptool.so
 lib/kde3/kbabel_setfuzzytool.la
 lib/kde3/kbabel_setfuzzytool.so
 lib/kde3/kbabel_whitespacetool.la
@@ -180,6 +203,9 @@ lib/libkompareinterface.so.0
 lib/libkspy.la
 lib/libkspy.so
 lib/libkspy.so.3
+lib/libkunittestgui.la
+lib/libkunittestgui.so
+lib/libkunittestgui.so.0
 share/applications/kde/catalogmanager.desktop
 share/applications/kde/cervisia.desktop
 share/applications/kde/kbabel.desktop
@@ -210,12 +236,12 @@ share/apps/kapptemplate/admin/config.pl
 share/apps/kapptemplate/admin/config.sub
 share/apps/kapptemplate/admin/configure.in.bot.end
 share/apps/kapptemplate/admin/configure.in.min
-share/apps/kapptemplate/admin/cvs-clean.pl
 share/apps/kapptemplate/admin/cvs.sh
 share/apps/kapptemplate/admin/debianrules
 share/apps/kapptemplate/admin/depcomp
 share/apps/kapptemplate/admin/deps.am
-share/apps/kapptemplate/admin/detect-autoconf.sh
+share/apps/kapptemplate/admin/detect-autoconf.pl
+share/apps/kapptemplate/admin/doxygen.sh
 share/apps/kapptemplate/admin/install-sh
 share/apps/kapptemplate/admin/libtool.m4.in
 share/apps/kapptemplate/admin/ltmain.sh
@@ -307,6 +333,7 @@ share/apps/kapptemplate/kpartplugin/plugin-Makefile.am
 share/apps/kapptemplate/kpartplugin/plugin_app.cpp
 share/apps/kapptemplate/kpartplugin/plugin_app.h
 share/apps/kapptemplate/kpartplugin/plugin_app.rc
+share/apps/katepart/syntax/kdesvn-buildrc.xml
 share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
 share/apps/kbabel/icons/hicolor/16x16/actions/diff.png
@@ -450,6 +477,7 @@ share/apps/kbabel/pics/noflag.png
 share/apps/kbabel/pics/ok.png
 share/apps/kbabel/pics/pref_identity.png
 share/apps/kbabel/pics/splash.png
+share/apps/kbabel/regexplist.xml
 share/apps/kbugbuster/kbugbusterui.rc
 share/apps/kbugbuster/pics/bars.png
 share/apps/kbugbuster/pics/logo.png
@@ -467,11 +495,14 @@ share/apps/kconf_update/cervisia-change_repos_list.pl
 share/apps/kconf_update/cervisia-normalize_cvsroot.pl
 share/apps/kconf_update/cervisia.upd
 share/apps/kconf_update/change_colors.pl
+share/apps/kconf_update/kbabel-difftoproject.upd
 share/apps/kconf_update/kbabel-project.upd
 share/apps/kconf_update/kbabel-projectrename.upd
 share/apps/kconf_update/move_repositories.pl
 share/apps/kompare/komparepartui.rc
 share/apps/kompare/kompareui.rc
+share/apps/konqueror/servicemenus/subversion.desktop
+share/apps/konqueror/servicemenus/subversion_toplevel.desktop
 share/apps/kstyle/themes/scheck.themerc
 share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
@@ -487,10 +518,15 @@ share/apps/umbrello/headings/heading.js
 share/apps/umbrello/headings/heading.php
 share/apps/umbrello/headings/heading.pm
 share/apps/umbrello/headings/heading.py
+share/apps/umbrello/headings/heading.rb
 share/apps/umbrello/headings/heading.sql
 share/apps/umbrello/headings/heading.xsd
 share/apps/umbrello/pics/CVglobal_meth.png
 share/apps/umbrello/pics/CVglobal_var.png
+share/apps/umbrello/pics/CVimplementation_meth.png
+share/apps/umbrello/pics/CVimplementation_signal.png
+share/apps/umbrello/pics/CVimplementation_slot.png
+share/apps/umbrello/pics/CVimplementation_var.png
 share/apps/umbrello/pics/CVnamespace.png
 share/apps/umbrello/pics/CVprivate_meth.png
 share/apps/umbrello/pics/CVprivate_signal.png
@@ -514,11 +550,14 @@ share/apps/umbrello/pics/align_right.png
 share/apps/umbrello/pics/align_top.png
 share/apps/umbrello/pics/align_vert_middle.png
 share/apps/umbrello/pics/anchor.png
+share/apps/umbrello/pics/andline.png
 share/apps/umbrello/pics/arrow.png
 share/apps/umbrello/pics/artifact.png
 share/apps/umbrello/pics/association.png
 share/apps/umbrello/pics/box.png
 share/apps/umbrello/pics/branch.png
+share/apps/umbrello/pics/choice-rhomb.png
+share/apps/umbrello/pics/choice-round.png
 share/apps/umbrello/pics/class.png
 share/apps/umbrello/pics/component.png
 share/apps/umbrello/pics/composition.png
@@ -526,23 +565,29 @@ share/apps/umbrello/pics/containment.png
 share/apps/umbrello/pics/cursor-actor.png
 share/apps/umbrello/pics/cursor-aggregation.png
 share/apps/umbrello/pics/cursor-anchor.png
+share/apps/umbrello/pics/cursor-andline.png
 share/apps/umbrello/pics/cursor-artifact.png
 share/apps/umbrello/pics/cursor-association.png
 share/apps/umbrello/pics/cursor-box.png
 share/apps/umbrello/pics/cursor-branch.png
+share/apps/umbrello/pics/cursor-choice-rhomb.png
+share/apps/umbrello/pics/cursor-choice-round.png
 share/apps/umbrello/pics/cursor-class.png
 share/apps/umbrello/pics/cursor-component.png
 share/apps/umbrello/pics/cursor-composition.png
 share/apps/umbrello/pics/cursor-containment.png
 share/apps/umbrello/pics/cursor-datatype.png
+share/apps/umbrello/pics/cursor-deep-history.png
 share/apps/umbrello/pics/cursor-dependency.png
-share/apps/umbrello/pics/cursor-end-state.png
+share/apps/umbrello/pics/cursor-end_state.png
 share/apps/umbrello/pics/cursor-entity.png
 share/apps/umbrello/pics/cursor-enum.png
 share/apps/umbrello/pics/cursor-fork.png
 share/apps/umbrello/pics/cursor-generalisation.png
-share/apps/umbrello/pics/cursor-initial-state.png
+share/apps/umbrello/pics/cursor-initial_state.png
 share/apps/umbrello/pics/cursor-interface.png
+share/apps/umbrello/pics/cursor-join.png
+share/apps/umbrello/pics/cursor-junction.png
 share/apps/umbrello/pics/cursor-message-asynchronous.png
 share/apps/umbrello/pics/cursor-message-synchronous.png
 share/apps/umbrello/pics/cursor-node.png
@@ -550,10 +595,13 @@ share/apps/umbrello/pics/cursor-note.png
 share/apps/umbrello/pics/cursor-object.png
 share/apps/umbrello/pics/cursor-package.png
 share/apps/umbrello/pics/cursor-relationship.png
+share/apps/umbrello/pics/cursor-shallow-history.png
+share/apps/umbrello/pics/cursor-state-fork.png
 share/apps/umbrello/pics/cursor-text.png
 share/apps/umbrello/pics/cursor-uniassociation.png
 share/apps/umbrello/pics/cursor-usecase.png
 share/apps/umbrello/pics/datatype.png
+share/apps/umbrello/pics/deep-history.png
 share/apps/umbrello/pics/dependency.png
 share/apps/umbrello/pics/end_state.png
 share/apps/umbrello/pics/entity.png
@@ -562,6 +610,8 @@ share/apps/umbrello/pics/fork.png
 share/apps/umbrello/pics/generalisation.png
 share/apps/umbrello/pics/initial_state.png
 share/apps/umbrello/pics/interface.png
+share/apps/umbrello/pics/join.png
+share/apps/umbrello/pics/junction.png
 share/apps/umbrello/pics/message-asynchronous.png
 share/apps/umbrello/pics/message-synchronous.png
 share/apps/umbrello/pics/node.png
@@ -569,7 +619,9 @@ share/apps/umbrello/pics/note.png
 share/apps/umbrello/pics/object.png
 share/apps/umbrello/pics/package.png
 share/apps/umbrello/pics/relationship.png
+share/apps/umbrello/pics/shallow-history.png
 share/apps/umbrello/pics/startlogo.png
+share/apps/umbrello/pics/state-fork.png
 share/apps/umbrello/pics/template.png
 share/apps/umbrello/pics/text.png
 share/apps/umbrello/pics/uniassociation.png
@@ -653,6 +705,9 @@ share/doc/HTML/en/kbugbuster/index.docbook
 share/doc/HTML/en/kcachegrind/common
 share/doc/HTML/en/kcachegrind/index.cache.bz2
 share/doc/HTML/en/kcachegrind/index.docbook
+share/doc/HTML/en/kdesvn-build/common
+share/doc/HTML/en/kdesvn-build/index.cache.bz2
+share/doc/HTML/en/kdesvn-build/index.docbook
 share/doc/HTML/en/kompare/common
 share/doc/HTML/en/kompare/index.cache.bz2
 share/doc/HTML/en/kompare/index.docbook
@@ -684,10 +739,19 @@ share/doc/HTML/en/umbrello/umbrello-ui.png
 share/doc/HTML/en/umbrello/uml_basics.docbook
 share/doc/HTML/en/umbrello/use-case-diagram.png
 share/doc/HTML/en/umbrello/working_with_umbrello.docbook
-share/icons/crystalsvg/128x128/apps/kbugbuster.png
-share/icons/crystalsvg/128x128/apps/kompare.png
-share/icons/crystalsvg/128x128/apps/umbrello.png
+share/icons/crystalsvg/128x128/actions/svn_add.png
+share/icons/crystalsvg/128x128/actions/svn_branch.png
+share/icons/crystalsvg/128x128/actions/svn_merge.png
+share/icons/crystalsvg/128x128/actions/svn_remove.png
+share/icons/crystalsvg/128x128/actions/svn_status.png
+share/icons/crystalsvg/128x128/actions/svn_switch.png
 share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
+share/icons/crystalsvg/16x16/actions/svn_add.png
+share/icons/crystalsvg/16x16/actions/svn_branch.png
+share/icons/crystalsvg/16x16/actions/svn_merge.png
+share/icons/crystalsvg/16x16/actions/svn_remove.png
+share/icons/crystalsvg/16x16/actions/svn_status.png
+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
@@ -702,14 +766,13 @@ 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/apps/catalogmanager.png
-share/icons/crystalsvg/16x16/apps/cervisia.png
-share/icons/crystalsvg/16x16/apps/kbabel.png
-share/icons/crystalsvg/16x16/apps/kbabeldict.png
-share/icons/crystalsvg/16x16/apps/kbugbuster.png
-share/icons/crystalsvg/16x16/apps/kompare.png
-share/icons/crystalsvg/16x16/apps/umbrello.png
 share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
+share/icons/crystalsvg/22x22/actions/svn_add.png
+share/icons/crystalsvg/22x22/actions/svn_branch.png
+share/icons/crystalsvg/22x22/actions/svn_merge.png
+share/icons/crystalsvg/22x22/actions/svn_remove.png
+share/icons/crystalsvg/22x22/actions/svn_status.png
+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
@@ -725,76 +788,105 @@ 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/apps/catalogmanager.png
-share/icons/crystalsvg/22x22/apps/cervisia.png
-share/icons/crystalsvg/22x22/apps/kbugbuster.png
-share/icons/crystalsvg/22x22/apps/umbrello.png
 share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
+share/icons/crystalsvg/32x32/actions/svn_add.png
+share/icons/crystalsvg/32x32/actions/svn_branch.png
+share/icons/crystalsvg/32x32/actions/svn_merge.png
+share/icons/crystalsvg/32x32/actions/svn_remove.png
+share/icons/crystalsvg/32x32/actions/svn_status.png
+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/apps/catalogmanager.png
-share/icons/crystalsvg/32x32/apps/cervisia.png
-share/icons/crystalsvg/32x32/apps/kbabel.png
-share/icons/crystalsvg/32x32/apps/kbabeldict.png
-share/icons/crystalsvg/32x32/apps/kbugbuster.png
-share/icons/crystalsvg/32x32/apps/kompare.png
-share/icons/crystalsvg/32x32/apps/umbrello.png
 share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
+share/icons/crystalsvg/48x48/actions/svn_add.png
+share/icons/crystalsvg/48x48/actions/svn_branch.png
+share/icons/crystalsvg/48x48/actions/svn_merge.png
+share/icons/crystalsvg/48x48/actions/svn_remove.png
+share/icons/crystalsvg/48x48/actions/svn_status.png
+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/apps/catalogmanager.png
-share/icons/crystalsvg/48x48/apps/cervisia.png
-share/icons/crystalsvg/48x48/apps/kbabel.png
-share/icons/crystalsvg/48x48/apps/kbabeldict.png
-share/icons/crystalsvg/48x48/apps/kbugbuster.png
-share/icons/crystalsvg/48x48/apps/kompare.png
-share/icons/crystalsvg/48x48/apps/umbrello.png
 share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
-share/icons/crystalsvg/64x64/apps/kbugbuster.png
-share/icons/crystalsvg/64x64/apps/umbrello.png
+share/icons/crystalsvg/64x64/actions/svn_add.png
+share/icons/crystalsvg/64x64/actions/svn_branch.png
+share/icons/crystalsvg/64x64/actions/svn_merge.png
+share/icons/crystalsvg/64x64/actions/svn_remove.png
+share/icons/crystalsvg/64x64/actions/svn_status.png
+share/icons/crystalsvg/64x64/actions/svn_switch.png
 share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
+share/icons/crystalsvg/scalable/actions/svn_add.svgz
+share/icons/crystalsvg/scalable/actions/svn_branch.svgz
+share/icons/crystalsvg/scalable/actions/svn_merge.svgz
+share/icons/crystalsvg/scalable/actions/svn_remove.svgz
+share/icons/crystalsvg/scalable/actions/svn_status.svgz
+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/apps/kompare.svgz
-share/icons/crystalsvg/scalable/apps/umbrello.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/16x16/apps/umbrello.png
-share/icons/locolor/16x16/mimetypes/umbrellofile.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/icons/locolor/32x32/apps/umbrello.png
-share/icons/locolor/32x32/mimetypes/umbrellofile.png
 share/mimelnk/application/x-kcachegrind.desktop
 share/mimelnk/application/x-umbrello.desktop
 share/services/cvsservice.desktop
@@ -812,6 +904,7 @@ share/services/kbabel_linguist_import.desktop
 share/services/kbabel_nottranslatedtool.desktop
 share/services/kbabel_pluralformstool.desktop
 share/services/kbabel_punctuationtool.desktop
+share/services/kbabel_regexptool.desktop
 share/services/kbabel_setfuzzytool.desktop
 share/services/kbabel_whitespacetool.desktop
 share/services/kbabel_xliff_export.desktop
@@ -843,6 +936,7 @@ share/servicetypes/komparenavigationpart.desktop
 share/servicetypes/kompareviewpart.desktop
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/kompare
+@dirrm share/doc/HTML/en/kdesvn-build
 @dirrm share/doc/HTML/en/kcachegrind
 @dirrm share/doc/HTML/en/kbugbuster
 @dirrm share/doc/HTML/en/kbabel
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 77206f3..2fe3c5a 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -33,12 +33,12 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-CONFIGURE_ARGS+=--with-db-include-dir=/usr/local/include/db4 \
-		--with-db-lib-dir=/usr/local/lib --with-db-name=db4 \
+CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \
+		--with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \
 		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
 		--with-apu-config=${LOCALBASE}/bin/apu-1-config
 
-MAN1=		cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 noncvslist.1
+MAN1=		cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 kdesvn-build.1 noncvslist.1
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 9916970..6cabb58 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdesdk-3.4.3.tar.bz2) = d0d51c35769709b00b2ff7d59ed90631
-SIZE (KDE/kdesdk-3.4.3.tar.bz2) = 4584263
+MD5 (KDE/kdesdk-3.5.0.tar.bz2) = dc91ffcfa8114cf4f9d40bc9ffe47d97
+SHA256 (KDE/kdesdk-3.5.0.tar.bz2) = d8562422c6b7bd7992bd3e049d194cb9620f3499911c256a11b3ad0cb0400214
+SIZE (KDE/kdesdk-3.5.0.tar.bz2) = 4832117
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 4192d9b..214dc69 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -3,9 +3,11 @@ bin/build-progress.sh
 bin/catalogmanager
 bin/cervisia
 bin/cheatmake
+bin/colorsvn
 bin/create_cvsignore
 bin/create_makefile
 bin/create_makefiles
+bin/create_svnignore
 bin/cvs-clean
 bin/cvs2dist
 bin/cvsaskpass
@@ -38,12 +40,19 @@ bin/kdedoc
 bin/kdekillall
 bin/kdelnk2desktop.py
 bin/kdemangen.pl
+bin/kdesvn-build
+bin/kio_svn_helper
 bin/kompare
 bin/kuiviewer
+bin/kunittest
+bin/kunittest_debughelper
+bin/kunittestguimodrunner
+bin/kunittestmod
 bin/licensecheck
 bin/makeobj
 bin/memprof2calltree
 bin/noncvslist
+bin/nonsvnlist
 bin/op2calltree
 bin/package_crystalsvg
 bin/png2mng.pl
@@ -52,6 +61,17 @@ bin/pprof2calltree
 bin/pruneemptydirs
 bin/qtdoc
 bin/split2po
+bin/svn-clean
+bin/svn2dist
+bin/svnaddcurrentdir
+bin/svnbackport
+bin/svnchangesince
+bin/svnforwardport
+bin/svngettags
+bin/svnlastchange
+bin/svnlastlog
+bin/svnrevertlast
+bin/svnversions
 bin/swappo
 bin/transxx
 bin/umbrello
@@ -82,6 +102,7 @@ include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
 include/kprofilemethod.h
 include/kspy.h
+include/kunittest/runnergui.h
 include/repository_stub.h
 lib/kde3/cervisia.la
 lib/kde3/cervisia.so
@@ -115,6 +136,8 @@ lib/kde3/kbabel_pluraltool.la
 lib/kde3/kbabel_pluraltool.so
 lib/kde3/kbabel_punctuationtool.la
 lib/kde3/kbabel_punctuationtool.so
+lib/kde3/kbabel_regexptool.la
+lib/kde3/kbabel_regexptool.so
 lib/kde3/kbabel_setfuzzytool.la
 lib/kde3/kbabel_setfuzzytool.so
 lib/kde3/kbabel_whitespacetool.la
@@ -180,6 +203,9 @@ lib/libkompareinterface.so.0
 lib/libkspy.la
 lib/libkspy.so
 lib/libkspy.so.3
+lib/libkunittestgui.la
+lib/libkunittestgui.so
+lib/libkunittestgui.so.0
 share/applications/kde/catalogmanager.desktop
 share/applications/kde/cervisia.desktop
 share/applications/kde/kbabel.desktop
@@ -210,12 +236,12 @@ share/apps/kapptemplate/admin/config.pl
 share/apps/kapptemplate/admin/config.sub
 share/apps/kapptemplate/admin/configure.in.bot.end
 share/apps/kapptemplate/admin/configure.in.min
-share/apps/kapptemplate/admin/cvs-clean.pl
 share/apps/kapptemplate/admin/cvs.sh
 share/apps/kapptemplate/admin/debianrules
 share/apps/kapptemplate/admin/depcomp
 share/apps/kapptemplate/admin/deps.am
-share/apps/kapptemplate/admin/detect-autoconf.sh
+share/apps/kapptemplate/admin/detect-autoconf.pl
+share/apps/kapptemplate/admin/doxygen.sh
 share/apps/kapptemplate/admin/install-sh
 share/apps/kapptemplate/admin/libtool.m4.in
 share/apps/kapptemplate/admin/ltmain.sh
@@ -307,6 +333,7 @@ share/apps/kapptemplate/kpartplugin/plugin-Makefile.am
 share/apps/kapptemplate/kpartplugin/plugin_app.cpp
 share/apps/kapptemplate/kpartplugin/plugin_app.h
 share/apps/kapptemplate/kpartplugin/plugin_app.rc
+share/apps/katepart/syntax/kdesvn-buildrc.xml
 share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
 share/apps/kbabel/icons/hicolor/16x16/actions/diff.png
@@ -450,6 +477,7 @@ share/apps/kbabel/pics/noflag.png
 share/apps/kbabel/pics/ok.png
 share/apps/kbabel/pics/pref_identity.png
 share/apps/kbabel/pics/splash.png
+share/apps/kbabel/regexplist.xml
 share/apps/kbugbuster/kbugbusterui.rc
 share/apps/kbugbuster/pics/bars.png
 share/apps/kbugbuster/pics/logo.png
@@ -467,11 +495,14 @@ share/apps/kconf_update/cervisia-change_repos_list.pl
 share/apps/kconf_update/cervisia-normalize_cvsroot.pl
 share/apps/kconf_update/cervisia.upd
 share/apps/kconf_update/change_colors.pl
+share/apps/kconf_update/kbabel-difftoproject.upd
 share/apps/kconf_update/kbabel-project.upd
 share/apps/kconf_update/kbabel-projectrename.upd
 share/apps/kconf_update/move_repositories.pl
 share/apps/kompare/komparepartui.rc
 share/apps/kompare/kompareui.rc
+share/apps/konqueror/servicemenus/subversion.desktop
+share/apps/konqueror/servicemenus/subversion_toplevel.desktop
 share/apps/kstyle/themes/scheck.themerc
 share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
@@ -487,10 +518,15 @@ share/apps/umbrello/headings/heading.js
 share/apps/umbrello/headings/heading.php
 share/apps/umbrello/headings/heading.pm
 share/apps/umbrello/headings/heading.py
+share/apps/umbrello/headings/heading.rb
 share/apps/umbrello/headings/heading.sql
 share/apps/umbrello/headings/heading.xsd
 share/apps/umbrello/pics/CVglobal_meth.png
 share/apps/umbrello/pics/CVglobal_var.png
+share/apps/umbrello/pics/CVimplementation_meth.png
+share/apps/umbrello/pics/CVimplementation_signal.png
+share/apps/umbrello/pics/CVimplementation_slot.png
+share/apps/umbrello/pics/CVimplementation_var.png
 share/apps/umbrello/pics/CVnamespace.png
 share/apps/umbrello/pics/CVprivate_meth.png
 share/apps/umbrello/pics/CVprivate_signal.png
@@ -514,11 +550,14 @@ share/apps/umbrello/pics/align_right.png
 share/apps/umbrello/pics/align_top.png
 share/apps/umbrello/pics/align_vert_middle.png
 share/apps/umbrello/pics/anchor.png
+share/apps/umbrello/pics/andline.png
 share/apps/umbrello/pics/arrow.png
 share/apps/umbrello/pics/artifact.png
 share/apps/umbrello/pics/association.png
 share/apps/umbrello/pics/box.png
 share/apps/umbrello/pics/branch.png
+share/apps/umbrello/pics/choice-rhomb.png
+share/apps/umbrello/pics/choice-round.png
 share/apps/umbrello/pics/class.png
 share/apps/umbrello/pics/component.png
 share/apps/umbrello/pics/composition.png
@@ -526,23 +565,29 @@ share/apps/umbrello/pics/containment.png
 share/apps/umbrello/pics/cursor-actor.png
 share/apps/umbrello/pics/cursor-aggregation.png
 share/apps/umbrello/pics/cursor-anchor.png
+share/apps/umbrello/pics/cursor-andline.png
 share/apps/umbrello/pics/cursor-artifact.png
 share/apps/umbrello/pics/cursor-association.png
 share/apps/umbrello/pics/cursor-box.png
 share/apps/umbrello/pics/cursor-branch.png
+share/apps/umbrello/pics/cursor-choice-rhomb.png
+share/apps/umbrello/pics/cursor-choice-round.png
 share/apps/umbrello/pics/cursor-class.png
 share/apps/umbrello/pics/cursor-component.png
 share/apps/umbrello/pics/cursor-composition.png
 share/apps/umbrello/pics/cursor-containment.png
 share/apps/umbrello/pics/cursor-datatype.png
+share/apps/umbrello/pics/cursor-deep-history.png
 share/apps/umbrello/pics/cursor-dependency.png
-share/apps/umbrello/pics/cursor-end-state.png
+share/apps/umbrello/pics/cursor-end_state.png
 share/apps/umbrello/pics/cursor-entity.png
 share/apps/umbrello/pics/cursor-enum.png
 share/apps/umbrello/pics/cursor-fork.png
 share/apps/umbrello/pics/cursor-generalisation.png
-share/apps/umbrello/pics/cursor-initial-state.png
+share/apps/umbrello/pics/cursor-initial_state.png
 share/apps/umbrello/pics/cursor-interface.png
+share/apps/umbrello/pics/cursor-join.png
+share/apps/umbrello/pics/cursor-junction.png
 share/apps/umbrello/pics/cursor-message-asynchronous.png
 share/apps/umbrello/pics/cursor-message-synchronous.png
 share/apps/umbrello/pics/cursor-node.png
@@ -550,10 +595,13 @@ share/apps/umbrello/pics/cursor-note.png
 share/apps/umbrello/pics/cursor-object.png
 share/apps/umbrello/pics/cursor-package.png
 share/apps/umbrello/pics/cursor-relationship.png
+share/apps/umbrello/pics/cursor-shallow-history.png
+share/apps/umbrello/pics/cursor-state-fork.png
 share/apps/umbrello/pics/cursor-text.png
 share/apps/umbrello/pics/cursor-uniassociation.png
 share/apps/umbrello/pics/cursor-usecase.png
 share/apps/umbrello/pics/datatype.png
+share/apps/umbrello/pics/deep-history.png
 share/apps/umbrello/pics/dependency.png
 share/apps/umbrello/pics/end_state.png
 share/apps/umbrello/pics/entity.png
@@ -562,6 +610,8 @@ share/apps/umbrello/pics/fork.png
 share/apps/umbrello/pics/generalisation.png
 share/apps/umbrello/pics/initial_state.png
 share/apps/umbrello/pics/interface.png
+share/apps/umbrello/pics/join.png
+share/apps/umbrello/pics/junction.png
 share/apps/umbrello/pics/message-asynchronous.png
 share/apps/umbrello/pics/message-synchronous.png
 share/apps/umbrello/pics/node.png
@@ -569,7 +619,9 @@ share/apps/umbrello/pics/note.png
 share/apps/umbrello/pics/object.png
 share/apps/umbrello/pics/package.png
 share/apps/umbrello/pics/relationship.png
+share/apps/umbrello/pics/shallow-history.png
 share/apps/umbrello/pics/startlogo.png
+share/apps/umbrello/pics/state-fork.png
 share/apps/umbrello/pics/template.png
 share/apps/umbrello/pics/text.png
 share/apps/umbrello/pics/uniassociation.png
@@ -653,6 +705,9 @@ share/doc/HTML/en/kbugbuster/index.docbook
 share/doc/HTML/en/kcachegrind/common
 share/doc/HTML/en/kcachegrind/index.cache.bz2
 share/doc/HTML/en/kcachegrind/index.docbook
+share/doc/HTML/en/kdesvn-build/common
+share/doc/HTML/en/kdesvn-build/index.cache.bz2
+share/doc/HTML/en/kdesvn-build/index.docbook
 share/doc/HTML/en/kompare/common
 share/doc/HTML/en/kompare/index.cache.bz2
 share/doc/HTML/en/kompare/index.docbook
@@ -684,10 +739,19 @@ share/doc/HTML/en/umbrello/umbrello-ui.png
 share/doc/HTML/en/umbrello/uml_basics.docbook
 share/doc/HTML/en/umbrello/use-case-diagram.png
 share/doc/HTML/en/umbrello/working_with_umbrello.docbook
-share/icons/crystalsvg/128x128/apps/kbugbuster.png
-share/icons/crystalsvg/128x128/apps/kompare.png
-share/icons/crystalsvg/128x128/apps/umbrello.png
+share/icons/crystalsvg/128x128/actions/svn_add.png
+share/icons/crystalsvg/128x128/actions/svn_branch.png
+share/icons/crystalsvg/128x128/actions/svn_merge.png
+share/icons/crystalsvg/128x128/actions/svn_remove.png
+share/icons/crystalsvg/128x128/actions/svn_status.png
+share/icons/crystalsvg/128x128/actions/svn_switch.png
 share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
+share/icons/crystalsvg/16x16/actions/svn_add.png
+share/icons/crystalsvg/16x16/actions/svn_branch.png
+share/icons/crystalsvg/16x16/actions/svn_merge.png
+share/icons/crystalsvg/16x16/actions/svn_remove.png
+share/icons/crystalsvg/16x16/actions/svn_status.png
+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
@@ -702,14 +766,13 @@ 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/apps/catalogmanager.png
-share/icons/crystalsvg/16x16/apps/cervisia.png
-share/icons/crystalsvg/16x16/apps/kbabel.png
-share/icons/crystalsvg/16x16/apps/kbabeldict.png
-share/icons/crystalsvg/16x16/apps/kbugbuster.png
-share/icons/crystalsvg/16x16/apps/kompare.png
-share/icons/crystalsvg/16x16/apps/umbrello.png
 share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
+share/icons/crystalsvg/22x22/actions/svn_add.png
+share/icons/crystalsvg/22x22/actions/svn_branch.png
+share/icons/crystalsvg/22x22/actions/svn_merge.png
+share/icons/crystalsvg/22x22/actions/svn_remove.png
+share/icons/crystalsvg/22x22/actions/svn_status.png
+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
@@ -725,76 +788,105 @@ 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/apps/catalogmanager.png
-share/icons/crystalsvg/22x22/apps/cervisia.png
-share/icons/crystalsvg/22x22/apps/kbugbuster.png
-share/icons/crystalsvg/22x22/apps/umbrello.png
 share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
+share/icons/crystalsvg/32x32/actions/svn_add.png
+share/icons/crystalsvg/32x32/actions/svn_branch.png
+share/icons/crystalsvg/32x32/actions/svn_merge.png
+share/icons/crystalsvg/32x32/actions/svn_remove.png
+share/icons/crystalsvg/32x32/actions/svn_status.png
+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/apps/catalogmanager.png
-share/icons/crystalsvg/32x32/apps/cervisia.png
-share/icons/crystalsvg/32x32/apps/kbabel.png
-share/icons/crystalsvg/32x32/apps/kbabeldict.png
-share/icons/crystalsvg/32x32/apps/kbugbuster.png
-share/icons/crystalsvg/32x32/apps/kompare.png
-share/icons/crystalsvg/32x32/apps/umbrello.png
 share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
+share/icons/crystalsvg/48x48/actions/svn_add.png
+share/icons/crystalsvg/48x48/actions/svn_branch.png
+share/icons/crystalsvg/48x48/actions/svn_merge.png
+share/icons/crystalsvg/48x48/actions/svn_remove.png
+share/icons/crystalsvg/48x48/actions/svn_status.png
+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/apps/catalogmanager.png
-share/icons/crystalsvg/48x48/apps/cervisia.png
-share/icons/crystalsvg/48x48/apps/kbabel.png
-share/icons/crystalsvg/48x48/apps/kbabeldict.png
-share/icons/crystalsvg/48x48/apps/kbugbuster.png
-share/icons/crystalsvg/48x48/apps/kompare.png
-share/icons/crystalsvg/48x48/apps/umbrello.png
 share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
-share/icons/crystalsvg/64x64/apps/kbugbuster.png
-share/icons/crystalsvg/64x64/apps/umbrello.png
+share/icons/crystalsvg/64x64/actions/svn_add.png
+share/icons/crystalsvg/64x64/actions/svn_branch.png
+share/icons/crystalsvg/64x64/actions/svn_merge.png
+share/icons/crystalsvg/64x64/actions/svn_remove.png
+share/icons/crystalsvg/64x64/actions/svn_status.png
+share/icons/crystalsvg/64x64/actions/svn_switch.png
 share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
+share/icons/crystalsvg/scalable/actions/svn_add.svgz
+share/icons/crystalsvg/scalable/actions/svn_branch.svgz
+share/icons/crystalsvg/scalable/actions/svn_merge.svgz
+share/icons/crystalsvg/scalable/actions/svn_remove.svgz
+share/icons/crystalsvg/scalable/actions/svn_status.svgz
+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/apps/kompare.svgz
-share/icons/crystalsvg/scalable/apps/umbrello.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/16x16/apps/umbrello.png
-share/icons/locolor/16x16/mimetypes/umbrellofile.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/icons/locolor/32x32/apps/umbrello.png
-share/icons/locolor/32x32/mimetypes/umbrellofile.png
 share/mimelnk/application/x-kcachegrind.desktop
 share/mimelnk/application/x-umbrello.desktop
 share/services/cvsservice.desktop
@@ -812,6 +904,7 @@ share/services/kbabel_linguist_import.desktop
 share/services/kbabel_nottranslatedtool.desktop
 share/services/kbabel_pluralformstool.desktop
 share/services/kbabel_punctuationtool.desktop
+share/services/kbabel_regexptool.desktop
 share/services/kbabel_setfuzzytool.desktop
 share/services/kbabel_whitespacetool.desktop
 share/services/kbabel_xliff_export.desktop
@@ -843,6 +936,7 @@ share/servicetypes/komparenavigationpart.desktop
 share/servicetypes/kompareviewpart.desktop
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/kompare
+@dirrm share/doc/HTML/en/kdesvn-build
 @dirrm share/doc/HTML/en/kcachegrind
 @dirrm share/doc/HTML/en/kbugbuster
 @dirrm share/doc/HTML/en/kbabel
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 7e677e4..1f3ee82 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3.0
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION:S/.0//}/src
@@ -14,10 +14,12 @@ MASTER_SITE_SUBDIR=	stable/${KDE_VERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
-COMMENT=	Powerful IDE for developing KDE/Qt-based apps
+COMMENT=	IDE for a wide variety of programming tasks
 
 BUILD_DEPENDS=	cervisia:${PORTSDIR}/devel/kdesdk3 \
 		msgfmt:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
+		svn_client-1.0:${PORTSDIR}/devel/subversion
 RUN_DEPENDS=	extractrc:${PORTSDIR}/devel/kdesdk3 \
 		gmake:${PORTSDIR}/devel/gmake \
 		${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \
@@ -33,11 +35,21 @@ RUN_DEPENDS+=	kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
 
 # KDE_DISTNAME=		${PORTNAME}-${PORTVERSION}_for_KDE_3.1
 
+INSTALLS_SHLIB=	yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qtdoc-dir=${X11BASE}/share/doc/qt/html
+CONFIGURE_ARGS+=--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \
+		--with-db-includedir=${LOCALBASE}/include/db4 \
+		--with-db-libdir=${LOCALBASE}/lib --with-db-lib=db4 \
+		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
+		--with-apu-config=${LOCALBASE}/bin/apu-1-config \
+		--with-subversion-dir=${LOCALBASE} \
+		--with-svn-include=${LOCALBASE}/include \
+		--with-svn-lib=${LOCALBASE}/lib \
+		--with-neon-config=${LOCALBASE}/bin/neon-config
+
 CONFIGURE_ENV+=	PATH=${LOCALBASE}/gnu-autotools/bin:${PATH}
 USE_REINPLACE=	yes
 
@@ -61,10 +73,6 @@ post-configure:
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' < ${FILESDIR}/kdevelop \
 		> ${WRKDIR}/kdevelop
-.if ${ARCH} == "amd64"
-	@${REINPLACE_CMD} -e "s,-O2,${CFLAGS} -fPIC," \
-		${WRKSRC}/bdb/build_unix/Makefile ${WRKSRC}/bdb/Makefile
-.endif
 
 post-install:
 	@${MV} ${PREFIX}/bin/kdevelop ${PREFIX}/bin/kdevelop-bin
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index 44334a4..e54d589 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdevelop-3.2.3.tar.bz2) = 7dfae96e274c6dcb4748419452ebdf35
-SIZE (KDE/kdevelop-3.2.3.tar.bz2) = 8353809
+MD5 (KDE/kdevelop-3.3.0.tar.bz2) = 1048c89c1aad0daf6581bb04e15206c4
+SHA256 (KDE/kdevelop-3.3.0.tar.bz2) = 136eb7b69f8de09bd7dabb4dffafa2fd889ccaca638e628bd84155258ece8e06
+SIZE (KDE/kdevelop-3.3.0.tar.bz2) = 8100852
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 96716ef..34c18e6 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -7,6 +7,9 @@ bin/kdevprj2kdevelop
 bin/kdevprofileeditor
 bin/r++
 include/kdevelop/buildtools/base/kdevbuildtool.h
+include/kdevelop/buildtools/parsers/qmake/qmakeast.h
+include/kdevelop/buildtools/parsers/qmake/qmakeastvisitor.h
+include/kdevelop/buildtools/parsers/qmake/qmakedriver.h
 include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectbuilder.h
 include/kdevelop/buildtools/projectmanager/interfaces/kdevprojecteditor.h
 include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectimporter.h
@@ -25,13 +28,10 @@ include/kdevelop/buildtools/widgets/runoptionswidgetbase.h
 include/kdevelop/buildtools/widgets/subclassesdlg.h
 include/kdevelop/buildtools/widgets/subclassesdlgbase.h
 include/kdevelop/catalog/catalog.h
-include/kdevelop/catalog/gcatalog.h
-include/kdevelop/catalog/gcatalog.tcc
 include/kdevelop/catalog/tag.h
 include/kdevelop/cppparser/ast.h
 include/kdevelop/cppparser/driver.h
 include/kdevelop/cppparser/errors.h
-include/kdevelop/cppparser/keywords.lut.h
 include/kdevelop/cppparser/lexer.h
 include/kdevelop/cppparser/lookup.h
 include/kdevelop/cppparser/parser.h
@@ -120,8 +120,8 @@ include/kdevelop/shell/profileengine/profileengine.h
 include/kdevelop/shell/projectmanager.h
 include/kdevelop/shell/projectsession.h
 include/kdevelop/shell/settingswidget.h
-include/kdevelop/shell/settingswidget.ui.h
 include/kdevelop/shell/shellextension.h
+include/kdevelop/shell/simplemainwindow.h
 include/kdevelop/shell/splashscreen.h
 include/kdevelop/shell/statusbar.h
 include/kdevelop/shell/toplevel.h
@@ -142,21 +142,7 @@ include/kdevelop/widgets/processwidget.h
 include/kdevelop/widgets/qcomboview.h
 include/kdevelop/widgets/resizablecombo.h
 include/kinterfacedesigner/designer.h
-kdevbdb/bin/db_archive
-kdevbdb/bin/db_checkpoint
-kdevbdb/bin/db_deadlock
-kdevbdb/bin/db_dump
-kdevbdb/bin/db_load
-kdevbdb/bin/db_printlog
-kdevbdb/bin/db_recover
-kdevbdb/bin/db_stat
-kdevbdb/bin/db_upgrade
-kdevbdb/bin/db_verify
-kdevbdb/docs/LICENSE
-kdevbdb/docs/README
-kdevbdb/include/db.h
-kdevbdb/include/db_cxx.h
-kdevbdb/lib/libdb.a
+lib/kconf_update_bin/kdev-gen-settings-kconf_update
 lib/kde3/kio_chm.la
 lib/kde3/kio_chm.so
 lib/kde3/kio_perldoc.la
@@ -291,6 +277,8 @@ lib/kde3/libkdevscripting.la
 lib/kde3/libkdevscripting.so
 lib/kde3/libkdevscriptproject.la
 lib/kde3/libkdevscriptproject.so
+lib/kde3/libkdevsecurity.la
+lib/kde3/libkdevsecurity.so
 lib/kde3/libkdevsnippet.la
 lib/kde3/libkdevsnippet.so
 lib/kde3/libkdevsqlsupport.la
@@ -317,6 +305,9 @@ lib/kde3/libqeditorpart.la
 lib/kde3/libqeditorpart.so
 lib/kde3/libsubversionintegrator.la
 lib/kde3/libsubversionintegrator.so
+lib/libd.la
+lib/libd.so
+lib/libd.so.0
 lib/libdesignerintegration.la
 lib/libdesignerintegration.so
 lib/libdesignerintegration.so.0
@@ -366,6 +357,9 @@ lib/libkdevmakebuilder.so
 lib/libkdevpropertyeditor.la
 lib/libkdevpropertyeditor.so
 lib/libkdevpropertyeditor.so.0
+lib/libkdevqmakeparser.la
+lib/libkdevqmakeparser.so
+lib/libkdevqmakeparser.so.0
 lib/libkdevqtimporter.la
 lib/libkdevqtimporter.so
 lib/libkdevshell.la
@@ -389,6 +383,8 @@ lib/libprofileengine.so.0
 lib/libprojectmanager_interfaces.la
 lib/libprojectmanager_interfaces.so
 lib/libprojectmanager_interfaces.so.1
+lib/libqmakeimporter.la
+lib/libqmakeimporter.so
 share/applications/kde/kdevassistant.desktop
 share/applications/kde/kdevdesigner.desktop
 share/applications/kde/kdevelop.desktop
@@ -396,6 +392,7 @@ share/applications/kde/kdevelop_c_cpp.desktop
 share/applications/kde/kdevelop_kde_cpp.desktop
 share/applications/kde/kdevelop_ruby.desktop
 share/applications/kde/kdevelop_scripting.desktop
+share/apps/kconf_update/kdev-gen-settings.upd
 share/apps/kdevabbrev/kdevabbrev.rc
 share/apps/kdevabbrev/sources/cpp_keywords
 share/apps/kdevabbrev/sources/qt_classes
@@ -533,6 +530,10 @@ share/apps/kdevappwizard/kpartapp.png
 share/apps/kdevappwizard/kpartapp.tar.gz
 share/apps/kdevappwizard/kpartplugin.png
 share/apps/kdevappwizard/kpartplugin.tar.gz
+share/apps/kdevappwizard/kscons_kmdi.png
+share/apps/kdevappwizard/kscons_kmdi.tar.gz
+share/apps/kdevappwizard/kscons_kxt.png
+share/apps/kdevappwizard/kscons_kxt.tar.gz
 share/apps/kdevappwizard/kscreensaver.png
 share/apps/kdevappwizard/kscreensaver.tar.gz
 share/apps/kdevappwizard/kxt.png
@@ -615,6 +616,8 @@ share/apps/kdevappwizard/template-common/kde-doc-en-Makefile.am
 share/apps/kdevappwizard/template-common/kde-index.docbook
 share/apps/kdevappwizard/template-common/kde-part.desktop
 share/apps/kdevappwizard/template-common/kde-po-Makefile.am
+share/apps/kdevappwizard/template-common/scons.kdevtemplate
+share/apps/kdevappwizard/template-common/scons.tar.gz
 share/apps/kdevappwizard/template-common/wx-Makefile.am
 share/apps/kdevappwizard/template-common/wx-Makefile.cvs
 share/apps/kdevappwizard/template-common/wx-configure.in
@@ -663,6 +666,8 @@ share/apps/kdevappwizard/templates/konqnavpanel.kdevtemplate
 share/apps/kdevappwizard/templates/kopart.kdevtemplate
 share/apps/kdevappwizard/templates/kpartapp.kdevtemplate
 share/apps/kdevappwizard/templates/kpartplugin.kdevtemplate
+share/apps/kdevappwizard/templates/kscons_kmdi.kdevtemplate
+share/apps/kdevappwizard/templates/kscons_kxt.kdevtemplate
 share/apps/kdevappwizard/templates/kscreensaver.kdevtemplate
 share/apps/kdevappwizard/templates/kxt.kdevtemplate
 share/apps/kdevappwizard/templates/kxtruby.kdevtemplate
@@ -748,6 +753,7 @@ share/apps/kdevcustomproject/kdevcustomproject.rc
 share/apps/kdevcvsservice/buildcvs.sh
 share/apps/kdevcvsservice/pics/kdev_cvs.png
 share/apps/kdevdebugger/icons/hicolor/16x16/actions/dbgwatchvar.png
+share/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgjumpto.png
 share/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgmemview.png
 share/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgnext.png
 share/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgnextinst.png
@@ -1058,6 +1064,7 @@ share/apps/kdevelop/icons/hicolor/16x16/actions/variablenew.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/classnew.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/classwiz.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/configure_file.png
+share/apps/kdevelop/icons/hicolor/22x22/actions/dbgjumpto.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/dbgmemview.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/dbgnext.png
 share/apps/kdevelop/icons/hicolor/22x22/actions/dbgnextinst.png
@@ -1170,6 +1177,7 @@ share/apps/kdevfilecreate/file-templates/y
 share/apps/kdevfilecreate/file-templates/yy
 share/apps/kdevfilecreate/kdevpart_filecreate.rc
 share/apps/kdevfilecreate/template-info.xml
+share/apps/kdevfilelist/kdevfilelist.rc
 share/apps/kdevfilter/kdevfilter.rc
 share/apps/kdevfortransupport/kdevfortransupport.rc
 share/apps/kdevfullscreen/kdevpart_fullscreen.rc
@@ -1205,6 +1213,7 @@ share/apps/kdevrubysupport/pics/ruby_config.png
 share/apps/kdevrubysupport/pics/ruby_run.png
 share/apps/kdevscripting/kdevscripting.rc
 share/apps/kdevscriptproject/kdevscriptproject.rc
+share/apps/kdevsecurity/patterns
 share/apps/kdevsqlsupport/kdevsqlsupport.rc
 share/apps/kdevtipofday/kdevpart_tipofday.rc
 share/apps/kdevtipofday/tips
@@ -1216,25 +1225,34 @@ share/apps/kio_pydoc/kde_pydoc.py
 share/apps/qeditorpart/highlight/highlighting.xml
 share/apps/qeditorpart/highlight/qt.xml
 share/apps/qeditorpart/qeditor_part.rc
+share/config/kdevassistantrc
 share/config/kdeveloprc
 share/desktop-directories/kde-development-kdevelop.directory
+share/doc/HTML/en/kde_app_devel/CMakeLists.txt
 share/doc/HTML/en/kde_app_devel/appwizard.png
 share/doc/HTML/en/kde_app_devel/common
 share/doc/HTML/en/kde_app_devel/index.cache.bz2
 share/doc/HTML/en/kde_app_devel/index.docbook
 share/doc/HTML/en/kde_app_devel/kscribblefiles.png
 share/doc/HTML/en/kdevelop-apidocs/common
+share/doc/HTML/en/kdevelop/CMakeLists.txt
 share/doc/HTML/en/kdevelop/SF-general.png
 share/doc/HTML/en/kdevelop/SF-indent.png
 share/doc/HTML/en/kdevelop/SF-other.png
+share/doc/HTML/en/kdevelop/adv-build-management.docbook
+share/doc/HTML/en/kdevelop/app-changelog.docbook
 share/doc/HTML/en/kdevelop/app-files.docbook
 share/doc/HTML/en/kdevelop/app-menu.docbook
+share/doc/HTML/en/kdevelop/app-misc-info.docbook
+share/doc/HTML/en/kdevelop/app-uimodes-examples.docbook
 share/doc/HTML/en/kdevelop/applicationwizard.docbook
 share/doc/HTML/en/kdevelop/automake-file-popup.png
 share/doc/HTML/en/kdevelop/automake-subproject-popup.png
 share/doc/HTML/en/kdevelop/automake-target-popup.png
 share/doc/HTML/en/kdevelop/automakemanager.png
+share/doc/HTML/en/kdevelop/class-browsers.docbook
 share/doc/HTML/en/kdevelop/classview.png
+share/doc/HTML/en/kdevelop/commands.docbook
 share/doc/HTML/en/kdevelop/common
 share/doc/HTML/en/kdevelop/configure-adddialog-baselibs.png
 share/doc/HTML/en/kdevelop/configure-adddialog-qt.png
@@ -1259,13 +1277,19 @@ share/doc/HTML/en/kdevelop/configure-select.png
 share/doc/HTML/en/kdevelop/configure-snippets.png
 share/doc/HTML/en/kdevelop/create-new-project-cvs.png
 share/doc/HTML/en/kdevelop/createnewproject.png
+share/doc/HTML/en/kdevelop/credits.docbook
+share/doc/HTML/en/kdevelop/cvs.docbook
+share/doc/HTML/en/kdevelop/debugger.docbook
 share/doc/HTML/en/kdevelop/doctree-add-bookmark.png
 share/doc/HTML/en/kdevelop/doctree-reduced.png
 share/doc/HTML/en/kdevelop/doctree.png
 share/doc/HTML/en/kdevelop/doctreeview.png
+share/doc/HTML/en/kdevelop/documentation.docbook
 share/doc/HTML/en/kdevelop/documents-contents.png
 share/doc/HTML/en/kdevelop/edit-doctree-TOC-entry.png
+share/doc/HTML/en/kdevelop/editing.docbook
 share/doc/HTML/en/kdevelop/empty-ide.png
+share/doc/HTML/en/kdevelop/file-browsers.docbook
 share/doc/HTML/en/kdevelop/file-selector.png
 share/doc/HTML/en/kdevelop/filetree.png
 share/doc/HTML/en/kdevelop/folded-tabs.png
@@ -1282,15 +1306,19 @@ share/doc/HTML/en/kdevelop/kdevelop-scripting.docbook
 share/doc/HTML/en/kdevelop/kdevelop-survey.docbook
 share/doc/HTML/en/kdevelop/kdevelop-tabbed-mode.png
 share/doc/HTML/en/kdevelop/kdevelop-toplevel-mode.png
+share/doc/HTML/en/kdevelop/listplugins.sh
 share/doc/HTML/en/kdevelop/loading-progress-bar.png
+share/doc/HTML/en/kdevelop/nutshell.docbook
 share/doc/HTML/en/kdevelop/open-project.png
 share/doc/HTML/en/kdevelop/open-recent-project.png
+share/doc/HTML/en/kdevelop/plugin-tools.docbook
 share/doc/HTML/en/kdevelop/project-advanced.docbook
 share/doc/HTML/en/kdevelop/project-management.docbook
 share/doc/HTML/en/kdevelop/script_location.png
 share/doc/HTML/en/kdevelop/select-user-interface-0.png
 share/doc/HTML/en/kdevelop/select-user-interface.png
 share/doc/HTML/en/kdevelop/setup.docbook
+share/doc/HTML/en/kdevelop/survey-manual.docbook
 share/doc/HTML/en/kdevelop/unixdev.docbook
 share/doc/HTML/en/kdevelop/wrong-project-location.png
 share/icons/hicolor/16x16/actions/breakpoint_add.png
@@ -1311,7 +1339,6 @@ share/icons/hicolor/48x48/apps/kdevdesigner.png
 share/icons/hicolor/48x48/apps/kdevelop.png
 share/icons/locolor/16x16/actions/kdevelop_tip.png
 share/icons/locolor/32x32/actions/kdevelop_tip.png
-share/mimelnk/application/chm.desktop
 share/mimelnk/application/x-kdevelop.desktop
 share/mimelnk/text/x-fortran.desktop
 share/services/chm.protocol
@@ -1387,6 +1414,7 @@ share/services/kdevpghpfoptions.desktop
 share/services/kdevphpsupport.desktop
 share/services/kdevprojectmanager.desktop
 share/services/kdevpythonsupport.desktop
+share/services/kdevqmakeimporter.desktop
 share/services/kdevqtimporter.desktop
 share/services/kdevquickopen.desktop
 share/services/kdevrbdebugger.desktop
@@ -1395,6 +1423,7 @@ share/services/kdevreplace.desktop
 share/services/kdevrubysupport.desktop
 share/services/kdevscripting.desktop
 share/services/kdevscriptproject.desktop
+share/services/kdevsecurity.desktop
 share/services/kdevsnippet.desktop
 share/services/kdevsqlsupport.desktop
 share/services/kdevsubversion.desktop
@@ -1464,13 +1493,13 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/catalog/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/catalog/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/util/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/extensions/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/external/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/extras/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/widgets/propeditor/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/widgets/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/util/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/catalog/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html
@@ -1497,42 +1526,59 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/util/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/extensions/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/external/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/extras/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/widgets/propeditor/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/widgets/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/util/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/catalog/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/documentation/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/documentation/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/debugger/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/debugger/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/html
@@ -1583,6 +1629,12 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager
 @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets
+@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake
+@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
+@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools
+@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers
 @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
 @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base
@@ -1601,6 +1653,7 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/apps/kdevtools
 @dirrm share/apps/kdevtipofday
 @dirrm share/apps/kdevsqlsupport
+@dirrm share/apps/kdevsecurity
 @dirrm share/apps/kdevscriptproject
 @dirrm share/apps/kdevscripting
 @dirrm share/apps/kdevrubysupport/pics
@@ -1633,6 +1686,7 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/apps/kdevfullscreen
 @dirrm share/apps/kdevfortransupport
 @dirrm share/apps/kdevfilter
+@dirrm share/apps/kdevfilelist
 @dirrm share/apps/kdevfilecreate/file-templates
 @dirrm share/apps/kdevfilecreate
 @dirrm share/apps/kdevelop/profiles/KDevAssistant
@@ -1718,11 +1772,6 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/apps/kdevabbrev/templates
 @dirrm share/apps/kdevabbrev/sources
 @dirrm share/apps/kdevabbrev
-@dirrm kdevbdb/lib
-@dirrm kdevbdb/include
-@dirrm kdevbdb/docs
-@dirrm kdevbdb/bin
-@dirrm kdevbdb
 @dirrm include/kinterfacedesigner
 @dirrm include/kdevelop/widgets
 @dirrm include/kdevelop/util
@@ -1744,6 +1793,8 @@ share/servicetypes/kdevelopversioncontrol.desktop
 @dirrm include/kdevelop/buildtools/widgets
 @dirrm include/kdevelop/buildtools/projectmanager/interfaces
 @dirrm include/kdevelop/buildtools/projectmanager
+@dirrm include/kdevelop/buildtools/parsers/qmake
+@dirrm include/kdevelop/buildtools/parsers
 @dirrm include/kdevelop/buildtools/base
 @dirrm include/kdevelop/buildtools
 @dirrm include/kdevelop