Welcome to mono 2.4

Changelist available at http://www.mono-project.com/Release_Notes_Mono_2.4

Note: Enabled for now generics on amd64, as they look to work

10 files changed, 334 insertions, 588 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 6adfcf14d88..d19a2346a6d 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2009/03/25 22:37:12 he Exp $
+# $NetBSD: Makefile,v 1.83 2009/04/07 08:20:42 kefren Exp $
 
 DISTNAME=	mono-${MONO_VERSION}
-PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,7 +15,7 @@ BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
 CONFLICTS=	pnet-[0-9]*
 
-MONO_VERSION=		2.2
+MONO_VERSION=		2.4
 ALL_ENV+=		MONO_SHARED_DIR=${WRKDIR:Q}
 
 USE_TOOLS+=		bison gmake gtar perl:run pkg-config bash:run
diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common
index 4ec6bd89120..30bd4ac3bb5 100644
--- a/lang/mono/PLIST.common
+++ b/lang/mono/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2009/01/21 18:20:28 kefren Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2009/04/07 08:20:42 kefren Exp $
 bin/al
 bin/al1
 bin/al2
@@ -16,7 +16,6 @@ bin/gacutil1
 bin/gacutil2
 bin/genxs
 bin/genxs1
-bin/genxs2
 bin/gmcs
 bin/httpcfg
 bin/ilasm
@@ -43,10 +42,7 @@ bin/mkbundle1
 bin/mkbundle2
 bin/mod
 bin/mono
-bin/mono-api-diff
 bin/mono-api-info
-bin/mono-api-info1
-bin/mono-api-info2
 bin/mono-cil-strip
 bin/mono-find-provides
 bin/mono-find-requires
@@ -165,7 +161,6 @@ lib/mono-source-libs/getline.cs
 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/CorCompare.exe
 lib/mono/1.0/CustomMarshalers.dll
 lib/mono/1.0/FirebirdSql.Data.Firebird.dll
 lib/mono/1.0/I18N.CJK.dll
@@ -189,6 +184,8 @@ lib/mono/1.0/Mono.Data.TdsClient.dll
 lib/mono/1.0/Mono.Data.dll
 lib/mono/1.0/Mono.GetOptions.dll
 lib/mono/1.0/Mono.Http.dll
+lib/mono/1.0/Mono.Messaging.RabbitMQ.dll
+lib/mono/1.0/Mono.Messaging.dll
 lib/mono/1.0/Mono.Posix.dll
 lib/mono/1.0/Mono.Security.Win32.dll
 lib/mono/1.0/Mono.Security.dll
@@ -197,6 +194,7 @@ lib/mono/1.0/Novell.Directory.Ldap.dll
 lib/mono/1.0/Npgsql.dll
 lib/mono/1.0/OpenSystem.C.dll
 lib/mono/1.0/PEAPI.dll
+lib/mono/1.0/RabbitMQ.Client.dll
 lib/mono/1.0/System.Configuration.Install.dll
 lib/mono/1.0/System.Data.OracleClient.dll
 lib/mono/1.0/System.Data.dll
@@ -264,8 +262,6 @@ lib/mono/1.0/mkbundle.exe
 lib/mono/1.0/mkbundle.exe.mdb
 lib/mono/1.0/mod.exe
 lib/mono/1.0/mod.exe.mdb
-lib/mono/1.0/mono-api-diff.exe
-lib/mono/1.0/mono-api-info.exe
 lib/mono/1.0/mono-cil-strip.exe
 lib/mono/1.0/mono-cil-strip.exe.mdb
 lib/mono/1.0/mono-service.exe
@@ -280,11 +276,15 @@ lib/mono/1.0/mozroots.exe
 lib/mono/1.0/mozroots.exe.mdb
 lib/mono/1.0/mscorlib.dll
 lib/mono/1.0/mscorlib.dll.mdb
+lib/mono/1.0/nunit-console-runner.dll
 lib/mono/1.0/nunit-console.exe
 lib/mono/1.0/nunit-console.exe.config
 lib/mono/1.0/nunit-console.exe.mdb
 lib/mono/1.0/nunit.core.dll
+lib/mono/1.0/nunit.core.extensions.dll
+lib/mono/1.0/nunit.core.interfaces.dll
 lib/mono/1.0/nunit.framework.dll
+lib/mono/1.0/nunit.framework.extensions.dll
 lib/mono/1.0/nunit.mocks.dll
 lib/mono/1.0/nunit.util.dll
 lib/mono/1.0/permview.exe
@@ -303,7 +303,6 @@ lib/mono/1.0/sn.exe
 lib/mono/1.0/sn.exe.mdb
 lib/mono/1.0/soapsuds.exe
 lib/mono/1.0/soapsuds.exe.mdb
-lib/mono/1.0/transform.exe
 lib/mono/1.0/wsdl.exe
 lib/mono/1.0/wsdl.exe.mdb
 lib/mono/1.0/xsd.exe
@@ -335,9 +334,9 @@ lib/mono/2.0/Microsoft.VisualBasic.targets
 lib/mono/2.0/Microsoft.VisualC.dll
 lib/mono/2.0/Microsoft.Vsa.dll
 lib/mono/2.0/Mono.C5.dll
+lib/mono/2.0/Mono.CSharp.dll
 lib/mono/2.0/Mono.Cairo.dll
 lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
-lib/mono/2.0/Mono.CSharp.dll
 lib/mono/2.0/Mono.Data.Sqlite.dll
 lib/mono/2.0/Mono.Data.SqliteClient.dll
 lib/mono/2.0/Mono.Data.SybaseClient.dll
@@ -347,6 +346,8 @@ lib/mono/2.0/Mono.Data.dll
 lib/mono/2.0/Mono.GetOptions.dll
 lib/mono/2.0/Mono.Http.dll
 lib/mono/2.0/Mono.Management.dll
