pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mono38: Refresh patches (they will be fixed)

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Aug 10 02:21:59 2016 +0200
Changeset:	ff64c32239c79edbed0a692ed01cd9517d56295b

Modified Files:
	mono38/Makefile
	mono38/distinfo
	mono38/patches/patch-ae
	mono38/patches/patch-am
	mono38/patches/patch-bd
	mono38/patches/patch-configure
	mono38/patches/patch-data_mono-nunit.pc.in
	mono38/patches/patch-mono_metadata_mono-perfcounters.c
	mono38/patches/patch-mono_mini_mini-arm.c
Removed Files:
	mono38/patches/patch-data_Makefile.in
	mono38/patches/patch-db
	mono38/patches/patch-dc
	mono38/patches/patch-mono_dis_Makefile.in
	mono38/patches/patch-mono_metadata_icall.c
	mono38/patches/patch-mono_metadata_mono-route.c
	mono38/patches/patch-mono_unit-tests_Makefile.in
	mono38/patches/patch-mono_utils_Makefile.in

Log Message:
mono38: Refresh patches (they will be fixed)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff64c32239c79edbed0a692ed01cd9517d56295b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mono38/Makefile                                    |  1 -
 mono38/distinfo                                    | 22 ++----
 mono38/patches/patch-ae                            | 13 +---
 mono38/patches/patch-am                            | 11 +--
 mono38/patches/patch-bd                            |  6 +-
 mono38/patches/patch-configure                     | 91 +++-------------------
 mono38/patches/patch-data_Makefile.in              | 15 ----
 mono38/patches/patch-data_mono-nunit.pc.in         | 12 ++-
 mono38/patches/patch-db                            | 37 ---------
 mono38/patches/patch-dc                            | 12 ---
 mono38/patches/patch-mono_dis_Makefile.in          | 13 ----
 mono38/patches/patch-mono_metadata_icall.c         | 22 ------
 .../patch-mono_metadata_mono-perfcounters.c        | 42 +---------
 mono38/patches/patch-mono_metadata_mono-route.c    | 14 ----
 mono38/patches/patch-mono_mini_mini-arm.c          | 31 +-------
 mono38/patches/patch-mono_unit-tests_Makefile.in   | 21 -----
 mono38/patches/patch-mono_utils_Makefile.in        | 43 ----------
 17 files changed, 38 insertions(+), 368 deletions(-)

diffs:
diff --git a/mono38/Makefile b/mono38/Makefile
index d5f4c59..d907358 100644
--- a/mono38/Makefile
+++ b/mono38/Makefile
@@ -14,7 +14,6 @@ LICENSE=	mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
 BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 CONFLICTS=	pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
 ALL_ENV+=	MONO_SHARED_DIR=${WRKDIR:Q} PLATFORM=
-WRKSRC=		${WRKDIR}/mono-4.0.4
 
 USE_TOOLS+=	bash:run bison gmake gtar msgfmt perl:run pkg-config
 USE_LIBTOOL=	yes
diff --git a/mono38/distinfo b/mono38/distinfo
index 538b262..5602f11 100644
--- a/mono38/distinfo
+++ b/mono38/distinfo
@@ -6,33 +6,30 @@ SHA512 (mono-3.8.0.tar.bz2) = 1fb877e259a4dce4484402b9c15079e69402f0a2a6052f4ff1
 Size (mono-3.8.0.tar.bz2) = 73495543 bytes
 SHA1 (patch-aa) = 84e5bca2b6d9715271c343f774c81186858d90c9
 SHA1 (patch-ad) = ebd47980f0141f7cbd0c6bbcfc15942cebc263f1
