Update to 2.1.2 and to use KDE 3.0.

Lots of bug fixes and new features.

This closes pkg/17579 from Joe Reed <jnr@po.cwru.edu>

7 files changed, 114 insertions, 148 deletions

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index db1e09d191d..9325ca72adf 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.11 2002/03/13 17:36:51 fredb Exp $
+# $NetBSD: Makefile,v 1.12 2002/07/17 11:28:04 skrll Exp $
 
-DISTNAME=	kdevelop-2.0.2
-PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	1
+DISTNAME=	kdevelop-2.1.2_for_KDE_3.0
+PKGNAME=	kdevelop-base-2.1.2
 CATEGORIES=	devel kde
-COMMENT=	Base modules for IDE for Unix/X11/KDE
-
-.include "../../x11/kde2/Makefile.kde2"
 
 HOMEPAGE=       http://www.kdevelop.org/
+COMMENT=	Base modules for IDE for Unix/X11/KDE
+
+.include "../../x11/kde3/Makefile.kde3"
 
 BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK_ONLY=	yes
+
 DEPENDS+=		automake>=1.4:../../devel/automake
-DEPENDS+=		kdoc-2.2.2:../../textproc/kdoc
+DEPENDS+=		kdoc>=3.0:../../textproc/kdoc
 DEPENDS+=		htdig>=3.1.6:../../www/htdig
 DEPENDS+=		a2ps>=4.12:../../print/a2ps
-DEPENDS+=		kdelibdocs>=2.2.2nb1:../../x11/kdelibdocs2
-DEPENDS+=		qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
-DEPENDS+=		kdesdk>=2.2.2nb1:../../devel/kdesdk2
+DEPENDS+=		kdelibdocs>=3.0.1:../../x11/kdelibdocs3
+DEPENDS+=		qt3-tools>=3.0.4:../../x11/qt3-tools
+DEPENDS+=		kdesdk>=3.0.1:../../devel/kdesdk3
 
 CONFLICTS+=	kdevelop<=1.3
 
@@ -29,15 +29,15 @@ REPLACE_PERL= \
 	${WRKSRC}/kdevelop/tools/processes.pl.in
 
 EVAL_PREFIX+=	\
-	QT2DIR=qt2 \
+	QT3DIR=qt3 \
 	KDELIBDIR=kdelibs
 
 CONFIGURE_ARGS+= \
-	--with-qtdoc-dir=${QT2DIR}/qt2/doc/html \
+	--with-qtdoc-dir=${QT3DIR}/qt3/doc/html \
 	--with-kdelibsdoc-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs \
-	--enable-kdoc2
+	--enable-kdoc3
 
-.include "../../x11/kde2/buildlink.mk"
-.include "../../x11/kdebase2/buildlink.mk"
+.include "../../x11/kde3/buildlink.mk"
+.include "../../x11/kdebase3/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index 6550d865213..2630a6b1f08 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/04 20:45:31 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/17 11:28:04 skrll Exp $
 bin/kdevdlg2ui
 bin/kdevelop
 bin/one2two
@@ -61,6 +61,7 @@ share/doc/kde/HTML/en/kdevelop/index-15.html
 share/doc/kde/HTML/en/kdevelop/index-16.html
 share/doc/kde/HTML/en/kdevelop/index-17.html
 share/doc/kde/HTML/en/kdevelop/index-18.html
+share/doc/kde/HTML/en/kdevelop/index-19.html
 share/doc/kde/HTML/en/kdevelop/index-2.html
 share/doc/kde/HTML/en/kdevelop/index-3.html
 share/doc/kde/HTML/en/kdevelop/index-4.html
@@ -121,6 +122,8 @@ share/doc/kde/HTML/en/kdevelop/tutorial/index-8.html
 share/doc/kde/HTML/en/kdevelop/tutorial/index-9.html
 share/doc/kde/HTML/en/kdevelop/tutorial/index.html
 share/doc/kde/HTML/en/kdevelop/tutorial/logotp3.png
+share/doc/kde/HTML/en/kdevelop/welcome/index.html
+share/doc/kde/HTML/en/kdevelop/welcome/logotp3.png
 share/kde/applnk/Development/kdevelop-setup.desktop
 share/kde/applnk/Development/kdevelop.desktop
 share/kde/apps/kconf_update/kdevelop2.upd
@@ -270,6 +273,9 @@ share/kde/mimelnk/application/x-kdevelop-project.desktop
 @dirrm share/kde/apps/kdevelop/icons/hicolor
 @dirrm share/kde/apps/kdevelop/icons
 @dirrm share/kde/apps/kdevelop
