Welcome to Mono 2.2.

Changes since version 2.0 include improved performance, Full AOT and SIMD

For full changelist see:
http://www.mono-project.com/Release_Notes_Mono_2.2

7 files changed, 300 insertions, 30 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 79b52a9433f..a2c47e5c4b0 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2008/12/21 07:44:46 kefren Exp $
+# $NetBSD: Makefile,v 1.78 2009/01/19 22:35:53 kefren Exp $
 
 DISTNAME=	mono-${MONO_VERSION}
-PKGREVISION=	2
 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.0.1
+MONO_VERSION=		2.2
 ALL_ENV+=		MONO_SHARED_DIR=${WRKDIR:Q}
 
 USE_TOOLS+=		bison gmake gtar perl:run pkg-config bash:run
@@ -44,10 +43,16 @@ PKGCONFIG_OVERRIDE+=	data/cecil.pc.in
 PKGCONFIG_OVERRIDE+=	data/dotnet.pc.in
 PKGCONFIG_OVERRIDE+=	data/dotnet35.pc.in
 PKGCONFIG_OVERRIDE+=	data/mint.pc.in
+PKGCONFIG_OVERRIDE+=	data/monodoc.pc.in
 PKGCONFIG_OVERRIDE+=	data/mono-cairo.pc.in
+PKGCONFIG_OVERRIDE+=	data/mono-lineeditor.pc.in
+PKGCONFIG_OVERRIDE+=	data/mono-nunit.pc.in
+PKGCONFIG_OVERRIDE+=	data/mono-options.pc.in
 PKGCONFIG_OVERRIDE+=	data/mono.pc.in
 PKGCONFIG_OVERRIDE+=	data/smcs.pc.in
-PKGCONFIG_OVERRIDE+=	scripts/mono-nunit.pc.in
+PKGCONFIG_OVERRIDE+=	data/system.web.extensions_1.0.pc.in
+PKGCONFIG_OVERRIDE+=	data/system.web.extensions.design_1.0.pc.in
+PKGCONFIG_OVERRIDE+=	data/wcf.pc.in
 
 REPLACE_PERL+=	mcs/errors/do-tests.pl
 REPLACE_PERL+=	mcs/tools/scan-tests.pl
@@ -58,6 +63,7 @@ REPLACE_PERL+=	mono/metadata/make-bundle.pl
 REPLACE_PERL+=	mono/mini/genmdesc.pl
 REPLACE_PERL+=	mono/tests/stress-runner.pl
 
+REPLACE_BASH+=	build-mingw32.sh
 REPLACE_BASH+=	mono/arch/arm/dpiops.sh
 REPLACE_BASH+=	mono/arch/arm/fpaops.sh
 REPLACE_BASH+=	mono/arch/arm/vfpops.sh
@@ -74,6 +80,9 @@ REPLACE_BASH+=	mcs/class/Mono.Cairo/Samples/png/compile.sh
 REPLACE_BASH+=	mcs/class/Mono.Cairo/Samples/win32/compile.sh
 REPLACE_BASH+=	mcs/class/Mono.Cairo/Samples/x11/compile.sh
 REPLACE_BASH+=	mcs/tools/tinderbox/tinderbox.sh
+REPLACE_BASH+=	libgc/mkinstalldirs
+REPLACE_BASH+=	mcs/mkinstalldirs
+REPLACE_BASH+=	mkinstalldirs
 
 EGDIR=		${PREFIX}/share/examples/mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/mono/config
diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common
index 3900f4f52d5..7a67eb549aa 100644
--- a/lang/mono/PLIST.common
+++ b/lang/mono/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2008/10/25 05:27:58 kefren Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2009/01/19 22:35:53 kefren Exp $
 bin/al
 bin/al1
 bin/al2
@@ -7,10 +7,12 @@ bin/cert2spc
 bin/certmgr
 bin/chktrust
 bin/cilc
+bin/csharp
 bin/disco
 bin/dtd2rng
 bin/dtd2xsd
 bin/gacutil
+bin/gacutil1
 bin/gacutil2
 bin/genxs
 bin/genxs1
@@ -36,6 +38,7 @@ 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
 bin/mono-service
@@ -145,6 +148,8 @@ lib/libikvm-native.la
 lib/libmono-profiler-aot.la
 lib/libmono-profiler-cov.la
 lib/libmono.la
+lib/mono-source-libs/Options.cs
+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
@@ -245,13 +250,14 @@ lib/mono/1.0/mjs.exe
 lib/mono/1.0/mjs.exe.mdb
 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
 lib/mono/1.0/mono-service.exe.mdb
