Update to 2.1.5

PR:		47814
Submitted by:	Lev A. Serebryakov <lev@serebryakov.spb.ru>

3 files changed, 43 insertions, 10 deletions

diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 53942164136b..a8f48f6beb53 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.5
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/3.0.3/src
+MASTER_SITE_SUBDIR=	stable/kdevelop-${PORTVERSION}/src
 DISTNAME=	${KDE_DISTNAME}
 DIST_SUBDIR=	KDE
 
@@ -26,14 +26,15 @@ RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
 		a2ps:${PORTSDIR}/print/a2ps-letter
 .endif
 
-KDE_DISTNAME=		${PORTNAME}-${PORTVERSION}_for_KDE_3.0
+KDE_DISTNAME=		${PORTNAME}-${PORTVERSION}_for_KDE_3.1
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt/html
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
 
 pre-everything::
 .if !defined(WITH_OPTIONAL_DEPENDS)
@@ -43,4 +44,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index b80c93ced248..f592b41300a8 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdevelop-2.1.3_for_KDE_3.0.tar.bz2) = f71ad2aa07522f99ef62bc46d2e3e8bf
+MD5 (KDE/kdevelop-2.1.5_for_KDE_3.1.tar.bz2) = 8953caa03c22aabe6707ca494a0d4a41
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 21875a8de88f..e24856ae51ad 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -23,6 +23,38 @@ lib/libkdevelopsetup.so.2
 lib/libkdevelopvc.la
 lib/libkdevelopvc.so
 lib/libkdevelopvc.so.2
+share/locale/af/LC_MESSAGES/kdevelop.mo
+share/locale/ar/LC_MESSAGES/kdevelop.mo
+share/locale/az/LC_MESSAGES/kdevelop.mo
+share/locale/da/LC_MESSAGES/kdevelop.mo
+share/locale/de/LC_MESSAGES/kdevelop.mo
+share/locale/en_GB/LC_MESSAGES/kdevelop.mo
+share/locale/es/LC_MESSAGES/kdevelop.mo
+share/locale/et/LC_MESSAGES/kdevelop.mo
+share/locale/fi/LC_MESSAGES/kdevelop.mo
+share/locale/fr/LC_MESSAGES/kdevelop.mo
+share/locale/hu/LC_MESSAGES/kdevelop.mo
+share/locale/id/LC_MESSAGES/kdevelop.mo
+share/locale/is/LC_MESSAGES/kdevelop.mo
+share/locale/it/LC_MESSAGES/kdevelop.mo
+share/locale/ja/LC_MESSAGES/kdevelop.mo
+share/locale/lv/LC_MESSAGES/kdevelop.mo
+share/locale/nb/LC_MESSAGES/kdevelop.mo
+share/locale/nl/LC_MESSAGES/kdevelop.mo
+share/locale/nn/LC_MESSAGES/kdevelop.mo
+share/locale/pl/LC_MESSAGES/kdevelop.mo
+share/locale/pt/LC_MESSAGES/kdevelop.mo
+share/locale/pt_BR/LC_MESSAGES/kdevelop.mo
+share/locale/ro/LC_MESSAGES/kdevelop.mo
+share/locale/sk/LC_MESSAGES/kdevelop.mo
+share/locale/sl/LC_MESSAGES/kdevelop.mo
+share/locale/sv/LC_MESSAGES/kdevelop.mo
+share/locale/ta/LC_MESSAGES/kdevelop.mo
+share/locale/tr/LC_MESSAGES/kdevelop.mo
+share/locale/vi/LC_MESSAGES/kdevelop.mo
+share/locale/xh/LC_MESSAGES/kdevelop.mo
+share/locale/zh_CN/LC_MESSAGES/kdevelop.mo
+share/locale/zu/LC_MESSAGES/kdevelop.mo
 share/applnk/Development/kdevelop-setup.desktop
 share/applnk/Development/kdevelop.desktop
 share/apps/kconf_update/kdevelop2.upd
@@ -249,8 +281,8 @@ share/icons/hicolor/16x16/apps/kdevelop.png
 share/icons/hicolor/32x32/apps/kdevelop.png
 share/icons/hicolor/48x48/apps/kdevelop.png
 share/mimelnk/application/x-kdevelop-project.desktop
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @dirrm share/doc/HTML/en/kdevelop/welcome
 @dirrm share/doc/HTML/en/kdevelop/tutorial
 @dirrm share/doc/HTML/en/kdevelop/reference/C
@@ -269,5 +301,5 @@ share/mimelnk/application/x-kdevelop-project.desktop
 @dirrm share/apps/kdevelop/icons/hicolor
 @dirrm share/apps/kdevelop/icons
 @dirrm share/apps/kdevelop
-@dirrm share/applnk/Development
-@dirrm share/applnk
+@unexec rmdir %D/share/applnk/Development 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true