Update kdevelop to 3.3.0 (part of KDE 3.5.0)

changes unknown

8 files changed, 84 insertions, 124 deletions

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 00ebf0baabd..b9e46b9ee39 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/10/13 13:27:21 markd Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/11 12:01:11 markd Exp $
 
-DISTNAME=	kdevelop-3.2.3
-PKGNAME=	kdevelop-base-3.2.3
+DISTNAME=	kdevelop-3.3.0
+PKGNAME=	kdevelop-base-3.3.0
 CATEGORIES=	devel kde
 
 HOMEPAGE=       http://www.kdevelop.org/
@@ -40,15 +40,15 @@ EVAL_PREFIX+=	\
 	KDELIBDIR=kdelibs
 
 CONFIGURE_ARGS+= \
+	--with-db-includedir=${BUILDLINK_PREFIX.db4}/include/db4 \
+	--with-db-libdir=${BUILDLINK_PREFIX.db4}/lib \
+	--with-db-lib=db4 \
 	--with-qtdoc-dir=${QT3DIR}/qt3/doc/html \
 	--with-kdelibsdoxy-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs-apidocs
 
-.include "../../databases/db3/buildlink3.mk"
-CPPFLAGS+= -I${BUILDLINK_PREFIX.db3}/include/db3
-MAKE_ENV+= BDB_LIBS="${BUILDLINK_LDADD.db3}"
-
 .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"
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index ea7c9ed3740..bd969f4d7e9 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/05/31 15:14:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/12/11 12:01:11 markd Exp $
 bin/kdevassistant
 bin/kdevdesigner
 bin/kdevelop
@@ -7,6 +7,9 @@ bin/kdevprj2kdevelop
 bin/kdevprofileeditor
 bin/r++
 include/kdevelop/buildtools/base/kdevbuildtool.h
+include/kdevelop/buildtools/parsers/qmake/qmakeast.h
+include/kdevelop/buildtools/parsers/qmake/qmakeastvisitor.h
+include/kdevelop/buildtools/parsers/qmake/qmakedriver.h
 include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectbuilder.h
 include/kdevelop/buildtools/projectmanager/interfaces/kdevprojecteditor.h
 include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectimporter.h
@@ -25,13 +28,10 @@ include/kdevelop/buildtools/widgets/runoptionswidgetbase.h
 include/kdevelop/buildtools/widgets/subclassesdlg.h
 include/kdevelop/buildtools/widgets/subclassesdlgbase.h
 include/kdevelop/catalog/catalog.h
-include/kdevelop/catalog/gcatalog.h
-include/kdevelop/catalog/gcatalog.tcc
 include/kdevelop/catalog/tag.h
 include/kdevelop/cppparser/ast.h
 include/kdevelop/cppparser/driver.h
 include/kdevelop/cppparser/errors.h
-include/kdevelop/cppparser/keywords.lut.h
 include/kdevelop/cppparser/lexer.h
 include/kdevelop/cppparser/lookup.h
 include/kdevelop/cppparser/parser.h
@@ -120,8 +120,8 @@ include/kdevelop/shell/profileengine/profileengine.h
 include/kdevelop/shell/projectmanager.h
 include/kdevelop/shell/projectsession.h
 include/kdevelop/shell/settingswidget.h
-include/kdevelop/shell/settingswidget.ui.h
 include/kdevelop/shell/shellextension.h
+include/kdevelop/shell/simplemainwindow.h
 include/kdevelop/shell/splashscreen.h
 include/kdevelop/shell/statusbar.h
 include/kdevelop/shell/toplevel.h
@@ -142,6 +142,7 @@ include/kdevelop/widgets/processwidget.h
 include/kdevelop/widgets/qcomboview.h
 include/kdevelop/widgets/resizablecombo.h
 include/kinterfacedesigner/designer.h
+lib/kconf_update_bin/kdev-gen-settings-kconf_update
 lib/kde3/kio_chm.la
 lib/kde3/kio_perldoc.la
 lib/kde3/kio_pydoc.la
@@ -209,6 +210,7 @@ lib/kde3/libkdevreplace.la
 lib/kde3/libkdevrubysupport.la
 lib/kde3/libkdevscripting.la
 lib/kde3/libkdevscriptproject.la