-lib/mono/1.0/mono-shlib-cop.exe
-lib/mono/1.0/mono-shlib-cop.exe.config
-lib/mono/1.0/mono-shlib-cop.exe.mdb
 lib/mono/1.0/mono-xmltool.exe
 lib/mono/1.0/mono-xmltool.exe.mdb
 lib/mono/1.0/monolinker.exe
@@ -285,8 +291,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/sqlsharp.exe
-lib/mono/1.0/sqlsharp.exe.mdb
 lib/mono/1.0/transform.exe
 lib/mono/1.0/wsdl.exe
 lib/mono/1.0/wsdl.exe.mdb
@@ -321,6 +325,7 @@ lib/mono/2.0/Microsoft.Vsa.dll
 lib/mono/2.0/Mono.C5.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
@@ -329,15 +334,18 @@ lib/mono/2.0/Mono.Data.TdsClient.dll
 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.Posix.dll
 lib/mono/2.0/Mono.Security.Win32.dll
 lib/mono/2.0/Mono.Security.dll
+lib/mono/2.0/Mono.Simd.dll
 lib/mono/2.0/Mono.Web.dll
 lib/mono/2.0/Mono.WebBrowser.dll
 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/System.ComponentModel.DataAnnotations.dll
 lib/mono/2.0/System.Configuration.Install.dll
 lib/mono/2.0/System.Configuration.dll
 lib/mono/2.0/System.Core.dll
@@ -350,15 +358,23 @@ 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.IdentityModel.Selectors.dll
+lib/mono/2.0/System.IdentityModel.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.Runtime.Serialization.dll
 lib/mono/2.0/System.Security.dll
+lib/mono/2.0/System.ServiceModel.Web.dll
+lib/mono/2.0/System.ServiceModel.dll
 lib/mono/2.0/System.ServiceProcess.dll
 lib/mono/2.0/System.Transactions.dll
+lib/mono/2.0/System.Web.Abstractions.dll
+lib/mono/2.0/System.Web.DynamicData.dll
 lib/mono/2.0/System.Web.Extensions.Design.dll
 lib/mono/2.0/System.Web.Extensions.dll
+lib/mono/2.0/System.Web.Routing.dll
 lib/mono/2.0/System.Web.Services.dll
 lib/mono/2.0/System.Web.dll
 lib/mono/2.0/System.Windows.Forms.dll
@@ -367,6 +383,8 @@ 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/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
@@ -381,11 +399,16 @@ lib/mono/2.0/installutil.exe
 lib/mono/2.0/installutil.exe.mdb
 lib/mono/2.0/mconfig.exe
 lib/mono/2.0/mconfig.exe.mdb
+lib/mono/2.0/mdoc.exe
+lib/mono/2.0/mdoc.exe.mdb
 lib/mono/2.0/mkbundle.exe
 lib/mono/2.0/mkbundle.exe.mdb
 lib/mono/2.0/mono-api-info.exe
 lib/mono/2.0/mono-service.exe
 lib/mono/2.0/mono-service.exe.mdb
+lib/mono/2.0/mono-shlib-cop.exe
+lib/mono/2.0/mono-shlib-cop.exe.config
+lib/mono/2.0/mono-shlib-cop.exe.mdb
 lib/mono/2.0/monop.exe
 lib/mono/2.0/monop.exe.mdb
 lib/mono/2.0/mscorlib.dll
@@ -401,6 +424,8 @@ lib/mono/2.0/resgen.exe
 lib/mono/2.0/resgen.exe.mdb
 lib/mono/2.0/sgen.exe
 lib/mono/2.0/sgen.exe.mdb
+lib/mono/2.0/sqlsharp.exe
+lib/mono/2.0/sqlsharp.exe.mdb
 lib/mono/2.0/wsdl.exe
 lib/mono/2.0/wsdl.exe.mdb
 lib/mono/2.0/xbuild.exe
@@ -409,9 +434,10 @@ lib/mono/2.0/xbuild.rsp
 lib/mono/2.0/xsd.exe
 lib/mono/2.0/xsd.exe.mdb
 lib/mono/3.5/System.Web.Extensions.Design.dll
-lib/mono/3.5/System.Web.Extensions.dll
 lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
 lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
+lib/mono/compat-2.0/System.Web.Extensions.Design.dll
+lib/mono/compat-2.0/System.Web.Extensions.dll
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll.mdb
 lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a/Accessibility.dll
@@ -490,14 +516,15 @@ 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.8.8607__0738eb9f132ed756/Mono.Cecil.dll
-lib/mono/gac/Mono.Cecil/0.6.8.8607__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
@@ -530,6 +557,8 @@ lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll
 lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll.mdb
 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.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
@@ -542,6 +571,8 @@ lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
 lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll.mdb
 lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll
 lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll.mdb
+lib/mono/gac/Mono.Simd/2.0.0.0__0738eb9f132ed756/Mono.Simd.dll
+lib/mono/gac/Mono.Simd/2.0.0.0__0738eb9f132ed756/Mono.Simd.dll.mdb
 lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
 lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll.mdb
 lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756/Mono.WebBrowser.dll
@@ -562,6 +593,8 @@ 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/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
 lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb
 lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll
@@ -602,6 +635,10 @@ lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.Enter
 lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll.mdb
 lib/mono/gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
 lib/mono/gac/System.EnterpriseServices/2.0.0.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll.mdb
+lib/mono/gac/System.IdentityModel.Selectors/3.0.0.0__b77a5c561934e089/System.IdentityModel.Selectors.dll
+lib/mono/gac/System.IdentityModel.Selectors/3.0.0.0__b77a5c561934e089/System.IdentityModel.Selectors.dll.mdb
+lib/mono/gac/System.IdentityModel/3.0.0.0__b77a5c561934e089/System.IdentityModel.dll
+lib/mono/gac/System.IdentityModel/3.0.0.0__b77a5c561934e089/System.IdentityModel.dll.mdb
 lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll
 lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll.mdb
 lib/mono/gac/System.Management/2.0.0.0__b03f5f7f11d50a3a/System.Management.dll
@@ -614,6 +651,8 @@ 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
@@ -622,12 +661,20 @@ 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
 lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll.mdb
+lib/mono/gac/System.ServiceModel.Web/3.0.0.0__31bf3856ad364e35/System.ServiceModel.Web.dll
+lib/mono/gac/System.ServiceModel.Web/3.0.0.0__31bf3856ad364e35/System.ServiceModel.Web.dll.mdb
+lib/mono/gac/System.ServiceModel/3.0.0.0__b77a5c561934e089/System.ServiceModel.dll
+lib/mono/gac/System.ServiceModel/3.0.0.0__b77a5c561934e089/System.ServiceModel.dll.mdb
 lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
 lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb
 lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
 lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb
 lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.dll
 lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.dll.mdb
+lib/mono/gac/System.Web.Abstractions/3.5.0.0__31bf3856ad364e35/System.Web.Abstractions.dll
+lib/mono/gac/System.Web.Abstractions/3.5.0.0__31bf3856ad364e35/System.Web.Abstractions.dll.mdb
+lib/mono/gac/System.Web.DynamicData/3.5.0.0__31bf3856ad364e35/System.Web.DynamicData.dll
+lib/mono/gac/System.Web.DynamicData/3.5.0.0__31bf3856ad364e35/System.Web.DynamicData.dll.mdb
 lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
 lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll.mdb
 lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
@@ -636,6 +683,8 @@ lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Exte
 lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb
 lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll
 lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb
+lib/mono/gac/System.Web.Routing/3.5.0.0__31bf3856ad364e35/System.Web.Routing.dll
+lib/mono/gac/System.Web.Routing/3.5.0.0__31bf3856ad364e35/System.Web.Routing.dll.mdb
 lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll
 lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb
 lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll
@@ -666,6 +715,9 @@ lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756/mono-service.exe
 lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756/mono-service.exe.mdb
 lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756/mono-service.exe
 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
@@ -674,18 +726,51 @@ 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/monodoc/monodoc.dll
+lib/monodoc/monodoc.xml
+lib/monodoc/sources/Mono.source
+lib/monodoc/sources/Mono.tree
+lib/monodoc/sources/Mono.zip
+lib/monodoc/sources/Novell.source
+lib/monodoc/sources/Novell.tree
+lib/monodoc/sources/Novell.zip
+lib/monodoc/sources/cs-errors.tree
+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.tree
+lib/monodoc/sources/mono-file-formats.zip
+lib/monodoc/sources/mono-tools.tree
+lib/monodoc/sources/mono-tools.zip
+lib/monodoc/sources/monoapi.source
+lib/monodoc/sources/monoapi.tree
+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
 lib/pkgconfig/mono-cairo.pc
+lib/pkgconfig/mono-lineeditor.pc
 lib/pkgconfig/mono-nunit.pc
+lib/pkgconfig/mono-options.pc
 lib/pkgconfig/mono.pc
+lib/pkgconfig/monodoc.pc
 lib/pkgconfig/smcs.pc
+lib/pkgconfig/system.web.extensions.design_1.0.pc
+lib/pkgconfig/system.web.extensions_1.0.pc
+lib/pkgconfig/wcf.pc
 man/man1/al.1
 man/man1/cert2spc.1
 man/man1/certmgr.1
 man/man1/chktrust.1
 man/man1/cilc.1
