- Update lang/mono to 2.4.2.3.

- Remove a patch that makes xsp fail.
- Cleanup.

PR:		ports/137223
Submitted by:	Romain Tartiere

6 files changed, 40 insertions, 83 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 6f4fc665917f..9d5b7cb988e3 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mono
-PORTVERSION=	2.4.2.2
+PORTVERSION=	2.4.2.3
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
@@ -59,7 +59,6 @@ MAN5=		mdoc.5 mono-config.5
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-USE_FAM=	yes
 MAKE_ARGS+=	MONO_GENERIC_SHARING=none #https://bugzilla.novell.com/show_bug.cgi?id=434457
 .endif
 
@@ -74,16 +73,7 @@ PLIST_SUB+=	MOON="@comment "
 pre-everything::
 	@${CAT} ${PKGMESSAGE}
 
-.if exists(${LOCALBASE}/lib/libfam.so)
-USE_FAM=	yes
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure ${WRKSRC}/libgc/configure
-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/mcs/tools/mkbundle/mkbundle.cs
 	@${REINPLACE_CMD} -e 's|libgamin-1.so.0|libgamin-1.so.1|g' \
 		${WRKSRC}/mcs/class/System/System.IO/FAMWatcher.cs
 	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/bin/sh|g' \
@@ -94,23 +84,6 @@ post-patch:
 		${WRKSRC}/mcs/class/Mono.Cairo/Samples/png/compile.sh \
 		${WRKSRC}/mcs/class/Mono.Cairo/Samples/win32/compile.sh \
 		${WRKSRC}/mcs/class/Mono.Cairo/Samples/x11/compile.sh
