Update to 0.31

The major highligths of this release:

    * SPARC JIT engine
    * Windows.Forms is working again (alpha preview)
    * Native asynchronous support has been added to our I/O layer.
    * Relax NG compact syntax parser.
    * FileSystemWatcher.
    * ADO.NET disconnected operation.

For a complete list of changes see:
http://www.go-mono.org/archive/mono-0.31.html

9 files changed, 70 insertions, 49 deletions

diff --git a/lang/mono/MESSAGE b/lang/mono/MESSAGE
index 132994fcbab..4fba62f0c9d 100644
--- a/lang/mono/MESSAGE
+++ b/lang/mono/MESSAGE
@@ -1,7 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/02/03 12:30:11 recht Exp $
+$NetBSD: MESSAGE,v 1.2 2004/04/04 16:53:59 recht Exp $
 
-If you want to use the System.Drawing APIs then you have to install
-graphics/libgdiplus as well.
+If you intent to use the System.Drawing then you have to install
+graphics/libgdiplus as well. For Windows.Forms you have to install
+emulators/winelib.
 
 ===========================================================================
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index bf3fe6c8164..cfd690a2bb2 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/03/03 01:37:09 recht Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/04 16:53:59 recht Exp $
 #
 
-DISTNAME=	mono-0.30.2
+DISTNAME=	mono-0.31
 CATEGORIES=	lang
 MASTER_SITES=	http://www.go-mono.org/archive/
 
@@ -9,9 +9,8 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.go-mono.org/
 COMMENT=	Open source implementation of the .NET Development Framework
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-BUILD_DEPENDS+=	bash>=2.0:../../shells/bash2
+#BUILD_DEPENDS+=	bash>=2.0:../../shells/bash2
 
 CONFLICTS=	pnet-[0-9]*
 
@@ -23,7 +22,7 @@ NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 NOT_FOR_PLATFORM+=	*-*-amd64 *-*-x86_64
 
 
-USE_GNU_TOOLS+=		make
+USE_GNU_TOOLS+=		make yacc
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
@@ -54,8 +53,10 @@ CONF_FILES+=	${EGDIR}/DefaultWsdlHelpGenerator.aspx \
 BUILD_DEFS+=	MONO_USE_NPTL
 .  if defined(MONO_USE_NPTL) && !empty(MONO_USE_NPTL:M[yY][eE][sS])
 # Enable support for NPTL
-CONFIGURE_ARGS+=	--with-nptl
+CONFIGURE_ARGS+=	--with-nptl=yes
 .  endif
+.else
+CONFIGURE_ARGS+=	--with-nptl=no
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 322f0f0124f..28f12bab1fc 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,6 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/03 12:30:11 recht Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/04 16:53:59 recht Exp $
+bin/MakeCert.exe
 bin/al
 bin/al.exe
+bin/cert2spc
+bin/cert2spc.exe
+bin/certmgr
+bin/certmgr.exe
 bin/chktrust
 bin/chktrust.exe
 bin/cilc
@@ -11,6 +16,7 @@ bin/genxs
 bin/genxs.exe
 bin/ilasm
 bin/ilasm.exe
+bin/makecert
 bin/mbas
 bin/mbas.exe
 bin/mcs
@@ -19,12 +25,17 @@ bin/mint
 bin/mono
 bin/monodis
 bin/monograph
+bin/monop
+bin/monop.exe
 bin/monoresgen
 bin/monoresgen.exe
 bin/monosn
 bin/pedump
+bin/resgen
 bin/secutil
 bin/secutil.exe
+bin/setreg
+bin/setreg.exe
 bin/signcode
 bin/signcode.exe
 bin/sn
@@ -95,6 +106,7 @@ include/mono/metadata/threads.h
 include/mono/metadata/tokentype.h
 include/mono/metadata/verify.h
 include/mono/private/libgc-mono-debugger.h
+include/mono/utils/mono-codeman.h
 include/mono/utils/mono-digest.h
 include/mono/utils/mono-hash.h
 include/mono/utils/mono-logger.h
@@ -154,6 +166,11 @@ lib/System.Web.dll
 lib/System.Windows.Forms.dll
 lib/System.Xml.dll
 lib/System.dll
+lib/libMonoPosixHelper.a
+lib/libMonoPosixHelper.la
+lib/libMonoPosixHelper.so
+lib/libMonoPosixHelper.so.0
+lib/libMonoPosixHelper.so.0.0
 lib/libmint.a
 lib/libmint.la
 lib/libmint.so
@@ -173,17 +190,25 @@ lib/mscorlib.dll
 lib/pkgconfig/mint.pc
 lib/pkgconfig/mono.pc
 man/man1/cert2spc.1
+man/man1/certmgr.1
+man/man1/chktrust.1
 man/man1/cilc.1
 man/man1/disco.1
 man/man1/genxs.1
 man/man1/ilasm.1
+man/man1/makecert.1
 man/man1/mcs.1
 man/man1/mint.1
 man/man1/mono.1
 man/man1/monoburg.1
 man/man1/monodis.1
+man/man1/monop.1
 man/man1/monostyle.1
 man/man1/oldmono.1
