[pkgsrc/trunk]: pkgsrc/lang/mono Handle safer mremap(2)'s flags parameter on ...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2352874f29c0
branches:  trunk
changeset: 532198:2352874f29c0
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Aug 13 16:41:34 2007 +0000

description:
Handle safer mremap(2)'s flags parameter on NetBSD.
Patch supplied from Matthias Drochner.

Bump PKGREVISION.

diffstat:

 lang/mono/Makefile         |   8 ++++----
 lang/mono/distinfo         |   3 ++-
 lang/mono/patches/patch-bf |  28 ++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diffs (70 lines):

diff -r bf7b2dad0d2a -r 2352874f29c0 lang/mono/Makefile
--- a/lang/mono/Makefile        Mon Aug 13 15:23:15 2007 +0000
+++ b/lang/mono/Makefile        Mon Aug 13 16:41:34 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2007/01/04 02:38:13 rillig Exp $
+# $NetBSD: Makefile,v 1.58 2007/08/13 16:41:34 taca Exp $
 
 DISTNAME=      mono-1.1.13.8.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://go-mono.com/sources/mono-1.1/
 
@@ -73,8 +73,8 @@
 substpcprefix:
 .for f in ${PKGCONFIG_OVERRIDE}
        (cd ${WRKSRC}; \
-        ${SED} 's|$${pcfiledir}/../..|@prefix@|g' <$f >$f.tmp; \
-        ${MV} $f.tmp $f \
+        ${SED} 's|$${pcfiledir}/../..|@prefix@|g' <${f} >${f}.tmp; \
+        ${MV} ${f}.tmp ${f} \
        )
 .endfor
 
diff -r bf7b2dad0d2a -r 2352874f29c0 lang/mono/distinfo
--- a/lang/mono/distinfo        Mon Aug 13 15:23:15 2007 +0000
+++ b/lang/mono/distinfo        Mon Aug 13 16:41:34 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2007/08/03 07:46:54 taca Exp $
+$NetBSD: distinfo,v 1.30 2007/08/13 16:41:34 taca Exp $
 
 SHA1 (mono-1.1.13.8.1.tar.gz) = f2cb79844073694859b1fb92eb770e3705239a3d
 RMD160 (mono-1.1.13.8.1.tar.gz) = a100a96b19300b253c12a2ad70caf65721418209
@@ -23,3 +23,4 @@
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
 SHA1 (patch-bd) = a52007ae22f8b23d20abf4a56e5b9d57ccd1fbbe
 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332
+SHA1 (patch-bf) = cbe6c7a401a183eccc73ffb45120486c1cbc75b8
diff -r bf7b2dad0d2a -r 2352874f29c0 lang/mono/patches/patch-bf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-bf        Mon Aug 13 16:41:34 2007 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-bf,v 1.1 2007/08/13 16:41:34 taca Exp $
+
+--- support/map.c.orig 2006-04-11 07:21:37.000000000 +0900
++++ support/map.c
+@@ -4672,15 +4672,23 @@ int Mono_Posix_ToMountFlags (guint64 x, 
+ 
+ int Mono_Posix_FromMremapFlags (guint64 x, guint64 *r)
+ {
++#ifdef __NetBSD__
++      *r = MAP_FIXED;
++#else
+       *r = 0;
++#endif
+       if (x == 0)
+               return 0;
+       if ((x & Mono_Posix_MremapFlags_MREMAP_MAYMOVE) == Mono_Posix_MremapFlags_MREMAP_MAYMOVE)
++#ifdef __NetBSD__
++              *r &= ~MAP_FIXED;
++#else
+ #ifdef MREMAP_MAYMOVE
+               *r |= MREMAP_MAYMOVE;
+ #else /* def MREMAP_MAYMOVE */
+               {errno = EINVAL; return -1;}
+ #endif /* ndef MREMAP_MAYMOVE */
++#endif /* NetBSD */
+       return 0;
+ }
+