-	@${REINPLACE_CMD} -e 's|^#!/bin/perl|#!/usr/bin/env perl|g' \
-		${WRKSRC}/mcs/errors/do-tests.pl \
-		${WRKSRC}/mcs/tools/scan-tests.pl \
-		${WRKSRC}/msvc/create-windef.pl \
-		${WRKSRC}/mono/benchmark/test-driver \
-		${WRKSRC}/mono/cil/make-opcodes-def.pl \
-		${WRKSRC}/mono/metadata/make-bundle.pl \
-		${WRKSRC}/mono/mini/genmdesc.pl \
-		${WRKSRC}/mono/tests/stress-runner.pl
-
-.if ${OSVERSION} >= 700000 && ${OSVERSION} < 800000
-	@${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \
-		${WRKSRC}/configure ${WRKSRC}/libgc/configure
-.elif ${OSVERSION} >= 800000
-	@${REINPLACE_CMD} -e 's|freebsd6|freebsd8|g' \
-		${WRKSRC}/configure ${WRKSRC}/libgc/configure
-.endif
 
 tests: build
 	@${ECHO_MSG} "===> Running mono regression tests"
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index e51bf9d28e80..f34349a67189 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,3 @@
-MD5 (mono-2.4.2.2.tar.bz2) = 54aac9b914c5a4dc81c2bfd058df1c93
-SHA256 (mono-2.4.2.2.tar.bz2) = e3b965c56a669c3012856dcc17b7400d28505dd4bb8a3c6eb3e653bb41b5e6ba
-SIZE (mono-2.4.2.2.tar.bz2) = 24813167
+MD5 (mono-2.4.2.3.tar.bz2) = 696f25afc8453cd0d1c78de6e905dcf2
+SHA256 (mono-2.4.2.3.tar.bz2) = 1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
+SIZE (mono-2.4.2.3.tar.bz2) = 24815426
diff --git a/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs b/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs
deleted file mode 100644
index 0406d04f70f9..000000000000
--- a/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs
+++ /dev/null
@@ -1,17 +0,0 @@
---- mcs/class/System.Web/System.Web.Compilation/AspParser.cs.orig	Fri Dec 29 22:13:43 2006
-+++ mcs/class/System.Web/System.Web.Compilation/AspParser.cs	Fri Dec 29 22:14:41 2006
-@@ -454,8 +454,12 @@
- 			tokenizer.Verbatim = false;
- 			id = inside_tags;
- 			attributes = null;
--			tagtype = (databinding ? TagType.DataBinding :
--				  (varname ? TagType.CodeRenderExpression : TagType.CodeRender));
-+			if (databinding)
-+				tagtype = TagType.DataBinding;
-+			else if (varname)
-+				tagtype = TagType.CodeRenderExpression;
-+			else
-+				tagtype = TagType.CodeRender;
- 		}
- 
- 		public event ParseErrorHandler Error;
diff --git a/lang/mono/files/patch-mono_io-layer_processes.c b/lang/mono/files/patch-mono_io-layer_processes.c
new file mode 100644
index 000000000000..c4be002359d9
--- /dev/null
+++ b/lang/mono/files/patch-mono_io-layer_processes.c
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- mono/io-layer/processes.c.orig
++++ mono/io-layer/processes.c
+@@ -1950,7 +1950,7 @@
+ 	{
+ 		mods = load_modules ();
+ #else
+-	filename = g_strdup_printf ("/proc/%d/maps", pid);
++	filename = g_strdup_printf ("/proc/%d/map", pid);
+ 	if ((fp = fopen (filename, "r")) == NULL) {
+ 		/* No /proc/<pid>/maps so just return the main module
+ 		 * shortcut for now
+@@ -2111,7 +2111,7 @@
+ 	{
+ 		mods = load_modules ();
+ #else
+-	filename = g_strdup_printf ("/proc/%d/maps", pid);
++	filename = g_strdup_printf ("/proc/%d/map", pid);
+ 	if ((fp = fopen (filename, "r")) == NULL) {
+ 		if (errno == EACCES && module == NULL && base == TRUE) {
+ 			procname_ext = get_process_name_from_proc (pid);
+@@ -2266,7 +2266,7 @@
+ 		mods = load_modules ();
+ #else
+ 	/* Look up the address in /proc/<pid>/maps */
+-	filename = g_strdup_printf ("/proc/%d/maps", pid);
++	filename = g_strdup_printf ("/proc/%d/map", pid);
+ 	if ((fp = fopen (filename, "r")) == NULL) {
+ 		/* No /proc/<pid>/maps, so just return failure
+ 		 * for now
diff --git a/lang/mono/files/patch-mono_metadata_filewatcher.c b/lang/mono/files/patch-mono_metadata_filewatcher.c
deleted file mode 100644
index a4c4218c61be..000000000000
--- a/lang/mono/files/patch-mono_metadata_filewatcher.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- mono/metadata/filewatcher.c.orig	Fri Dec 29 19:52:48 2006
-+++ mono/metadata/filewatcher.c	Fri Dec 29 20:25:18 2006
-@@ -44,9 +44,6 @@
- gint
- ves_icall_System_IO_FSW_SupportsFSW (void)
- {
--#if HAVE_KQUEUE
--	return 3;
--#else
- 	MonoDl *fam_module;
- 	gchar *filename;
- 	int lib_used = 4; /* gamin */
-@@ -76,14 +73,20 @@
- 	}
- 
- 	if (fam_module == NULL)
--		return 0;
-+		goto nofam;
- 
- 	err = mono_dl_symbol (fam_module, "FAMNextEvent", (gpointer *) &FAMNextEvent);
- 	g_free (err);
- 	if (FAMNextEvent == NULL)
--		return 0;
-+		goto nofam;
- 
- 	return lib_used;
-+
-+ nofam:
-+#if HAVE_KQUEUE
-+	return 3;
-+#else
-+	return 0;
- #endif
- }
- 
diff --git a/lang/mono/pkg-message b/lang/mono/pkg-message
index 736693317c11..5be4c4caface 100644
--- a/lang/mono/pkg-message
+++ b/lang/mono/pkg-message
@@ -26,4 +26,8 @@ following first:
   You can rely on the security.jail.sysvipc_allowed  sysctl to check
   this status.  The following enables this feature on the host system:
     # echo "jail_sysvipc_allow=\"YES\"" >> /etc/rc.conf
+
+* Some process information are acceded through /proc (e.g. when using
+  NUnit) and procfs(5) has to be mounted for these features to work:
+    # echo "proc            /proc   procfs  rw 0 0" >> /etc/fstab
 ************************************************************************