update to mono-0.97 (release candidate 1)

Changes include:
- any bug-fixes and code generator improvements
- new Thread.Abort implementation,
- I/O libraries
- speed improvements
... and much more

14 files changed, 291 insertions, 166 deletions

diff --git a/lang/mono/DEINSTALL b/lang/mono/DEINSTALL
deleted file mode 100644
index 23ca3ff1c06..00000000000
--- a/lang/mono/DEINSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-# $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 162a319703f..bbfea0217de 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.25 2004/05/12 09:59:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/06/26 20:19:16 recht Exp $
 #
 
-DISTNAME=	mono-0.91
+DISTNAME=	mono-0.97
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/archive/beta1/
+MASTER_SITES=	http://www.go-mono.com/archive/rc/
 
 MAINTAINER=	recht@NetBSD.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+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
 CONFLICTS=	pnet-[0-9]*
 
@@ -18,7 +18,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-5]*-*
 NOT_FOR_PLATFORM+=	NetBSD-1.6-* NetBSD-1.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
+NOT_FOR_PLATFORM+=	FreeBSD-*-amd64 FreeBSD-*-x86_64
 
 USE_GNU_TOOLS+=		make yacc
 USE_BUILDLINK3=		yes
@@ -29,7 +29,9 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gc=included
 CONFIGURE_ARGS+=	--with-ikvm-jni=no
 CONFIGURE_ARGS+=	--with-jdk=no
-CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+MAKE_FLAGS+=		PERL=${PERL5}
 
 PKGCONFIG_OVERRIDE=	mint.pc.in
 PKGCONFIG_OVERRIDE=	mono.pc.in
@@ -38,7 +40,9 @@ PKG_SYSCONFSUBDIR=	mono
 USE_PERL5=	build
 REPLACE_PERL=	mono/cil/make-opcodes-def.pl
 REPLACE_PERL+=	mono/metadata/make-bundle.pl
+REPLACE_PERL+=	mono/mini/build_relations_propagation_table.pl
 REPLACE_PERL+=	mono/benchmark/test-driver
+REPLACE_PERL+=	mono/tests/test-driver
 
 EGDIR=		${PREFIX}/share/examples/mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
