update to 1.0

Changes are only bugfixes compared to the rc1 version. While at it
also install the preview components.

6 files changed, 181 insertions, 26 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index bbfea0217de..a8358cf6b6f 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2004/06/26 20:19:16 recht Exp $
+# $NetBSD: Makefile,v 1.27 2004/07/03 23:02:50 recht Exp $
 #
 
-DISTNAME=	mono-0.97
+DISTNAME=	mono-1.0
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/archive/rc/
+MASTER_SITES=	http://mono2.ximian.com/archive/1.0/
 
 MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://www.go-mono.com/
+HOMEPAGE=	http://www.mono-project.com/
 COMMENT=	Open source implementation of the .NET Development Framework
 
 #BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
@@ -26,7 +26,7 @@ USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gc=included
+CONFIGURE_ARGS+=	--with-preview=yes
 CONFIGURE_ARGS+=	--with-ikvm-jni=no
 CONFIGURE_ARGS+=	--with-jdk=no
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 7ed22c7d28e..52c265227c7 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/06/26 20:19:16 recht Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/07/03 23:02:50 recht Exp $
 bin/MakeCert.exe
 bin/al
 bin/al.exe
@@ -183,56 +183,150 @@ 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/Accessibility.dll
+lib/mono/2.0/ByteFX.Data.dll
+lib/mono/2.0/Commons.Xml.Relaxng.dll
+lib/mono/2.0/I18N.CJK.dll
+lib/mono/2.0/I18N.MidEast.dll
+lib/mono/2.0/I18N.Other.dll
+lib/mono/2.0/I18N.Rare.dll
+lib/mono/2.0/I18N.West.dll
+lib/mono/2.0/I18N.dll
+lib/mono/2.0/ICSharpCode.SharpZipLib.dll
+lib/mono/2.0/Microsoft.VisualBasic.dll
+lib/mono/2.0/Microsoft.VisualC.dll
+lib/mono/2.0/Microsoft.Vsa.dll
+lib/mono/2.0/Mono.CSharp.Debugger.dll
+lib/mono/2.0/Mono.Cairo.dll
+lib/mono/2.0/Mono.Data.SqliteClient.dll
+lib/mono/2.0/Mono.Data.SybaseClient.dll
+lib/mono/2.0/Mono.Data.Tds.dll
+lib/mono/2.0/Mono.Data.TdsClient.dll
+lib/mono/2.0/Mono.GetOptions.dll
+lib/mono/2.0/Mono.Http.dll
+lib/mono/2.0/Mono.Posix.dll
+lib/mono/2.0/Mono.Security.Win32.dll
+lib/mono/2.0/Mono.Security.dll
+lib/mono/2.0/Novell.Directory.Ldap.dll
+lib/mono/2.0/Npgsql.dll
+lib/mono/2.0/PEAPI.dll
+lib/mono/2.0/System.Configuration.Install.dll
+lib/mono/2.0/System.Data.OracleClient.dll
+lib/mono/2.0/System.Data.dll
+lib/mono/2.0/System.Design.dll
+lib/mono/2.0/System.DirectoryServices.dll
+lib/mono/2.0/System.Drawing.Design.dll
+lib/mono/2.0/System.Drawing.dll
+lib/mono/2.0/System.EnterpriseServices.dll
+lib/mono/2.0/System.Management.dll
+lib/mono/2.0/System.Messaging.dll
+lib/mono/2.0/System.Runtime.Remoting.dll
+lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll
+lib/mono/2.0/System.Security.dll
+lib/mono/2.0/System.ServiceProcess.dll
+lib/mono/2.0/System.Web.Services.dll
+lib/mono/2.0/System.Web.dll
+lib/mono/2.0/System.Windows.Forms.dll
+lib/mono/2.0/System.Xml.dll
+lib/mono/2.0/System.dll
+lib/mono/2.0/cscompmgd.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/Accessibility/2.0.3600.0__b03f5f7f11d50a3a/Accessibility.dll
 lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll
+lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756/ByteFX.Data.dll
 lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll
+lib/mono/gac/Commons.Xml.Relaxng/2.0.3600.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll
 lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll
+lib/mono/gac/I18N.CJK/2.0.3600.0__0738eb9f132ed756/I18N.CJK.dll
 lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll
+lib/mono/gac/I18N.MidEast/2.0.3600.0__0738eb9f132ed756/I18N.MidEast.dll
 lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll
+lib/mono/gac/I18N.Other/2.0.3600.0__0738eb9f132ed756/I18N.Other.dll
 lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll
+lib/mono/gac/I18N.Rare/2.0.3600.0__0738eb9f132ed756/I18N.Rare.dll
 lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
+lib/mono/gac/I18N.West/2.0.3600.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/I18N/2.0.3600.0__0738eb9f132ed756/I18N.dll
+lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__7c307b91aa13d208/IBM.Data.DB2.dll
 lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
+lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
 lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
+lib/mono/gac/Microsoft.VisualBasic/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
 lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
+lib/mono/gac/Microsoft.VisualC/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
 lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
+lib/mono/gac/Microsoft.Vsa/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
 lib/mono/gac/Mono.CSharp.Debugger/1.0.5000.0__0738eb9f132ed756/Mono.CSharp.Debugger.dll
+lib/mono/gac/Mono.CSharp.Debugger/2.0.3600.0__0738eb9f132ed756/Mono.CSharp.Debugger.dll
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
+lib/mono/gac/Mono.Cairo/2.0.3600.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.SqliteClient/2.0.3600.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.SybaseClient/2.0.3600.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.Tds/2.0.3600.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.Data.TdsClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.TdsClient.dll
 lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll
+lib/mono/gac/Mono.GetOptions/2.0.3600.0__0738eb9f132ed756/Mono.GetOptions.dll
 lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll
+lib/mono/gac/Mono.Http/2.0.3600.0__0738eb9f132ed756/Mono.Http.dll
 lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll
+lib/mono/gac/Mono.Posix/2.0.3600.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.Win32/2.0.3600.0__0738eb9f132ed756/Mono.Security.Win32.dll
 lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
+lib/mono/gac/Mono.Security/2.0.3600.0__0738eb9f132ed756/Mono.Security.dll
 lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
+lib/mono/gac/Novell.Directory.Ldap/2.0.3600.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
 lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll
+lib/mono/gac/Npgsql/2.0.3600.0__5d8b90d52f46fda7/Npgsql.dll
 lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll
+lib/mono/gac/PEAPI/2.0.3600.0__0738eb9f132ed756/PEAPI.dll
 lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll
+lib/mono/gac/System.Configuration.Install/2.0.3600.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.OracleClient/2.0.3600.0__b77a5c561934e089/System.Data.OracleClient.dll
 lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll
+lib/mono/gac/System.Data/2.0.3600.0__b77a5c561934e089/System.Data.dll
 lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll
+lib/mono/gac/System.Design/2.0.3600.0__b03f5f7f11d50a3a/System.Design.dll
 lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll
+lib/mono/gac/System.DirectoryServices/2.0.3600.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.Design/2.0.3600.0__b03f5f7f11d50a3a/System.Drawing.Design.dll
 lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll
+lib/mono/gac/System.Drawing/2.0.3600.0__b03f5f7f11d50a3a/System.Drawing.dll
 lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
+lib/mono/gac/System.EnterpriseServices/2.0.3600.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
 lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll
+lib/mono/gac/System.Management/2.0.3600.0__b03f5f7f11d50a3a/System.Management.dll
 lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll
+lib/mono/gac/System.Messaging/2.0.3600.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.Remoting/2.0.3600.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.Runtime.Serialization.Formatters.Soap/2.0.3600.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.Security/2.0.3600.0__b03f5f7f11d50a3a/System.Security.dll
 lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
+lib/mono/gac/System.ServiceProcess/2.0.3600.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.Services/2.0.3600.0__b03f5f7f11d50a3a/System.Web.Services.dll
 lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll
+lib/mono/gac/System.Web/2.0.3600.0__b03f5f7f11d50a3a/System.Web.dll
 lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll
+lib/mono/gac/System.Windows.Forms/2.0.3600.0__b77a5c561934e089/System.Windows.Forms.dll
 lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll
+lib/mono/gac/System.Xml/2.0.3600.0__b77a5c561934e089/System.Xml.dll
 lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
+lib/mono/gac/System/2.0.3600.0__b77a5c561934e089/System.dll
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
+lib/mono/gac/cscompmgd/8.0.3600.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
@@ -312,100 +406,147 @@ share/mono/cil/cil-opcodes.xml
 @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/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/cscompmgd
+@dirrm lib/mono/gac/System/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml/2.0.3600.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/2.0.3600.0__b77a5c561934e089
 @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/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web.Services/2.0.3600.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/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.ServiceProcess
+@dirrm lib/mono/gac/System.Security/2.0.3600.0__b03f5f7f11d50a3a
 @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/2.0.3600.0__b03f5f7f11d50a3a
 @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/2.0.3600.0__b77a5c561934e089
 @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/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Messaging
+@dirrm lib/mono/gac/System.Management/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Management
+@dirrm lib/mono/gac/System.EnterpriseServices/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.EnterpriseServices
+@dirrm lib/mono/gac/System.Drawing/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing.Design/2.0.3600.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/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.DirectoryServices
+@dirrm lib/mono/gac/System.Design/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Design
+@dirrm lib/mono/gac/System.Data/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.OracleClient/2.0.3600.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/2.0.3600.0__b03f5f7f11d50a3a
 @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/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/PEAPI
+@dirrm lib/mono/gac/Npgsql/2.0.3600.0__5d8b90d52f46fda7
 @dirrm lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7
 @dirrm lib/mono/gac/Npgsql
+@dirrm lib/mono/gac/Novell.Directory.Ldap/2.0.3600.0__0738eb9f132ed756
 @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/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security.Win32/2.0.3600.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/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Posix
+@dirrm lib/mono/gac/Mono.Http/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Http
+@dirrm lib/mono/gac/Mono.GetOptions/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.GetOptions
+@dirrm lib/mono/gac/Mono.Data.TdsClient/2.0.3600.0__0738eb9f132ed756
 @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/2.0.3600.0__0738eb9f132ed756
 @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/2.0.3600.0__0738eb9f132ed756
 @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/2.0.3600.0__0738eb9f132ed756
 @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/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo
+@dirrm lib/mono/gac/Mono.CSharp.Debugger/2.0.3600.0__0738eb9f132ed756
 @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/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Vsa
+@dirrm lib/mono/gac/Microsoft.VisualC/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualC
+@dirrm lib/mono/gac/Microsoft.VisualBasic/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualBasic
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73
 @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/1.0.1641.20878__7c307b91aa13d208
 @dirrm lib/mono/gac/IBM.Data.DB2
+@dirrm lib/mono/gac/I18N/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.West/2.0.3600.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/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Rare
+@dirrm lib/mono/gac/I18N.Other/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Other
+@dirrm lib/mono/gac/I18N.MidEast/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.MidEast
+@dirrm lib/mono/gac/I18N.CJK/2.0.3600.0__0738eb9f132ed756
 @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/2.0.3600.0__0738eb9f132ed756
 @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.2__0738eb9f132ed756
 @dirrm lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756
 @dirrm lib/mono/gac/ByteFX.Data
+@dirrm lib/mono/gac/Accessibility/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility
 @dirrm lib/mono/gac
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index ce55c3b6659..da427e43160 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/06/26 20:19:16 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/07/03 23:02:50 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.97
+BUILDLINK_DEPENDS.mono+=	mono>=1.0
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 6d038aac040..5d02dddf52e 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2004/06/26 20:19:16 recht Exp $
+$NetBSD: distinfo,v 1.15 2004/07/03 23:02:50 recht Exp $
 
-SHA1 (mono-0.97.tar.gz) = c7bbf73b9b63a50fcec88aba69c0a28e106bc5cc
-Size (mono-0.97.tar.gz) = 18213505 bytes
-SHA1 (patch-aa) = f9acaa770eb5d3dbafc655c2bc1ac514189c480b
+SHA1 (mono-1.0.tar.gz) = fa9c1b79152f05c1bfdd15bfce28a47e63d33dc7
+Size (mono-1.0.tar.gz) = 18218284 bytes
+SHA1 (patch-ab) = 7c2b07f0e14103ccccc6e9e1514774d520865009
 SHA1 (patch-ac) = be58af38a4fa937837006066ca8a2ecc96729640
 SHA1 (patch-ad) = d8a72b7408e1209b7cb53b93b008d35ff071d2a7
 SHA1 (patch-ak) = 7ec142119e22d024d0ed2e29b4f0d77d2857506e
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
deleted file mode 100644
index 150d2647eb9..00000000000
--- a/lang/mono/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/06/26 20:19:16 recht Exp $
-
---- 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"
- 	;;
- esac
- 
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
new file mode 100644
index 00000000000..ba4c3954241
--- /dev/null
+++ b/lang/mono/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.6 2004/07/03 23:02:50 recht Exp $
+
+--- runtime/net_1_1/Makefile.in.orig	2004-06-29 18:09:20.000000000 +0200
++++ runtime/net_1_1/Makefile.in	2004-07-03 23:38:39.000000000 +0200
+@@ -361,17 +361,17 @@
+ install-data-local:
+ 	@if test -n '$(gac_assemblies)'; then \
+ 	  for i in ''$(gac_assemblies); do \
+-	    echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
++	    echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /root $(GAC_ROOT_DIR)" ; \
+ 	    MONO_PATH=$(srcdir) \
+-	      $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
++	      $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /root $(GAC_ROOT_DIR) || exit 1 ; \
+ 	  done; fi
+ 
+ uninstall-local:
+ 	@if test -n '$(gac_assemblies_list)'; then \
+ 	  for i in ''$(gac_assemblies_list); do \
+-	    echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
++	    echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /root $(GAC_ROOT_DIR)" ; \
+ 	    MONO_PATH=$(srcdir) \
+-	      $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || true ; \
++	      $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /u $$i /root $(GAC_ROOT_DIR) || true ; \
+ 	  done; fi
+ 
+ copy_dlls: