[35304] trunk/dports/devel/mono

mww at macports.org mww at macports.org
Mon Mar 24 16:37:59 PDT 2008 

Revision: 35304
          http://trac.macosforge.org/projects/macports/changeset/35304
Author:   mww at macports.org
Date:     2008-03-24 16:37:57 -0700 (Mon, 24 Mar 2008)

Log Message:
-----------
-version 1.9
-fix build on 10.5 (#14454)

Modified Paths:
--------------
    trunk/dports/devel/mono/Portfile

Added Paths:
-----------
    trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff
    trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff
    trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff

Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile	2008-03-24 23:29:22 UTC (rev 35303)
+++ trunk/dports/devel/mono/Portfile	2008-03-24 23:37:57 UTC (rev 35304)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			mono
-version			1.2.6
+version			1.9
 categories		devel lang mono
 platforms		darwin
 maintainers		mww
@@ -16,9 +16,9 @@
 master_sites    ${homepage}sources/${name}/
 use_bzip2		yes
 
-checksums       md5 391f85b4f962269e044ceac2b5235310 \
-                sha1 f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae \
-                rmd160 c6536b008cb73845943956c9ab365589a28c013c
+checksums       md5 371158ca0bbd9d6fb391d9c0f9834529 \
+                sha1 1008f1bacb04de9ff9f5d87808ab0c5fba577a9d \
+		rmd160 abc62137b738d9e84b8564018ffaa85cb76f45c3
 
 depends_build		port:pkgconfig port:gawk
 depends_lib		port:gettext port:glib2 port:icu \
@@ -38,14 +38,8 @@
 test.run		yes
 test.target		check
 
-livecheck.check	regex
-livecheck.url   ${homepage}sources-stable/
-livecheck.regex mono/mono-(\\d+(?:\\.\\d+)*)
+post-patch { reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure }
 
-post-patch {
-    reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure
-}
-
 post-destroot {
     set docdir ${prefix}/share/doc/${name}-${version}
 
@@ -71,9 +65,16 @@
 }
 
 platform darwin 9 {
-	configure.compiler	gcc-4.0
 	depends_lib-delete	port:icu
 	configure.cflags-append	-D_NONSTD_SOURCE
 	configure.cxxflags-append	-D_NONSTD_SOURCE
-	patchfiles-append patch-interp.h patch-sys-mman.c
+	patchfiles-append patch-interp.h patch-sys-mman.c \
+		patch-mono-mini-mini-ppc.h.diff \
+		patch-mono-mini-mini-x86.h.diff \
+		patch-libgc-darwin_stop_world.c.diff
 }
+
+livecheck.check	regex
+livecheck.url   ${homepage}sources-stable/
+livecheck.regex mono/mono-(\\d+(?:\\.\\d+)*)
+

Added: trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff	                        (rev 0)
+++ trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff	2008-03-24 23:37:57 UTC (rev 35304)
@@ -0,0 +1,20 @@
+--- libgc/darwin_stop_world.c	2008-03-25 00:10:37.000000000 +0100
++++ libgc/darwin_stop_world.c	2008-03-25 00:11:05.000000000 +0100
+@@ -102,7 +102,7 @@
+ 	if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
+ 	
+ #if defined(I386)
+-#if defined(_STRUCT_X86_EXCEPTION_STATE32)
++#if __DARWIN_UNIX03
+ 	lo = state.__esp;
+ 
+ 	GC_push_one(state.__eax); 
+@@ -327,7 +327,7 @@
+ 			     (natural_t *)&info, &outCount);
+ 	if(r != KERN_SUCCESS) continue;
+ 
+-#if defined(_STRUCT_X86_EXCEPTION_STATE32)
++#if __DARWIN_UNIX03
+ 	lo = (void*)info.__esp;
+ 	hi = (ptr_t)FindTopOfStack(info.__esp);
+ 

Added: trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff	                        (rev 0)
+++ trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff	2008-03-24 23:37:57 UTC (rev 35304)
@@ -0,0 +1,18 @@
+--- mono/mini/mini-ppc.h	2008-03-25 00:04:36.000000000 +0100
++++ mono/mini/mini-ppc.h	2008-03-25 00:04:47.000000000 +0100
+@@ -178,13 +178,13 @@
+ 	#define UCONTEXT_REG_FPRn(ctx, n) ((ctx)->uc_mcontext.uc_regs->fpregs.fpregs [(n)])
+ 	#define UCONTEXT_REG_NIP(ctx)     ((ctx)->uc_mcontext.uc_regs->gregs [PT_NIP])
+ 	#define UCONTEXT_REG_LNK(ctx)     ((ctx)->uc_mcontext.uc_regs->gregs [PT_LNK])
+-#elif defined (__APPLE__) && defined (_STRUCT_MCONTEXT)
++#elif defined (__APPLE__) && __DARWIN_UNIX03
+ 	typedef struct __darwin_ucontext os_ucontext;
+ 
+ 	#define UCONTEXT_REG_Rn(ctx, n)   ((ctx)->uc_mcontext->__ss.__r##n)
+ 	#define UCONTEXT_REG_FPRn(ctx, n) ((ctx)->uc_mcontext->__fs.__fpregs [(n)])
+ 	#define UCONTEXT_REG_NIP(ctx)     ((ctx)->uc_mcontext->__ss.__srr0)
+-#elif defined (__APPLE__) && !defined (_STRUCT_MCONTEXT)
++#elif defined (__APPLE__) && !__DARWIN_UNIX03
+ 	typedef struct ucontext os_ucontext;
+ 
+ 	#define UCONTEXT_REG_Rn(ctx, n)   ((ctx)->uc_mcontext->ss.r##n)

Added: trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff	                        (rev 0)
+++ trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff	2008-03-24 23:37:57 UTC (rev 35304)
@@ -0,0 +1,20 @@
+--- mono/mini/mini-x86.h	2008-03-25 00:04:41.000000000 +0100
++++ mono/mini/mini-x86.h	2008-03-25 00:04:47.000000000 +0100
+@@ -152,7 +152,7 @@
+ 	#define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.mc_esi)
+ 	#define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.mc_edi)
+ 	#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.mc_eip)
+-#elif defined(__APPLE__) && defined(_STRUCT_MCONTEXT)
++#elif defined(__APPLE__) && __DARWIN_UNIX03
+ 	#define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext->__ss.__eax)
+ 	#define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext->__ss.__ebx)
+ 	#define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext->__ss.__ecx)
+@@ -162,7 +162,7 @@
+ 	#define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext->__ss.__esi)
+ 	#define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext->__ss.__edi)
+ 	#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext->__ss.__eip)
+-#elif defined(__APPLE__) && !defined(_STRUCT_MCONTEXT)
++#elif defined(__APPLE__) && !__DARWIN_UNIX03
+ 	#define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext->ss.eax)
+ 	#define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext->ss.ebx)
+ 	#define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext->ss.ecx)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080324/2325db53/attachment.html

More information about the macports-changes mailing list