Update kdevelop to 3.5.0 (part of KDE 3.5.8)

6 files changed, 27 insertions, 75 deletions

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index e107a9eab18..051d8433b82 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2007/09/21 13:03:37 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2007/10/20 10:51:40 markd Exp $
 
-DISTNAME=	kdevelop-3.4.1
-PKGNAME=	kdevelop-base-3.4.1
-PKGREVISION=	2
+DISTNAME=	kdevelop-3.5.0
+PKGNAME=	kdevelop-base-3.5.0
 CATEGORIES=	devel kde
 
 HOMEPAGE=	http://www.kdevelop.org/
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index 0f405006d4e..b638f2b41d5 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2007/05/23 13:52:58 markd Exp $
+@comment $NetBSD: PLIST,v 1.22 2007/10/20 10:51:40 markd Exp $
 bin/kdevassistant
 bin/kdevdesigner
 bin/kdevelop
@@ -46,6 +46,7 @@ include/kdevelop/interfaces/extensions/kdevappfrontend.h
 include/kdevelop/interfaces/extensions/kdevcreatefile.h
 include/kdevelop/interfaces/extensions/kdevdifffrontend.h
 include/kdevelop/interfaces/extensions/kdevmakefrontend.h
+include/kdevelop/interfaces/extensions/kdevquickopen.h
 include/kdevelop/interfaces/extensions/kdevsourceformatter.h
 include/kdevelop/interfaces/extensions/kdevversioncontrol.h
 include/kdevelop/interfaces/extras/kdevcompileroptions.h
@@ -419,6 +420,8 @@ share/kde/apps/kdevantproject/kdevantproject.rc
 share/kde/apps/kdevappoutputview/kdevmakeview.rc
 share/kde/apps/kdevappwizard/adahello.png
 share/kde/apps/kdevappwizard/adahello.tar.gz
+share/kde/apps/kdevappwizard/automakeempty.png
+share/kde/apps/kdevappwizard/automakeempty.tar.gz
 share/kde/apps/kdevappwizard/bashhello.png
 share/kde/apps/kdevappwizard/bashhello.tar.gz
 share/kde/apps/kdevappwizard/chello.png
@@ -511,6 +514,8 @@ share/kde/apps/kdevappwizard/kcmodule.png
 share/kde/apps/kdevappwizard/kcmodule.tar.gz
 share/kde/apps/kdevappwizard/kconfig35.png
 share/kde/apps/kdevappwizard/kconfig35.tar.gz
+share/kde/apps/kdevappwizard/kde4app.png
+share/kde/apps/kdevappwizard/kde4app.tar.gz
 share/kde/apps/kdevappwizard/kdedcop.png
 share/kde/apps/kdevappwizard/kdedcop.tar.gz
 share/kde/apps/kdevappwizard/kdevappwizard.rc
@@ -550,6 +555,8 @@ share/kde/apps/kdevappwizard/kxt.png
 share/kde/apps/kdevappwizard/kxt.tar.gz
 share/kde/apps/kdevappwizard/kxtruby.png
 share/kde/apps/kdevappwizard/kxtruby.tar.gz
+share/kde/apps/kdevappwizard/makefileempty.png
+share/kde/apps/kdevappwizard/makefileempty.tar.gz
 share/kde/apps/kdevappwizard/noatunui.png
 share/kde/apps/kdevappwizard/noatunui.tar.gz
 share/kde/apps/kdevappwizard/noatunvisual.png
@@ -580,12 +587,16 @@ share/kde/apps/kdevappwizard/pytk.png
 share/kde/apps/kdevappwizard/pytk.tar.gz
 share/kde/apps/kdevappwizard/qmakeapp.png
 share/kde/apps/kdevappwizard/qmakeapp.tar.gz
+share/kde/apps/kdevappwizard/qmakeempty.png
+share/kde/apps/kdevappwizard/qmakeempty.tar.gz
 share/kde/apps/kdevappwizard/qmakesimple.png
 share/kde/apps/kdevappwizard/qmakesimple.tar.gz
 share/kde/apps/kdevappwizard/qt4hello.png
 share/kde/apps/kdevappwizard/qt4hello.tar.gz
 share/kde/apps/kdevappwizard/qt4makeapp.png
 share/kde/apps/kdevappwizard/qt4makeapp.tar.gz
+share/kde/apps/kdevappwizard/qtopia4app.png
+share/kde/apps/kdevappwizard/qtopia4app.tar.gz
 share/kde/apps/kdevappwizard/qtopiaapp.png
 share/kde/apps/kdevappwizard/qtopiaapp.tar.gz
 share/kde/apps/kdevappwizard/qtruby.png
@@ -639,6 +650,7 @@ share/kde/apps/kdevappwizard/template-common/wx-Makefile.cvs
 share/kde/apps/kdevappwizard/template-common/wx-configure.in
 share/kde/apps/kdevappwizard/template-common/wxwidgets.tar.gz
 share/kde/apps/kdevappwizard/templates/adahello.kdevtemplate
+share/kde/apps/kdevappwizard/templates/automakeempty.kdevtemplate
 share/kde/apps/kdevappwizard/templates/bashhello.kdevtemplate
 share/kde/apps/kdevappwizard/templates/chello.kdevtemplate
 share/kde/apps/kdevappwizard/templates/chellogba.kdevtemplate
@@ -665,6 +677,7 @@ share/kde/apps/kdevappwizard/templates/kateplugin.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kateplugin2.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kcmodule.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kconfig35.kdevtemplate
+share/kde/apps/kdevappwizard/templates/kde4app.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kdedcop.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kdevlang.kdevtemplate
 share/kde/apps/kdevappwizard/templates/kdevpart.kdevtemplate
@@ -684,6 +697,7 @@ 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
+share/kde/apps/kdevappwizard/templates/makefileempty.kdevtemplate
 share/kde/apps/kdevappwizard/templates/noatunui.kdevtemplate
 share/kde/apps/kdevappwizard/templates/noatunvisual.kdevtemplate
 share/kde/apps/kdevappwizard/templates/opieapp.kdevtemplate
@@ -699,9 +713,11 @@ share/kde/apps/kdevappwizard/templates/pyqt.kdevtemplate
 share/kde/apps/kdevappwizard/templates/pythonhello.kdevtemplate
 share/kde/apps/kdevappwizard/templates/pytk.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qmakeapp.kdevtemplate
+share/kde/apps/kdevappwizard/templates/qmakeempty.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qmakesimple.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qt4hello.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qt4makeapp.kdevtemplate
+share/kde/apps/kdevappwizard/templates/qtopia4app.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qtopiaapp.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qtruby.kdevtemplate
 share/kde/apps/kdevappwizard/templates/qtrubyapp.kdevtemplate
@@ -1361,6 +1377,7 @@ share/kde/servicetypes/kdevelopmakefrontend.desktop
 share/kde/servicetypes/kdeveloppcsimporter.desktop
 share/kde/servicetypes/kdevelopplugin.desktop
 share/kde/servicetypes/kdevelopproject.desktop
+share/kde/servicetypes/kdevelopquickopen.desktop
 share/kde/servicetypes/kdevelopsourceformatter.desktop
 share/kde/servicetypes/kdevelopvcsintegrator.desktop
 share/kde/servicetypes/kdevelopversioncontrol.desktop
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index d000cf65c16..b100d1d07b6 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.32 2007/05/23 13:52:58 markd Exp $
+$NetBSD: distinfo,v 1.33 2007/10/20 10:51:41 markd Exp $
 
