Update to kdevelop 3.3.6 (part of KDE 3.5.6)

4 files changed, 43 insertions, 37 deletions

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 6ea3e978068..bdff31d3ffd 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2007/01/26 03:30:26 markd Exp $
 
-DISTNAME=	kdevelop-3.3.5
-PKGNAME=	kdevelop-base-3.3.5
-PKGREVISION=	1
+DISTNAME=	kdevelop-3.3.6
+PKGNAME=	kdevelop-base-3.3.6
 CATEGORIES=	devel kde
 
 HOMEPAGE=       http://www.kdevelop.org/
@@ -34,6 +33,12 @@ REPLACE_PERL+= \
 	languages/perl/app_templates/perlhello/app.pl \
 	languages/perl/file_templates/pl
 
+SUBST_CLASSES+=		perlpath
+SUBST_STAGE.perlpath=	post-patch
+SUBST_MESSAGE.perlpath=	Fix perl path.
+SUBST_FILES.perlpath=	languages/perl/perlparser.cpp parts/doxygen/config.cpp
+SUBST_SED.perlpath=	-e s:/usr/bin/perl:${PERL5}:
+
 EVAL_PREFIX+=	\
 	QT3DIR=qt3 \
 	KDELIBDIR=kdelibs
@@ -49,6 +54,7 @@ CONFIGURE_ARGS+= \
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/kdesdk3/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index d60a99603bd..a3432ad2a8a 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/10/12 11:10:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/01/26 03:30:26 markd Exp $
 bin/kdevassistant
 bin/kdevdesigner
 bin/kdevelop
@@ -355,6 +355,24 @@ share/doc/kde/HTML/en/kdevelop/setup.docbook
 share/doc/kde/HTML/en/kdevelop/survey-manual.docbook
 share/doc/kde/HTML/en/kdevelop/unixdev.docbook
 share/doc/kde/HTML/en/kdevelop/wrong-project-location.png
+share/icons/hicolor/16x16/actions/breakpoint_add.png
+share/icons/hicolor/16x16/actions/breakpoint_delete.png
+share/icons/hicolor/16x16/actions/breakpoint_delete_all.png
+share/icons/hicolor/16x16/actions/breakpoint_edit.png
+share/icons/hicolor/16x16/actions/ktip.png
+share/icons/hicolor/16x16/apps/kdevassistant.png
+share/icons/hicolor/16x16/apps/kdevdesigner.png
+share/icons/hicolor/16x16/apps/kdevelop.png
+share/icons/hicolor/32x32/actions/ktip.png
+share/icons/hicolor/32x32/apps/kdevassistant.png
+share/icons/hicolor/32x32/apps/kdevdesigner.png
+share/icons/hicolor/32x32/apps/kdevelop.png
+share/icons/hicolor/48x48/actions/ktip.png
+share/icons/hicolor/48x48/apps/kdevassistant.png
+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/kde/apps/kconf_update/kdev-gen-settings.upd
 share/kde/apps/kdevabbrev/kdevabbrev.rc
 share/kde/apps/kdevabbrev/sources/cpp_keywords
@@ -1196,24 +1214,6 @@ share/kde/apps/qeditorpart/highlight/qt.xml
 share/kde/apps/qeditorpart/qeditor_part.rc
 share/kde/config/kdevassistantrc
 share/kde/config/kdeveloprc
-share/kde/icons/hicolor/16x16/actions/breakpoint_add.png
-share/kde/icons/hicolor/16x16/actions/breakpoint_delete.png
-share/kde/icons/hicolor/16x16/actions/breakpoint_delete_all.png
-share/kde/icons/hicolor/16x16/actions/breakpoint_edit.png
-share/kde/icons/hicolor/16x16/actions/ktip.png
-share/kde/icons/hicolor/16x16/apps/kdevassistant.png
-share/kde/icons/hicolor/16x16/apps/kdevdesigner.png
-share/kde/icons/hicolor/16x16/apps/kdevelop.png
-share/kde/icons/hicolor/32x32/actions/ktip.png
-share/kde/icons/hicolor/32x32/apps/kdevassistant.png
-share/kde/icons/hicolor/32x32/apps/kdevdesigner.png
-share/kde/icons/hicolor/32x32/apps/kdevelop.png
-share/kde/icons/hicolor/48x48/actions/ktip.png
-share/kde/icons/hicolor/48x48/apps/kdevassistant.png
-share/kde/icons/hicolor/48x48/apps/kdevdesigner.png
-share/kde/icons/hicolor/48x48/apps/kdevelop.png
-share/kde/icons/locolor/16x16/actions/kdevelop_tip.png
-share/kde/icons/locolor/32x32/actions/kdevelop_tip.png
 share/kde/mimelnk/application/x-kdevelop.desktop
 share/kde/mimelnk/text/x-fortran.desktop
 share/kde/services/chm.protocol
@@ -1333,14 +1333,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/text
 @comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/locolor/32x32/actions
-@comment in kde: @dirrm share/kde/icons/locolor/16x16/actions
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/actions
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/actions
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/actions
 @comment in kde: @dirrm share/kde/config
 @dirrm share/kde/apps/qeditorpart/highlight
 @dirrm share/kde/apps/qeditorpart
@@ -1473,6 +1465,14 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/kde/apps/kdevabbrev
 @comment in kde: @dirrm share/kde/apps/kconf_update
 @comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/icons/locolor/32x32/actions
+@comment in kde: @dirrm share/icons/locolor/16x16/actions
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/actions
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/actions
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/actions
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
 @dirrm share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
 @dirrm share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index cd5e839111b..c6a60d3e2f0 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2006/10/12 11:10:15 markd Exp $
+$NetBSD: distinfo,v 1.28 2007/01/26 03:30:26 markd Exp $
 
-SHA1 (kdevelop-3.3.5.tar.bz2) = 5de503d814abc9c70130326b50484ebb5bac3364
-RMD160 (kdevelop-3.3.5.tar.bz2) = 7c422d62073fd8984d1464fec7201d255b147b40
-Size (kdevelop-3.3.5.tar.bz2) = 8178575 bytes
+SHA1 (kdevelop-3.3.6.tar.bz2) = 90d56409cf1108b4469c1ce98e7517dc46633eb9
+RMD160 (kdevelop-3.3.6.tar.bz2) = 1a1356e9eb015b2947cd64ba9ba223479d1ef3a4
+Size (kdevelop-3.3.6.tar.bz2) = 8176547 bytes
 SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
 SHA1 (patch-af) = ed3d61bb5dbaa22516088e8591db1fa41e913016
 SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 0b67c5acea0..b9f72f57b15 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2006/10/20 20:06:46 markd Exp $
+# $NetBSD: Makefile,v 1.64 2007/01/26 03:31:32 markd Exp $
 
-DISTNAME=	kdevelop-3.3.5
+DISTNAME=	kdevelop-3.3.6
 CATEGORIES=	devel kde meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty