Add patch set for partial SunOS support. This gets us to the point of

being able to run the bootstrap compiler, but for some as-yet unknown
reason it fails during the build but works ok when executed manually.

10 files changed, 136 insertions, 19 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 821b79352e2..7d244afa275 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2013/05/31 12:41:11 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2013/06/05 17:03:55 jperkin Exp $
 
 DISTNAME=	mono-3.0.10
 PKGREVISION=	1
@@ -24,6 +24,7 @@ EXTRACT_USING=	gtar
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} --with-icu=yes
 CONFIGURE_ARGS+=	--with-preview=yes --with-libgdiplus=installed
+CONFIGURE_ARGS+=	--disable-dtrace
 
 .include "options.mk"
 
@@ -128,6 +129,13 @@ SUBST_MESSAGE.fix-libx11=	Fixing libX11 search path configuration
 SUBST_FILES.fix-libx11=		configure
 SUBST_SED.fix-libx11=		-e 's,@X11BASE@,${X11BASE},g'
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=			ac_cv_func_getdomainname=no
+CONFIGURE_ENV+=			ac_cv_func_setdomainname=no
+.endif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/net_4_5/DefaultWsdlHelpGenerator.aspx \
 		${DESTDIR}${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index fc51237c81a..b85063df457 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.90 2013/05/29 11:11:12 wiz Exp $
+$NetBSD: distinfo,v 1.91 2013/06/05 17:03:55 jperkin Exp $
 
 SHA1 (mono-3.0.10.tar.bz2) = 7646d3ecb2dc2e7fd12c7fc661e7a500b9833e64
 RMD160 (mono-3.0.10.tar.bz2) = d2c4dc64b233f51f6ec8be4ee1f3ef08f0099057
 Size (mono-3.0.10.tar.bz2) = 81844036 bytes
 SHA1 (patch-aa) = 688e02cd43716476f3f1baae9116a6aa7e186b2b
-SHA1 (patch-ab) = 831209f075d306b28c9ea5208ec21261b9aae7a0
+SHA1 (patch-ab) = 47e3e90674e757fc662455f8a7cdf0ac6d3ecc5b
 SHA1 (patch-ac) = 9666a8e30aedacf46d4817161cc0036fa59b12d8
 SHA1 (patch-ad) = 27a75f7f4a8db6ecfd6bea420dacd911d123a1ae
 SHA1 (patch-ae) = 6431e119a26f89c691c27858d64c8ccc7f8c0e31
@@ -14,7 +14,7 @@ SHA1 (patch-ai) = 43cd820c3c683ba5990776ecaf8ce1cca531d03f
 SHA1 (patch-aj) = b4d65a823849e3e94457a5e361b53b49038fdd04
 SHA1 (patch-ak) = fc8d177ffdb4b8ec2b62d8fcb2a84e09c1737f0a
 SHA1 (patch-al) = 40f8616bd0d4152ab21573d1647ef44018228908
-SHA1 (patch-am) = 0c535d2034a1141ab0ad2f860b587813540b1071
+SHA1 (patch-am) = d314692858b6d3ac45e8363ee1992071834f17e0
 SHA1 (patch-ap) = c0ac836a4d0bc09895b262ff2b455fb172532e7a
 SHA1 (patch-aq) = 6465c4d1076d96b43f985580fdcf8b608bc29da1
 SHA1 (patch-ar) = 03a0542582f05da5b3d0193aa7124aae7c14e1ef
@@ -22,7 +22,7 @@ SHA1 (patch-as) = 20104c1898c6335a1cecd9331413dbd1eef7b257
 SHA1 (patch-ba) = c967b7d01c872cacdf2557623674eb6e1954a44a
 SHA1 (patch-bc) = e1adbcd8ad1b9ddbe94774e4a59c5c4aab3a2a37
 SHA1 (patch-bd) = 44db6cd138dd87b0e5540b4dce264776c5c3b7b7
-SHA1 (patch-be) = 834362bcb839de68a4e508ae4eeccb575d44d50d
+SHA1 (patch-be) = 895a7ab941b37202076faf94b98baf7d17f3d86c
 SHA1 (patch-bf) = 4dec79a18ee77d29c1eac6a556939478912a3f45
 SHA1 (patch-bg) = 019f20c4a916569a0ef31d4c44f87eaac26e253b
 SHA1 (patch-bh) = 82747732a771783d5368672810684eefba1a8ee3
@@ -38,11 +38,15 @@ SHA1 (patch-dh) = d0f32afdeecefbd12df00d41809b405fdb56cbe0
 SHA1 (patch-di) = 2e590f0491edf6ab8d253f99a23c6b9644ac3bc5
 SHA1 (patch-dj) = 2a3b4ab8b8eaf2aa0a10c867596ba3eb8d12a1b9
 SHA1 (patch-dk) = 9173254d4de1dc138a1b6559f7319473581c6dc4
-SHA1 (patch-dl) = 306d2af8933997e35637bb6d305450f6b9224d71
+SHA1 (patch-dl) = e2508749a8682102fa2bf877e3ee43c1444efdb1
 SHA1 (patch-dm) = bbdb71d2554f19ed7c0b390f78fa0fd82c68a5c5
 SHA1 (patch-dn) = e451f01452869be5a42fafe9b547fa298a1c4b3b
 SHA1 (patch-do) = 6cd2e8c6d9321243a1fd9462aef992e1f33daef9
 SHA1 (patch-man_mprof-report.1) = fccadd7c284a3ce50919534b6dacb2da002edef8
 SHA1 (patch-mono_io-layer_sockets.c) = 8c4f5fbc3469831a1c03680ed493b96c3b50199c
+SHA1 (patch-mono_profiler_proflog.c) = 23e43af9d35d9fcb41a3d79b01d5494169fa15c2
 SHA1 (patch-mono_utils_mono-compiler.h) = 76822de9dde03bac11a16c4cc687728566d98235
+SHA1 (patch-mono_utils_mono-mmap.c) = 24a4bff061db6e5f6722a933b7f5cf843610e5f1
 SHA1 (patch-po_Makefile.in) = 514f96172178f9cc2959d9bce3fb96e8c6710d99
+SHA1 (patch-support_signal.c) = 411a22a62398a6f2c03f511090148e1b3bc76baf
+SHA1 (patch-support_time.c) = abe7180538fcc7b3c0cdc31cbc36e2edbf42cd4c
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index a0b664af23d..4246f6e0ffd 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.29 2013/05/29 11:11:12 wiz Exp $
+$NetBSD: patch-ab,v 1.30 2013/06/05 17:03:55 jperkin Exp $
+
+Add __C99FEATURES__ to SunOS defines for additional math functions.
+
 --- configure.orig	2013-04-25 09:08:54.000000000 +0000
 +++ configure
 @@ -3843,7 +3843,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1
@@ -38,7 +41,15 @@ $NetBSD: patch-ab,v 1.29 2013/05/29 11:11:12 wiz Exp $
  		need_link_unlink=yes
  
  $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h
-@@ -24527,7 +24531,7 @@ LIBC="libc.so.6"
+@@ -21395,6 +21399,7 @@ $as_echo_n "checking for Solaris XPG4 su
+ 			if test -f /usr/lib/libxnet.so; then
+ 				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+ 	    			CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
++	    			CPPFLAGS="$CPPFLAGS -D__C99FEATURES__"
+ 				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
+            			LIBS="$LIBS -lxnet"
+   	    			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -24527,7 +24532,7 @@ LIBC="libc.so.6"
  INTL="libc.so.6"
  SQLITE="libsqlite.so.0"
  SQLITE3="libsqlite3.so.0"
@@ -47,7 +58,7 @@ $NetBSD: patch-ab,v 1.29 2013/05/29 11:11:12 wiz Exp $
  
  sizeof_register="SIZEOF_VOID_P"
  
-@@ -25132,10 +25136,12 @@ case "$host" in
+@@ -25132,10 +25137,12 @@ case "$host" in
  	X11="libX11.dylib"
  	;;
       *-*-*netbsd*)
