Update to mono 2.6.1

Changes since version 2.4 are documented at:
http://www.mono-project.com/Release_Notes_Mono_2.6
http://www.mono-project.com/Release_Notes_Mono_2.6.1

15 files changed, 182 insertions, 180 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index fb2668e6f0a..9d010ce804a 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2010/01/15 19:41:23 drochner Exp $
+# $NetBSD: Makefile,v 1.97 2010/02/16 17:01:04 kefren Exp $
 
-DISTNAME=	mono-${MONO_VERSION}
+DISTNAME=	mono-2.6.1
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
 CONFLICTS=	pnet-[0-9]*
 
-MONO_VERSION=		2.4.3.1
 ALL_ENV+=		MONO_SHARED_DIR=${WRKDIR:Q}
 
 USE_TOOLS+=		bison gmake gtar perl:run pkg-config bash:run msgfmt
@@ -31,8 +30,6 @@ CONFIGURE_ARGS+=	--with-libgdiplus=installed
 
 .include "options.mk"
 
-MAKE_JOBS_SAFE=		no
-
 MAKE_FLAGS+=		PERL=${PERL5:Q}
 MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
 UNLIMIT_RESOURCES=	datasize
@@ -44,15 +41,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/mono.web.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+=	data/system.web.extensions_1.0.pc.in
 PKGCONFIG_OVERRIDE+=	data/system.web.extensions.design_1.0.pc.in
+PKGCONFIG_OVERRIDE+=	data/system.web.mvc.pc.in
 PKGCONFIG_OVERRIDE+=	data/wcf.pc.in
 
 REPLACE_PERL+=	mcs/errors/do-tests.pl
@@ -102,6 +100,8 @@ CONF_FILES+=	${EGDIR}/2.0/settings.map \
 		${PKG_SYSCONFDIR}/mono/2.0/settings.map
 CONF_FILES+=	${EGDIR}/2.0/web.config \
 		${PKG_SYSCONFDIR}/mono/2.0/web.config
+CONF_FILES+=	${EGDIR}/2.0/Browsers/Compat.browser \
+		${PKG_SYSCONFDIR}/mono/2.0/Browsers/Compat.browser
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/mono/1.0
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/mono/2.0
diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common
index cdfc4d35d66..0eef34a6e08 100644
--- a/lang/mono/PLIST.common
+++ b/lang/mono/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2010/01/15 19:41:23 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2010/02/16 17:01:04 kefren Exp $
 bin/al
 bin/al1
 bin/al2
@@ -23,6 +23,7 @@ bin/ilasm1
 bin/ilasm2
 bin/installvst
 bin/jay
+bin/lc
 bin/macpack
 bin/makecert
 bin/mconfig
@@ -46,6 +47,7 @@ bin/mono-api-info
 bin/mono-cil-strip
 bin/mono-find-provides
 bin/mono-find-requires
+bin/mono-gdb.py
 bin/mono-service
 bin/mono-service2
 bin/mono-shlib-cop
@@ -63,6 +65,7 @@ bin/monop2
 bin/mozroots
 bin/nunit-console
 bin/nunit-console2
+bin/pdb2mdb
 bin/pedump
 bin/permview
 bin/prj2make
@@ -73,10 +76,11 @@ bin/secutil
 bin/setreg
 bin/sgen
 bin/signcode
-bin/smcs
 bin/sn
 bin/soapsuds
+bin/sqlmetal
 bin/sqlsharp
+bin/svcutil
 bin/wsdl
 bin/wsdl1
 bin/wsdl2
@@ -141,6 +145,7 @@ include/mono-1.0/mono/metadata/verify.h
 include/mono-1.0/mono/utils/mono-codeman.h
 include/mono-1.0/mono/utils/mono-counters.h
 include/mono-1.0/mono/utils/mono-digest.h
+include/mono-1.0/mono/utils/mono-embed.h
 include/mono-1.0/mono/utils/mono-hash.h
 include/mono-1.0/mono/utils/mono-logger.h
 include/mono-1.0/mono/utils/mono-math.h
@@ -266,10 +271,6 @@ 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-xmltool.exe
-lib/mono/1.0/mono-xmltool.exe.mdb
-lib/mono/1.0/monolinker.exe
-lib/mono/1.0/monolinker.exe.mdb
 lib/mono/1.0/monop.exe
 lib/mono/1.0/monop.exe.mdb
 lib/mono/1.0/mozroots.exe
@@ -343,6 +344,7 @@ 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.Data.dll
+lib/mono/2.0/Mono.Debugger.Soft.dll
 lib/mono/2.0/Mono.GetOptions.dll
 lib/mono/2.0/Mono.Http.dll
 lib/mono/2.0/Mono.Management.dll
@@ -352,6 +354,7 @@ 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.Tasklets.dll
 lib/mono/2.0/Mono.Web.dll
 lib/mono/2.0/Mono.WebBrowser.dll
 lib/mono/2.0/Novell.Directory.Ldap.dll
@@ -396,6 +399,7 @@ lib/mono/2.0/System.Windows.Forms.dll
 lib/mono/2.0/System.Xml.Linq.dll
 lib/mono/2.0/System.Xml.dll
 lib/mono/2.0/System.dll
+lib/mono/2.0/WindowsBase.dll
 lib/mono/2.0/al.exe
 lib/mono/2.0/al.exe.mdb
 lib/mono/2.0/cscompmgd.dll
@@ -426,6 +430,10 @@ 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/mono-xmltool.exe
+lib/mono/2.0/mono-xmltool.exe.mdb
+lib/mono/2.0/monolinker.exe
+lib/mono/2.0/monolinker.exe.mdb
 lib/mono/2.0/monop.exe
 lib/mono/2.0/monop.exe.mdb
 lib/mono/2.0/mscorlib.dll
@@ -441,12 +449,19 @@ 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/pdb2mdb.exe
+lib/mono/2.0/pdb2mdb.exe.mdb
 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/sqlmetal.exe
+lib/mono/2.0/sqlmetal.exe.config
+lib/mono/2.0/sqlmetal.exe.mdb
 lib/mono/2.0/sqlsharp.exe
 lib/mono/2.0/sqlsharp.exe.mdb
+lib/mono/2.0/svcutil.exe
+lib/mono/2.0/svcutil.exe.mdb
 lib/mono/2.0/wsdl.exe
 lib/mono/2.0/wsdl.exe.mdb
 lib/mono/2.0/xbuild.exe
@@ -454,19 +469,10 @@ lib/mono/2.0/xbuild.exe.mdb
 lib/mono/2.0/xbuild.rsp
 lib/mono/2.0/xsd.exe
 lib/mono/2.0/xsd.exe.mdb
-${PLIST.moon}lib/mono/2.1/Mono.CompilerServices.SymbolWriter.dll
-${PLIST.moon}lib/mono/2.1/System.Core.dll
-${PLIST.moon}lib/mono/2.1/System.Net.dll
-${PLIST.moon}lib/mono/2.1/System.Runtime.Serialization.dll
-${PLIST.moon}lib/mono/2.1/System.ServiceModel.Web.dll
-${PLIST.moon}lib/mono/2.1/System.ServiceModel.dll
-${PLIST.moon}lib/mono/2.1/System.Xml.Linq.dll
-${PLIST.moon}lib/mono/2.1/System.Xml.dll
-${PLIST.moon}lib/mono/2.1/System.dll
-${PLIST.moon}lib/mono/2.1/mscorlib.dll
-${PLIST.moon}lib/mono/2.1/mscorlib.dll.mdb
-${PLIST.moon}lib/mono/2.1/smcs.exe
-${PLIST.moon}lib/mono/2.1/smcs.exe.mdb
+lib/mono/3.5/Microsoft.Build.Engine.dll
+lib/mono/3.5/Microsoft.Build.Framework.dll
+lib/mono/3.5/Microsoft.Build.Tasks.v3.5.dll
+lib/mono/3.5/Microsoft.Build.Utilities.v3.5.dll
 lib/mono/3.5/System.Web.Extensions.Design.dll
 lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
 lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
@@ -526,10 +532,18 @@ lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.Shar
 lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb
 lib/mono/gac/Microsoft.Build.Engine/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll
 lib/mono/gac/Microsoft.Build.Engine/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll.mdb
+lib/mono/gac/Microsoft.Build.Engine/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll
+lib/mono/gac/Microsoft.Build.Engine/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll.mdb
 lib/mono/gac/Microsoft.Build.Framework/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Framework.dll
 lib/mono/gac/Microsoft.Build.Framework/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Framework.dll.mdb
+lib/mono/gac/Microsoft.Build.Framework/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Framework.dll
+lib/mono/gac/Microsoft.Build.Framework/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Framework.dll.mdb
+lib/mono/gac/Microsoft.Build.Tasks.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.v3.5.dll
+lib/mono/gac/Microsoft.Build.Tasks.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.v3.5.dll.mdb
 lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.dll
 lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.dll.mdb
+lib/mono/gac/Microsoft.Build.Utilities.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.v3.5.dll
+lib/mono/gac/Microsoft.Build.Utilities.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.v3.5.dll.mdb
 lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.dll
 lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.dll.mdb
 lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll
@@ -544,8 +558,8 @@ lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
 lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
 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.C5/1.1.0.0__ba07f434b1c35cbd/Mono.C5.dll
+lib/mono/gac/Mono.C5/1.1.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
@@ -583,6 +597,8 @@ lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll
 lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll.mdb
 lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll
 lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll.mdb
+lib/mono/gac/Mono.Debugger.Soft/0.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll
+lib/mono/gac/Mono.Debugger.Soft/0.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll.mdb
 lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll
 lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll.mdb
 lib/mono/gac/Mono.GetOptions/2.0.0.0__0738eb9f132ed756/Mono.GetOptions.dll
@@ -593,14 +609,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.Messaging.RabbitMQ/1.0.5000.0__0738eb9f132ed756/Mono.Messaging.RabbitMQ.dll
+lib/mono/gac/Mono.Messaging.RabbitMQ/1.0.5000.0__0738eb9f132ed756/Mono.Messaging.RabbitMQ.dll.mdb
+lib/mono/gac/Mono.Messaging.RabbitMQ/2.0.0.0__0738eb9f132ed756/Mono.Messaging.RabbitMQ.dll
+lib/mono/gac/Mono.Messaging.RabbitMQ/2.0.0.0__0738eb9f132ed756/Mono.Messaging.RabbitMQ.dll.mdb
+lib/mono/gac/Mono.Messaging/1.0.5000.0__0738eb9f132ed756/Mono.Messaging.dll
+lib/mono/gac/Mono.Messaging/1.0.5000.0__0738eb9f132ed756/Mono.Messaging.dll.mdb
+lib/mono/gac/Mono.Messaging/2.0.0.0__0738eb9f132ed756/Mono.Messaging.dll
+lib/mono/gac/Mono.Messaging/2.0.0.0__0738eb9f132ed756/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
@@ -615,6 +631,8 @@ 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.Tasklets/2.0.0.0__0738eb9f132ed756/Mono.Tasklets.dll
+lib/mono/gac/Mono.Tasklets/2.0.0.0__0738eb9f132ed756/Mono.Tasklets.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
@@ -657,6 +675,8 @@ lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.O
 lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb
 lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll
 lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb
+lib/mono/gac/System.Data.Services/2.0.0.0__0738eb9f132ed756/System.Data.Services.dll
+lib/mono/gac/System.Data.Services/2.0.0.0__0738eb9f132ed756/System.Data.Services.dll.mdb
 lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll
 lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll.mdb
 lib/mono/gac/System.Data/2.0.0.0__b77a5c561934e089/System.Data.dll
@@ -707,8 +727,8 @@ 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.Web/3.5.0.0__31bf3856ad364e35/System.ServiceModel.Web.dll
+lib/mono/gac/System.ServiceModel.Web/3.5.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
@@ -755,24 +775,8 @@ lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
 lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll.mdb
 lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll
 lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll.mdb
-${PLIST.moon}lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.5.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
-${PLIST.moon}lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.5.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
-${PLIST.moon}lib/mono/gac/System.Core/2.0.5.0__7cec85d7bea7798e/System.Core.dll
-${PLIST.moon}lib/mono/gac/System.Core/2.0.5.0__7cec85d7bea7798e/System.Core.dll.mdb
-${PLIST.moon}lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e/System.Net.dll
-${PLIST.moon}lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e/System.Net.dll.mdb
-${PLIST.moon}lib/mono/gac/System.Runtime.Serialization/2.0.5.0__7cec85d7bea7798e/System.Runtime.Serialization.dll
-${PLIST.moon}lib/mono/gac/System.Runtime.Serialization/2.0.5.0__7cec85d7bea7798e/System.Runtime.Serialization.dll.mdb
-${PLIST.moon}lib/mono/gac/System.ServiceModel.Web/2.0.5.0__7cec85d7bea7798e/System.ServiceModel.Web.dll
-${PLIST.moon}lib/mono/gac/System.ServiceModel.Web/2.0.5.0__7cec85d7bea7798e/System.ServiceModel.Web.dll.mdb
-${PLIST.moon}lib/mono/gac/System.ServiceModel/2.0.5.0__31bf3856ad364e35/System.ServiceModel.dll
-${PLIST.moon}lib/mono/gac/System.ServiceModel/2.0.5.0__31bf3856ad364e35/System.ServiceModel.dll.mdb
-${PLIST.moon}lib/mono/gac/System.Xml.Linq/2.0.5.0__31bf3856ad364e35/System.Xml.Linq.dll
-${PLIST.moon}lib/mono/gac/System.Xml.Linq/2.0.5.0__31bf3856ad364e35/System.Xml.Linq.dll.mdb
-${PLIST.moon}lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e/System.Xml.dll
-${PLIST.moon}lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e/System.Xml.dll.mdb
-${PLIST.moon}lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e/System.dll
-${PLIST.moon}lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e/System.dll.mdb
+lib/mono/gac/WindowsBase/3.0.0.0__31bf3856ad364e35/WindowsBase.dll
+lib/mono/gac/WindowsBase/3.0.0.0__31bf3856ad364e35/WindowsBase.dll.mdb
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb
 lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll
@@ -800,8 +804,8 @@ 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/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
 lib/mono/monodoc/monodoc.dll
+lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
 lib/monodoc/monodoc.xml
 lib/monodoc/sources/Mono.source
 lib/monodoc/sources/Mono.tree
@@ -836,7 +840,6 @@ 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
 lib/pkgconfig/system.web.extensions_1.0.pc
 lib/pkgconfig/system.web.mvc.pc
@@ -882,6 +885,7 @@ man/man1/monop.1
 man/man1/monostyle.1
 man/man1/mozroots.1
 man/man1/oldmono.1
+man/man1/pdb2mdb.1
 man/man1/permview.1
 man/man1/prj2make.1
 man/man1/resgen.1
@@ -899,6 +903,7 @@ man/man5/mdoc.5
 man/man5/mono-config.5
 share/examples/mono/1.0/DefaultWsdlHelpGenerator.aspx
 share/examples/mono/1.0/machine.config
+share/examples/mono/2.0/Browsers/Compat.browser
 share/examples/mono/2.0/DefaultWsdlHelpGenerator.aspx
 share/examples/mono/2.0/machine.config
 share/examples/mono/2.0/settings.map
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index bfb16339ef6..8fe7e14a0e9 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.59 2010/01/15 19:41:23 drochner Exp $
+$NetBSD: distinfo,v 1.60 2010/02/16 17:01:04 kefren Exp $
 
-SHA1 (mono-2.4.3.1.tar.bz2) = 1a092d33bc3fbdb3fe3e608c6840d7a4da71f33d
-RMD160 (mono-2.4.3.1.tar.bz2) = 0f77d3cb6f42fc13360aab9ccc546690a61ee6f5
-Size (mono-2.4.3.1.tar.bz2) = 24987012 bytes
-SHA1 (patch-ab) = 114f35f4a0bdb0b995e0a91ae2ff9cb5bc3e29f1
-SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05
+SHA1 (mono-2.6.1.tar.bz2) = 1e28a40e9e3da194ef96011d804cbcc839b85e08
+RMD160 (mono-2.6.1.tar.bz2) = 9d1b5f1f465f285edac98e6b1122965f9e56e0fa
+Size (mono-2.6.1.tar.bz2) = 27644697 bytes
+SHA1 (patch-ab) = a00c0409eabe2f392d09026a8690b327885a793d
+SHA1 (patch-ac) = b8f47cc94ed2269b8fe4efe95269b208827b4688
+SHA1 (patch-ad) = c6956a9e17e0c898cdba5dc15532181dfad32599
 SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
-SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f
+SHA1 (patch-af) = b259961265c861f9d3b1bc66ed8ffaaf46f178c6
 SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca
-SHA1 (patch-ah) = 1642287318add6d255426aeac5eec47720621ca0
 SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56
+SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72
 SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
 SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc
 SHA1 (patch-aq) = f4a009d91c44fb1f05eb7c9bf6282a27e4938aeb
@@ -19,19 +20,18 @@ SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
 SHA1 (patch-bd) = cf15b750dbd93ebf0e0e5165b8a10aabbf4f1642
 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332
 SHA1 (patch-bf) = e945b13fbffc1239a4c459a2c6be543e67e883f9
-SHA1 (patch-bg) = 92168eba23d1cf17a1424e318e21b0d845c52c5a
+SHA1 (patch-bg) = a748a11e6ccaa4abc6552e64615f16657d277c15
 SHA1 (patch-bh) = a42432fd8ed92e2213fbcd24bf29c2b6d4cbd8ba
 SHA1 (patch-bi) = 91786c858b459cd6b5a0dc683b5bdefc412973c1
 SHA1 (patch-ca) = f5c54525d70b185f9fcb28f82034c4e995395c0b
 SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69
-SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6
 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0
 SHA1 (patch-da) = 877ed8ec92ec25686c5a9a59db107f122d49035d
 SHA1 (patch-db) = 97c39aafeb66afdd42317a18c9b8d7d92b103cc0
