diff options
-rw-r--r-- | lang/mono/Makefile | 4 | ||||
-rw-r--r-- | lang/mono/distinfo | 6 | ||||
-rw-r--r-- | lang/mono/patches/patch-ah | 63 | ||||
-rw-r--r-- | lang/mono/patches/patch-ai | 22 | ||||
-rw-r--r-- | lang/mono/patches/patch-aj | 26 | ||||
-rw-r--r-- | lang/mono/patches/patch-ak | 13 |
6 files changed, 132 insertions, 2 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index fd12d5e703a..c4ca4171be3 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2003/10/02 08:41:42 recht Exp $ +# $NetBSD: Makefile,v 1.12 2003/12/03 00:12:12 recht Exp $ # DISTNAME= mono-0.28 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.go-mono.org/archive/ @@ -23,6 +24,7 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/libgc/libtool PKGCONFIG_OVERRIDE= mono.pc.in CONFIGURE_ARGS+= --with-gc=included diff --git a/lang/mono/distinfo b/lang/mono/distinfo index f3f7f35e67b..b97f0f2443b 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2003/10/02 08:41:42 recht Exp $ +$NetBSD: distinfo,v 1.6 2003/12/03 00:12:12 recht Exp $ SHA1 (mono-0.28.tar.gz) = be85cd411d24d2b62bec6eb06eaab936b7f13f25 Size (mono-0.28.tar.gz) = 9323050 bytes @@ -7,3 +7,7 @@ SHA1 (patch-ad) = ab5ff080232df6a59e34d1806ffe288a1052a019 SHA1 (patch-ae) = 11adc136723cf56d6cae51e59a58da1f0152e98d SHA1 (patch-af) = bda6a314b0c4bef9c4a6db7e0860123d4de1f0fa SHA1 (patch-ag) = c0b458ff387fba231db3a536cba507d3c16e0286 +SHA1 (patch-ah) = ca67288373df96e46b1d60560cca25698ce8261e +SHA1 (patch-ai) = af76f915b1cb00b9c662e89ddb7aaf702de4a26d +SHA1 (patch-aj) = ab41349968d0f621c5f3e848c25d112c50558a28 +SHA1 (patch-ak) = aab1295adad7a09b9fc7d52139793bb7ec0b76d5 diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah new file mode 100644 index 00000000000..bd707abcf79 --- /dev/null +++ b/lang/mono/patches/patch-ah @@ -0,0 +1,63 @@ +$NetBSD: patch-ah,v 1.3 2003/12/03 00:12:12 recht Exp $ + +--- libgc/os_dep.c.orig 2003-08-26 23:21:14.000000000 +0200 ++++ libgc/os_dep.c 2003-11-27 18:34:40.000000000 +0100 +@@ -121,7 +121,7 @@ + # include <fcntl.h> + #endif + +-#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX) ++#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX) || defined(NETBSD) + # ifdef SUNOS5SIGS + # include <sys/siginfo.h> + # endif +@@ -688,9 +688,11 @@ + typedef void (*handler)(); + # endif + +-# if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) || defined(HURD) ++# if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) \ ++ || defined(HURD) || defined(NETBSD) + static struct sigaction old_segv_act; +-# if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) || defined(HURD) ++# if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \ ++ || defined(HURD) || defined(NETBSD) + static struct sigaction old_bus_act; + # endif + # else +@@ -705,11 +707,11 @@ + # endif + { + # if defined(SUNOS5SIGS) || defined(IRIX5) \ +- || defined(OSF1) || defined(HURD) ++ || defined(OSF1) || defined(HURD) || defined(NETBSD) + struct sigaction act; + + act.sa_handler = h; +-# ifdef SUNOS5SIGS ++# if defined(SUNOS5SIGS) || defined(NETBSD) + act.sa_flags = SA_RESTART | SA_NODEFER; + # else + act.sa_flags = SA_RESTART; +@@ -729,7 +731,7 @@ + # else + (void) sigaction(SIGSEGV, &act, &old_segv_act); + # if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \ +- || defined(HPUX) || defined(HURD) ++ || defined(HPUX) || defined(HURD) || defined(NETBSD) + /* Under Irix 5.x or HP/UX, we may get SIGBUS. */ + /* Pthreads doesn't exist under Irix 5.x, so we */ + /* don't have to worry in the threads case. */ +@@ -765,10 +767,10 @@ + void GC_reset_fault_handler() + { + # if defined(SUNOS5SIGS) || defined(IRIX5) \ +- || defined(OSF1) || defined(HURD) ++ || defined(OSF1) || defined(HURD) || defined(NETBSD) + (void) sigaction(SIGSEGV, &old_segv_act, 0); + # if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \ +- || defined(HPUX) || defined(HURD) ++ || defined(HPUX) || defined(HURD) || defined(NETBSD) + (void) sigaction(SIGBUS, &old_bus_act, 0); + # endif + # else diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai new file mode 100644 index 00000000000..2b69aabf599 --- /dev/null +++ b/lang/mono/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 2003/12/03 00:12:12 recht Exp $ + +--- configure.orig 2003-11-27 18:35:28.000000000 +0100 ++++ configure 2003-11-27 18:39:04.000000000 +0100 +@@ -1914,7 +1914,7 @@ + _ACEOF + + libdl= +- libgc_threads=pthreads ++ libgc_threads=no + ;; + *-*-*freebsd*|*-*-*openbsd*) + platform_win32=no +@@ -1931,7 +1931,7 @@ + _ACEOF + + libdl= +- libgc_threads=pthreads ++ libgc_threads=no + ;; + *-*-linux*) + platform_win32=no diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj new file mode 100644 index 00000000000..8bebb9642c0 --- /dev/null +++ b/lang/mono/patches/patch-aj @@ -0,0 +1,26 @@ +$NetBSD: patch-aj,v 1.1 2003/12/03 00:12:12 recht Exp $ + +--- libgc/include/private/gcconfig.h.orig 2003-08-26 23:01:26.000000000 +0200 ++++ libgc/include/private/gcconfig.h 2003-11-27 18:42:00.000000000 +0100 +@@ -1151,8 +1151,8 @@ + # ifndef GC_FREEBSD_THREADS + # define MPROTECT_VDB + # endif +-# define SIG_SUSPEND SIGUSR1 +-# define SIG_THR_RESTART SIGUSR2 ++# define SIG_SUSPEND SIGTSTP ++# define SIG_THR_RESTART SIGCONT + # define FREEBSD_STACKBOTTOM + # ifdef __ELF__ + # define DYNAMIC_LOADING +@@ -1466,8 +1466,8 @@ + # ifdef FREEBSD + # define OS_TYPE "FREEBSD" + /* MPROTECT_VDB is not yet supported at all on FreeBSD/alpha. */ +-# define SIG_SUSPEND SIGUSR1 +-# define SIG_THR_RESTART SIGUSR2 ++# define SIG_SUSPEND SIGTSTP ++# define SIG_THR_RESTART SIGCONT + # define FREEBSD_STACKBOTTOM + # ifdef __ELF__ + # define DYNAMIC_LOADING diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak new file mode 100644 index 00000000000..c473abb5b2d --- /dev/null +++ b/lang/mono/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2003/12/03 00:12:12 recht Exp $ + +--- mono/metadata/mono-config.c.orig 2003-11-27 21:10:10.000000000 +0100 ++++ mono/metadata/mono-config.c 2003-11-27 21:12:30.000000000 +0100 +@@ -258,7 +258,7 @@ + + /* Ensure mono_cfg_dir gets a value */ + mono_install_get_config_dir (); +- mono_cfg = g_build_filename (mono_cfg_dir, "mono", "config", NULL); ++ mono_cfg = g_build_filename (mono_cfg_dir, "config", NULL, NULL); + mono_config_parse_file (mono_cfg); + g_free (mono_cfg); + |