sigaltstack()/SA_ONSTACK isn't going to work on NetBSD with threads,

for fundamental reasons. So don't try it.
Being here, don't include <machine/db_machdep.h>. No user program
should use it. It shouldn't be installed at all.

5 files changed, 25 insertions, 18 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index a83e11f4c2e..8ae239e46d0 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/05/18 20:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2006/07/26 10:57:41 drochner Exp $
 
 DISTNAME=	mono-1.1.12.1
 PKGREVISION=	2
@@ -9,8 +9,6 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/
 COMMENT=	Open source implementation of the .NET Development Framework
 
-BROKEN_IN=	pkgsrc-2005Q4 pkgsrc-2006Q1
-
 BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
 CONFLICTS=	pnet-[0-9]*
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index b41de6ec415..8d7d3b7daa8 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/01/03 08:03:53 recht Exp $
+@comment $NetBSD: PLIST,v 1.19 2006/07/26 10:57:41 drochner Exp $
 bin/al
 bin/caspol
 bin/cert2spc
@@ -45,10 +45,6 @@ bin/wsdl
 bin/wsdl2
 bin/xbuild
 bin/xsd
-etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
-etc/mono/1.0/machine.config
-etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
-etc/mono/2.0/machine.config
 include/mono/cil/opcode.def
 include/mono/interpreter/embed.h
 include/mono/io-layer/access.h
@@ -609,7 +605,7 @@ share/libgc-mono/README.autoconf
 share/libgc-mono/README.changes
 share/libgc-mono/README.contributors
 share/libgc-mono/README.cords
-share/libgc-mono/README.${LOWER_OPSYS}
+share/libgc-mono/README.darwin
 share/libgc-mono/README.dj
 share/libgc-mono/README.environment
 share/libgc-mono/README.ews4800
@@ -824,6 +820,3 @@ share/mono/cil/cil-opcodes.xml
 @dirrm include/mono/interpreter
 @dirrm include/mono/cil
 @dirrm include/mono
-@dirrm etc/mono/2.0
-@dirrm etc/mono/1.0
-@dirrm etc/mono
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 59c45304756..bec50f24b20 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/01/03 08:03:53 recht Exp $
+$NetBSD: distinfo,v 1.25 2006/07/26 10:57:41 drochner Exp $
 
 SHA1 (mono-1.1.12.1.tar.gz) = 9cf8fcbbe3f133328ba3555c3763536780e7314f
 RMD160 (mono-1.1.12.1.tar.gz) = 4e008bb159549e964e4ea8937ed95d731fb6453f
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = a4338be0acf17b212dbb33bd90400ba31802d462
 SHA1 (patch-ac) = 57139cd9312461db0665bd9f1cfa716f4f6ba6ef
 SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1
 SHA1 (patch-af) = b74d8401e9e0213a7c4418b9d989365af2f3ae30
-SHA1 (patch-ag) = 8fbe737e05ea8051ff95b2cac6ed6b702a3e13b4
+SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca
 SHA1 (patch-ah) = 6f05a2a7460ea243fa9d294dc8bde4db6dbed55b
 SHA1 (patch-ai) = ef4aedc6f6e200704b3754be7277e8d3a047624c
 SHA1 (patch-aj) = 14131eb3ee9e827955091412cce59b62da0a6832
@@ -15,5 +15,6 @@ SHA1 (patch-ak) = f053c9f38fecde2ff3f81d8d3668330a333496a2
 SHA1 (patch-al) = 96e7125b2e9046784e3cf1b1c094de26d55d073e
 SHA1 (patch-am) = 07b004da1bf0cda00b79f731fd46b440cdff01ba
 SHA1 (patch-an) = 9ebaf8024e1a5b9581e5fdf20899331308074db4
+SHA1 (patch-ao) = fdb9fe52808557fc69d0cfd15d98fd2e253cc24c
 SHA1 (patch-ba) = 1aee2cf3dce0d2d378941b6cbff5600640c4d564
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
index 1f7203a3842..2e168f22468 100644
--- a/lang/mono/patches/patch-ag
+++ b/lang/mono/patches/patch-ag
@@ -1,21 +1,20 @@
-$NetBSD: patch-ag,v 1.5 2005/07/31 15:26:58 recht Exp $
+$NetBSD: patch-ag,v 1.6 2006/07/26 10:57:41 drochner Exp $
 
 --- libgc/dyn_load.c.orig	2005-04-11 16:12:45.000000000 +0200
 +++ libgc/dyn_load.c
-@@ -70,6 +70,12 @@
+@@ -70,6 +70,11 @@
  #   include <dlfcn.h>
  #   include <link.h>
  #endif
 +
 +#ifdef NETBSD 
-+#include <machine/db_machdep.h>
 +#include <dlfcn.h>
 +#endif
 +
  #ifdef SUNOS4
  #   include <dlfcn.h>
  #   include <link.h>
-@@ -509,6 +515,31 @@ GC_FirstDLOpenedLinkMap()
+@@ -509,6 +514,31 @@ GC_FirstDLOpenedLinkMap()
                  break;
              }
          }
diff --git a/lang/mono/patches/patch-ao b/lang/mono/patches/patch-ao
new file mode 100644
index 00000000000..3b187ab2bf7
--- /dev/null
+++ b/lang/mono/patches/patch-ao
@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.1 2006/07/26 10:57:41 drochner Exp $
+
+--- mono/mini/mini-x86.h.orig	2005-09-15 13:18:39.000000000 +0200
++++ mono/mini/mini-x86.h
+@@ -74,6 +74,11 @@ struct sigcontext {
+ #define MONO_ARCH_USE_SIGACTION
+ #endif
+ 
++#ifdef __NetBSD__
++#undef HAVE_WORKING_SIGALTSTACK
++#define MONO_ARCH_USE_SIGACTION
++#endif
++
+ #ifndef PLATFORM_WIN32
+ 
+ #ifdef HAVE_WORKING_SIGALTSTACK