mono-git: Eliminate merged patch

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Aug 8 19:25:02 2016 +0200
Changeset:	df7d0b8afec22e485aee1009824e1572036bb693

Modified Files:
	mono-git/distinfo
Removed Files:
	mono-git/patches/patch-mono_utils_dlmalloc.c
	mono-git/patches/patch-support_map.c
	mono-git/patches/patch-support_sys-mman.c

Log Message:
mono-git: Eliminate merged patch

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

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

diffstat:
 mono-git/distinfo                            |  3 --
 mono-git/patches/patch-mono_utils_dlmalloc.c | 42 --------------------------
 mono-git/patches/patch-support_map.c         | 45 ----------------------------
 mono-git/patches/patch-support_sys-mman.c    | 20 -------------
 4 files changed, 110 deletions(-)

diffs:
diff --git a/mono-git/distinfo b/mono-git/distinfo
index c7c0a5c..12ad357 100644
--- a/mono-git/distinfo
+++ b/mono-git/distinfo
@@ -7,8 +7,5 @@ Size (mono-4.4.0.122.tar.bz2) = 84904723 bytes
 SHA1 (patch-mono_io-layer_io.c) = 03b4b03abc2f6dbb5fed39f07b8a1bc23cca07b8
 SHA1 (patch-mono_metadata_mono-perfcounters.c) = 6b4b4019e09e529c2f6f8faa3936e3ac91ddfe17
 SHA1 (patch-mono_utils_Makefile.am) = b3bf378d1576c98262dce0a1b08bf45d013fa323
-SHA1 (patch-mono_utils_dlmalloc.c) = a1fcd65964e1e18418c97e1726058f1864a49de1
 SHA1 (patch-mono_utils_mono-proclib.c) = 30739ccde2a25f5fd8dcf0e7d581443b6e175ade
 SHA1 (patch-mono_utils_mono-threads-netbsd.c) = 244d88cd407bc28f498bb2e35b44304a7c911325
-SHA1 (patch-support_map.c) = 39a26cca54503d465fe89042433b7bfdb52104ab
-SHA1 (patch-support_sys-mman.c) = 9d22f579a3f826faf5092b1c3ba0409bde419970
diff --git a/mono-git/patches/patch-mono_utils_dlmalloc.c b/mono-git/patches/patch-mono_utils_dlmalloc.c
deleted file mode 100644
index 52065e2..0000000
--- a/mono-git/patches/patch-mono_utils_dlmalloc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
---- mono/utils/dlmalloc.c.orig	2016-04-16 14:26:45.000000000 +0000
-+++ mono/utils/dlmalloc.c
-@@ -342,7 +342,7 @@ HAVE_MMAP                 default: 1 (tr
-   able to unmap memory that may have be allocated using multiple calls
-   to MMAP, so long as they are adjacent.
- 
--HAVE_MREMAP               default: 1 on linux, else 0
-+HAVE_MREMAP               default: 1 on linux and NetBSD, else 0
-   If true realloc() uses mremap() to re-allocate large blocks and
-   extend or shrink allocation spaces.
- 
-@@ -536,11 +536,11 @@ DEFAULT_MMAP_THRESHOLD       default: 25
- #define MMAP_CLEARS 1
- #endif  /* MMAP_CLEARS */
- #ifndef HAVE_MREMAP
--#ifdef linux
-+#if defined(linux) || defined(__NetBSD__)
- #define HAVE_MREMAP 1
--#else   /* linux */
-+#else   /* linux || __NetBSD__ */
- #define HAVE_MREMAP 0
--#endif  /* linux */
-+#endif  /* linux || __NetBSD__ */
- #endif  /* HAVE_MREMAP */
- #ifndef MALLOC_FAILURE_ACTION
- #define MALLOC_FAILURE_ACTION  errno = ENOMEM;
-@@ -1375,7 +1375,13 @@ static int win32munmap(void* ptr, size_t
- #endif /* HAVE_MMAP */
- 
- #if HAVE_MMAP && HAVE_MREMAP
-+#if defined(linux)
- #define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv))
-+#elif defined(__NetBSD__)
-+#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (addr), (nsz), (mv))
-+#else
-+#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
-+#endif
- #else  /* HAVE_MMAP && HAVE_MREMAP */
- #define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
- #endif /* HAVE_MMAP && HAVE_MREMAP */
diff --git a/mono-git/patches/patch-support_map.c b/mono-git/patches/patch-support_map.c
deleted file mode 100644
index 423c19d..0000000
--- a/mono-git/patches/patch-support_map.c
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
---- support/map.c.orig	2016-04-16 14:26:45.000000000 +0000
-+++ support/map.c
-@@ -3922,12 +3922,17 @@ int Mono_Posix_ToMountFlags (guint64 x, 
- int Mono_Posix_FromMremapFlags (guint64 x, guint64 *r)
- {
- 	*r = 0;
-+#ifndef __NetBSD__
- 	if ((x & Mono_Posix_MremapFlags_MREMAP_MAYMOVE) == Mono_Posix_MremapFlags_MREMAP_MAYMOVE)
- #ifdef MREMAP_MAYMOVE
- 		*r |= MREMAP_MAYMOVE;
- #else /* def MREMAP_MAYMOVE */
- 		{errno = EINVAL; return -1;}
- #endif /* ndef MREMAP_MAYMOVE */
-+#else /* def __NetBSD__ */
-+	if ((x & Mono_Posix_MremapFlags_MREMAP_MAYMOVE) != Mono_Posix_MremapFlags_MREMAP_MAYMOVE)
-+		*r = MAP_FIXED;
-+#endif /* def __NetBSD__ */
- 	if (x == 0)
- 		return 0;
- 	return 0;
-@@ -3936,12 +3941,17 @@ int Mono_Posix_FromMremapFlags (guint64 
- int Mono_Posix_ToMremapFlags (guint64 x, guint64 *r)
- {
- 	*r = 0;
-+#ifndef __NetBSD__
- 	if (x == 0)
- 		return 0;
- #ifdef MREMAP_MAYMOVE
- 	if ((x & MREMAP_MAYMOVE) == MREMAP_MAYMOVE)
- 		*r |= Mono_Posix_MremapFlags_MREMAP_MAYMOVE;
- #endif /* ndef MREMAP_MAYMOVE */
-+#else /* def __NetBSD__ */
-+	if ((x & MAP_FIXED) != MAP_FIXED)
-+		*r |= Mono_Posix_MremapFlags_MREMAP_MAYMOVE;
-+#endif
- 	return 0;
- }
- 
-@@ -9314,4 +9324,3 @@ int Mono_Posix_ToXattrFlags (int x, int 
- #endif /* ndef XATTR_REPLACE */
- 	return 0;
- }
--
diff --git a/mono-git/patches/patch-support_sys-mman.c b/mono-git/patches/patch-support_sys-mman.c
deleted file mode 100644
index f030784..0000000
--- a/mono-git/patches/patch-support_sys-mman.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- support/sys-mman.c.orig	2016-04-16 14:26:45.000000000 +0000
-+++ support/sys-mman.c
-@@ -109,8 +109,15 @@ Mono_Posix_Syscall_mremap (void *old_add
- 	if (Mono_Posix_FromMremapFlags (flags, &_flags) == -1)
- 		return MAP_FAILED;
- 
-+#if defined(linux)
- 	return mremap (old_address, (size_t) old_size, (size_t) new_size,
- 			(unsigned long) _flags);
-+#elif defined(__NetBSD__)
-+	return mremap (old_address, (size_t) old_size, old_address,
-+			(size_t) new_size, (unsigned long) _flags);
-+#else
-+#error Port me
-+#endif
- }
- #endif /* def HAVE_MREMAP */
-