+lib/mono/2.0/Mono.Messaging.RabbitMQ.dll
+lib/mono/2.0/Mono.Messaging.dll
 lib/mono/2.0/Mono.Posix.dll
 lib/mono/2.0/Mono.Security.Win32.dll
 lib/mono/2.0/Mono.Security.dll
@@ -357,6 +358,7 @@ lib/mono/2.0/Novell.Directory.Ldap.dll
 lib/mono/2.0/Npgsql.dll
 lib/mono/2.0/OpenSystem.C.dll
 lib/mono/2.0/PEAPI.dll
+lib/mono/2.0/RabbitMQ.Client.dll
 lib/mono/2.0/System.ComponentModel.DataAnnotations.dll
 lib/mono/2.0/System.Configuration.Install.dll
 lib/mono/2.0/System.Configuration.dll
@@ -395,9 +397,9 @@ lib/mono/2.0/System.Xml.dll
 lib/mono/2.0/System.dll
 lib/mono/2.0/al.exe
 lib/mono/2.0/al.exe.mdb
+lib/mono/2.0/cscompmgd.dll
 lib/mono/2.0/csharp.exe
 lib/mono/2.0/csharp.exe.mdb
-lib/mono/2.0/cscompmgd.dll
 lib/mono/2.0/gacutil.exe
 lib/mono/2.0/gacutil.exe.mdb
 lib/mono/2.0/gmcs.exe
@@ -425,11 +427,15 @@ lib/mono/2.0/monop.exe
 lib/mono/2.0/monop.exe.mdb
 lib/mono/2.0/mscorlib.dll
 lib/mono/2.0/mscorlib.dll.mdb
+lib/mono/2.0/nunit-console-runner.dll
 lib/mono/2.0/nunit-console.exe
 lib/mono/2.0/nunit-console.exe.config
 lib/mono/2.0/nunit-console.exe.mdb
 lib/mono/2.0/nunit.core.dll
+lib/mono/2.0/nunit.core.extensions.dll
+lib/mono/2.0/nunit.core.interfaces.dll
 lib/mono/2.0/nunit.framework.dll
+lib/mono/2.0/nunit.framework.extensions.dll
 lib/mono/2.0/nunit.mocks.dll
 lib/mono/2.0/nunit.util.dll
 lib/mono/2.0/resgen.exe
@@ -524,19 +530,19 @@ lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
 lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
 lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd/Mono.C5.dll
 lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd/Mono.C5.dll.mdb
+lib/mono/gac/Mono.CSharp/2.1.0.0__0738eb9f132ed756/Mono.CSharp.dll
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
 lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
 lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
-lib/mono/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
-lib/mono/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll.mdb
 lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll
 lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll.mdb
+lib/mono/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
+lib/mono/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll.mdb
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
-lib/mono/gac/Mono.CSharp/2.1.0.0__0738eb9f132ed756/Mono.CSharp.dll
 lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756/Mono.Data.Sqlite.dll
 lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756/Mono.Data.Sqlite.dll.mdb
 lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756/Mono.Data.Sqlite.dll
@@ -571,6 +577,14 @@ lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll
 lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll.mdb
 lib/mono/gac/Mono.Management/2.0.0.0__0738eb9f132ed756/Mono.Management.dll
 lib/mono/gac/Mono.Management/2.0.0.0__0738eb9f132ed756/Mono.Management.dll.mdb
+lib/mono/gac/Mono.Messaging.RabbitMQ/1.0.5000.0__b03f5f7f11d50a3a/Mono.Messaging.RabbitMQ.dll
+lib/mono/gac/Mono.Messaging.RabbitMQ/1.0.5000.0__b03f5f7f11d50a3a/Mono.Messaging.RabbitMQ.dll.mdb
+lib/mono/gac/Mono.Messaging.RabbitMQ/2.0.0.0__b03f5f7f11d50a3a/Mono.Messaging.RabbitMQ.dll
+lib/mono/gac/Mono.Messaging.RabbitMQ/2.0.0.0__b03f5f7f11d50a3a/Mono.Messaging.RabbitMQ.dll.mdb
+lib/mono/gac/Mono.Messaging/1.0.5000.0__b03f5f7f11d50a3a/Mono.Messaging.dll
+lib/mono/gac/Mono.Messaging/1.0.5000.0__b03f5f7f11d50a3a/Mono.Messaging.dll.mdb
+lib/mono/gac/Mono.Messaging/2.0.0.0__b03f5f7f11d50a3a/Mono.Messaging.dll
+lib/mono/gac/Mono.Messaging/2.0.0.0__b03f5f7f11d50a3a/Mono.Messaging.dll.mdb
 lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll
 lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll.mdb
 lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756/Mono.Posix.dll
@@ -605,6 +619,10 @@ lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll
 lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll.mdb
 lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll
 lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll.mdb
+lib/mono/gac/RabbitMQ.Client/1.0.5000.0__b03f5f7f11d50a3a/RabbitMQ.Client.dll
+lib/mono/gac/RabbitMQ.Client/1.0.5000.0__b03f5f7f11d50a3a/RabbitMQ.Client.dll.mdb
+lib/mono/gac/RabbitMQ.Client/2.0.0.0__b03f5f7f11d50a3a/RabbitMQ.Client.dll
+lib/mono/gac/RabbitMQ.Client/2.0.0.0__b03f5f7f11d50a3a/RabbitMQ.Client.dll.mdb
 lib/mono/gac/System.ComponentModel.DataAnnotations/3.5.0.0__31bf3856ad364e35/System.ComponentModel.DataAnnotations.dll
 lib/mono/gac/System.ComponentModel.DataAnnotations/3.5.0.0__31bf3856ad364e35/System.ComponentModel.DataAnnotations.dll.mdb
 lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll
@@ -663,12 +681,12 @@ lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime
 lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb
 lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089/System.Runtime.Remoting.dll
 lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb
-lib/mono/gac/System.Runtime.Serialization/3.0.0.0__b77a5c561934e089/System.Runtime.Serialization.dll
-lib/mono/gac/System.Runtime.Serialization/3.0.0.0__b77a5c561934e089/System.Runtime.Serialization.dll.mdb
 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/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll.mdb
 lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll
 lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll.mdb
+lib/mono/gac/System.Runtime.Serialization/3.0.0.0__b77a5c561934e089/System.Runtime.Serialization.dll
+lib/mono/gac/System.Runtime.Serialization/3.0.0.0__b77a5c561934e089/System.Runtime.Serialization.dll.mdb
 lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll
 lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll.mdb
 lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll
@@ -730,14 +748,22 @@ lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756/mono-service.exe.mdb
 lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll
 lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.config
 lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.mdb
-lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll
-lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll.mdb
-lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll
-lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll.mdb
-lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77/nunit.mocks.dll
-lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77/nunit.mocks.dll.mdb
-lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll
-lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll.mdb
+lib/mono/gac/nunit-console-runner/2.4.8.0__96d09a1eb7f44a77/nunit-console-runner.dll
+lib/mono/gac/nunit-console-runner/2.4.8.0__96d09a1eb7f44a77/nunit-console-runner.dll.mdb
+lib/mono/gac/nunit.core.extensions/2.4.8.0__96d09a1eb7f44a77/nunit.core.extensions.dll
+lib/mono/gac/nunit.core.extensions/2.4.8.0__96d09a1eb7f44a77/nunit.core.extensions.dll.mdb
+lib/mono/gac/nunit.core.interfaces/2.4.8.0__96d09a1eb7f44a77/nunit.core.interfaces.dll
+lib/mono/gac/nunit.core.interfaces/2.4.8.0__96d09a1eb7f44a77/nunit.core.interfaces.dll.mdb
+lib/mono/gac/nunit.core/2.4.8.0__96d09a1eb7f44a77/nunit.core.dll
+lib/mono/gac/nunit.core/2.4.8.0__96d09a1eb7f44a77/nunit.core.dll.mdb
+lib/mono/gac/nunit.framework.extensions/2.4.8.0__96d09a1eb7f44a77/nunit.framework.extensions.dll
+lib/mono/gac/nunit.framework.extensions/2.4.8.0__96d09a1eb7f44a77/nunit.framework.extensions.dll.mdb
+lib/mono/gac/nunit.framework/2.4.8.0__96d09a1eb7f44a77/nunit.framework.dll
+lib/mono/gac/nunit.framework/2.4.8.0__96d09a1eb7f44a77/nunit.framework.dll.mdb
+lib/mono/gac/nunit.mocks/2.4.8.0__96d09a1eb7f44a77/nunit.mocks.dll
+lib/mono/gac/nunit.mocks/2.4.8.0__96d09a1eb7f44a77/nunit.mocks.dll.mdb
+lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll
+lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll.mdb
 lib/mono/monodoc/monodoc.dll
 lib/monodoc/monodoc.xml
 lib/monodoc/sources/Mono.source
@@ -751,8 +777,10 @@ lib/monodoc/sources/cs-errors.zip
 lib/monodoc/sources/ecma334.tree
 lib/monodoc/sources/ecma334.zip
 lib/monodoc/sources/lang-csharp.source
+lib/monodoc/sources/mono-file-formats.source
 lib/monodoc/sources/mono-file-formats.tree
 lib/monodoc/sources/mono-file-formats.zip
+lib/monodoc/sources/mono-tools.source
 lib/monodoc/sources/mono-tools.tree
 lib/monodoc/sources/mono-tools.zip
 lib/monodoc/sources/monoapi.source
@@ -761,9 +789,6 @@ lib/monodoc/sources/monoapi.zip
 lib/monodoc/sources/netdocs.source
 lib/monodoc/sources/netdocs.tree
 lib/monodoc/sources/netdocs.zip
-lib/monodoc/sources/nunit-docs.source
-lib/monodoc/sources/nunit-docs.tree
-lib/monodoc/sources/nunit-docs.zip
 lib/pkgconfig/cecil.pc
 lib/pkgconfig/dotnet.pc
 lib/pkgconfig/dotnet35.pc
@@ -772,6 +797,7 @@ lib/pkgconfig/mono-lineeditor.pc
 lib/pkgconfig/mono-nunit.pc
 lib/pkgconfig/mono-options.pc
 lib/pkgconfig/mono.pc
+lib/pkgconfig/mono.web.pc
 lib/pkgconfig/monodoc.pc
 lib/pkgconfig/smcs.pc
 lib/pkgconfig/system.web.extensions.design_1.0.pc
@@ -809,7 +835,6 @@ man/man1/mono-service.1
 man/man1/mono-shlib-cop.1
 man/man1/mono-xmltool.1
 man/man1/mono.1
-man/man1/monoburg.1
 man/man1/monodis.1
 man/man1/monodocer.1
 man/man1/monodocs2html.1
@@ -884,237 +909,281 @@ share/locale/de/LC_MESSAGES/mcs.mo
 share/locale/es/LC_MESSAGES/mcs.mo
 share/locale/ja/LC_MESSAGES/mcs.mo
 share/mono-1.0/mono/cil/cil-opcodes.xml
-@dirrm share/mono-1.0/mono/cil
-@dirrm share/mono-1.0/mono
-@dirrm share/mono-1.0
-@dirrm share/libgc-mono
-@dirrm share/jay
-@dirrm share/examples/mono/mconfig
-@dirrm share/examples/mono/2.0
-@dirrm share/examples/mono/1.0
-@dirrm share/examples/mono
-@dirrm lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77
-@dirrm lib/mono/gac/nunit.util
-@dirrm lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77
-@dirrm lib/mono/gac/nunit.mocks
-@dirrm lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77
-@dirrm lib/mono/gac/nunit.framework
-@dirrm lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77
-@dirrm lib/mono/gac/nunit.core
-@dirrm lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/mono-service
-@dirrm lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/cscompmgd
-@dirrm lib/mono/gac/System/2.0.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Xml.Linq
-@dirrm lib/mono/gac/System.Xml
-@dirrm lib/mono/gac/System.Windows.Forms/2.0.0.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.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/System.Web.Services/2.0.0.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.Extensions/3.5.0.0__31bf3856ad364e35
-@dirrm lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35
-@dirrm lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35
+@dirrm include/mono-1.0/mono/cil
+@dirrm include/mono-1.0/mono/interpreter
+@dirrm include/mono-1.0/mono/io-layer
+@dirrm include/mono-1.0/mono/jit
+@dirrm include/mono-1.0/mono/metadata
+@dirrm include/mono-1.0/mono/utils
+@dirrm include/mono-1.0/mono
+@dirrm include/mono-1.0
+@dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Accessibility
+@dirrm lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756
+@dirrm lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756
+@dirrm lib/mono/gac/ByteFX.Data
+@dirrm lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Commons.Xml.Relaxng
+@dirrm lib/mono/gac/CustomMarshalers/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/CustomMarshalers/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/CustomMarshalers
+@dirrm lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4
+@dirrm lib/mono/gac/FirebirdSql.Data.Firebird
+@dirrm lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.CJK/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.CJK
+@dirrm lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.MidEast/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.MidEast
+@dirrm lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.Other/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.Other
+@dirrm lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.Rare/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.Rare
+@dirrm lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.West/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.West
+@dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.84.0.0__1b03e6acf1164f73
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib
+@dirrm lib/mono/gac/Microsoft.Build.Engine/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Build.Engine
+@dirrm lib/mono/gac/Microsoft.Build.Framework/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Build.Framework
+@dirrm lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Build.Tasks
+@dirrm lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Build.Utilities
+@dirrm lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.JScript
+@dirrm lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.VisualC
+@dirrm lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.Vsa
+@dirrm lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd
+@dirrm lib/mono/gac/Mono.C5
+@dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cairo
+@dirrm lib/mono/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil
+@dirrm lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil.Mdb
+@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter
+@dirrm lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Sqlite
+@dirrm lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.SqliteClient
+@dirrm lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.SybaseClient
+@dirrm lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.Tds
+@dirrm lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.TdsClient
+@dirrm lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data
+@dirrm lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.GetOptions/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.GetOptions
+@dirrm lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Http
+@dirrm lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Posix
+@dirrm lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security.Win32
+@dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security
+@dirrm lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Web
+@dirrm lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.WebBrowser
+@dirrm lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Novell.Directory.Ldap
+@dirrm lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7
+@dirrm lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7
+@dirrm lib/mono/gac/Npgsql
+@dirrm lib/mono/gac/OpenSystem.C/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/OpenSystem.C/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/OpenSystem.C
+@dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/PEAPI
+@dirrm lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Configuration.Install
+@dirrm lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Configuration
+@dirrm lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Core
+@dirrm lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.DataSetExtensions
+@dirrm lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.Linq
+@dirrm lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.OracleClient
+@dirrm lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data
+@dirrm lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Design/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Design
+@dirrm lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.DirectoryServices/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.DirectoryServices
+@dirrm lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing.Design/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing.Design
+@dirrm lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing
+@dirrm lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.EnterpriseServices
+@dirrm lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Management/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Management
+@dirrm lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Messaging
+@dirrm lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Runtime.Remoting/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Runtime.Remoting
+@dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap
+@dirrm lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Security
+@dirrm lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.ServiceProcess
+@dirrm lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Transactions
 @dirrm lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35
 @dirrm lib/mono/gac/System.Web.Extensions.Design
+@dirrm lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35
 @dirrm lib/mono/gac/System.Web.Extensions
+@dirrm lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web.Services
+@dirrm lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web/2.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Web
-@dirrm lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Transactions
-@dirrm lib/mono/gac/System.ServiceProcess/2.0.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/System.Drawing.Design/2.0.0.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.0.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.0.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.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Data.OracleClient/2.0.0.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.Linq/3.5.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Data.Linq
-@dirrm lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Data.DataSetExtensions
-@dirrm lib/mono/gac/System.Data
-@dirrm lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/System.Core
-@dirrm lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/System.Configuration.Install/2.0.0.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.Configuration
+@dirrm lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Windows.Forms
+@dirrm lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml.Linq
+@dirrm lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml
+@dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System/2.0.0.0__b77a5c561934e089
 @dirrm lib/mono/gac/System
