Update to 2.10.6. Minor bugfixes found in Changelog:

Simplify building with the Android NDK.
Allow Android'd support_boehm=no to work.
Disable the -Wunused-by-set-variable warning supported by newer gcc versions.
Add shared_perfcounters option to enable minimal.
Fix configure check for darwin to support all variants
Fix mingw32 cross-build on a git no-branch checkout.
Add a membar to libgc's UNLOCK () on arm.
Pass HAVE_ARMV6 to libgc on darwin too.

7 files changed, 59 insertions, 136 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index bb22d7517ae..2bbafea1d2d 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2011/10/14 00:17:44 christos Exp $
+# $NetBSD: Makefile,v 1.120 2011/10/29 05:47:54 kefren Exp $
 
-DISTNAME=	mono-2.10.2
-PKGREVISION=	4
+DISTNAME=	mono-2.10.6
 CATEGORIES=	lang
-MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono/
+MASTER_SITES=	http://download.mono-project.com/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kefren@NetBSD.org
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 3a66b79f73b..be59146c3a0 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.82 2011/10/15 02:03:59 marino Exp $
+$NetBSD: distinfo,v 1.83 2011/10/29 05:47:54 kefren Exp $
 
-SHA1 (mono-2.10.2.tar.bz2) = 7b673255c6b17c5a41c15059e5f068d6a970d2ea
-RMD160 (mono-2.10.2.tar.bz2) = bac1ecb7e94c77341ae5f15f8d59141f9eb4aa38
-Size (mono-2.10.2.tar.bz2) = 33737282 bytes
+SHA1 (mono-2.10.6.tar.bz2) = c17d211475a321680b4772dd3b8cadde7eaa60aa
+RMD160 (mono-2.10.6.tar.bz2) = ca4037531046f60348350e7ab5a760ddbc152bc4
+Size (mono-2.10.6.tar.bz2) = 34006551 bytes
 SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb
-SHA1 (patch-ab) = 0dae456d0d12421e2bcf0c092c5a522473fbd16f
+SHA1 (patch-ab) = f4d7c412a34e6ce5321361616888b601ff666cdd
 SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2
-SHA1 (patch-ad) = 0148dc2ebf8ec0c74144fa41570b501ce30394f0
-SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
+SHA1 (patch-ad) = 2dc253928695966b5310457b0cec52cd919a4851
+SHA1 (patch-ae) = 2b032ad658e8aa23c4e3825474d2d284b00557cd
 SHA1 (patch-af) = c109a9a742cb70d83cf99df0ad6c907c68809d52
 SHA1 (patch-ah) = 5f90aa60504b9508d21e05b390626788d71d47b4
 SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56
 SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72
 SHA1 (patch-ak) = 838b72fdc4e2ce8a62a56f8faf98c1f334abad14
-SHA1 (patch-al) = 2603dee45ca6e91df1a321015428677875a29b03
+SHA1 (patch-al) = 07d9c01fd5b6478f87dc563e2a2ae53ffbbc7187
 SHA1 (patch-am) = 22a3c968089a837bc99e1d0f21bc3b33689b8311
 SHA1 (patch-ap) = 9da5c76e34f1f61da411ab4e0c884c23cc320bb9
 SHA1 (patch-aq) = a356e520eeb95a8c3bb1485cb460710703882e39
 SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b
 SHA1 (patch-as) = 9f434c84f57e985d4734872e2dbce1079c87fcfa
-SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152
+SHA1 (patch-ba) = 872ca1579a5a3e4003b17d3406abe9c5d3a935cf
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
 SHA1 (patch-bd) = 15c803bf85ad36ad08bcaaf7dbc371a6473ae5f2
 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index a7ba2e2fe5d..7b5462c9d75 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,16 +1,16 @@
-$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 @@
+$NetBSD: patch-ab,v 1.28 2011/10/29 05:47:54 kefren Exp $
+--- configure.orig	2011-09-15 20:12:44.000000000 +0300
++++ configure	2011-10-28 17:51:31.000000000 +0300
+@@ -3834,7 +3834,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1
  		host_win32=yes
  		if test "x$cross_compiling" = "xno"; then
  			target_win32=yes
 -			if test "x$host" == "x$build"; then
 +			if test "x$host" = "x$build"; then
  
- cat >>confdefs.h <<\_ACEOF
- #define TARGET_WIN32 1
-@@ -3171,12 +3171,15 @@
+ $as_echo "#define TARGET_WIN32 1" >>confdefs.h
+ 
+@@ -3876,12 +3876,15 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
  		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
  		libmono_ldflags="-pthread"
  		need_link_unlink=yes
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.27 2011/04/25 14:01:40 kefren Exp $
  		host_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
  			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-@@ -3192,7 +3195,8 @@
+@@ -3897,7 +3900,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
  			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
  			libmono_ldflags="$PTHREAD_LIBS"
  		fi
@@ -37,18 +37,8 @@ $NetBSD: patch-ab,v 1.27 2011/04/25 14:01:40 kefren Exp $
 +		libmono_cflags="$libmono_cflags -D_REENTRANT"
  		need_link_unlink=yes
  
- cat >>confdefs.h <<\_ACEOF
-@@ -28838,6 +28842,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"
-@@ -39018,7 +39025,7 @@
+ $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h
+@@ -22821,7 +22825,7 @@ LIBC="libc.so.6"
  INTL="libc.so.6"
  SQLITE="libsqlite.so.0"
  SQLITE3="libsqlite3.so.0"
@@ -57,7 +47,7 @@ $NetBSD: patch-ab,v 1.27 2011/04/25 14:01:40 kefren Exp $
  
  sizeof_register="SIZEOF_VOID_P"
  
-@@ -39646,10 +39653,12 @@
+@@ -23379,10 +23383,12 @@ case "$host" in
  	X11="libX11.dylib"
  	;;
       *-*-*netbsd*)
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index 4c9d4881488..e9360bb955c 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,57 +1,12 @@
-$NetBSD: patch-ad,v 1.22 2011/10/15 02:04:00 marino Exp $
---- mono/utils/mono-sigcontext.h.orig	2010-11-12 10:24:41.000000000 +0000
-+++ mono/utils/mono-sigcontext.h
-@@ -8,14 +8,14 @@
- 
- #if defined(__i386__)
- 
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
- #include <ucontext.h>
- #endif
- #if defined(__APPLE__)
- #include <AvailabilityMacros.h>
- #endif
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- 	#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eax)
- 	#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ebx)
- 	#define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ecx)
-@@ -99,8 +99,34 @@
- 	#define UCONTEXT_REG_R13(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r13)
- 	#define UCONTEXT_REG_R14(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r14)
- 	#define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r15)
+$NetBSD: patch-ad,v 1.23 2011/10/29 05:47:54 kefren Exp $
+--- mono/utils/mono-sigcontext.h.orig	2011-09-14 06:32:19.000000000 +0300
++++ mono/utils/mono-sigcontext.h	2011-10-28 17:28:46.000000000 +0300
+@@ -211,7 +211,7 @@
+ 	#define UCONTEXT_REG_FPRn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.__fpregs.__fpu_regs [(n)])
+ 	#define UCONTEXT_REG_NIP(ctx)     _UC_MACHINE_PC(ctx)
+ 	#define UCONTEXT_REG_LNK(ctx)     (((os_ucontext*)(ctx))->uc_mcontext.__gregs [_REG_LR])
 -#elif defined(__FreeBSD__)
--#define UCONTEXT_GREGS(ctx)	((guint64*)&(((ucontext_t*)(ctx))->uc_mcontext))
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+	#define UCONTEXT_REG_RAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rax)
-+	#define UCONTEXT_REG_RBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rbx)
-+	#define UCONTEXT_REG_RCX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rcx)
-+	#define UCONTEXT_REG_RDX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rdx)
-+	#define UCONTEXT_REG_RBP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rbp)
-+	#define UCONTEXT_REG_RSP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rsp)
-+	#define UCONTEXT_REG_RSI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rsi)
-+	#define UCONTEXT_REG_RDI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rdi)
-+	#define UCONTEXT_REG_RIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rip)
-+	#define UCONTEXT_REG_R12(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r12)
-+	#define UCONTEXT_REG_R13(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r13)
-+	#define UCONTEXT_REG_R14(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r14)
-+	#define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r15)
-+#elif defined(__NetBSD__)
-+	#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) (((ucontext_t*)(ctx))->sc_rax)
+ 	typedef ucontext_t os_ucontext;
+ 
+ 	#define UCONTEXT_REG_Rn(ctx, n)   ((ctx)->uc_mcontext.mc_gpr [(n)])
diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae
index c6493b1f363..4babb578fb9 100644
--- a/lang/mono/patches/patch-ae
+++ b/lang/mono/patches/patch-ae
@@ -1,42 +1,21 @@
-$NetBSD: patch-ae,v 1.10 2009/04/28 10:31:58 hasso Exp $
-
---- libgc/configure.orig	2009-01-09 07:56:17 -0800
-+++ libgc/configure	2009-03-03 15:25:59 -0800
-@@ -4604,7 +4604,27 @@
- _ACEOF
- 
- 	;;
--     *-*-aix*)
-+	 *-*-netbsd*)
-+	cat >>confdefs.h <<\_ACEOF
-+#define GC_NETBSD_THREADS 1
-+_ACEOF
-+
-+	cat >>confdefs.h <<\_ACEOF
-+#define _REENTRANT 1
-+_ACEOF
-+
-+	cat >>confdefs.h <<\_ACEOF
-+#define THREAD_LOCAL_ALLOC 1
-+_ACEOF
-+
-+		if test "${enable_parallel_mark}" = yes; then
-+			cat >>confdefs.h <<\_ACEOF
-+#define PARALLEL_MARK 1
-+_ACEOF
-+
-+		fi
-+	;;
-+	*-*-aix*)
- 	cat >>confdefs.h <<\_ACEOF
- #define GC_AIX_THREADS 1
- _ACEOF
-@@ -4637,7 +4657,7 @@
+$NetBSD: patch-ae,v 1.11 2011/10/29 05:47:54 kefren Exp $
+--- libgc/configure.orig	2011-09-15 20:12:48.000000000 +0300
++++ libgc/configure	2011-10-28 18:07:42.000000000 +0300
+@@ -4921,7 +4921,7 @@ $as_echo "$as_me: WARNING: \"Only HP/UX 
  
  	THREADDLLIBS="-lpthread -lrt"
  	;;
 -      *-*-freebsd*)
 +      *-*-freebsd* | *-*-*dragonfly*)
