[pkgsrc/trunk]: pkgsrc/lang/mono Follow devel/boehm-gc's lead and also correc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2413b46429a
branches:  trunk
changeset: 477969:d2413b46429a
user:      recht <recht%pkgsrc.org@localhost>
date:      Tue Jul 13 14:45:33 2004 +0000

description:
Follow devel/boehm-gc's lead and also correctly define ELFSIZE for NetBSD
here.
Bump BUILDLINK_DEPENDS to 1.0nb1 for the ELFSIZE fix.

diffstat:

 lang/mono/Makefile         |   3 ++-
 lang/mono/buildlink3.mk    |   4 ++--
 lang/mono/distinfo         |   3 ++-
 lang/mono/patches/patch-aa |  25 +++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diffs (73 lines):

diff -r 01da788b2ed1 -r d2413b46429a lang/mono/Makefile
--- a/lang/mono/Makefile        Tue Jul 13 14:22:27 2004 +0000
+++ b/lang/mono/Makefile        Tue Jul 13 14:45:33 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/07/03 23:02:50 recht Exp $
+# $NetBSD: Makefile,v 1.28 2004/07/13 14:45:33 recht Exp $
 #
 
 DISTNAME=      mono-1.0
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://mono2.ximian.com/archive/1.0/
 
diff -r 01da788b2ed1 -r d2413b46429a lang/mono/buildlink3.mk
--- a/lang/mono/buildlink3.mk   Tue Jul 13 14:22:27 2004 +0000
+++ b/lang/mono/buildlink3.mk   Tue Jul 13 14:45:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/07/03 23:02:50 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/07/13 14:45:33 recht Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=   ${MONO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   mono
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mono+=       mono>=1.0
+BUILDLINK_DEPENDS.mono+=       mono>=1.0nb1
 BUILDLINK_PKGSRCDIR.mono?=     ../../lang/mono
 .endif # MONO_BUILDLINK3_MK
 
diff -r 01da788b2ed1 -r d2413b46429a lang/mono/distinfo
--- a/lang/mono/distinfo        Tue Jul 13 14:22:27 2004 +0000
+++ b/lang/mono/distinfo        Tue Jul 13 14:45:33 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2004/07/03 23:02:50 recht Exp $
+$NetBSD: distinfo,v 1.16 2004/07/13 14:45:33 recht Exp $
 
 SHA1 (mono-1.0.tar.gz) = fa9c1b79152f05c1bfdd15bfce28a47e63d33dc7
 Size (mono-1.0.tar.gz) = 18218284 bytes
+SHA1 (patch-aa) = 4b8828f70c0329dd8f995142d3493310eb227d9e
 SHA1 (patch-ab) = 7c2b07f0e14103ccccc6e9e1514774d520865009
 SHA1 (patch-ac) = be58af38a4fa937837006066ca8a2ecc96729640
 SHA1 (patch-ad) = d8a72b7408e1209b7cb53b93b008d35ff071d2a7
diff -r 01da788b2ed1 -r d2413b46429a lang/mono/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-aa        Tue Jul 13 14:45:33 2004 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.8 2004/07/13 14:45:34 recht Exp $
+
+--- libgc/dyn_load.c.orig      2004-05-18 20:42:19.000000000 +0200
++++ libgc/dyn_load.c   2004-07-13 16:35:00.000000000 +0200
+@@ -80,6 +80,11 @@
+ #   define l_name     lm_name
+ #endif
+ 
++#if defined(NETBSD)
++#   include <machine/elf_machdep.h>
++#   define ELFSIZE ARCH_ELFSIZE
++#endif
++
+ #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
+     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
+     (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
+@@ -91,7 +96,7 @@
+ /* Newer versions of GNU/Linux define this macro.  We
+  * define it similarly for any ELF systems that don't.  */
+ #  ifndef ElfW
+-#    ifdef __NetBSD__
++#    ifdef NETBSD
+ #      if ELFSIZE == 32
+ #        define ElfW(type) Elf32_##type
+ #      else