diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/mono/Makefile | 3 | ||||
-rw-r--r-- | lang/mono/distinfo | 20 | ||||
-rw-r--r-- | lang/mono/patches/patch-ab | 31 | ||||
-rw-r--r-- | lang/mono/patches/patch-ae | 2 | ||||
-rw-r--r-- | lang/mono/patches/patch-ch | 2 | ||||
-rw-r--r-- | lang/mono/patches/patch-da | 2 | ||||
-rw-r--r-- | lang/mono/patches/patch-db | 2 | ||||
-rw-r--r-- | lang/mono/patches/patch-dc | 31 | ||||
-rw-r--r-- | lang/mono/patches/patch-de | 2 | ||||
-rw-r--r-- | lang/mono/patches/patch-df | 2 | ||||
-rw-r--r-- | lang/mono/patches/patch-dh | 13 | ||||
-rw-r--r-- | lang/mono/patches/patch-di | 13 |
12 files changed, 105 insertions, 18 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index cc0115ca43d..05e94b4665b 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.84 2009/04/13 11:38:23 hasso Exp $ +# $NetBSD: Makefile,v 1.85 2009/04/28 10:31:58 hasso Exp $ DISTNAME= mono-${MONO_VERSION} +PKGREVISION= 1 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 ad100e74bb2..f68f78143da 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.47 2009/04/07 08:20:42 kefren Exp $ +$NetBSD: distinfo,v 1.48 2009/04/28 10:31:58 hasso Exp $ SHA1 (mono-2.4.tar.bz2) = a0b5ea2f17f9ecc1d85f34e12e83797342104f5d RMD160 (mono-2.4.tar.bz2) = cc0581b0ef13349a7bbdc4284cf985af9c52bd94 Size (mono-2.4.tar.bz2) = 24861051 bytes -SHA1 (patch-ab) = 4ce8b19286e2696b1fe8786366fb79d546d248ff +SHA1 (patch-ab) = e2a9c788c072f347dcb4c427d91b50b5153bff2f SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05 -SHA1 (patch-ae) = bd667ff350c7086d2ec0d8c873f2c7e2dfc09ed7 +SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53 SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df @@ -24,10 +24,12 @@ SHA1 (patch-ca) = f5c54525d70b185f9fcb28f82034c4e995395c0b SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69 SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0 -SHA1 (patch-ch) = acf3a67779917d1e8fec364b191be6a3c0c507c5 -SHA1 (patch-da) = 84e572df943a65ef30205f219921a899949abac8 -SHA1 (patch-db) = c96ec3799d538af33797dea9c3687a091677e0e7 -SHA1 (patch-dc) = 1f1792e7c23cfeebabed2bd82f47b18a245e9641 -SHA1 (patch-de) = 292bdc9baf16f5c9f2dc42645ef6d9cdc1a7add8 -SHA1 (patch-df) = a1127999bf0d73dfaeabb369e0ad6abe3fc4b255 +SHA1 (patch-ch) = d495e5a77a349b8d243ebf0a06a48d4342627ae2 +SHA1 (patch-da) = 877ed8ec92ec25686c5a9a59db107f122d49035d +SHA1 (patch-db) = 97c39aafeb66afdd42317a18c9b8d7d92b103cc0 +SHA1 (patch-dc) = 29fe575f97b7716ffb467e3ae0f19cb8b1e35c87 +SHA1 (patch-de) = 199930ed3ea86d14d9ffbcac46aac708b30dc1a0 +SHA1 (patch-df) = b84e779e8054d6425b38a3aeea2971e3a5a78f07 SHA1 (patch-dg) = d5bcda304ad00b5b8ea03dec76967b43da4b0d51 +SHA1 (patch-dh) = 5eaa3c65036ccd35415d8da9dc7e77ed8c08c67c +SHA1 (patch-di) = cec2e67c65ca0d9b1ef17a2d9929e85c126cb1ad diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index 4b419793a92..8f62e2d4be4 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,6 +1,8 @@ ---- configure.orig 2009-01-09 07:56:07 -0800 -+++ configure 2009-03-03 16:24:30 -0800 -@@ -2938,11 +2938,11 @@ +$NetBSD: patch-ab,v 1.17 2009/04/28 10:31:58 hasso Exp $ + +--- configure.orig 2009-03-13 16:51:11 +0200 ++++ configure 2009-04-27 12:56:28 +0300 +@@ -2939,11 +2939,11 @@ _ACEOF CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes @@ -14,7 +16,17 @@ platform_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" -@@ -32216,6 +32216,9 @@ +@@ -2959,7 +2959,8 @@ _ACEOF + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" + libmono_ldflags="$PTHREAD_LIBS" + fi +- CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" ++ CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6 -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP" ++ libmono_cflags="$libmono_cflags -D_REENTRANT" + need_link_unlink=yes + + cat >>confdefs.h <<\_ACEOF +@@ -32274,6 +32275,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default #include <$ac_header> @@ -24,7 +36,7 @@ _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" -@@ -32256,6 +32259,9 @@ +@@ -32314,6 +32318,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> @@ -34,3 +46,12 @@ _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in +@@ -40049,7 +40056,7 @@ case "$host" in + LIBC="libc.so.12" + INTL="libintl.so.0" + ;; +- *-*-*freebsd*) ++ *-*-*freebsd*|*-*-*dragonfly*) + LIBC="libc.so" + INTL="libintl.so" + ;; diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae index d9f40c24686..c6493b1f363 100644 --- a/lang/mono/patches/patch-ae +++ b/lang/mono/patches/patch-ae @@ -1,3 +1,5 @@ +$NetBSD: patch-ae,v 1.10 2009/04/28 10:31:58 hasso Exp $ + --- libgc/configure.orig 2009-01-09 07:56:17 -0800 +++ libgc/configure 2009-03-03 15:25:59 -0800 @@ -4604,7 +4604,27 @@ diff --git a/lang/mono/patches/patch-ch b/lang/mono/patches/patch-ch index c3f23387c14..619cf601e45 100644 --- a/lang/mono/patches/patch-ch +++ b/lang/mono/patches/patch-ch @@ -1,3 +1,5 @@ +$NetBSD: patch-ch,v 1.5 2009/04/28 10:31:58 hasso Exp $ + --- mcs/tools/csharplib/Makefile.orig 2009-04-07 07:16:59.000000000 +0300 +++ mcs/tools/csharplib/Makefile 2009-04-07 07:17:14.000000000 +0300 @@ -33,6 +33,6 @@ diff --git a/lang/mono/patches/patch-da b/lang/mono/patches/patch-da index 23e020cc745..93c860f616f 100644 --- a/lang/mono/patches/patch-da +++ b/lang/mono/patches/patch-da @@ -1,3 +1,5 @@ +$NetBSD: patch-da,v 1.2 2009/04/28 10:31:58 hasso Exp $ + --- libgc/include/private/gcconfig.h.orig 2009-03-03 14:22:28 -0800 +++ libgc/include/private/gcconfig.h 2009-03-03 14:24:56 -0800 @@ -351,6 +351,9 @@ diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db index fb1bf79f957..bacfbc15b3e 100644 --- a/lang/mono/patches/patch-db +++ b/lang/mono/patches/patch-db @@ -1,3 +1,5 @@ +$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 @@ diff --git a/lang/mono/patches/patch-dc b/lang/mono/patches/patch-dc index efb0641c4c3..58c3b5e7df5 100644 --- a/lang/mono/patches/patch-dc +++ b/lang/mono/patches/patch-dc @@ -1,6 +1,31 @@ ---- mono/mini/mini-x86.h.orig 2009-03-03 16:01:51 -0800 -+++ mono/mini/mini-x86.h 2009-03-03 16:02:17 -0800 -@@ -194,7 +194,7 @@ +$NetBSD: patch-dc,v 1.2 2009/04/28 10:31:58 hasso Exp $ + +--- mono/mini/mini-x86.h.orig 2009-02-14 01:34:26 +0200 ++++ mono/mini/mini-x86.h 2009-04-27 13:32:19 +0300 +@@ -43,7 +43,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POIN + + #endif /* PLATFORM_WIN32 */ + +-#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) + #define MONO_ARCH_USE_SIGACTION + #endif + +@@ -138,11 +138,11 @@ struct MonoLMF { + + typedef void* MonoCompileArch; + +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) + #include <ucontext.h> + #endif + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext.mc_eax) + #define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext.mc_ebx) + #define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext.mc_ecx) +@@ -194,7 +194,7 @@ typedef void* MonoCompileArch; #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.gregs [REG_EIP]) #endif diff --git a/lang/mono/patches/patch-de b/lang/mono/patches/patch-de index 794564eb289..772227b942b 100644 --- a/lang/mono/patches/patch-de +++ b/lang/mono/patches/patch-de @@ -1,3 +1,5 @@ +$NetBSD: patch-de,v 1.2 2009/04/28 10:31:58 hasso Exp $ + --- ikvm-native/jni.c.orig 2009-03-03 16:07:20 -0800 +++ ikvm-native/jni.c 2009-03-03 16:07:43 -0800 @@ -28,7 +28,7 @@ diff --git a/lang/mono/patches/patch-df b/lang/mono/patches/patch-df index 79c4d8d663f..7e5bb3a2464 100644 --- a/lang/mono/patches/patch-df +++ b/lang/mono/patches/patch-df @@ -1,3 +1,5 @@ +$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 @@ -36,7 +36,7 @@ diff --git a/lang/mono/patches/patch-dh b/lang/mono/patches/patch-dh new file mode 100644 index 00000000000..4f8a5b7146c --- /dev/null +++ b/lang/mono/patches/patch-dh @@ -0,0 +1,13 @@ +$NetBSD: patch-dh,v 1.1 2009/04/28 10:31:58 hasso Exp $ + +--- mono/mini/mini-x86.c.orig 2009-04-28 08:42:57 +0300 ++++ mono/mini/mini-x86.c 2009-04-28 08:43:22 +0300 +@@ -171,7 +171,7 @@ typedef struct { + + static X86_Reg_No param_regs [] = { 0 }; + +-#if defined(PLATFORM_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(PLATFORM_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + #define SMALL_STRUCTS_IN_REGS + static X86_Reg_No return_regs [] = { X86_EAX, X86_EDX }; + #endif diff --git a/lang/mono/patches/patch-di b/lang/mono/patches/patch-di new file mode 100644 index 00000000000..5bb6010dadc --- /dev/null +++ b/lang/mono/patches/patch-di @@ -0,0 +1,13 @@ +$NetBSD: patch-di,v 1.1 2009/04/28 10:31:58 hasso Exp $ + +--- mono/tests/libtest.c.orig 2009-04-27 12:38:38 +0300 ++++ mono/tests/libtest.c 2009-04-27 12:40:25 +0300 +@@ -2978,7 +2978,7 @@ mono_test_marshal_ccw_itest (MonoComObje + * mono_method_get_unmanaged_thunk tests + */ + +-#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__))) || (defined(__ppc__) && defined(__APPLE__))) ++#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__) || defined (__FreeBSD__) || defined(__DragonFly__))) || (defined(__ppc__) && defined(__APPLE__))) + #define ALIGN(size) __attribute__ ((aligned(size))) + #else + #define ALIGN(size) |