Update KDevelop to 4.5.2.

Additionally, support staging in all ports being changed here, replace
USE_GMAKE=yes with USES=gmake and fix a typo in the CMake parameters passed
in kdevelop-kde4 when the OKTETA option is disabled.

Submitted by:	Schaich Alonso <alonsoschaich@fastmail.fm>

13 files changed, 173 insertions, 68 deletions

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index dbf42ca6f9fa..03807dc5cbac 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -80,7 +80,7 @@ KTP_VERSION?=		0.6.1
 KTP_BRANCH?=		stable
 CALLIGRA_VERSION?=	2.6.2
 CALLIGRA_BRANCH?=	stable
-KDEVELOP_VERSION?=	4.5.1
+KDEVELOP_VERSION?=	4.5.2
 KDEVELOP_BRANCH?=	stable
 
 #
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index 7c6c1f755333..91ffb8d5a46b 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdevelop
 DISTVERSION=	${KDEVELOP_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
@@ -19,23 +18,21 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USE_KDE4=	kdehier kdelibs kdeprefix sharedmime workspace automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
-USE_BZIP2=	yes
-USES=		cmake shared-mime-info
-USE_GMAKE=	yes
+USE_XZ=		yes
+USES=		cmake gmake shared-mime-info
 
 OPTIONS_DEFINE=	OKTETA PHP NLS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 OKTETA_DESC=	Hex editing support via Okteta
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOKTETA}
 LIB_DEPENDS+=	okteta1core:${PORTSDIR}/devel/kdesdk4
 PLIST_SUB+=	OKTETA=""
 .else
-CMAKE_ARGS+=	WITH_LibOkteta:BOOL=FALSE
+CMAKE_ARGS+=	-DWITH_LibOkteta:BOOL=FALSE
 PLIST_SUB+=	OKTETA="@comment "
 .endif
 
diff --git a/devel/kdevelop-kde4/distinfo b/devel/kdevelop-kde4/distinfo
index 2ce8699c6a56..bebd7da30ee4 100644
--- a/devel/kdevelop-kde4/distinfo
+++ b/devel/kdevelop-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevelop-4.5.1.tar.bz2) = 36b559b0c0aff13370e27dda57383605e719b55e4b95abd932e513183fcb46ee
-SIZE (KDE/kdevelop-4.5.1.tar.bz2) = 5342081
+SHA256 (KDE/kdevelop-4.5.2.tar.xz) = d157224a81c886cbe32d25600a29042a6fec1e0c535202dc85748cd15877fe30
+SIZE (KDE/kdevelop-4.5.2.tar.xz) = 4901660
diff --git a/devel/kdevelop-kde4/pkg-plist b/devel/kdevelop-kde4/pkg-plist
index 4f166bece8bb..d90e62410e52 100644
--- a/devel/kdevelop-kde4/pkg-plist
+++ b/devel/kdevelop-kde4/pkg-plist
@@ -262,8 +262,10 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevokteta.mo
@@ -273,10 +275,13 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevokteta.mo
@@ -296,10 +301,13 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevokteta.mo
@@ -400,8 +408,10 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevokteta.mo
@@ -411,17 +421,35 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevelop.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevcmake.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevcmakebuilder.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevcustombuildsystem.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevcustommake.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevexecuteplasmoid.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevformatters.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevkdeprovider.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevmakebuilder.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevokteta.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevqthelp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevcpp.mo
@@ -460,6 +488,7 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevgdb.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevmakebuilder.mo
@@ -504,8 +533,10 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevokteta.mo
@@ -547,13 +578,35 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevmakebuilder.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevqthelp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcmake.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcmakebuilder.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcustombuildsystem.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcustommake.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevexecuteplasmoid.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevformatters.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevkdeprovider.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevmakebuilder.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevokteta.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevqthelp.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevcpp.mo
@@ -587,6 +640,19 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/th/LC_MESSAGES/kdevcustommake.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevcmake.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevcmakebuilder.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevcustombuildsystem.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevcustommake.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevformatters.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevmakebuilder.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevokteta.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kdevqthelp.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevcpp.mo
@@ -623,8 +689,10 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevmanpage.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevokteta.mo
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index 2fe81b151035..cf3ef4e0d5aa 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kdevelop-php-docs
 PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
