Update KDE to 3.1.

Many bugfixes and functionality enhancements including:

kdesdk

 KBugBuster
    Adapted KBugBuster to the new Bugzilla based KDE bug tracking system.
    Implemented Bookmarking support for Bug reports.
    Changing view settings no longer requires a reload.
    Added toolbar
 KBabel
    Automatic update of Project-Id-Version
    Possibility to specify localized translator name
    Validation & highlighting of XML
    Save special (the settings can be changed for the particular save)
    KDE specifics added to rough translation (e.g. only add a new translator
    in TRANSLATORS)
    Load/Save markings in Catalog Manager
    Navigation bar in Catalog Manager
    Mail PO-file
    Tag structure tool
    Rough translation in catalog manager
    Automatic update of PO header comment
    Show source code
    Spellchecking in multiple files
 Cervisia: made hardcoded colors configurable.

12 files changed, 251 insertions, 136 deletions

diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 4582dd0ec25..c0bb3e209fa 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2002/12/24 06:09:54 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/03/11 13:30:40 markd Exp $
 
-DISTNAME=	kdbg-1.2.6
-PKGREVISION=	1
+DISTNAME=	kdbg-1.2.7
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/} \
 		ftp://ftp.eudaptics.com/pub/people/jsixt/
diff --git a/devel/kdbg/distinfo b/devel/kdbg/distinfo
index de9b9e1e5fa..0cd5fae174a 100644
--- a/devel/kdbg/distinfo
+++ b/devel/kdbg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/10/15 03:37:00 markd Exp $
+$NetBSD: distinfo,v 1.7 2003/03/11 13:30:40 markd Exp $
 
-SHA1 (kdbg-1.2.6.tar.gz) = b47dcaaf7b5fbbcf20e20268718bbc7ae9039255
-Size (kdbg-1.2.6.tar.gz) = 525622 bytes
-SHA1 (patch-aa) = 2c54f9f30a55e0967e02ffe5d4e8097b03f9afe0
+SHA1 (kdbg-1.2.7.tar.gz) = bc79c4573b45d0875848dbd56fddf26214241f5b
+Size (kdbg-1.2.7.tar.gz) = 526415 bytes
+SHA1 (patch-aa) = 98dc1182a09cf809f2edf1a4343305b37e3ca8ab
 SHA1 (patch-ac) = ef7ae69e39d01db396da61cc2231b282095cd20d
diff --git a/devel/kdbg/patches/patch-aa b/devel/kdbg/patches/patch-aa
index c359919be89..3f1b85cbe8a 100644
--- a/devel/kdbg/patches/patch-aa
+++ b/devel/kdbg/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2002/10/15 03:37:01 markd Exp $
+$NetBSD: patch-aa,v 1.6 2003/03/11 13:30:41 markd Exp $
 
---- configure.orig	Mon Oct  7 09:19:05 2002
-+++ configure	Tue Oct 15 14:06:56 2002
-@@ -11014,7 +11014,7 @@
- 
- 
- 
--
-+LIBQTMT="-lqt-mt"
- LIBQT=${LIBQTMT:-"-lqt"}
- if test $kde_qtver = 2; then
- 
-@@ -11112,7 +11112,7 @@
+--- configure.orig	Sun Feb  2 03:50:30 2003
++++ configure
+@@ -11112,7 +11112,7 @@ ac_ldflags_safe="$LDFLAGS"
  ac_libs_safe="$LIBS"
  
  CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
@@ -20,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2002/10/15 03:37:01 markd Exp $
  LIBS="$LIBS $LIBQT"
  
  
-@@ -11233,7 +11233,7 @@
+@@ -11233,7 +11233,7 @@ ac_libs_safe="$LIBS"
  
  CXXFLAGS="$CXXFLAGS -I$qt_includes"
  LDFLAGS="$X_LDFLAGS"
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 592c1bd12e9..c80d01d39ca 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/01/02 09:12:24 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/11 13:30:41 markd Exp $
 
-DISTNAME=	kdesdk-3.0.5a
+DISTNAME=	kdesdk-3.1
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
@@ -11,7 +11,7 @@ CONFLICTS=	cervisia-[0-9]*
 USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE+=	${WRKSRC}/kapptemplate/admin/ltconfig
 
-BUILD_DEPENDS+= qt3-tools>=3.0.4nb1:../../x11/qt3-tools
+BUILD_DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/kdesdk3/PLIST b/devel/kdesdk3/PLIST
index 1bdc1a71219..5bec4305834 100644
--- a/devel/kdesdk3/PLIST
+++ b/devel/kdesdk3/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/20 10:03:46 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/03/11 13:30:42 markd Exp $
 bin/adddebug
 bin/catalogmanager
 bin/cervisia
+bin/cheatmake
 bin/create_cvsignore
 bin/create_makefile
 bin/create_makefiles
@@ -15,11 +16,13 @@ bin/cvsversion
 bin/cxxmetric
 bin/extend_dmalloc
 bin/extractrc
+bin/fixincludes
 bin/fixsgml
 bin/includemocs
 bin/kapptemplate
 bin/kbabel
 bin/kbabeldict
+bin/kbugbuster
 bin/kde-build
 bin/kdedoc
 bin/kdekillall
@@ -35,6 +38,7 @@ bin/split2po
 bin/swappo
 bin/transxx
 bin/xml2pot