-SHA1 (kdevelop-3.4.1.tar.bz2) = 5862f03aa4111b1288fc3c1cc926bc7aa582179c
-RMD160 (kdevelop-3.4.1.tar.bz2) = c24ee5a999334345c521ddd70f51b8d2e4aa38d6
-Size (kdevelop-3.4.1.tar.bz2) = 9368912 bytes
+SHA1 (kdevelop-3.5.0.tar.bz2) = e46eb17bcf83e9a31c120bd6b872347b7a606dcf
+RMD160 (kdevelop-3.5.0.tar.bz2) = fad1adda009eaa7fc6a6533a6bf211e3f1fa23fa
+Size (kdevelop-3.5.0.tar.bz2) = 9415312 bytes
 SHA1 (patch-aa) = ea4ceb43d826297610b19c1cd2c538fa486b2b22
 SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
 SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
 SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
 SHA1 (patch-ai) = fa0b9b7bc82c9cf2e8ac32e873e7efd06bb75599
-SHA1 (patch-aj) = 649ea2804c81e177c8c7d1fa52120c803d9068f3
-SHA1 (patch-ak) = 5c9e8c75b294218ecfd8ffc745784a2d54077a9b
diff --git a/devel/kdevelop-base/patches/patch-aj b/devel/kdevelop-base/patches/patch-aj
deleted file mode 100644
index 2c8d4b6e0bb..00000000000
--- a/devel/kdevelop-base/patches/patch-aj
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/05/23 13:52:58 markd Exp $
-
-Fix from svn.
-
-diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp kdevelop-svn/languages/cpp/cppsupportpart.cpp
---- kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp	2007-05-16 16:36:20.000000000 +0200
-+++ languages/cpp/cppsupportpart.cpp	2007-05-16 00:25:57.000000000 +0200
-@@ -3130,11 +3130,11 @@
-         return QString::null;
- }
- 
--UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ) {
-+UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) {
- }
-       
- void UIBlockTester::UIBlockTesterThread::run() {
--  while(1) {
-+  while(!m_stop) {
- 	  msleep( m_parent.m_msecs / 10 );
- 	  m_parent.m_timeMutex.lock();
- 	  QDateTime t = QDateTime::currentDateTime();
-@@ -3146,7 +3146,11 @@
- 	  m_parent.m_timeMutex.unlock();
-   }
- }
--      
-+
-+void UIBlockTester::UIBlockTesterThread::stop() {
-+	m_stop = true;
-+}
-+
- UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) {
- 	m_timer = new QTimer( this );
- 	m_timer->start( milliseconds/10 );
-@@ -3155,7 +3159,7 @@
- 	m_thread.start();
- }
- UIBlockTester::~UIBlockTester() {
--  m_thread.terminate();
-+  m_thread.stop();
-   m_thread.wait();
- }
- 	
diff --git a/devel/kdevelop-base/patches/patch-ak b/devel/kdevelop-base/patches/patch-ak
deleted file mode 100644
index 0b83465b58f..00000000000
--- a/devel/kdevelop-base/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/05/23 13:52:58 markd Exp $
-
-Fix from SVN
-
-diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.h kdevelop-svn/languages/cpp/cppsupportpart.h
---- kdevelop-3.4.1/languages/cpp/cppsupportpart.h	2007-05-16 16:36:20.000000000 +0200
-+++ languages/cpp/cppsupportpart.h	2007-05-16 00:25:57.000000000 +0200
-@@ -43,9 +43,10 @@
-     public:
-       UIBlockTesterThread( UIBlockTester& parent );
-       void run();
--      
-+      void stop();
-     private:
-       UIBlockTester& m_parent;
-+      bool m_stop;
-     };
-   friend class UIBlockTesterThread;
- public:
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 1a8b5854105..1743e1baa7c 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2007/05/23 13:54:36 markd Exp $
+# $NetBSD: Makefile,v 1.68 2007/10/20 10:51:38 markd Exp $
 
-DISTNAME=	kdevelop-3.4.1
+DISTNAME=	kdevelop-3.5.0
 CATEGORIES=	devel kde meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty