diff options
| -rw-r--r-- | lang/mono/Makefile | 4 | ||||
| -rw-r--r-- | lang/mono/distinfo | 21 | ||||
| -rw-r--r-- | lang/mono/patches/patch-ah | 30 | ||||
| -rw-r--r-- | lang/mono/patches/patch-bd | 10 | ||||
| -rw-r--r-- | lang/mono/patches/patch-db | 18 | ||||
| -rw-r--r-- | lang/mono/patches/patch-dc | 16 | ||||
| -rw-r--r-- | lang/mono/patches/patch-df | 11 | ||||
| -rw-r--r-- | lang/mono/patches/patch-dg | 20 | ||||
| -rw-r--r-- | lang/mono/patches/patch-di | 12 |
9 files changed, 86 insertions, 56 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 0f0e807c0f9..524e238ecba 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.101 2010/04/09 15:35:21 kefren Exp $ +# $NetBSD: Makefile,v 1.102 2010/04/29 08:44:30 kefren Exp $ -DISTNAME= mono-2.6.3 +DISTNAME= mono-2.6.4 CATEGORIES= lang MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/mono/distinfo b/lang/mono/distinfo index fcf2b50c87a..502752e1a85 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.62 2010/04/09 15:35:21 kefren Exp $ +$NetBSD: distinfo,v 1.63 2010/04/29 08:44:30 kefren Exp $ -SHA1 (mono-2.6.3.tar.bz2) = a4aab7f46983664dc4cf63a01e4fe7a8a49de2c6 -RMD160 (mono-2.6.3.tar.bz2) = e3d61f618a0e9f063d6eb86e336f5deaa23cbcc8 -Size (mono-2.6.3.tar.bz2) = 27761467 bytes +SHA1 (mono-2.6.4.tar.bz2) = c3b556e63cfa635687a40372a83e4a1b8fd10103 +RMD160 (mono-2.6.4.tar.bz2) = c5c12bd0226ff3b45bb8951bfb5c74415e81d6b1 +Size (mono-2.6.4.tar.bz2) = 27690544 bytes SHA1 (patch-ab) = 728f9e596ff113a5f08c266e7419d40c16e6f03c SHA1 (patch-ac) = b8f47cc94ed2269b8fe4efe95269b208827b4688 SHA1 (patch-ad) = c6956a9e17e0c898cdba5dc15532181dfad32599 SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53 SHA1 (patch-af) = b259961265c861f9d3b1bc66ed8ffaaf46f178c6 SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca +SHA1 (patch-ah) = 7f8f525fd0ce5a565d42de61381e8b773d06e9b5 SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56 SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72 SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df @@ -17,7 +18,7 @@ SHA1 (patch-aq) = f4a009d91c44fb1f05eb7c9bf6282a27e4938aeb SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2 -SHA1 (patch-bd) = cf15b750dbd93ebf0e0e5165b8a10aabbf4f1642 +SHA1 (patch-bd) = 15c803bf85ad36ad08bcaaf7dbc371a6473ae5f2 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332 SHA1 (patch-bf) = e945b13fbffc1239a4c459a2c6be543e67e883f9 SHA1 (patch-bg) = a748a11e6ccaa4abc6552e64615f16657d277c15 @@ -27,11 +28,11 @@ SHA1 (patch-ca) = f5c54525d70b185f9fcb28f82034c4e995395c0b SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0 SHA1 (patch-da) = 877ed8ec92ec25686c5a9a59db107f122d49035d -SHA1 (patch-db) = 97c39aafeb66afdd42317a18c9b8d7d92b103cc0 -SHA1 (patch-dc) = 2d4d0dd9bc69a5aba64f031c40dead5286846fea +SHA1 (patch-db) = 2b11ad4e37c4487f53c34b4ac85a526c31af3292 +SHA1 (patch-dc) = b8d73064f0a111d5244c7ba94d2b0e58ff686ccf SHA1 (patch-de) = d9867210a90389ff9ff5b9376b7091f923960973 -SHA1 (patch-df) = b84e779e8054d6425b38a3aeea2971e3a5a78f07 -SHA1 (patch-dg) = 65b56a2501190eb43e8872278bc3a4cabaa80822 +SHA1 (patch-df) = b817bb4dd09c4490efba749bf9c4a663253da11b +SHA1 (patch-dg) = bb400ea08a07b24797af16e926a430e493203e51 SHA1 (patch-dh) = 5eaa3c65036ccd35415d8da9dc7e77ed8c08c67c -SHA1 (patch-di) = 3d59636a1f2455cacc44bc3c011318370ef70132 +SHA1 (patch-di) = 67a4054c3e860f6f79050a8b8e571f1495d3feeb SHA1 (patch-dj) = acff1ca9b38b1c21ed545bcd4fb806c69e40c409 diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah new file mode 100644 index 00000000000..8e2c5b20243 --- /dev/null +++ b/lang/mono/patches/patch-ah @@ -0,0 +1,30 @@ +$NetBSD: patch-ah,v 1.10 2010/04/29 08:44:30 kefren Exp $ +--- mono/utils/mono-semaphore.c.orig 2010-04-29 11:29:02.000000000 +0300 ++++ mono/utils/mono-semaphore.c 2010-04-29 11:19:30.000000000 +0300 +@@ -22,7 +22,7 @@ + # ifdef USE_MACH_SEMA + # define TIMESPEC mach_timespec_t + # define WAIT_BLOCK(a,b) semaphore_timedwait (*(a), *(b)) +-# elif defined(__OpenBSD__) ++# elif (defined(__OpenBSD__) || defined(__NetBSD__)) + # define TIMESPEC struct timespec + # define WAIT_BLOCK(a) sem_trywait(a) + # else +@@ -37,7 +37,7 @@ + TIMESPEC ts, copy; + struct timeval t; + int res = 0; +-#if defined(__OpenBSD__) ++#if (defined(__OpenBSD__) || defined(__NetBSD__)) + int timeout; + #endif + +@@ -55,7 +55,7 @@ + ts.tv_nsec -= NSEC_PER_SEC; + ts.tv_sec++; + } +-#if defined(__OpenBSD__) ++#if (defined(__OpenBSD__) || defined(__NetBSD__)) + timeout = ts.tv_sec; + while (timeout) { + if ((res = WAIT_BLOCK (sem)) == 0) diff --git a/lang/mono/patches/patch-bd b/lang/mono/patches/patch-bd index 77f28433219..1b289c43a87 100644 --- a/lang/mono/patches/patch-bd +++ b/lang/mono/patches/patch-bd @@ -1,8 +1,8 @@ -$NetBSD: patch-bd,v 1.2 2008/02/13 14:16:43 kefren Exp $ ---- mcs/build/config-default.make.orig 2008-02-05 14:12:44.000000000 +0200 -+++ mcs/build/config-default.make 2008-02-05 14:13:00.000000000 +0200 -@@ -17,6 +17,7 @@ - CFLAGS = -g -O2 +$NetBSD: patch-bd,v 1.3 2010/04/29 08:44:30 kefren Exp $ +--- mcs/build/config-default.make.orig 2010-04-22 18:38:03.000000000 +0300 ++++ mcs/build/config-default.make 2010-04-29 09:44:38.000000000 +0300 +@@ -19,6 +19,7 @@ + endif prefix = /usr/local exec_prefix = $(prefix) +mandir = $(prefix)/man diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db index bacfbc15b3e..caf3bdba21c 100644 --- a/lang/mono/patches/patch-db +++ b/lang/mono/patches/patch-db @@ -1,13 +1,13 @@ -$NetBSD: patch-db,v 1.2 2009/04/28 10:31:58 hasso Exp $ - ---- mono/utils/mono-proclib.c.orig 2008-11-10 20:56:14 -0800 -+++ mono/utils/mono-proclib.c 2009-03-03 15:30:03 -0800 -@@ -13,14 +13,19 @@ +$NetBSD: patch-db,v 1.3 2010/04/29 08:44:30 kefren Exp $ +--- mono/utils/mono-proclib.c.orig 2010-04-22 18:37:45.000000000 +0300 ++++ mono/utils/mono-proclib.c 2010-04-29 09:47:24.000000000 +0300 +@@ -13,15 +13,20 @@ #endif /* FIXME: bsds untested */ -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #include <sys/param.h> #include <sys/types.h> #include <sys/sysctl.h> +#ifndef __DragonFly__ @@ -17,10 +17,10 @@ $NetBSD: patch-db,v 1.2 2009/04/28 10:31:58 hasso Exp $ #include <sys/user.h> #endif -#ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC -+#ifdef __DragonFly__ ++#if !(defined(__NetBSD__) || defined(__DragonFly__)) +#define kinfo_pid_member kp_pid +#define kinfo_name_member kp_comm +#elif HAVE_STRUCT_KINFO_PROC_KP_PROC - #define kinfo_pid_member kp_proc.p_pid - #define kinfo_name_member kp_proc.p_comm - #else + # ifdef KERN_PROC2 + # define kinfo_pid_member p_pid + # define kinfo_name_member p_comm diff --git a/lang/mono/patches/patch-dc b/lang/mono/patches/patch-dc index 4a11a12163e..66502abb759 100644 --- a/lang/mono/patches/patch-dc +++ b/lang/mono/patches/patch-dc @@ -1,16 +1,16 @@ -$NetBSD: patch-dc,v 1.3 2010/02/16 17:01:05 kefren Exp $ ---- mono/mini/mini-x86.h.orig 2009-12-17 01:26:00.000000000 +0200 -+++ mono/mini/mini-x86.h 2010-02-16 12:29:54.000000000 +0200 -@@ -44,7 +44,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POIN - +$NetBSD: patch-dc,v 1.4 2010/04/29 08:44:30 kefren Exp $ +--- mono/mini/mini-x86.h.orig 2010-04-22 18:37:45.000000000 +0300 ++++ mono/mini/mini-x86.h 2010-04-29 09:48:59.000000000 +0300 +@@ -45,7 +45,7 @@ #endif /* PLATFORM_WIN32 */ --#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) -+#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) + #if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || \ +- defined(__FreeBSD__) || defined(__OpenBSD__) ++ defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #define MONO_ARCH_USE_SIGACTION #endif -@@ -150,7 +150,7 @@ typedef struct { +@@ -151,7 +151,7 @@ gboolean need_stack_frame; } MonoCompileArch; diff --git a/lang/mono/patches/patch-df b/lang/mono/patches/patch-df index 7e5bb3a2464..bbb087e5a6d 100644 --- a/lang/mono/patches/patch-df +++ b/lang/mono/patches/patch-df @@ -1,13 +1,12 @@ -$NetBSD: patch-df,v 1.2 2009/04/28 10:31:58 hasso Exp $ - ---- support/mph.h.orig 2009-03-03 16:39:06 -0800 -+++ support/mph.h 2009-03-03 16:39:21 -0800 +$NetBSD: patch-df,v 1.3 2010/04/29 08:44:30 kefren Exp $ +--- support/mph.h.orig 2010-04-22 18:37:47.000000000 +0300 ++++ support/mph.h 2010-04-29 09:50:38.000000000 +0300 @@ -36,7 +36,7 @@ #include <stdint.h> /* for SIZE_MAX */ #endif --#if __APPLE__ || __BSD__ || __FreeBSD__ -+#if __APPLE__ || __BSD__ || __FreeBSD__ || __DragonFly__ +-#if __APPLE__ || __BSD__ || __FreeBSD__ || __OpenBSD__ ++#if __APPLE__ || __BSD__ || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__ #define MPH_ON_BSD #endif diff --git a/lang/mono/patches/patch-dg b/lang/mono/patches/patch-dg index 1aa8c6c96a5..ed9085116f7 100644 --- a/lang/mono/patches/patch-dg +++ b/lang/mono/patches/patch-dg @@ -1,14 +1,14 @@ -$NetBSD: patch-dg,v 1.2 2010/02/16 17:01:05 kefren Exp $ ---- mono/metadata/threads.c.orig 2009-11-03 02:36:41.000000000 +0200 -+++ mono/metadata/threads.c 2010-02-16 12:34:11.000000000 +0200 -@@ -865,8 +865,14 @@ mono_thread_get_stack_bounds (guint8 **s - - # ifndef sun +$NetBSD: patch-dg,v 1.3 2010/04/29 08:44:30 kefren Exp $ +--- mono/metadata/threads.c.orig 2010-04-22 18:37:44.000000000 +0300 ++++ mono/metadata/threads.c 2010-04-29 10:52:33.000000000 +0300 +@@ -880,8 +880,14 @@ + # if !defined(__OpenBSD__) pthread_attr_getstack (&attr, (void**)staddr, stsize); -+ /* -+ * he@NetBSD.org: For some reason, this test fails on NetBSD/powerpc, -+ * so just avoid it. -+ */ + # endif ++ /* ++ * he@NetBSD.org: For some reason, this test fails on NetBSD/powerpc, ++ * so just avoid it. ++ */ + #if !(defined(__NetBSD__) && defined(__powerpc__)) if (*staddr) g_assert ((current > *staddr) && (current < *staddr + *stsize)); diff --git a/lang/mono/patches/patch-di b/lang/mono/patches/patch-di index 9fea5a1b275..c991eb8d6bf 100644 --- a/lang/mono/patches/patch-di +++ b/lang/mono/patches/patch-di @@ -1,12 +1,12 @@ -$NetBSD: patch-di,v 1.2 2010/02/16 17:01:05 kefren Exp $ ---- mono/tests/libtest.c.orig 2009-12-17 14:23:15.000000000 +0200 -+++ mono/tests/libtest.c 2010-02-16 12:37:39.000000000 +0200 -@@ -3190,7 +3190,7 @@ mono_test_marshal_ccw_itest (MonoComObje +$NetBSD: patch-di,v 1.3 2010/04/29 08:44:30 kefren Exp $ +--- mono/tests/libtest.c.orig 2010-04-22 18:37:47.000000000 +0300 ++++ mono/tests/libtest.c 2010-04-29 10:55:04.000000000 +0300 +@@ -3190,7 +3190,7 @@ * mono_method_get_unmanaged_thunk tests */ --#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__FreeBSD__)) || (defined(__ppc__) && defined(__APPLE__))) -+#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__) || defined (__NetBSD__)) || defined (__FreeBSD__) || defined(__DragonFly__)) || (defined(__ppc__) && defined(__APPLE__))) +-#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__FreeBSD__) || defined(__OpenBSD__)) || (defined(__ppc__) && defined(__APPLE__))) ++#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__NetBSD__) || defined (__FreeBSD__) || defined(__OpenBSD__)) || (defined(__ppc__) && defined(__APPLE__))) #define ALIGN(size) __attribute__ ((aligned(size))) #else #define ALIGN(size) |