@@ -47,7 +51,7 @@ CONF_FILES+=	${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
 CONF_FILES+=	${EGDIR}/DefaultWsdlHelpGenerator.aspx \
 		${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
 
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
+#DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -83,8 +87,8 @@ CONFIGURE_ARGS+=	--with-sigaltstack=no
 .endif
 
 # Global Assembly Cache files are handled during (de)installation.
-PRINT_PLIST_AWK+=	/^lib\/mono\/gac\// { next; }
-PRINT_PLIST_AWK+=	/^@dirrm lib\/mono\/gac\// { next; }
+#PRINT_PLIST_AWK+=	/^lib\/mono\/gac\// { next; }
+#PRINT_PLIST_AWK+=	/^@dirrm lib\/mono\/gac\// { next; }
 
 # GC files are only installed if GC was enabled.
 PRINT_PLIST_AWK+=	/^include\/mono\/private\/libgc/ \
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 8638d2a8dd3..7ed22c7d28e 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/05/11 17:33:42 recht Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/06/26 20:19:16 recht Exp $
 bin/MakeCert.exe
 bin/al
 bin/al.exe
@@ -24,13 +24,16 @@ bin/mbas
 bin/mcs
 bin/mint
 bin/mono
+bin/mono-find-provides
+bin/mono-find-provides.exe
+bin/mono-find-requires
+bin/mono-find-requires.exe
 bin/monodis
 bin/monograph
 bin/monop
 bin/monop.exe
 bin/monoresgen
 bin/monoresgen.exe
-bin/monosn
 bin/pedump
 bin/resgen
 bin/secutil
@@ -80,7 +83,6 @@ include/mono/jit/jit.h
 include/mono/metadata/appdomain.h
 include/mono/metadata/assembly.h
 include/mono/metadata/blob.h
-include/mono/metadata/cil-coff.h
 include/mono/metadata/class.h
 include/mono/metadata/debug-helpers.h
 include/mono/metadata/debug-mono-symfile.h
@@ -88,23 +90,15 @@ include/mono/metadata/environment.h
 include/mono/metadata/exception.h
 include/mono/metadata/image.h
 include/mono/metadata/loader.h
-include/mono/metadata/locales.h
 include/mono/metadata/mempool.h
 include/mono/metadata/metadata.h
-include/mono/metadata/monitor.h
 include/mono/metadata/mono-debug-debugger.h
 include/mono/metadata/mono-debug.h
-include/mono/metadata/mono-endian.h
 include/mono/metadata/object.h
 include/mono/metadata/opcodes.h
 include/mono/metadata/profiler.h
-include/mono/metadata/rand.h
-include/mono/metadata/rawbuffer.h
 include/mono/metadata/reflection.h
 include/mono/metadata/row-indexes.h
-include/mono/metadata/tabledefs.h
-include/mono/metadata/threadpool.h
-include/mono/metadata/threads-types.h
 include/mono/metadata/threads.h
 include/mono/metadata/tokentype.h
 include/mono/metadata/verify.h
@@ -139,13 +133,13 @@ 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/IBM.Data.DB2.dll
 lib/mono/1.0/ICSharpCode.SharpZipLib.dll
 lib/mono/1.0/Microsoft.VisualBasic.dll
 lib/mono/1.0/Microsoft.VisualC.dll
@@ -161,8 +155,6 @@ 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
@@ -185,10 +177,65 @@ 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/cscompmgd.dll
 lib/mono/1.0/mbas.exe
 lib/mono/1.0/mcs.exe
+lib/mono/1.0/nunit.core.dll
+lib/mono/1.0/nunit.framework.dll
+lib/mono/1.0/nunit.util.dll
 lib/mono/2.0/gmcs.exe
 lib/mono/2.0/mscorlib.dll
+lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
+lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll
+lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll
+lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll
+lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll
+lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll
+lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll
+lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
+lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll
+lib/mono/gac/IBM.Data.DB2/1.0.1636.35700__7c307b91aa13d208/IBM.Data.DB2.dll
+lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
+lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
+lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
+lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
+lib/mono/gac/Mono.CSharp.Debugger/1.0.5000.0__0738eb9f132ed756/Mono.CSharp.Debugger.dll
+lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
+lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll
+lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll
+lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756/Mono.Data.Tds.dll
+lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.TdsClient.dll
+lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll
+lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll
+lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll
+lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756/Mono.Security.Win32.dll
+lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
+lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
+lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll
+lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll
+lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll
+lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll
+lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll
+lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll
+lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll
+lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.Design.dll
+lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll
+lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
+lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll
+lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll
+lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll
+lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll
+lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll
+lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
+lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll
+lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll
+lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll
+lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll
+lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
+lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
+lib/mono/gac/nunit.core/2.1.91.0__96d09a1eb7f44a77/nunit.core.dll
+lib/mono/gac/nunit.framework/2.1.91.0__96d09a1eb7f44a77/nunit.framework.dll
+lib/mono/gac/nunit.util/2.1.91.0__96d09a1eb7f44a77/nunit.util.dll
 lib/mscorlib.dll
 lib/pkgconfig/mint.pc
 lib/pkgconfig/mono.pc
@@ -222,10 +269,145 @@ share/examples/mono/DefaultWsdlHelpGenerator.aspx
 share/examples/mono/browscap.ini
 share/examples/mono/config
 share/examples/mono/machine.config
+share/libgc-mono/README
+share/libgc-mono/README.DGUX386
+share/libgc-mono/README.Mac
+share/libgc-mono/README.MacOSX
+share/libgc-mono/README.OS2
+share/libgc-mono/README.amiga
+share/libgc-mono/README.arm.cross
+share/libgc-mono/README.autoconf
+share/libgc-mono/README.changes
+share/libgc-mono/README.contributors
+share/libgc-mono/README.cords
+share/libgc-mono/README.darwin
+share/libgc-mono/README.dj
+share/libgc-mono/README.environment
+share/libgc-mono/README.ews4800
+share/libgc-mono/README.hp
+share/libgc-mono/README.linux
+share/libgc-mono/README.macros
+share/libgc-mono/README.rs6000
+share/libgc-mono/README.sgi
+share/libgc-mono/README.solaris2
+share/libgc-mono/README.uts
+share/libgc-mono/README.win32
+share/libgc-mono/barrett_diagram
+share/libgc-mono/debugging.html
+share/libgc-mono/gc.man
+share/libgc-mono/gcdescr.html
+share/libgc-mono/gcinterface.html
+share/libgc-mono/leak.html
+share/libgc-mono/scale.html
+share/libgc-mono/simple_example.html
+share/libgc-mono/tree.html
 share/mono/cil/cil-opcodes.xml
 @dirrm share/mono/cil
 @dirrm share/mono
+@dirrm share/libgc-mono
 @dirrm share/examples/mono
+@dirrm lib/mono/gac/nunit.util/2.1.91.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.util
+@dirrm lib/mono/gac/nunit.framework/2.1.91.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.framework
+@dirrm lib/mono/gac/nunit.core/2.1.91.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.core
+@dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/cscompmgd
+@dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml
+@dirrm lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Windows.Forms
+@dirrm lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web.Services
+@dirrm lib/mono/gac/System.Web
+@dirrm lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.ServiceProcess
+@dirrm lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Security
+@dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap
+@dirrm lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Runtime.Remoting
+@dirrm lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Messaging
+@dirrm lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Management
+@dirrm lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.EnterpriseServices
+@dirrm lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing.Design
+@dirrm lib/mono/gac/System.Drawing
+@dirrm lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.DirectoryServices
+@dirrm lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Design
+@dirrm lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.OracleClient
+@dirrm lib/mono/gac/System.Data
+@dirrm lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Configuration.Install
+@dirrm lib/mono/gac/System
+@dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/PEAPI
+@dirrm lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7
+@dirrm lib/mono/gac/Npgsql
+@dirrm lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Novell.Directory.Ldap
+@dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security.Win32
+@dirrm lib/mono/gac/Mono.Security
+@dirrm lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Posix
+@dirrm lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Http
+@dirrm lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.GetOptions
+@dirrm lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.TdsClient
+@dirrm lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Tds
+@dirrm lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.SybaseClient
+@dirrm lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.SqliteClient
+@dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cairo
+@dirrm lib/mono/gac/Mono.CSharp.Debugger/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.CSharp.Debugger
+@dirrm lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Vsa
+@dirrm lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.VisualC
+@dirrm lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.VisualBasic
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1636.35700__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2
+@dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.West
+@dirrm lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.Rare
+@dirrm lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.Other
+@dirrm lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.MidEast
+@dirrm lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.CJK
+@dirrm lib/mono/gac/I18N
+@dirrm lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Commons.Xml.Relaxng
+@dirrm lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756
+@dirrm lib/mono/gac/ByteFX.Data
+@dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Accessibility
 @dirrm lib/mono/gac
 @dirrm lib/mono/2.0
 @dirrm lib/mono/1.0
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index ab0f274f398..ce55c3b6659 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/05/11 17:33:42 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/06/26 20:19:16 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.91
+BUILDLINK_DEPENDS.mono+=	mono>=0.97
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index ffd8e2699de..6d038aac040 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.13 2004/05/11 17:33:42 recht Exp $
+$NetBSD: distinfo,v 1.14 2004/06/26 20:19:16 recht Exp $
 
-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) = 1aeeeb7b7d6aa42eea8262aa9e48de48400698f3
+SHA1 (mono-0.97.tar.gz) = c7bbf73b9b63a50fcec88aba69c0a28e106bc5cc
+Size (mono-0.97.tar.gz) = 18213505 bytes
+SHA1 (patch-aa) = f9acaa770eb5d3dbafc655c2bc1ac514189c480b
+SHA1 (patch-ac) = be58af38a4fa937837006066ca8a2ecc96729640
+SHA1 (patch-ad) = d8a72b7408e1209b7cb53b93b008d35ff071d2a7
+SHA1 (patch-ak) = 7ec142119e22d024d0ed2e29b4f0d77d2857506e
+SHA1 (patch-ba) = b9e5b2fa27afd7862e2e93f903bb22c3876dd40a
+SHA1 (patch-bb) = ab45d39becdedb5190e79fcff5d82950aa6133c9
+SHA1 (patch-bc) = 57f13840653bfdbb3401182c6a004f91ae7ed02f
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
index f807967fa14..150d2647eb9 100644
--- a/lang/mono/patches/patch-aa
+++ b/lang/mono/patches/patch-aa
@@ -1,14 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2004/05/11 17:33:42 recht Exp $
+$NetBSD: patch-aa,v 1.6 2004/06/26 20:19:16 recht Exp $
 
---- 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"
+--- configure.orig	2004-06-26 20:09:52.000000000 +0200
++++ configure	2004-06-26 20:10:16.000000000 +0200
+@@ -14124,6 +14124,7 @@
+ 	;;
+      *-*-*netbsd*)
+ 	LIBC="libc.so.12"
++	INTL="libintl.so.0"
  	;;
