Update kdevelop to 2.0.2 (part of KDE 2.2.2) and kdbg 1.2.2.

The main part of the update is that both are now KDE 2 applications not
KDE 1.

4 files changed, 73 insertions, 197 deletions

diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 0823b6c7624..3d1e404ff4c 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2001/11/29 19:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/12/04 20:45:31 skrll Exp $
 
-DISTNAME=	kdbg-1.2.0
+DISTNAME=	kdbg-1.2.2
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/} \
 		ftp://ftp.eudaptics.com/pub/people/jsixt/
@@ -10,20 +10,17 @@ HOMEPAGE=       http://members.telecom.at/~johsixt/kdbg.html
 COMMENT=	Graphical User Interface around gdb using KDE
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=	automake>=1.4:../automake
-DEPENDS+=	kdevelop-base-1.*:../kdevelop-base
+USE_BUILDLINK_ONLY=     YES
+AUTOMAKE_OVERRIDE=      YES
 
-USE_X11BASE=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
+USE_GMAKE=              YES
+GNU_CONFIGURE=          YES
+USE_LIBTOOL=            YES
+LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
 
-EVAL_PREFIX+=	QT1DIR=qt1
-CONFIGURE_ARGS=	--with-qt-dir=${QT1DIR}/qt1 \
-		--with-qt-includes=${QT1DIR}/qt1/include \
-		--with-extra-libs=${LOCALBASE}/lib \
-		--with-extra-includes=${LOCALBASE}/include
-
-CONFIGURE_ENV=	KDEDIR=${PREFIX}
+CONFIGURE_ARGS+=	--with-kde-version=2
 
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdbg/PLIST b/devel/kdbg/PLIST
index 47a1b19ec54..2c449d4525a 100644
--- a/devel/kdbg/PLIST
+++ b/devel/kdbg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/04 20:45:31 skrll Exp $
 bin/kdbg
 share/doc/kde/HTML/de/kdbg/argspwdenv.html
 share/doc/kde/HTML/de/kdbg/breakptlist.html
@@ -48,7 +48,7 @@ share/doc/kde/HTML/ru/kdbg/threads.html
 share/doc/kde/HTML/ru/kdbg/tips.html
 share/doc/kde/HTML/ru/kdbg/types.html
 share/doc/kde/HTML/ru/kdbg/watches.html
-share/kde/applnk/Development/kdbg.kdelnk
+share/kde/applnk/Development/kdbg.desktop
 share/kde/apps/kdbg/pics/brkcond.xpm
 share/kde/apps/kdbg/pics/brkdis.xpm
 share/kde/apps/kdbg/pics/brkena.xpm
@@ -77,8 +77,10 @@ share/kde/apps/kdbg/types/kdecore.kdbgtt
 share/kde/apps/kdbg/types/kdecore3.kdbgtt
 share/kde/apps/kdbg/types/qt.kdbgtt
 share/kde/apps/kdbg/types/qt2.kdbgtt
-share/kde/icons/kdbg.xpm
-share/kde/icons/mini/mini-kdbg.xpm
+share/kde/icons/hicolor/16x16/apps/kdbg.png
+share/kde/icons/hicolor/32x32/apps/kdbg.png
+share/kde/icons/locolor/16x16/apps/kdbg.png
+share/kde/icons/locolor/32x32/apps/kdbg.png
 share/kde/locale/cs/LC_MESSAGES/kdbg.mo
 share/kde/locale/da/LC_MESSAGES/kdbg.mo
 share/kde/locale/de/LC_MESSAGES/kdbg.mo
@@ -99,9 +101,51 @@ share/kde/locale/sr/LC_MESSAGES/kdbg.mo
 share/kde/locale/sv/LC_MESSAGES/kdbg.mo
 share/kde/locale/tr/LC_MESSAGES/kdbg.mo
 share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