-SHA1 (patch-ae) = 25869b98f9197243aea799b75b238d92f58e8845
+SHA1 (patch-ae) = 88ff54b09fb1830649af044eda3bb8d92d0d75a9
 SHA1 (patch-af) = 6a458a91dc34420d45238b5dad01ed63f0bd9e00
 SHA1 (patch-ai) = d06c382d188f4263a2a505ca3d3ee491baa3af28
 SHA1 (patch-aj) = 33b75ec2662cc442f602b21b03fee1e5c39e3a76
 SHA1 (patch-ak) = 262845edcf84cf5127b7e01963f0d433aad7682a
 SHA1 (patch-al) = 07462d3f9cf2aa08b1fb837400084d32a7062eee
-SHA1 (patch-am) = ff0af9c120ebeb59edcdb727c7d36aa5939c73af
+SHA1 (patch-am) = 69e0847ea286e6e13d53114bd403f36e94b0dbc9
 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) = a6706236caae06c5defa5c8e2488380cc64f93ab
+SHA1 (patch-bd) = 92db536887c06a387dd2f6d3640f55ca99c30409
 SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f
 SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d
 SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb
 SHA1 (patch-cc) = d26c9e04f04896f0e7b2edab61cd347d76e0fcaf
-SHA1 (patch-configure) = 20af37b1f87623504d8e70dd6b749eeb3bf0118a
+SHA1 (patch-configure) = 1aec4aef2fc693744877ad6e1bfc96594014853b
 SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd
-SHA1 (patch-data_Makefile.in) = 0c54664b1a59714c6bec02547d70eaa7dee47928
-SHA1 (patch-data_mono-nunit.pc.in) = 59e0a932727b842ac90c2d0b702481d62f72cab8
+SHA1 (patch-data_mono-nunit.pc.in) = 339d37cef5638f93826b8dc77c5953422a14433f
 SHA1 (patch-data_net_4_0_Browsers_Makefile.in) = ab4baa45dd75b87786cbc7d942611915d5ae1f72
 SHA1 (patch-data_net_4_5_Browsers_Makefile.in) = e4cab08ffa040020684edb3a9fbc8e448d2faf35
 SHA1 (patch-data_net_4_5_Makefile.in) = 778be615f4f21f2561e47e082302c09f02c6f8f6
-SHA1 (patch-db) = 185ae2e5cbac9bca99443efbc5a8ae63423656cf
-SHA1 (patch-dc) = 725c82a9ac4ae9c01045149504a6df6a64d808a3
 SHA1 (patch-de) = 0c2a123868b20236fceb93d33fa3084a1afd004c
 SHA1 (patch-df) = b2780e809d681795a6bdd9039ec890cfc9362187
 SHA1 (patch-dh) = 30f0bea7c707829247c2b426a88c4adba057e534
@@ -43,14 +40,9 @@ SHA1 (patch-dl) = dc63c1d3f6a1d78b2f5bb725cdff6824e2307dc5
 SHA1 (patch-do) = 0bda0d2e482be218fb502e0c4ea945a41d078d27
 SHA1 (patch-libgc_misc.c) = 52c68e7b6f1b58f480286bd135591f97a3e13125
 SHA1 (patch-man_mprof-report.1) = 0a80c164614cc9af5f01822005193d80f1d89946
-SHA1 (patch-mono_dis_Makefile.in) = f000112e2712faf29104489e45feae8d6fc45169
-SHA1 (patch-mono_metadata_icall.c) = 191a7fccb174855026cb11dd0f6ac450bb920ec7
-SHA1 (patch-mono_metadata_mono-perfcounters.c) = 8cfbfa62fe4201a20bc07645ccf6b13487a64fc3
-SHA1 (patch-mono_metadata_mono-route.c) = 6eb741efca0a66fae894f7c49fa8f6393079e67f
-SHA1 (patch-mono_mini_mini-arm.c) = 1c4f85a6b2a49604a6b4299f65f0c93d0c01ffa3
+SHA1 (patch-mono_metadata_mono-perfcounters.c) = f737a9234f153a4bb657d919679d343d847e521c
+SHA1 (patch-mono_mini_mini-arm.c) = 23fed9c9b6d941a13222b561c2aebfd1a00edb95
 SHA1 (patch-mono_profiler_proflog.c) = 060e8052aeedc1ee224d33644f39b8085a6c92a2
-SHA1 (patch-mono_unit-tests_Makefile.in) = 98cb082e2e0ad53c36b513a7bce9568c26e14f21
-SHA1 (patch-mono_utils_Makefile.in) = be9caeff6d687e8c686d7436db2f39f7803c231a
 SHA1 (patch-mono_utils_mono-compiler.h) = 210062c167c00500f6a9176ef94c8cd96d39c730
 SHA1 (patch-mono_utils_mono-mmap.c) = 869c24a57861fcfb1bdc8a04ed0e0d1fd5a0e0b5
 SHA1 (patch-mono_utils_mono-semaphore.c) = a47c7816445c7781e1cf0efc889dedfbf5b351f9
diff --git a/mono38/patches/patch-ae b/mono38/patches/patch-ae
index 1c9d792..1a7506b 100644
--- a/mono38/patches/patch-ae
+++ b/mono38/patches/patch-ae
@@ -1,16 +1,7 @@
 $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.orig	2014-09-04 07:29:00.000000000 +0000
 +++ libgc/configure
-@@ -5037,7 +5037,7 @@ $as_echo "$as_me: WARNING: \"Only HP/UX 
- 	$as_echo "#define USE_COMPILER_TLS 1" >>confdefs.h
- 
- 	;;
--      *-*-freebsd*)
-+      *-*-freebsd* | *-*-*dragonfly*)
- 	$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
- 
- 	if test "x$PTHREAD_CFLAGS" != "x"; then
-@@ -5078,6 +5078,8 @@ $as_echo "$as_me: WARNING: \"Only HP/UX 
+@@ -5062,6 +5062,8 @@ $as_echo "$as_me: WARNING: \"Only HP/UX 
       *-*-netbsd*)
  	$as_echo "#define GC_NETBSD_THREADS 1" >>confdefs.h
  
diff --git a/mono38/patches/patch-am b/mono38/patches/patch-am
index 7c519a6..2163846 100644
--- a/mono38/patches/patch-am
+++ b/mono38/patches/patch-am
@@ -1,6 +1,6 @@
 $NetBSD: patch-am,v 1.7 2014/11/30 08:40:51 spz Exp $
 
