summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/kdbg/Makefile14
-rw-r--r--devel/kdbg/PLIST31
-rw-r--r--devel/kdbg/distinfo12
-rw-r--r--devel/kdbg/patches/patch-aa23
-rw-r--r--devel/kdbg/patches/patch-ab24
-rw-r--r--devel/kdbg/patches/patch-ac24
6 files changed, 63 insertions, 65 deletions
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index d825ea612bc..96afb901e3f 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2002/03/13 17:36:50 fredb Exp $
+# $NetBSD: Makefile,v 1.29 2002/07/17 11:32:16 skrll Exp $
-DISTNAME= kdbg-1.2.2
-PKGREVISION= 1
+DISTNAME= kdbg-1.2.5
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kdbg/} \
ftp://ftp.eudaptics.com/pub/people/jsixt/
@@ -12,16 +11,17 @@ COMMENT= Graphical User Interface around gdb using KDE
BUILD_USES_MSGFMT= yes
USE_BUILDLINK_ONLY= YES
-AUTOMAKE_OVERRIDE= YES
+#AUTOMAKE_OVERRIDE= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ARGS+= --with-kde-version=2
+CONFIGURE_ARGS+= --with-kde-version=3
-.include "../../x11/kde2/buildlink.mk"
-.include "../../x11/kdebase2/buildlink.mk"
+.include "../../x11/qt3-libs/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/kdbg/PLIST b/devel/kdbg/PLIST
index 2c449d4525a..30d5b4961e3 100644
--- a/devel/kdbg/PLIST
+++ b/devel/kdbg/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:32:16 skrll Exp $
bin/kdbg
share/doc/kde/HTML/de/kdbg/argspwdenv.html
share/doc/kde/HTML/de/kdbg/breakptlist.html
@@ -77,6 +77,8 @@ 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/apps/kdbg/types/qt3.kdbgtt
+share/kde/apps/kdbg/types/stdc++.kdbgtt
share/kde/icons/hicolor/16x16/apps/kdbg.png
share/kde/icons/hicolor/32x32/apps/kdbg.png
share/kde/icons/locolor/16x16/apps/kdbg.png
@@ -102,50 +104,33 @@ 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
+@comment dirrm share/kde/icons/locolor/32x32/apps
+@comment dirrm share/kde/icons/locolor/16x16/apps
+@comment dirrm share/kde/icons/hicolor/32x32/apps
+@comment dirrm share/kde/icons/hicolor/16x16/apps
@dirrm share/kde/apps/kdbg/types
@dirrm share/kde/apps/kdbg/pics
@dirrm share/kde/apps/kdbg
+@comment dirrm share/kde/applnk/Development
@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 c36482b33a7..b861518cff3 100644
--- a/devel/kdbg/distinfo
+++ b/devel/kdbg/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/01/21 22:27:10 markd Exp $
+$NetBSD: distinfo,v 1.5 2002/07/17 11:32:16 skrll Exp $
-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
-SHA1 (patch-ac) = a01b6c4c7a763b635692785ad731a1eb289037d0
+SHA1 (kdbg-1.2.5.tar.gz) = 687afe2781801de5ab4c810245f85d15c458be75
+Size (kdbg-1.2.5.tar.gz) = 450958 bytes
+SHA1 (patch-aa) = 096cabb1e59dfd3239664fb037b62ec7fc45af09
+SHA1 (patch-ab) = b92a31ab2c58138ab079ab617b13d24e4a7c6897
+SHA1 (patch-ac) = ef7ae69e39d01db396da61cc2231b282095cd20d
diff --git a/devel/kdbg/patches/patch-aa b/devel/kdbg/patches/patch-aa
index 976bbce1907..4b5f6a1a321 100644
--- a/devel/kdbg/patches/patch-aa
+++ b/devel/kdbg/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2001/12/04 20:45:32 skrll Exp $
+$NetBSD: patch-aa,v 1.4 2002/07/17 11:32:16 skrll Exp $
---- configure.orig Sun Apr 29 13:25:17 2001
+--- configure.orig Wed Mar 20 21:23:13 2002
+++ configure
-@@ -2622,7 +2622,7 @@
+@@ -2507,7 +2507,7 @@
+
+
+
+-
++LIBQTMT="-lqt-mt"
+ LIBQT=${LIBQTMT:-"-lqt"}
+ if test $kde_qtver = 2; then
+
+@@ -2603,7 +2603,7 @@
ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
@@ -11,4 +20,12 @@ $NetBSD: patch-aa,v 1.3 2001/12/04 20:45:32 skrll Exp $
LIBS="$LIBS $LIBQT"
+@@ -2717,7 +2717,7 @@
+ CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ LDFLAGS="$X_LDFLAGS"
+-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
++LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
+ LD_LIBRARY_PATH=
+ export LD_LIBRARY_PATH
+ LIBRARY_PATH=
diff --git a/devel/kdbg/patches/patch-ab b/devel/kdbg/patches/patch-ab
index e34796a37bf..072cd49bb69 100644
--- a/devel/kdbg/patches/patch-ab
+++ b/devel/kdbg/patches/patch-ab
@@ -1,16 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2001/03/10 00:30:06 wulf Exp $
-
---- kdbg/mainwndbase.cpp.orig Wed Sep 13 03:44:40 2000
-+++ kdbg/mainwndbase.cpp Wed Feb 28 00:31:03 2001
-@@ -562,7 +562,11 @@
- */
- static const char shellScriptFmt[] =
- "tty>%s;"
+--- kdbg/ttywnd.cpp.orig Tue Jul 2 14:31:36 2002
++++ kdbg/ttywnd.cpp Tue Jul 2 14:33:00 2002
+@@ -32,6 +32,9 @@
+ #ifdef HAVE_LIBUTIL_H
+ #include <libutil.h> /* openpty on FreeBSD */
+ #endif
+#ifdef __NetBSD__
-+ "trap \"\" 2 3 18;" /* ignore various signals */
-+#else
- "trap \"\" INT QUIT TSTP;" /* ignore various signals */
++#include <util.h> /* openpty on NetBSD */
+#endif
- "exec<&-;exec>&-;" /* close stdin and stdout */
- "while :;do sleep 3600;done";
- // let config file override this script
+ #include <errno.h>
+
+ #include "mydebug.h"
diff --git a/devel/kdbg/patches/patch-ac b/devel/kdbg/patches/patch-ac
index 703d62a538b..d14c5be985a 100644
--- a/devel/kdbg/patches/patch-ac
+++ b/devel/kdbg/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2002/01/21 22:27:10 markd Exp $
-
---- kdbg/ttywnd.cpp.orig Mon Jan 22 03:01:20 2001
-+++ kdbg/ttywnd.cpp
-@@ -32,6 +32,9 @@
- #ifdef HAVE_LIBUTIL_H
- #include <libutil.h> /* openpty on FreeBSD */
- #endif
+--- kdbg/mainwndbase.cpp.orig Tue Jul 2 14:41:40 2002
++++ kdbg/mainwndbase.cpp Tue Jul 2 14:44:39 2002
+@@ -554,7 +554,11 @@
+ */
+ static const char shellScriptFmt[] =
+ "tty>%s;"
+#ifdef __NetBSD__
-+#include <util.h> /* openpty on NetBSD */
++ "trap \"\" 2 3 18;" /* ignore various signals */
++#else
+ "trap \"\" INT QUIT TSTP;" /* ignore various signals */
+#endif
- #include <errno.h>
-
- #include "mydebug.h"
+ "exec<&-;exec>&-;" /* close stdin and stdout */
+ "while :;do sleep 3600;done";
+ // let config file override this script