-@dirrm lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/PEAPI
-@dirrm lib/mono/gac/OpenSystem.C/2.0.0.0__b77a5c561934e089
-@dirrm lib/mono/gac/OpenSystem.C/1.0.5000.0__b77a5c561934e089
-@dirrm lib/mono/gac/OpenSystem.C
-@dirrm lib/mono/gac/Npgsql/2.0.0.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.0.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.WebBrowser/0.5.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.WebBrowser
-@dirrm lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Web
-@dirrm lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Security.Win32/2.0.0.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.0.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.0.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.0.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/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Data.TdsClient/2.0.0.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.0.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.0.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.0.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.Data.Sqlite/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Data.Sqlite
-@dirrm lib/mono/gac/Mono.Data
-@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter
-@dirrm lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Cecil.Mdb
-@dirrm lib/mono/gac/Mono.Cecil
-@dirrm lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Cairo
-@dirrm lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd
-@dirrm lib/mono/gac/Mono.C5
-@dirrm lib/mono/gac/Microsoft.Vsa/8.0.0.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.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.VisualC
-@dirrm lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.JScript
-@dirrm lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.Build.Utilities
-@dirrm lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.Build.Tasks
-@dirrm lib/mono/gac/Microsoft.Build.Framework/2.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.Build.Framework
-@dirrm lib/mono/gac/Microsoft.Build.Engine/2.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Microsoft.Build.Engine
-@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73
-@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73
-@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.84.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.0.0__7c307b91aa13d208
-@dirrm lib/mono/gac/IBM.Data.DB2
-@dirrm lib/mono/gac/I18N/2.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
-@dirrm lib/mono/gac/I18N.West/2.0.0.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.0.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.0.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.0.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.0.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/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4
-@dirrm lib/mono/gac/FirebirdSql.Data.Firebird
-@dirrm lib/mono/gac/CustomMarshalers/2.0.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/CustomMarshalers/1.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/CustomMarshalers
-@dirrm lib/mono/gac/Commons.Xml.Relaxng/2.0.0.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.0.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
-@dirrm lib/mono/gac/Accessibility
-@dirrm lib/mono/gac
-@dirrm lib/mono/compat-2.0
-@dirrm lib/mono/compat-1.0
-@dirrm lib/mono/3.5
-@dirrm lib/mono/2.0/MSBuild
-@dirrm lib/mono/2.0
-@dirrm lib/mono/1.0
+@dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/cscompmgd
+@dirrm lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mono-service
+@dirrm lib/mono/gac/nunit.core/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.core
+@dirrm lib/mono/gac/nunit.core.extensions/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.core.extensions
+@dirrm lib/mono/gac/nunit.core.interfaces/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.core.interfaces
+@dirrm lib/mono/gac/nunit.framework/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.framework
+@dirrm lib/mono/gac/nunit.framework.extensions/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.framework.extensions
+@dirrm lib/mono/gac/nunit.mocks/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.mocks
+@dirrm lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit.util
 @dirrm lib/mono/monodoc
-@dirrm lib/mono
 @dirrm lib/monodoc/sources
 @dirrm lib/monodoc
 @dirrm lib/mono-source-libs
-@dirrm include/mono-1.0/mono/utils
-@dirrm include/mono-1.0/mono/metadata
-@dirrm include/mono-1.0/mono/jit
-@dirrm include/mono-1.0/mono/io-layer
-@dirrm include/mono-1.0/mono/interpreter
-@dirrm include/mono-1.0/mono/cil
-@dirrm include/mono-1.0/mono
-@dirrm include/mono-1.0
+@dirrm lib/mono/1.0
+@dirrm lib/mono/2.0/MSBuild
+@dirrm lib/mono/2.0
+@dirrm lib/mono/3.5
+@dirrm lib/mono/compat-1.0
+@dirrm lib/mono/compat-2.0
+@dirrm lib/mono/gac/nunit-console-runner/2.4.8.0__96d09a1eb7f44a77
+@dirrm lib/mono/gac/nunit-console-runner
+@dirrm lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/monodoc
+@dirrm lib/mono/gac/System.Web.Routing/3.5.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Routing
+@dirrm lib/mono/gac/System.Web.DynamicData/3.5.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.DynamicData
+@dirrm lib/mono/gac/System.Web.Abstractions/3.5.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.Web.Abstractions
+@dirrm lib/mono/gac/System.ServiceModel/3.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.ServiceModel.Web/3.0.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.ServiceModel.Web
+@dirrm lib/mono/gac/System.ServiceModel
+@dirrm lib/mono/gac/System.Runtime.Serialization/3.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Runtime.Serialization
+@dirrm lib/mono/gac/System.IdentityModel/3.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.IdentityModel.Selectors/3.0.0.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.IdentityModel.Selectors
+@dirrm lib/mono/gac/System.IdentityModel
+@dirrm lib/mono/gac/System.ComponentModel.DataAnnotations/3.5.0.0__31bf3856ad364e35
+@dirrm lib/mono/gac/System.ComponentModel.DataAnnotations
+@dirrm lib/mono/gac/RabbitMQ.Client/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/RabbitMQ.Client/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/RabbitMQ.Client
+@dirrm lib/mono/gac/Mono.Simd/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Simd
+@dirrm lib/mono/gac/Mono.Messaging/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Mono.Messaging/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Mono.Messaging.RabbitMQ/2.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Mono.Messaging.RabbitMQ/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Mono.Messaging.RabbitMQ
+@dirrm lib/mono/gac/Mono.Messaging
+@dirrm lib/mono/gac/Mono.Management/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Management
+@dirrm lib/mono/gac/Mono.CSharp/2.1.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.CSharp
+@dirrm lib/mono/gac
+@dirrm lib/mono
+@dirrm share/examples/mono/1.0
+@dirrm share/examples/mono/2.0
+@dirrm share/examples/mono/mconfig
+@dirrm share/examples/mono
+@dirrm share/jay
+@dirrm share/libgc-mono
+@dirrm share/mono-1.0/mono/cil
+@dirrm share/mono-1.0/mono
+@dirrm share/mono-1.0
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 0a11e9faa3e..ad100e74bb2 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2009/04/05 16:20:06 he Exp $
+$NetBSD: distinfo,v 1.47 2009/04/07 08:20:42 kefren Exp $
 
-SHA1 (mono-2.2.tar.bz2) = 028c061ba4f4631c4ff10a15b832211a67ec5858
-RMD160 (mono-2.2.tar.bz2) = 664f09ccd8822b62d94d242871b956b00adae7b6
-Size (mono-2.2.tar.bz2) = 24360722 bytes
+SHA1 (mono-2.4.tar.bz2) = a0b5ea2f17f9ecc1d85f34e12e83797342104f5d
+RMD160 (mono-2.4.tar.bz2) = cc0581b0ef13349a7bbdc4284cf985af9c52bd94
+Size (mono-2.4.tar.bz2) = 24861051 bytes
 SHA1 (patch-ab) = 4ce8b19286e2696b1fe8786366fb79d546d248ff
 SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05
 SHA1 (patch-ae) = bd667ff350c7086d2ec0d8c873f2c7e2dfc09ed7
