4 files changed, 46 insertions, 19 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index ca11764bd180..0e0fea751049 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -15,7 +15,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Software Development Kit
 
-LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4
+LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
+		svn_client-1.0:${PORTSDIR}/devel/subversion
 
 CONFLICTS=	umbrello-[0-9]* kcachegrind-[0-9]*
 
@@ -32,7 +33,9 @@ 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
+		--with-db-lib-dir=/usr/local/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
 
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index bba79256539c..8ecddb6bc4bd 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdesdk-3.3.2.tar.bz2) = 906bbcde1b3db2eaac8a257c8574e033
-SIZE (KDE/kdesdk-3.3.2.tar.bz2) = 4358995
+MD5 (KDE/kdesdk-3.4.0.tar.bz2) = 5b88692972e65c5e7d3aafc6400bea2c
+SIZE (KDE/kdesdk-3.4.0.tar.bz2) = 4571452
diff --git a/devel/kdesdk4/files/patch-umbrello_umbrello_dialogs_classifierlistpage.cpp b/devel/kdesdk4/files/patch-umbrello_umbrello_dialogs_classifierlistpage.cpp
deleted file mode 100644
index 7561df6e5d64..000000000000
--- a/devel/kdesdk4/files/patch-umbrello_umbrello_dialogs_classifierlistpage.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- patch-umbrello:umbrello:dialogs:classifierlistpage.cpp begins here ---
---- umbrello/umbrello/dialogs/classifierlistpage.cpp.old	Mon Oct 25 16:09:31 2004
-+++ umbrello/umbrello/dialogs/classifierlistpage.cpp	Mon Oct 25 16:09:56 2004
-@@ -348,7 +348,7 @@
- 	//now change around in the list
- 	UMLClassifierListItem* currentAtt = getItemList().at( index );
- 	takeClassifier(currentAtt);
--	addClassifier(currentAtt, index + 2);
-+	addClassifier(currentAtt, index + 1);
- 	slotClicked( item );
- }
\ No newline at end of file
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 5e1da934e6bd..523827d068de 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -21,6 +21,7 @@ bin/cvsversion
 bin/cxxmetric
 bin/dprof2calltree
 bin/extend_dmalloc
+bin/extractattr
 bin/extractrc
 bin/findmissingcrystal
 bin/fixkdeincludes
@@ -112,6 +113,10 @@ lib/kde3/kbabel_setfuzzytool.la
 lib/kde3/kbabel_setfuzzytool.so
 lib/kde3/kbabel_whitespacetool.la
 lib/kde3/kbabel_whitespacetool.so
+lib/kde3/kbabel_xliffexport.la
+lib/kde3/kbabel_xliffexport.so
+lib/kde3/kbabel_xliffimport.la
+lib/kde3/kbabel_xliffimport.so
 lib/kde3/kbabel_xmltool.la
 lib/kde3/kbabel_xmltool.so
 lib/kde3/kbabeldict_dbsearchengine.la
@@ -122,6 +127,8 @@ lib/kde3/kbabeldict_pocompendium.la
 lib/kde3/kbabeldict_pocompendium.so
 lib/kde3/kbabeldict_tmxcompendium.la
 lib/kde3/kbabeldict_tmxcompendium.so
+lib/kde3/kded_ksvnd.la
+lib/kde3/kded_ksvnd.so
 lib/kde3/kfile_cpp.la
 lib/kde3/kfile_cpp.so
 lib/kde3/kfile_diff.la
@@ -130,11 +137,10 @@ lib/kde3/kfile_po.la
 lib/kde3/kfile_po.so
 lib/kde3/kfile_ts.la
 lib/kde3/kfile_ts.so
+lib/kde3/kio_svn.la
+lib/kde3/kio_svn.so
 lib/kde3/libcervisiapart.la
 lib/kde3/libcervisiapart.so
-lib/kde3/libdialogpages.la
-lib/kde3/libdialogpages.so
-lib/kde3/libdialogpages.so.0
 lib/kde3/libkomparenavtreepart.la
 lib/kde3/libkomparenavtreepart.so
 lib/kde3/libkomparepart.la
@@ -173,6 +179,7 @@ share/applications/kde/kuiviewer.desktop
 share/applications/kde/umbrello.desktop
 share/apps/catalogmanager/catalogmanagerui.rc
 share/apps/cervisia/cervisiashellui.rc
+share/apps/cervisia/eventsrc
 share/apps/cervisiapart/cervisiaui.rc
 share/apps/kabc/formats/kdeaccountsplugin.desktop
 share/apps/kapptemplate/admin/Doxyfile.am
@@ -204,6 +211,7 @@ share/apps/kapptemplate/admin/missing
 share/apps/kapptemplate/admin/mkinstalldirs
 share/apps/kapptemplate/admin/nmcheck
 share/apps/kapptemplate/admin/oldinclude.m4.in
+share/apps/kapptemplate/admin/pkg.m4.in
 share/apps/kapptemplate/admin/ylwrap
 share/apps/kapptemplate/appframework/AUTHORS
 share/apps/kapptemplate/appframework/COPYING
@@ -434,6 +442,7 @@ share/apps/kbugbuster/kbugbusterui.rc
 share/apps/kbugbuster/pics/bars.png
 share/apps/kbugbuster/pics/logo.png
 share/apps/kbugbuster/pics/tools.png
+share/apps/kbugbuster/pics/top-right.png
 share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png
 share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
 share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png
@@ -442,14 +451,17 @@ share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
 share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
 share/apps/kcachegrind/kcachegrindui.rc
 share/apps/kcachegrind/tips
+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-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/kstyle/themes/scheck.themerc
-share/apps/kuiviewer/kuiviewer.rc
+share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
 share/apps/umbrello/headings/heading.adb
 share/apps/umbrello/headings/heading.ads
@@ -513,6 +525,7 @@ share/apps/umbrello/pics/cursor-containment.png
 share/apps/umbrello/pics/cursor-datatype.png
 share/apps/umbrello/pics/cursor-dependency.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
@@ -524,12 +537,14 @@ share/apps/umbrello/pics/cursor-node.png
 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-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/dependency.png
 share/apps/umbrello/pics/end_state.png
+share/apps/umbrello/pics/entity.png
 share/apps/umbrello/pics/enum.png
 share/apps/umbrello/pics/fork.png
 share/apps/umbrello/pics/generalisation.png
@@ -541,6 +556,7 @@ share/apps/umbrello/pics/node.png
 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/startlogo.png
 share/apps/umbrello/pics/template.png
 share/apps/umbrello/pics/text.png
@@ -550,6 +566,7 @@ share/apps/umbrello/tips
 share/apps/umbrello/umbrelloui.rc
 share/config.kcfg/cervisiapart.kcfg
 share/config.kcfg/kbabel.kcfg
+share/config.kcfg/kbprojectsettings.kcfg
 share/doc/HTML/en/cervisia/annotate.png
 share/doc/HTML/en/cervisia/checkout.png
 share/doc/HTML/en/cervisia/commit.png
@@ -593,6 +610,7 @@ share/doc/HTML/en/kbabel/glossary.docbook
 share/doc/HTML/en/kbabel/index.cache.bz2
 share/doc/HTML/en/kbabel/index.docbook
 share/doc/HTML/en/kbabel/kbabeldict.docbook
+share/doc/HTML/en/kbabel/man-catalogmanager.1.docbook
 share/doc/HTML/en/kbabel/menu.docbook
 share/doc/HTML/en/kbabel/msgid2msgstr.png
 share/doc/HTML/en/kbabel/next.png
@@ -654,6 +672,7 @@ 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/mimetypes/umbrellofile.png
@@ -667,6 +686,7 @@ 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
@@ -683,20 +703,24 @@ 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/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/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
@@ -710,6 +734,7 @@ share/icons/crystalsvg/32x32/apps/umbrello.png
 share/icons/crystalsvg/32x32/mimetypes/umbrellofile.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
@@ -721,10 +746,12 @@ 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/mimetypes/umbrellofile.png
 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
@@ -775,7 +802,10 @@ share/services/kbabel_pluralformstool.desktop
 share/services/kbabel_punctuationtool.desktop
 share/services/kbabel_setfuzzytool.desktop
 share/services/kbabel_whitespacetool.desktop
+share/services/kbabel_xliff_export.desktop
+share/services/kbabel_xliff_import.desktop
 share/services/kbabel_xmltool.desktop
+share/services/kded/ksvnd.desktop
 share/services/kfile_cpp.desktop
 share/services/kfile_diff.desktop
 share/services/kfile_h.desktop
@@ -787,6 +817,11 @@ share/services/kuiviewer_part.desktop
 share/services/poauxiliary.desktop
 share/services/pocompendium.desktop
 share/services/pothumbnail.desktop
+share/services/svn+file.protocol
+share/services/svn+http.protocol
+share/services/svn+https.protocol
+share/services/svn+ssh.protocol
+share/services/svn.protocol
 share/services/tmxcompendium.desktop
 share/servicetypes/kbabel_tool.desktop
 share/servicetypes/kbabel_validator.desktop