Update to mono-0.91 (beta1).

Too many changes to list them all. For a complete list see:
http://www.go-mono.com/archive/beta1/beta1.html
Some of the higlights:
- Global Assembly Cache (GAC)
- CLS support in the C# compiler
- new SQL expression parser
- new Interpreter

10 files changed, 150 insertions, 124 deletions

diff --git a/lang/mono/DEINSTALL b/lang/mono/DEINSTALL
new file mode 100644
index 00000000000..23ca3ff1c06
--- /dev/null
+++ b/lang/mono/DEINSTALL
@@ -0,0 +1,20 @@
+# $NetBSD: DEINSTALL,v 1.1 2004/05/11 17:33:42 recht Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${CAT} << EOF
+===========================================================================
+Note:
+
+  Removing Assemblies from the Global Assembly Cache.
+
+===========================================================================
+EOF
+
+assemblies=`${LS} @PREFIX@/lib/mono/gac`
+
+for a in $assemblies; do
+	@PREFIX@/bin/gacutil -u $a
+done
+	;;
+esac
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 784d5cd1f04..9d8f15efbb1 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.23 2004/04/04 19:23:10 recht Exp $
+# $NetBSD: Makefile,v 1.24 2004/05/11 17:33:42 recht Exp $
 #
 
-DISTNAME=	mono-0.31
-PKGREVISION=	1
+DISTNAME=	mono-0.91
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.org/archive/
+MASTER_SITES=	http://www.go-mono.com/archive/beta1/
 
 MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://www.go-mono.org/
+HOMEPAGE=	http://www.go-mono.com/
 COMMENT=	Open source implementation of the .NET Development Framework
 
 BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-#BUILD_DEPENDS+=	bash>=2.0:../../shells/bash2
 
 CONFLICTS=	pnet-[0-9]*
 
@@ -22,7 +20,6 @@ NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 # boehm-gc doesn't build on amd64/x86_64
 NOT_FOR_PLATFORM+=	*-*-amd64 *-*-x86_64
 
-
 USE_GNU_TOOLS+=		make yacc
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
@@ -39,7 +36,7 @@ PKG_SYSCONFSUBDIR=	mono
 USE_PERL5=	build
 REPLACE_PERL=	mono/cil/make-opcodes-def.pl
 REPLACE_PERL+=	mono/metadata/make-bundle.pl
-REPLACE_PERL+=	mono/tests/test-driver
+REPLACE_PERL+=	mono/benchmark/test-driver
 
 EGDIR=		${PREFIX}/share/examples/mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