-SHA1 (patch-dc) = 29fe575f97b7716ffb467e3ae0f19cb8b1e35c87
-SHA1 (patch-de) = 199930ed3ea86d14d9ffbcac46aac708b30dc1a0
+SHA1 (patch-dc) = 2d4d0dd9bc69a5aba64f031c40dead5286846fea
+SHA1 (patch-de) = d9867210a90389ff9ff5b9376b7091f923960973
 SHA1 (patch-df) = b84e779e8054d6425b38a3aeea2971e3a5a78f07
-SHA1 (patch-dg) = d5bcda304ad00b5b8ea03dec76967b43da4b0d51
+SHA1 (patch-dg) = 65b56a2501190eb43e8872278bc3a4cabaa80822
 SHA1 (patch-dh) = 5eaa3c65036ccd35415d8da9dc7e77ed8c08c67c
-SHA1 (patch-di) = cec2e67c65ca0d9b1ef17a2d9929e85c126cb1ad
+SHA1 (patch-di) = 3d59636a1f2455cacc44bc3c011318370ef70132
 SHA1 (patch-dj) = acff1ca9b38b1c21ed545bcd4fb806c69e40c409
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index 9b6eb9b6c54..197f8bdfe51 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,26 +1,25 @@
-$NetBSD: patch-ab,v 1.21 2010/01/15 19:41:23 drochner Exp $
-
---- configure.orig	2009-12-28 19:58:39.000000000 +0000
-+++ configure
-@@ -3058,11 +3058,15 @@ _ACEOF
+$NetBSD: patch-ab,v 1.22 2010/02/16 17:01:04 kefren Exp $
+--- configure.orig	2010-02-16 12:05:01.000000000 +0200
++++ configure	2010-02-16 12:15:36.000000000 +0200
+@@ -3115,12 +3115,15 @@ _ACEOF
  		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
  		libmono_ldflags="-pthread"
  		need_link_unlink=yes
 -		libdl="-ldl"
 +		libdl="-ldl /libexec/ld.elf_so"
  		libgc_threads=pthreads
+ 		with_sigaltstack=no
+ 		use_sigposix=yes
 +		cat >>confdefs.h <<\_ACEOF
 +#define PTHREAD_POINTER_ID 1
 +_ACEOF
-+
- 		with_sigaltstack=no
  		;;
 -	*-*-*freebsd*)
 +	*-*-*freebsd* | *-*-*dragonfly*)
  		platform_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
  			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-@@ -3078,7 +3082,8 @@ _ACEOF
+@@ -3136,7 +3139,8 @@ _ACEOF
  			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
  			libmono_ldflags="$PTHREAD_LIBS"
  		fi
@@ -30,16 +29,7 @@ $NetBSD: patch-ab,v 1.21 2010/01/15 19:41:23 drochner Exp $
  		need_link_unlink=yes
  
  cat >>confdefs.h <<\_ACEOF
-@@ -31859,7 +31864,7 @@ LIBC="libc.so.6"
- INTL="libc.so.6"
- SQLITE="libsqlite.so.0"
- SQLITE3="libsqlite3.so.0"
--X11="libX11.so"
-+X11="/usr/pkg/lib/libX11.so"
- 
- sizeof_register="SIZEOF_VOID_P"
- 
-@@ -32309,10 +32314,10 @@ case "$host" in
+@@ -37054,10 +37058,10 @@ case "$host" in
  	X11="libX11.dylib"
  	;;
       *-*-*netbsd*)
@@ -49,11 +39,11 @@ $NetBSD: patch-ab,v 1.21 2010/01/15 19:41:23 drochner Exp $
 +	INTL="libintl.so"
  	;;
 -    *-*-*freebsd*)
-+    *-*-*freebsd*|*-*-*dragonfly*)
++    *-*-*freebsd* | *-*-*dragonfly*)
      	LIBC="libc.so"
  	INTL="libintl.so"
  	;;
-@@ -32613,6 +32618,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -37358,6 +37362,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
  #include <$ac_header>
