3 files changed, 110 insertions, 89 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 2a1169c45009..ef883e0fc167 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	kdesdk
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,16 +20,39 @@ LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
-KDE4_BUILDENV=	yes
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier \
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier \
 		automoc4 akonadi
+KDE4_BUILDENV=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	network gui svg qt3support \
-		qmake_build moc_build rcc_build uic_build
-
-MAN1=		cervisia.1
-
-CMAKE_ARGS+=	-DBUILD_kapptemplate:BOOL=Off
+		qmake_build moc_build rcc_build uic_build \
+		porting_build uic3_build
+
+MAN1=	adddebug.1 \
+	cervisia.1 \
+	cheatmake.1 \
+	create_cvsignore.1 \
+	create_makefile.1 \
+	create_makefiles.1 \
+	cvscheck.1 \
+	cvslastchange.1 \
+	cvslastlog.1 \
+	cvsrevertlast.1 \
+	cxxmetric.1 \
+	demangle.1 \
+	extend_dmalloc.1 \
+	extractrc.1 \
+	fixincludes.1 \
+	kate.1 \
+	po2xml.1 \
+	pruneemptydirs.1 \
+	qtdoc.1 \
+	reportview.1 \
+	split2po.1 \
+	swappo.1 \
+	transxx.1 \
+	xml2pot.1 \
+	zonetab2pot.py.1
 
 post-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 15487e67aa68..7031361bedad 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdesdk-4.1.4.tar.bz2) = 1ca874a1d239018472bf27d0f2b98feb
-SHA256 (KDE/kdesdk-4.1.4.tar.bz2) = 115544852a0f4d7f8a44fd989e77f5f555498f02069d1d9f4e929e89b9b32cd0
-SIZE (KDE/kdesdk-4.1.4.tar.bz2) = 4979915
+MD5 (KDE/kdesdk-4.2.0.tar.bz2) = 79d01b4f10f1ecc283f7860d2c7973e9
+SHA256 (KDE/kdesdk-4.2.0.tar.bz2) = 2e53f7ff3331d3b72ce45bb71701ae38529212a5d35b7d8c8e26da2ee557fa05
+SIZE (KDE/kdesdk-4.2.0.tar.bz2) = 5434773
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 7b283c3054e2..d886e94f239d 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -31,6 +31,7 @@ bin/fixkdeincludes
 bin/fixuifiles
 bin/hotshot2calltree
 bin/includemocs
+bin/kapptemplate
 bin/kate
 bin/kbugbuster
 bin/kcachegrind
@@ -42,6 +43,7 @@ bin/kdemangen.pl
 bin/kdesvn-build
 bin/kio_svn_helper
 bin/kompare
+bin/kpartloader
 bin/krazy-licensecheck
 bin/kuiviewer
 bin/lokalize
@@ -82,7 +84,11 @@ include/kate/pluginconfigpageinterface.h
 include/kate/pluginmanager.h
 include/kate_export.h
 include/kprofilemethod.h
+lib/kde4/cervisiapart.so
 lib/kde4/kabcformat_kdeaccounts.so
+lib/kde4/katebacktracebrowserplugin.so
+lib/kde4/katebuildplugin.so
+lib/kde4/katectagsplugin.so
 lib/kde4/kateexternaltoolsplugin.so
 lib/kde4/katefilebrowserplugin.so
 lib/kde4/katefiletemplates.so
@@ -91,13 +97,14 @@ lib/kde4/katekonsoleplugin.so
 lib/kde4/katemailfilesplugin.so
 lib/kde4/kateopenheaderplugin.so
 lib/kde4/katequickdocumentswitcherplugin.so
+lib/kde4/katesnippetsplugin.so
 lib/kde4/katesymbolviewerplugin.so
 lib/kde4/katetabbarextensionplugin.so
 lib/kde4/katetextfilterplugin.so
 lib/kde4/kcal_bugzilla.so
 lib/kde4/kded_ksvnd.so
+lib/kde4/kio_perldoc.so
 lib/kde4/kio_svn.so
-lib/kde4/libcervisiapart.so
 lib/kde4/libkomparenavtreepart.so
 lib/kde4/libkomparepart.so
 lib/kde4/libkuiviewerpart.so
@@ -105,27 +112,28 @@ lib/kde4/plasma_applet_katesession.so
 lib/kde4/quithumbnail.so
 lib/libantlr.so
 lib/libantlr.so.5
-lib/libantlr.so.5.0.0
+lib/libantlr.so.5.0.1
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.5
-lib/libkateinterfaces.so.5.0.0
+lib/libkateinterfaces.so.5.0.1
 lib/libkdeinit4_cervisia.so
 lib/libkdeinit4_cvsaskpass.so
 lib/libkdeinit4_cvsservice.so
 lib/libkdeinit4_kate.so
 lib/libkomparedialogpages.so
 lib/libkomparedialogpages.so.5
