From 400b0187b9ec56ff6f6dd46adfe5f7335f3a8484 Mon Sep 17 00:00:00 2001
From: shannonjr <shannonjr>
Date: Tue, 22 Feb 2005 15:22:02 +0000
Subject: Added patch changing how program counter, stack pointer, and frame
 pointer are retrieved on NetBSD. This fixes a build problem on CURRENT.

---
 devel/gdb6/DESCR            |  6 +++---
 devel/gdb6/Makefile         |  5 +++--
 devel/gdb6/distinfo         |  3 ++-
 devel/gdb6/patches/patch-aa | 51 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 devel/gdb6/patches/patch-aa

diff --git a/devel/gdb6/DESCR b/devel/gdb6/DESCR
index f7b0d9b2949..e10b71287ba 100644
--- a/devel/gdb6/DESCR
+++ b/devel/gdb6/DESCR
@@ -1,3 +1,3 @@
-GDB, the GNU Project debugger, allows you to see what is 
-going on `inside' another program while it executes -- or 
-what another program was doing at the moment it crashed. 
+GDB, the GNU Project debugger, allows you to see what is
+going on `inside' another program while it executes -- or
+what another program was doing at the moment it crashed.
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index ae330343c11..5765963b31b 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/10/04 22:35:17 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2005/02/22 15:22:02 shannonjr Exp $
 #
 
 DISTNAME=		gdb-6.2.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://sources.redhat.com/pub/gdb/releases/
 EXTRACT_SUFX=		.tar.bz2
@@ -22,6 +22,7 @@ GNU_CONFIGURE=		yes
 AUTOCONF_REQD=		2.13
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/gdb6
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gdb6
+CONFIGURE_ARGS+=	--enable-libada
 
 USE_MAKEINFO=		yes
 INFO_FILES=		annotate.info bfd.info configure.info
diff --git a/devel/gdb6/distinfo b/devel/gdb6/distinfo
index fb6679d5fdc..470281491de 100644
--- a/devel/gdb6/distinfo
+++ b/devel/gdb6/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2004/10/04 22:35:17 shannonjr Exp $
+$NetBSD: distinfo,v 1.5 2005/02/22 15:22:02 shannonjr Exp $
 
 SHA1 (gdb-6.2.1.tar.bz2) = 50cee3887744c4140aafcc0e4eb579d94464dfd7
 Size (gdb-6.2.1.tar.bz2) = 12820148 bytes
 SHA1 (patch-Makefile_tpl) = b5c98fc990606e2f5c566864d02565d8fc9adeb4
+SHA1 (patch-aa) = 6cbdc01338b162a4bde6e2d55c5b3571a8bc66d3
 SHA1 (patch-ax_gdb_c) = bc9a4e5d77d571a6f06b88984fb2030beec37654
 SHA1 (patch-bsd_kvm_c) = 909612a85a4c46a13f9de3408df4c69e502c02a5
 SHA1 (patch-cli_cli_decode_c) = 19dbdb326643bf32a3d0c26cfea056cca19deb13
diff --git a/devel/gdb6/patches/patch-aa b/devel/gdb6/patches/patch-aa
new file mode 100644
index 00000000000..f9c557631b7
--- /dev/null
+++ b/devel/gdb6/patches/patch-aa
@@ -0,0 +1,51 @@
+$NetBSD: patch-aa,v 1.1 2005/02/22 15:22:02 shannonjr Exp $
+
+--- gdb/i386bsd-nat.c.orig	2004-05-31 05:20:41.000000000 -0600
++++ gdb/i386bsd-nat.c
+@@ -33,6 +33,19 @@
+ 
+ #include "i386-tdep.h"
+ #include "i387-tdep.h"
++#ifdef HAVE_SYS_PROCFS_H
++#include <sys/procfs.h>
++#endif
++
++#ifndef HAVE_GREGSET_T
++typedef struct reg gregset_t;
++#endif
++
++#ifndef HAVE_FPREGSET_T
++typedef struct fpreg fpregset_t;
++#endif
++
++#include "gregset.h"
+ 
+ 
+ /* In older BSD versions we cannot get at some of the segment
+@@ -373,7 +386,7 @@ _initialize_i386bsd_nat (void)
+ 
+   /* Override the default value for the offset of the program counter
+      in the sigcontext structure.  */
+-  offset = offsetof (struct sigcontext, sc_pc);
++  offset = offsetof (ucontext_t, uc_mcontext.__gregs[_REG_EIP]);
+ 
+   if (SC_PC_OFFSET != offset)
+     {
+@@ -386,7 +399,7 @@ Please report this to <bug-gdb@gnu.org>.
+   SC_PC_OFFSET = offset;
+ 
+   /* Likewise for the stack pointer.  */
+-  offset = offsetof (struct sigcontext, sc_sp);
++  offset = offsetof (ucontext_t, uc_mcontext.__gregs[_REG_UESP]);
+ 
+   if (SC_SP_OFFSET != offset)
+     {
+@@ -399,7 +412,7 @@ Please report this to <bug-gdb@gnu.org>.
+   SC_SP_OFFSET = offset;
+ 
+   /* And the frame pointer.  */
+-  offset = offsetof (struct sigcontext, sc_fp);
++  offset = offsetof (ucontext_t, uc_stack);
+ 
+   if (SC_FP_OFFSET != offset)
+     {
-- 
cgit v1.2.3