+man/man1/secutil.1
+man/man1/setreg.1
+man/man1/signcode.1
+man/man1/sn.1
 man/man1/soapsuds.1
 man/man1/sqlsharp.1
 man/man1/wsdl.1
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 09b9628d306..23524e52a47 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/04 16:53:59 recht Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
 BUILDLINK_PACKAGES+=	mono
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mono+=	mono>=0.30
+BUILDLINK_DEPENDS.mono+=	mono>=0.31
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 934636fb56f..ea2d9a5e1c9 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.10 2004/03/03 01:37:09 recht Exp $
+$NetBSD: distinfo,v 1.11 2004/04/04 16:53:59 recht Exp $
 
-SHA1 (mono-0.30.2.tar.gz) = fc871616e74b1a120c2e6c22bcdc91447788bd57
-Size (mono-0.30.2.tar.gz) = 9713488 bytes
-SHA1 (patch-ac) = 59dba48f800f3e1030d586d3707616eff6c59c38
-SHA1 (patch-ad) = 1490db664f52112ec0ab4fb7d85e50443de72728
+SHA1 (mono-0.31.tar.gz) = be012fff6b5287503bbed4d96a9fbee843c6f044
+Size (mono-0.31.tar.gz) = 10098314 bytes
+SHA1 (patch-aa) = f347d991502da0c62131c65bdcb1be5eaea4cc77
+SHA1 (patch-ab) = 9bbef6f3bc593531339e1024cf776b82751655cf
+SHA1 (patch-ac) = ad880da185210b934536870fd025f588745dbc90
+SHA1 (patch-ad) = b7299d17bc7250ed50b91bdf1443ae45a3b67862
 SHA1 (patch-ah) = ca67288373df96e46b1d60560cca25698ce8261e
-SHA1 (patch-ai) = a4abc88e994ac4597966f9ebfd0ff15a782c5f5e
+SHA1 (patch-ai) = e365ba34991c555b333fcb93d24c16e7f1d27aeb
 SHA1 (patch-aj) = ab41349968d0f621c5f3e848c25d112c50558a28
 SHA1 (patch-ak) = aab1295adad7a09b9fc7d52139793bb7ec0b76d5
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
new file mode 100644
index 00000000000..7a0d1ab0c6f
--- /dev/null
+++ b/lang/mono/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.4 2004/04/04 16:53:59 recht Exp $
+
+--- mono/mini/mini-x86.h.orig	2004-03-20 15:40:23.000000000 +0100
++++ mono/mini/mini-x86.h	2004-03-20 15:40:52.000000000 +0100
+@@ -43,6 +43,9 @@
+ 
+ #ifdef HAVE_WORKING_SIGALTSTACK
+ #define MONO_ARCH_SIGSEGV_ON_ALTSTACK
++#ifndef SA_STACK
++#define SA_STACK SA_ONSTACK
++#endif
+ #endif
+ 
+ #endif
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index b3562dffa07..1b7fc493c65 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.5 2004/02/03 12:30:11 recht Exp $
+$NetBSD: patch-ac,v 1.6 2004/04/04 16:53:59 recht Exp $
 
---- data/Makefile.in.orig	2004-02-02 23:02:39.000000000 +0100
-+++ data/Makefile.in	2004-02-03 11:53:36.000000000 +0100
-@@ -117,7 +117,7 @@
- libgc_dir = @libgc_dir@
+--- data/Makefile.in.orig	2004-03-19 03:26:35.000000000 +0100
++++ data/Makefile.in	2004-03-20 14:05:48.000000000 +0100
+@@ -118,7 +118,7 @@
  libmono_cflags = @libmono_cflags@
  libmono_ldflags = @libmono_ldflags@
+ libsuffix = @libsuffix@
 -monodir = $(sysconfdir)/mono
 +monodir = $(datadir)/examples/mono
  
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index 9d85be485fd..e1d3a03b1ed 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2004/02/03 12:30:11 recht Exp $
+$NetBSD: patch-ad,v 1.6 2004/04/04 16:53:59 recht Exp $
 
---- mono/metadata/icall.c.orig	2004-01-30 18:01:36.000000000 +0100
-+++ mono/metadata/icall.c	2004-02-03 11:53:52.000000000 +0100
-@@ -4174,7 +4174,7 @@
+--- mono/metadata/icall.c.orig	2004-03-18 00:59:47.000000000 +0100
++++ mono/metadata/icall.c	2004-03-20 14:03:52.000000000 +0100
+@@ -4439,7 +4439,7 @@
  
  	MONO_ARCH_SAVE_REGS;
  
diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai
deleted file mode 100644
index 421a8cd5c42..00000000000
--- a/lang/mono/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2004/02/03 12:30:11 recht Exp $
-
---- configure.orig	2004-02-02 23:02:43.000000000 +0100
-+++ configure	2004-02-03 11:54:24.000000000 +0100
-@@ -1991,7 +1991,7 @@
- _ACEOF
- 
- 		libdl=
--		libgc_threads=pthreads
-+		libgc_threads=no
- 		;;
- 	*-*-*freebsd*|*-*-*openbsd*)
- 		platform_win32=no
-@@ -2008,7 +2008,7 @@
- _ACEOF
- 
- 		libdl=
--		libgc_threads=pthreads
-+		libgc_threads=no
- 		;;
- 	*-*-linux*)
- 		platform_win32=no