+lib/kde3/libkdevsecurity.la
 lib/kde3/libkdevsnippet.la
 lib/kde3/libkdevsqlsupport.la
 lib/kde3/libkdevsubversion.la
@@ -222,6 +224,7 @@ lib/kde3/libkdevvcsmanager.la
 lib/kde3/libperforceintegrator.la
 lib/kde3/libqeditorpart.la
 lib/kde3/libsubversionintegrator.la
+lib/libd.la
 lib/libdesignerintegration.la
 lib/libdocchmplugin.la
 lib/libdocdevhelpplugin.la
@@ -240,6 +243,7 @@ lib/libkdevextras.la
 lib/libkdevkdelibsimporter.la
 lib/libkdevmakebuilder.la
 lib/libkdevpropertyeditor.la
+lib/libkdevqmakeparser.la
 lib/libkdevqtimporter.la
 lib/libkdevshell.la
 lib/libkdevwidgets.la
@@ -248,6 +252,7 @@ lib/liblang_debugger.la
 lib/liblang_interfaces.la
 lib/libprofileengine.la
 lib/libprojectmanager_interfaces.la
+lib/libqmakeimporter.la
 share/applications/kde/kdevassistant.desktop
 share/applications/kde/kdevdesigner.desktop
 share/applications/kde/kdevelop.desktop
@@ -256,23 +261,31 @@ share/applications/kde/kdevelop_kde_cpp.desktop
 share/applications/kde/kdevelop_ruby.desktop
 share/applications/kde/kdevelop_scripting.desktop
 share/desktop-directories/kde-development-kdevelop.directory
+share/doc/kde/HTML/en/kde_app_devel/CMakeLists.txt
 share/doc/kde/HTML/en/kde_app_devel/appwizard.png
 share/doc/kde/HTML/en/kde_app_devel/common
 share/doc/kde/HTML/en/kde_app_devel/index.cache.bz2
 share/doc/kde/HTML/en/kde_app_devel/index.docbook
 share/doc/kde/HTML/en/kde_app_devel/kscribblefiles.png
 share/doc/kde/HTML/en/kdevelop-apidocs/common
+share/doc/kde/HTML/en/kdevelop/CMakeLists.txt
 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/adv-build-management.docbook
+share/doc/kde/HTML/en/kdevelop/app-changelog.docbook
 share/doc/kde/HTML/en/kdevelop/app-files.docbook
 share/doc/kde/HTML/en/kdevelop/app-menu.docbook
+share/doc/kde/HTML/en/kdevelop/app-misc-info.docbook
+share/doc/kde/HTML/en/kdevelop/app-uimodes-examples.docbook
 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/class-browsers.docbook
 share/doc/kde/HTML/en/kdevelop/classview.png
+share/doc/kde/HTML/en/kdevelop/commands.docbook
 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
@@ -297,13 +310,19 @@ 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/credits.docbook
+share/doc/kde/HTML/en/kdevelop/cvs.docbook
+share/doc/kde/HTML/en/kdevelop/debugger.docbook
 share/doc/kde/HTML/en/kdevelop/doctree-add-bookmark.png
 share/doc/kde/HTML/en/kdevelop/doctree-reduced.png
 share/doc/kde/HTML/en/kdevelop/doctree.png
 share/doc/kde/HTML/en/kdevelop/doctreeview.png
+share/doc/kde/HTML/en/kdevelop/documentation.docbook
 share/doc/kde/HTML/en/kdevelop/documents-contents.png
 share/doc/kde/HTML/en/kdevelop/edit-doctree-TOC-entry.png
+share/doc/kde/HTML/en/kdevelop/editing.docbook
 share/doc/kde/HTML/en/kdevelop/empty-ide.png
+share/doc/kde/HTML/en/kdevelop/file-browsers.docbook
 share/doc/kde/HTML/en/kdevelop/file-selector.png
 share/doc/kde/HTML/en/kdevelop/filetree.png
 share/doc/kde/HTML/en/kdevelop/folded-tabs.png
@@ -320,17 +339,22 @@ share/doc/kde/HTML/en/kdevelop/kdevelop-scripting.docbook
 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/listplugins.sh
 share/doc/kde/HTML/en/kdevelop/loading-progress-bar.png