+bin/zonetab2pot.py
 include/kbabel/catalog.h
 include/kbabel/catalogitem.h
 include/kbabel/catalogsettings.h
@@ -48,9 +52,20 @@ include/kbabel/kbabeldictiface.h
 include/kbabel/msgfmt.h
 include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
+include/kprofilemethod.h
 include/kspy.h
+lib/kde3/kabcformat_kdeaccounts.la
+lib/kde3/kabcformat_kdeaccounts.so
+lib/kde3/kfile_cpp.la
+lib/kde3/kfile_cpp.so
+lib/kde3/kfile_diff.la
+lib/kde3/kfile_diff.so
+lib/kde3/kfile_po.la
+lib/kde3/kfile_po.so
 lib/kde3/libdbsearchengine.la
 lib/kde3/libdbsearchengine.so
+lib/kde3/libkomparenavtreepart.la
+lib/kde3/libkomparenavtreepart.so
 lib/kde3/libkomparepart.la
 lib/kde3/libkomparepart.so
 lib/kde3/libpoauxiliary.la
@@ -87,10 +102,14 @@ lib/libkspy.la
 lib/libkspy.so
 lib/libkspy.so.1
 lib/libkspy.so.1.0
+man/man1/cervisia.1
 man/man1/cvs2pack.1
+man/man1/cvsblame.1
+man/man1/cvscheck.1
 man/man1/cvsversion.1
 man/man1/kde-build.1
 man/man1/noncvslist.1
+share/doc/kde/HTML/en/cervisia/annotate.png
 share/doc/kde/HTML/en/cervisia/checkout.png
 share/doc/kde/HTML/en/cervisia/commit.png
 share/doc/kde/HTML/en/cervisia/common
@@ -103,6 +122,7 @@ share/doc/kde/HTML/en/cervisia/logtree.png
 share/doc/kde/HTML/en/cervisia/mainview.png
 share/doc/kde/HTML/en/cervisia/resolve.png
 share/doc/kde/HTML/en/cervisia/updatetag.png
+share/doc/kde/HTML/en/kbabel/TODO
 share/doc/kde/HTML/en/kbabel/back.png
 share/doc/kde/HTML/en/kbabel/bottom.png
 share/doc/kde/HTML/en/kbabel/catalogmanager.png
@@ -112,84 +132,89 @@ share/doc/kde/HTML/en/kbabel/catalogmanager_needwork.png
 share/doc/kde/HTML/en/kbabel/catalogmanager_nopot.png
 share/doc/kde/HTML/en/kbabel/catalogmanager_nopot_ok.png
 share/doc/kde/HTML/en/kbabel/catalogmanager_ok.png
+share/doc/kde/HTML/en/kbabel/catalogmanager_reload.png
+share/doc/kde/HTML/en/kbabel/catman.docbook
 share/doc/kde/HTML/en/kbabel/common
+share/doc/kde/HTML/en/kbabel/dbcan.png
+share/doc/kde/HTML/en/kbabel/dictionaries.docbook
 share/doc/kde/HTML/en/kbabel/editcopy.png
 share/doc/kde/HTML/en/kbabel/editcut.png
 share/doc/kde/HTML/en/kbabel/editpaste.png
+share/doc/kde/HTML/en/kbabel/faq.docbook
 share/doc/kde/HTML/en/kbabel/fileopen.png
 share/doc/kde/HTML/en/kbabel/filesave.png
 share/doc/kde/HTML/en/kbabel/find.png
 share/doc/kde/HTML/en/kbabel/forward.png
+share/doc/kde/HTML/en/kbabel/glossary.docbook
 share/doc/kde/HTML/en/kbabel/index.cache.bz2
 share/doc/kde/HTML/en/kbabel/index.docbook
+share/doc/kde/HTML/en/kbabel/kbabeldict.docbook
+share/doc/kde/HTML/en/kbabel/menu.docbook
 share/doc/kde/HTML/en/kbabel/msgid2msgstr.png
 share/doc/kde/HTML/en/kbabel/next.png
 share/doc/kde/HTML/en/kbabel/nexterror.png
 share/doc/kde/HTML/en/kbabel/nextfuzzy.png
 share/doc/kde/HTML/en/kbabel/nextfuzzyuntrans.png
 share/doc/kde/HTML/en/kbabel/nextuntranslated.png
+share/doc/kde/HTML/en/kbabel/preferences.docbook
 share/doc/kde/HTML/en/kbabel/preverror.png
 share/doc/kde/HTML/en/kbabel/prevfuzzy.png
 share/doc/kde/HTML/en/kbabel/prevfuzzyuntrans.png
 share/doc/kde/HTML/en/kbabel/previous.png
 share/doc/kde/HTML/en/kbabel/prevuntranslated.png
 share/doc/kde/HTML/en/kbabel/redo.png
+share/doc/kde/HTML/en/kbabel/roughtranslation.png
 share/doc/kde/HTML/en/kbabel/snap1.png
 share/doc/kde/HTML/en/kbabel/snap_catalogmanager.png
+share/doc/kde/HTML/en/kbabel/snap_kbabeldict.png
+share/doc/kde/HTML/en/kbabel/snap_kbabeldict2.png
 share/doc/kde/HTML/en/kbabel/stop.png
 share/doc/kde/HTML/en/kbabel/top.png
 share/doc/kde/HTML/en/kbabel/transsearch.png
 share/doc/kde/HTML/en/kbabel/undo.png
