pkg/44846: lang/mono needs some patches to compile on DragonFly

[ftigeot%wolfpond.org@localhost]

>Number:         44846
>Category:       pkg
>Synopsis:       lang/mono needs some patches to compile on DragonFly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 09 15:40:01 +0000 2011
>Originator:     François Tigeot
>Release:        DragonFly
>Organization:
>Environment:
DragonFly dfly64.zefyris.com 2.9-DEVELOPMENT DragonFly 
v2.9.1.1067.gecc6d0-DEVELOPMENT #2: Sat Apr  9 17:08:27 CEST 2011     
ftigeot%dfly64.zefyris.com@localhost:/usr/obj/usr/src/sys/X86_64_GENERIC_SMP  
x86_64
>Description:
lang/mono does not build on DragonFly hosts.

The attached patches fix some of the compilation errors.
>How-To-Repeat:
Try to build lang/mono on a DragonFly host
>Fix:
- modify patches/patch-ad:

Index: patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/lang/mono/patches/patch-ad,v
retrieving revision 1.21
diff -u -r1.21 patch-ad
--- patch-ad    29 Dec 2010 05:41:20 -0000      1.21
+++ patch-ad    9 Apr 2011 15:36:27 -0000
@@ -1,5 +1,6 @@
-$NetBSD: patch-ad,v 1.21 2010/12/29 05:41:20 obache Exp $
---- mono/utils/mono-sigcontext.h.orig  2010-11-12 10:24:41.000000000 +0000
+$NetBSD$
+
+--- mono/utils/mono-sigcontext.h.orig  2011-01-04 17:39:55 +0000
 +++ mono/utils/mono-sigcontext.h
 @@ -8,14 +8,14 @@
  
@@ -18,9 +19,12 @@
        #define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eax)
        #define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ebx)
        #define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ecx)
-@@ -101,6 +101,20 @@
+@@ -99,8 +99,22 @@
+       #define UCONTEXT_REG_R13(ctx) 
(((ucontext_t*)(ctx))->uc_mcontext->__ss.__r13)
+       #define UCONTEXT_REG_R14(ctx) 
(((ucontext_t*)(ctx))->uc_mcontext->__ss.__r14)
        #define UCONTEXT_REG_R15(ctx) 
(((ucontext_t*)(ctx))->uc_mcontext->__ss.__r15)
- #elif defined(__FreeBSD__)
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
  #define UCONTEXT_GREGS(ctx)   ((guint64*)&(((ucontext_t*)(ctx))->uc_mcontext))
 +#elif defined(__NetBSD__)
 +      #define UCONTEXT_REG_RAX(ctx) 
(((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_RAX])




and add this new patch to patches/

$NetBSD$

--- mono/mini/mini-amd64.h.orig 2011-01-04 17:39:55 +0000
+++ mono/mini/mini-amd64.h
@@ -288,7 +288,7 @@ typedef struct {
 
 #define MONO_ARCH_NOMAP32BIT
 
-#elif defined (__FreeBSD__)
+#elif defined (__FreeBSD__) || defined(__DragonFly__)
 
 #define REG_RAX 7
 #define REG_RCX 4