Update to 6.1nb1, from Marc Recht in PR 20008: Install shared libs.

4 files changed, 5 insertions, 46 deletions

diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index 62774bfbd28..4f3f99fa287 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.12 2002/09/25 18:18:52 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2003/02/14 18:50:51 wiz Exp $
 
---- Makefile.orig	Mon Sep  9 14:50:58 2002
-+++ Makefile	Mon Sep  9 14:52:54 2002
+--- Makefile.direct.orig	Thu Aug  1 05:19:26 2002
++++ Makefile.direct	Thu Jan 23 09:19:39 2003
 @@ -20,8 +20,8 @@
  # executables.
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.12 2002/09/25 18:18:52 wiz Exp $
  	mv gc.a bsd-libgc.a
  
 +bsd-libleak.a:
-+	$(MAKE) CFLAGS="$(LEAKFLAGS)" clean c++-nt
++	$(MAKE) -f Makefile.direct CFLAGS="$(LEAKFLAGS)" clean c++-nt
 +	mv gc.a bsd-libleak.a
 +
  BSD-pkg-install: BSD-pkg-all
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
index 1a6637be227..134372bc3f8 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.11 2003/02/10 14:08:21 kei Exp $
+$NetBSD: patch-ad,v 1.12 2003/02/14 18:50:51 wiz Exp $
 
 --- include/private/gcconfig.h.orig	Wed Aug  7 03:49:22 2002
 +++ include/private/gcconfig.h	Mon Feb 10 22:54:58 2003
@@ -31,14 +31,3 @@ $NetBSD: patch-ad,v 1.11 2003/02/10 14:08:21 kei Exp $
  # if defined(mips) || defined(__mips) || defined(_mips)
  #    define MIPS
  #    if defined(nec_ews) || defined(_nec_ews)
-@@ -752,6 +756,10 @@
- #   ifdef ULTRIX
- #	define OS_TYPE "ULTRIX"
- #	define STACKBOTTOM ((ptr_t) 0x7fffc800)
-+#   endif
-+#   ifdef NETBSD
-+#      define OS_TYPE "NETBSD"
-+#      define HEURISTIC2
- #   endif
- # endif
- 
diff --git a/devel/boehm-gc/patches/patch-ai b/devel/boehm-gc/patches/patch-ai
deleted file mode 100644
index c84ed2d2a41..00000000000
--- a/devel/boehm-gc/patches/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2001/09/08 00:36:10 kei Exp $
-
-*** include/gc.h.orig	Thu Mar 29 19:57:39 2001
---- include/gc.h	Thu Mar 29 20:00:24 2001
-***************
-*** 370,375 ****
---- 370,380 ----
-  #   define GC_RETURN_ADDR (GC_word)__return_address
-  #endif
-  
-+ #if defined(__GNUC__)
-+ #   define GC_ADD_CALLER
-+ #   define GC_RETURN_ADDR (GC_word)__builtin_return_address(0)
-+ #endif
-+ 
-  #ifdef GC_ADD_CALLER
-  #  define GC_EXTRAS GC_RETURN_ADDR, __FILE__, __LINE__
-  #  define GC_EXTRA_PARAMS GC_word ra, GC_CONST char * s, int i
diff --git a/devel/boehm-gc/patches/patch-aj b/devel/boehm-gc/patches/patch-aj
deleted file mode 100644
index 9a978be2ff0..00000000000
--- a/devel/boehm-gc/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/09/25 18:18:52 wiz Exp $
-
---- os_dep.c.orig	Mon Sep  9 14:59:29 2002
-+++ os_dep.c	Mon Sep  9 15:00:00 2002
-@@ -3165,7 +3165,6 @@
- # endif
- #endif
- 
--#include <execinfo.h>
- #ifdef LINUX
- #   include <unistd.h>
- #endif