+share/doc/kde/HTML/en/kdevelop/nutshell.docbook
 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/plugin-tools.docbook
 share/doc/kde/HTML/en/kdevelop/project-advanced.docbook
 share/doc/kde/HTML/en/kdevelop/project-management.docbook
 share/doc/kde/HTML/en/kdevelop/script_location.png
 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/survey-manual.docbook
 share/doc/kde/HTML/en/kdevelop/unixdev.docbook
 share/doc/kde/HTML/en/kdevelop/wrong-project-location.png
+share/kde/apps/kconf_update/kdev-gen-settings.upd
 share/kde/apps/kdevabbrev/kdevabbrev.rc
 share/kde/apps/kdevabbrev/sources/cpp_keywords
 share/kde/apps/kdevabbrev/sources/qt_classes
@@ -468,6 +492,10 @@ share/kde/apps/kdevappwizard/kpartapp.png
 share/kde/apps/kdevappwizard/kpartapp.tar.gz
 share/kde/apps/kdevappwizard/kpartplugin.png
 share/kde/apps/kdevappwizard/kpartplugin.tar.gz
+share/kde/apps/kdevappwizard/kscons_kmdi.png
+share/kde/apps/kdevappwizard/kscons_kmdi.tar.gz
+share/kde/apps/kdevappwizard/kscons_kxt.png
+share/kde/apps/kdevappwizard/kscons_kxt.tar.gz
 share/kde/apps/kdevappwizard/kscreensaver.png
 share/kde/apps/kdevappwizard/kscreensaver.tar.gz
 share/kde/apps/kdevappwizard/kxt.png
@@ -550,6 +578,8 @@ share/kde/apps/kdevappwizard/template-common/kde-doc-en-Makefile.am
 share/kde/apps/kdevappwizard/template-common/kde-index.docbook
 share/kde/apps/kdevappwizard/template-common/kde-part.desktop
 share/kde/apps/kdevappwizard/template-common/kde-po-Makefile.am
+share/kde/apps/kdevappwizard/template-common/scons.kdevtemplate
+share/kde/apps/kdevappwizard/template-common/scons.tar.gz
 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
@@ -598,6 +628,8 @@ share/kde/apps/kdevappwizard/templates/konqnavpanel.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kopart.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kpartapp.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kpartplugin.kdevtemplate
+share/kde/apps/kdevappwizard/templates/kscons_kmdi.kdevtemplate
+share/kde/apps/kdevappwizard/templates/kscons_kxt.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kscreensaver.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kxt.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kxtruby.kdevtemplate
@@ -683,6 +715,7 @@ share/kde/apps/kdevcustomproject/kdevcustomproject.rc
 share/kde/apps/kdevcvsservice/buildcvs.sh
 share/kde/apps/kdevcvsservice/pics/kdev_cvs.png
 share/kde/apps/kdevdebugger/icons/hicolor/16x16/actions/dbgwatchvar.png
+share/kde/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgjumpto.png
 share/kde/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgmemview.png
 share/kde/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgnext.png
 share/kde/apps/kdevdebugger/icons/hicolor/22x22/actions/dbgnextinst.png
@@ -993,6 +1026,7 @@ share/kde/apps/kdevelop/icons/hicolor/16x16/actions/variablenew.png
 share/kde/apps/kdevelop/icons/hicolor/22x22/actions/classnew.png
 share/kde/apps/kdevelop/icons/hicolor/22x22/actions/classwiz.png
 share/kde/apps/kdevelop/icons/hicolor/22x22/actions/configure_file.png
+share/kde/apps/kdevelop/icons/hicolor/22x22/actions/dbgjumpto.png
 share/kde/apps/kdevelop/icons/hicolor/22x22/actions/dbgmemview.png
 share/kde/apps/kdevelop/icons/hicolor/22x22/actions/dbgnext.png
 share/kde/apps/kdevelop/icons/hicolor/22x22/actions/dbgnextinst.png
@@ -1105,6 +1139,7 @@ share/kde/apps/kdevfilecreate/file-templates/y
 share/kde/apps/kdevfilecreate/file-templates/yy
 share/kde/apps/kdevfilecreate/kdevpart_filecreate.rc
 share/kde/apps/kdevfilecreate/template-info.xml
+share/kde/apps/kdevfilelist/kdevfilelist.rc
 share/kde/apps/kdevfilter/kdevfilter.rc
 share/kde/apps/kdevfortransupport/kdevfortransupport.rc
 share/kde/apps/kdevfullscreen/kdevpart_fullscreen.rc
@@ -1140,6 +1175,7 @@ share/kde/apps/kdevrubysupport/pics/ruby_config.png
 share/kde/apps/kdevrubysupport/pics/ruby_run.png
 share/kde/apps/kdevscripting/kdevscripting.rc
 share/kde/apps/kdevscriptproject/kdevscriptproject.rc
+share/kde/apps/kdevsecurity/patterns
 share/kde/apps/kdevsqlsupport/kdevsqlsupport.rc
 share/kde/apps/kdevtipofday/kdevpart_tipofday.rc
 share/kde/apps/kdevtipofday/tips
@@ -1151,6 +1187,7 @@ share/kde/apps/kio_pydoc/kde_pydoc.py
 share/kde/apps/qeditorpart/highlight/highlighting.xml
 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
@@ -1170,7 +1207,6 @@ 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/chm.desktop
 share/kde/mimelnk/application/x-kdevelop.desktop
 share/kde/mimelnk/text/x-fortran.desktop
 share/kde/services/chm.protocol
@@ -1246,6 +1282,7 @@ share/kde/services/kdevpghpfoptions.desktop
 share/kde/services/kdevphpsupport.desktop
 share/kde/services/kdevprojectmanager.desktop
 share/kde/services/kdevpythonsupport.desktop
+share/kde/services/kdevqmakeimporter.desktop
 share/kde/services/kdevqtimporter.desktop
 share/kde/services/kdevquickopen.desktop
 share/kde/services/kdevrbdebugger.desktop
@@ -1254,6 +1291,7 @@ share/kde/services/kdevreplace.desktop
 share/kde/services/kdevrubysupport.desktop
 share/kde/services/kdevscripting.desktop
 share/kde/services/kdevscriptproject.desktop
+share/kde/services/kdevsecurity.desktop
 share/kde/services/kdevsnippet.desktop
 share/kde/services/kdevsqlsupport.desktop
 share/kde/services/kdevsubversion.desktop
@@ -1292,10 +1330,8 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @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/mimetypes
 @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/22x22/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
@@ -1309,6 +1345,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/kde/apps/kdevtools
 @dirrm share/kde/apps/kdevtipofday
 @dirrm share/kde/apps/kdevsqlsupport
+@dirrm share/kde/apps/kdevsecurity
 @dirrm share/kde/apps/kdevscriptproject
 @dirrm share/kde/apps/kdevscripting
 @dirrm share/kde/apps/kdevrubysupport/pics
@@ -1341,6 +1378,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/kde/apps/kdevfullscreen
 @dirrm share/kde/apps/kdevfortransupport
 @dirrm share/kde/apps/kdevfilter
+@dirrm share/kde/apps/kdevfilelist
 @dirrm share/kde/apps/kdevfilecreate/file-templates
 @dirrm share/kde/apps/kdevfilecreate
 @dirrm share/kde/apps/kdevelop/profiles/KDevAssistant
@@ -1426,8 +1464,8 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @dirrm share/kde/apps/kdevabbrev/templates
 @dirrm share/kde/apps/kdevabbrev/sources
 @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/kde/applnk/Development
 @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
@@ -1497,6 +1535,15 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
 @dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
+@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools
+@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/html
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
@@ -1513,6 +1560,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @comment in xdg-dirs: @dirrm share/desktop-directories
 @comment in kde: @dirrm share/applications/kde
 @comment in kde: @dirrm lib/kde3
+@comment in kde: @dirrm lib/kconf_update_bin
 @dirrm include/kinterfacedesigner
 @dirrm include/kdevelop/widgets
 @dirrm include/kdevelop/util
@@ -1534,6 +1582,8 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
 @dirrm include/kdevelop/buildtools/widgets
 @dirrm include/kdevelop/buildtools/projectmanager/interfaces
 @dirrm include/kdevelop/buildtools/projectmanager
+@dirrm include/kdevelop/buildtools/parsers/qmake
+@dirrm include/kdevelop/buildtools/parsers
 @dirrm include/kdevelop/buildtools/base
 @dirrm include/kdevelop/buildtools
 @dirrm include/kdevelop
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index 4aa23d35a74..2709e3a3d87 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.21 2005/10/13 13:27:21 markd Exp $
+$NetBSD: distinfo,v 1.22 2005/12/11 12:01:11 markd Exp $
 
-SHA1 (kdevelop-3.2.3.tar.bz2) = b6bc6ccde4901de00880346391bd6cbc1e2e2e11
-RMD160 (kdevelop-3.2.3.tar.bz2) = cced730031e4c8f9995c75ea509fe6fca3637003
-Size (kdevelop-3.2.3.tar.bz2) = 8353809 bytes
+SHA1 (kdevelop-3.3.0.tar.bz2) = ca3b8c2985ea6c45c48dfc3e7e21d68fcd5f95b9
+RMD160 (kdevelop-3.3.0.tar.bz2) = cf33ca9b1316007e10ccd8d192882e30e0b6f064
+Size (kdevelop-3.3.0.tar.bz2) = 8100852 bytes
 SHA1 (patch-aa) = 7efffd47879e4d41923030f17087ab2c6c029e6c
-SHA1 (patch-ab) = 48963db1a34048e59727e701d95f071a29d9208e
-SHA1 (patch-ac) = 8065fe5d4600f2678e6b70838a7ea1cafcbafce7
-SHA1 (patch-ad) = de2183ebf309bb06819f60ff17febab697dda7ff
-SHA1 (patch-ae) = 91e744cc5a49bce401ad801750fe79fa468b250b
+SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
 SHA1 (patch-af) = ed3d61bb5dbaa22516088e8591db1fa41e913016
 SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
diff --git a/devel/kdevelop-base/patches/patch-ab b/devel/kdevelop-base/patches/patch-ab
index f9c92b1fda2..13b78a5c2f0 100644
--- a/devel/kdevelop-base/patches/patch-ab
+++ b/devel/kdevelop-base/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2005/03/23 22:38:45 markd Exp $
+$NetBSD: patch-ab,v 1.7 2005/12/11 12:01:11 markd Exp $
 
---- Makefile.in.orig	2005-03-05 01:47:58.000000000 +1300
+--- Makefile.in.orig	2005-11-21 09:28:20.000000000 +1300
 +++ Makefile.in
-@@ -413,7 +413,7 @@ x_libraries = @x_libraries@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--SUBDIRS = bdb lib parts languages buildtools editors vcs src pics doc mimetypes embedded kdevdesigner
-+SUBDIRS = lib parts languages buildtools editors vcs src pics doc mimetypes embedded kdevdesigner
- EXTRA_DIST = AUTHORS COPYING COPYING.LIB NEWS ChangeLog INSTALL README TODO HACKING HACKING.language admin configure.in.bot
- xdg_apps_DATA = kdevelop.desktop kdevassistant.desktop kdevelop_ruby.desktop \
- 	kdevelop_c_cpp.desktop  kdevelop_kde_cpp.desktop  kdevelop_scripting.desktop
+@@ -1022,7 +1022,7 @@ $(top_srcdir)/configure.files: $(top_src
+ $(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
+ 	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
+ 
+-$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
++$(top_srcdir)/subdirs: $(top_srcdir)/admin/cvs.sh
+ 	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
+ 
+ # defining default rules for files that may not be present
diff --git a/devel/kdevelop-base/patches/patch-ac b/devel/kdevelop-base/patches/patch-ac
deleted file mode 100644
index d9c113d02bd..00000000000
--- a/devel/kdevelop-base/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2005/03/23 22:38:45 markd Exp $
-
---- languages/cpp/Makefile.in.orig	2005-03-05 01:47:59.000000000 +1300
-+++ languages/cpp/Makefile.in
-@@ -73,8 +73,7 @@ libkdevcppsupport_la_DEPENDENCIES =  \
- 	$(top_builddir)/lib/catalog/libkdevcatalog.la \
- 	$(top_builddir)/lib/cppparser/libkdevcppparser.la \
- 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \
--	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la \
--	$(top_builddir)/bdb/build_unix/libdb.a
-+	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la
- am_libkdevcppsupport_la_OBJECTS = cppsupportpart.lo ccconfigwidget.lo \
- 	kdevdriver.lo cppcodecompletion.lo problemreporter.lo \
- 	backgroundparser.lo ast_utils.lo store_walker.lo \
-@@ -483,15 +482,15 @@ INCLUDES = -I$(top_srcdir)/languages/lib
- 	-I$(top_srcdir)/languages/lib/interfaces -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/compat \
- 	-I$(top_srcdir)/lib/cppparser -I$(top_srcdir)/lib/interfaces \
- 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
--	-I$(top_builddir)/languages/lib/designer_integration -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include \
-+	-I$(top_builddir)/languages/lib/designer_integration \
- 	$(all_includes)
- 
- kde_module_LTLIBRARIES = libkdevcppsupport.la
--libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -L$(top_srcdir)/bdb/dist
-+libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
- 	$(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \
- 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \
--	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/bdb/build_unix/libdb.a
-+	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(BDB_LIBS)
- 
- #>- libkdevcppsupport_la_SOURCES = cppsupportpart.cpp ccconfigwidget.cpp \
- #>- 			ccconfigwidgetbase.ui kdevdriver.cpp cppcodecompletion.cpp problemreporter.cpp \
diff --git a/devel/kdevelop-base/patches/patch-ad b/devel/kdevelop-base/patches/patch-ad
deleted file mode 100644
index 9b1bdddb1c4..00000000000
--- a/devel/kdevelop-base/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2005/03/23 22:38:45 markd Exp $
-
---- languages/java/Makefile.in.orig	2005-03-05 01:48:00.000000000 +1300
-+++ languages/java/Makefile.in
-@@ -64,7 +64,6 @@ am__installdirs = "$(DESTDIR)$(kde_modul
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- libkdevjavasupport_la_DEPENDENCIES =  \
--	$(top_builddir)/bdb/build_unix/libdb.a \
- 	$(top_builddir)/lib/libkdevelop.la \
- 	$(top_builddir)/lib/antlr/src/libantlr.la \
- 	$(top_builddir)/lib/catalog/libkdevcatalog.la
-@@ -446,11 +445,11 @@ SUBDIRS = file_templates app_templates d
- INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
- 	-I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
- 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
--	-I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include $(all_includes)
-+	$(all_includes)
- 
- kde_module_LTLIBRARIES = libkdevjavasupport.la
- libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
--libkdevjavasupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
-+libkdevjavasupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
- #>- libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \
- #>- JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui  javasupportpart.cpp \
- #>- JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel
diff --git a/devel/kdevelop-base/patches/patch-ae b/devel/kdevelop-base/patches/patch-ae
deleted file mode 100644
index 06a13dd5f60..00000000000
--- a/devel/kdevelop-base/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/03/23 22:38:45 markd Exp $
-
---- languages/pascal/Makefile.in.orig	2005-03-05 01:48:02.000000000 +1300
-+++ languages/pascal/Makefile.in
-@@ -62,7 +62,6 @@ am__installdirs = "$(DESTDIR)$(kde_modul
- kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(kde_module_LTLIBRARIES)
- libkdevpascalsupport_la_DEPENDENCIES =  \
--	$(top_builddir)/bdb/build_unix/libdb.a \
- 	$(top_builddir)/lib/libkdevelop.la \
- 	$(top_builddir)/lib/antlr/src/libantlr.la \
- 	$(top_builddir)/lib/catalog/libkdevcatalog.la
-@@ -438,12 +437,12 @@ xdg_menudir = @xdg_menudir@
- KDE_CXXFLAGS = $(USE_EXCEPTIONS)
- INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
- 	-I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
--	-I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include $(all_includes)
-+	$(all_includes)
- 
- SUBDIRS = file_templates app_templates compiler doc
- kde_module_LTLIBRARIES = libkdevpascalsupport.la
--libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
--libkdevpascalsupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
-+libkdevpascalsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-+libkdevpascalsupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
- #>- libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
- #>+ 1
- libkdevpascalsupport_la_SOURCES=pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp  problemreporter.cpp configproblemreporter.cpp
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index a2c8fb55579..28559a5e580 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2005/10/13 13:27:21 markd Exp $
+# $NetBSD: Makefile,v 1.53 2005/12/11 12:02:19 markd Exp $
 
-DISTNAME=	kdevelop-3.2.3
+DISTNAME=	kdevelop-3.3.0
 CATEGORIES=	devel kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty