bl3ify and update to kdevelop3.0.3

Changes:
* Fixed: A case where selected items that disappeared due to filesystem
  events could crash the FileTree.
* Fixed: Several language parsers were updated to use QRegExp instead of
  the deprecated KRegExp.
* Fixed: 74570: Custom makefiles project doesn't support "GNUmakefile"
  file name (Don't try to outguess make.)
* Fixed: 75172: Changing projects with unsaved work (Don't set recent
  project marker when user cancels project change.)
* Fixed: 75943: Crash during directory scan (Don't crash when we don't have
  permission to read a directory.)
* Fixed: 77278: Grep component fails to search with spaces in path
* Fixed: 78776: Crash in CustomProjectPart::populateProject populating new
  project

5 files changed, 60 insertions, 27 deletions

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 6c97da5864f..ee0b9f296d3 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/20 14:15:41 markd Exp $
 
-DISTNAME=	kdevelop-3.0.2
-PKGNAME=	kdevelop-base-3.0.2
-PKGREVISION=	1
+DISTNAME=	kdevelop-3.0.3
+PKGNAME=	kdevelop-base-3.0.3
 CATEGORIES=	devel kde
 
 HOMEPAGE=       http://www.kdevelop.org/
@@ -11,7 +10,7 @@ COMMENT=	Base modules for IDE for Unix/X11/KDE
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 DEPENDS+=		automake>=1.7:../../devel/automake
 DEPENDS+=		doxygen>=1.3.5:../../devel/doxygen
@@ -24,7 +23,7 @@ DEPENDS+=		qt3-tools>=3.1.1:../../x11/qt3-tools
 
 CONFLICTS+=	kdevelop<=1.3
 
-USE_PERL5=	yes
+USE_PERL5=	run
 
 REPLACE_PERL= \
 	kdevprj2kdevelop \
@@ -47,8 +46,10 @@ CONFIGURE_ARGS+= \
 
 CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
 
-.include "../../databases/db4/buildlink2.mk"
-.include "../../devel/kdesdk3/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+
+.include "../../databases/db4/buildlink3.mk"
+.include "../../devel/kdesdk3/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 5ca078e5546..508b9bb99fe 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/09 13:03:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/20 14:15:41 markd Exp $
 bin/kdevelop
 bin/kdevelop-htdig
 bin/kdevprj2kdevelop
@@ -260,12 +260,21 @@ share/doc/kde/HTML/en/kde_app_devel/kscribblefiles.png
 share/doc/kde/HTML/en/kdevelop/SF-general.png
 share/doc/kde/HTML/en/kdevelop/SF-indent.png
 share/doc/kde/HTML/en/kdevelop/SF-other.png
+share/doc/kde/HTML/en/kdevelop/applicationwizard.docbook
 share/doc/kde/HTML/en/kdevelop/automake-file-popup.png
 share/doc/kde/HTML/en/kdevelop/automake-subproject-popup.png
 share/doc/kde/HTML/en/kdevelop/automake-target-popup.png
 share/doc/kde/HTML/en/kdevelop/automakemanager.png
 share/doc/kde/HTML/en/kdevelop/classview.png
 share/doc/kde/HTML/en/kdevelop/common
+share/doc/kde/HTML/en/kdevelop/configure-adddialog-baselibs.png
+share/doc/kde/HTML/en/kdevelop/configure-adddialog-qt.png
+share/doc/kde/HTML/en/kdevelop/configure-adddialog.png
+share/doc/kde/HTML/en/kdevelop/configure-doctree-DevHelp.png
+share/doc/kde/HTML/en/kdevelop/configure-doctree-TOC.png
+share/doc/kde/HTML/en/kdevelop/configure-doctree-bookmark.png
+share/doc/kde/HTML/en/kdevelop/configure-doctree-general.png
+share/doc/kde/HTML/en/kdevelop/configure-doctree-textsearch.png
 share/doc/kde/HTML/en/kdevelop/configure-editor.png
 share/doc/kde/HTML/en/kdevelop/configure-file-selector.png
 share/doc/kde/HTML/en/kdevelop/configure-general.png
@@ -273,7 +282,10 @@ share/doc/kde/HTML/en/kdevelop/configure-select.png
 share/doc/kde/HTML/en/kdevelop/configure-snippets.png
 share/doc/kde/HTML/en/kdevelop/create-new-project-cvs.png
 share/doc/kde/HTML/en/kdevelop/createnewproject.png
+share/doc/kde/HTML/en/kdevelop/doctree-add-bookmark.png
+share/doc/kde/HTML/en/kdevelop/doctree.png
 share/doc/kde/HTML/en/kdevelop/doctreeview.png
+share/doc/kde/HTML/en/kdevelop/edit-doctree-TOC-entry.png
 share/doc/kde/HTML/en/kdevelop/file-selector.png
 share/doc/kde/HTML/en/kdevelop/filetree.png
 share/doc/kde/HTML/en/kdevelop/importdirectory.png
@@ -281,14 +293,19 @@ share/doc/kde/HTML/en/kdevelop/index.cache.bz2
 share/doc/kde/HTML/en/kdevelop/index.docbook
 share/doc/kde/HTML/en/kdevelop/kdevelop-ideal-mode-0.png
 share/doc/kde/HTML/en/kdevelop/kdevelop-ideal-mode.png
+share/doc/kde/HTML/en/kdevelop/kdevelop-install.docbook
 share/doc/kde/HTML/en/kdevelop/kdevelop-mdi-mode.png
+share/doc/kde/HTML/en/kdevelop/kdevelop-survey.docbook
 share/doc/kde/HTML/en/kdevelop/kdevelop-tabbed-mode.png
 share/doc/kde/HTML/en/kdevelop/kdevelop-toplevel-mode.png
 share/doc/kde/HTML/en/kdevelop/loading-progress-bar.png
 share/doc/kde/HTML/en/kdevelop/open-project.png
 share/doc/kde/HTML/en/kdevelop/open-recent-project.png
+share/doc/kde/HTML/en/kdevelop/project-management.docbook
 share/doc/kde/HTML/en/kdevelop/select-user-interface-0.png
 share/doc/kde/HTML/en/kdevelop/select-user-interface.png
+share/doc/kde/HTML/en/kdevelop/setup.docbook
+share/doc/kde/HTML/en/kdevelop/unixdev.docbook
 share/doc/kde/HTML/en/kdevelop/wrong-project-location.png
 share/kde/applnk/Development/kdevelop.desktop
 share/kde/apps/devdoctreeview/indices/kde2book.index
@@ -406,7 +423,7 @@ share/kde/apps/kdevappwizard/template-common/kdevelop.pm
 share/kde/apps/kdevappwizard/template-common/wx-Makefile.am
 share/kde/apps/kdevappwizard/template-common/wx-Makefile.cvs
 share/kde/apps/kdevappwizard/template-common/wx-configure.in
-share/kde/apps/kdevappwizard/template-common/wxwindows.tar.gz
+share/kde/apps/kdevappwizard/template-common/wxwidgets.tar.gz
 share/kde/apps/kdevappwizard/template-cpphello/app.kdevelop
 share/kde/apps/kdevappwizard/template-cpphello/configure.in
 share/kde/apps/kdevappwizard/template-cpphello/cpp-Makefile.am
@@ -613,6 +630,19 @@ share/kde/apps/kdevappwizard/template-khello/preview.png
 share/kde/apps/kdevappwizard/template-khello/script
 share/kde/apps/kdevappwizard/template-khello/src-Makefile.am
 share/kde/apps/kdevappwizard/template-khello/subdirs
+share/kde/apps/kdevappwizard/template-khello2/app.cpp
+share/kde/apps/kdevappwizard/template-khello2/app.desktop
+share/kde/apps/kdevappwizard/template-khello2/app.h
+share/kde/apps/kdevappwizard/template-khello2/app.kdevelop
+share/kde/apps/kdevappwizard/template-khello2/appui.rc
+share/kde/apps/kdevappwizard/template-khello2/main.cpp
+share/kde/apps/kdevappwizard/template-khello2/preview.png
+share/kde/apps/kdevappwizard/template-khello2/script
+share/kde/apps/kdevappwizard/template-khello2/src-Makefile.am
+share/kde/apps/kdevappwizard/template-khello2/subdirs
+share/kde/apps/kdevappwizard/template-khello2/widget.cpp
+share/kde/apps/kdevappwizard/template-khello2/widget.h
+share/kde/apps/kdevappwizard/template-khello2/widgetbase.ui
 share/kde/apps/kdevappwizard/template-kicker/applet.cpp
 share/kde/apps/kdevappwizard/template-kicker/applet.desktop
 share/kde/apps/kdevappwizard/template-kicker/applet.h
@@ -821,6 +851,7 @@ share/kde/apps/kdevappwizard/templates/kdevpart
 share/kde/apps/kdevappwizard/templates/kdevpart2
 share/kde/apps/kdevappwizard/templates/kfileplugin
 share/kde/apps/kdevappwizard/templates/khello
+share/kde/apps/kdevappwizard/templates/khello2
 share/kde/apps/kdevappwizard/templates/kicker
 share/kde/apps/kdevappwizard/templates/kioslave
 share/kde/apps/kdevappwizard/templates/kmod
@@ -941,7 +972,7 @@ share/kde/apps/kdevdoctreeview/tocs/sw.toc
 share/kde/apps/kdevdoctreeview/tocs/w3c-dom-level2-html.toc
 share/kde/apps/kdevdoctreeview/tocs/w3c-svg.toc
 share/kde/apps/kdevdoctreeview/tocs/w3c-uaag10.toc
-share/kde/apps/kdevdoctreeview/tocs/wxwindows_bugs.toc
+share/kde/apps/kdevdoctreeview/tocs/wxwidgets_bugs.toc
 share/kde/apps/kdevdoxygen/kdevdoxygen.rc
 share/kde/apps/kdevelop/eventsrc
 share/kde/apps/kdevelop/kdevelopui.rc
@@ -1271,6 +1302,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/kde/apps/kdevappwizard/template-kmod
 @dirrm share/kde/apps/kdevappwizard/template-kioslave
 @dirrm share/kde/apps/kdevappwizard/template-kicker
+@dirrm share/kde/apps/kdevappwizard/template-khello2
 @dirrm share/kde/apps/kdevappwizard/template-khello
 @dirrm share/kde/apps/kdevappwizard/template-kfileplugin
 @dirrm share/kde/apps/kdevappwizard/template-kdevpart2
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index e55c387c3d7..ae18b8f5b83 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2004/03/09 13:03:55 markd Exp $
+$NetBSD: distinfo,v 1.11 2004/04/20 14:15:41 markd Exp $
 
-SHA1 (kdevelop-3.0.2.tar.bz2) = 2383b002f1454556d605dbded1c2327ad3ba5771
-Size (kdevelop-3.0.2.tar.bz2) = 5531192 bytes
-SHA1 (patch-aa) = 8fafcb72c02a6799016fd4bcd1505c271bf91487
+SHA1 (kdevelop-3.0.3.tar.bz2) = d2c34e689e1a968b920a0dfab6d1c1ce21daeae0
+Size (kdevelop-3.0.3.tar.bz2) = 5904393 bytes
+SHA1 (patch-aa) = cb3a0d8461ea24318ad57e98c6b5c52ada11a9ef
 SHA1 (patch-ab) = ed3703054afea00ea96880549d9f729c8b2f2b29
-SHA1 (patch-ac) = 394b7667ff28de09134b751fbbfd556029212d06
+SHA1 (patch-ac) = c481c9e415d6b9f7b3cf6f9f299fab586cec79f3
diff --git a/devel/kdevelop-base/patches/patch-aa b/devel/kdevelop-base/patches/patch-aa
index 9cd4b30d4af..7d06ae4e13b 100644
--- a/devel/kdevelop-base/patches/patch-aa
+++ b/devel/kdevelop-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/02/15 11:25:24 markd Exp $
+$NetBSD: patch-aa,v 1.5 2004/04/20 14:15:41 markd Exp $
 
---- configure.orig	2004-01-26 08:14:50.000000000 +1300
+--- configure.orig	2004-04-06 02:57:52.000000000 +1200
 +++ configure
-@@ -36447,7 +36447,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} 
+@@ -38961,7 +38961,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} 
  
      save_CXXFLAGS="$CXXFLAGS"
  
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.4 2004/02/15 11:25:24 markd Exp $
 +    CXXFLAGS="$CXXFLAGS $X_CFLAGS -ldb4"
  
      cat >conftest.$ac_ext <<_ACEOF