---- mono/io-layer/io.c.orig	2014-10-04 09:27:43.000000000 +0000
+--- mono/io-layer/io.c.orig	2014-09-04 07:25:40.000000000 +0000
 +++ mono/io-layer/io.c
 @@ -3463,7 +3463,7 @@ guint32 GetTempPath (guint32 len, gunich
  	return(ret);
@@ -11,12 +11,3 @@ $NetBSD: patch-am,v 1.7 2014/11/30 08:40:51 spz Exp $
  /* Darwin has getfsstat */
  gint32 GetLogicalDriveStrings (guint32 len, gunichar2 *buf)
  {
-@@ -4260,7 +4260,7 @@ guint32 GetDriveType(const gunichar2 *ro
- 	return (drive_type);
- }
- 
--#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/mono38/patches/patch-bd b/mono38/patches/patch-bd
index 55206c0..fd3bb6d 100644
--- a/mono38/patches/patch-bd
+++ b/mono38/patches/patch-bd
@@ -2,16 +2,16 @@ $NetBSD: patch-bd,v 1.7 2015/06/04 17:16:20 jperkin Exp $
 
 Add MANDIR, but don't hardcode it (fixed in post-patch by SUBST_*).
 
---- mcs/build/config-default.make.orig	2014-09-22 13:23:05.000000000 +0000
+--- mcs/build/config-default.make.orig	2014-08-09 11:10:40.000000000 +0000
 +++ mcs/build/config-default.make
 @@ -17,8 +17,9 @@ LIBRARY_FLAGS = /noconfig
  ifndef CFLAGS
  CFLAGS = -g -O2
  endif
 -prefix = /usr/local
-+prefix = @PREFIX@
++prefix = /usr/pkg
  exec_prefix = $(prefix)
-+mandir = @PKGMANDIR@
++mandir = man
  mono_libdir = $(exec_prefix)/lib
  sysconfdir = $(prefix)/etc
  #RUNTIME = mono
diff --git a/mono38/patches/patch-configure b/mono38/patches/patch-configure
index 0d7d309..d29179e 100644
--- a/mono38/patches/patch-configure
+++ b/mono38/patches/patch-configure
@@ -1,8 +1,8 @@
 $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
 
---- configure.orig	2015-08-04 07:48:54.000000000 +0000
+--- configure.orig	2014-09-04 07:28:57.000000000 +0000
 +++ configure
-@@ -3983,7 +3983,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1
+@@ -4025,7 +4025,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1
  		mono_cv_clang=no
  		if test "x$cross_compiling" = "xno"; then
  			target_win32=yes
@@ -11,22 +11,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
  
  $as_echo "#define TARGET_WIN32 1" >>confdefs.h
  
-@@ -4020,10 +4020,13 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
- 		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
- 		libmono_ldflags="-pthread"
- 		need_link_unlink=yes
--		libdl="-ldl"
-+		libdl="-ldl /libexec/ld.elf_so"
- 		libgc_threads=pthreads
- 		with_sigaltstack=no
- 		use_sigposix=yes
-+		cat >>confdefs.h <<\_ACEOF
-+#define PTHREAD_POINTER_ID 1
-+_ACEOF
- 		;;
- 	*-*-kfreebsd*-gnu)
- 		host_win32=no
-@@ -4036,7 +4039,7 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
+@@ -4067,7 +4067,7 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
  		with_sigaltstack=no
  		use_sigposix=yes
  		;;
@@ -35,7 +20,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
  		host_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
  			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-@@ -4052,7 +4055,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
+@@ -4083,7 +4083,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
  			LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib"
  			libmono_ldflags="$PTHREAD_LIBS"
  		fi
@@ -45,7 +30,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
  		need_link_unlink=yes
  
  $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h
-@@ -21999,9 +22003,7 @@ done
+@@ -21699,9 +21700,7 @@ done
  			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris XPG4 support" >&5
  $as_echo_n "checking for Solaris XPG4 support... " >&6; }
  			if test -f /usr/lib/libxnet.so; then
@@ -55,16 +40,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
             			LIBS="$LIBS -lxnet"
    	    			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -25084,7 +25086,7 @@ else
-   test_perf_events=no
- fi
- 
--if test "x$test_perf_events" == "xyes"; then
-+if test "x$test_perf_events" = "xyes"; then
- 
- $as_echo "#define ENABLE_PERF_EVENTS 1" >>confdefs.h
- 
-@@ -25422,7 +25424,7 @@ $as_echo_n "checking LLVM version... " >
+@@ -24919,7 +24918,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
@@ -73,16 +49,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 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
-@@ -25504,7 +25506,7 @@ LIBC="libc.so.6"
- INTL="libc.so.6"
- SQLITE="libsqlite.so.0"
- SQLITE3="libsqlite3.so.0"
--X11="libX11.so"
-+X11="/usr/X11R7/lib/libX11.so"
- GDKX11="libgdk-x11-2.0.so.0"
- GTKX11="libgtk-x11-2.0.so.0"
- XINERAMA="libXinerama.so.1"
-@@ -25608,6 +25610,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co
+@@ -25103,6 +25102,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co
  			sizeof_register=8
  		fi
  		case $host_os in