@@ -13,7 +13,6 @@ SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc
 SHA1 (patch-aq) = 2279dc6b46eded6f5a67b04e79779c1c7117fbc5
 SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b
 SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152
-SHA1 (patch-bb) = e11e7af5c745f1ef315c46d5bb87944d08a058ff
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
 SHA1 (patch-bd) = cf15b750dbd93ebf0e0e5165b8a10aabbf4f1642
 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332
@@ -23,17 +22,12 @@ SHA1 (patch-bh) = a42432fd8ed92e2213fbcd24bf29c2b6d4cbd8ba
 SHA1 (patch-bi) = 91786c858b459cd6b5a0dc683b5bdefc412973c1
 SHA1 (patch-ca) = f5c54525d70b185f9fcb28f82034c4e995395c0b
 SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69
-SHA1 (patch-cc) = 139e8ac5ca2e2a6bc2754ff1bbe0a8d08fd4bc91
 SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6
 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0
-SHA1 (patch-cf) = 2ae0f528e3273a51c4e2582d6580768072c50008
-SHA1 (patch-cg) = 93a81dccbc8ac006e97be6641de9b4625263f3d5
-SHA1 (patch-ch) = 4ca88b9e6c45263c9fd75a573ff1b149197363dc
-SHA1 (patch-ci) = 9c6d77c4c76c618304e62f744b0d03bb58df5d93
+SHA1 (patch-ch) = acf3a67779917d1e8fec364b191be6a3c0c507c5
 SHA1 (patch-da) = 84e572df943a65ef30205f219921a899949abac8
 SHA1 (patch-db) = c96ec3799d538af33797dea9c3687a091677e0e7
 SHA1 (patch-dc) = 1f1792e7c23cfeebabed2bd82f47b18a245e9641
-SHA1 (patch-dd) = 88feddae56ffd63bd9c783408c32bd6539b2e798
 SHA1 (patch-de) = 292bdc9baf16f5c9f2dc42645ef6d9cdc1a7add8
 SHA1 (patch-df) = a1127999bf0d73dfaeabb369e0ad6abe3fc4b255
 SHA1 (patch-dg) = d5bcda304ad00b5b8ea03dec76967b43da4b0d51
diff --git a/lang/mono/patches/patch-bb b/lang/mono/patches/patch-bb
deleted file mode 100644
index 5bb1ae2eba8..00000000000
--- a/lang/mono/patches/patch-bb
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2008/11/19 11:17:49 kefren Exp $
---- mono/io-layer/atomic.h.orig	2008-07-01 20:50:32.000000000 +0300
-+++ mono/io-layer/atomic.h	2008-11-19 11:37:19.000000000 +0200
-@@ -10,11 +10,61 @@
- #ifndef _WAPI_ATOMIC_H_
- #define _WAPI_ATOMIC_H_
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+
-+#if __NetBSD_Version__ > 499004000
-+#include <sys/atomic.h>
-+#define HAVE_ATOMIC_OPS
-+#endif
-+
-+#endif
-+
- #include <glib.h>
- 
- #include "mono/io-layer/wapi.h"
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__NetBSD__) && defined(HAVE_ATOMIC_OPS)
-+
-+#define WAPI_ATOMIC_ASM
-+static inline gint32 InterlockedCompareExchange(volatile gint32 *dest,
-+	gint32 exch, gint32 comp)
-+{
-+	return atomic_cas_32((uint32_t*)dest, comp, exch);
-+}
-+
-+static inline gpointer InterlockedCompareExchangePointer(volatile gpointer *dest, gpointer exch, gpointer comp)
-+{
-+	return atomic_cas_ptr(dest, comp, exch);
-+}
-+
-+static inline gint32 InterlockedIncrement(volatile gint32 *val)
-+{
-+	return atomic_inc_32_nv((uint32_t*)val);
-+}
-+
-+static inline gint32 InterlockedDecrement(volatile gint32 *val)
-+{
-+	return atomic_dec_32_nv((uint32_t*)val);
-+}
-+
-+static inline gint32 InterlockedExchange(volatile gint32 *val, gint32 new_val)
-+{
-+	return atomic_swap_32((uint32_t*)val, new_val);
-+}
-+
-+static inline gpointer InterlockedExchangePointer(volatile gpointer *val,
-+		gpointer new_val)
-+{
-+	return atomic_swap_ptr(val, new_val);
-+}
-+
-+static inline gint32 InterlockedExchangeAdd(volatile gint32 *val, gint32 add)
-+{
-+	return atomic_add_32_nv((uint32_t*)val, add) - add;
-+}
-+
-+#elif defined(__i386__) || defined(__x86_64__)
- #define WAPI_ATOMIC_ASM
- 
- /*
diff --git a/lang/mono/patches/patch-cc b/lang/mono/patches/patch-cc
deleted file mode 100644
index 9c8a9553fa1..00000000000
--- a/lang/mono/patches/patch-cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-cc,v 1.2 2008/11/21 08:00:49 kefren Exp $
---- mono/mini/mini-amd64.h.orig	2008-09-02 18:42:54.000000000 +0300
-+++ mono/mini/mini-amd64.h	2008-11-21 09:42:31.000000000 +0200
-@@ -229,7 +229,29 @@
- 
- #endif /* PLATFORM_WIN32 */
- 
--#ifdef __FreeBSD__
-+#if defined (__NetBSD__)
-+
-+#define REG_RAX 14
-+#define REG_RCX 3
-+#define REG_RDX 2
-+#define REG_RBX 13
-+#define REG_RSP 24
-+#define REG_RBP 12
-+#define REG_RSI 1
-+#define REG_RDI 0
-+#define REG_R8 4
-+#define REG_R9 5
-+#define REG_R10 6
-+#define REG_R11 7
-+#define REG_R12 8
-+#define REG_R13 9
-+#define REG_R14 10
-+#define REG_R15 11
-+#define REG_RIP 21
-+
-+#define MONO_ARCH_NOMAP32BIT
-+
-+#elif defined (__FreeBSD__)
- 
- #define REG_RAX 7
- #define REG_RCX 4
diff --git a/lang/mono/patches/patch-cf b/lang/mono/patches/patch-cf
deleted file mode 100644
index 081f3019d9b..00000000000
--- a/lang/mono/patches/patch-cf
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cf,v 1.4 2009/01/19 22:35:53 kefren Exp $
---- mono/metadata/class.c.orig	2009-01-09 04:48:42.000000000 +0200
-+++ mono/metadata/class.c	2009-01-19 08:27:07.000000000 +0200
-@@ -7534,7 +7534,12 @@
- mono_class_generic_sharing_enabled (MonoClass *class)
- {
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__ppc__) || defined(__powerpc__)
-+#if defined(__NetBSD__) && defined(__x86_64__)
-+	/* https://bugzilla.novell.com/show_bug.cgi?id=434457 */
-+	static gboolean supported = FALSE;
-+#else
- 	static gboolean supported = TRUE;
-+#endif
- #else
- 	/* Not supported by the JIT backends */
- 	static gboolean supported = FALSE;
diff --git a/lang/mono/patches/patch-cg b/lang/mono/patches/patch-cg
deleted file mode 100644
index 39216e7bc16..00000000000
--- a/lang/mono/patches/patch-cg
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD: patch-cg,v 1.3 2009/01/19 22:35:53 kefren Exp $
---- mono/utils/mono-mmap.c.orig	2009-01-19 10:32:55.000000000 +0200
-+++ mono/utils/mono-mmap.c	2009-01-19 18:29:41.000000000 +0200
-@@ -7,6 +7,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#ifdef __NetBSD__
-+#include <sys/shm.h>
-+#endif
- #include <fcntl.h>
- #include <string.h>
- #include <unistd.h>
-@@ -402,7 +405,11 @@
- 	const char *name;
- 	int i = 0;
- 	int curpid = getpid ();
-+#ifdef __NetBSD__
-+	GDir *dir = g_dir_open ("/tmp/", 0, NULL);
-+#else
- 	GDir *dir = g_dir_open ("/dev/shm/", 0, NULL);
-+#endif
- 	if (!dir)
- 		return mono_shared_area_instances_slow (array, count, cleanup);
- 	while ((name = g_dir_read_name (dir))) {
-@@ -421,8 +428,13 @@
- 		}
- 		if (curpid != pid && kill (pid, SIGCONT) == -1 && errno == ESRCH) {
- 			char buf [128];
-+#ifdef __NetBSD__
-+			g_snprintf (buf, sizeof (buf), "/tmp/mono.%d", pid);
-+			unlink (buf);
-+#else
- 			g_snprintf (buf, sizeof (buf), "/mono.%d", pid);
- 			shm_unlink (buf);
-+#endif
- 		}
- 	}
- 	g_dir_close (dir);
-@@ -439,10 +451,23 @@
- 	char buf [128];
- 	void *res;
- 	SAreaHeader *header;
-+#ifdef __NetBSD__
-+	key_t skey;
-+	int shms;
-+#endif
- 
- 	/* perform cleanup of segments left over from dead processes */
- 	mono_shared_area_instances_helper (NULL, 0, TRUE);
-+#ifdef __NetBSD__
-+	g_snprintf(buf, sizeof (buf), "/tmp/mono.%d", pid);
- 
-+	fd = open(buf, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR|S_IRGRP);
-+	if (fd == -1 && errno == EEXIST) {
-+		/* leftover */
-+		unlink(buf);
-+		fd = open(buf, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR|S_IRGRP);
-+	}
-+#else
- 	g_snprintf (buf, sizeof (buf), "/mono.%d", pid);
- 
- 	fd = shm_open (buf, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR|S_IRGRP);
-@@ -451,11 +476,21 @@
- 		shm_unlink (buf);
- 		fd = shm_open (buf, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR|S_IRGRP);
- 	}
-+#endif
- 	/* in case of failure we try to return a memory area anyway,
- 	 * even if it means the data can't be read by other processes
- 	 */
- 	if (fd == -1)
- 		return malloc_shared_area (pid);
-+#ifdef __NetBSD__
-+	if ((skey = ftok(buf, 'M')) == ((key_t)-1) ||
-+	    (shms = shmget(skey, size, IPC_CREAT)) == -1 ||
-+	    (res = shmat(shms, NULL, 0)) == ((void*)-1)) {
-+		close(fd);
-+		unlink(buf);
-+		return malloc_shared_area(pid);
-+	}
-+#else
- 	if (ftruncate (fd, size) != 0) {
- 		shm_unlink (buf);
- 		close (fd);
-@@ -466,6 +501,7 @@
- 		close (fd);
- 		return malloc_shared_area (pid);
- 	}
-+#endif
- 	/* we don't need the file descriptor anymore */
- 	close (fd);
- 	header = res;
-@@ -482,8 +518,18 @@
- mono_shared_area_remove (void)
- {
- 	char buf [128];
-+#ifdef __NetBSD__
-+	key_t skey;
-+	int shms;
-+	struct shmid_ds shmds;
-+	g_snprintf(buf, sizeof (buf), "/tmp/mono.%d", getpid());
-+	if ((skey = ftok(buf, 'M')) != ((key_t)-1) &&
-+	    (shms = shmget(skey, mono_pagesize(), IPC_CREAT)) != -1)
-+		shmctl(shms, IPC_RMID, &shmds);
-+#else
- 	g_snprintf (buf, sizeof (buf), "/mono.%d", getpid ());
- 	shm_unlink (buf);
-+#endif
- 	if (malloced_shared_area)
- 		g_free (malloced_shared_area);
- }
-@@ -497,6 +543,22 @@
- 	char buf [128];
- 	void *res;
- 
-+#ifdef __NetBSD__
-+	key_t skey;
-+	int shms;
-+
-+	g_snprintf (buf, sizeof (buf), "/tmp/mono.%d", GPOINTER_TO_INT (pid));
-+
-+	fd = open(buf, O_RDONLY, S_IRUSR|S_IRGRP);
-+	if (fd == -1)
-+		return NULL;
-+	if ((skey = ftok(buf, 'M')) != ((key_t)-1) ||
-+	    (shms = shmget(skey, mono_pagesize(), IPC_CREAT)) != -1 ||
-+	    (res = shmat(shms, NULL, 0)) == ((void*)-1)) {
-+		close(fd);
-+		return NULL;
-+	}
-+#else
- 	g_snprintf (buf, sizeof (buf), "/mono.%d", GPOINTER_TO_INT (pid));
- 
- 	fd = shm_open (buf, O_RDONLY, S_IRUSR|S_IRGRP);
-@@ -507,6 +569,7 @@
- 		close (fd);
- 		return NULL;
- 	}
-+#endif
- 	/* FIXME: validate the area */
- 	/* we don't need the file descriptor anymore */
- 	close (fd);
-@@ -517,7 +580,11 @@
- mono_shared_area_unload  (void *area)
- {
- 	/* FIXME: currently we load only a page */
-+#ifdef __NetBSD__
-+	shmdt(area);
-+#else
- 	munmap (area, mono_pagesize ());
-+#endif
- }
- 
- int
diff --git a/lang/mono/patches/patch-ch b/lang/mono/patches/patch-ch
index 909a3866e67..c3f23387c14 100644
--- a/lang/mono/patches/patch-ch
+++ b/lang/mono/patches/patch-ch
@@ -1,11 +1,10 @@
-$NetBSD: patch-ch,v 1.3 2009/01/19 22:35:53 kefren Exp $
---- mcs/tools/csharplib/Makefile.orig	2009-01-19 19:19:08.000000000 +0200
-+++ mcs/tools/csharplib/Makefile	2009-01-19 19:14:53.000000000 +0200
-@@ -31,6 +31,6 @@
+--- mcs/tools/csharplib/Makefile.orig	2009-04-07 07:16:59.000000000 +0300
++++ mcs/tools/csharplib/Makefile	2009-04-07 07:17:14.000000000 +0300
+@@ -33,6 +33,6 @@
  
  $(the_lib): $(the_libdir)/.stamp Makefile Mono.CSharp.dll.sources $(build_lib)
  	$(MKINSTALLDIRS) fixup
--	$(MONO_PATH) $(RUNTIME) ../linker/monolinker.exe -d fixup/$(PROFILE) -o out -l none -c skip -b true -x link.xml -s Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep -s Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep  -i compiler.info
-+	$(MONO_PATH) $(RUNTIME) ../linker/monolinker.exe -d fixup/$(PROFILE) -o out -lnone -c skip -b true -x link.xml -s Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep -s Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep  -i compiler.info
+-	$(MONO_PATH) $(RUNTIME) $(LINKER) -d fixup/$(PROFILE) -o out -l none -c skip -b true -x link.xml -s Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep -s Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep  -i compiler.info
++	$(MONO_PATH) $(RUNTIME) $(LINKER) -d fixup/$(PROFILE) -o out -lnone -c skip -b true -x link.xml -s Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep -s Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep  -i compiler.info
  	$(SN) $(SNFLAGS) out/Mono.CSharp.dll $(topdir)/class/mono.snk
  	cp out/Mono.CSharp.dll $(the_lib)
diff --git a/lang/mono/patches/patch-ci b/lang/mono/patches/patch-ci
deleted file mode 100644
index a9fe375d413..00000000000
--- a/lang/mono/patches/patch-ci
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ci,v 1.3 2009/02/12 19:44:50 kefren Exp $
---- mono/mini/mini-amd64.c.orig	2008-11-11 06:56:14.000000000 +0200
-+++ mono/mini/mini-amd64.c	2009-02-12 21:06:56.000000000 +0200
-@@ -6300,10 +6300,14 @@
- 					else
- 						item->chunk_size += MOV_REG_IMM_SIZE + CMP_REG_REG_SIZE;
- 				}
--				if (vtable_is_32bit)
--					item->chunk_size += MOV_REG_IMM_32BIT_SIZE;
--				else
-+				if (fail_tramp) {
- 					item->chunk_size += MOV_REG_IMM_SIZE;
-+				} else {
-+					if (vtable_is_32bit)
-+						item->chunk_size += MOV_REG_IMM_32BIT_SIZE;
-+					else
-+						item->chunk_size += MOV_REG_IMM_SIZE;
-+				}
- 				item->chunk_size += BR_SMALL_SIZE + JUMP_REG_SIZE;
- 			} else {
- 				if (fail_tramp) {
diff --git a/lang/mono/patches/patch-dd b/lang/mono/patches/patch-dd
deleted file mode 100644
index b9d260b957e..00000000000
--- a/lang/mono/patches/patch-dd
+++ /dev/null
@@ -1,23 +0,0 @@
---- mono/metadata/attach.c.orig	2009-03-03 15:32:27 -0800
-+++ mono/metadata/attach.c	2009-03-03 15:48:41 -0800
-@@ -366,12 +366,20 @@ ipc_connect (void)
- 	 */
- 	/* FIXME: Use TMP ? */
- 	pw = NULL;
-+#ifndef HAVE_GETPWUID_R
-+	pw = getpwuid(getuid());
-+	if (pw == NULL) {
-+		fprintf(stderr, "attach: getpwuid () failed.\n");
-+		return;
-+	}
-+#else
- 	res = getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw);
- 	if (res != 0) {
- 		fprintf (stderr, "attach: getpwuid_r () failed.\n");
- 		return;
- 	}
- 	g_assert (pw);
-+#endif
- 	directory = g_strdup_printf ("/tmp/mono-%s", pw->pw_name);
- 	res = mkdir (directory, S_IRUSR | S_IWUSR | S_IXUSR);
- 	if (res != 0) {