-lib/libkomparedialogpages.so.5.0.0
+lib/libkomparedialogpages.so.5.0.1
 lib/libkomparediff2.so
 lib/libkomparediff2.so.5
-lib/libkomparediff2.so.5.0.0
+lib/libkomparediff2.so.5.0.1
 lib/libkompareinterface.so
 lib/libkompareinterface.so.5
-lib/libkompareinterface.so.5.0.0
+lib/libkompareinterface.so.5.0.1
 lib/strigi/strigila_diff.so
 lib/strigi/strigila_po.so
 lib/strigi/strigita_ts.so
 share/applications/kde4/cervisia.desktop
+share/applications/kde4/kapptemplate.desktop
 share/applications/kde4/kate.desktop
 share/applications/kde4/kbugbuster.desktop
 share/applications/kde4/kcachegrind.desktop
@@ -145,7 +153,9 @@ share/apps/kate/icons/oxygen/16x16/actions/modmod.png
 share/apps/kate/icons/oxygen/16x16/actions/modonhd.png
 share/apps/kate/icons/oxygen/16x16/actions/null.png
 share/apps/kate/kateui.rc
-share/apps/kate/pics/sessionchooser.png
+share/apps/kate/plugins/findinfiles/ui.rc
+share/apps/kate/plugins/katebuild/ui.rc
+share/apps/kate/plugins/katectags/ui.rc
 share/apps/kate/plugins/kateexternaltools/ui.rc
 share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate
 share/apps/kate/plugins/katefiletemplates/templates/cppgpl.hh.katetemplate
@@ -159,6 +169,7 @@ share/apps/kate/plugins/katekonsole/ui.rc
 share/apps/kate/plugins/katemailfiles/ui.rc
 share/apps/kate/plugins/kateopenheader/ui.rc
 share/apps/kate/plugins/katequickdocumentswitcher/ui.rc
+share/apps/kate/plugins/katesnippets/plugin_katesnippets.rc
 share/apps/kate/plugins/katesymbolviewer/ui.rc
 share/apps/kate/plugins/katetabbarextension/ui.rc
 share/apps/kate/plugins/katetextfilter/ui.rc
@@ -182,12 +193,31 @@ 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/kate-2.4.upd
+share/apps/kdevappwizard/template_previews/akonadi-resources.png
+share/apps/kdevappwizard/template_previews/default.png
+share/apps/kdevappwizard/template_previews/kapp4.png
+share/apps/kdevappwizard/template_previews/kderubyapp.png
+share/apps/kdevappwizard/template_previews/kpartapp.png
+share/apps/kdevappwizard/template_previews/plasma-applet.png
+share/apps/kdevappwizard/template_previews/pykde4.png
+share/apps/kdevappwizard/template_previews/pyqt4app.png
+share/apps/kdevappwizard/template_previews/qmake4gui.png
+share/apps/kdevappwizard/template_previews/runner.png
+share/apps/kio_perldoc/kio_perldoc.css
+share/apps/kio_perldoc/pod2html.pl
 share/apps/kompare/komparepartui.rc
 share/apps/kompare/kompareui.rc
+share/apps/kpartloader/kpartloaderui.rc
 share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
-share/apps/lokalize/lokalizeui.rc
+share/apps/lokalize/editorui.rc
+share/apps/lokalize/find-gui-text.sh
+share/apps/lokalize/lokalizemainwindowui.rc
 share/apps/lokalize/projectmanagerui.rc
+share/apps/lokalize/scripts/widget-text-capture.py
+share/apps/lokalize/scripts/widget-text-capture.rc
+share/apps/lokalize/scripts/widget-text-capture.ui
+share/apps/lokalize/translationmemoryrui.rc
 share/apps/umbrello/common.ent
 share/apps/umbrello/docbook2xhtml.xsl
 share/apps/umbrello/headings/heading.adb
@@ -324,6 +354,7 @@ share/apps/umbrello/pics/exception.png
 share/apps/umbrello/pics/final_activity.png
 share/apps/umbrello/pics/foreignkey_constraint.png
 share/apps/umbrello/pics/generalisation.png
+share/apps/umbrello/pics/hi64-app-umbrello.png
 share/apps/umbrello/pics/initial_state.png
 share/apps/umbrello/pics/interface.png
 share/apps/umbrello/pics/join.png
@@ -357,6 +388,7 @@ share/apps/umbrello/umbrelloui.rc
 share/apps/umbrello/xmi.css
 share/apps/umbrello/xmi2docbook.xsl
 share/config.kcfg/cervisiapart.kcfg
+share/config.kcfg/kapptemplate.kcfg
 share/config.kcfg/lokalize.kcfg
 share/config/katefiletemplates.knsrc
 share/config/katerc
@@ -482,6 +514,8 @@ 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/hicolor/128x128/apps/kapptemplate.png
+share/icons/hicolor/128x128/apps/kate.png
 share/icons/hicolor/128x128/apps/kbugbuster.png
 share/icons/hicolor/128x128/apps/kompare.png
 share/icons/hicolor/128x128/apps/lokalize.png
@@ -501,6 +535,8 @@ share/icons/hicolor/16x16/actions/prevuntranslated.png
 share/icons/hicolor/16x16/actions/search2msgstr.png
 share/icons/hicolor/16x16/actions/transsearch.png
 share/icons/hicolor/16x16/apps/cervisia.png
+share/icons/hicolor/16x16/apps/kapptemplate.png
+share/icons/hicolor/16x16/apps/kate.png
 share/icons/hicolor/16x16/apps/kbugbuster.png
 share/icons/hicolor/16x16/apps/kompare.png
 share/icons/hicolor/16x16/apps/kuiviewer.png
@@ -522,6 +558,8 @@ share/icons/hicolor/22x22/actions/prevuntranslated.png
 share/icons/hicolor/22x22/actions/search2msgstr.png
 share/icons/hicolor/22x22/actions/transsearch.png
 share/icons/hicolor/22x22/apps/cervisia.png
+share/icons/hicolor/22x22/apps/kapptemplate.png
+share/icons/hicolor/22x22/apps/kate.png
 share/icons/hicolor/22x22/apps/kbugbuster.png
 share/icons/hicolor/22x22/apps/kompare.png
 share/icons/hicolor/22x22/apps/umbrello.png
@@ -543,6 +581,8 @@ share/icons/hicolor/32x32/actions/prevuntranslated.png
 share/icons/hicolor/32x32/actions/search2msgstr.png
 share/icons/hicolor/32x32/actions/transsearch.png
 share/icons/hicolor/32x32/apps/cervisia.png
+share/icons/hicolor/32x32/apps/kapptemplate.png
+share/icons/hicolor/32x32/apps/kate.png
 share/icons/hicolor/32x32/apps/kbugbuster.png
 share/icons/hicolor/32x32/apps/kcachegrind.png
 share/icons/hicolor/32x32/apps/kompare.png
@@ -552,15 +592,20 @@ share/icons/hicolor/32x32/apps/umbrello.png
 share/icons/hicolor/32x32/mimetypes/umbrellofile.png
 share/icons/hicolor/48x48/actions/approved.png
 share/icons/hicolor/48x48/apps/cervisia.png
+share/icons/hicolor/48x48/apps/kapptemplate.png
+share/icons/hicolor/48x48/apps/kate.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/kapptemplate.png
+share/icons/hicolor/64x64/apps/kate.png
 share/icons/hicolor/64x64/apps/kbugbuster.png
 share/icons/hicolor/64x64/apps/lokalize.png
 share/icons/hicolor/64x64/apps/umbrello.png
 share/icons/hicolor/scalable/actions/approved.svgz
+share/icons/hicolor/scalable/apps/kate.svgz
 share/icons/hicolor/scalable/apps/kompare.svgz
 share/icons/hicolor/scalable/apps/lokalize.svgz
 share/icons/hicolor/scalable/apps/umbrello.svgz
@@ -687,8 +732,12 @@ share/icons/oxygen/scalable/actions/vcs_status.svgz
 share/icons/oxygen/scalable/actions/vcs_update.svgz
 share/kde4/services/ServiceMenus/subversion.desktop
 share/kde4/services/ServiceMenus/subversion_toplevel.desktop
+share/kde4/services/cervisiapart.desktop
 share/kde4/services/cvsservice.desktop
 share/kde4/services/designerthumbnail.desktop
+share/kde4/services/katebacktracebrowserplugin.desktop
+share/kde4/services/katebuildplugin.desktop
+share/kde4/services/katectagsplugin.desktop
 share/kde4/services/kateexternaltoolsplugin.desktop
 share/kde4/services/katefilebrowserplugin.desktop
 share/kde4/services/katefiletemplates.desktop
@@ -697,6 +746,7 @@ share/kde4/services/katekonsoleplugin.desktop
 share/kde4/services/katemailfilesplugin.desktop
 share/kde4/services/kateopenheader.desktop
 share/kde4/services/katequickdocumentswitcher.desktop
+share/kde4/services/katesnippets.desktop
 share/kde4/services/katesymbolviewer.desktop
 share/kde4/services/katetabbarextension.desktop
 share/kde4/services/katetextfilter.desktop
@@ -705,6 +755,7 @@ share/kde4/services/komparenavtreepart.desktop
 share/kde4/services/komparepart.desktop
 share/kde4/services/kresources/kcal/bugzilla.desktop
 share/kde4/services/kuiviewer_part.desktop
