From c2ee6301a45649e717f21348fc32658da8bbf57e Mon Sep 17 00:00:00 2001 From: kefren Date: Mon, 25 Apr 2011 14:01:40 +0000 Subject: Update to mono 2.10.1. Major Highlights: * Google Native Client Support * New Profiler engine * Faster socket stack * Improved Parallel Framework * SGen Precise Stack Scanning and Many performance improvements. * Unified MonoTouch/Monodroid runtime support * Cecil/Light * New C# Compiler backend (can now use any custom mscorlib) * VB Compiler can now compile to both 2.0 and 4.0 profiles. * Supports ASP.NET MVC3, Razor and new WebPages. * New WebMatrix.Data database API. * Improved OSX Mono * F# and IronRuby --- lang/mono/Makefile | 5 ++--- lang/mono/PLIST.common | 47 +++++++++++++++++++++++++++++++++++----------- lang/mono/distinfo | 19 ++++++++----------- lang/mono/patches/patch-ab | 22 +++++++++++----------- lang/mono/patches/patch-bg | 32 ++++--------------------------- lang/mono/patches/patch-ca | 12 ------------ lang/mono/patches/patch-cb | 12 ------------ lang/mono/patches/patch-ce | 32 ------------------------------- lang/mono/patches/patch-db | 12 ++++++------ lang/mono/patches/patch-dg | 24 ++++++++++++----------- 10 files changed, 80 insertions(+), 137 deletions(-) delete mode 100644 lang/mono/patches/patch-ca delete mode 100644 lang/mono/patches/patch-cb delete mode 100644 lang/mono/patches/patch-ce (limited to 'lang') diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 396c03e93ea..6bd1084e1d4 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.112 2011/04/22 13:42:28 obache Exp $ +# $NetBSD: Makefile,v 1.113 2011/04/25 14:01:40 kefren Exp $ -DISTNAME= mono-2.8.2 -PKGREVISION= 2 +DISTNAME= mono-2.10.1 CATEGORIES= lang MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common index 650f62fe6a3..6ccf271f1b1 100644 --- a/lang/mono/PLIST.common +++ b/lang/mono/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.13 2010/12/01 16:49:13 kefren Exp $ +@comment $NetBSD: PLIST.common,v 1.14 2011/04/25 14:01:40 kefren Exp $ bin/al bin/al2 bin/caspol @@ -56,6 +56,7 @@ bin/monolinker bin/monop bin/monop2 bin/mozroots +bin/mprof-report bin/nunit-console bin/nunit-console2 bin/pdb2mdb @@ -100,6 +101,7 @@ include/mono-2.0/mono/metadata/opcodes.h include/mono-2.0/mono/metadata/profiler.h include/mono-2.0/mono/metadata/reflection.h include/mono-2.0/mono/metadata/row-indexes.h +include/mono-2.0/mono/metadata/sgen-bridge.h include/mono-2.0/mono/metadata/threads.h include/mono-2.0/mono/metadata/tokentype.h include/mono-2.0/mono/metadata/verify.h @@ -114,6 +116,7 @@ lib/libmono-2.0.la lib/libmono-profiler-aot.la lib/libmono-profiler-cov.la lib/libmono-profiler-iomap.la +lib/libmono-profiler-log.la lib/mono-source-libs/Options.cs lib/mono-source-libs/getline.cs lib/mono/2.0/Accessibility.dll @@ -171,6 +174,7 @@ lib/mono/2.0/System.Core.dll lib/mono/2.0/System.Data.DataSetExtensions.dll lib/mono/2.0/System.Data.Linq.dll lib/mono/2.0/System.Data.OracleClient.dll +lib/mono/2.0/System.Data.Services.Client.dll lib/mono/2.0/System.Data.Services.dll lib/mono/2.0/System.Data.dll lib/mono/2.0/System.Design.dll @@ -182,6 +186,7 @@ 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.Net.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 @@ -219,6 +224,9 @@ lib/mono/2.0/gmcs.exe.config lib/mono/2.0/gmcs.exe.mdb lib/mono/2.0/ilasm.exe lib/mono/2.0/ilasm.exe.mdb +lib/mono/2.0/mcs.exe +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-service.exe @@ -260,7 +268,6 @@ lib/mono/3.5/Microsoft.CSharp.targets lib/mono/3.5/Microsoft.Common.targets lib/mono/3.5/Microsoft.Common.tasks lib/mono/3.5/Microsoft.VisualBasic.targets -lib/mono/3.5/System.Web.Extensions.Design.dll lib/mono/3.5/xbuild.exe lib/mono/3.5/xbuild.exe.mdb lib/mono/3.5/xbuild.rsp @@ -288,6 +295,7 @@ lib/mono/4.0/Microsoft.Common.targets lib/mono/4.0/Microsoft.Common.tasks lib/mono/4.0/Microsoft.VisualBasic.targets lib/mono/4.0/Microsoft.VisualC.dll +lib/mono/4.0/Microsoft.Web.Infrastructure.dll lib/mono/4.0/Mono.C5.dll lib/mono/4.0/Mono.CSharp.dll lib/mono/4.0/Mono.Cairo.dll @@ -295,6 +303,7 @@ lib/mono/4.0/Mono.CodeContracts.dll lib/mono/4.0/Mono.CompilerServices.SymbolWriter.dll lib/mono/4.0/Mono.Data.Sqlite.dll lib/mono/4.0/Mono.Data.Tds.dll +lib/mono/4.0/Mono.Debugger.Soft.dll lib/mono/4.0/Mono.Http.dll lib/mono/4.0/Mono.Management.dll lib/mono/4.0/Mono.Messaging.RabbitMQ.dll @@ -321,6 +330,7 @@ lib/mono/4.0/System.Core.dll lib/mono/4.0/System.Data.DataSetExtensions.dll lib/mono/4.0/System.Data.Linq.dll lib/mono/4.0/System.Data.OracleClient.dll +lib/mono/4.0/System.Data.Services.Client.dll lib/mono/4.0/System.Data.Services.dll lib/mono/4.0/System.Data.dll lib/mono/4.0/System.Design.dll @@ -333,6 +343,7 @@ lib/mono/4.0/System.IdentityModel.Selectors.dll lib/mono/4.0/System.IdentityModel.dll lib/mono/4.0/System.Management.dll lib/mono/4.0/System.Messaging.dll +lib/mono/4.0/System.Net.dll lib/mono/4.0/System.Numerics.dll lib/mono/4.0/System.Runtime.Caching.dll lib/mono/4.0/System.Runtime.DurableInstancing.dll @@ -360,6 +371,7 @@ lib/mono/4.0/System.Xaml.dll lib/mono/4.0/System.Xml.Linq.dll lib/mono/4.0/System.Xml.dll lib/mono/4.0/System.dll +lib/mono/4.0/WebMatrix.Data.dll lib/mono/4.0/WindowsBase.dll lib/mono/4.0/al.exe lib/mono/4.0/al.exe.mdb @@ -411,8 +423,6 @@ lib/mono/4.0/makecert.exe lib/mono/4.0/makecert.exe.mdb lib/mono/4.0/mconfig.exe lib/mono/4.0/mconfig.exe.mdb -lib/mono/4.0/mdoc.exe -lib/mono/4.0/mdoc.exe.mdb lib/mono/4.0/mkbundle.exe lib/mono/4.0/mkbundle.exe.mdb lib/mono/4.0/mod.exe @@ -481,7 +491,6 @@ 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/compat-2.0/System.Web.Mvc.dll -lib/mono/compat-4.0/ICSharpCode.SharpZipLib.dll lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a/Accessibility.dll lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a/Accessibility.dll.mdb lib/mono/gac/Accessibility/4.0.0.0__b03f5f7f11d50a3a/Accessibility.dll @@ -524,6 +533,8 @@ lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.Sharp lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb +lib/mono/gac/ICSharpCode.SharpZipLib/4.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll +lib/mono/gac/ICSharpCode.SharpZipLib/4.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 @@ -554,6 +565,8 @@ lib/mono/gac/Microsoft.VisualC/0.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll lib/mono/gac/Microsoft.VisualC/0.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb +lib/mono/gac/Microsoft.Web.Infrastructure/1.0.0.0__31bf3856ad364e35/Microsoft.Web.Infrastructure.dll +lib/mono/gac/Microsoft.Web.Infrastructure/1.0.0.0__31bf3856ad364e35/Microsoft.Web.Infrastructure.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.0.0.0__0738eb9f132ed756/Mono.CSharp.dll @@ -564,10 +577,10 @@ 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.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.dll lib/mono/gac/Mono.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.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.Cecil.Mdb/0.9.4.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll +lib/mono/gac/Mono.Cecil.Mdb/0.9.4.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll.mdb +lib/mono/gac/Mono.Cecil/0.9.4.0__0738eb9f132ed756/Mono.Cecil.dll +lib/mono/gac/Mono.Cecil/0.9.4.0__0738eb9f132ed756/Mono.Cecil.dll.mdb lib/mono/gac/Mono.CodeContracts/4.0.0.0__0738eb9f132ed756/Mono.CodeContracts.dll lib/mono/gac/Mono.CodeContracts/4.0.0.0__0738eb9f132ed756/Mono.CodeContracts.dll.mdb lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll @@ -582,8 +595,10 @@ lib/mono/gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll lib/mono/gac/Mono.Data.Tds/2.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll.mdb lib/mono/gac/Mono.Data.Tds/4.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll lib/mono/gac/Mono.Data.Tds/4.0.0.0__0738eb9f132ed756/Mono.Data.Tds.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.Debugger.Soft/2.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll +lib/mono/gac/Mono.Debugger.Soft/2.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll.mdb +lib/mono/gac/Mono.Debugger.Soft/4.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll +lib/mono/gac/Mono.Debugger.Soft/4.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.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.Http/4.0.0.0__0738eb9f132ed756/Mono.Http.dll @@ -678,6 +693,8 @@ lib/mono/gac/System.Data.OracleClient/4.0.0.0__b77a5c561934e089/System.Data.Orac lib/mono/gac/System.Data.OracleClient/4.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb lib/mono/gac/System.Data.Services.Client/3.5.0.0__b03f5f7f11d50a3a/System.Data.Services.Client.dll lib/mono/gac/System.Data.Services.Client/3.5.0.0__b03f5f7f11d50a3a/System.Data.Services.Client.dll.mdb +lib/mono/gac/System.Data.Services.Client/4.0.0.0__b77a5c561934e089/System.Data.Services.Client.dll +lib/mono/gac/System.Data.Services.Client/4.0.0.0__b77a5c561934e089/System.Data.Services.Client.dll.mdb lib/mono/gac/System.Data.Services/3.5.0.0__b77a5c561934e089/System.Data.Services.dll lib/mono/gac/System.Data.Services/3.5.0.0__b77a5c561934e089/System.Data.Services.dll.mdb lib/mono/gac/System.Data.Services/4.0.0.0__b77a5c561934e089/System.Data.Services.dll @@ -724,6 +741,10 @@ lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll lib/mono/gac/System.Messaging/2.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb lib/mono/gac/System.Messaging/4.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll lib/mono/gac/System.Messaging/4.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb +lib/mono/gac/System.Net/3.5.0.0__7cec85d7bea7798e/System.Net.dll +lib/mono/gac/System.Net/3.5.0.0__7cec85d7bea7798e/System.Net.dll.mdb +lib/mono/gac/System.Net/4.0.0.0__7cec85d7bea7798e/System.Net.dll +lib/mono/gac/System.Net/4.0.0.0__7cec85d7bea7798e/System.Net.dll.mdb lib/mono/gac/System.Numerics/4.0.0.0__b77a5c561934e089/System.Numerics.dll lib/mono/gac/System.Numerics/4.0.0.0__b77a5c561934e089/System.Numerics.dll.mdb lib/mono/gac/System.Runtime.Caching/4.0.0.0__b03f5f7f11d50a3a/System.Runtime.Caching.dll @@ -824,6 +845,8 @@ lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll.mdb lib/mono/gac/System/4.0.0.0__b77a5c561934e089/System.dll lib/mono/gac/System/4.0.0.0__b77a5c561934e089/System.dll.mdb +lib/mono/gac/WebMatrix.Data/4.0.0.0__0738eb9f132ed756/WebMatrix.Data.dll +lib/mono/gac/WebMatrix.Data/4.0.0.0__0738eb9f132ed756/WebMatrix.Data.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/WindowsBase/4.0.0.0__31bf3856ad364e35/WindowsBase.dll @@ -949,6 +972,7 @@ man/man1/monodocs2html.1 man/man1/monolinker.1 man/man1/monop.1 man/man1/mozroots.1 +man/man1/mprof-report.1 man/man1/pdb2mdb.1 man/man1/permview.1 man/man1/prj2make.1 @@ -1012,4 +1036,5 @@ 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/locale/pt_BR/LC_MESSAGES/mcs.mo share/mono-2.0/mono/cil/cil-opcodes.xml diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 597389c1d65..fe1928a4d99 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.76 2011/03/17 14:24:52 kefren Exp $ +$NetBSD: distinfo,v 1.77 2011/04/25 14:01:40 kefren Exp $ -SHA1 (mono-2.8.2.tar.bz2) = 4223a40706b422c44be5eb1c89b4f316026a02a5 -RMD160 (mono-2.8.2.tar.bz2) = 8536c1c9a481ece2ba254a7c943353f9ade66a84 -Size (mono-2.8.2.tar.bz2) = 31292886 bytes +SHA1 (mono-2.10.1.tar.bz2) = 234ee4eca6c80dda9d8fe955f3aafa25530921a7 +RMD160 (mono-2.10.1.tar.bz2) = 3c9acc54d1df0f63ee546bf47bed3ca53b3f679e +Size (mono-2.10.1.tar.bz2) = 33483937 bytes SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb -SHA1 (patch-ab) = ea20eb85d29c36de8f830a5225cd271d75225407 +SHA1 (patch-ab) = 0dae456d0d12421e2bcf0c092c5a522473fbd16f SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2 SHA1 (patch-ad) = 55ccdedbdf80c24be110dcebc73644e1e68909b3 SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53 @@ -24,19 +24,16 @@ SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2 SHA1 (patch-bd) = 15c803bf85ad36ad08bcaaf7dbc371a6473ae5f2 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332 SHA1 (patch-bf) = e945b13fbffc1239a4c459a2c6be543e67e883f9 -SHA1 (patch-bg) = a748a11e6ccaa4abc6552e64615f16657d277c15 +SHA1 (patch-bg) = 7ac66455c304880e40bb915b8ba1f28ee57dd576 SHA1 (patch-bh) = a42432fd8ed92e2213fbcd24bf29c2b6d4cbd8ba SHA1 (patch-bi) = 91786c858b459cd6b5a0dc683b5bdefc412973c1 -SHA1 (patch-ca) = f5c54525d70b185f9fcb28f82034c4e995395c0b -SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69 SHA1 (patch-cc) = 97b247ea353c6b0e08b96bdf0e6de74c5dcb60ef -SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0 SHA1 (patch-da) = 877ed8ec92ec25686c5a9a59db107f122d49035d -SHA1 (patch-db) = e99e8a6c40bc2dac626b3f48a8c8e09132b9856a +SHA1 (patch-db) = 1d735b2b25c113119637835f6bc54d8b37532941 SHA1 (patch-dc) = e139e349217b213eea53a17fcae44fda0bbfe636 SHA1 (patch-de) = d9867210a90389ff9ff5b9376b7091f923960973 SHA1 (patch-df) = b817bb4dd09c4490efba749bf9c4a663253da11b -SHA1 (patch-dg) = bb400ea08a07b24797af16e926a430e493203e51 +SHA1 (patch-dg) = d6af013f17f293485ed8740e284f44a53467391e SHA1 (patch-dh) = 9d1603cb55658a378cf4af29e41d6215f6a080c9 SHA1 (patch-di) = 925b26e848f5f25376a21948d0627e987cfaa467 SHA1 (patch-dj) = acff1ca9b38b1c21ed545bcd4fb806c69e40c409 diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index 488b8c62ba5..a7ba2e2fe5d 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,16 +1,16 @@ -$NetBSD: patch-ab,v 1.26 2010/10/16 04:32:18 kefren Exp $ ---- configure.orig 2010-10-05 23:00:40.000000000 +0300 -+++ configure 2010-10-15 08:28:52.000000000 +0300 -@@ -3106,7 +3106,7 @@ +$NetBSD: patch-ab,v 1.27 2011/04/25 14:01:40 kefren Exp $ +--- configure.orig 2011-02-23 21:34:00.000000000 +0200 ++++ configure 2011-04-25 12:37:59.000000000 +0300 +@@ -3123,7 +3123,7 @@ host_win32=yes if test "x$cross_compiling" = "xno"; then target_win32=yes -- if test "x$host" == "x$target"; then -+ if test "x$host" = "x$target"; then +- if test "x$host" == "x$build"; then ++ if test "x$host" = "x$build"; then cat >>confdefs.h <<\_ACEOF #define TARGET_WIN32 1 -@@ -3153,12 +3153,15 @@ +@@ -3171,12 +3171,15 @@ CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes @@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.26 2010/10/16 04:32:18 kefren Exp $ host_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" -@@ -3174,7 +3177,8 @@ +@@ -3192,7 +3195,8 @@ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi @@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.26 2010/10/16 04:32:18 kefren Exp $ need_link_unlink=yes cat >>confdefs.h <<\_ACEOF -@@ -28824,6 +28828,9 @@ +@@ -28838,6 +28842,9 @@ /* end confdefs.h. */ $ac_includes_default #include <$ac_header> @@ -48,7 +48,7 @@ $NetBSD: patch-ab,v 1.26 2010/10/16 04:32:18 kefren Exp $ _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" -@@ -38453,7 +38460,7 @@ +@@ -39018,7 +39025,7 @@ INTL="libc.so.6" SQLITE="libsqlite.so.0" SQLITE3="libsqlite3.so.0" @@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.26 2010/10/16 04:32:18 kefren Exp $ sizeof_register="SIZEOF_VOID_P" -@@ -39038,10 +39045,12 @@ +@@ -39646,10 +39653,12 @@ X11="libX11.dylib" ;; *-*-*netbsd*) diff --git a/lang/mono/patches/patch-bg b/lang/mono/patches/patch-bg index 4c4608769e1..4b1babd0649 100644 --- a/lang/mono/patches/patch-bg +++ b/lang/mono/patches/patch-bg @@ -1,19 +1,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_ +$NetBSD: patch-bg,v 1.3 2011/04/25 14:01:40 kefren Exp $ +--- mono/metadata/socket-io.c.orig 2011-02-23 21:21:01.000000000 +0200 ++++ mono/metadata/socket-io.c 2011-04-25 12:21:56.000000000 +0300 +@@ -2998,7 +2998,7 @@ extern MonoBoolean ves_icall_System_Net_ struct sockaddr_in6 saddr6; struct addrinfo *info = NULL, hints; gint32 family; @@ -22,15 +10,3 @@ $NetBSD: patch-bg,v 1.2 2010/02/16 17:01:05 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-ca b/lang/mono/patches/patch-ca deleted file mode 100644 index 8852655e720..00000000000 --- a/lang/mono/patches/patch-ca +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ca,v 1.2 2008/02/13 14:16:43 kefren Exp $ ---- mcs/class/Mono.Security/Mono.Math/BigInteger.cs.orig 2008-02-05 14:19:30.000000000 +0200 -+++ mcs/class/Mono.Security/Mono.Math/BigInteger.cs 2008-02-05 14:19:44.000000000 +0200 -@@ -1607,7 +1607,7 @@ - uint j = 1; - - // Multiply and add -- for (; j < m.length; j++) { -+ for (; j < m.length && j < A.length; j++) { - c += (ulong)u_i * (ulong)*(mP++) + *(aSP++); - *(aDP++) = (uint)c; - c >>= 32; diff --git a/lang/mono/patches/patch-cb b/lang/mono/patches/patch-cb deleted file mode 100644 index 579bc0d8469..00000000000 --- a/lang/mono/patches/patch-cb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cb,v 1.2 2008/02/13 14:16:43 kefren Exp $ ---- mcs/class/corlib/Mono.Math/BigInteger.cs.orig 2008-02-05 14:20:27.000000000 +0200 -+++ mcs/class/corlib/Mono.Math/BigInteger.cs 2008-02-05 14:20:57.000000000 +0200 -@@ -1607,7 +1607,7 @@ namespace Mono.Math { - uint j = 1; - - // Multiply and add -- for (; j < m.length; j++) { -+ for (; j < m.length && j < A.length; j++) { - c += (ulong)u_i * (ulong)*(mP++) + *(aSP++); - *(aDP++) = (uint)c; - c >>= 32; diff --git a/lang/mono/patches/patch-ce b/lang/mono/patches/patch-ce deleted file mode 100644 index a763974cbf9..00000000000 --- a/lang/mono/patches/patch-ce +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2008/02/13 14:16:43 kefren Exp $ ---- mcs/class/System/System.Net.Sockets/Socket.cs.orig 2008-02-08 11:30:11.000000000 +0200 -+++ mcs/class/System/System.Net.Sockets/Socket.cs 2008-02-08 11:33:32.000000000 +0200 -@@ -1452,7 +1452,7 @@ - } - - int error = 0; -- if (!blocking) { -+// if (!blocking) { - SocketAddress serial = end_point.Serialize (); - Connect_internal (socket, serial, out error); - if (error == 0) { -@@ -1464,16 +1464,16 @@ - connected = false; - req.Complete (new SocketException (error), true); - } -- } -+// } - -- if (blocking || error == (int) SocketError.InProgress || error == (int) SocketError.WouldBlock) { -+/* if (blocking || error == (int) SocketError.InProgress || error == (int) SocketError.WouldBlock) { - // continue asynch - connected = false; - Worker worker = new Worker (req); - SocketAsyncCall sac = new SocketAsyncCall (worker.Connect); - sac.BeginInvoke (null, req); - } -- -+*/ - return(req); - } - diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db index 4758ebf8aab..6dbcbcc2a43 100644 --- a/lang/mono/patches/patch-db +++ b/lang/mono/patches/patch-db @@ -1,6 +1,6 @@ -$NetBSD: patch-db,v 1.4 2010/12/29 05:41:20 obache Exp $ ---- mono/utils/mono-proclib.c.orig 2010-11-12 10:24:41.000000000 +0000 -+++ mono/utils/mono-proclib.c +$NetBSD: patch-db,v 1.5 2011/04/25 14:01:40 kefren Exp $ +--- mono/utils/mono-proclib.c.orig 2011-02-23 21:21:01.000000000 +0200 ++++ mono/utils/mono-proclib.c 2011-04-25 12:35:21.000000000 +0300 @@ -13,11 +13,13 @@ #endif @@ -13,10 +13,10 @@ $NetBSD: patch-db,v 1.4 2010/12/29 05:41:20 obache Exp $ +#ifndef __DragonFly__ #include +#endif - #ifdef HAVE_SYS_USER_H - #include + #if defined(__APPLE__) + #include #endif -@@ -29,6 +31,9 @@ +@@ -32,6 +34,9 @@ # define kinfo_pid_member kp_proc.p_pid # define kinfo_name_member kp_proc.p_comm # endif diff --git a/lang/mono/patches/patch-dg b/lang/mono/patches/patch-dg index ed9085116f7..57d8a275399 100644 --- a/lang/mono/patches/patch-dg +++ b/lang/mono/patches/patch-dg @@ -1,18 +1,20 @@ -$NetBSD: patch-dg,v 1.3 2010/04/29 08:44:30 kefren Exp $ ---- mono/metadata/threads.c.orig 2010-04-22 18:37:44.000000000 +0300 -+++ mono/metadata/threads.c 2010-04-29 10:52:33.000000000 +0300 -@@ -880,8 +880,14 @@ +$NetBSD: patch-dg,v 1.4 2011/04/25 14:01:40 kefren Exp $ +--- mono/metadata/threads.c.orig 2011-02-23 21:21:01.000000000 +0200 ++++ mono/metadata/threads.c 2011-04-25 12:32:08.000000000 +0300 +@@ -1002,8 +1002,16 @@ mono_thread_get_stack_bounds (guint8 **s # if !defined(__OpenBSD__) pthread_attr_getstack (&attr, (void**)staddr, stsize); # endif -+ /* -+ * he@NetBSD.org: For some reason, this test fails on NetBSD/powerpc, -+ * so just avoid it. -+ */ -+ #if !(defined(__NetBSD__) && defined(__powerpc__)) ++ /* ++ * he@NetBSD.org: For some reason, this test fails on NetBSD/powerpc, ++ * so just avoid it. ++ * kefren@: as a hint if somebody want to take a closer look: this ++ * triggers also when building in a i386 chroot on amd64 ++ */ ++# if !(defined(__NetBSD__) && defined(__powerpc__)) if (*staddr) g_assert ((current > *staddr) && (current < *staddr + *stsize)); -+ #endif ++# endif # endif - pthread_attr_destroy (&attr); + pthread_attr_destroy (&attr); -- cgit v1.2.3