@@ -48,27 +45,35 @@ CONF_FILES+=	${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
 CONF_FILES+=	${EGDIR}/DefaultWsdlHelpGenerator.aspx \
 		${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
 
+DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
+
 .include "../../mk/bsd.prefs.mk"
 
-GC_LIB?=included
 .if ${OPSYS} == "Linux"
 .  if defined(MONO_USE_NPTL) && !empty(MONO_USE_NPTL:M[yY][eE][sS])
 # Enable support for NPTL
 CONFIGURE_ARGS+=	--with-nptl=yes
 .  endif
 BUILD_DEFS+=	MONO_USE_NPTL
-GC_LIB=included
 .else
 CONFIGURE_ARGS+=	--with-nptl=no
 .endif
 
-.if ${GC_LIB} == "boehm"
+# allow changing the gc_type
+# allowed values: included, boehm, none
+MONO_GC_TYPE?=included
+.if ${MONO_GC_TYPE} == "boehm"
 .  include "../../devel/boehm-gc/buildlink3.mk"
+.endif
+CONFIGURE_ARGS+=	--with-gc=${MONO_GC_TYPE}
+
+# mono debugger support is only available with the included gc
+# patch the PLIST accordingly
+.if ${MONO_GC_TYPE} == "boehm" || ${MONO_GC_TYPE} == "none"
 PLIST_SUBST+=  GC="@comment "
 .else
 PLIST_SUBST+=  GC=
 .endif
-CONFIGURE_ARGS+=	--with-gc=${GC_LIB}
 
 # mcs coredumps with sigaltstack
 .if ${OPSYS} == "NetBSD"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 951c3255527..8638d2a8dd3 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/04 19:23:10 recht Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/05/11 17:33:42 recht Exp $
 bin/MakeCert.exe
 bin/al
 bin/al.exe
@@ -12,15 +12,16 @@ bin/cilc
 bin/cilc.exe
 bin/disco
 bin/disco.exe
+bin/gacutil
+bin/gacutil.exe
 bin/genxs
 bin/genxs.exe
+bin/gmcs
 bin/ilasm
 bin/ilasm.exe
 bin/makecert
 bin/mbas
-bin/mbas.exe
 bin/mcs
-bin/mcs.exe
 bin/mint
 bin/mono
 bin/monodis
@@ -39,6 +40,7 @@ bin/setreg.exe
 bin/signcode
 bin/signcode.exe
 bin/sn
+bin/sn.exe
 bin/soapsuds
 bin/soapsuds.exe
 bin/sqlsharp
@@ -62,6 +64,7 @@ include/mono/io-layer/macros.h
 include/mono/io-layer/mono-mutex.h
 include/mono/io-layer/mutexes.h
 include/mono/io-layer/processes.h
+include/mono/io-layer/security.h
 include/mono/io-layer/semaphores.h
 include/mono/io-layer/sockets.h
 include/mono/io-layer/status.h
@@ -113,59 +116,6 @@ include/mono/utils/mono-logger.h
 include/mono/utils/mono-math.h
 include/mono/utils/mono-uri.h
 include/mono/utils/monobitset.h
-lib/Accessibility.dll
-lib/ByteFX.Data.dll
-lib/Commons.Xml.Relaxng.dll
-lib/Cscompmgd.dll
-lib/I18N.CJK.dll
-lib/I18N.MidEast.dll
-lib/I18N.Other.dll
-lib/I18N.Rare.dll
-lib/I18N.West.dll
-lib/I18N.dll
-lib/ICSharpCode.SharpZipLib.dll
-lib/Microsoft.VisualBasic.dll
-lib/Microsoft.VisualC.dll
-lib/Microsoft.Vsa.dll
-lib/Mono.CSharp.Debugger.dll
-lib/Mono.Cairo.dll
-lib/Mono.Data.DB2Client.dll
-lib/Mono.Data.MySql.dll
-lib/Mono.Data.PostgreSqlClient.dll
-lib/Mono.Data.SqliteClient.dll
-lib/Mono.Data.SybaseClient.dll
-lib/Mono.Data.Tds.dll
-lib/Mono.Data.TdsClient.dll
-lib/Mono.GetOptions.dll
-lib/Mono.Http.dll
-lib/Mono.PEToolkit.dll
-lib/Mono.Posix.dll
-lib/Mono.Security.Win32.dll
-lib/Mono.Security.dll
-lib/NUnit.Framework.dll
-lib/NUnit.Util.dll
-lib/Novell.Directory.Ldap.dll
-lib/Npgsql.dll
-lib/PEAPI.dll
-lib/System.Configuration.Install.dll
-lib/System.Data.OracleClient.dll
-lib/System.Data.dll
-lib/System.Design.dll
-lib/System.DirectoryServices.dll
-lib/System.Drawing.Design.dll
-lib/System.Drawing.dll
-lib/System.EnterpriseServices.dll
-lib/System.Management.dll
-lib/System.Messaging.dll
-lib/System.Runtime.Remoting.dll
-lib/System.Runtime.Serialization.Formatters.Soap.dll
-lib/System.Security.dll
-lib/System.ServiceProcess.dll
-lib/System.Web.Services.dll
-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
@@ -186,6 +136,59 @@ lib/libmono.la
 lib/libmono.so
 lib/libmono.so.0
 lib/libmono.so.0.0
+lib/mono/1.0/Accessibility.dll
+lib/mono/1.0/ByteFX.Data.dll
+lib/mono/1.0/Commons.Xml.Relaxng.dll
+lib/mono/1.0/Cscompmgd.dll
+lib/mono/1.0/I18N.CJK.dll
+lib/mono/1.0/I18N.MidEast.dll
+lib/mono/1.0/I18N.Other.dll
+lib/mono/1.0/I18N.Rare.dll
+lib/mono/1.0/I18N.West.dll
+lib/mono/1.0/I18N.dll
+lib/mono/1.0/ICSharpCode.SharpZipLib.dll
+lib/mono/1.0/Microsoft.VisualBasic.dll
+lib/mono/1.0/Microsoft.VisualC.dll
+lib/mono/1.0/Microsoft.Vsa.dll
+lib/mono/1.0/Mono.CSharp.Debugger.dll
+lib/mono/1.0/Mono.Cairo.dll
+lib/mono/1.0/Mono.Data.SqliteClient.dll
+lib/mono/1.0/Mono.Data.SybaseClient.dll
+lib/mono/1.0/Mono.Data.Tds.dll
+lib/mono/1.0/Mono.Data.TdsClient.dll
+lib/mono/1.0/Mono.GetOptions.dll
+lib/mono/1.0/Mono.Http.dll
+lib/mono/1.0/Mono.Posix.dll
+lib/mono/1.0/Mono.Security.Win32.dll
+lib/mono/1.0/Mono.Security.dll
+lib/mono/1.0/NUnit.Framework.dll
+lib/mono/1.0/NUnit.Util.dll
+lib/mono/1.0/Novell.Directory.Ldap.dll
+lib/mono/1.0/Npgsql.dll
+lib/mono/1.0/PEAPI.dll
+lib/mono/1.0/System.Configuration.Install.dll
+lib/mono/1.0/System.Data.OracleClient.dll
+lib/mono/1.0/System.Data.dll
+lib/mono/1.0/System.Design.dll
+lib/mono/1.0/System.DirectoryServices.dll
+lib/mono/1.0/System.Drawing.Design.dll
+lib/mono/1.0/System.Drawing.dll
+lib/mono/1.0/System.EnterpriseServices.dll
+lib/mono/1.0/System.Management.dll
+lib/mono/1.0/System.Messaging.dll
+lib/mono/1.0/System.Runtime.Remoting.dll
+lib/mono/1.0/System.Runtime.Serialization.Formatters.Soap.dll
+lib/mono/1.0/System.Security.dll
+lib/mono/1.0/System.ServiceProcess.dll
+lib/mono/1.0/System.Web.Services.dll
+lib/mono/1.0/System.Web.dll
+lib/mono/1.0/System.Windows.Forms.dll
+lib/mono/1.0/System.Xml.dll
+lib/mono/1.0/System.dll
+lib/mono/1.0/mbas.exe
+lib/mono/1.0/mcs.exe
+lib/mono/2.0/gmcs.exe
+lib/mono/2.0/mscorlib.dll
 lib/mscorlib.dll
 lib/pkgconfig/mint.pc
 lib/pkgconfig/mono.pc
@@ -194,6 +197,7 @@ man/man1/certmgr.1
 man/man1/chktrust.1
 man/man1/cilc.1
 man/man1/disco.1
+man/man1/gacutil.1
 man/man1/genxs.1
 man/man1/ilasm.1
 man/man1/makecert.1
@@ -212,6 +216,7 @@ man/man1/sn.1
 man/man1/soapsuds.1
 man/man1/sqlsharp.1
 man/man1/wsdl.1
+man/man1/xsd.1
 man/man5/mono-config.5
 share/examples/mono/DefaultWsdlHelpGenerator.aspx
 share/examples/mono/browscap.ini
@@ -221,6 +226,10 @@ share/mono/cil/cil-opcodes.xml
 @dirrm share/mono/cil
 @dirrm share/mono
 @dirrm share/examples/mono
+@dirrm lib/mono/gac
+@dirrm lib/mono/2.0
+@dirrm lib/mono/1.0
+@dirrm lib/mono
 @dirrm include/mono/utils
 ${GC}@dirrm include/mono/private
 @dirrm include/mono/metadata
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 23524e52a47..ab0f274f398 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/04/04 16:53:59 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/05/11 17:33:42 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.31
+BUILDLINK_DEPENDS.mono+=	mono>=0.91
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 2d699ca72bd..ffd8e2699de 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.12 2004/04/04 19:23:10 recht Exp $
+$NetBSD: distinfo,v 1.13 2004/05/11 17:33:42 recht Exp $
 
-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 (mono-0.91.tar.gz) = 8190b7468c8fa6723b33a96e4dbd74dd8e6cd6e2
+Size (mono-0.91.tar.gz) = 17324655 bytes
+SHA1 (patch-aa) = 6607af5ec7f50d9325523a7d9926473983d09aa9
+SHA1 (patch-ac) = 5a5a8ac93daded24aff259316a3fa31b26fe2cd4
+SHA1 (patch-ad) = eca75dde3b17f22deb9242aa3ac6dcfffbe5725d
 SHA1 (patch-ah) = ca67288373df96e46b1d60560cca25698ce8261e
 SHA1 (patch-aj) = ab41349968d0f621c5f3e848c25d112c50558a28
-SHA1 (patch-ak) = aab1295adad7a09b9fc7d52139793bb7ec0b76d5
+SHA1 (patch-ak) = 1aeeeb7b7d6aa42eea8262aa9e48de48400698f3
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
index 7a0d1ab0c6f..f807967fa14 100644
--- a/lang/mono/patches/patch-aa
+++ b/lang/mono/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2004/04/04 16:53:59 recht Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/11 17:33:42 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 @@
+--- configure.orig	2004-05-11 14:34:57.000000000 +0200
++++ configure	2004-05-11 14:35:25.000000000 +0200
+@@ -14078,6 +14078,9 @@
+ 	libsuffix=".dylib"
+ 	LIBC="libc.dylib"
+ 	;;
++	*-*-*netbsd*)
++	LIBC="libc.so.12"
++	;;
+ esac
  
- #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-ab b/lang/mono/patches/patch-ab
deleted file mode 100644
index ce0c11a1549..00000000000
--- a/lang/mono/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/04/16 15:33:52 recht Exp $
-
---- mono/mini/mini-x86.c.orig	2004-03-10 20:53:29.000000000 +0100
-+++ mono/mini/mini-x86.c	2004-04-04 13:12:20.000000000 +0200
-@@ -3379,7 +3379,11 @@
- 
- 	/* Determine stack boundaries */
- 	if (!mono_running_on_valgrind ()) {
-+#ifdef __NetBSD__
-+		pthread_attr_get_np( self, &attr );
-+#else
- 		pthread_getattr_np( self, &attr );
-+#endif
- 		pthread_attr_getstack( &attr, &staddr, &stsize );
- 	}
- 
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index 1b7fc493c65..3a55cf55cb2 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/04/04 16:53:59 recht Exp $
+$NetBSD: patch-ac,v 1.7 2004/05/11 17:33:42 recht Exp $
 
---- 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 @@
+--- data/Makefile.in.orig	2004-05-04 23:51:17.000000000 +0200
++++ data/Makefile.in	2004-05-11 14:04:36.000000000 +0200
+@@ -120,7 +120,7 @@
  libmono_cflags = @libmono_cflags@
  libmono_ldflags = @libmono_ldflags@
  libsuffix = @libsuffix@
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index e1d3a03b1ed..d948f10364e 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.6 2004/04/04 16:53:59 recht Exp $
+$NetBSD: patch-ad,v 1.7 2004/05/11 17:33:42 recht Exp $
 
---- 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/metadata/icall.c.orig	2004-05-11 13:57:50.000000000 +0200
++++ mono/metadata/icall.c	2004-05-11 14:03:41.000000000 +0200
+@@ -4597,7 +4597,7 @@
  
  	MONO_ARCH_SAVE_REGS;
  
--	path = g_build_path (G_DIR_SEPARATOR_S, mono_cfg_dir, "mono", "machine.config", NULL);
-+	path = g_build_path (G_DIR_SEPARATOR_S, mono_cfg_dir, "machine.config", NULL);
+-	path = g_build_path (G_DIR_SEPARATOR_S, mono_get_config_dir (), "mono", "machine.config", NULL);
++	path = g_build_path (G_DIR_SEPARATOR_S, mono_get_config_dir (), "machine.config", NULL);
  
  #if defined (PLATFORM_WIN32)
  	/* Avoid mixing '/' and '\\' */
diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak
index 0e8b31cf4df..434513b63db 100644
--- a/lang/mono/patches/patch-ak
+++ b/lang/mono/patches/patch-ak
@@ -1,13 +1,22 @@
-$NetBSD: patch-ak,v 1.2 2003/12/03 17:08:24 recht Exp $
+$NetBSD: patch-ak,v 1.3 2004/05/11 17:33:42 recht Exp $
 
---- mono/metadata/mono-config.c.orig	2003-11-27 21:10:10.000000000 +0100
-+++ mono/metadata/mono-config.c	2003-11-27 21:12:30.000000000 +0100
-@@ -258,7 +258,7 @@
- 
- 	/* Ensure mono_cfg_dir gets a value */
- 	mono_install_get_config_dir ();
--	mono_cfg = g_build_filename (mono_cfg_dir, "mono", "config", NULL);
-+	mono_cfg = g_build_filename (mono_cfg_dir, "config", NULL, NULL);
+--- mono/metadata/mono-config.c.orig	2004-05-11 14:06:35.000000000 +0200
++++ mono/metadata/mono-config.c	2004-05-11 14:06:59.000000000 +0200
+@@ -308,7 +308,7 @@
+ 	home = g_get_home_dir ();
+ 
+ 	for (i = 0; (aname = get_assembly_filename (assembly, i)) != NULL; ++i) {
+-		cfg = g_build_filename (mono_get_config_dir (), "mono", "assemblies", aname, cfg_name, NULL);
++		cfg = g_build_filename (mono_get_config_dir (), "assemblies", aname, cfg_name, NULL);
+ 		got_it += mono_config_parse_file_with_context (&state, cfg);
+ 		g_free (cfg);
+ 
+@@ -345,7 +345,7 @@
+ 		return;
+ 	}
+ 
+-	mono_cfg = g_build_filename (mono_get_config_dir (), "mono", "config", NULL);
++	mono_cfg = g_build_filename (mono_get_config_dir (), "config", NULL);
  	mono_config_parse_file (mono_cfg);
  	g_free (mono_cfg);