@@ -63,7 +53,7 @@ $NetBSD: patch-ab,v 1.21 2010/01/15 19:41:23 drochner Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -32654,6 +32662,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -37399,6 +37406,9 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <$ac_header>
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index 971085db0d1..9150a6768ab 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.15 2008/10/07 13:22:33 kefren Exp $
---- data/Makefile.in.orig	2008-10-02 00:07:19.000000000 +0300
-+++ data/Makefile.in	2008-10-06 16:48:02.000000000 +0300
-@@ -244,7 +244,7 @@
+$NetBSD: patch-ac,v 1.16 2010/02/16 17:01:04 kefren Exp $
+--- data/Makefile.in.orig	2009-12-17 17:50:39.000000000 +0200
++++ data/Makefile.in	2010-02-16 12:16:55.000000000 +0200
+@@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- SUBDIRS = net_1_1 net_2_0
+ SUBDIRS = net_1_1 net_2_0 $(am__append_1)
 -monodir = $(sysconfdir)/mono
 +monodir = $(datadir)/examples/mono
  EXTRA_DIST = \
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
new file mode 100644
index 00000000000..12e23e69db4
--- /dev/null
+++ b/lang/mono/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.16 2010/02/16 17:01:04 kefren Exp $
+--- mono/utils/mono-sigcontext.h.orig	2010-02-16 16:50:32.000000000 +0200
++++ mono/utils/mono-sigcontext.h	2010-02-16 16:57:02.000000000 +0200
+@@ -70,6 +70,8 @@
+ 
+ #ifdef __FreeBSD__
+ #define UCONTEXT_GREGS(ctx)	&(((ucontext_t*)(ctx))->uc_mcontext)
++#elif defined(__NetBSD__)
++#define UCONTEXT_GREGS(ctx)	&(((ucontext_t*)(ctx))->uc_mcontext.__gregs)
+ #else
+ #define UCONTEXT_GREGS(ctx)	&(((ucontext_t*)(ctx))->uc_mcontext.gregs)
+ #endif
diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af
index 1c82cdbc74c..91e7bdec7e2 100644
--- a/lang/mono/patches/patch-af
+++ b/lang/mono/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.10 2008/04/19 18:42:10 kefren Exp $
---- mono/metadata/Makefile.in.orig	2008-03-11 01:37:56.000000000 +0200
-+++ mono/metadata/Makefile.in	2008-03-18 15:35:22.000000000 +0200
-@@ -65,7 +65,7 @@
+$NetBSD: patch-af,v 1.11 2010/02/16 17:01:04 kefren Exp $
+--- mono/metadata/Makefile.in.orig	2009-12-17 17:50:41.000000000 +0200
++++ mono/metadata/Makefile.in	2010-02-16 12:18:12.000000000 +0200
+@@ -103,7 +103,7 @@ libmonoruntime_static_la_OBJECTS =  \
  libmonoruntime_static_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libmonoruntime_static_la_LDFLAGS) $(LDFLAGS) -o $@
 -libmonoruntime_la_LIBADD =
 +libmonoruntime_la_LIBADD = $(ICU_LIBS)
- am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \
- 	decimal.lo boehm-gc.lo null-gc.lo sgen-gc.lo gc.lo \
- 	method-builder.lo marshal.lo mono-mlist.lo monitor.lo \
+ am__libmonoruntime_la_SOURCES_DIST = console-unix.c console-win32.c \
+ 	appdomain.c assembly.c attach.h attach.c boehm-gc.c \
+ 	char-conversions.h cil-coff.h class.c class-internals.h \
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
deleted file mode 100644
index 182af7ac9a4..00000000000
--- a/lang/mono/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2009/08/21 09:29:28 kefren Exp $
---- mono/metadata/gc.c.orig	2009-08-17 17:16:08.000000000 +0300
-+++ mono/metadata/gc.c	2009-08-17 17:16:30.000000000 +0300
-@@ -31,7 +31,7 @@
-  * has the header and functions, but they don't work at all): in other cases
-  * we fall back to the io-layer slightly slower and signal-unsafe Event.
-  */
--#ifdef __linux__
-+#if defined __linux__ || defined __NetBSD__
- #define USE_POSIX_SEM 1
- #endif
- #endif
diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj
new file mode 100644
index 00000000000..f9b6d01f4f1
--- /dev/null
+++ b/lang/mono/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.7 2010/02/16 17:01:04 kefren Exp $
+--- data/net_2_0/Browsers/Makefile.in.orig	2010-02-16 18:25:56.000000000 +0200
++++ data/net_2_0/Browsers/Makefile.in	2010-02-16 18:26:11.000000000 +0200
+@@ -249,7 +249,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-monodir = $(sysconfdir)/mono/2.0/Browsers
++monodir = $(datadir)/examples/mono/2.0/Browsers
+ EXTRA_DIST = Compat.browser
+ mono_DATA = Compat.browser
+ all: all-am
diff --git a/lang/mono/patches/patch-bg b/lang/mono/patches/patch-bg
index 125dab2a638..4c4608769e1 100644
--- a/lang/mono/patches/patch-bg
+++ b/lang/mono/patches/patch-bg
@@ -1,7 +1,19 @@
-$NetBSD: patch-bg,v 1.1 2008/02/13 14:16:43 kefren Exp $
---- mono/metadata/socket-io.c.orig	2008-02-07 08:37:02.000000000 +0200
-+++ mono/metadata/socket-io.c	2008-02-07 08:37:17.000000000 +0200
-@@ -2751,7 +2751,7 @@
+$NetBSD: patch-bg,v 1.2 2010/02/16 17:01:05 kefren Exp $
+--- mono/metadata/socket-io.c.orig	2009-10-22 00:48:35.000000000 +0300
++++ mono/metadata/socket-io.c	2010-02-16 13:54:05.000000000 +0200
+@@ -2759,7 +2759,10 @@ MonoBoolean ves_icall_System_Net_Dns_Get
+ 	memset(&hints, 0, sizeof(hints));
+ 	hints.ai_family = get_family_hint ();
+ 	hints.ai_socktype = SOCK_STREAM;
+-	hints.ai_flags = AI_CANONNAME | AI_ADDRCONFIG;
++	hints.ai_flags = AI_CANONNAME;
++#ifdef AI_ADDRCONFIG
++	hints.ai_flags |= AI_ADDRCONFIG;
++#endif
+ 
+ 	if (*hostname && getaddrinfo(hostname, NULL, &hints, &info) == -1) {
+ 		return(FALSE);
+@@ -2904,7 +2907,7 @@ extern MonoBoolean ves_icall_System_Net_
  	struct sockaddr_in6 saddr6;
  	struct addrinfo *info = NULL, hints;
  	gint32 family;
@@ -10,3 +22,15 @@ $NetBSD: patch-bg,v 1.1 2008/02/13 14:16:43 kefren Exp $
  	int flags = 0;
  #else
  	struct in_addr inaddr;
+@@ -2961,7 +2964,10 @@ extern MonoBoolean ves_icall_System_Net_
+ 	memset (&hints, 0, sizeof(hints));
+ 	hints.ai_family = get_family_hint ();
+ 	hints.ai_socktype = SOCK_STREAM;
+-	hints.ai_flags = AI_CANONNAME | AI_ADDRCONFIG;
++	hints.ai_flags = AI_CANONNAME;
++#ifdef AI_ADDRCONFIG
++	hints.ai_flags |= AI_ADDRCONFIG;
++#endif
+ 
+ 	if( getaddrinfo (hostname, NULL, &hints, &info) == -1 ) {
+ 		return(FALSE);
diff --git a/lang/mono/patches/patch-cd b/lang/mono/patches/patch-cd
deleted file mode 100644
index 3b1e610d3c7..00000000000
--- a/lang/mono/patches/patch-cd
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2008/02/13 14:16:43 kefren Exp $
---- mono/mini/exceptions-amd64.c.orig	2008-02-05 23:56:30.000000000 +0200
-+++ mono/mini/exceptions-amd64.c	2008-02-05 23:53:28.000000000 +0200
-@@ -682,7 +682,7 @@ mono_arch_handle_exception (void *sigctx
- static inline guint64*
- gregs_from_ucontext (ucontext_t *ctx)
- {
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined (__NetBSD__)
-     guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
- #else
-     guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
diff --git a/lang/mono/patches/patch-dc b/lang/mono/patches/patch-dc
index 58c3b5e7df5..4a11a12163e 100644
--- a/lang/mono/patches/patch-dc
+++ b/lang/mono/patches/patch-dc
@@ -1,33 +1,18 @@
-$NetBSD: patch-dc,v 1.2 2009/04/28 10:31:58 hasso Exp $
-
---- mono/mini/mini-x86.h.orig	2009-02-14 01:34:26 +0200
-+++ mono/mini/mini-x86.h	2009-04-27 13:32:19 +0300
-@@ -43,7 +43,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POIN
+$NetBSD: patch-dc,v 1.3 2010/02/16 17:01:05 kefren Exp $
+--- mono/mini/mini-x86.h.orig	2009-12-17 01:26:00.000000000 +0200
++++ mono/mini/mini-x86.h	2010-02-16 12:29:54.000000000 +0200
+@@ -44,7 +44,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POIN
  
  #endif /* PLATFORM_WIN32 */
  
--#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__)
+-#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__)
 +#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
  #define MONO_ARCH_USE_SIGACTION
  #endif
  
-@@ -138,11 +138,11 @@ struct MonoLMF {
- 
- typedef void* MonoCompileArch;
- 
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
- #include <ucontext.h>
- #endif 
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- 	#define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext.mc_eax)
- 	#define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext.mc_ebx)
- 	#define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext.mc_ecx)
-@@ -194,7 +194,7 @@ typedef void* MonoCompileArch;
- 	#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.gregs [REG_EIP])
- #endif
+@@ -150,7 +150,7 @@ typedef struct {
+ 	gboolean need_stack_frame;
+ } MonoCompileArch;
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
diff --git a/lang/mono/patches/patch-de b/lang/mono/patches/patch-de
index 772227b942b..ec4a69e5981 100644
--- a/lang/mono/patches/patch-de
+++ b/lang/mono/patches/patch-de
@@ -1,13 +1,12 @@
-$NetBSD: patch-de,v 1.2 2009/04/28 10:31:58 hasso Exp $
-
---- ikvm-native/jni.c.orig	2009-03-03 16:07:20 -0800
-+++ ikvm-native/jni.c	2009-03-03 16:07:43 -0800
+$NetBSD: patch-de,v 1.3 2010/02/16 17:01:05 kefren Exp $
+--- ikvm-native/jni.c.orig	2009-09-25 17:58:13.000000000 +0300
++++ ikvm-native/jni.c	2010-02-16 12:31:23.000000000 +0200
 @@ -28,7 +28,7 @@
  #include <malloc.h>
  #define ALLOCA _alloca
  #else
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
  #include <stdlib.h>
  #else
  #include <alloca.h>
diff --git a/lang/mono/patches/patch-dg b/lang/mono/patches/patch-dg
index 5633ec31f49..1aa8c6c96a5 100644
--- a/lang/mono/patches/patch-dg
+++ b/lang/mono/patches/patch-dg
@@ -1,18 +1,18 @@
-$NetBSD: patch-dg,v 1.1 2009/04/05 16:20:06 he Exp $
-
-For some reason, this test fails on NetBSD/powerpc, so just avoid it.
-
---- ./mono/metadata/threads.c.orig	2009-04-05 15:00:34.000000000 +0200
-+++ ./mono/metadata/threads.c
-@@ -782,9 +782,11 @@ mono_thread_get_stack_bounds (guint8 **s
+$NetBSD: patch-dg,v 1.2 2010/02/16 17:01:05 kefren Exp $
+--- mono/metadata/threads.c.orig	2009-11-03 02:36:41.000000000 +0200
++++ mono/metadata/threads.c	2010-02-16 12:34:11.000000000 +0200
+@@ -865,8 +865,14 @@ mono_thread_get_stack_bounds (guint8 **s
  
- #ifndef sun
+ #  ifndef sun
  	pthread_attr_getstack (&attr, (void**)staddr, stsize);
-+#if !(defined(__NetBSD__) && defined(__powerpc__))
++	/*
++	 * he@NetBSD.org: For some reason, this test fails on NetBSD/powerpc,
++	 * so just avoid it.
++	 */
++    #if !(defined(__NetBSD__) && defined(__powerpc__))
  	if (*staddr)
  		g_assert ((current > *staddr) && (current < *staddr + *stsize));
- #endif
-+#endif
++    #endif
+ #  endif
  
  	pthread_attr_destroy (&attr); 
- #endif
diff --git a/lang/mono/patches/patch-di b/lang/mono/patches/patch-di
index 5bb6010dadc..9fea5a1b275 100644
--- a/lang/mono/patches/patch-di
+++ b/lang/mono/patches/patch-di
@@ -1,13 +1,12 @@
-$NetBSD: patch-di,v 1.1 2009/04/28 10:31:58 hasso Exp $
-
---- mono/tests/libtest.c.orig	2009-04-27 12:38:38 +0300
-+++ mono/tests/libtest.c	2009-04-27 12:40:25 +0300
-@@ -2978,7 +2978,7 @@ mono_test_marshal_ccw_itest (MonoComObje
+$NetBSD: patch-di,v 1.2 2010/02/16 17:01:05 kefren Exp $
+--- mono/tests/libtest.c.orig	2009-12-17 14:23:15.000000000 +0200
++++ mono/tests/libtest.c	2010-02-16 12:37:39.000000000 +0200
+@@ -3190,7 +3190,7 @@ mono_test_marshal_ccw_itest (MonoComObje
   * mono_method_get_unmanaged_thunk tests
   */
  
--#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__))) || (defined(__ppc__) && defined(__APPLE__)))
-+#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__) || defined (__FreeBSD__) || defined(__DragonFly__))) || (defined(__ppc__) && defined(__APPLE__)))
+-#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__FreeBSD__)) || (defined(__ppc__) && defined(__APPLE__)))
++#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__) || defined (__NetBSD__)) || defined (__FreeBSD__) || defined(__DragonFly__)) || (defined(__ppc__) && defined(__APPLE__)))
  #define ALIGN(size) __attribute__ ((aligned(size)))
  #else
  #define ALIGN(size)