+share/doc/kde/HTML/en/kbabel/using.docbook
+share/doc/kde/HTML/en/kbugbuster/common
+share/doc/kde/HTML/en/kbugbuster/index.cache.bz2
+share/doc/kde/HTML/en/kbugbuster/index.docbook
+share/doc/kde/HTML/en/kompare/common
+share/doc/kde/HTML/en/kompare/index.cache.bz2
+share/doc/kde/HTML/en/kompare/index.docbook
 share/kde/applnk/Development/catalogmanager.desktop
 share/kde/applnk/Development/cervisia.desktop
 share/kde/applnk/Development/kbabel.desktop
 share/kde/applnk/Development/kbabeldict.desktop
+share/kde/applnk/Development/kbugbuster.desktop
 share/kde/applnk/Development/kompare.desktop
 share/kde/apps/catalogmanager/catalogmanagerui.rc
-share/kde/apps/catalogmanager/icons/hicolor/16x16/actions/statistics.png
-share/kde/apps/catalogmanager/icons/hicolor/16x16/actions/syntax.png
-share/kde/apps/catalogmanager/icons/hicolor/22x22/actions/statistics.png
-share/kde/apps/catalogmanager/icons/hicolor/22x22/actions/syntax.png
-share/kde/apps/catalogmanager/icons/hicolor/32x32/actions/statistics.png
-share/kde/apps/catalogmanager/icons/hicolor/32x32/actions/syntax.png
-share/kde/apps/catalogmanager/icons/locolor/16x16/actions/statistics.png
-share/kde/apps/catalogmanager/icons/locolor/16x16/actions/syntax.png
-share/kde/apps/catalogmanager/icons/locolor/22x22/actions/statistics.png
-share/kde/apps/catalogmanager/icons/locolor/22x22/actions/syntax.png
-share/kde/apps/catalogmanager/icons/locolor/32x32/actions/statistics.png
-share/kde/apps/catalogmanager/icons/locolor/32x32/actions/syntax.png
-share/kde/apps/catalogmanager/pics/broken.png
-share/kde/apps/catalogmanager/pics/missing.png
-share/kde/apps/catalogmanager/pics/needwork.png
-share/kde/apps/catalogmanager/pics/ok.png
 share/kde/apps/cervisia/cervisiashellui.rc
-share/kde/apps/cervisia/cervisiaui.rc
+share/kde/apps/cervisiapart/cervisiaui.rc
+share/kde/apps/kabc/formats/kdeaccountsplugin.desktop
 share/kde/apps/kapptemplate/admin/ChangeLog
+share/kde/apps/kapptemplate/admin/Doxyfile.am
+share/kde/apps/kapptemplate/admin/Doxyfile.global
 share/kde/apps/kapptemplate/admin/Makefile
 share/kde/apps/kapptemplate/admin/Makefile.am
 share/kde/apps/kapptemplate/admin/Makefile.common
 share/kde/apps/kapptemplate/admin/Makefile.in
 share/kde/apps/kapptemplate/admin/acinclude.m4.in
 share/kde/apps/kapptemplate/admin/am_edit
+share/kde/apps/kapptemplate/admin/compile
 share/kde/apps/kapptemplate/admin/conf.change.pl
 share/kde/apps/kapptemplate/admin/config.guess
 share/kde/apps/kapptemplate/admin/config.pl
 share/kde/apps/kapptemplate/admin/config.sub
+share/kde/apps/kapptemplate/admin/configure.in.bot.end
 share/kde/apps/kapptemplate/admin/configure.in.min
+share/kde/apps/kapptemplate/admin/cvs-clean.pl
+share/kde/apps/kapptemplate/admin/cvs.sh
 share/kde/apps/kapptemplate/admin/debianrules
 share/kde/apps/kapptemplate/admin/depcomp
+share/kde/apps/kapptemplate/admin/detect-autoconf.sh
 share/kde/apps/kapptemplate/admin/install-sh
 share/kde/apps/kapptemplate/admin/libtool.m4.in
-share/kde/apps/kapptemplate/admin/ltconfig
 share/kde/apps/kapptemplate/admin/ltmain.sh
 share/kde/apps/kapptemplate/admin/missing
 share/kde/apps/kapptemplate/admin/mkinstalldirs
-share/kde/apps/kapptemplate/admin/old-libtool.m4.in
-share/kde/apps/kapptemplate/admin/old-ltcf-c.sh
-share/kde/apps/kapptemplate/admin/old-ltcf-cxx.sh
-share/kde/apps/kapptemplate/admin/old-ltcf-gcj.sh
-share/kde/apps/kapptemplate/admin/old-ltconfig
-share/kde/apps/kapptemplate/admin/old-ltmain.sh
 share/kde/apps/kapptemplate/admin/ylwrap
 share/kde/apps/kapptemplate/appframework/AUTHORS
 share/kde/apps/kapptemplate/appframework/COPYING
@@ -202,7 +227,6 @@ share/kde/apps/kapptemplate/appframework/app.lsm
 share/kde/apps/kapptemplate/appframework/app.spec
 share/kde/apps/kapptemplate/appframework/base-Makefile.am
 share/kde/apps/kapptemplate/appframework/base-Makefile.cvs
-share/kde/apps/kapptemplate/appframework/config.h.bot
 share/kde/apps/kapptemplate/appframework/configure.in.in.in
 share/kde/apps/kapptemplate/appframework/no-exe/COPYING
 share/kde/apps/kapptemplate/appframework/no-exe/INSTALL
@@ -277,81 +301,136 @@ share/kde/apps/kapptemplate/kpartplugin/plugin_app.rc
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/diff.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/insert_arg.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/msgid2msgstr.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/nexterror.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzy.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextmarked.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextpo.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nexttemplate.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/preverror.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzy.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevmarked.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevpo.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevtemplate.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_actual.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_all.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_from_cursor.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_selected.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/statistics.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/syntax.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/diff.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/insert_arg.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/msgid2msgstr.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/nexterror.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzy.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/nextmarked.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/nextpo.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/nexttemplate.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/nextuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/preverror.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzy.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevmarked.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevpo.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevtemplate.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/statistics.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/syntax.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/diff.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/insert_arg.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/msgid2msgstr.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/nexterror.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzy.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextmarked.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextpo.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nexttemplate.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/preverror.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzy.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevmarked.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevpo.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevtemplate.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/statistics.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/syntax.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/diff.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/insert_arg.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/msgid2msgstr.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/nexterror.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/nextfuzzy.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nextmarked.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nextpo.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nexttemplate.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/nextuntranslated.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/preverror.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/prevfuzzy.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/prevmarked.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/prevpo.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/prevtemplate.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/prevuntranslated.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/spellcheck_actual.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/spellcheck_all.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/spellcheck_from_cursor.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/spellcheck_selected.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/statistics.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/syntax.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/togglefuzzy.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
+share/kde/apps/kbabel/icons/locolor/22x22/actions/statistics.png
+share/kde/apps/kbabel/icons/locolor/22x22/actions/syntax.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/diff.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/insert_arg.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/msgid2msgstr.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/nexterror.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/nextfuzzy.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nextmarked.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nextpo.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nexttemplate.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/nextuntranslated.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/preverror.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/prevfuzzy.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/prevmarked.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/prevpo.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/prevtemplate.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/prevuntranslated.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/statistics.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/syntax.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/togglefuzzy.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/transsearch.png
 share/kde/apps/kbabel/kbabelui.rc
@@ -364,66 +443,85 @@ share/kde/apps/kbabel/pics/splash.png
 share/kde/apps/kbabeldict/modules/dbsearchengine.rc
 share/kde/apps/kbabeldict/modules/poauxiliary.rc
 share/kde/apps/kbabeldict/modules/pocompendium.rc
-share/kde/apps/kompare/icons/hicolor/16x16/apps/kompare.png
+share/kde/apps/kbugbuster/kbugbusterui.rc
+share/kde/apps/kbugbuster/pics/bars.png
+share/kde/apps/kbugbuster/pics/logo.png
+share/kde/apps/kbugbuster/pics/tools.png
+share/kde/apps/kompare/icons/crystalsvg/16x16/apps/kompare.png
 share/kde/apps/kompare/icons/locolor/16x16/apps/kompare.png
 share/kde/apps/kompare/icons/locolor/32x32/apps/kompare.png
 share/kde/apps/kompare/kompareui.rc
 share/kde/apps/komparepart/komparepartui.rc
-share/kde/icons/hicolor/16x16/apps/catalogmanager.png
-share/kde/icons/hicolor/16x16/apps/cervisia.png
-share/kde/icons/hicolor/16x16/apps/kbabel.png
-share/kde/icons/hicolor/16x16/apps/kbabeldict.png
-share/kde/icons/hicolor/16x16/apps/kompare.png
-share/kde/icons/hicolor/16x16/mimetypes/gettext.png
-share/kde/icons/hicolor/32x32/apps/catalogmanager.png
-share/kde/icons/hicolor/32x32/apps/cervisia.png
-share/kde/icons/hicolor/32x32/apps/kbabel.png
-share/kde/icons/hicolor/32x32/apps/kbabeldict.png
-share/kde/icons/hicolor/32x32/mimetypes/gettext.png
-share/kde/icons/hicolor/48x48/apps/catalogmanager.png
-share/kde/icons/hicolor/48x48/apps/kbabel.png
-share/kde/icons/hicolor/48x48/mimetypes/gettext.png
+share/kde/icons/crystalsvg/16x16/apps/catalogmanager.png
+share/kde/icons/crystalsvg/16x16/apps/cervisia.png
+share/kde/icons/crystalsvg/16x16/apps/kbabel.png
+share/kde/icons/crystalsvg/16x16/apps/kbabeldict.png
+share/kde/icons/crystalsvg/16x16/apps/kbugbuster.png
+share/kde/icons/crystalsvg/16x16/apps/kompare.png
+share/kde/icons/crystalsvg/16x16/mimetypes/gettext.png
+share/kde/icons/crystalsvg/32x32/apps/catalogmanager.png
+share/kde/icons/crystalsvg/32x32/apps/cervisia.png
+share/kde/icons/crystalsvg/32x32/apps/kbabel.png
+share/kde/icons/crystalsvg/32x32/apps/kbabeldict.png
+share/kde/icons/crystalsvg/32x32/mimetypes/gettext.png
+share/kde/icons/crystalsvg/48x48/apps/catalogmanager.png
+share/kde/icons/crystalsvg/48x48/apps/kbabel.png
+share/kde/icons/crystalsvg/48x48/mimetypes/gettext.png
 share/kde/icons/locolor/16x16/apps/catalogmanager.png
 share/kde/icons/locolor/16x16/apps/kbabel.png
 share/kde/icons/locolor/16x16/apps/kbabeldict.png
+share/kde/icons/locolor/16x16/apps/kbugbuster.png
 share/kde/icons/locolor/16x16/apps/kompare.png
 share/kde/icons/locolor/16x16/mimetypes/gettext.png
 share/kde/icons/locolor/32x32/apps/catalogmanager.png
 share/kde/icons/locolor/32x32/apps/kbabel.png
 share/kde/icons/locolor/32x32/apps/kbabeldict.png
+share/kde/icons/locolor/32x32/apps/kbugbuster.png
 share/kde/icons/locolor/32x32/apps/kompare.png
 share/kde/icons/locolor/32x32/mimetypes/gettext.png
 share/kde/mimelnk/application/x-gettext.desktop
-share/kde/services/kompare_part.desktop
+share/kde/services/kfile_cpp.desktop
+share/kde/services/kfile_diff.desktop
+share/kde/services/kfile_h.desktop
+share/kde/services/kfile_po.desktop
+share/kde/services/komparenavtreepart.desktop
+share/kde/services/komparepart.desktop
 share/kde/services/pothumbnail.desktop
+share/kde/servicetypes/komparenavigationpart.desktop
+share/kde/servicetypes/kompareviewpart.desktop
+@comment dirrm share/kde/servicetypes
 @comment dirrm share/kde/services
 @comment dirrm share/kde/mimelnk/application
 @comment dirrm share/kde/icons/locolor/32x32/mimetypes
 @comment dirrm share/kde/icons/locolor/32x32/apps
 @comment dirrm share/kde/icons/locolor/16x16/mimetypes
 @comment dirrm share/kde/icons/locolor/16x16/apps
-@comment dirrm share/kde/icons/hicolor/48x48/mimetypes
-@comment dirrm share/kde/icons/hicolor/48x48/apps
-@comment dirrm share/kde/icons/hicolor/32x32/mimetypes
-@comment dirrm share/kde/icons/hicolor/32x32/apps
-@comment dirrm share/kde/icons/hicolor/16x16/mimetypes
-@comment dirrm share/kde/icons/hicolor/16x16/apps
+@comment dirrm share/kde/icons/crystalsvg/48x48/mimetypes
+@comment dirrm share/kde/icons/crystalsvg/48x48/apps
+@comment dirrm share/kde/icons/crystalsvg/32x32/mimetypes
+@comment dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment dirrm share/kde/icons/crystalsvg/16x16/mimetypes
+@comment dirrm share/kde/icons/crystalsvg/16x16/apps
 @dirrm share/kde/apps/komparepart
 @dirrm share/kde/apps/kompare/icons/locolor/32x32/apps
 @dirrm share/kde/apps/kompare/icons/locolor/32x32
 @dirrm share/kde/apps/kompare/icons/locolor/16x16/apps
 @dirrm share/kde/apps/kompare/icons/locolor/16x16
 @dirrm share/kde/apps/kompare/icons/locolor
-@dirrm share/kde/apps/kompare/icons/hicolor/16x16/apps
-@dirrm share/kde/apps/kompare/icons/hicolor/16x16
-@dirrm share/kde/apps/kompare/icons/hicolor
+@dirrm share/kde/apps/kompare/icons/crystalsvg/16x16/apps
+@dirrm share/kde/apps/kompare/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kompare/icons/crystalsvg
 @dirrm share/kde/apps/kompare/icons
 @dirrm share/kde/apps/kompare
+@dirrm share/kde/apps/kbugbuster/pics
+@dirrm share/kde/apps/kbugbuster
 @dirrm share/kde/apps/kbabeldict/modules
 @dirrm share/kde/apps/kbabeldict
 @dirrm share/kde/apps/kbabel/pics
 @dirrm share/kde/apps/kbabel/icons/locolor/32x32/actions
 @dirrm share/kde/apps/kbabel/icons/locolor/32x32
+@dirrm share/kde/apps/kbabel/icons/locolor/22x22/actions
+@dirrm share/kde/apps/kbabel/icons/locolor/22x22
 @dirrm share/kde/apps/kbabel/icons/locolor/16x16/actions
 @dirrm share/kde/apps/kbabel/icons/locolor/16x16
 @dirrm share/kde/apps/kbabel/icons/locolor
@@ -449,26 +547,14 @@ share/kde/services/pothumbnail.desktop
 @dirrm share/kde/apps/kapptemplate/appframework
 @dirrm share/kde/apps/kapptemplate/admin
 @dirrm share/kde/apps/kapptemplate
+@dirrm share/kde/apps/kabc/formats
+@dirrm share/kde/apps/cervisiapart
 @dirrm share/kde/apps/cervisia
-@dirrm share/kde/apps/catalogmanager/pics
-@dirrm share/kde/apps/catalogmanager/icons/locolor/32x32/actions
-@dirrm share/kde/apps/catalogmanager/icons/locolor/32x32
-@dirrm share/kde/apps/catalogmanager/icons/locolor/22x22/actions
-@dirrm share/kde/apps/catalogmanager/icons/locolor/22x22
-@dirrm share/kde/apps/catalogmanager/icons/locolor/16x16/actions
-@dirrm share/kde/apps/catalogmanager/icons/locolor/16x16
-@dirrm share/kde/apps/catalogmanager/icons/locolor
-@dirrm share/kde/apps/catalogmanager/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/catalogmanager/icons/hicolor/32x32
-@dirrm share/kde/apps/catalogmanager/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/catalogmanager/icons/hicolor/22x22
-@dirrm share/kde/apps/catalogmanager/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/catalogmanager/icons/hicolor/16x16
-@dirrm share/kde/apps/catalogmanager/icons/hicolor
-@dirrm share/kde/apps/catalogmanager/icons
 @dirrm share/kde/apps/catalogmanager
 @comment dirrm share/kde/apps
 @comment dirrm share/kde/applnk/Development