@@ -63,7 +74,7 @@ $NetBSD: patch-ab,v 1.29 2013/05/29 11:11:12 wiz Exp $
      	LIBC="libc.so"
  	INTL="libintl.so"
  	SQLITE="libsqlite.so"
-@@ -26162,7 +26168,6 @@ else
+@@ -26162,7 +26169,6 @@ else
  fi
  
  
diff --git a/lang/mono/patches/patch-am b/lang/mono/patches/patch-am
index 351db3a258b..0fbb26aaab7 100644
--- a/lang/mono/patches/patch-am
+++ b/lang/mono/patches/patch-am
@@ -1,7 +1,8 @@
-$NetBSD: patch-am,v 1.5 2013/05/29 11:11:12 wiz Exp $
---- mono/io-layer/io.c.orig	2012-12-05 17:44:35.000000000 +0000
+$NetBSD: patch-am,v 1.6 2013/06/05 17:03:55 jperkin Exp $
+
+--- mono/io-layer/io.c.orig	2013-04-25 09:07:19.000000000 +0000
 +++ mono/io-layer/io.c
-@@ -3376,7 +3376,7 @@ guint32 GetTempPath (guint32 len, gunich
+@@ -3405,7 +3405,7 @@ guint32 GetTempPath (guint32 len, gunich
  	return(ret);
  }
  
@@ -10,3 +11,12 @@ $NetBSD: patch-am,v 1.5 2013/05/29 11:11:12 wiz Exp $
  /* Darwin has getfsstat */
  gint32 GetLogicalDriveStrings (guint32 len, gunichar2 *buf)
  {
+@@ -4227,7 +4227,7 @@ get_fstypename (gchar *utfpath)
+ }
+ 
+ /* Linux has struct statfs which has a different layout */
+-#if defined (PLATFORM_MACOSX) || defined (__linux__) || defined(PLATFORM_BSD) || defined(__native_client__)
++#if defined (PLATFORM_MACOSX) || defined (__linux__) || defined(PLATFORM_BSD) || defined(__native_client__) || defined(PLATFORM_SOLARIS)
+ gboolean
+ GetVolumeInformation (const gunichar2 *path, gunichar2 *volumename, int volumesize, int *outserial, int *maxcomp, int *fsflags, gunichar2 *fsbuffer, int fsbuffersize)
+ {
diff --git a/lang/mono/patches/patch-be b/lang/mono/patches/patch-be
index 0f863505641..64ae65d4ef6 100644
--- a/lang/mono/patches/patch-be
+++ b/lang/mono/patches/patch-be
@@ -1,6 +1,6 @@
-$NetBSD: patch-be,v 1.2 2013/05/29 11:11:12 wiz Exp $
+$NetBSD: patch-be,v 1.3 2013/06/05 17:03:55 jperkin Exp $
 
---- support/sys-mman.c.orig	2012-12-05 17:44:30.000000000 +0000
+--- support/sys-mman.c.orig	2013-04-25 09:01:57.000000000 +0000
 +++ support/sys-mman.c
 @@ -7,7 +7,6 @@
   * Copyright (C) 2004-2006 Jonathan Pryor
@@ -10,7 +10,17 @@ $NetBSD: patch-be,v 1.2 2013/05/29 11:11:12 wiz Exp $
  
  #ifdef PLATFORM_MACOSX
  /* For mincore () */
-@@ -105,8 +104,13 @@ Mono_Posix_Syscall_mremap (void *old_add
+@@ -21,6 +20,9 @@
+ #include <sys/types.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++#ifdef __sun
++#include <unistd.h>
++#endif
+ 
+ #include "map.h"
+ #include "mph.h"
+@@ -105,8 +107,13 @@ Mono_Posix_Syscall_mremap (void *old_add
  	if (Mono_Posix_FromMremapFlags (flags, &_flags) == -1)
  		return MAP_FAILED;
  
diff --git a/lang/mono/patches/patch-dl b/lang/mono/patches/patch-dl
index 9dd846bfd90..bdb0afc691f 100644
--- a/lang/mono/patches/patch-dl
+++ b/lang/mono/patches/patch-dl
@@ -1,8 +1,10 @@
-$NetBSD: patch-dl,v 1.2 2013/05/29 11:11:12 wiz Exp $
+$NetBSD: patch-dl,v 1.3 2013/06/05 17:03:55 jperkin Exp $
 
---- mono/utils/dlmalloc.c.orig	2012-12-05 17:44:35.000000000 +0000
+SunOS needs unistd.h for sysconf().
+
+--- mono/utils/dlmalloc.c.orig	2013-04-25 09:01:42.000000000 +0000
 +++ mono/utils/dlmalloc.c
-@@ -1207,7 +1207,7 @@ int mspace_mallopt(int, int);
+@@ -1207,11 +1207,14 @@ int mspace_mallopt(int, int);
  #ifndef LACKS_UNISTD_H
  #include <unistd.h>     /* for sbrk */
  #else /* LACKS_UNISTD_H */
@@ -11,3 +13,10 @@ $NetBSD: patch-dl,v 1.2 2013/05/29 11:11:12 wiz Exp $
  extern void*     sbrk(ptrdiff_t);
  #endif /* FreeBSD etc */
  #endif /* LACKS_UNISTD_H */
+ #endif /* HAVE_MMAP */
++#ifdef __sun
++#include <unistd.h> /* for sysconf */
++#endif
+ 
+ #ifndef WIN32
+ #ifndef malloc_getpagesize
diff --git a/lang/mono/patches/patch-mono_profiler_proflog.c b/lang/mono/patches/patch-mono_profiler_proflog.c
new file mode 100644
index 00000000000..afe5306dec7
--- /dev/null
+++ b/lang/mono/patches/patch-mono_profiler_proflog.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-mono_profiler_proflog.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $
+
+SunOS libelf does not support largefile.
+
+--- mono/profiler/proflog.c.orig	2013-04-25 09:01:57.000000000 +0000
++++ mono/profiler/proflog.c
+@@ -36,6 +36,10 @@
+ #ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
++#ifdef __sun
++#undef _FILE_OFFSET_BITS
++#define _FILE_OFFSET_BITS 32
++#endif
+ #ifdef HAVE_LINK_H
+ #include <link.h>
+ #endif
diff --git a/lang/mono/patches/patch-mono_utils_mono-mmap.c b/lang/mono/patches/patch-mono_utils_mono-mmap.c
new file mode 100644
index 00000000000..9b8846630cf
--- /dev/null
+++ b/lang/mono/patches/patch-mono_utils_mono-mmap.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-mono_utils_mono-mmap.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $
+
+Use posix_madvise on SunOS.
+
+--- mono/utils/mono-mmap.c.orig	2013-04-25 09:01:42.000000000 +0000
++++ mono/utils/mono-mmap.c
+@@ -431,7 +431,7 @@ mono_mprotect (void *addr, size_t length
+ 			memset (addr, 0, length);
+ #else
+ 		memset (addr, 0, length);
+-#ifdef HAVE_MADVISE
++#if defined(HAVE_MADVISE) && !defined(__sun)
+ 		madvise (addr, length, MADV_DONTNEED);
+ 		madvise (addr, length, MADV_FREE);
+ #else
diff --git a/lang/mono/patches/patch-support_signal.c b/lang/mono/patches/patch-support_signal.c
new file mode 100644
index 00000000000..7b27566aa94
--- /dev/null
+++ b/lang/mono/patches/patch-support_signal.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-support_signal.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $
+
+Add necessary includes on SunOS.
+
+--- support/signal.c.orig	2013-04-25 09:01:58.000000000 +0000
++++ support/signal.c
+@@ -31,6 +31,10 @@
+ #include <mono/metadata/appdomain.h>
+ #endif
+ 
++#ifdef __sun
++#include <siginfo.h>
++#endif
++
+ G_BEGIN_DECLS
+ 
+ typedef void (*mph_sighandler_t)(int);
diff --git a/lang/mono/patches/patch-support_time.c b/lang/mono/patches/patch-support_time.c
new file mode 100644
index 00000000000..182a6068821
--- /dev/null
+++ b/lang/mono/patches/patch-support_time.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-support_time.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $
+
+Add necessary includes on SunOS.
+
+--- support/time.c.orig	2013-04-25 09:01:57.000000000 +0000
++++ support/time.c
+@@ -10,6 +10,9 @@
+ #define _SVID_SOURCE
+ #include <time.h>
+ #include <errno.h>
++#ifdef __sun
++#include <unistd.h>
++#endif
+ 
+ #include "map.h"
+ #include "mph.h"