+@comment dirrm share/kde/apps/kconf_update
+@comment dirrm share/kde/applnk/Development
+@dirrm share/doc/kde/HTML/en/kdevelop/welcome
 @dirrm share/doc/kde/HTML/en/kdevelop/tutorial
 @dirrm share/doc/kde/HTML/en/kdevelop/reference/C
 @dirrm share/doc/kde/HTML/en/kdevelop/reference
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index e6409bb8f76..ba99b1bb146 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/12/04 20:45:31 skrll Exp $
+$NetBSD: distinfo,v 1.4 2002/07/17 11:28:04 skrll Exp $
 
-SHA1 (kdevelop-2.0.2.tar.bz2) = bc8c664434811c0b68c760ba2bffea63c7426b2c
-Size (kdevelop-2.0.2.tar.bz2) = 3082498 bytes
-SHA1 (patch-aa) = 093ba2b5a4a4b987c1b1117dc119bfe6646d7b96
-SHA1 (patch-ab) = db7787b6d8c9db9aba3e1147b67e2d2de2f85e63
-SHA1 (patch-ac) = 343674e6e6ff8a43b28cc81b2d08f701d13371ef
-SHA1 (patch-ad) = ae99f1c15c75ec97c07b2a80798c687407df67f0
+SHA1 (kdevelop-2.1.2_for_KDE_3.0.tar.bz2) = 8c2dde46607a267281b5bb15c34cf0445a15b097
+Size (kdevelop-2.1.2_for_KDE_3.0.tar.bz2) = 3384306 bytes
+SHA1 (patch-aa) = fb81b39dbfeacec8f6b496ed71d804ae4699ed18
+SHA1 (patch-ab) = 0e209ce83acd60b6b3a004c6398d3aed11e8cdfc
+SHA1 (patch-ac) = 4956d5864f064bd79d8f06cf763af8405b1d55cd
+SHA1 (patch-ad) = 3384826db7655f077065dc570a7b5b3747b4a16d
diff --git a/devel/kdevelop-base/patches/patch-aa b/devel/kdevelop-base/patches/patch-aa
index 44f653d31f6..7732dc90cf1 100644
--- a/devel/kdevelop-base/patches/patch-aa
+++ b/devel/kdevelop-base/patches/patch-aa
@@ -1,8 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2001/12/04 20:50:22 skrll Exp $
-
---- kdevelop/tools/processes.pl.in.orig	Wed Nov  7 00:25:10 2001
+--- kdevelop/tools/processes.pl.in.orig	Wed Apr  3 10:27:20 2002
 +++ kdevelop/tools/processes.pl.in
-@@ -11,9 +11,9 @@
+
+@@ -11,9 +11,9 @@ my $entriesfilename= shift || "entries";
  my %changings;
  
  my $homedirectory = $ENV{KDEHOME};
diff --git a/devel/kdevelop-base/patches/patch-ab b/devel/kdevelop-base/patches/patch-ab
index e36e23f857e..af6a5d23555 100644
--- a/devel/kdevelop-base/patches/patch-ab
+++ b/devel/kdevelop-base/patches/patch-ab
@@ -1,7 +1,5 @@
-$NetBSD: patch-ab,v 1.1 2001/12/04 20:50:22 skrll Exp $
-
---- kdevelop/tools/processesend.pl.orig	Wed Nov  7 00:25:10 2001
-+++ kdevelop/tools/processesend.pl
+--- kdevelop/tools/processesend.pl.orig	Tue Jul  9 15:48:09 2002
++++ kdevelop/tools/processesend.pl	Tue Jul  9 15:48:13 2002
 @@ -3,10 +3,10 @@
  use File::Copy;
  
@@ -15,26 +13,7 @@ $NetBSD: patch-ab,v 1.1 2001/12/04 20:50:22 skrll Exp $
  
  printflush (STDOUT,"Starting with configuration\n");
  
