[pkgsrc/trunk]: pkgsrc/lang/mono Fix Bug 475132 for amd64. Patch provided by ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0969032d5ceb
branches:  trunk
changeset: 554335:0969032d5ceb
user:      kefren <kefren%pkgsrc.org@localhost>
date:      Thu Feb 12 19:44:50 2009 +0000

description:
Fix Bug 475132 for amd64. Patch provided by Zoltan Varga

diffstat:

 lang/mono/Makefile         |   4 ++--
 lang/mono/distinfo         |   3 ++-
 lang/mono/patches/patch-ci |  21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r eb48b7d5c07e -r 0969032d5ceb lang/mono/Makefile
--- a/lang/mono/Makefile        Thu Feb 12 18:44:07 2009 +0000
+++ b/lang/mono/Makefile        Thu Feb 12 19:44:50 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2009/02/11 21:03:10 kefren Exp $
+# $NetBSD: Makefile,v 1.80 2009/02/12 19:44:50 kefren Exp $
 
 DISTNAME=      mono-${MONO_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=  .tar.bz2
diff -r eb48b7d5c07e -r 0969032d5ceb lang/mono/distinfo
--- a/lang/mono/distinfo        Thu Feb 12 18:44:07 2009 +0000
+++ b/lang/mono/distinfo        Thu Feb 12 19:44:50 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2009/01/19 22:35:53 kefren Exp $
+$NetBSD: distinfo,v 1.44 2009/02/12 19:44:50 kefren Exp $
 
 SHA1 (mono-2.2.tar.bz2) = 028c061ba4f4631c4ff10a15b832211a67ec5858
 RMD160 (mono-2.2.tar.bz2) = 664f09ccd8822b62d94d242871b956b00adae7b6
@@ -29,3 +29,4 @@
 SHA1 (patch-cf) = 2ae0f528e3273a51c4e2582d6580768072c50008
 SHA1 (patch-cg) = 93a81dccbc8ac006e97be6641de9b4625263f3d5
 SHA1 (patch-ch) = 4ca88b9e6c45263c9fd75a573ff1b149197363dc
+SHA1 (patch-ci) = 9c6d77c4c76c618304e62f744b0d03bb58df5d93
diff -r eb48b7d5c07e -r 0969032d5ceb lang/mono/patches/patch-ci
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-ci        Thu Feb 12 19:44:50 2009 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ci,v 1.3 2009/02/12 19:44:50 kefren Exp $
+--- mono/mini/mini-amd64.c.orig        2008-11-11 06:56:14.000000000 +0200
++++ mono/mini/mini-amd64.c     2009-02-12 21:06:56.000000000 +0200
+@@ -6300,10 +6300,14 @@
+                                       else
+                                               item->chunk_size += MOV_REG_IMM_SIZE + CMP_REG_REG_SIZE;
+                               }
+-                              if (vtable_is_32bit)
+-                                      item->chunk_size += MOV_REG_IMM_32BIT_SIZE;
+-                              else
++                              if (fail_tramp) {
+                                       item->chunk_size += MOV_REG_IMM_SIZE;
++                              } else {
++                                      if (vtable_is_32bit)
++                                              item->chunk_size += MOV_REG_IMM_32BIT_SIZE;
++                                      else
++                                              item->chunk_size += MOV_REG_IMM_SIZE;
++                              }
+                               item->chunk_size += BR_SMALL_SIZE + JUMP_REG_SIZE;
+                       } else {
+                               if (fail_tramp) {