@@ -94,26 +61,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
  		  linux*)
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
-@@ -25739,12 +25746,15 @@ fi
- 		CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
- 		sgen_supported=true
- 		;;
--	arm*-linux*)
-+	arm*-linux* | arm*-netbsd* | earm*-netbsd*)
- 		TARGET=ARM;
- 		arch_target=arm;
- 		ACCESS_UNALIGNED="no"
--		sgen_supported=true
--		AOT_SUPPORTED="yes"
-+		case $host_os in
-+		  *linux)
-+			sgen_supported=true
-+			AOT_SUPPORTED="yes"
-+		esac
- 		CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
- 		;;
- # TODO: make proper support for NaCl host.
-@@ -25854,7 +25864,7 @@ $as_echo "#define TARGET_X86 1" >>confde
+@@ -25361,7 +25365,7 @@ $as_echo "#define TARGET_X86 1" >>confde
  
  		sizeof_register=4
  		;;
@@ -122,28 +70,7 @@ $NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $
  		TARGET=ARM;
  		arch_target=arm;
  
-@@ -26198,15 +26208,17 @@ case "$host" in
- 	GTKX11="libgtk-x11-2.0.dylib"
- 	;;
-      *-*-*netbsd*)
--	LIBC="libc.so.12"
--	INTL="libintl.so.0"
-+	LIBC="libc.so"
-+	INTL="libintl.so"
-+	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"
-@@ -27193,7 +27205,6 @@ else
+@@ -26693,7 +26697,6 @@ else
  fi
  
  
diff --git a/mono38/patches/patch-data_Makefile.in b/mono38/patches/patch-data_Makefile.in
deleted file mode 100644
index a7586a2..0000000
--- a/mono38/patches/patch-data_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-data_Makefile.in,v 1.1 2015/05/21 14:38:08 kefren Exp $
-
-Fix monodir
-
---- data/Makefile.in.orig	2015-05-06 00:29:54.000000000 +0300
-+++ data/Makefile.in	2015-05-11 15:40:33.000000000 +0300
-@@ -434,7 +434,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = net_2_0 net_4_0 net_4_5
--monodir = $(sysconfdir)/mono
-+monodir = $(datadir)/examples/mono
- monolldbdir = $(libdir)/mono/lldb
- EXTRA_DIST = \
- 	config.in \
diff --git a/mono38/patches/patch-data_mono-nunit.pc.in b/mono38/patches/patch-data_mono-nunit.pc.in
index aae04de..2566463 100644
--- a/mono38/patches/patch-data_mono-nunit.pc.in
+++ b/mono38/patches/patch-data_mono-nunit.pc.in
@@ -2,9 +2,15 @@ $NetBSD: patch-data_mono-nunit.pc.in,v 1.1 2015/05/23 06:20:20 kefren Exp $
 
 Fix nunit pkg-config path
 
---- data/mono-nunit.pc.in.orig	2015-05-22 17:30:11.000000000 +0300
-+++ data/mono-nunit.pc.in	2015-05-22 17:30:49.000000000 +0300
-@@ -6,4 +6,4 @@
+--- data/mono-nunit.pc.in.orig	2014-08-09 11:10:40.000000000 +0000
++++ data/mono-nunit.pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
  Name: Mono NUnit
  Description: Mono's version of NUnit
  Version: @VERSION@
diff --git a/mono38/patches/patch-db b/mono38/patches/patch-db
deleted file mode 100644
index 0ba84b5..0000000
--- a/mono38/patches/patch-db
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-db,v 1.10 2015/05/21 14:38:08 kefren Exp $
-
---- mono/utils/mono-proclib.c.orig	2015-04-30 13:28:36.000000000 +0300
-+++ mono/utils/mono-proclib.c	2015-05-11 15:45:04.000000000 +0300
-@@ -19,24 +19,29 @@
- #include <process.h>
- #endif
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <sys/errno.h>
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/sysctl.h>
-+#ifndef __DragonFly__
- #include <sys/proc.h>
-+#endif
- #if defined(__APPLE__)
- #include <mach/mach.h>
- #endif
- #ifdef HAVE_SYS_USER_H
- #include <sys/user.h>
- #endif
--#ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC
-+#if defined(HAVE_STRUCT_KINFO_PROC_KP_PROC) && !defined(__NetBSD__)
- #    define kinfo_pid_member kp_proc.p_pid
- #    define kinfo_name_member kp_proc.p_comm
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- #    define kinfo_pid_member p_pid
- #    define kinfo_name_member p_comm
-+#elif defined(__DragonFly__)
-+#    define kinfo_pid_member kp_pid
-+#    define kinfo_name_member kp_comm
- #else
- #define kinfo_pid_member ki_pid
- #define kinfo_name_member ki_comm
diff --git a/mono38/patches/patch-dc b/mono38/patches/patch-dc
deleted file mode 100644
index 1a68aaf..0000000
--- a/mono38/patches/patch-dc
+++ /dev/null
@@ -1,12 +0,0 @@
-$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(__FreeBSD_kernel__) || defined(__OpenBSD__)
-+       defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define MONO_ARCH_USE_SIGACTION
- #endif
- 
diff --git a/mono38/patches/patch-mono_dis_Makefile.in b/mono38/patches/patch-mono_dis_Makefile.in
deleted file mode 100644
index 144a6f0..0000000
--- a/mono38/patches/patch-mono_dis_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mono_dis_Makefile.in,v 1.1 2015/05/21 14:38:08 kefren Exp $
-
---- mono/dis/Makefile.in.orig	2015-05-11 16:34:26.000000000 +0300
-+++ mono/dis/Makefile.in	2015-05-11 16:34:57.000000000 +0300
-@@ -428,7 +428,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
--@SUPPORT_SGEN_FALSE@metadata_lib = $(top_builddir)/mono/metadata/libmonoruntime-static.a
-+@SUPPORT_SGEN_FALSE@metadata_lib = $(top_builddir)/mono/metadata/libmonoruntime-static.la
- @SUPPORT_SGEN_TRUE@metadata_lib = $(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
- @SUPPORT_SGEN_FALSE@gc_lib = $(LIBGC_STATIC_LIBS)
- runtime_lib = \
diff --git a/mono38/patches/patch-mono_metadata_icall.c b/mono38/patches/patch-mono_metadata_icall.c
deleted file mode 100644
index 4730472..0000000
--- a/mono38/patches/patch-mono_metadata_icall.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-mono_metadata_icall.c,v 1.1 2015/05/21 14:38:08 kefren Exp $
-
-strtod hack until someone has time to debug mono_strtod
-
---- mono/metadata/icall.c.orig	2015-05-21 14:20:36.000000000 +0300
-+++ mono/metadata/icall.c	2015-05-21 14:22:00.000000000 +0300
-@@ -127,10 +127,15 @@ mono_double_ParseImpl (char *ptr, double
- 	*result = 0.0;
- 
- 	if (*ptr){
-+#if defined(__NetBSD__)
-+		/* XXX WIP: mono_strtod spins 100% CPU on NetBSD */
-+		*result = strtod(ptr, &endptr);
-+#else
- 		/* mono_strtod () is not thread-safe */
- 		mono_mutex_lock (&mono_strtod_mutex);
- 		*result = mono_strtod (ptr, &endptr);
- 		mono_mutex_unlock (&mono_strtod_mutex);
-+#endif
- 	}
- 
- 	if (!*ptr || (endptr && *endptr))
diff --git a/mono38/patches/patch-mono_metadata_mono-perfcounters.c b/mono38/patches/patch-mono_metadata_mono-perfcounters.c
index ee7c6a1..1a9cf96 100644
--- a/mono38/patches/patch-mono_metadata_mono-perfcounters.c
+++ b/mono38/patches/patch-mono_metadata_mono-perfcounters.c
@@ -2,9 +2,9 @@ $NetBSD: patch-mono_metadata_mono-perfcounters.c,v 1.2 2015/05/22 06:55:40 kefre
 
 Correct mibs initialization for NetBSD
 
---- mono/metadata/mono-perfcounters.c.orig	2015-04-26 19:28:39.000000000 +0300
-+++ mono/metadata/mono-perfcounters.c	2015-05-14 19:07:18.000000000 +0300
-@@ -33,6 +33,9 @@
+--- mono/metadata/mono-perfcounters.c.orig	2014-09-04 07:25:40.000000000 +0000
++++ mono/metadata/mono-perfcounters.c
+@@ -28,6 +28,9 @@
  #if defined (__NetBSD__) || defined (__APPLE__)
  #include <sys/sysctl.h>
  #endif
@@ -14,39 +14,3 @@ Correct mibs initialization for NetBSD
  #include "metadata/mono-perfcounters.h"
  #include "metadata/appdomain.h"
  #include "metadata/object-internals.h"
-@@ -473,11 +476,7 @@ mono_determine_physical_ram_available_si
- #elif defined (__NetBSD__)
- 	struct vmtotal vm_total;
- 	guint64 page_size;
--	int mib [2];
--	size_t len;
--
--
--	mib = {
-+	int mib [2] = {
- 		CTL_VM,
- #if defined (VM_METER)
- 		VM_METER
-@@ -485,17 +484,15 @@ mono_determine_physical_ram_available_si
- 		VM_TOTAL
- #endif
- 	};
--	len = sizeof (vm_total);
-+	size_t len = sizeof (vm_total);
- 	sysctl (mib, 2, &vm_total, &len, NULL, 0);
- 
--	mib = {
--		CTL_HW,
--		HW_PAGESIZE
--	};
-+	mib[0] = CTL_HW;
-+	mib[1] = HW_PAGESIZE;
- 	len = sizeof (page_size);
--	sysctl (mib, 2, &page_size, &len, NULL, 0
-+	sysctl (mib, 2, &page_size, &len, NULL, 0);
- 
--	return ((guint64) value.t_free * page_size) / 1024;
-+	return ((guint64) vm_total.t_free * page_size) / 1024;
- #elif defined (__APPLE__)
- 	mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
- 	vm_statistics_data_t vmstat;
diff --git a/mono38/patches/patch-mono_metadata_mono-route.c b/mono38/patches/patch-mono_metadata_mono-route.c
deleted file mode 100644
index bc6891b..0000000
--- a/mono38/patches/patch-mono_metadata_mono-route.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-mono_metadata_mono-route.c,v 1.1 2015/05/21 14:38:08 kefren Exp $
-
-Fix includes
-
---- mono/metadata/mono-route.c.orig	2015-05-11 16:20:29.000000000 +0300
-+++ mono/metadata/mono-route.c	2015-05-11 16:20:39.000000000 +0300
-@@ -8,6 +8,7 @@
- 
- #if defined(PLATFORM_MACOSX) || defined(PLATFORM_BSD)
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if.h>
- #include <net/if_dl.h>
diff --git a/mono38/patches/patch-mono_mini_mini-arm.c b/mono38/patches/patch-mono_mini_mini-arm.c
index acc8503..3343693 100644
--- a/mono38/patches/patch-mono_mini_mini-arm.c
+++ b/mono38/patches/patch-mono_mini_mini-arm.c
@@ -1,8 +1,8 @@
 $NetBSD: patch-mono_mini_mini-arm.c,v 1.5 2015/05/21 14:38:08 kefren Exp $
 
---- mono/mini/mini-arm.c.orig	2015-04-30 13:27:46.000000000 +0300
-+++ mono/mini/mini-arm.c	2015-05-11 15:55:15.000000000 +0300
-@@ -56,6 +56,11 @@
+--- mono/mini/mini-arm.c.orig	2014-09-04 07:25:40.000000000 +0000
++++ mono/mini/mini-arm.c
+@@ -54,6 +54,11 @@
  #define IS_VFP (TRUE)
  #endif
  
@@ -14,18 +14,7 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.5 2015/05/21 14:38:08 kefren Exp $
  #if defined(__ARM_EABI__) && defined(__linux__) && !defined(PLATFORM_ANDROID) && !defined(__native_client__)
  #define HAVE_AEABI_READ_TP 1
  #endif
-@@ -922,6 +927,10 @@ void
- mono_arch_init (void)
- {
- 	const char *cpu_arch;
-+#if defined(__NetBSD__)
-+	char *s = NULL;
-+	size_t len;
-+#endif
- 
- 	mono_mutex_init_recursive (&mini_arch_mutex);
- #ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
-@@ -986,6 +995,32 @@ mono_arch_init (void)
+@@ -941,6 +946,32 @@ mono_arch_init (void)
  	   have a way to properly detect CPU features on it. */
  	thumb_supported = TRUE;
  	iphone_abi = TRUE;
@@ -58,15 +47,3 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.5 2015/05/21 14:38:08 kefren Exp $
  #else
  	thumb_supported = mono_hwcap_arm_has_thumb;
  	thumb2_supported = mono_hwcap_arm_has_thumb2;
-@@ -1196,6 +1231,11 @@ mono_arch_flush_icache (guint8 *code, gi
- #ifdef MONO_CROSS_COMPILE
- #elif __APPLE__
- 	sys_icache_invalidate (code, size);
-+#elif defined(__NetBSD__)
-+	struct arm_sync_icache_args args;
-+	args.addr = (uintptr_t)code;
-+	args.len = (size_t)size;
-+	sysarch(ARM_SYNC_ICACHE, &args);
- #elif __GNUC_PREREQ(4, 3)
-     __builtin___clear_cache (code, code + size);
- #elif __GNUC_PREREQ(4, 1)
diff --git a/mono38/patches/patch-mono_unit-tests_Makefile.in b/mono38/patches/patch-mono_unit-tests_Makefile.in
deleted file mode 100644
index 2b13c53..0000000
--- a/mono38/patches/patch-mono_unit-tests_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$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-10-04 09:29:01.000000000 +0000
-+++ mono/unit-tests/Makefile.in
-@@ -79,14 +79,8 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--@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/mono38/patches/patch-mono_utils_Makefile.in b/mono38/patches/patch-mono_utils_Makefile.in
deleted file mode 100644
index ab75c1f..0000000
--- a/mono38/patches/patch-mono_utils_Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-mono_utils_Makefile.in,v 1.3 2015/05/26 12:19:46 jperkin Exp $
-
-Add NetBSD and Solaris threads
-
---- mono/utils/Makefile.in.orig	2015-04-26 16:29:35.000000000 +0000
-+++ mono/utils/Makefile.in
-@@ -146,6 +146,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-solaris.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 \
-@@ -174,7 +175,7 @@ am__objects_1 = mono-md5.lo mono-sha1.lo
- 	mono-linked-list-set.lo mono-threads.lo mono-threads-posix.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-freebsd.lo mono-threads-openbsd.lo mono-threads-netbsd.lo mono-threads-solaris.lo \
- 	mono-threads-android.lo mono-tls.lo atomic.lo mono-hwcap.lo \
- 	bsearch.lo mono-conc-hashtable.lo sha1.lo json.lo \
- 	networking.lo networking-posix.lo networking-fallback.lo \
-@@ -600,6 +601,9 @@ monoutils_sources = \
- 	mono-threads-linux.c	\
- 	mono-threads-freebsd.c	\
- 	mono-threads-openbsd.c	\
-+	mono-threads-solaris.c	\
-+	mono-threads-netbsd.c	\
-+	mono-threads-dragonfly.c	\
- 	mono-threads-android.c	\
- 	mono-threads.h	\
- 	mono-tls.h	\
-@@ -753,6 +757,9 @@ 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-solaris.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@
Home | Main Index | Thread Index | Old Index