diff options
54 files changed, 384 insertions, 223 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 33c1e6404a9..47e7d4dbde9 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.152 2014/10/07 16:47:12 adam Exp $ +# $NetBSD: Makefile,v 1.153 2014/11/30 08:40:50 spz Exp $ -DISTNAME= mono-3.6.0 -PKGREVISION= 2 +DISTNAME= mono-3.10.0 CATEGORIES= lang MASTER_SITES= http://download.mono-project.com/sources/mono/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common index b71398c4eea..2f96dcbf5eb 100644 --- a/lang/mono/PLIST.common +++ b/lang/mono/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.20 2014/09/10 12:17:15 joerg Exp $ +@comment $NetBSD: PLIST.common,v 1.21 2014/11/30 08:40:50 spz Exp $ bin/al bin/al2 bin/caspol @@ -1180,6 +1180,7 @@ lib/mono/xbuild-frameworks/.NETFramework/v3.5/RedistList/FrameworkList.xml lib/mono/xbuild-frameworks/.NETFramework/v4.0/Profile/Client/RedistList/FrameworkList.xml lib/mono/xbuild-frameworks/.NETFramework/v4.0/RedistList/FrameworkList.xml lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml +lib/mono/xbuild-frameworks/.NETFramework/v4.5.1/RedistList/FrameworkList.xml lib/mono/xbuild/12.0/bin/MSBuild/Microsoft.Build.CommonTypes.xsd lib/mono/xbuild/12.0/bin/MSBuild/Microsoft.Build.Core.xsd lib/mono/xbuild/12.0/bin/Microsoft.Build.Engine.dll diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 944b73120c0..445a6d78fca 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,51 +1,56 @@ -$NetBSD: distinfo,v 1.96 2014/09/23 22:26:24 jmcneill Exp $ +$NetBSD: distinfo,v 1.97 2014/11/30 08:40:50 spz Exp $ -SHA1 (mono-3.6.0.tar.bz2) = 54150bf88d6ebdaaa40c474c66680b06a875f060 -RMD160 (mono-3.6.0.tar.bz2) = bf416bd14c6ef014b08f9750ac86b6dbd5a3d434 -Size (mono-3.6.0.tar.bz2) = 84031890 bytes -SHA1 (patch-aa) = 688e02cd43716476f3f1baae9116a6aa7e186b2b -SHA1 (patch-ab) = c4f000fc757d66fcc54a14783e02ac801ca85a3f -SHA1 (patch-ac) = 9666a8e30aedacf46d4817161cc0036fa59b12d8 -SHA1 (patch-ad) = b4eacf109b58e722616cae0ab90ce1d4cabc9f77 -SHA1 (patch-ae) = 6431e119a26f89c691c27858d64c8ccc7f8c0e31 -SHA1 (patch-af) = 1a7d763836dd4c6abfdd31d7072e77352e23df7d -SHA1 (patch-ai) = 43cd820c3c683ba5990776ecaf8ce1cca531d03f -SHA1 (patch-aj) = a7767ee31536048fdae57026f64eecbad2ff2057 -SHA1 (patch-ak) = fc8d177ffdb4b8ec2b62d8fcb2a84e09c1737f0a -SHA1 (patch-al) = 87e6a7f2ea407de2674c54f9385c05767f533091 -SHA1 (patch-am) = d314692858b6d3ac45e8363ee1992071834f17e0 -SHA1 (patch-ap) = c0ac836a4d0bc09895b262ff2b455fb172532e7a -SHA1 (patch-aq) = 7b6ce5b79730c50f857fe6a57858118c71ee3976 -SHA1 (patch-ar) = 03a0542582f05da5b3d0193aa7124aae7c14e1ef -SHA1 (patch-as) = dc771916a44f07c1dd9c2c577570514a5902c714 -SHA1 (patch-ba) = 95bf806a065b7bec9fa90d2587761159a6fde6fc -SHA1 (patch-bc) = e1adbcd8ad1b9ddbe94774e4a59c5c4aab3a2a37 -SHA1 (patch-bd) = c54d3147497846e066ceeba9b96278baf0ba2ec3 -SHA1 (patch-be) = 85a04609defcedb0e43018f31afec76228f4433e -SHA1 (patch-bf) = 4dec79a18ee77d29c1eac6a556939478912a3f45 -SHA1 (patch-bi) = 67e916a7cd93fc2e327f14beda1e75333d25daf2 -SHA1 (patch-cc) = 86cc1590c3f59d90fa24c58355712089c0e2adff -SHA1 (patch-da) = 03c7edf29072de01b15ca97a3c074980c438b43c -SHA1 (patch-db) = 1b4a3519802bd5e60234edf0b7a884f2279d9ee2 -SHA1 (patch-dc) = c3f7763d019226473b3b6b22d4ab2511b6a65fa4 -SHA1 (patch-de) = 7e74a64c6be7fe38fe870a1c56d13825500d421c -SHA1 (patch-df) = 2a74937a5bd5f70b337aa216c31cb9cd30623023 -SHA1 (patch-dh) = 2df58072f7031df1b1029bd225c3965538bcd571 -SHA1 (patch-di) = 2e590f0491edf6ab8d253f99a23c6b9644ac3bc5 -SHA1 (patch-dj) = 2a3b4ab8b8eaf2aa0a10c867596ba3eb8d12a1b9 -SHA1 (patch-dk) = 9173254d4de1dc138a1b6559f7319473581c6dc4 -SHA1 (patch-dl) = 53a334d84f8ac1bb1b70b66780c193b78f9e6488 -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_mini_mini-arm.c) = 5df6fcb73a04fcd0f97156514e70b6ed6ebd2394 -SHA1 (patch-mono_profiler_proflog.c) = 23e43af9d35d9fcb41a3d79b01d5494169fa15c2 -SHA1 (patch-mono_unit-tests_Makefile.in) = 882207b8d609d649c9e098ccd883ed4b5ba445b5 -SHA1 (patch-mono_utils_mono-compiler.h) = 76822de9dde03bac11a16c4cc687728566d98235 -SHA1 (patch-mono_utils_mono-mmap.c) = 24a4bff061db6e5f6722a933b7f5cf843610e5f1 -SHA1 (patch-mono_utils_mono-threads-posix.c) = 52b3e0a8a9c673a1cc8e515bb4a7d6d17c1ea091 -SHA1 (patch-po_Makefile.in) = 514f96172178f9cc2959d9bce3fb96e8c6710d99 -SHA1 (patch-support_signal.c) = 411a22a62398a6f2c03f511090148e1b3bc76baf -SHA1 (patch-support_time.c) = abe7180538fcc7b3c0cdc31cbc36e2edbf42cd4c +SHA1 (mono-3.10.0.tar.bz2) = 74e43604ea48e941c39a43ebc153abee4ddba56c +RMD160 (mono-3.10.0.tar.bz2) = 93312568ec4963cf6be1d5d29e5d634c5a7a4bf2 +Size (mono-3.10.0.tar.bz2) = 73485820 bytes +SHA1 (patch-aa) = 84e5bca2b6d9715271c343f774c81186858d90c9 +SHA1 (patch-ab) = a79d1fe4c6246a082a7a40309f199a75319155db +SHA1 (patch-ac) = c183486f092c064c13969c9f9283eef56d853e84 +SHA1 (patch-ad) = ebd47980f0141f7cbd0c6bbcfc15942cebc263f1 +SHA1 (patch-ae) = 25869b98f9197243aea799b75b238d92f58e8845 +SHA1 (patch-af) = 6a458a91dc34420d45238b5dad01ed63f0bd9e00 +SHA1 (patch-ai) = d06c382d188f4263a2a505ca3d3ee491baa3af28 +SHA1 (patch-aj) = 33b75ec2662cc442f602b21b03fee1e5c39e3a76 +SHA1 (patch-ak) = 919379dbf2a35c23010c87d9e95e124e8e84d04a +SHA1 (patch-al) = 07462d3f9cf2aa08b1fb837400084d32a7062eee +SHA1 (patch-am) = ff0af9c120ebeb59edcdb727c7d36aa5939c73af +SHA1 (patch-ap) = e0590d7014ae4ef74ee9f9c39f069411a66c8f76 +SHA1 (patch-aq) = 91f8384c62e4a7a1b2079038495a1a78364926c9 +SHA1 (patch-ar) = e225bfaa1a18aa5997a1a6472889da3a0ec533cc +SHA1 (patch-as) = 101c0119f498a389613a3cd54497e85b3aece1c2 +SHA1 (patch-ba) = f501f1fa3e603660dc8f64ea6bc020b4f4c08a57 +SHA1 (patch-bc) = 1fbb3d78683dc29944eb69d2b033f34539da2b39 +SHA1 (patch-bd) = f5794809dd4a19d97322525693f65ab2f844104d +SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f +SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d +SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb +SHA1 (patch-cc) = d26c9e04f04896f0e7b2edab61cd347d76e0fcaf +SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd +SHA1 (patch-db) = 66c86c0ea8de64cdfaab30b8b97dabfb0e2fef10 +SHA1 (patch-dc) = 725c82a9ac4ae9c01045149504a6df6a64d808a3 +SHA1 (patch-de) = 0c2a123868b20236fceb93d33fa3084a1afd004c +SHA1 (patch-df) = b2780e809d681795a6bdd9039ec890cfc9362187 +SHA1 (patch-dh) = 30f0bea7c707829247c2b426a88c4adba057e534 +SHA1 (patch-di) = 67a26c3cd7752d5b629f00cdba7cc9613d10f43c +SHA1 (patch-dj) = 049cc88dc523975404445f13de81255d75a22156 +SHA1 (patch-dk) = ad78819e71f082d0b7f262c162d3a67cfdfdcf2f +SHA1 (patch-dl) = dc63c1d3f6a1d78b2f5bb725cdff6824e2307dc5 +SHA1 (patch-dm) = 700bd09b41973f4664e4b63dfc042f60503a069f +SHA1 (patch-dn) = 5d87cbff70432a674f1271d7b44757f86e1f1bd0 +SHA1 (patch-do) = 0bda0d2e482be218fb502e0c4ea945a41d078d27 +SHA1 (patch-man_mprof-report.1) = 0a80c164614cc9af5f01822005193d80f1d89946 +SHA1 (patch-mono_io-layer_sockets.c) = e95fdd20657b4ea71ef4c4ad2ae777e82248d381 +SHA1 (patch-mono_mini_mini-arm.c) = f8460870a77200eb12c2970b3ae7c432febbfdd9 +SHA1 (patch-mono_profiler_proflog.c) = 060e8052aeedc1ee224d33644f39b8085a6c92a2 +SHA1 (patch-mono_unit-tests_Makefile.in) = 98cb082e2e0ad53c36b513a7bce9568c26e14f21 +SHA1 (patch-mono_utils_Makefile.in) = 08c5d8c2cb64b526b5596f15a590260630bd67c6 +SHA1 (patch-mono_utils_mono-compiler.h) = 210062c167c00500f6a9176ef94c8cd96d39c730 +SHA1 (patch-mono_utils_mono-mmap.c) = 869c24a57861fcfb1bdc8a04ed0e0d1fd5a0e0b5 +SHA1 (patch-mono_utils_mono-threads-dragonfly.c) = 05adc3d75f620a6e1a297d2b05978afbeb3ac58a +SHA1 (patch-mono_utils_mono-threads-freebsd.c) = 029a6b14255edd8c298c9c8d1f5018bc6efc5866 +SHA1 (patch-mono_utils_mono-threads-netbsd.c) = 29d7bdb4906bca4e2f5a0a94b7e70e04570df8ee +SHA1 (patch-mono_utils_mono-threads-posix.c) = d0cb2b1be62cbafe86a3efa817b8120af4ab1086 +SHA1 (patch-mono_utils_mono-threads-solaris.c) = 8781c9e09edfbbbc9940f02cce46a3ce5b6c10c3 +SHA1 (patch-po_Makefile.in) = 53f967c75ae028d991f118fb3bbc5b90bb4ceea7 +SHA1 (patch-support_signal.c) = 33e0c19c21955b105d78a05b2b10d00f479a60c2 +SHA1 (patch-support_time.c) = 2031ab294d66594ff3645b03c48ffca143ab59b5 diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa index d25878d5bd9..2a2f646e2a3 100644 --- a/lang/mono/patches/patch-aa +++ b/lang/mono/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.17 2013/05/29 11:11:12 wiz Exp $ ---- mono/io-layer/collection.c.orig 2012-12-05 17:44:35.000000000 +0000 +$NetBSD: patch-aa,v 1.18 2014/11/30 08:40:51 spz Exp $ +--- mono/io-layer/collection.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/io-layer/collection.c -@@ -57,7 +57,11 @@ void _wapi_collection_init (void) +@@ -58,7 +58,11 @@ void _wapi_collection_init (void) #if defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) if (set_stacksize == 0) { diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index 547354cdc94..631a95b1385 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-ab,v 1.34 2014/11/30 08:40:51 spz Exp $ ---- configure.orig 2014-08-12 16:51:03.000000000 +0000 +--- configure.orig 2014-10-04 09:29:01.000000000 +0000 +++ configure -@@ -4018,7 +4018,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1 +@@ -4027,7 +4027,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1 mono_cv_clang=no if test "x$cross_compiling" = "xno"; then target_win32=yes @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ $as_echo "#define TARGET_WIN32 1" >>confdefs.h -@@ -4054,12 +4054,15 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" +@@ -4064,10 +4064,13 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes @@ -24,12 +24,18 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ +#define PTHREAD_POINTER_ID 1 +_ACEOF ;; + *-*-kfreebsd*-gnu) + host_win32=no +@@ -4080,7 +4083,7 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" + with_sigaltstack=no + use_sigposix=yes + ;; - *-*-*freebsd*) + *-*-*freebsd* | *-*-*dragonfly*) host_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" -@@ -4075,7 +4078,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" +@@ -4096,7 +4099,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib" libmono_ldflags="$PTHREAD_LIBS" fi @@ -39,7 +45,7 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ need_link_unlink=yes $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h -@@ -21735,6 +21739,7 @@ $as_echo_n "checking for Solaris XPG4 su +@@ -21722,6 +21726,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__" @@ -47,7 +53,7 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1" LIBS="$LIBS -lxnet" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -24934,7 +24939,7 @@ $as_echo_n "checking LLVM version... " > +@@ -24940,7 +24945,7 @@ $as_echo_n "checking LLVM version... " > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvm_version" >&5 $as_echo "$llvm_version" >&6; } if echo $llvm_version | grep -q 'mono'; then @@ -56,16 +62,16 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ if test "$llvm_version" != "$expected_llvm_version"; then as_fn_error $? "Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version\"" "$LINENO" 5 fi -@@ -25010,7 +25015,7 @@ LIBC="libc.so.6" +@@ -25016,7 +25021,7 @@ LIBC="libc.so.6" INTL="libc.so.6" SQLITE="libsqlite.so.0" SQLITE3="libsqlite3.so.0" -X11="libX11.so" -+X11="@X11BASE@/lib/libX11.so" - XINERAMA="libXinerama.so" - - sizeof_register="SIZEOF_VOID_P" -@@ -25116,6 +25121,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co ++X11="/usr/X11R7/lib/libX11.so" + GDKX11="libgdk-x11-2.0.so.0" + GTKX11="libgtk-x11-2.0.so.0" + XINERAMA="libXinerama.so.1" +@@ -25124,6 +25129,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co sizeof_register=8 fi case $host_os in @@ -77,8 +83,8 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ linux*) sgen_supported=true AOT_SUPPORTED="yes" -@@ -25246,13 +25256,17 @@ fi - CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC" +@@ -25259,13 +25269,17 @@ fi + CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" sgen_supported=true ;; - arm*-linux*) @@ -98,8 +104,8 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" ;; # TODO: make proper support for NaCl host. -@@ -25641,10 +25655,12 @@ case "$host" in - X11="libX11.dylib" +@@ -25655,15 +25669,17 @@ case "$host" in + GTKX11="libgtk-x11-2.0.dylib" ;; *-*-*netbsd*) - LIBC="libc.so.12" @@ -109,12 +115,17 @@ $NetBSD: patch-ab,v 1.33 2014/08/21 07:49:56 wiz Exp $ + SQLITE="libsqlite.so" + SQLITE3="libsqlite3.so" ;; + *-*-kfreebsd*-gnu) + LIBC="libc.so.0.1" + INTL="libc.so.0.1" + X11="libX11.so.6" + ;; - *-*-*freebsd*) + *-*-*freebsd* | *-*-*dragonfly*) LIBC="libc.so" INTL="libintl.so" SQLITE="libsqlite.so" -@@ -26684,7 +26700,6 @@ else +@@ -26704,7 +26720,6 @@ else fi diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac index 3454187c167..4755c30b408 100644 --- a/lang/mono/patches/patch-ac +++ b/lang/mono/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.18 2013/05/29 11:11:12 wiz Exp $ ---- data/Makefile.in.orig 2012-12-05 17:50:23.000000000 +0000 +$NetBSD: patch-ac,v 1.19 2014/11/30 08:40:51 spz Exp $ +--- data/Makefile.in.orig 2014-10-04 09:28:58.000000000 +0000 +++ data/Makefile.in -@@ -341,7 +341,7 @@ top_build_prefix = @top_build_prefix@ +@@ -431,7 +431,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = net_2_0 $(am__append_1) diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad index 3b167be6fe2..4f840bb9744 100644 --- a/lang/mono/patches/patch-ad +++ b/lang/mono/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.26 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-ad,v 1.27 2014/11/30 08:40:51 spz Exp $ ---- mono/utils/mono-sigcontext.h.orig 2014-08-12 16:50:38.000000000 +0000 +--- mono/utils/mono-sigcontext.h.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/utils/mono-sigcontext.h @@ -204,6 +204,10 @@ typedef struct ucontext { #define UCONTEXT_REG_RSI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RSI]) diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae index 867ee6c54b6..1c9d792c466 100644 --- a/lang/mono/patches/patch-ae +++ b/lang/mono/patches/patch-ae @@ -1,16 +1,16 @@ -$NetBSD: patch-ae,v 1.12 2013/05/29 11:11:12 wiz Exp $ ---- libgc/configure.orig 2012-12-05 17:50:43.000000000 +0000 +$NetBSD: patch-ae,v 1.13 2014/11/30 08:40:51 spz Exp $ +--- libgc/configure.orig 2014-10-04 09:29:04.000000000 +0000 +++ libgc/configure -@@ -4939,7 +4939,7 @@ $as_echo "$as_me: WARNING: \"Only HP/UX +@@ -5037,7 +5037,7 @@ $as_echo "$as_me: WARNING: \"Only HP/UX + $as_echo "#define USE_COMPILER_TLS 1" >>confdefs.h - THREADDLLIBS="-lpthread -lrt" ;; - *-*-freebsd*) + *-*-freebsd* | *-*-*dragonfly*) $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h if test "x$PTHREAD_CFLAGS" != "x"; then -@@ -4980,6 +4980,8 @@ $as_echo "$as_me: WARNING: \"Only HP/UX +@@ -5078,6 +5078,8 @@ $as_echo "$as_me: WARNING: \"Only HP/UX *-*-netbsd*) $as_echo "#define GC_NETBSD_THREADS 1" >>confdefs.h diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af index 9ff0cc92e0a..496a08a0f71 100644 --- a/lang/mono/patches/patch-af +++ b/lang/mono/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.13 2013/05/29 11:11:12 wiz Exp $ ---- mono/metadata/Makefile.in.orig 2012-12-05 17:50:29.000000000 +0000 +$NetBSD: patch-af,v 1.14 2014/11/30 08:40:51 spz Exp $ +--- mono/metadata/Makefile.in.orig 2014-10-04 09:29:00.000000000 +0000 +++ mono/metadata/Makefile.in -@@ -159,7 +159,7 @@ libmonoruntime_static_la_LINK = $(LIBTOO +@@ -213,7 +213,7 @@ libmonoruntime_static_la_LINK = $(LIBTOO $(libmonoruntime_static_la_CFLAGS) $(CFLAGS) \ $(libmonoruntime_static_la_LDFLAGS) $(LDFLAGS) -o $@ @DISABLE_EXECUTABLES_FALSE@@SUPPORT_BOEHM_TRUE@am_libmonoruntime_static_la_rpath = diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai index 09b542f08aa..b88445a7820 100644 --- a/lang/mono/patches/patch-ai +++ b/lang/mono/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.9 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-ai,v 1.10 2014/11/30 08:40:51 spz Exp $ ---- mono/metadata/object.c.orig 2012-12-05 17:44:35.000000000 +0000 +--- mono/metadata/object.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/metadata/object.c -@@ -4042,6 +4042,135 @@ mono_install_runtime_invoke (MonoInvokeF +@@ -4122,6 +4122,135 @@ mono_install_runtime_invoke (MonoInvokeF default_mono_runtime_invoke = func ? func: dummy_mono_runtime_invoke; } @@ -138,7 +138,7 @@ $NetBSD: patch-ai,v 1.9 2013/05/29 11:11:12 wiz Exp $ /** * mono_runtime_invoke_array: -@@ -4094,6 +4223,8 @@ mono_runtime_invoke_array (MonoMethod *m +@@ -4174,6 +4303,8 @@ mono_runtime_invoke_array (MonoMethod *m pa = alloca (sizeof (gpointer) * mono_array_length (params)); for (i = 0; i < mono_array_length (params); i++) { MonoType *t = sig->params [i]; @@ -147,7 +147,7 @@ $NetBSD: patch-ai,v 1.9 2013/05/29 11:11:12 wiz Exp $ again: switch (t->type) { -@@ -4118,9 +4249,16 @@ mono_runtime_invoke_array (MonoMethod *m +@@ -4198,9 +4329,16 @@ mono_runtime_invoke_array (MonoMethod *m if (t->byref) has_byref_nullables = TRUE; } else { @@ -166,7 +166,7 @@ $NetBSD: patch-ai,v 1.9 2013/05/29 11:11:12 wiz Exp $ if (t->byref) { /* -@@ -4130,12 +4268,13 @@ mono_runtime_invoke_array (MonoMethod *m +@@ -4210,12 +4348,13 @@ mono_runtime_invoke_array (MonoMethod *m * object, pass that to the callee, and replace the original * boxed object in the arg array with the copy. */ @@ -182,7 +182,7 @@ $NetBSD: patch-ai,v 1.9 2013/05/29 11:11:12 wiz Exp $ } break; case MONO_TYPE_STRING: -@@ -4143,11 +4282,19 @@ mono_runtime_invoke_array (MonoMethod *m +@@ -4223,11 +4362,19 @@ mono_runtime_invoke_array (MonoMethod *m case MONO_TYPE_CLASS: case MONO_TYPE_ARRAY: case MONO_TYPE_SZARRAY: diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj index 5f7ca910aa6..331192bb96b 100644 --- a/lang/mono/patches/patch-aj +++ b/lang/mono/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.9 2014/08/21 07:49:56 wiz Exp $ ---- data/net_2_0/Browsers/Makefile.in.orig 2014-08-12 16:51:00.000000000 +0000 +$NetBSD: patch-aj,v 1.10 2014/11/30 08:40:51 spz Exp $ +--- data/net_2_0/Browsers/Makefile.in.orig 2014-10-04 09:28:58.000000000 +0000 +++ data/net_2_0/Browsers/Makefile.in -@@ -347,7 +347,7 @@ target_vendor = @target_vendor@ +@@ -351,7 +351,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak index 8e54ba5dd03..60abd763702 100644 --- a/lang/mono/patches/patch-ak +++ b/lang/mono/patches/patch-ak @@ -1,5 +1,5 @@ -$NetBSD: patch-ak,v 1.10 2013/05/29 11:11:12 wiz Exp $ ---- libgc/pthread_support.c.orig 2012-12-05 17:44:36.000000000 +0000 +$NetBSD: patch-ak,v 1.11 2014/11/30 08:40:51 spz Exp $ +--- libgc/pthread_support.c.orig 2014-09-22 13:23:05.000000000 +0000 +++ libgc/pthread_support.c @@ -71,7 +71,7 @@ defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)) || \ @@ -10,7 +10,7 @@ $NetBSD: patch-ak,v 1.10 2013/05/29 11:11:12 wiz Exp $ # define USE_PTHREAD_SPECIFIC # endif #endif -@@ -1280,6 +1280,22 @@ void GC_end_blocking(void) { +@@ -1282,6 +1282,22 @@ void GC_end_blocking(void) { #define __d10_sleep sleep #endif /* GC_DGUX386_THREADS */ diff --git a/lang/mono/patches/patch-al b/lang/mono/patches/patch-al index 1ac22554ce2..81b8dbe6fbd 100644 --- a/lang/mono/patches/patch-al +++ b/lang/mono/patches/patch-al @@ -1,7 +1,7 @@ -$NetBSD: patch-al,v 1.7 2014/08/21 07:49:56 wiz Exp $ ---- data/config.in.orig 2014-08-12 16:50:38.000000000 +0000 +$NetBSD: patch-al,v 1.8 2014/11/30 08:40:51 spz Exp $ +--- data/config.in.orig 2014-10-04 09:27:43.000000000 +0000 +++ data/config.in -@@ -19,7 +19,7 @@ +@@ -21,7 +21,7 @@ <dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" /> <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/> <dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/> diff --git a/lang/mono/patches/patch-am b/lang/mono/patches/patch-am index 0fbb26aaab7..7c519a6b2ea 100644 --- a/lang/mono/patches/patch-am +++ b/lang/mono/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.6 2013/06/05 17:03:55 jperkin Exp $ +$NetBSD: patch-am,v 1.7 2014/11/30 08:40:51 spz Exp $ ---- mono/io-layer/io.c.orig 2013-04-25 09:07:19.000000000 +0000 +--- mono/io-layer/io.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/io-layer/io.c -@@ -3405,7 +3405,7 @@ guint32 GetTempPath (guint32 len, gunich +@@ -3463,7 +3463,7 @@ guint32 GetTempPath (guint32 len, gunich return(ret); } @@ -11,12 +11,12 @@ $NetBSD: patch-am,v 1.6 2013/06/05 17:03:55 jperkin Exp $ /* Darwin has getfsstat */ gint32 GetLogicalDriveStrings (guint32 len, gunichar2 *buf) { -@@ -4227,7 +4227,7 @@ get_fstypename (gchar *utfpath) +@@ -4260,7 +4260,7 @@ guint32 GetDriveType(const gunichar2 *ro + return (drive_type); } - /* 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) +-#if defined (PLATFORM_MACOSX) || defined (__linux__) || defined(PLATFORM_BSD) || defined(__native_client__) || defined(__FreeBSD_kernel__) ++#if defined (PLATFORM_MACOSX) || defined (__linux__) || defined(PLATFORM_BSD) || defined(__native_client__) || defined(__FreeBSD_kernel__) || defined(PLATFORM_SOLARIS) + static gchar* + get_fstypename (gchar *utfpath) { diff --git a/lang/mono/patches/patch-ap b/lang/mono/patches/patch-ap index 7aef7b86902..e7e4e5ef7b6 100644 --- a/lang/mono/patches/patch-ap +++ b/lang/mono/patches/patch-ap @@ -1,5 +1,5 @@ -$NetBSD: patch-ap,v 1.4 2013/05/29 11:11:12 wiz Exp $ ---- mcs/jay/Makefile.orig 2012-12-05 17:45:59.000000000 +0000 +$NetBSD: patch-ap,v 1.5 2014/11/30 08:40:51 spz Exp $ +--- mcs/jay/Makefile.orig 2014-09-22 13:23:09.000000000 +0000 +++ mcs/jay/Makefile @@ -21,19 +21,19 @@ ifndef NO_INSTALL install-local: diff --git a/lang/mono/patches/patch-aq b/lang/mono/patches/patch-aq index 29b84e4e3ad..5621f7b0612 100644 --- a/lang/mono/patches/patch-aq +++ b/lang/mono/patches/patch-aq @@ -1,7 +1,7 @@ -$NetBSD: patch-aq,v 1.6 2014/08/21 07:49:56 wiz Exp $ ---- data/net_4_0/Makefile.in.orig 2014-08-12 16:51:00.000000000 +0000 +$NetBSD: patch-aq,v 1.7 2014/11/30 08:40:51 spz Exp $ +--- data/net_4_0/Makefile.in.orig 2014-10-04 09:28:58.000000000 +0000 +++ data/net_4_0/Makefile.in -@@ -408,7 +408,7 @@ top_build_prefix = @top_build_prefix@ +@@ -412,7 +412,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = Browsers diff --git a/lang/mono/patches/patch-ar b/lang/mono/patches/patch-ar index f89237d3d35..6950df3a0b8 100644 --- a/lang/mono/patches/patch-ar +++ b/lang/mono/patches/patch-ar @@ -1,7 +1,7 @@ -$NetBSD: patch-ar,v 1.5 2013/05/29 11:11:12 wiz Exp $ ---- data/net_2_0/Makefile.in.orig 2012-12-05 17:50:24.000000000 +0000 +$NetBSD: patch-ar,v 1.6 2014/11/30 08:40:51 spz Exp $ +--- data/net_2_0/Makefile.in.orig 2014-10-04 09:28:58.000000000 +0000 +++ data/net_2_0/Makefile.in -@@ -322,7 +322,7 @@ top_build_prefix = @top_build_prefix@ +@@ -412,7 +412,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = Browsers diff --git a/lang/mono/patches/patch-as b/lang/mono/patches/patch-as index 300faf3ff82..1fc65f0a4b0 100644 --- a/lang/mono/patches/patch-as +++ b/lang/mono/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.3 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-as,v 1.4 2014/11/30 08:40:51 spz Exp $ From FreeBSD: https://bugzilla.novell.com/show_bug.cgi?id=528830 ---- mono/metadata/appdomain.c.orig 2014-08-12 16:50:38.000000000 +0000 +--- mono/metadata/appdomain.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/metadata/appdomain.c -@@ -2457,6 +2457,11 @@ mono_domain_try_unload (MonoDomain *doma +@@ -2476,6 +2476,11 @@ mono_domain_try_unload (MonoDomain *doma CloseHandle (thread_handle); unload_data_unref (thread_data); return; diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba index f1b9de11617..6fe873f5936 100644 --- a/lang/mono/patches/patch-ba +++ b/lang/mono/patches/patch-ba @@ -1,7 +1,7 @@ -$NetBSD: patch-ba,v 1.10 2014/08/21 07:49:56 wiz Exp $ ---- mono/cil/Makefile.in.orig 2014-08-12 16:51:01.000000000 +0000 +$NetBSD: patch-ba,v 1.11 2014/11/30 08:40:51 spz Exp $ +--- mono/cil/Makefile.in.orig 2014-10-04 09:28:59.000000000 +0000 +++ mono/cil/Makefile.in -@@ -589,7 +589,7 @@ uninstall-am: uninstall-defDATA uninstal +@@ -593,7 +593,7 @@ uninstall-am: uninstall-defDATA uninstal uninstall-am uninstall-defDATA uninstall-xmlDATA opcode.def: make-opcodes-def.pl cil-opcodes.xml diff --git a/lang/mono/patches/patch-bc b/lang/mono/patches/patch-bc index d3ac55418f8..2fffbd4d470 100644 --- a/lang/mono/patches/patch-bc +++ b/lang/mono/patches/patch-bc @@ -1,8 +1,8 @@ -$NetBSD: patch-bc,v 1.7 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-bc,v 1.8 2014/11/30 08:40:51 spz Exp $ ---- mono/mini/Makefile.in.orig 2012-12-05 17:50:32.000000000 +0000 +--- mono/mini/Makefile.in.orig 2014-10-04 09:29:00.000000000 +0000 +++ mono/mini/Makefile.in -@@ -3915,15 +3915,15 @@ mbench: test.exe +@@ -3018,15 +3018,15 @@ mbench: test.exe stat1: mono bench.exe $(RUNTIME) --verbose --statfile stats.pl --regression bench.exe diff --git a/lang/mono/patches/patch-bd b/lang/mono/patches/patch-bd index ded5b19810c..6a0e761691b 100644 --- a/lang/mono/patches/patch-bd +++ b/lang/mono/patches/patch-bd @@ -1,14 +1,17 @@ -$NetBSD: patch-bd,v 1.5 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-bd,v 1.6 2014/11/30 08:40:51 spz Exp $ Add MANDIR, but don't hardcode it (fixed in post-patch by SUBST_*). ---- mcs/build/config-default.make.orig 2014-08-09 11:10:40.000000000 +0000 +--- mcs/build/config-default.make.orig 2014-09-22 13:23:05.000000000 +0000 +++ mcs/build/config-default.make -@@ -19,6 +19,7 @@ CFLAGS = -g -O2 +@@ -17,8 +17,9 @@ LIBRARY_FLAGS = /noconfig + ifndef CFLAGS + CFLAGS = -g -O2 endif - prefix = /usr/local +-prefix = /usr/local ++prefix = /usr/pkg exec_prefix = $(prefix) -+mandir = $(prefix)/MANDIR ++mandir = $(prefix)/man mono_libdir = $(exec_prefix)/lib sysconfdir = $(prefix)/etc #RUNTIME = mono diff --git a/lang/mono/patches/patch-be b/lang/mono/patches/patch-be index f2e9d06cfe9..216f0da873d 100644 --- a/lang/mono/patches/patch-be +++ b/lang/mono/patches/patch-be @@ -1,6 +1,6 @@ -$NetBSD: patch-be,v 1.4 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-be,v 1.5 2014/11/30 08:40:51 spz Exp $ ---- support/sys-mman.c.orig 2014-08-09 11:10:44.000000000 +0000 +--- support/sys-mman.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ support/sys-mman.c @@ -10,7 +10,6 @@ #include <config.h> diff --git a/lang/mono/patches/patch-bf b/lang/mono/patches/patch-bf index 025094a45b8..37fe6a0761f 100644 --- a/lang/mono/patches/patch-bf +++ b/lang/mono/patches/patch-bf @@ -1,7 +1,7 @@ -$NetBSD: patch-bf,v 1.3 2013/05/29 11:11:12 wiz Exp $ ---- support/map.c.orig 2012-12-05 17:44:30.000000000 +0000 +$NetBSD: patch-bf,v 1.4 2014/11/30 08:40:51 spz Exp $ +--- support/map.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ support/map.c -@@ -3282,13 +3282,21 @@ int Mono_Posix_ToMountFlags (guint64 x, +@@ -3623,13 +3623,21 @@ int Mono_Posix_ToMountFlags (guint64 x, int Mono_Posix_FromMremapFlags (guint64 x, guint64 *r) { diff --git a/lang/mono/patches/patch-bi b/lang/mono/patches/patch-bi index 01631755c4f..2fb921e9f32 100644 --- a/lang/mono/patches/patch-bi +++ b/lang/mono/patches/patch-bi @@ -1,5 +1,5 @@ -$NetBSD: patch-bi,v 1.2 2013/05/29 11:11:12 wiz Exp $ ---- mono/metadata/filewatcher.c.orig 2012-12-05 17:44:34.000000000 +0000 +$NetBSD: patch-bi,v 1.3 2014/11/30 08:40:51 spz Exp $ +--- mono/metadata/filewatcher.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/metadata/filewatcher.c @@ -45,9 +45,6 @@ static int (*FAMNextEvent) (gpointer, gp gint diff --git a/lang/mono/patches/patch-cc b/lang/mono/patches/patch-cc index 6015e1b9868..093c29941da 100644 --- a/lang/mono/patches/patch-cc +++ b/lang/mono/patches/patch-cc @@ -1,4 +1,4 @@ -$NetBSD: patch-cc,v 1.5 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-cc,v 1.6 2014/11/30 08:40:51 spz Exp $ Currently mono is not copying the domain default context for some of the newly created threads. This leads to some problems with programs @@ -9,9 +9,9 @@ issue until further investigations for pkgsrc-2010Q3 release. Bug tracking: https://bugzilla.novell.com/show_bug.cgi?id=599485 ---- mono/metadata/domain.c.orig 2012-12-05 17:44:34.000000000 +0000 +--- mono/metadata/domain.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/metadata/domain.c -@@ -2305,7 +2305,18 @@ mono_context_set (MonoAppContext * new_c +@@ -2359,7 +2359,18 @@ mono_context_set (MonoAppContext * new_c MonoAppContext * mono_context_get (void) { diff --git a/lang/mono/patches/patch-da b/lang/mono/patches/patch-da index a4313c13cb4..43c9770f750 100644 --- a/lang/mono/patches/patch-da +++ b/lang/mono/patches/patch-da @@ -1,8 +1,8 @@ -$NetBSD: patch-da,v 1.5 2013/09/13 20:47:55 jperkin Exp $ +$NetBSD: patch-da,v 1.6 2014/11/30 08:40:51 spz Exp $ Support 64-bit SunOS. ---- libgc/include/private/gcconfig.h.orig 2013-04-25 09:01:57.000000000 +0000 +--- libgc/include/private/gcconfig.h.orig 2014-09-22 13:23:05.000000000 +0000 +++ libgc/include/private/gcconfig.h @@ -169,6 +169,11 @@ # define SUNOS5 @@ -59,7 +59,7 @@ Support 64-bit SunOS. # define HEURISTIC2 # ifdef __ELF__ # define DATASTART GC_data_start -@@ -1383,6 +1403,10 @@ +@@ -1390,6 +1410,10 @@ # endif # ifdef NETBSD # define OS_TYPE "NETBSD" @@ -70,7 +70,7 @@ Support 64-bit SunOS. # ifdef __ELF__ # define DYNAMIC_LOADING # endif -@@ -1544,6 +1568,10 @@ +@@ -1551,6 +1575,10 @@ # if defined(NETBSD) # define ALIGNMENT 4 # define OS_TYPE "NETBSD" @@ -81,7 +81,7 @@ Support 64-bit SunOS. # define HEURISTIC2 # define USE_GENERIC_PUSH_REGS # ifdef __ELF__ -@@ -1670,6 +1698,10 @@ +@@ -1677,6 +1705,10 @@ # endif # ifdef NETBSD # define OS_TYPE "NETBSD" @@ -92,7 +92,7 @@ Support 64-bit SunOS. # define HEURISTIC2 # define DATASTART GC_data_start # define ELFCLASS32 32 -@@ -1937,6 +1969,10 @@ +@@ -1944,6 +1976,10 @@ # define ALIGNMENT 4 # ifdef NETBSD # define OS_TYPE "NETBSD" @@ -103,7 +103,7 @@ Support 64-bit SunOS. # define HEURISTIC2 # ifdef __ELF__ # define DATASTART GC_data_start -@@ -2034,6 +2070,10 @@ +@@ -2041,6 +2077,10 @@ # endif # ifdef NETBSD # define OS_TYPE "NETBSD" @@ -114,7 +114,7 @@ Support 64-bit SunOS. # define HEURISTIC2 # define DATASTART GC_data_start # define USE_GENERIC_PUSH_REGS -@@ -2145,6 +2185,10 @@ +@@ -2159,6 +2199,10 @@ # endif # ifdef NETBSD # define OS_TYPE "NETBSD" @@ -125,7 +125,7 @@ Support 64-bit SunOS. # ifdef __ELF__ # define DYNAMIC_LOADING # endif -@@ -2152,6 +2196,29 @@ +@@ -2166,6 +2210,29 @@ extern char etext[]; # define SEARCH_FOR_DATA_START # endif diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db index eb779822f6b..b4f343d0363 100644 --- a/lang/mono/patches/patch-db +++ b/lang/mono/patches/patch-db @@ -1,5 +1,5 @@ -$NetBSD: patch-db,v 1.8 2014/08/21 07:49:56 wiz Exp $ ---- mono/utils/mono-proclib.c.orig 2014-08-12 16:50:38.000000000 +0000 +$NetBSD: patch-db,v 1.9 2014/11/30 08:40:51 spz Exp $ +--- mono/utils/mono-proclib.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/utils/mono-proclib.c @@ -19,23 +19,28 @@ #include <process.h> diff --git a/lang/mono/patches/patch-dc b/lang/mono/patches/patch-dc index b577f0160b6..1a68aaf356f 100644 --- a/lang/mono/patches/patch-dc +++ b/lang/mono/patches/patch-dc @@ -1,12 +1,12 @@ -$NetBSD: patch-dc,v 1.6 2013/05/29 11:11:12 wiz Exp $ ---- mono/mini/mini-x86.h.orig 2012-12-05 17:44:33.000000000 +0000 +$NetBSD: patch-dc,v 1.7 2014/11/30 08:40:51 spz Exp $ +--- mono/mini/mini-x86.h.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/mini/mini-x86.h @@ -48,7 +48,7 @@ struct sigcontext { #endif /* __HAIKU__ */ #if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || \ -- defined(__FreeBSD__) || defined(__OpenBSD__) -+ defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +- defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) ++ defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) #define MONO_ARCH_USE_SIGACTION #endif diff --git a/lang/mono/patches/patch-de b/lang/mono/patches/patch-de index 19cefda5400..53af8da6a63 100644 --- a/lang/mono/patches/patch-de +++ b/lang/mono/patches/patch-de @@ -1,5 +1,5 @@ -$NetBSD: patch-de,v 1.4 2013/05/29 11:11:12 wiz Exp $ ---- ikvm-native/jni.c.orig 2012-12-05 17:44:37.000000000 +0000 +$NetBSD: patch-de,v 1.5 2014/11/30 08:40:51 spz Exp $ +--- ikvm-native/jni.c.orig 2014-09-22 13:23:05.000000000 +0000 +++ ikvm-native/jni.c @@ -28,7 +28,7 @@ #include <malloc.h> diff --git a/lang/mono/patches/patch-df b/lang/mono/patches/patch-df index 31e65f78890..5201698b527 100644 --- a/lang/mono/patches/patch-df +++ b/lang/mono/patches/patch-df @@ -1,5 +1,5 @@ -$NetBSD: patch-df,v 1.4 2013/05/29 11:11:12 wiz Exp $ ---- support/mph.h.orig 2012-12-05 17:44:30.000000000 +0000 +$NetBSD: patch-df,v 1.5 2014/11/30 08:40:51 spz Exp $ +--- support/mph.h.orig 2014-09-22 13:23:09.000000000 +0000 +++ support/mph.h @@ -36,7 +36,7 @@ #include <stdint.h> /* for SIZE_MAX */ diff --git a/lang/mono/patches/patch-dh b/lang/mono/patches/patch-dh index 9520215c754..b9d2dadea11 100644 --- a/lang/mono/patches/patch-dh +++ b/lang/mono/patches/patch-dh @@ -1,7 +1,7 @@ -$NetBSD: patch-dh,v 1.4 2014/08/21 07:49:56 wiz Exp $ ---- mono/mini/mini-x86.c.orig 2014-08-12 16:50:38.000000000 +0000 +$NetBSD: patch-dh,v 1.5 2014/11/30 08:40:51 spz Exp $ +--- mono/mini/mini-x86.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/mini/mini-x86.c -@@ -239,7 +239,7 @@ static const guint32 *callconv_param_reg +@@ -242,7 +242,7 @@ static const guint32 *callconv_param_reg } } diff --git a/lang/mono/patches/patch-di b/lang/mono/patches/patch-di index e6c954da8d0..dec8138bf56 100644 --- a/lang/mono/patches/patch-di +++ b/lang/mono/patches/patch-di @@ -1,7 +1,7 @@ -$NetBSD: patch-di,v 1.5 2013/05/29 11:11:12 wiz Exp $ ---- mono/tests/libtest.c.orig 2012-12-05 17:44:31.000000000 +0000 +$NetBSD: patch-di,v 1.6 2014/11/30 08:40:51 spz Exp $ +--- mono/tests/libtest.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/tests/libtest.c -@@ -3297,7 +3297,7 @@ mono_test_marshal_ccw_itest (MonoComObje +@@ -3463,7 +3463,7 @@ mono_test_marshal_ccw_itest (MonoComObje * mono_method_get_unmanaged_thunk tests */ diff --git a/lang/mono/patches/patch-dj b/lang/mono/patches/patch-dj index 93dfe9ca405..ebab7579c07 100644 --- a/lang/mono/patches/patch-dj +++ b/lang/mono/patches/patch-dj @@ -1,9 +1,9 @@ -$NetBSD: patch-dj,v 1.2 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-dj,v 1.3 2014/11/30 08:40:51 spz Exp $ Although DragonFly has a POSIX.1e implementation, it's too old at the moment to be usable here. ---- support/sys-xattr.c.orig 2012-12-05 17:44:30.000000000 +0000 +--- support/sys-xattr.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ support/sys-xattr.c @@ -11,7 +11,7 @@ diff --git a/lang/mono/patches/patch-dk b/lang/mono/patches/patch-dk index 3ff7f5aaa6f..11c17c710c4 100644 --- a/lang/mono/patches/patch-dk +++ b/lang/mono/patches/patch-dk @@ -1,8 +1,8 @@ -$NetBSD: patch-dk,v 1.3 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-dk,v 1.4 2014/11/30 08:40:51 spz Exp $ ---- libgc/include/gc.h.orig 2012-12-05 17:44:36.000000000 +0000 +--- libgc/include/gc.h.orig 2014-09-22 13:23:05.000000000 +0000 +++ libgc/include/gc.h -@@ -521,6 +521,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of +@@ -526,6 +526,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of /* This may also be desirable if it is possible but expensive to */ /* retrieve the call chain. */ #if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \ diff --git a/lang/mono/patches/patch-dl b/lang/mono/patches/patch-dl index f6bf4f8e243..64f0b1058e5 100644 --- a/lang/mono/patches/patch-dl +++ b/lang/mono/patches/patch-dl @@ -1,8 +1,8 @@ -$NetBSD: patch-dl,v 1.4 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-dl,v 1.5 2014/11/30 08:40:51 spz Exp $ SunOS needs unistd.h for sysconf(). ---- mono/utils/dlmalloc.c.orig 2014-08-09 11:10:44.000000000 +0000 +--- mono/utils/dlmalloc.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/utils/dlmalloc.c @@ -1208,11 +1208,14 @@ int mspace_mallopt(int, int); #ifndef LACKS_UNISTD_H diff --git a/lang/mono/patches/patch-dm b/lang/mono/patches/patch-dm index 4b51cb7cd45..ca1bea2925b 100644 --- a/lang/mono/patches/patch-dm +++ b/lang/mono/patches/patch-dm @@ -1,6 +1,6 @@ -$NetBSD: patch-dm,v 1.2 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-dm,v 1.3 2014/11/30 08:40:51 spz Exp $ ---- mono/utils/mono-time.c.orig 2012-12-05 17:44:35.000000000 +0000 +--- mono/utils/mono-time.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/utils/mono-time.c @@ -65,7 +65,7 @@ mono_100ns_datetime (void) #include <sys/time.h> diff --git a/lang/mono/patches/patch-dn b/lang/mono/patches/patch-dn index 599c5429a02..0c1cb785458 100644 --- a/lang/mono/patches/patch-dn +++ b/lang/mono/patches/patch-dn @@ -1,10 +1,10 @@ -$NetBSD: patch-dn,v 1.2 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-dn,v 1.3 2014/11/30 08:40:51 spz Exp $ http://gnats.netbsd.org/45201 ---- mono/mini/mini-amd64.h.orig 2012-12-05 17:44:32.000000000 +0000 +--- mono/mini/mini-amd64.h.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/mini/mini-amd64.h -@@ -252,6 +252,10 @@ typedef struct MonoCompileArch { +@@ -279,6 +279,10 @@ typedef struct { #define MONO_ARCH_NOMAP32BIT diff --git a/lang/mono/patches/patch-do b/lang/mono/patches/patch-do index e9ab881fc30..0e550038f9f 100644 --- a/lang/mono/patches/patch-do +++ b/lang/mono/patches/patch-do @@ -1,6 +1,6 @@ -$NetBSD: patch-do,v 1.2 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-do,v 1.3 2014/11/30 08:40:51 spz Exp $ ---- libgc/headers.c.orig 2012-12-05 17:44:36.000000000 +0000 +--- libgc/headers.c.orig 2014-09-22 13:23:05.000000000 +0000 +++ libgc/headers.c @@ -139,6 +139,8 @@ void GC_init_headers() register unsigned i; diff --git a/lang/mono/patches/patch-man_mprof-report.1 b/lang/mono/patches/patch-man_mprof-report.1 index 9c19fb148cf..76a3e9e6851 100644 --- a/lang/mono/patches/patch-man_mprof-report.1 +++ b/lang/mono/patches/patch-man_mprof-report.1 @@ -1,8 +1,8 @@ -$NetBSD: patch-man_mprof-report.1,v 1.2 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-man_mprof-report.1,v 1.3 2014/11/30 08:40:51 spz Exp $ Fix mandoc -Tlint warnings. ---- man/mprof-report.1.orig 2012-12-05 17:44:37.000000000 +0000 +--- man/mprof-report.1.orig 2014-09-22 13:23:05.000000000 +0000 +++ man/mprof-report.1 @@ -1,4 +1,4 @@ -.TH mprof-report 1 "" diff --git a/lang/mono/patches/patch-mono_io-layer_sockets.c b/lang/mono/patches/patch-mono_io-layer_sockets.c index a19006d5fdb..d23919222db 100644 --- a/lang/mono/patches/patch-mono_io-layer_sockets.c +++ b/lang/mono/patches/patch-mono_io-layer_sockets.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mono_io-layer_sockets.c,v 1.1 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-mono_io-layer_sockets.c,v 1.2 2014/11/30 08:40:51 spz Exp $ Use getprotoent() instead of hardcoding SOL_TCP on NetBSD. ---- mono/io-layer/sockets.c.orig 2012-12-05 17:44:35.000000000 +0000 +--- mono/io-layer/sockets.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/io-layer/sockets.c @@ -46,6 +46,9 @@ #include <netinet/in.h> diff --git a/lang/mono/patches/patch-mono_mini_mini-arm.c b/lang/mono/patches/patch-mono_mini_mini-arm.c index b0f4f43b522..cabc3e38f8e 100644 --- a/lang/mono/patches/patch-mono_mini_mini-arm.c +++ b/lang/mono/patches/patch-mono_mini_mini-arm.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mono_mini_mini-arm.c,v 1.3 2014/09/23 22:26:24 jmcneill Exp $ +$NetBSD: patch-mono_mini_mini-arm.c,v 1.4 2014/11/30 08:40:51 spz Exp $ ---- mono/mini/mini-arm.c.orig 2014-08-12 16:50:38.000000000 +0000 +--- mono/mini/mini-arm.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/mini/mini-arm.c -@@ -53,6 +53,11 @@ +@@ -54,6 +54,11 @@ #define IS_VFP (TRUE) #endif @@ -14,7 +14,7 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.3 2014/09/23 22:26:24 jmcneill Exp $ #if defined(__ARM_EABI__) && defined(__linux__) && !defined(PLATFORM_ANDROID) && !defined(__native_client__) #define HAVE_AEABI_READ_TP 1 #endif -@@ -891,6 +896,10 @@ void +@@ -897,6 +902,10 @@ void mono_arch_init (void) { const char *cpu_arch; @@ -23,9 +23,9 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.3 2014/09/23 22:26:24 jmcneill Exp $ + size_t len; +#endif - InitializeCriticalSection (&mini_arch_mutex); + mono_mutex_init_recursive (&mini_arch_mutex); #ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED -@@ -942,6 +951,32 @@ mono_arch_init (void) +@@ -948,6 +957,32 @@ mono_arch_init (void) have a way to properly detect CPU features on it. */ thumb_supported = TRUE; iphone_abi = TRUE; @@ -58,7 +58,7 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.3 2014/09/23 22:26:24 jmcneill Exp $ #else thumb_supported = mono_hwcap_arm_has_thumb; thumb2_supported = mono_hwcap_arm_has_thumb2; -@@ -1154,6 +1189,11 @@ mono_arch_flush_icache (guint8 *code, gi +@@ -1160,6 +1195,11 @@ mono_arch_flush_icache (guint8 *code, gi #ifdef MONO_CROSS_COMPILE #elif __APPLE__ sys_icache_invalidate (code, size); diff --git a/lang/mono/patches/patch-mono_profiler_proflog.c b/lang/mono/patches/patch-mono_profiler_proflog.c index afe5306dec7..4386900f36e 100644 --- a/lang/mono/patches/patch-mono_profiler_proflog.c +++ b/lang/mono/patches/patch-mono_profiler_proflog.c @@ -1,10 +1,10 @@ -$NetBSD: patch-mono_profiler_proflog.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $ +$NetBSD: patch-mono_profiler_proflog.c,v 1.2 2014/11/30 08:40:51 spz Exp $ SunOS libelf does not support largefile. ---- mono/profiler/proflog.c.orig 2013-04-25 09:01:57.000000000 +0000 +--- mono/profiler/proflog.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/profiler/proflog.c -@@ -36,6 +36,10 @@ +@@ -38,6 +38,10 @@ #ifdef HAVE_EXECINFO_H #include <execinfo.h> #endif diff --git a/lang/mono/patches/patch-mono_unit-tests_Makefile.in b/lang/mono/patches/patch-mono_unit-tests_Makefile.in index d7fd90ee767..2b13c53bb39 100644 --- a/lang/mono/patches/patch-mono_unit-tests_Makefile.in +++ b/lang/mono/patches/patch-mono_unit-tests_Makefile.in @@ -1,19 +1,21 @@ -$NetBSD: patch-mono_unit-tests_Makefile.in,v 1.1 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-mono_unit-tests_Makefile.in,v 1.2 2014/11/30 08:40:51 spz Exp $ ---- mono/unit-tests/Makefile.in.orig 2014-08-12 16:51:02.000000000 +0000 +--- mono/unit-tests/Makefile.in.orig 2014-10-04 09:29:01.000000000 +0000 +++ mono/unit-tests/Makefile.in -@@ -79,12 +79,8 @@ POST_UNINSTALL = : +@@ -79,14 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ --@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@noinst_PROGRAMS = test-sgen-qsort$(EXEEXT) \ --@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@ test-gc-memfuncs$(EXEEXT) \ --@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@ test-mono-linked-list-set$(EXEEXT) --@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@TESTS = test-sgen-qsort$(EXEEXT) \ --@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@ test-gc-memfuncs$(EXEEXT) \ --@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@ test-mono-linked-list-set$(EXEEXT) -+@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@noinst_PROGRAMS = -+@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@SUPPORT_BOEHM_TRUE@TESTS = +-@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@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@noinst_PROGRAMS = ++@CROSS_COMPILE_FALSE@@HOST_WIN32_FALSE@@PLATFORM_GNU_FALSE@@SUPPORT_BOEHM_TRUE@TESTS = subdir = mono/unit-tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp \ diff --git a/lang/mono/patches/patch-mono_utils_Makefile.in b/lang/mono/patches/patch-mono_utils_Makefile.in new file mode 100644 index 00000000000..2de89019599 --- /dev/null +++ b/lang/mono/patches/patch-mono_utils_Makefile.in @@ -0,0 +1,38 @@ +$NetBSD: patch-mono_utils_Makefile.in,v 1.1 2014/11/30 08:40:51 spz Exp $ + +--- mono/utils/Makefile.in.orig 2014-10-04 09:29:01.000000000 +0000 ++++ mono/utils/Makefile.in +@@ -144,6 +144,7 @@ am__libmonoutils_la_SOURCES_DIST = mono- + mono-threads-mach.c mono-threads-mach-helper.c \ + mono-threads-windows.c mono-threads-linux.c \ + mono-threads-freebsd.c mono-threads-openbsd.c \ ++ mono-threads-netbsd.c mono-threads-dragonfly.c \ + mono-threads-android.c mono-threads.h mono-tls.h mono-tls.c \ + linux_magic.h mono-memory-model.h atomic.h atomic.c \ + mono-hwcap.h mono-hwcap.c bsearch.h bsearch.c \ +@@ -170,6 +171,7 @@ am__objects_1 = mono-md5.lo mono-sha1.lo + mono-threads-mach.lo mono-threads-mach-helper.lo \ + mono-threads-windows.lo mono-threads-linux.lo \ + mono-threads-freebsd.lo mono-threads-openbsd.lo \ ++ mono-threads-netbsd.lo mono-threads-dragonfly.lo \ + mono-threads-android.lo mono-tls.lo atomic.lo mono-hwcap.lo \ + bsearch.lo mono-conc-hashtable.lo sha1.lo + @CROSS_COMPILE_FALSE@@X86_TRUE@am__objects_2 = mach-support-x86.lo +@@ -585,6 +587,8 @@ monoutils_sources = \ + mono-threads-linux.c \ + mono-threads-freebsd.c \ + mono-threads-openbsd.c \ ++ mono-threads-netbsd.c \ ++ mono-threads-dragonfly.c \ + mono-threads-android.c \ + mono-threads.h \ + mono-tls.h \ +@@ -726,6 +730,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-mach-helper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-mach.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-openbsd.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-netbsd.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-dragonfly.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-posix.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-windows.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads.Plo@am__quote@ diff --git a/lang/mono/patches/patch-mono_utils_mono-compiler.h b/lang/mono/patches/patch-mono_utils_mono-compiler.h index 2aec2244eef..1b18e1e21f0 100644 --- a/lang/mono/patches/patch-mono_utils_mono-compiler.h +++ b/lang/mono/patches/patch-mono_utils_mono-compiler.h @@ -1,9 +1,9 @@ -$NetBSD: patch-mono_utils_mono-compiler.h,v 1.2 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-mono_utils_mono-compiler.h,v 1.3 2014/11/30 08:40:51 spz Exp $ Make sure that TLS variables are actually emitted, since the compiler doesn't see all references. ---- mono/utils/mono-compiler.h.orig 2012-12-05 17:44:35.000000000 +0000 +--- mono/utils/mono-compiler.h.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/utils/mono-compiler.h @@ -36,7 +36,7 @@ #if defined(PIC) diff --git a/lang/mono/patches/patch-mono_utils_mono-mmap.c b/lang/mono/patches/patch-mono_utils_mono-mmap.c index 9b8846630cf..40096a66dcf 100644 --- a/lang/mono/patches/patch-mono_utils_mono-mmap.c +++ b/lang/mono/patches/patch-mono_utils_mono-mmap.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mono_utils_mono-mmap.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $ +$NetBSD: patch-mono_utils_mono-mmap.c,v 1.2 2014/11/30 08:40:51 spz 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.orig 2014-09-22 13:23:09.000000000 +0000 +++ mono/utils/mono-mmap.c @@ -431,7 +431,7 @@ mono_mprotect (void *addr, size_t length memset (addr, 0, length); diff --git a/lang/mono/patches/patch-mono_utils_mono-threads-dragonfly.c b/lang/mono/patches/patch-mono_utils_mono-threads-dragonfly.c new file mode 100644 index 00000000000..5245669617d --- /dev/null +++ b/lang/mono/patches/patch-mono_utils_mono-threads-dragonfly.c @@ -0,0 +1,30 @@ +$NetBSD: patch-mono_utils_mono-threads-dragonfly.c,v 1.1 2014/11/30 08:40:51 spz Exp $ + +--- mono/utils/mono-threads-dragonfly.c.orig 2014-11-29 21:20:20.000000000 +0000 ++++ mono/utils/mono-threads-dragonfly.c +@@ -0,0 +1,25 @@ ++#include <config.h> ++ ++#if defined(__FreeBSD__) ++ ++#include <mono/utils/mono-threads.h> ++#include <pthread.h> ++#include <pthread_np.h> ++ ++ ++void ++mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize) ++{ ++ pthread_attr_t attr; ++ ++ *staddr = NULL; ++ *stsize = (size_t)-1; ++ ++ pthread_attr_init (&attr); ++ pthread_attr_get_np (pthread_self (), &attr); ++ ++ pthread_attr_getstack (&attr, (void**)staddr, stsize); ++ pthread_attr_destroy (&attr); ++} ++ ++#endif diff --git a/lang/mono/patches/patch-mono_utils_mono-threads-freebsd.c b/lang/mono/patches/patch-mono_utils_mono-threads-freebsd.c new file mode 100644 index 00000000000..ee26316d80f --- /dev/null +++ b/lang/mono/patches/patch-mono_utils_mono-threads-freebsd.c @@ -0,0 +1,20 @@ +$NetBSD: patch-mono_utils_mono-threads-freebsd.c,v 1.1 2014/11/30 08:40:51 spz Exp $ + +--- mono/utils/mono-threads-freebsd.c.orig 2014-09-22 13:23:09.000000000 +0000 ++++ mono/utils/mono-threads-freebsd.c +@@ -2,14 +2,14 @@ + + #if defined(__FreeBSD__) + ++#include <mono/utils/mono-threads.h> + #include <pthread.h> + #include <pthread_np.h> + + void + mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize) + { + pthread_attr_t attr; +- guint8 *current = (guint8*)&attr; + + *staddr = NULL; + *stsize = (size_t)-1; diff --git a/lang/mono/patches/patch-mono_utils_mono-threads-netbsd.c b/lang/mono/patches/patch-mono_utils_mono-threads-netbsd.c new file mode 100644 index 00000000000..991fd4c7f39 --- /dev/null +++ b/lang/mono/patches/patch-mono_utils_mono-threads-netbsd.c @@ -0,0 +1,28 @@ +$NetBSD: patch-mono_utils_mono-threads-netbsd.c,v 1.1 2014/11/30 08:40:51 spz Exp $ + +--- mono/utils/mono-threads-netbsd.c.orig 2014-11-29 21:20:20.000000000 +0000 ++++ mono/utils/mono-threads-netbsd.c +@@ -0,0 +1,23 @@ ++#include <config.h> ++ ++#if defined(__NetBSD__) ++ ++#include <mono/utils/mono-threads.h> ++#include <pthread.h> ++ ++void ++mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize) ++{ ++ pthread_attr_t attr; ++ ++ *staddr = NULL; ++ *stsize = (size_t)-1; ++ ++ pthread_attr_init (&attr); ++ pthread_attr_get_np (pthread_self (), &attr); ++ ++ pthread_attr_getstack (&attr, (void**)staddr, stsize); ++ pthread_attr_destroy (&attr); ++} ++ ++#endif diff --git a/lang/mono/patches/patch-mono_utils_mono-threads-posix.c b/lang/mono/patches/patch-mono_utils_mono-threads-posix.c index d16ef229f87..321fb810b25 100644 --- a/lang/mono/patches/patch-mono_utils_mono-threads-posix.c +++ b/lang/mono/patches/patch-mono_utils_mono-threads-posix.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mono_utils_mono-threads-posix.c,v 1.1 2014/08/21 07:49:56 wiz Exp $ +$NetBSD: patch-mono_utils_mono-threads-posix.c,v 1.2 2014/11/30 08:40:51 spz Exp $ ---- mono/utils/mono-threads-posix.c.orig 2014-08-09 11:10:44.000000000 +0000 +--- mono/utils/mono-threads-posix.c.orig 2014-10-04 09:27:43.000000000 +0000 +++ mono/utils/mono-threads-posix.c -@@ -543,13 +543,21 @@ mono_threads_core_set_name (MonoNativeTh +@@ -420,13 +420,21 @@ mono_threads_core_set_name (MonoNativeTh { #ifdef HAVE_PTHREAD_SETNAME_NP if (!name) { diff --git a/lang/mono/patches/patch-mono_utils_mono-threads-solaris.c b/lang/mono/patches/patch-mono_utils_mono-threads-solaris.c new file mode 100644 index 00000000000..f1267342411 --- /dev/null +++ b/lang/mono/patches/patch-mono_utils_mono-threads-solaris.c @@ -0,0 +1,24 @@ +$NetBSD: patch-mono_utils_mono-threads-solaris.c,v 1.1 2014/11/30 08:40:51 spz Exp $ + +--- mono/utils/mono-threads-solaris.c.orig 2014-11-29 21:53:35.000000000 +0000 ++++ mono/utils/mono-threads-solaris.c +@@ -0,0 +1,19 @@ ++#include <config.h> ++ ++#if defined(PLATFORM_SOLARIS) ++ ++#include <mono/utils/mono-threads.h> ++#include <pthread.h> ++ ++void ++mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize) ++{ ++ pthread_attr_t attr; ++ pthread_attr_init (&attr); ++ pthread_attr_getstacksize (&attr, &stsize); ++ pthread_attr_destroy (&attr); ++ *staddr = NULL; ++ return; ++} ++ ++#endif diff --git a/lang/mono/patches/patch-po_Makefile.in b/lang/mono/patches/patch-po_Makefile.in index 9deef5355d1..08248d03a29 100644 --- a/lang/mono/patches/patch-po_Makefile.in +++ b/lang/mono/patches/patch-po_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-po_Makefile.in,v 1.1 2013/05/29 11:11:12 wiz Exp $ +$NetBSD: patch-po_Makefile.in,v 1.2 2014/11/30 08:40:51 spz Exp $ ---- po/Makefile.in.orig 2013-04-25 09:08:53.000000000 +0000 +--- po/Makefile.in.orig 2014-10-04 09:29:01.000000000 +0000 +++ po/Makefile.in -@@ -321,7 +321,7 @@ target_vendor = @target_vendor@ +@@ -381,7 +381,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/lang/mono/patches/patch-support_signal.c b/lang/mono/patches/patch-support_signal.c index 7b27566aa94..af3b945dbd5 100644 --- a/lang/mono/patches/patch-support_signal.c +++ b/lang/mono/patches/patch-support_signal.c @@ -1,8 +1,8 @@ -$NetBSD: patch-support_signal.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $ +$NetBSD: patch-support_signal.c,v 1.2 2014/11/30 08:40:51 spz Exp $ Add necessary includes on SunOS. ---- support/signal.c.orig 2013-04-25 09:01:58.000000000 +0000 +--- support/signal.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ support/signal.c @@ -31,6 +31,10 @@ #include <mono/metadata/appdomain.h> diff --git a/lang/mono/patches/patch-support_time.c b/lang/mono/patches/patch-support_time.c index 182a6068821..a4a2bf05b3a 100644 --- a/lang/mono/patches/patch-support_time.c +++ b/lang/mono/patches/patch-support_time.c @@ -1,8 +1,8 @@ -$NetBSD: patch-support_time.c,v 1.1 2013/06/05 17:03:55 jperkin Exp $ +$NetBSD: patch-support_time.c,v 1.2 2014/11/30 08:40:51 spz Exp $ Add necessary includes on SunOS. ---- support/time.c.orig 2013-04-25 09:01:57.000000000 +0000 +--- support/time.c.orig 2014-09-22 13:23:09.000000000 +0000 +++ support/time.c @@ -10,6 +10,9 @@ #define _SVID_SOURCE |