[pkgsrc/trunk]: pkgsrc/devel/gdb6 Made gdb build again on NetBSD-current. The...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bc55f170882
branches:  trunk
changeset: 537354:5bc55f170882
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 06 19:54:46 2008 +0000

description:
Made gdb build again on NetBSD-current. The cause was that <sys/vmparam.h>
uses kmutex_t, but doesn't include <sys/mutex.h>, where it is defined.

diffstat:

 devel/gdb6/distinfo         |   4 ++--
 devel/gdb6/patches/patch-an |  11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 5c87cc60fe4b -r 5bc55f170882 devel/gdb6/distinfo
--- a/devel/gdb6/distinfo       Sun Jan 06 19:44:23 2008 +0000
+++ b/devel/gdb6/distinfo       Sun Jan 06 19:54:46 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2007/07/03 12:32:28 lkundrak Exp $
+$NetBSD: distinfo,v 1.12 2008/01/06 19:54:46 rillig Exp $
 
 SHA1 (gdb-6.2.1.tar.bz2) = 50cee3887744c4140aafcc0e4eb579d94464dfd7
 RMD160 (gdb-6.2.1.tar.bz2) = 6fe9f3bbef076c55cbcdf05143e7d5f98f61f889
@@ -16,7 +16,7 @@
 SHA1 (patch-ak) = 6ae7afb646fe7464b8a3667913ac6681b1df34e6
 SHA1 (patch-al) = c883cc007cd43c478b1ba0f09ca084391552ba3b
 SHA1 (patch-am) = 3d9a9eb8dce8a8cb83f8e7afc504bf52cdec0b1d
-SHA1 (patch-an) = 11df264e672894836effbb922381dff6abb42aca
+SHA1 (patch-an) = ba113183487cea58e71b932754d3b7b77f1c96f9
 SHA1 (patch-ao) = 6b977d1da6d94ff32bdf1e3627ee534333cc2a79
 SHA1 (patch-ap) = 3e41ee1623a52802268d5986559ce7ab742f36e7
 SHA1 (patch-aq) = bf4b1c62b003e65f5810a7d28f8464e936e8d190
diff -r 5c87cc60fe4b -r 5bc55f170882 devel/gdb6/patches/patch-an
--- a/devel/gdb6/patches/patch-an       Sun Jan 06 19:44:23 2008 +0000
+++ b/devel/gdb6/patches/patch-an       Sun Jan 06 19:54:46 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2005/10/20 17:48:49 wiz Exp $
+$NetBSD: patch-an,v 1.2 2008/01/06 19:54:46 rillig Exp $
 
---- gdb/config/i386/nm-nbsd.h.orig     2004-02-22 09:20:22.000000000 -0700
-+++ gdb/config/i386/nm-nbsd.h
-@@ -23,7 +23,13 @@
+--- gdb/config/i386/nm-nbsd.h.orig     2004-02-22 16:20:22.000000000 +0000
++++ gdb/config/i386/nm-nbsd.h  2008-01-06 20:43:25.000000000 +0000
+@@ -23,7 +23,16 @@
  #ifndef NM_NBSD_H
  #define NM_NBSD_H
  
@@ -12,6 +12,9 @@
  #include "config/nm-nbsd.h"
  
 +#include <sys/lock.h>
++#if __NetBSD_Version__ >= 499000900
++#include <sys/mutex.h>
++#endif
 +#include <machine/vmparam.h>
 +#define KERNEL_U_ADDR USRSTACK
 +