SunOS updates to really use c99 and update mono-sigcontext.h to use

HAVE_UCONTEXT_H a bit more logically and motivated by illumos updates
involving regset.h.

Builds now reliably even if /lib/cpp is not present.

4 files changed, 51 insertions, 24 deletions

diff --git a/lang/mono2/Makefile b/lang/mono2/Makefile
index ff092d8833b..62610c03752 100644
--- a/lang/mono2/Makefile
+++ b/lang/mono2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 06:38:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/08/15 10:24:31 richard Exp $
 
 DISTNAME=	mono-2.10.9
 PKGREVISION=	17
@@ -147,8 +147,13 @@ SUBST_SED.fix-libx11=		-e 's,@X11BASE@,${X11BASE},g'
 
 .include "../../mk/bsd.prefs.mk"
 
+OPSYSVARS+=	USE_LANGUAGES
+
 CPPFLAGS.NetBSD+=	-D_KMEMUSER
-CPPFLAGS.SunOS+=	-D__C99FEATURES__
+USE_LANGUAGES.SunOS+=	c99
+
+BUILDLINK_TRANSFORM.SunOS+=	opt:-D_XOPEN_SOURCE=500:-D_POSIX_C_SOURCE=200112L
+BUILDLINK_TRANSFORM.SunOS+=	rm:-D_XOPEN_SOURCE_EXTENDED=1
 
 .if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
 ULIMIT_CMD_datasize=	ulimit -d 262144
diff --git a/lang/mono2/distinfo b/lang/mono2/distinfo
index eb61d7ed308..14496d23b08 100644
--- a/lang/mono2/distinfo
+++ b/lang/mono2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2016/07/22 12:21:05 jperkin Exp $
+$NetBSD: distinfo,v 1.10 2016/08/15 10:24:31 richard Exp $
 
 SHA1 (mono-2.10.9.tar.bz2) = 1a6e8c5a0c3d88d87982259aa04402e028a283de
 RMD160 (mono-2.10.9.tar.bz2) = ac9784c413eb2cdb490750a86a96cce5c11ad5bd
@@ -8,7 +8,7 @@ SHA1 (patch-CVE-2012-3382) = f2c35a69c6c4db2ca3576fdc10ce5465f081b686
 SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb
 SHA1 (patch-ab) = 10eb6f4453c626f0bedce4b0ce6519ba6aea4d5f
 SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2
-SHA1 (patch-ad) = 2dc253928695966b5310457b0cec52cd919a4851
+SHA1 (patch-ad) = d7763ce6021cec2ca1b2c6e43b9f6a8806034a23
 SHA1 (patch-ae) = 2b032ad658e8aa23c4e3825474d2d284b00557cd
 SHA1 (patch-af) = c109a9a742cb70d83cf99df0ad6c907c68809d52
 SHA1 (patch-ah) = 5f90aa60504b9508d21e05b390626788d71d47b4
@@ -50,6 +50,5 @@ SHA1 (patch-mcs_class_System.Web_System.Web.UI_Page.cs) = 986874319e849b93a2c89b
 SHA1 (patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs) = d82d9737efb07a8095acc5bf78d9cc522d24632d
 SHA1 (patch-mcs_class_System.Web_System.Web.dll.sources) = 751139d6dc4bf8f2cda767e8e6d8a3ed2dd2ecd8
 SHA1 (patch-mcs_class_System.Web_System.Web_WebROCollection.cs) = ff95c3898df3aa4809d1222c29f9bf81e87e9af1
-SHA1 (patch-mono_mini_exceptions-x86.c) = 5bb9c028b32fba8073733be32691c72fb0128764
 SHA1 (patch-mono_profiler_proflog.c) = 2f7826873ab7fdb858db3d39606028ee87a34a46
 SHA1 (patch-mono_utils_mono-compiler.h) = 0dce7994bdb350f7080464f416b725cbe3e7e293
diff --git a/lang/mono2/patches/patch-ad b/lang/mono2/patches/patch-ad
index 779c4ae18be..70af8ebab49 100644
--- a/lang/mono2/patches/patch-ad
+++ b/lang/mono2/patches/patch-ad
@@ -1,7 +1,34 @@
-$NetBSD: patch-ad,v 1.1 2013/06/17 12:43:28 wiz 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 @@
+$NetBSD: patch-ad,v 1.2 2016/08/15 10:24:31 richard Exp $
+--- mono/utils/mono-sigcontext.h.orig	2012-01-30 18:01:23.000000000 +0000
++++ mono/utils/mono-sigcontext.h
+@@ -6,11 +6,12 @@
+ #include <asm/sigcontext.h>
+ #endif
+ 
+-#if defined(__i386__)
+-
+-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
++#ifdef HAVE_UCONTEXT_H
+ #include <ucontext.h>
+ #endif
++
++#if defined(__i386__)
++
+ #if defined(__APPLE__)
+ #include <AvailabilityMacros.h>
+ #endif
+@@ -172,10 +173,6 @@
+ 
+ #elif defined(__mono_ppc__)
+ 
+-#if HAVE_UCONTEXT_H
+-#include <ucontext.h>
+-#endif
+-
+ #if defined(__linux__)
+ 	typedef struct ucontext os_ucontext;
+ 
+@@ -211,7 +208,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])
@@ -10,3 +37,14 @@ $NetBSD: patch-ad,v 1.1 2013/06/17 12:43:28 wiz Exp $
  	typedef ucontext_t os_ucontext;
  
  	#define UCONTEXT_REG_Rn(ctx, n)   ((ctx)->uc_mcontext.mc_gpr [(n)])
+@@ -275,10 +272,6 @@
+ #endif
+ #elif defined(__s390x__)
+ 
+-# if HAVE_UCONTEXT_H
+-#  include <ucontext.h>
+-# endif
+-
+ # define UCONTEXT_GREGS(ctx)	(((ucontext_t *)(ctx))->uc_mcontext.gregs)
+ #endif
+ 
diff --git a/lang/mono2/patches/patch-mono_mini_exceptions-x86.c b/lang/mono2/patches/patch-mono_mini_exceptions-x86.c
deleted file mode 100644
index f285ba40021..00000000000
--- a/lang/mono2/patches/patch-mono_mini_exceptions-x86.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mono_mini_exceptions-x86.c,v 1.1 2016/07/22 12:21:05 jperkin Exp $
-
-Remove obsolete and unused SunOS code.
-
---- mono/mini/exceptions-x86.c.orig	2012-01-30 18:13:39.000000000 +0000
-+++ mono/mini/exceptions-x86.c
-@@ -895,7 +895,7 @@ mono_arch_find_jit_info (MonoDomain *dom
- 	return FALSE;
- }
- 
--#ifdef __sun
-+#ifdef __notsun
- #define REG_EAX EAX
- #define REG_EBX EBX
- #define REG_ECX ECX