- /* #line $LINENO "configure" */
-@@ -37480,9 +37480,9 @@ fi
+ /* confdefs.h.  */
+@@ -40101,9 +40101,9 @@ fi
  
    test -n "$TAR" && break
  done
diff --git a/devel/kdevelop-base/patches/patch-ac b/devel/kdevelop-base/patches/patch-ac
index f1da12447cd..04c96f51d4f 100644
--- a/devel/kdevelop-base/patches/patch-ac
+++ b/devel/kdevelop-base/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2004/02/15 11:25:24 markd Exp $
+$NetBSD: patch-ac,v 1.5 2004/04/20 14:15:41 markd Exp $
 
---- lib/catalog/Makefile.in.orig	2004-01-26 08:14:46.000000000 +1300
+--- lib/catalog/Makefile.in.orig	2004-04-06 02:57:47.000000000 +1200
 +++ lib/catalog/Makefile.in
-@@ -332,7 +332,7 @@ xdg_menudir = @xdg_menudir@
+@@ -395,7 +395,7 @@ xdg_menudir = @xdg_menudir@
  INCLUDES = $(all_includes)
  lib_LTLIBRARIES = libkdevcatalog.la
  libkdevcatalog_la_SOURCES = tag.cpp
 -libkdevcatalog_la_LIBADD = -ldb
 +libkdevcatalog_la_LIBADD = -ldb4
- 
  kdevcatalogincludedir = $(includedir)/kdevelop/catalog
  kdevcataloginclude_HEADERS = gcatalog.h gcatalog.tcc catalog.h tag.h
+ #>- all: all-am