+man/man1/csharp.1
 man/man1/disco.1
 man/man1/dtd2xsd.1
 man/man1/gacutil.1
@@ -697,8 +782,10 @@ man/man1/macpack.1
 man/man1/makecert.1
 man/man1/mconfig.1
 man/man1/mcs.1
+man/man1/mdvalidater.1
 man/man1/mint.1
 man/man1/mkbundle.1
+man/man1/mono-cil-strip.1
 man/man1/mono-service.1
 man/man1/mono-shlib-cop.1
 man/man1/mono-xmltool.1
@@ -720,7 +807,6 @@ man/man1/signcode.1
 man/man1/sn.1
 man/man1/soapsuds.1
 man/man1/sqlsharp.1
-man/man1/vbnc.1
 man/man1/wsdl.1
 man/man1/xsd.1
 man/man5/mono-config.5
@@ -772,6 +858,9 @@ share/libgc-mono/leak.html
 share/libgc-mono/scale.html
 share/libgc-mono/simple_example.html
 share/libgc-mono/tree.html
+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
@@ -923,7 +1012,6 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @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/0.6.8.8607__0738eb9f132ed756
 @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
@@ -995,7 +1083,11 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/2.0/MSBuild
 @dirrm lib/mono/2.0
 @dirrm lib/mono/1.0
+@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
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 5332202f78b..b6c30e88530 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2008/10/07 13:22:33 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2009/01/19 22:35:53 kefren Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mono
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono
 
 .if ${MONO_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.mono+=	mono>=2.0
+BUILDLINK_API_DEPENDS.mono+=	mono>=2.2
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 ALL_ENV+=			MONO_SHARED_DIR=${WRKDIR:Q}
 .endif	# MONO_BUILDLINK3_MK
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index f85042fc744..56a4967e5de 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2008/11/21 08:00:48 kefren Exp $
+$NetBSD: distinfo,v 1.43 2009/01/19 22:35:53 kefren Exp $
 
-SHA1 (mono-2.0.1.tar.bz2) = 1c06d614b9b83ca0c8cff98d06136fd5a17344e2
-RMD160 (mono-2.0.1.tar.bz2) = ecada26dc398f0ea4cc4cae62885f4d1438bd540
-Size (mono-2.0.1.tar.bz2) = 19385815 bytes
+SHA1 (mono-2.2.tar.bz2) = 028c061ba4f4631c4ff10a15b832211a67ec5858
+RMD160 (mono-2.2.tar.bz2) = 664f09ccd8822b62d94d242871b956b00adae7b6
+Size (mono-2.2.tar.bz2) = 24360722 bytes
 SHA1 (patch-ab) = c5011d00d34c92b32d4243adac26b531ce40df00
 SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05
 SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1
@@ -26,4 +26,6 @@ SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69
 SHA1 (patch-cc) = 139e8ac5ca2e2a6bc2754ff1bbe0a8d08fd4bc91
 SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6
 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0
-SHA1 (patch-cf) = d6c419402636018800e62341024dc7cba71f791a
+SHA1 (patch-cf) = 2ae0f528e3273a51c4e2582d6580768072c50008
+SHA1 (patch-cg) = 93a81dccbc8ac006e97be6641de9b4625263f3d5
+SHA1 (patch-ch) = 4ca88b9e6c45263c9fd75a573ff1b149197363dc
diff --git a/lang/mono/patches/patch-cf b/lang/mono/patches/patch-cf
index 3fef495cb2b..081f3019d9b 100644
--- a/lang/mono/patches/patch-cf
+++ b/lang/mono/patches/patch-cf
@@ -1,15 +1,16 @@
-$NetBSD: patch-cf,v 1.3 2008/10/10 22:02:43 kefren Exp $
---- mono/metadata/class.c.orig	2008-10-10 23:57:39.000000000 +0300
-+++ mono/metadata/class.c	2008-10-10 23:58:35.000000000 +0300
-@@ -7445,7 +7445,10 @@
- gboolean
+$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__)
+ #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 */
++	/* https://bugzilla.novell.com/show_bug.cgi?id=434457 */
 +	static gboolean supported = FALSE;
-+#elif defined(__i386__) || defined(__x86_64__)
++#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
new file mode 100644
index 00000000000..39216e7bc16
--- /dev/null
+++ b/lang/mono/patches/patch-cg
@@ -0,0 +1,155 @@
+$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
new file mode 100644
index 00000000000..909a3866e67
--- /dev/null
+++ b/lang/mono/patches/patch-ch
@@ -0,0 +1,11 @@
+$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 @@
+ 
+ $(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
+ 	$(SN) $(SNFLAGS) out/Mono.CSharp.dll $(topdir)/class/mono.snk
+ 	cp out/Mono.CSharp.dll $(the_lib)