+share/kde4/services/perldoc.protocol
 share/kde4/services/plasma-applet-katesession.desktop
 share/kde4/services/svn+file.protocol
 share/kde4/services/svn+http.protocol
@@ -715,58 +766,13 @@ share/kde4/servicetypes/kateplugin.desktop
 share/kde4/servicetypes/komparenavigationpart.desktop
 share/kde4/servicetypes/kompareviewpart.desktop
 share/strigi/fieldproperties/strigi_translation.fieldproperties
-@dirrmtry share/strigi/fieldproperties
-@dirrmtry share/strigi
-@dirrmtry share/kde4/servicetypes
-@dirrmtry share/kde4/services/kresources/kcal
-@dirrmtry share/kde4/services/kresources
-@dirrmtry share/kde4/services/kded
-@dirrmtry share/kde4/services/ServiceMenus
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/oxygen/scalable/actions
-@dirrmtry share/icons/oxygen/scalable
-@dirrmtry share/icons/oxygen/64x64/actions
-@dirrmtry share/icons/oxygen/64x64
-@dirrmtry share/icons/oxygen/48x48/actions
-@dirrmtry share/icons/oxygen/48x48
-@dirrmtry share/icons/oxygen/32x32/actions
-@dirrmtry share/icons/oxygen/32x32
-@dirrmtry share/icons/oxygen/22x22/actions
-@dirrmtry share/icons/oxygen/22x22
-@dirrmtry share/icons/oxygen/16x16/actions
-@dirrmtry share/icons/oxygen/16x16
-@dirrmtry share/icons/oxygen/128x128/actions
-@dirrmtry share/icons/oxygen/128x128
-@dirrmtry share/icons/oxygen
-@dirrmtry share/icons/locolor/32x32/actions
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor/16x16/actions
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable/actions
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48/actions
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/mimetypes
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32/actions
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/mimetypes
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16/actions
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+@dirrm share/strigi/fieldproperties
+@dirrm share/strigi
+@dirrm share/icons/locolor/32x32/actions
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/actions
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/lokalize
 @dirrm share/doc/HTML/en/kompare
@@ -777,20 +783,18 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/doc/HTML/en/kate
 @dirrm share/doc/HTML/en/kapptemplate
 @dirrm share/doc/HTML/en/cervisia
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/dbus-1/interfaces
-@dirrmtry share/dbus-1
-@dirrmtry share/config.kcfg
-@dirrmtry share/config
 @dirrm share/apps/umbrello/pics
 @dirrm share/apps/umbrello/headings
 @dirrm share/apps/umbrello
+@dirrm share/apps/lokalize/scripts
 @dirrm share/apps/lokalize
 @dirrm share/apps/kuiviewerpart
 @dirrm share/apps/kuiviewer
+@dirrm share/apps/kpartloader
 @dirrm share/apps/kompare
-@dirrmtry share/apps/kconf_update
+@dirrm share/apps/kio_perldoc
+@dirrm share/apps/kdevappwizard/template_previews
+@dirrm share/apps/kdevappwizard
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32
 @dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions
@@ -802,11 +806,10 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/kcachegrind
 @dirrm share/apps/kbugbuster/pics
 @dirrm share/apps/kbugbuster
-@dirrmtry share/apps/katepart/syntax
-@dirrmtry share/apps/katepart
 @dirrm share/apps/kate/plugins/katetextfilter
 @dirrm share/apps/kate/plugins/katetabbarextension
 @dirrm share/apps/kate/plugins/katesymbolviewer
+@dirrm share/apps/kate/plugins/katesnippets
 @dirrm share/apps/kate/plugins/katequickdocumentswitcher
 @dirrm share/apps/kate/plugins/kateopenheader
 @dirrm share/apps/kate/plugins/katemailfiles
@@ -814,20 +817,15 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/kate/plugins/katefiletemplates/templates
 @dirrm share/apps/kate/plugins/katefiletemplates
 @dirrm share/apps/kate/plugins/kateexternaltools
+@dirrm share/apps/kate/plugins/katectags
+@dirrm share/apps/kate/plugins/katebuild
+@dirrm share/apps/kate/plugins/findinfiles
 @dirrm share/apps/kate/plugins
-@dirrm share/apps/kate/pics
 @dirrm share/apps/kate/icons/oxygen/16x16/actions
 @dirrm share/apps/kate/icons/oxygen/16x16
 @dirrm share/apps/kate/icons/oxygen
 @dirrm share/apps/kate/icons
-@dirrmtry share/apps/kate
-@dirrmtry share/apps/kabc/formats
-@dirrmtry share/apps/kabc
+@dirrm share/apps/kate
 @dirrm share/apps/cervisiapart
 @dirrm share/apps/cervisia
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/strigi
-@dirrmtry lib/kde4
 @dirrm include/kate