-@@ -32,14 +32,14 @@
- if ($processes{APPLICATION} eq "customproj") {}
- else {
-   my $confargs = $processes{CONFIGARG} || "";
--  #start make -f Makefile.dist
-+  #start gmake -f Makefile.dist
-   printflush (STDOUT,"creating configuration files...\n");
--  printflush (STDOUT,">make -f Makefile.dist\n");
-+  printflush (STDOUT,">gmake -f Makefile.dist\n");
-   chdir ($overDirectory);
--  system ("make -f Makefile.dist");
-+  system ("gmake -f Makefile.dist");
-   
-   #start configure
--  printflush (STDOUT,"make configure...\n");
-+  printflush (STDOUT,"gmake configure...\n");
-   printflush (STDOUT,">LDFLAGS=\" \" CFLAGS=\"-O0 -g3 -Wall\" CXXFLAGS=\"-O0 -g3 -Wall\"\n>./configure $confargs\n");
-   chdir ($overDirectory);
-   system ("LDFLAGS=\" \" CFLAGS=\"-O0 -g3 -Wall\" CXXFLAGS=\"-O0 -g3 -Wall\" ./configure " . $confargs);	
-@@ -110,8 +110,8 @@
+@@ -113,8 +113,8 @@
      printflush (STDOUT,"creating $nameLittle.pot\n");
      if ($processes{XGETTEXT} && $processes{XGETTEXT} eq "yes")
      {
@@ -45,7 +24,7 @@ $NetBSD: patch-ab,v 1.1 2001/12/04 20:50:22 skrll Exp $
      }
      else
      {
-@@ -126,8 +126,8 @@
+@@ -128,8 +128,8 @@
      if ($processes{XGETTEXT} && $processes{XGETTEXT} eq "yes")
      {
        chdir ($overDirectory);
diff --git a/devel/kdevelop-base/patches/patch-ac b/devel/kdevelop-base/patches/patch-ac
index 8e11e5ac9e3..0a49a0eccb4 100644
--- a/devel/kdevelop-base/patches/patch-ac
+++ b/devel/kdevelop-base/patches/patch-ac
@@ -1,13 +1,11 @@
-$NetBSD: patch-ac,v 1.1 2001/12/04 20:50:22 skrll Exp $
-
---- kdevelop/Makefile.am.orig	Tue Dec  4 20:19:06 2001
-+++ kdevelop/Makefile.am
+--- kdevelop/Makefile.am.orig	Tue Jul  9 15:49:58 2002
++++ kdevelop/Makefile.am	Tue Jul  9 15:51:37 2002
 @@ -5,7 +5,7 @@
  
  SUBDIRS = classparser kpp classwizard dbg examples gfxview kwrite pics templates tools vc widgets ctags setup 
  
--EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h extractrc grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h lo16-app-kdevelop.png lo32-app-kdevelop.png lo32-mime-kdevelop_project.png main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h 
-+EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h lo16-app-kdevelop.png lo32-app-kdevelop.png lo32-mime-kdevelop_project.png main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h 
+-EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h extractrc grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi32-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h ccompconfdlg.ui ccompconf.h ccompconf.cpp codecompletion_arghint.h codecompletion_arghint.cpp cppcodecompletion.cpp cppcodecompletion.h cprjaddopts.cpp cprjaddopts.h cprjaddoptsdlg.ui cprjcompopts.cpp cprjcompopts.h cprjcompoptsdlg.ui cprjconfchange.cpp cprjconfchange.h kdevregexp.cpp kdevregexp.h simpleparser.cpp simpleparser.h ccompletionoptsdlg.ui ccompletionopts.cpp ccompletionopts.h tips 
++EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h lo16-app-kdevelop.png lo32-app-kdevelop.png lo32-mime-kdevelop_project.png main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h
  
  ####### kdevelop will overwrite this part!!! (end)############
  
diff --git a/devel/kdevelop-base/patches/patch-ad b/devel/kdevelop-base/patches/patch-ad
index aa3bec57833..91f41b5545b 100644
--- a/devel/kdevelop-base/patches/patch-ad
+++ b/devel/kdevelop-base/patches/patch-ad
@@ -1,122 +1,106 @@
-$NetBSD: patch-ad,v 1.1 2001/12/04 20:50:22 skrll Exp $
-
---- kdevelop/Makefile.in.orig	Tue Dec  4 20:44:25 2001
-+++ kdevelop/Makefile.in
-@@ -224,7 +224,7 @@
+--- 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 @@
  
  SUBDIRS = classparser kpp classwizard dbg examples gfxview kwrite pics templates tools vc widgets ctags setup 
  
--EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h extractrc grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h lo16-app-kdevelop.png lo32-app-kdevelop.png lo32-mime-kdevelop_project.png main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h 
-+EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h lo16-app-kdevelop.png lo32-app-kdevelop.png lo32-mime-kdevelop_project.png main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h 
+-EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h extractrc grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi32-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h ccompconfdlg.ui ccompconf.h ccompconf.cpp codecompletion_arghint.h codecompletion_arghint.cpp cppcodecompletion.cpp cppcodecompletion.h cprjaddopts.cpp cprjaddopts.h cprjaddoptsdlg.ui cprjcompopts.cpp cprjcompopts.h cprjcompoptsdlg.ui cprjconfchange.cpp cprjconfchange.h kdevregexp.cpp kdevregexp.h simpleparser.cpp simpleparser.h ccompletionoptsdlg.ui ccompletionopts.cpp ccompletionopts.h tips 
+-
++EXTRA_DIST = caddclassattributedlg.cpp caddclassattributedlg.h caddclassmethoddlg.cpp caddclassmethoddlg.h caddexistingfiledlg.cpp caddexistingfiledlg.h caddnewtranslationdlg.cpp caddnewtranslationdlg.h cclasstooldlg.cpp cclasstooldlg.h cclasstooltreeview.cpp cclasstooltreeview.h wzconnectdlgimpl.cpp cclasstreehandler.h cclassview.cpp cclassview.h cclonefunctiondlg.cpp cclonefunctiondlg.h ccvaddfolderdlg.cpp ccvaddfolderdlg.h cdocbrowser.cpp cdocbrowser.h cdoctreepropdlg.cpp cdoctreepropdlg.h ceditwidget.cpp ceditwidget.h wzconnectdlgimpl.h cexecuteargdlg.cpp cexecuteargdlg.h cfilepropdlg.cpp cfilepropdlg.h cfinddoctextdlg.cpp cfinddoctextdlg.h cgeneratenewfile.cpp cgeneratenewfile.h cgrouppropertiesdlg.cpp cgrouppropertiesdlg.h ckdevaccel.h ckdevaccel.cpp cclasstreehandler.cpp ckdevelop.h ckdevelop_project.cpp ckdevelop_whatsthis.cpp ckdevsetupdlg.cpp ckdevsetupdlg.h clogfileview.cpp clogfileview.h cmakemanualdlg.cpp cmakemanualdlg.h cmakemanualdlgdata.cpp cnewclassdlg.cpp cnewclassdlg.h cnewfiledlg.cpp cnewfiledlg.h coutputwidget.cpp coutputwidget.h cprjoptionsdlg.h cproject.cpp cproject.h crealfileview.cpp crealfileview.h ctoolsconfigdlg.cpp ctoolsconfigdlg.h ctreehandler.cpp ctreehandler.h ctreeview.cpp ctreeview.h dbgpsdlg.cpp dbgpsdlg.h dbgtoolbar.cpp dbgtoolbar.h debug.h doctreeview.cpp doctreeview.h grepdialog.cpp grepdialog.h kdevelop-setup.desktop kdevelop.desktop kdeveloprc kdevelopui.rc kdevlistview.cpp kdevlistview.h kstartuplogo.cpp kstartuplogo.h lo16-app-kdevelop.png lo32-app-kdevelop.png lo32-mime-kdevelop_project.png main.cpp resource.h structdef.h ckdevelop_init.cpp wzconnectdlg.ui x-kdevelop-project.desktop ckappwizard.cpp ckappwizard.h cprjoptionsdlg.cpp ckdevelop_noslot.cpp ckdevelop_classview.cpp ckdevelop.cpp hi16-app-kdevelop.png hi48-app-kdevelop.png docviewman.cpp docviewman.h ckonsolewidget.cpp ckonsolewidget.h clibpropdlg.ui clibpropdlgimpl.cpp clibpropdlgimpl.h kdevsession.cpp kdevsession.h ctoolclass.cpp ctoolclass.h
  
  ####### kdevelop will overwrite this part!!! (end)############
- 
-@@ -249,8 +249,6 @@
- 
+ 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 @@
  mime_DATA = x-kdevelop-project.desktop
  mimedir = $(kde_mimedir)/application
--
+ 
 -bin_SCRIPTS = extractrc
+ subdir = kdevelop
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -317,8 +315,6 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -343,7 +341,6 @@
  	./kpp/libkdevelopkpp.la ./classparser/libclassparser.a \
  	./ctags/libctags.a ./setup/libkdevelopsetup.la \
  	./widgets/qextmdi/src/libkdevelopqextmdi.la
--SCRIPTS =  $(bin_SCRIPTS)
--
- CXXFLAGS = @CXXFLAGS@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 1
-@@ -337,7 +333,7 @@
+-SCRIPTS = $(bin_SCRIPTS)
  
- #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=hi32-app-kdevelop.png klangcombo.cpp klangcombo.h tips 
-+KDE_DIST=hi32-app-kdevelop.png klangcombo.cpp klangcombo.h tips extractrc 
  
- DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -435,25 +431,6 @@
- kdevelop$(EXEEXT): $(kdevelop_OBJECTS) $(kdevelop_DEPENDENCIES)
+ DEFS = @DEFS@
+@@ -485,27 +482,6 @@
+ kdevelop$(EXEEXT): $(kdevelop_OBJECTS) $(kdevelop_DEPENDENCIES) 
  	@rm -f kdevelop$(EXEEXT)
  	$(CXXLINK) $(kdevelop_LDFLAGS) $(kdevelop_OBJECTS) $(kdevelop_LDADD) $(LIBS)
--
 -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)/`echo $$p|sed '$(transform)'`"; \
--	$(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
--	else if test -f $(srcdir)/$$p; then \
--	echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
--	$(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
--	else :; fi; fi; \
+-	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; \
 -	done
 -
 -uninstall-binSCRIPTS:
 -	@$(NORMAL_UNINSTALL)
--	list='$(bin_SCRIPTS)'; for p in $$list; do \
--	rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+-	f="`echo $$p|sed '$(transform)'`"; \
+-	echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+-	rm -f $(DESTDIR)$(bindir)/$$f; \
 -	done
- .cpp.o:
- 	$(CXXCOMPILE) -c $<
- .cpp.obj:
-@@ -659,7 +636,7 @@
- check: check-recursive
- installcheck-am:
- installcheck: installcheck-recursive
--install-exec-am: install-binPROGRAMS install-binSCRIPTS
-+install-exec-am: install-binPROGRAMS
- install-exec: install-exec-recursive
  
- #>- install-data-am: install-dataDATA install-mimeDATA install-rcDATA \
-@@ -672,23 +649,21 @@
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-recursive
--#>- uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
--#>- uninstall-dataDATA uninstall-mimeDATA uninstall-rcDATA \
--#>- uninstall-tipDATA
--#>+ 3
--uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-binSCRIPTS \
--	uninstall-dataDATA uninstall-mimeDATA uninstall-rcDATA \
--	uninstall-tipDATA
-+#>- uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \
-+#>- uninstall-mimeDATA uninstall-rcDATA uninstall-tipDATA
-+#>+ 2
-+uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-dataDATA \
-+	uninstall-mimeDATA uninstall-rcDATA uninstall-tipDATA
- uninstall: uninstall-recursive
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+@@ -794,7 +770,7 @@
+ 	done
+ check-am: all-am
+ check: check-recursive
 -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 +all-am: Makefile $(PROGRAMS) $(DATA)
- all-redirect: all-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs: installdirs-recursive
  installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \
--	$(DESTDIR)$(datadir) $(DESTDIR)$(mimedir) \
--	$(DESTDIR)$(rcdir) $(DESTDIR)$(tipdir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
-+	$(DESTDIR)$(mimedir) $(DESTDIR)$(rcdir) \
-+	$(DESTDIR)$(tipdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mimedir) $(DESTDIR)$(rcdir) $(DESTDIR)$(tipdir)
+@@ -849,7 +825,7 @@
+ install-data-am: install-kde-icons  install-dataDATA install-mimeDATA install-rcDATA \
+ 	install-tipDATA
  
+-install-exec-am: install-binPROGRAMS install-binSCRIPTS
++install-exec-am: install-binPROGRAMS
+ 
+ install-info: install-info-recursive
+ 
+@@ -866,11 +842,11 @@
+ 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
+ #>+ 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
  
- mostlyclean-generic:
-@@ -735,10 +710,9 @@
- 	maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
- 	mostlyclean-compile distclean-compile clean-compile \
- 	maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--	clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
--	install-binSCRIPTS uninstall-dataDATA install-dataDATA \
--	uninstall-mimeDATA install-mimeDATA uninstall-rcDATA install-rcDATA \
--	uninstall-tipDATA install-tipDATA install-data-recursive \
-+	clean-libtool maintainer-clean-libtool uninstall-dataDATA \
-+	install-dataDATA uninstall-mimeDATA install-mimeDATA uninstall-rcDATA \
-+	install-rcDATA uninstall-tipDATA install-tipDATA install-data-recursive \
- 	uninstall-data-recursive install-exec-recursive \
- 	uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
- 	all-recursive check-recursive installcheck-recursive info-recursive \
+@@ -881,7 +857,7 @@
+ 	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 \
+-	install-am install-binPROGRAMS install-binSCRIPTS install-data \
++	install-am install-binPROGRAMS install-data \
+ 	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 @@
+ 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	mostlyclean-recursive tags tags-recursive uninstall \
+-	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
++	uninstall-am uninstall-binPROGRAMS \
+ 	uninstall-dataDATA uninstall-info-am uninstall-info-recursive \
+ 	uninstall-mimeDATA uninstall-rcDATA uninstall-recursive \
+ 	uninstall-tipDATA