- 	cat >>confdefs.h <<\_ACEOF
- #define GC_FREEBSD_THREADS 1
- _ACEOF
+ 	$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
+ 
+ 	if test "x$PTHREAD_CFLAGS" != "x"; then
+@@ -4960,6 +4960,8 @@ $as_echo "$as_me: WARNING: \"Only HP/UX 
+      *-*-netbsd*)
+ 	$as_echo "#define GC_NETBSD_THREADS 1" >>confdefs.h
+ 
++	$as_echo "#define _REENTRANT 1" >>confdefs.h
++
+ 	if test "${enable_parallel_mark}" = yes; then
+ 	  $as_echo "#define PARALLEL_MARK 1" >>confdefs.h
+ 
diff --git a/lang/mono/patches/patch-al b/lang/mono/patches/patch-al
index 6afadab98b4..a6b1f66e08b 100644
--- a/lang/mono/patches/patch-al
+++ b/lang/mono/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.4 2010/12/01 16:49:13 kefren Exp $
---- data/config.in.orig	2010-11-12 12:24:41.000000000 +0200
-+++ data/config.in	2010-12-01 18:00:19.000000000 +0200
-@@ -17,7 +17,7 @@
- 	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
+$NetBSD: patch-al,v 1.5 2011/10/29 05:47:54 kefren Exp $
+--- data/config.in.orig	2011-08-26 04:06:38.000000000 +0300
++++ data/config.in	2011-10-28 15:54:35.000000000 +0300
+@@ -18,7 +18,7 @@
  	<dllmap dll="libX11" target="@X11@" os="!windows" />
  	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
+ 	<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
 -	<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
 +	<dllmap dll="libcups" target="libcups.so" os="!windows"/>
  	<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba
index adb3abfa655..0a2fea4ff6e 100644
--- a/lang/mono/patches/patch-ba
+++ b/lang/mono/patches/patch-ba
@@ -1,12 +1,12 @@
-$NetBSD: patch-ba,v 1.7 2008/02/13 14:16:43 kefren Exp $
---- mono/cil/Makefile.in.orig	2008-02-05 14:11:27.000000000 +0200
-+++ mono/cil/Makefile.in	2008-02-05 14:11:40.000000000 +0200
-@@ -427,7 +427,7 @@
+$NetBSD: patch-ba,v 1.8 2011/10/29 05:47:54 kefren Exp $
+--- mono/cil/Makefile.in.orig	2011-09-15 20:12:39.000000000 +0300
++++ mono/cil/Makefile.in	2011-10-28 15:43:18.000000000 +0300
+@@ -506,7 +506,7 @@ uninstall-am: uninstall-defDATA uninstal
  	uninstall-xmlDATA
  
  opcode.def: make-opcodes-def.pl cil-opcodes.xml
 -	perl $(srcdir)/make-opcodes-def.pl $(srcdir)/cil-opcodes.xml $@.tmp
 +	$(PERL) $(srcdir)/make-opcodes-def.pl $(srcdir)/cil-opcodes.xml $@.tmp
  	mv $@.tmp $@
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.