Index: head/lang/mono/files/patch-configure
===================================================================
--- head/lang/mono/files/patch-configure	(revision 397062)
+++ head/lang/mono/files/patch-configure	(revision 397063)
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
 --- configure.orig
 +++ configure
 @@ -25136,7 +25136,7 @@
  	INTL="libintl.so.0"
  	;;
      *-*-*freebsd*)
 -    	LIBC="libc.so"
 +    	LIBC="libc.so.7"
  	INTL="libintl.so"
  	SQLITE="libsqlite.so"
  	SQLITE3="libsqlite3.so"
Index: head/lang/mono/files/patch-eglib_src_gfile-posix.c
===================================================================
--- head/lang/mono/files/patch-eglib_src_gfile-posix.c	(revision 397062)
+++ head/lang/mono/files/patch-eglib_src_gfile-posix.c	(revision 397063)
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
 --- eglib/src/gfile-posix.c.orig
 +++ eglib/src/gfile-posix.c
 @@ -170,7 +170,7 @@
  	do {
  		buffer = g_realloc (buffer, s);
  		r = getcwd (buffer, s);
 -		fail = (r == NULL && errno == ERANGE);
 +		fail = (r == NULL && (errno == ERANGE || errno == 0));
  		if (fail) {
  			s <<= 1;
  		}
Index: head/lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets
===================================================================
--- head/lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets	(revision 397062)
+++ head/lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets	(revision 397063)
@@ -1,10 +1,7 @@
-
-$FreeBSD$
-
 --- /dev/null
 +++ mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets
 @@ -0,0 +1,4 @@
 +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +	<Import Project="..\Microsoft.Portable.Core.props" />
 +	<Import Project="..\Microsoft.Portable.Core.targets" />
 +</Project>
Index: head/lang/mono/files/patch-mono_metadata_socket-io.c
===================================================================
--- head/lang/mono/files/patch-mono_metadata_socket-io.c	(revision 397062)
+++ head/lang/mono/files/patch-mono_metadata_socket-io.c	(revision 397063)
@@ -1,16 +1,13 @@
-
-$FreeBSD$
-
 Fix build on FreeBSD 8
 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198404#c6
 
 --- mono/metadata/socket-io.c.orig
 +++ mono/metadata/socket-io.c
 @@ -23,6 +23,7 @@
  #ifdef HOST_WIN32
  #include <ws2tcpip.h>
  #else
 +#include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <netinet/in.h>
Index: head/lang/mono/files/patch-mono_mini_exceptions-x86.c
===================================================================
--- head/lang/mono/files/patch-mono_mini_exceptions-x86.c	(revision 397062)
+++ head/lang/mono/files/patch-mono_mini_exceptions-x86.c	(revision 397063)
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
 --- mono/mini/exceptions-x86.c.orig
 +++ mono/mini/exceptions-x86.c
 @@ -12,6 +12,7 @@
  #include <glib.h>
  #include <signal.h>
  #include <string.h>
 +#include <sys/ucontext.h>
  
  #include <mono/metadata/abi-details.h>
  #include <mono/arch/x86/x86-codegen.h>
Index: head/lang/mono/files/patch-mono_tests_Makefile.in
===================================================================
--- head/lang/mono/files/patch-mono_tests_Makefile.in	(revision 397062)
+++ head/lang/mono/files/patch-mono_tests_Makefile.in	(revision 397063)
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
 --- mono/tests/Makefile.in.orig
 +++ mono/tests/Makefile.in
 @@ -1509,7 +1509,7 @@
  @HOST_WIN32_TRUE@@NACL_CODEGEN_FALSE@test-messages:
  @HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@test-messages: w32message.exe
  @HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@	> test_messages.zero
 -@HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@	$(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout
 +@HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@	$(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe > w32message.allout 2>&1 && cmp test_messages.zero w32message.allout
  
  @AMD64_TRUE@test-sgen : sgen-tests
  @AMD64_FALSE@@HOST_WIN32_TRUE@@X86_TRUE@test-sgen :
Index: head/lang/mono/files/patch-mono_unit-tests_Makefile.in
===================================================================
--- head/lang/mono/files/patch-mono_unit-tests_Makefile.in	(revision 397062)
+++ head/lang/mono/files/patch-mono_unit-tests_Makefile.in	(revision 397063)
@@ -1,26 +1,23 @@
-
-$FreeBSD$
-
 See comments on:
 https://github.com/mono/mono/commit/056cc3be24f933bc3638be4909ad1b7f1cd6e6d4
-	(What's wrong with the test)
+	(What is wrong with the test)
 
 https://github.com/mono/mono/commit/120d194d10ad351dd95450749cc4a62331331d8a
-	(Only one program cause trouble)
+	(Only one program causes trouble)
 --- mono/unit-tests/Makefile.in.orig
 +++ mono/unit-tests/Makefile.in
 @@ -81,12 +81,10 @@
  target_triplet = @target@
  @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@noinst_PROGRAMS = test-sgen-qsort$(EXEEXT) \
  @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-gc-memfuncs$(EXEEXT) \
 -@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT) \
 -@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-conc-hashtable$(EXEEXT)
 +@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT)
  @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@TESTS = test-sgen-qsort$(EXEEXT) \
  @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-gc-memfuncs$(EXEEXT) \
 -@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT) \
 -@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-conc-hashtable$(EXEEXT)
 +@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT)
  subdir = mono/unit-tests
  DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
  	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp \