From cb51d1bccbd7de9931a7d21e0ad645cb09fa40e2 Mon Sep 17 00:00:00 2001 From: kefren Date: Sat, 31 Jul 2010 08:40:37 +0000 Subject: [PATCH] Update to 2.6.7 - XXX: need to make moonlight profile work Full update list: http://www.mono-project.com/Release_Notes_Mono_2.6.7 --- lang/mono/Makefile | 4 ++-- lang/mono/PLIST.common | 27 +++++++++++++++++------ lang/mono/distinfo | 15 +++++++------ lang/mono/options.mk | 5 +++-- lang/mono/patches/patch-aa | 15 +++++++++++++ lang/mono/patches/patch-ab | 45 ++++++++++++++------------------------ lang/mono/patches/patch-ad | 27 ++++++++++++++++------- lang/mono/patches/patch-as | 18 +++++++++++++++ 8 files changed, 102 insertions(+), 54 deletions(-) create mode 100644 lang/mono/patches/patch-aa create mode 100644 lang/mono/patches/patch-as diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 524e238ecbaa..0af6d78c94e0 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.102 2010/04/29 08:44:30 kefren Exp $ +# $NetBSD: Makefile,v 1.103 2010/07/31 08:40:37 kefren Exp $ -DISTNAME= mono-2.6.4 +DISTNAME= mono-2.6.7 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 7b7debb555f1..b809afb5413b 100644 --- a/lang/mono/PLIST.common +++ b/lang/mono/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.10 2010/04/09 15:35:21 kefren Exp $ +@comment $NetBSD: PLIST.common,v 1.11 2010/07/31 08:40:37 kefren Exp $ bin/al bin/al1 bin/al2 @@ -473,13 +473,24 @@ 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 +lib/mono/3.5/MSBuild/Microsoft.Build.CommonTypes.xsd +lib/mono/3.5/MSBuild/Microsoft.Build.Core.xsd 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/Microsoft.Build.xsd +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 lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll +lib/mono/compat-2.0/System.Web.Mvc.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 @@ -755,6 +766,8 @@ lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensio lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll.mdb +lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll +lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.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 @@ -809,6 +822,12 @@ 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/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.CSharp.targets +lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.Common.targets +lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.VisualBasic.targets +lib/mono/xbuild/Microsoft/Silverlight/v3.0/Microsoft.Silverlight.CSharp.targets +lib/mono/xbuild/Microsoft/Silverlight/v3.0/Microsoft.Silverlight.Common.targets +lib/mono/xbuild/Microsoft/Silverlight/v3.0/Microsoft.Silverlight.VisualBasic.targets lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets lib/monodoc/monodoc.xml lib/monodoc/sources/Mono.source @@ -823,14 +842,8 @@ 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 -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 diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 502752e1a85c..878535551046 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.63 2010/04/29 08:44:30 kefren Exp $ +$NetBSD: distinfo,v 1.64 2010/07/31 08:40:37 kefren Exp $ -SHA1 (mono-2.6.4.tar.bz2) = c3b556e63cfa635687a40372a83e4a1b8fd10103 -RMD160 (mono-2.6.4.tar.bz2) = c5c12bd0226ff3b45bb8951bfb5c74415e81d6b1 -Size (mono-2.6.4.tar.bz2) = 27690544 bytes -SHA1 (patch-ab) = 728f9e596ff113a5f08c266e7419d40c16e6f03c +SHA1 (mono-2.6.7.tar.bz2) = 6528c009d344a21eb0898876369222a7fff76838 +RMD160 (mono-2.6.7.tar.bz2) = 5825ad284e4123e4ddb8933637a3dbf5f57f7f5a +Size (mono-2.6.7.tar.bz2) = 27921963 bytes +SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb +SHA1 (patch-ab) = 1d635df4dafbd674704a00c9ebf3efdcce43ee0d SHA1 (patch-ac) = b8f47cc94ed2269b8fe4efe95269b208827b4688 -SHA1 (patch-ad) = c6956a9e17e0c898cdba5dc15532181dfad32599 +SHA1 (patch-ad) = f67dad32fbae8bd85364151a1539ee55c92eaffa SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53 SHA1 (patch-af) = b259961265c861f9d3b1bc66ed8ffaaf46f178c6 -SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca SHA1 (patch-ah) = 7f8f525fd0ce5a565d42de61381e8b773d06e9b5 SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56 SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72 @@ -16,6 +16,7 @@ SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc SHA1 (patch-aq) = f4a009d91c44fb1f05eb7c9bf6282a27e4938aeb SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b +SHA1 (patch-as) = 9f434c84f57e985d4734872e2dbce1079c87fcfa SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2 SHA1 (patch-bd) = 15c803bf85ad36ad08bcaaf7dbc371a6473ae5f2 diff --git a/lang/mono/options.mk b/lang/mono/options.mk index fe2a3fa2cc69..24f2da819b5d 100644 --- a/lang/mono/options.mk +++ b/lang/mono/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2009/11/25 10:13:06 kefren Exp $ +# $NetBSD: options.mk,v 1.2 2010/07/31 08:40:37 kefren Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mono PKG_SUPPORTED_OPTIONS= moonlight -PKG_SUGGESTED_OPTIONS= moonlight +# PKG_SUGGESTED_OPTIONS= moonlight .include "../../mk/bsd.options.mk" @@ -10,6 +10,7 @@ PLIST_VARS+= moon .if !empty(PKG_OPTIONS:Mmoonlight) PLIST.moon= yes +CONFIGURE_ARGS+= --with-mcs-docs=yes .else CONFIGURE_ARGS+= --with-moonlight=no .endif diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa new file mode 100644 index 000000000000..316612ddfc40 --- /dev/null +++ b/lang/mono/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.16 2010/07/31 08:40:37 kefren Exp $ +--- mono/io-layer/collection.c.orig 2010-07-26 13:00:10.000000000 +0300 ++++ mono/io-layer/collection.c 2010-07-26 13:00:48.000000000 +0300 +@@ -60,7 +60,11 @@ + + #if defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) + if (set_stacksize == 0) { ++#ifdef PTHREAD_STACK_MIN + ret = pthread_attr_setstacksize (&attr, MAX (65536, PTHREAD_STACK_MIN)); ++#else ++ ret = pthread_attr_setstacksize (&attr, 65536); ++#endif + g_assert (ret == 0); + } else if (set_stacksize == 1) { + ret = pthread_attr_setstacksize (&attr, 131072); diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index cfc368258af9..1d5eb079b643 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,8 +1,7 @@ -$NetBSD: patch-ab,v 1.23 2010/02/18 21:55:48 ghen Exp $ - ---- configure.orig 2009-12-17 15:50:43.000000000 +0000 -+++ configure -@@ -3115,12 +3115,15 @@ _ACEOF +$NetBSD: patch-ab,v 1.24 2010/07/31 08:40:37 kefren Exp $ +--- configure.orig 2010-07-14 11:35:21.000000000 +0300 ++++ configure 2010-07-26 12:50:27.000000000 +0300 +@@ -3118,12 +3118,15 @@ CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes @@ -20,7 +19,7 @@ $NetBSD: patch-ab,v 1.23 2010/02/18 21:55:48 ghen Exp $ platform_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" -@@ -3136,7 +3139,8 @@ _ACEOF +@@ -3139,7 +3142,8 @@ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi @@ -30,7 +29,17 @@ $NetBSD: patch-ab,v 1.23 2010/02/18 21:55:48 ghen Exp $ need_link_unlink=yes cat >>confdefs.h <<\_ACEOF -@@ -36565,7 +36569,7 @@ LIBC="libc.so.6" +@@ -28734,6 +28738,9 @@ + /* end confdefs.h. */ + $ac_includes_default + #include <$ac_header> ++#ifdef __DragonFly__ ++#error extattr ++#endif + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -38012,7 +38019,7 @@ INTL="libc.so.6" SQLITE="libsqlite.so.0" SQLITE3="libsqlite3.so.0" @@ -39,7 +48,7 @@ $NetBSD: patch-ab,v 1.23 2010/02/18 21:55:48 ghen Exp $ sizeof_register="SIZEOF_VOID_P" -@@ -37054,10 +37058,10 @@ case "$host" in +@@ -38501,10 +38508,10 @@ X11="libX11.dylib" ;; *-*-*netbsd*) @@ -53,23 +62,3 @@ $NetBSD: patch-ab,v 1.23 2010/02/18 21:55:48 ghen Exp $ LIBC="libc.so" INTL="libintl.so" ;; -@@ -37358,6 +37362,9 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default - #include <$ac_header> -+#ifdef __DragonFly__ -+#error extattr -+#endif - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -37399,6 +37406,9 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <$ac_header> -+#ifdef __DragonFly__ -+#error extattr -+#endif - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad index 12e23e69db41..896a072289fe 100644 --- a/lang/mono/patches/patch-ad +++ b/lang/mono/patches/patch-ad @@ -1,12 +1,23 @@ -$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 @@ +--- mono/utils/mono-sigcontext.h.orig 2010-07-06 17:52:18.000000000 +0300 ++++ mono/utils/mono-sigcontext.h 2010-07-30 12:56:01.000000000 +0300 +@@ -80,6 +80,20 @@ #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 ++ #define UCONTEXT_REG_RAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RAX]) ++ #define UCONTEXT_REG_RBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RBX]) ++ #define UCONTEXT_REG_RCX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RCX]) ++ #define UCONTEXT_REG_RDX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RDX]) ++ #define UCONTEXT_REG_RBP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RBP]) ++ #define UCONTEXT_REG_RSP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RSP]) ++ #define UCONTEXT_REG_RSI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RSI]) ++ #define UCONTEXT_REG_RDI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RDI]) ++ #define UCONTEXT_REG_RIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RIP]) ++ #define UCONTEXT_REG_R12(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_R12]) ++ #define UCONTEXT_REG_R13(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_R13]) ++ #define UCONTEXT_REG_R14(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_R14]) ++ #define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_R15]) + #elif defined(__OpenBSD__) + /* OpenBSD/amd64 has no gregs array, ucontext_t == sigcontext */ + #define UCONTEXT_REG_RAX(ctx) ((ctx)->sc_rax) diff --git a/lang/mono/patches/patch-as b/lang/mono/patches/patch-as new file mode 100644 index 000000000000..6da49facb5be --- /dev/null +++ b/lang/mono/patches/patch-as @@ -0,0 +1,18 @@ +$NetBSD: patch-as,v 1.1 2010/07/31 08:40:37 kefren Exp $ + +From FreeBSD: https://bugzilla.novell.com/show_bug.cgi?id=528830 + +--- mono/metadata/appdomain.c.orig 2010-06-11 15:16:39.000000000 +0300 ++++ mono/metadata/appdomain.c 2010-06-11 15:18:02.000000000 +0300 +@@ -2359,6 +2359,11 @@ mono_domain_try_unload (MonoDomain *doma + /* The icall wrapper will execute the abort */ + CloseHandle (thread_handle); + return; ++ } else if (!mono_thread_has_appdomain_ref (mono_thread_current (), domain) && !(mono_thread_interruption_requested ())) { ++ if (!domain->friendly_name) { ++ CloseHandle (thread_handle); ++ return; ++ } + } + } + CloseHandle (thread_handle);