Update to 3.10.0.

5 files changed, 45 insertions, 17 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 8bb5eb81927e..29a3d749c4f9 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mono
-PORTVERSION=	3.8.0
+PORTVERSION=	3.10.0
 CATEGORIES=	lang
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
@@ -36,10 +36,6 @@ MAKE_ENV=	MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/bin/sh|g' \
-		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj \
-		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj2k5 \
-		${WRKSRC}/mcs/class/Mono.WebBrowser/build-csproj2k5
 	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|g' \
 		${WRKSRC}/scripts/mono-find-provides.in \
 		${WRKSRC}/scripts/mono-find-requires.in \
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 52b430e54d75..f6a281fd67a0 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mono-3.8.0.tar.bz2) = 71b80d555f334a05a8db386e1c41e1a2f61a845c57726205f846e563a5ee2a4b
-SIZE (mono-3.8.0.tar.bz2) = 73495543
+SHA256 (mono-3.10.0.tar.bz2) = fd74d1a6810d2d9b4733b4affbda67958e61520aade531c73103568dc18ab0b4
+SIZE (mono-3.10.0.tar.bz2) = 73485820
diff --git a/lang/mono/files/patch-mono_io-layer_processes.h b/lang/mono/files/patch-mono_io-layer_processes.h
new file mode 100644
index 000000000000..960ccdb98c14
--- /dev/null
+++ b/lang/mono/files/patch-mono_io-layer_processes.h
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+pid_t is typedef'd in sys/types.h
+Merged in #1341 upstream.
+
+--- mono/io-layer/processes.h.orig
++++ mono/io-layer/processes.h
+@@ -10,6 +10,8 @@
+ #ifndef _WAPI_PROCESSES_H_
+ #define _WAPI_PROCESSES_H_
+ 
++#include <sys/types.h>
++
+ #include <glib.h>
+ 
+ #include <mono/io-layer/handles.h>
diff --git a/lang/mono/files/patch-mono_unit-tests_Makefile.in b/lang/mono/files/patch-mono_unit-tests_Makefile.in
index b4921feed6d1..8a7ca0db5b89 100644
--- a/lang/mono/files/patch-mono_unit-tests_Makefile.in
+++ b/lang/mono/files/patch-mono_unit-tests_Makefile.in
@@ -11,16 +11,16 @@ https://github.com/mono/mono/commit/120d194d10ad351dd95450749cc4a62331331d8a
 +++ mono/unit-tests/Makefile.in
 @@ -81,12 +81,10 @@
  target_triplet = @target@
- @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@noinst_PROGRAMS = test-sgen-qsort$(EXEEXT) \
- @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-gc-memfuncs$(EXEEXT) \
--@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT) \
--@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-conc-hashtable$(EXEEXT)
-+@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT)
- @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@TESTS = test-sgen-qsort$(EXEEXT) \
- @CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-gc-memfuncs$(EXEEXT) \
--@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT) \
--@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-conc-hashtable$(EXEEXT)
-+@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_LINUX_FALSE@@SUPPORT_BOEHM_TRUE@	test-mono-linked-list-set$(EXEEXT)
+ @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 \
diff --git a/lang/mono/files/patch-mono_utils_mono-threads-freebsd.c b/lang/mono/files/patch-mono_utils_mono-threads-freebsd.c
new file mode 100644
index 000000000000..34525464541e
--- /dev/null
+++ b/lang/mono/files/patch-mono_utils_mono-threads-freebsd.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+Merged in #1340 upstream.
+
+--- mono/utils/mono-threads-freebsd.c.orig
++++ mono/utils/mono-threads-freebsd.c
+@@ -2,6 +2,7 @@
+ 
+ #if defined(__FreeBSD__)
+ 
++#include <mono/utils/mono-threads.h>
+ #include <pthread.h>
+ #include <pthread_np.h>
+