update to 2.4.3.1

this is a bugfix release on the 2.4 branch

6 files changed, 63 insertions, 53 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index be2ca109486..fb2668e6f0a 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2009/11/25 10:13:06 kefren Exp $
+# $NetBSD: Makefile,v 1.96 2010/01/15 19:41:23 drochner Exp $
 
 DISTNAME=	mono-${MONO_VERSION}
 CATEGORIES=	lang
-PKGREVISION=	2
 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.4.2.3
+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
diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common
index 5202befcebf..cdfc4d35d66 100644
--- a/lang/mono/PLIST.common
+++ b/lang/mono/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2009/11/25 10:13:06 kefren Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2010/01/15 19:41:23 drochner Exp $
 bin/al
 bin/al1
 bin/al2
@@ -412,6 +412,8 @@ lib/mono/2.0/ilasm.exe
 lib/mono/2.0/ilasm.exe.mdb
 lib/mono/2.0/installutil.exe
 lib/mono/2.0/installutil.exe.mdb
+lib/mono/2.0/lc.exe
+lib/mono/2.0/lc.exe.mdb
 lib/mono/2.0/mconfig.exe
 lib/mono/2.0/mconfig.exe.mdb
 lib/mono/2.0/mdoc.exe
@@ -798,6 +800,7 @@ 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/monodoc/monodoc.xml
 lib/monodoc/sources/Mono.source
@@ -836,6 +839,7 @@ 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
 lib/pkgconfig/wcf.pc
 man/man1/al.1
 man/man1/cert2spc.1
@@ -850,6 +854,7 @@ man/man1/genxs.1
 man/man1/httpcfg.1
 man/man1/ilasm.1
 man/man1/jay.1
+man/man1/lc.1
 man/man1/macpack.1
 man/man1/makecert.1
 man/man1/mconfig.1
@@ -888,6 +893,7 @@ man/man1/sn.1
 man/man1/soapsuds.1
 man/man1/sqlsharp.1
 man/man1/wsdl.1
+man/man1/xbuild.1
 man/man1/xsd.1
 man/man5/mdoc.5
 man/man5/mono-config.5
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 32fec0fecea..bfb16339ef6 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.58 2010/01/13 22:14:22 joerg Exp $
+$NetBSD: distinfo,v 1.59 2010/01/15 19:41:23 drochner Exp $
 
-SHA1 (mono-2.4.2.3.tar.bz2) = c0e7c2992ef6c1ea3d1fd48ef581aa1ff6ec29cb
-RMD160 (mono-2.4.2.3.tar.bz2) = f52bf6e281b076b859a567c17917577710522684
-Size (mono-2.4.2.3.tar.bz2) = 24815426 bytes
-SHA1 (patch-ab) = 3c0b2f81692394102376eedc4bed516b8bff70cd
+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 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
 SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f
 SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca
 SHA1 (patch-ah) = 1642287318add6d255426aeac5eec47720621ca0
-SHA1 (patch-ai) = dd3f3f3132f5760f760f3350b8e5a7e12c8b9eed
+SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56
 SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
 SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc
-SHA1 (patch-aq) = 2279dc6b46eded6f5a67b04e79779c1c7117fbc5
+SHA1 (patch-aq) = f4a009d91c44fb1f05eb7c9bf6282a27e4938aeb
 SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b
 SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index af0aef8ffe1..9b6eb9b6c54 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,14 +1,18 @@
-$NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $
+$NetBSD: patch-ab,v 1.21 2010/01/15 19:41:23 drochner Exp $
 
---- configure.orig	2009-03-13 15:51:11.000000000 +0100
+--- configure.orig	2009-12-28 19:58:39.000000000 +0000
 +++ configure
-@@ -2939,11 +2939,11 @@ _ACEOF
+@@ -3058,11 +3058,15 @@ _ACEOF
  		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
  		libmono_ldflags="-pthread"
  		need_link_unlink=yes
 -		libdl="-ldl"
 +		libdl="-ldl /libexec/ld.elf_so"
  		libgc_threads=pthreads
++		cat >>confdefs.h <<\_ACEOF
++#define PTHREAD_POINTER_ID 1
++_ACEOF
++
  		with_sigaltstack=no
  		;;
 -	*-*-*freebsd*)
@@ -16,7 +20,7 @@ $NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $
  		platform_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
  			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-@@ -2959,7 +2959,8 @@ _ACEOF
+@@ -3078,7 +3082,8 @@ _ACEOF
  			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
  			libmono_ldflags="$PTHREAD_LIBS"
  		fi
@@ -26,36 +30,16 @@ $NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $
  		need_link_unlink=yes
  
  cat >>confdefs.h <<\_ACEOF
-@@ -32274,6 +32275,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"
-@@ -32314,6 +32318,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
-@@ -39626,7 +39633,7 @@ LIBC="libc.so.6"
+@@ -31859,7 +31864,7 @@ LIBC="libc.so.6"
  INTL="libc.so.6"
  SQLITE="libsqlite.so.0"
  SQLITE3="libsqlite3.so.0"
 -X11="libX11.so"
-+X11="@X11BASE@/lib/libX11.so"
++X11="/usr/pkg/lib/libX11.so"
  
  sizeof_register="SIZEOF_VOID_P"
  
-@@ -40046,10 +40053,10 @@ case "$host" in
+@@ -32309,10 +32314,10 @@ case "$host" in
  	X11="libX11.dylib"
  	;;
       *-*-*netbsd*)
@@ -69,3 +53,23 @@ $NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $
      	LIBC="libc.so"
  	INTL="libintl.so"
  	;;
+@@ -32613,6 +32618,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"
+@@ -32654,6 +32662,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-ai b/lang/mono/patches/patch-ai
index 4db01a7b7de..f7c8a194c86 100644
--- a/lang/mono/patches/patch-ai
+++ b/lang/mono/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.7 2009/10/11 07:49:49 kefren Exp $
+$NetBSD: patch-ai,v 1.8 2010/01/15 19:41:23 drochner Exp $
 
---- mono/metadata/object.c.orig	2009-07-15 21:49:47.000000000 +0300
-+++ mono/metadata/object.c	2009-10-09 15:53:07.000000000 +0300
-@@ -3337,6 +3337,135 @@
+--- mono/metadata/object.c.orig	2009-10-26 20:44:10.000000000 +0000
++++ mono/metadata/object.c
+@@ -3353,6 +3353,135 @@ mono_install_runtime_invoke (MonoInvokeF
  	default_mono_runtime_invoke = func ? func: dummy_mono_runtime_invoke;
  }
  
@@ -138,7 +138,7 @@ $NetBSD: patch-ai,v 1.7 2009/10/11 07:49:49 kefren Exp $
  
  /**
   * mono_runtime_invoke_array:
-@@ -3387,6 +3516,8 @@
+@@ -3405,6 +3534,8 @@ mono_runtime_invoke_array (MonoMethod *m
  		pa = alloca (sizeof (gpointer) * mono_array_length (params));
  		for (i = 0; i < mono_array_length (params); i++) {
  			MonoType *t = sig->params [i];
@@ -147,9 +147,9 @@ $NetBSD: patch-ai,v 1.7 2009/10/11 07:49:49 kefren Exp $
  
  		again:
  			switch (t->type) {
-@@ -3409,9 +3540,16 @@
- 					/* The runtime invoke wrapper needs the original boxed vtype, it does handle byref values as well. */
- 					pa [i] = mono_array_get (params, MonoObject*, i);
+@@ -3429,9 +3560,16 @@ mono_runtime_invoke_array (MonoMethod *m
+ 					if (t->byref)
+ 						has_byref_nullables = TRUE;
  				} else {
 +					pao = mono_array_get (params, MonoObject*, i);
  					/* MS seems to create the objects if a null is passed in */
@@ -166,7 +166,7 @@ $NetBSD: patch-ai,v 1.7 2009/10/11 07:49:49 kefren Exp $
  
  					if (t->byref) {
  						/*
-@@ -3421,12 +3559,13 @@
+@@ -3441,12 +3579,13 @@ mono_runtime_invoke_array (MonoMethod *m
  						 * object, pass that to the callee, and replace the original
  						 * boxed object in the arg array with the copy.
  						 */
@@ -182,7 +182,7 @@ $NetBSD: patch-ai,v 1.7 2009/10/11 07:49:49 kefren Exp $
  				}
  				break;
  			case MONO_TYPE_STRING:
-@@ -3434,11 +3573,19 @@
+@@ -3454,11 +3593,19 @@ mono_runtime_invoke_array (MonoMethod *m
  			case MONO_TYPE_CLASS:
  			case MONO_TYPE_ARRAY:
  			case MONO_TYPE_SZARRAY:
diff --git a/lang/mono/patches/patch-aq b/lang/mono/patches/patch-aq
index 6232a0f5314..ab4e385e64e 100644
--- a/lang/mono/patches/patch-aq
+++ b/lang/mono/patches/patch-aq
@@ -1,8 +1,9 @@
-$NetBSD: patch-aq,v 1.2 2008/02/13 14:16:43 kefren Exp $
---- data/net_1_1/Makefile.in.orig	2008-02-05 14:07:38.000000000 +0200
-+++ data/net_1_1/Makefile.in	2008-02-05 14:07:52.000000000 +0200
-@@ -214,7 +214,7 @@
- target_vendor = @target_vendor@
+$NetBSD: patch-aq,v 1.3 2010/01/15 19:41:23 drochner Exp $
+
+--- data/net_1_1/Makefile.in.orig	2009-12-01 02:28:54.000000000 +0000
++++ data/net_1_1/Makefile.in
+@@ -239,7 +239,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -monodir = $(sysconfdir)/mono/1.0