@@ -15,10 +14,9 @@ LIB_DEPENDS=	kdevplatforminterfaces:${PORTSDIR}/devel/kdevplatform
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_BZIP2=	yes
+USE_XZ=		yes
 USES=		cmake
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/devel/kdevelop-php-docs/distinfo b/devel/kdevelop-php-docs/distinfo
index ce12ea2a9db4..ef531bec5639 100644
--- a/devel/kdevelop-php-docs/distinfo
+++ b/devel/kdevelop-php-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevelop-php-docs-1.5.1.tar.bz2) = 09ecb47f44db0f47dd43c7bec1c06a8d303b870677b44e15b4da124f6a72dd16
-SIZE (KDE/kdevelop-php-docs-1.5.1.tar.bz2) = 34694
+SHA256 (KDE/kdevelop-php-docs-1.5.2.tar.xz) = 1b8dbecbb0ad74910754b839fc29621aaf942792f9f30fd32521598d28711425
+SIZE (KDE/kdevelop-php-docs-1.5.2.tar.xz) = 32368
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index 5c9fa721ca43..ba17cb3331c2 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kdevelop-php
 PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
@@ -16,9 +15,8 @@ BUILD_DEPENDS=	${KDE4_PREFIX}/bin/kdev-pg-qt:${PORTSDIR}/devel/kdevelop-pg-qt
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_BZIP2=	yes
-USES=		cmake
-USE_GMAKE=	yes
+USE_XZ=		yes
+USES=		cmake gmake
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	PHPDOCS NLS
@@ -26,7 +24,6 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 PHPDOCS_DESC=	Integrate with PHP.net documentation
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPHPDOCS}
diff --git a/devel/kdevelop-php/distinfo b/devel/kdevelop-php/distinfo
index ebb604fffca2..f690195d6b80 100644
--- a/devel/kdevelop-php/distinfo
+++ b/devel/kdevelop-php/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevelop-php-1.5.1.tar.bz2) = 27a2ddab1ae8ff8f35b6f18a8591f5dd138f6f469c9ebe3035177f0268c8e4bb
-SIZE (KDE/kdevelop-php-1.5.1.tar.bz2) = 678171
+SHA256 (KDE/kdevelop-php-1.5.2.tar.xz) = 2ee676dd81af01a36c042248300ef1c5d27dfa1d5e29aa2e03749db8f4808f2d
+SIZE (KDE/kdevelop-php-1.5.2.tar.xz) = 649044
diff --git a/devel/kdevelop-php/pkg-plist b/devel/kdevelop-php/pkg-plist
index cb631e231e9a..9b73274f0fab 100644
--- a/devel/kdevelop-php/pkg-plist
+++ b/devel/kdevelop-php/pkg-plist
@@ -20,6 +20,7 @@ share/kde4/services/kdevphpunitprovider.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevphp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevphp.mo
@@ -28,6 +29,7 @@ share/kde4/services/kdevphpunitprovider.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevphp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevphp.mo
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 46934ce7abf0..89b4d2453600 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdevplatform
 PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
@@ -20,14 +19,13 @@ LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion \
 USE_KDE4=	kate_run kdehier kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
 		corelib designer_build gui webkit
-USE_BZIP2=	yes
+USE_XZ=		yes
 USES=		cmake
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	SHLIB_VER=7.0.0 \
 		SHLIB_SHVER=7
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/devel/kdevplatform/distinfo b/devel/kdevplatform/distinfo
index 462c096695a2..d042e4e87bb5 100644
--- a/devel/kdevplatform/distinfo
+++ b/devel/kdevplatform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevplatform-1.5.1.tar.bz2) = 37bc8985ca855673dce085722ae3cfd3703b9155eb5d0b31e60b975c976a410f
-SIZE (KDE/kdevplatform-1.5.1.tar.bz2) = 2272743
+SHA256 (KDE/kdevplatform-1.5.2.tar.xz) = a12656cfe137172db5feed9795b4f40b7fb42a93b6caf90838e5f9c205ee186a
+SIZE (KDE/kdevplatform-1.5.2.tar.xz) = 1895448
diff --git a/devel/kdevplatform/files/patch-git_4b04ee5 b/devel/kdevplatform/files/patch-git_4b04ee5
deleted file mode 100644
index e842e25748c6..000000000000
--- a/devel/kdevplatform/files/patch-git_4b04ee5
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 4b04ee5b50ef67df8636af837271984c4f7ead8b
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Thu Jun 20 22:00:10 2013 +0300
-
-    Install the Grantlee filter into the right location.
-    
-    This is similar to what was done to Skrooge in commit 14baa01.
-    
-    Grantlee plugins, such as kdev_filters, are Qt plugins, and thus it makes
-    sense to install it into ${PLUGIN_INSTALL_DIR} instead of installing into
-    the same directory Grantlee uses for its own filters.
-    
-    It's also worth pointing out that people are expected to have the
-    QT_PLUGIN_PATH environment variable correctly set for the filter to be
-    found by Grantlee.
-
-diff --git a/template/CMakeLists.txt b/template/CMakeLists.txt
-index 0dfa658..a35d2cd 100644
---- template/CMakeLists.txt
-+++ template/CMakeLists.txt
-@@ -1,11 +1,3 @@
--
--set (
--    TEMPLATE_FILTERS_INSTALL_ARGS
--    LIBRARY DESTINATION "${LIB_INSTALL_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}"
--    ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}"
--    RUNTIME DESTINATION "${BIN_INSTALL_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}"
--)
--
- include (${Grantlee_USE_FILE})
- 
- add_subdirectory(filters)
-diff --git a/template/filters/CMakeLists.txt b/template/filters/CMakeLists.txt
-index 8f59000..8a9e0a6 100644
---- template/filters/CMakeLists.txt
-+++ template/filters/CMakeLists.txt
-@@ -3,4 +3,4 @@ set(kdevfilters_SRCS kdevfilters.cpp)
- grantlee_add_plugin(kdev_filters kdevfilters)
- target_link_libraries(kdev_filters ${KDE4_KDECORE_LIBS} kdevplatformlanguage)
- 
--install(TARGETS kdev_filters DESTINATION ${TEMPLATE_FILTERS_INSTALL_ARGS})
-+install(TARGETS kdev_filters DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR})
diff --git a/devel/kdevplatform/pkg-plist b/devel/kdevplatform/pkg-plist
index bf4ae12f9101..3df32d51d9f3 100644
--- a/devel/kdevplatform/pkg-plist
+++ b/devel/kdevplatform/pkg-plist
@@ -534,6 +534,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevgrepview.mo
@@ -551,6 +552,8 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevclassbrowser.mo
@@ -563,6 +566,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevgrepview.mo
@@ -579,6 +583,9 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevsnippet.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevsubversion.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevclassbrowser.mo
@@ -617,6 +624,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/da/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevgrepview.mo
@@ -633,6 +641,9 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/da/LC_MESSAGES/kdevsnippet.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevsubversion.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevclassbrowser.mo
@@ -827,6 +838,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevgrepview.mo
@@ -844,6 +856,8 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevclassbrowser.mo
@@ -856,6 +870,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevgrepview.mo
@@ -873,6 +888,8 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevclassbrowser.mo
@@ -1037,6 +1054,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevgrepview.mo
@@ -1054,6 +1072,8 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevclassbrowser.mo
@@ -1119,6 +1139,70 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevtemplates_config.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevvcsprojectintegration.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevappwizard.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevclassbrowser.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevcodeutils.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevcontextbrowser.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevcvs.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevdocumentswitcher.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevdocumentview.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevexecute.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevexecutescript.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevexternalscript.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevfiletemplates.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevgenericprojectmanager.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevgit.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevgrepview.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevkonsole.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevopenwith.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevpastebin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevpatchreview.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevplatform.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevproblemreporter.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevprojectmanagerview.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevquickopen.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevreviewboard.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevsnippet.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevstandardoutputview.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevsubversion.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevtestview.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdevvcsprojectintegration.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevappwizard.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevclassbrowser.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcodeutils.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcontextbrowser.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevcvs.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevdocumentswitcher.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevdocumentview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevexecute.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevexecutescript.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevexternalscript.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevfiletemplates.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevgenericprojectmanager.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevgit.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevgrepview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevkonsole.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevopenwith.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevpastebin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevpatchreview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevplatform.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevproblemreporter.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevprojectmanagerview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevquickopen.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevreviewboard.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevsnippet.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevstandardoutputview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevsubversion.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevtestview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevclassbrowser.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevcodeutils.mo
@@ -1259,6 +1343,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevgrepview.mo
@@ -1276,6 +1361,8 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevvcsprojectintegration.mo
 @dirrm share/apps/plasma/plasmoids/org.kdevelop.branches/contents/qml
 @dirrm share/apps/plasma/plasmoids/org.kdevelop.branches/contents