+@dirrm share/kde/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrm share/kde/locale/zh_CN.GB2312
+@dirrm share/kde/locale/tr/LC_MESSAGES
+@dirrm share/kde/locale/tr
+@dirrm share/kde/locale/sv/LC_MESSAGES
+@dirrm share/kde/locale/sv
+@dirrm share/kde/locale/sr/LC_MESSAGES
+@dirrm share/kde/locale/sr
+@dirrm share/kde/locale/sk/LC_MESSAGES
+@dirrm share/kde/locale/sk
+@dirrm share/kde/locale/ru/LC_MESSAGES
+@dirrm share/kde/locale/ru
+@dirrm share/kde/locale/ro/LC_MESSAGES
+@dirrm share/kde/locale/ro
+@dirrm share/kde/locale/pt/LC_MESSAGES
+@dirrm share/kde/locale/pt
+@dirrm share/kde/locale/pl/LC_MESSAGES
+@dirrm share/kde/locale/pl
+@dirrm share/kde/locale/no_NY/LC_MESSAGES
+@dirrm share/kde/locale/no_NY
+@dirrm share/kde/locale/no/LC_MESSAGES
+@dirrm share/kde/locale/no
+@dirrm share/kde/locale/ja/LC_MESSAGES
+@dirrm share/kde/locale/ja
+@dirrm share/kde/locale/it/LC_MESSAGES
+@dirrm share/kde/locale/it
+@dirrm share/kde/locale/hu/LC_MESSAGES
+@dirrm share/kde/locale/hu
+@dirrm share/kde/locale/hr/LC_MESSAGES
+@dirrm share/kde/locale/hr
+@dirrm share/kde/locale/fr/LC_MESSAGES
+@dirrm share/kde/locale/fr
+@dirrm share/kde/locale/es/LC_MESSAGES
+@dirrm share/kde/locale/es
+@dirrm share/kde/locale/de/LC_MESSAGES
+@dirrm share/kde/locale/de
+@dirrm share/kde/locale/da/LC_MESSAGES
+@dirrm share/kde/locale/da
+@dirrm share/kde/locale/cs/LC_MESSAGES
+@dirrm share/kde/locale/cs
 @dirrm share/kde/apps/kdbg/types
 @dirrm share/kde/apps/kdbg/pics
 @dirrm share/kde/apps/kdbg
 @dirrm share/doc/kde/HTML/ru/kdbg
+@dirrm share/doc/kde/HTML/ru
 @dirrm share/doc/kde/HTML/en/kdbg
 @dirrm share/doc/kde/HTML/de/kdbg
+@dirrm share/doc/kde/HTML/de
diff --git a/devel/kdbg/distinfo b/devel/kdbg/distinfo
index b3d9def650c..479b20c37ec 100644
--- a/devel/kdbg/distinfo
+++ b/devel/kdbg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/04 20:45:32 skrll Exp $
 
-SHA1 (kdbg-1.2.0.tar.gz) = 96478f07b92cb859af26e6c3d9dd34d980814601
-Size (kdbg-1.2.0.tar.gz) = 432392 bytes
-SHA1 (patch-aa) = 57aa30c6fcdcee87c8c1e0a535233c48e4c53c1c
+SHA1 (kdbg-1.2.2.tar.gz) = 1912f37d2fab78f9ec1ef9fe169b3426ce0e3f17
+Size (kdbg-1.2.2.tar.gz) = 466637 bytes
+SHA1 (patch-aa) = a3cc86e07f879fd2083b940f9a5011687878440b
 SHA1 (patch-ab) = b86d844c67467561e7b3a800b0bf119a06c899a4
diff --git a/devel/kdbg/patches/patch-aa b/devel/kdbg/patches/patch-aa
index 338b9309261..976bbce1907 100644
--- a/devel/kdbg/patches/patch-aa
+++ b/devel/kdbg/patches/patch-aa
@@ -1,179 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2001/03/04 16:38:47 tron Exp $
+$NetBSD: patch-aa,v 1.3 2001/12/04 20:45:32 skrll Exp $
 
---- configure.orig	Sun Dec 24 16:45:11 2000
-+++ configure	Sun Mar  4 17:25:57 2001
-@@ -3829,7 +3829,8 @@
-     
+--- configure.orig	Sun Apr 29 13:25:17 2001
++++ configure
+@@ -2622,7 +2622,7 @@
+ ac_libs_safe="$LIBS"
  
+ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
+-LDFLAGS="-L$qt_libdir $all_libraries"
++LDFLAGS="-L$qt_libdir $all_libraries $USER_LDFLAGS"
+ LIBS="$LIBS $LIBQT"
  
--
-+# Use NetBSD package system libtool (start)
-+if false; then
  
- kde_save_cc=$CC
- kde_save_cflags="$CFLAGS"
-@@ -3939,6 +3940,9 @@
  
- CC=$kde_save_cc
- CFLAGS="$kde_save_cflags"
-+fi
-+# Use NetBSD package system libtool (end)
-+
- 
- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
- echo "configure:3945: checking whether NLS is requested" >&5
-@@ -4273,7 +4277,7 @@
-   fi
-   
- else
--  ac_use_path_checking="default"
-+  ac_use_path_checking=""
-   
- fi
- 
-@@ -4356,7 +4360,9 @@
- if eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--  
-+
-+if test "$ac_use_path_checking" = "default"; then
-+
-   if test -z "$kde_htmldir"; then
-     kde_htmldir='\$(prefix)/share/doc/HTML'
-   fi
-@@ -4417,6 +4423,124 @@
- 	kde_servicetypesdir=\"$kde_servicetypesdir\" \
- 	kde_result=defaults"
- 
-+else
-+
-+echo "$ac_t""compiling" 1>&6
-+
-+
-+    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
-+echo "configure:4346: checking for KDE headers installed" >&5
-+    ac_ext=C
-+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cxx_cross
-+
-+cat > conftest.$ac_ext <<EOF
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+    printf("kde_wallpaperdir=\\"%s\\"\n", 
-+	KApplication::kde_wallpaperdir().data());
-+    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+    printf("kde_servicesdir=\\"%s\\"\n", "dummy");
-+    printf("kde_servicetypesdir=\\"%s\\"\n", "dummy");
-+    return 0;
-+    }
-+EOF
-+
-+ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
-+if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  echo "$ac_t""yes" 1>&6
-+else
-+  { echo "configure: error: your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly." 1>&2; exit 1; }
-+fi
-+
-+
-+KDE_TEST_RPATH=
-+
-+if test -n "$USE_RPATH"; then
-+
-+  if test -n "$kde_libraries"; then
-+    KDE_TEST_RPATH="-rpath $kde_libraries"
-+  fi
-+
-+  if test -n "$qt_libraries"; then
-+    KDE_TEST_RPATH="$KDE_TEST_RPATH -rpath $qt_libraries"
-+  fi
-+
-+  if test -n "$x_libraries"; then
-+    KDE_TEST_RPATH="$KDE_TEST_RPATH -rpath $x_libraries"
-+  fi
-+
-+  KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+fi
-+
-+echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
-+echo "configure:4438: checking for KDE libraries installed" >&5
-+ac_link='/bin/sh $LIBTOOL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-+
-+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then 
-+  echo "$ac_t""yes" 1>&6
-+else
-+  { echo "configure: error: your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now" 1>&2; exit 1; }
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+  kde_result=done
-+else
-+  kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+ac_ext=C
-+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cxx_cross
-+
-+
-+if test "$kde_have_all_paths" = "yes"; then
-+kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_partsdir=\"$kde_partsdir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_result=$kde_result"
-+fi
-+rm -fr conftest*
-+
-+fi
- 
- fi
- 
-@@ -4429,8 +4553,7 @@
-    test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-    test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-    test -z "$kde_wallpaperdir" || test -z "$kde_bindir" ||
--   test -z "$kde_servicesdir" ||
--   test -z "$kde_servicetypesdir" || test "$kde_have_all_paths" != "yes"; then
-+   test "$kde_have_all_paths" != "yes"; then
-   kde_have_all_paths=no
-   { echo "configure: error: configure could not run a little KDE program to test the environment. 
- Since it had compiled and linked before, it must be a strange problem on your system.