-+	*-*-*netbsd*)
-+	LIBC="libc.so.12"
-+	;;
  esac
  
- 
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index 3a55cf55cb2..61b03011901 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2004/05/11 17:33:42 recht Exp $
+$NetBSD: patch-ac,v 1.8 2004/06/26 20:19:16 recht Exp $
 
---- 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 @@
+--- data/Makefile.in.orig	2004-06-25 01:27:58.000000000 +0200
++++ data/Makefile.in	2004-06-26 14:01:31.000000000 +0200
+@@ -121,7 +121,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 d948f10364e..18b889d16f1 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2004/05/11 17:33:42 recht Exp $
+$NetBSD: patch-ad,v 1.8 2004/06/26 20:19:16 recht Exp $
 
---- 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/metadata/icall.c.orig	2004-06-25 00:44:48.000000000 +0200
++++ mono/metadata/icall.c	2004-06-26 14:01:58.000000000 +0200
+@@ -4743,7 +4743,7 @@
  
  	MONO_ARCH_SAVE_REGS;
  
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
deleted file mode 100644
index 89ff9c4a7bc..00000000000
--- a/lang/mono/patches/patch-ah
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2003/12/03 17:08:24 recht Exp $
-
---- libgc/os_dep.c.orig	2003-08-26 23:21:14.000000000 +0200
-+++ libgc/os_dep.c	2003-11-27 18:34:40.000000000 +0100
-@@ -121,7 +121,7 @@
- # include <fcntl.h>
- #endif
- 
--#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX)
-+#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX) || defined(NETBSD)
- # ifdef SUNOS5SIGS
- #  include <sys/siginfo.h>
- # endif
-@@ -688,9 +688,11 @@
- 	typedef void (*handler)();
- #   endif
- 
--#   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) || defined(HURD)
-+#   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) \
-+    || defined(HURD) || defined(NETBSD)
- 	static struct sigaction old_segv_act;
--#	if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) || defined(HURD)
-+#	if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \
-+	|| defined(HURD) || defined(NETBSD)
- 	    static struct sigaction old_bus_act;
- #	endif
- #   else
-@@ -705,11 +707,11 @@
- #   endif
-     {
- #	if defined(SUNOS5SIGS) || defined(IRIX5)  \
--        || defined(OSF1) || defined(HURD)
-+        || defined(OSF1) || defined(HURD) || defined(NETBSD)
- 	  struct sigaction	act;
- 
- 	  act.sa_handler	= h;
--#	  ifdef SUNOS5SIGS
-+#	  if defined(SUNOS5SIGS) || defined(NETBSD)
-             act.sa_flags          = SA_RESTART | SA_NODEFER;
- #         else
-             act.sa_flags          = SA_RESTART;
-@@ -729,7 +731,7 @@
- #	  else
- 	        (void) sigaction(SIGSEGV, &act, &old_segv_act);
- #		if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
--		   || defined(HPUX) || defined(HURD)
-+		   || defined(HPUX) || defined(HURD) || defined(NETBSD)
- 		    /* Under Irix 5.x or HP/UX, we may get SIGBUS.	*/
- 		    /* Pthreads doesn't exist under Irix 5.x, so we	*/
- 		    /* don't have to worry in the threads case.		*/
-@@ -765,10 +767,10 @@
-     void GC_reset_fault_handler()
-     {
- #       if defined(SUNOS5SIGS) || defined(IRIX5) \
--	   || defined(OSF1) || defined(HURD)
-+	   || defined(OSF1) || defined(HURD) || defined(NETBSD)
- 	  (void) sigaction(SIGSEGV, &old_segv_act, 0);
- #	  if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
--	     || defined(HPUX) || defined(HURD)
-+	     || defined(HPUX) || defined(HURD) || defined(NETBSD)
- 	      (void) sigaction(SIGBUS, &old_bus_act, 0);
- #	  endif
- #       else
diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj
deleted file mode 100644
index 534b18139e0..00000000000
--- a/lang/mono/patches/patch-aj
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/12/03 17:08:24 recht Exp $
-
---- libgc/include/private/gcconfig.h.orig	2003-08-26 23:01:26.000000000 +0200
-+++ libgc/include/private/gcconfig.h	2003-11-27 18:42:00.000000000 +0100
-@@ -1151,8 +1151,8 @@
- #	ifndef GC_FREEBSD_THREADS
- #	    define MPROTECT_VDB
- #	endif
--#	define SIG_SUSPEND SIGUSR1
--#	define SIG_THR_RESTART SIGUSR2
-+#	define SIG_SUSPEND SIGTSTP
-+#	define SIG_THR_RESTART SIGCONT
- #	define FREEBSD_STACKBOTTOM
- #	ifdef __ELF__
- #	    define DYNAMIC_LOADING
-@@ -1466,8 +1466,8 @@
- #   ifdef FREEBSD
- #	define OS_TYPE "FREEBSD"
- /* MPROTECT_VDB is not yet supported at all on FreeBSD/alpha. */
--#	define SIG_SUSPEND SIGUSR1
--#	define SIG_THR_RESTART SIGUSR2
-+#	define SIG_SUSPEND SIGTSTP
-+#	define SIG_THR_RESTART SIGCONT
- #	define FREEBSD_STACKBOTTOM
- #	ifdef __ELF__
- #	    define DYNAMIC_LOADING
diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak
index 434513b63db..4ff351afb85 100644
--- a/lang/mono/patches/patch-ak
+++ b/lang/mono/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2004/05/11 17:33:42 recht Exp $
+$NetBSD: patch-ak,v 1.4 2004/06/26 20:19:16 recht Exp $
 
---- 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 @@
+--- mono/metadata/mono-config.c.orig	2004-06-19 20:03:54.000000000 +0200
++++ mono/metadata/mono-config.c	2004-06-26 14:02:25.000000000 +0200
+@@ -285,7 +285,7 @@
  	home = g_get_home_dir ();
  
  	for (i = 0; (aname = get_assembly_filename (assembly, i)) != NULL; ++i) {
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.3 2004/05/11 17:33:42 recht Exp $
  		got_it += mono_config_parse_file_with_context (&state, cfg);
  		g_free (cfg);
  
-@@ -345,7 +345,7 @@
+@@ -322,7 +322,7 @@
  		return;
  	}
  
diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba
new file mode 100644
index 00000000000..bab88b29358
--- /dev/null
+++ b/lang/mono/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2004/06/26 20:19:16 recht Exp $
+
+--- mono/cil/Makefile.in.orig	2004-06-26 14:04:26.000000000 +0200
++++ mono/cil/Makefile.in	2004-06-26 14:04:33.000000000 +0200
+@@ -299,7 +299,7 @@
+ 
+ 
+ opcode.def: make-opcodes-def.pl cil-opcodes.xml
+-	perl make-opcodes-def.pl < $(srcdir)/cil-opcodes.xml > opcode.def
++#	$(PERL) make-opcodes-def.pl < $(srcdir)/cil-opcodes.xml > opcode.def
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/lang/mono/patches/patch-bb b/lang/mono/patches/patch-bb
new file mode 100644
index 00000000000..563ab08dfe0
--- /dev/null
+++ b/lang/mono/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2004/06/26 20:19:16 recht Exp $
+
+--- mono/metadata/Makefile.in.orig	2004-06-26 14:05:44.000000000 +0200
++++ mono/metadata/Makefile.in	2004-06-26 14:05:51.000000000 +0200
+@@ -682,7 +682,7 @@
+ @WITH_BUNDLE_TRUE@	@if test -f $@; then :; else rm -f mono-bundle.stamp; $(MAKE) mono-bundle.stamp; fi
+ @WITH_BUNDLE_TRUE@mono-bundle.stamp: $(BUNDLE_FILE) $(srcdir)/make-bundle.pl
+ @WITH_BUNDLE_TRUE@	echo stamp > $@t
+-@WITH_BUNDLE_TRUE@	perl $(srcdir)/make-bundle.pl $(BUNDLE_FILE) mono-bundle.h mono-bundle.s
++@WITH_BUNDLE_TRUE@	$(PERL) $(srcdir)/make-bundle.pl $(BUNDLE_FILE) mono-bundle.h mono-bundle.s
+ @WITH_BUNDLE_TRUE@	mv $@t $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lang/mono/patches/patch-bc b/lang/mono/patches/patch-bc
new file mode 100644
index 00000000000..06d5cc71e4e
--- /dev/null
+++ b/lang/mono/patches/patch-bc
@@ -0,0 +1,23 @@
+$NetBSD: patch-bc,v 1.1 2004/06/26 20:19:16 recht Exp $
+
+--- mono/mini/Makefile.in.orig	2004-06-26 14:06:19.000000000 +0200
++++ mono/mini/Makefile.in	2004-06-26 14:06:35.000000000 +0200
+@@ -798,15 +798,15 @@
+ 
+ stat1: mono bench.exe
+ 	./mono --verbose --statfile stats.pl --regression bench.exe
+-	perl viewstat.pl stats.pl
++	$(PERL) viewstat.pl stats.pl
+ 
+ stat2: mono basic.exe
+ 	./mono --verbose --statfile stats.pl --regression basic.exe
+-	perl viewstat.pl -e stats.pl
++	$(PERL) viewstat.pl -e stats.pl
+ 
+ stat3: mono bench.exe
+ 	./mono --statfile stats.pl --ncompile 1000 --compile Tests:test_0_many_nested_loops bench.exe 
+-	perl viewstat.pl stats.pl
++	$(PERL) viewstat.pl stats.pl
+ 
+ docu: mini.sgm
+ 	docbook2txt mini.sgm