+@dirrm share/doc/kde/HTML/en/kompare
+@dirrm share/doc/kde/HTML/en/kbugbuster
 @dirrm share/doc/kde/HTML/en/kbabel
 @dirrm share/doc/kde/HTML/en/cervisia
 @comment dirrm share/doc/kde/HTML/en
diff --git a/devel/kdesdk3/buildlink2.mk b/devel/kdesdk3/buildlink2.mk
index 7006a6d3867..76071065356 100644
--- a/devel/kdesdk3/buildlink2.mk
+++ b/devel/kdesdk3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:41 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/03/11 13:30:42 markd Exp $
 #
 # This Makefile fragment is included by packages that use kdesdk.
 #
@@ -9,14 +9,20 @@
 KDESDK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdesdk
-BUILDLINK_DEPENDS.kdesdk?=		kdesdk>=3.0.5.1
+BUILDLINK_DEPENDS.kdesdk?=		kdesdk>=3.1
 BUILDLINK_PKGSRCDIR.kdesdk?=		../../devel/kdesdk3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdesdk=kdesdk
 BUILDLINK_PREFIX.kdesdk_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.kdesdk+=	include/kbabel/*
+BUILDLINK_FILES.kdesdk+=	include/kprofilemethod.h
 BUILDLINK_FILES.kdesdk+=	include/kspy.h
+BUILDLINK_FILES.kdesdk+=	lib/kde3/kabcformat_kdeaccounts.*
+BUILDLINK_FILES.kdesdk+=	lib/kde3/kfile_cpp.*
+BUILDLINK_FILES.kdesdk+=	lib/kde3/kfile_diff.*
+BUILDLINK_FILES.kdesdk+=	lib/kde3/kfile_po.*
 BUILDLINK_FILES.kdesdk+=	lib/kde3/libdbsearchengine.*
+BUILDLINK_FILES.kdesdk+=	lib/kde3/libkomparenavtreepart.*
 BUILDLINK_FILES.kdesdk+=	lib/kde3/libkomparepart.*
 BUILDLINK_FILES.kdesdk+=	lib/kde3/libpoauxiliary.*
 BUILDLINK_FILES.kdesdk+=	lib/kde3/libpocompendium.*
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index c273706442e..461c0c00b6f 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/01/02 09:12:24 skrll Exp $
+$NetBSD: distinfo,v 1.5 2003/03/11 13:30:42 markd Exp $
 
-SHA1 (kdesdk-3.0.5a.tar.bz2) = ef7efae29b49d8c71b121c31e23f7aa67ce4124c
-Size (kdesdk-3.0.5a.tar.bz2) = 1847289 bytes
+SHA1 (kdesdk-3.1.tar.bz2) = 2b44fff09319df2d358ffa5e66400a45d41adff1
+Size (kdesdk-3.1.tar.bz2) = 2139360 bytes
 SHA1 (patch-aa) = 769ed077dedc4fef0c3fbcfaa34f2e8d9c282c00
 SHA1 (patch-ab) = a975fd30cbee8107856774161f9216cde2548a10
 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index e24e41c1481..3cf6c8a2211 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2002/12/24 06:09:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/11 13:30:43 markd Exp $
 
-DISTNAME=	kdevelop-2.1.3_for_KDE_3.0
-PKGNAME=	kdevelop-base-2.1.3
-PKGREVISION=	1
+DISTNAME=	kdevelop-2.1.5_for_KDE_3.1
+PKGNAME=	kdevelop-base-2.1.5
 CATEGORIES=	devel kde
 
+MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/kdevelop-2.1.5/src/ \
+                ftp://ftp.us.kde.org/pub/kde/stable/kdevelop-2.1.5/src/ \
+                ftp://ftp.de.kde.org/pub/kde/stable/kdevelop-2.1.5/src/
 HOMEPAGE=       http://www.kdevelop.org/
 COMMENT=	Base modules for IDE for Unix/X11/KDE
 
@@ -17,9 +19,9 @@ DEPENDS+=		automake>=1.7:../../devel/automake
 DEPENDS+=		kdoc>=3.0:../../textproc/kdoc
 DEPENDS+=		htdig>=3.1.6:../../www/htdig
 DEPENDS+=		a2ps>=4.12:../../print/a2ps
-DEPENDS+=		kdelibdocs>=3.0.1:../../x11/kdelibdocs3
-DEPENDS+=		qt3-tools>=3.0.4:../../x11/qt3-tools
-DEPENDS+=		kdesdk>=3.0.1:../../devel/kdesdk3
+DEPENDS+=		kdelibdocs>=3.1:../../x11/kdelibdocs3
+DEPENDS+=		qt3-tools>=3.1.1:../../x11/qt3-tools
+DEPENDS+=		kdesdk>=3.1:../../devel/kdesdk3
 
 CONFLICTS+=	kdevelop<=1.3
 
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index 2bdd858a9cf..dedc0811374 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/22 19:15:16 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/03/11 13:30:43 markd Exp $
 bin/kdevdlg2ui
 bin/kdevelop
 bin/one2two
@@ -255,6 +255,38 @@ share/kde/apps/kdevelop/tools/processesend.pl
 share/kde/icons/hicolor/16x16/apps/kdevelop.png
 share/kde/icons/hicolor/32x32/apps/kdevelop.png
 share/kde/icons/hicolor/48x48/apps/kdevelop.png
+share/kde/locale/af/LC_MESSAGES/kdevelop.mo
+share/kde/locale/ar/LC_MESSAGES/kdevelop.mo
+share/kde/locale/az/LC_MESSAGES/kdevelop.mo
+share/kde/locale/da/LC_MESSAGES/kdevelop.mo
+share/kde/locale/de/LC_MESSAGES/kdevelop.mo
+share/kde/locale/en_GB/LC_MESSAGES/kdevelop.mo
+share/kde/locale/es/LC_MESSAGES/kdevelop.mo
+share/kde/locale/et/LC_MESSAGES/kdevelop.mo
+share/kde/locale/fi/LC_MESSAGES/kdevelop.mo
+share/kde/locale/fr/LC_MESSAGES/kdevelop.mo
+share/kde/locale/hu/LC_MESSAGES/kdevelop.mo
+share/kde/locale/id/LC_MESSAGES/kdevelop.mo
+share/kde/locale/is/LC_MESSAGES/kdevelop.mo
+share/kde/locale/it/LC_MESSAGES/kdevelop.mo
+share/kde/locale/ja/LC_MESSAGES/kdevelop.mo
+share/kde/locale/lv/LC_MESSAGES/kdevelop.mo
+share/kde/locale/nb/LC_MESSAGES/kdevelop.mo
+share/kde/locale/nl/LC_MESSAGES/kdevelop.mo
+share/kde/locale/nn/LC_MESSAGES/kdevelop.mo
+share/kde/locale/pl/LC_MESSAGES/kdevelop.mo
+share/kde/locale/pt/LC_MESSAGES/kdevelop.mo
+share/kde/locale/pt_BR/LC_MESSAGES/kdevelop.mo
+share/kde/locale/ro/LC_MESSAGES/kdevelop.mo
+share/kde/locale/sk/LC_MESSAGES/kdevelop.mo
+share/kde/locale/sl/LC_MESSAGES/kdevelop.mo
+share/kde/locale/sv/LC_MESSAGES/kdevelop.mo
+share/kde/locale/ta/LC_MESSAGES/kdevelop.mo
+share/kde/locale/tr/LC_MESSAGES/kdevelop.mo
+share/kde/locale/vi/LC_MESSAGES/kdevelop.mo
+share/kde/locale/xh/LC_MESSAGES/kdevelop.mo
+share/kde/locale/zh_CN/LC_MESSAGES/kdevelop.mo
+share/kde/locale/zu/LC_MESSAGES/kdevelop.mo
 share/kde/mimelnk/application/x-kdevelop-project.desktop
 @dirrm share/kde/apps/kdevelop/tools
 @dirrm share/kde/apps/kdevelop/templates
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index 3cc24dba6a2..528d3037d56 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/10/03 13:32:19 markd Exp $
+$NetBSD: distinfo,v 1.6 2003/03/11 13:30:44 markd Exp $
 
-SHA1 (kdevelop-2.1.3_for_KDE_3.0.tar.bz2) = 5188c6404a00c91634878b9b11cb84981c01729f
-Size (kdevelop-2.1.3_for_KDE_3.0.tar.bz2) = 3403196 bytes
+SHA1 (kdevelop-2.1.5_for_KDE_3.1.tar.bz2) = 6a99c5ab2b7e5ba1ec4a771a832c8815a76cd910
+Size (kdevelop-2.1.5_for_KDE_3.1.tar.bz2) = 5792839 bytes
 SHA1 (patch-aa) = fb81b39dbfeacec8f6b496ed71d804ae4699ed18
 SHA1 (patch-ab) = 0e209ce83acd60b6b3a004c6398d3aed11e8cdfc
 SHA1 (patch-ac) = 4956d5864f064bd79d8f06cf763af8405b1d55cd
-SHA1 (patch-ad) = 3384826db7655f077065dc570a7b5b3747b4a16d
+SHA1 (patch-ad) = 8898f64ee216c92e18d590db204fb126bb1de747
diff --git a/devel/kdevelop-base/patches/patch-ad b/devel/kdevelop-base/patches/patch-ad
index 6b539d3e5dc..8be3be1775b 100644
--- a/devel/kdevelop-base/patches/patch-ad
+++ b/devel/kdevelop-base/patches/patch-ad
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
---- kdevelop/Makefile.in.orig	Tue Jul  9 15:55:13 2002
-+++ kdevelop/Makefile.in	Tue Jul  9 16:02:06 2002
-@@ -242,8 +242,7 @@
+$NetBSD: patch-ad,v 1.4 2003/03/11 13:30:44 markd Exp $
+
+--- kdevelop/Makefile.in.orig	Mon Jan 20 14:25:57 2003
++++ kdevelop/Makefile.in
+@@ -255,8 +255,7 @@ kdevelop_LDADD = ./vc/libkdevelopvc.la .
  
  SUBDIRS = classparser kpp classwizard dbg examples gfxview kwrite pics templates tools vc widgets ctags setup 
  
@@ -11,7 +12,7 @@ $NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
  
  ####### kdevelop will overwrite this part!!! (end)############
  INCLUDES = -I$(top_srcdir)/kdevelop/widgets/qextmdi/include -I$(top_builddir)/kdevelop/ctags -I$(top_builddir)/kdevelop/kpp -I$(top_srcdir)/kdevelop/kpp -I$(top_srcdir)/kdevelop/kwrite $(all_includes)
-@@ -267,7 +266,6 @@
+@@ -280,7 +279,6 @@ tipdir = $(kde_datadir)/kdevelop
  mime_DATA = x-kdevelop-project.desktop
  mimedir = $(kde_mimedir)/application
  
@@ -19,7 +20,7 @@ $NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
  subdir = kdevelop
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
-@@ -343,7 +341,6 @@
+@@ -355,7 +353,6 @@ kdevelop_DEPENDENCIES = ./vc/libkdevelop
  	./kpp/libkdevelopkpp.la ./classparser/libclassparser.a \
  	./ctags/libctags.a ./setup/libkdevelopsetup.la \
  	./widgets/qextmdi/src/libkdevelopqextmdi.la
@@ -27,35 +28,33 @@ $NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
  
  
  DEFS = @DEFS@
-@@ -485,27 +482,6 @@
- kdevelop$(EXEEXT): $(kdevelop_OBJECTS) $(kdevelop_DEPENDENCIES) 
+@@ -560,25 +557,6 @@ kdevelop$(EXEEXT): $(kdevelop_OBJECTS) $
  	@rm -f kdevelop$(EXEEXT)
  	$(CXXLINK) $(kdevelop_LDFLAGS) $(kdevelop_OBJECTS) $(kdevelop_LDADD) $(LIBS)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 -install-binSCRIPTS: $(bin_SCRIPTS)
 -	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(bindir)
 -	@list='$(bin_SCRIPTS)'; for p in $$list; do \
--	f="`echo $$p|sed '$(transform)'`"; \
--	if test -f $$p; then \
--	echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
--	$(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
--	elif test -f $(srcdir)/$$p; then \
--	echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
--	$(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
--	else :; fi; \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  if test -f $$d$$p; then \
+-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+-	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+-	  else :; fi; \
 -	done
 -
 -uninstall-binSCRIPTS:
 -	@$(NORMAL_UNINSTALL)
 -	@list='$(bin_SCRIPTS)'; for p in $$list; do \
--	f="`echo $$p|sed '$(transform)'`"; \
--	echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
--	rm -f $(DESTDIR)$(bindir)/$$f; \
+-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+-	  rm -f $(DESTDIR)$(bindir)/$$f; \
 -	done
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT) core *.core
-@@ -794,7 +770,7 @@
+@@ -888,7 +866,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-recursive
@@ -64,7 +63,7 @@ $NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
  installdirs: installdirs-recursive
  installdirs-am:
  	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mimedir) $(DESTDIR)$(rcdir) $(DESTDIR)$(tipdir)
-@@ -849,7 +825,7 @@
+@@ -944,7 +922,7 @@ info-am:
  install-data-am: install-kde-icons  install-dataDATA install-mimeDATA install-rcDATA \
  	install-tipDATA
  
@@ -73,21 +72,21 @@ $NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
  
  install-info: install-info-recursive
  
-@@ -866,11 +842,11 @@
+@@ -961,11 +939,11 @@ mostlyclean: mostlyclean-recursive
  mostlyclean-am: mostlyclean-compile mostlyclean-generic \
  	mostlyclean-libtool
  
 -#>- uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 +#>- uninstall-am: uninstall-binPROGRAMS \
- #>- uninstall-dataDATA uninstall-info-am uninstall-mimeDATA \
- #>- uninstall-rcDATA uninstall-tipDATA
+ #>- 	uninstall-dataDATA uninstall-info-am uninstall-mimeDATA \
+ #>- 	uninstall-rcDATA uninstall-tipDATA
  #>+ 3
 -uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-binSCRIPTS \
 +uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS \
  	uninstall-dataDATA uninstall-info-am uninstall-mimeDATA \
  	uninstall-rcDATA uninstall-tipDATA
  
-@@ -881,7 +857,7 @@
+@@ -976,7 +954,7 @@ uninstall-info: uninstall-info-recursive
  	distclean distclean-compile distclean-depend distclean-generic \
  	distclean-libtool distclean-recursive distclean-tags distdir \
  	dvi dvi-am dvi-recursive info info-am info-recursive install \
@@ -96,7 +95,7 @@ $NetBSD: patch-ad,v 1.3 2002/11/26 21:38:24 cjep Exp $
  	install-data-am install-data-recursive install-dataDATA \
  	install-exec install-exec-am install-exec-recursive \
  	install-info install-info-am install-info-recursive install-man \
-@@ -891,7 +867,7 @@
+@@ -986,7 +964,7 @@ uninstall-info: uninstall-info-recursive
  	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
  	mostlyclean-recursive tags tags-recursive uninstall \
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 19b8d85d496..2dec94a29a2 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2002/10/03 13:50:52 markd Exp $
+# $NetBSD: Makefile,v 1.35 2003/03/11 13:30:42 markd Exp $
 
-DISTNAME=	kdevelop-2.1.3
+DISTNAME=	kdevelop-2.1.5
 CATEGORIES=	devel kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty