summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrecht <recht>2003-12-03 17:08:24 +0000
committerrecht <recht>2003-12-03 17:08:24 +0000
commit145a46aec1eb749dd61d43e8ca20064f0a02896a (patch)
treed137e0ed17fd27ffff9680924d802539d9855367
parent47d943824c4e595c045eed7df4cce2259779d0f2 (diff)
downloadpkgsrc-145a46aec1eb749dd61d43e8ca20064f0a02896a.tar.gz
update to 0.29
lots of updates fixes see http://www.go-mono.com/archive/mono-0.29.html for details
-rw-r--r--lang/mono/Makefile24
-rw-r--r--lang/mono/PLIST13
-rw-r--r--lang/mono/buildlink2.mk11
-rw-r--r--lang/mono/distinfo13
-rw-r--r--lang/mono/patches/patch-ac10
-rw-r--r--lang/mono/patches/patch-ad8
-rw-r--r--lang/mono/patches/patch-ae41
-rw-r--r--lang/mono/patches/patch-af21
-rw-r--r--lang/mono/patches/patch-ag88
-rw-r--r--lang/mono/patches/patch-ah2
-rw-r--r--lang/mono/patches/patch-ai2
-rw-r--r--lang/mono/patches/patch-aj2
-rw-r--r--lang/mono/patches/patch-ak2
13 files changed, 50 insertions, 187 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index c4ca4171be3..f4c7e554ab2 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/12/03 00:12:12 recht Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/03 17:08:24 recht Exp $
#
-DISTNAME= mono-0.28
-PKGREVISION= 1
+DISTNAME= mono-0.29
CATEGORIES= lang
MASTER_SITES= http://www.go-mono.org/archive/
@@ -17,24 +16,33 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-5]*-*
NOT_FOR_PLATFORM+= NetBSD-1.6-* NetBSD-1.6.*-*
NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
-GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_BUILDLINK2= YES
-USE_LIBTOOL= YES
USE_PKGINSTALL= YES
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --with-gc=included
+CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
+
+USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LIBTOOL_OVERRIDE+= ${WRKSRC}/libgc/libtool
+
PKGCONFIG_OVERRIDE= mono.pc.in
+PKG_SYSCONFSUBDIR= mono
-CONFIGURE_ARGS+= --with-gc=included
-CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
+USE_PERL5= build
+REPLACE_PERL= mono/cil/make-opcodes-def.pl
+REPLACE_PERL+= mono/metadata/make-bundle.pl
-PKG_SYSCONFSUBDIR= mono
EGDIR= ${PREFIX}/share/examples/mono
CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/config
CONF_FILES+= ${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
+CONF_FILES+= ${EGDIR}/DefaultWsdlHelpGenerator.aspx ${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../textproc/icu/buildlink2.mk"
+
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 8b27ca68411..9a10588325b 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2003/10/02 08:41:42 recht Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/03 17:08:24 recht Exp $
bin/chktrust
bin/chktrust.exe
bin/cilc
bin/cilc.exe
+bin/disco
+bin/disco.exe
bin/genxs
bin/genxs.exe
bin/ilasm
@@ -66,6 +68,7 @@ include/mono/metadata/environment.h
include/mono/metadata/exception.h
include/mono/metadata/image.h
include/mono/metadata/loader.h
+include/mono/metadata/locales.h
include/mono/metadata/mempool.h
include/mono/metadata/metadata.h
include/mono/metadata/monitor.h
@@ -89,6 +92,7 @@ include/mono/private/libgc-mono-debugger.h
include/mono/utils/mono-digest.h
include/mono/utils/mono-hash.h
include/mono/utils/mono-logger.h
+include/mono/utils/mono-math.h
include/mono/utils/monobitset.h
lib/Accessibility.dll
lib/ByteFX.Data.dll
@@ -113,7 +117,6 @@ lib/Mono.Data.SqliteClient.dll
lib/Mono.Data.SybaseClient.dll
lib/Mono.Data.Tds.dll
lib/Mono.Data.TdsClient.dll
-lib/Mono.Directory.LDAP.dll
lib/Mono.GetOptions.dll
lib/Mono.Http.dll
lib/Mono.PEToolkit.dll
@@ -122,6 +125,7 @@ lib/Mono.Security.Win32.dll
lib/Mono.Security.dll
lib/NUnit.Framework.dll
lib/NUnit.Util.dll
+lib/Novell.Directory.Ldap.dll
lib/Npgsql.dll
lib/PEAPI.dll
lib/System.Configuration.Install.dll
@@ -143,7 +147,7 @@ lib/System.Web.dll
lib/System.Windows.Forms.dll
lib/System.Xml.dll
lib/System.dll
-lib/corlib.dll
+lib/libgdiplus.dll.so
lib/libmono-profiler-cov.a
lib/libmono-profiler-cov.la
lib/libmono-profiler-cov.so
@@ -154,9 +158,11 @@ lib/libmono.la
lib/libmono.so
lib/libmono.so.0
lib/libmono.so.0.0
+lib/mscorlib.dll
lib/pkgconfig/mono.pc
man/man1/cert2spc.1
man/man1/cilc.1
+man/man1/genxs.1
man/man1/ilasm.1
man/man1/mcs.1
man/man1/mint.1
@@ -167,6 +173,7 @@ man/man1/monostyle.1
man/man1/oldmono.1
man/man1/sqlsharp.1
man/man5/mono-config.5
+share/examples/mono/DefaultWsdlHelpGenerator.aspx
share/examples/mono/config
share/examples/mono/machine.config
share/mono/cil/cil-opcodes.xml
diff --git a/lang/mono/buildlink2.mk b/lang/mono/buildlink2.mk
index dfc1030c3b5..1801cfaca49 100644
--- a/lang/mono/buildlink2.mk
+++ b/lang/mono/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/10/02 08:41:42 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/03 17:08:24 recht Exp $
.if !defined(MONO_BUILDLINK2_MK)
MONO_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= mono
-BUILDLINK_DEPENDS.mono?= mono>=0.28
+BUILDLINK_DEPENDS.mono?= mono>=0.29
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
EVAL_PREFIX+= BUILDLINK_PREFIX.mono=mono
@@ -38,7 +38,6 @@ BUILDLINK_FILES.mono+= lib/Mono.Data.SqliteClient.dll
BUILDLINK_FILES.mono+= lib/Mono.Data.SybaseClient.dll
BUILDLINK_FILES.mono+= lib/Mono.Data.Tds.dll
BUILDLINK_FILES.mono+= lib/Mono.Data.TdsClient.dll
-BUILDLINK_FILES.mono+= lib/Mono.Directory.LDAP.dll
BUILDLINK_FILES.mono+= lib/Mono.GetOptions.dll
BUILDLINK_FILES.mono+= lib/Mono.Http.dll
BUILDLINK_FILES.mono+= lib/Mono.PEToolkit.dll
@@ -47,6 +46,7 @@ BUILDLINK_FILES.mono+= lib/Mono.Security.Win32.dll
BUILDLINK_FILES.mono+= lib/Mono.Security.dll
BUILDLINK_FILES.mono+= lib/NUnit.Framework.dll
BUILDLINK_FILES.mono+= lib/NUnit.Util.dll
+BUILDLINK_FILES.mono+= lib/Novell.Directory.Ldap.dll
BUILDLINK_FILES.mono+= lib/Npgsql.dll
BUILDLINK_FILES.mono+= lib/PEAPI.dll
BUILDLINK_FILES.mono+= lib/System.Configuration.Install.dll
@@ -68,12 +68,13 @@ BUILDLINK_FILES.mono+= lib/System.Web.dll
BUILDLINK_FILES.mono+= lib/System.Windows.Forms.dll
BUILDLINK_FILES.mono+= lib/System.Xml.dll
BUILDLINK_FILES.mono+= lib/System.dll
-BUILDLINK_FILES.mono+= lib/corlib.dll
+BUILDLINK_FILES.mono+= lib/libgdiplus.dll.*
BUILDLINK_FILES.mono+= lib/libmono-profiler-cov.*
BUILDLINK_FILES.mono+= lib/libmono.*
-BUILDLINK_FILES.mono+= lib/pkgconfig/mono.pc
+BUILDLINK_FILES.mono+= lib/mscorlib.dll
.include "../../devel/glib2/buildlink2.mk"
+.include "../../textproc/icu/buildlink2.mk"
BUILDLINK_TARGETS+= mono-buildlink
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index b97f0f2443b..a26594548bf 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.6 2003/12/03 00:12:12 recht Exp $
+$NetBSD: distinfo,v 1.7 2003/12/03 17:08:24 recht Exp $
-SHA1 (mono-0.28.tar.gz) = be85cd411d24d2b62bec6eb06eaab936b7f13f25
-Size (mono-0.28.tar.gz) = 9323050 bytes
-SHA1 (patch-ac) = ef7f68603eaaf9c6ad7a3d65005a9cc62cd04a40
-SHA1 (patch-ad) = ab5ff080232df6a59e34d1806ffe288a1052a019
-SHA1 (patch-ae) = 11adc136723cf56d6cae51e59a58da1f0152e98d
-SHA1 (patch-af) = bda6a314b0c4bef9c4a6db7e0860123d4de1f0fa
-SHA1 (patch-ag) = c0b458ff387fba231db3a536cba507d3c16e0286
+SHA1 (mono-0.29.tar.gz) = 882b991e85c6db2b28ed07651da6f231c6d672ac
+Size (mono-0.29.tar.gz) = 10537284 bytes
+SHA1 (patch-ac) = 3a8366001ea1f47e68a54154d773c490655a07b7
+SHA1 (patch-ad) = 039b5c7fa27656b610095a87343d840a924bbf84
SHA1 (patch-ah) = ca67288373df96e46b1d60560cca25698ce8261e
SHA1 (patch-ai) = af76f915b1cb00b9c662e89ddb7aaf702de4a26d
SHA1 (patch-aj) = ab41349968d0f621c5f3e848c25d112c50558a28
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index 89654510563..efa3fc3ce73 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2003/09/25 16:05:21 recht Exp $
+$NetBSD: patch-ac,v 1.4 2003/12/03 17:08:24 recht Exp $
---- data/Makefile.in.orig 2003-08-14 08:00:52.000000000 +0200
-+++ data/Makefile.in 2003-09-25 01:58:12.000000000 +0200
-@@ -114,7 +114,7 @@
+--- data/Makefile.in.orig 2003-11-13 13:03:51.000000000 +0100
++++ data/Makefile.in 2003-11-13 16:22:41.000000000 +0100
+@@ -117,7 +117,7 @@
libgc_dir = @libgc_dir@
libmono_cflags = @libmono_cflags@
libmono_ldflags = @libmono_ldflags@
-monodir = $(sysconfdir)/mono
+monodir = $(datadir)/examples/mono
- EXTRA_DIST = config.in machine.config
+ EXTRA_DIST = config.in machine.config DefaultWsdlHelpGenerator.aspx
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index b46608a71f8..8c5038b7349 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2003/10/02 08:41:42 recht Exp $
+$NetBSD: patch-ad,v 1.4 2003/12/03 17:08:24 recht Exp $
---- mono/metadata/icall.c.orig 2003-09-26 18:25:40.000000000 +0200
-+++ mono/metadata/icall.c 2003-10-02 10:24:51.000000000 +0200
-@@ -3554,7 +3554,7 @@
+--- mono/metadata/icall.c.orig 2003-11-12 18:22:22.000000000 +0100
++++ mono/metadata/icall.c 2003-11-13 16:22:57.000000000 +0100
+@@ -3796,7 +3796,7 @@
MONO_ARCH_SAVE_REGS;
diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae
deleted file mode 100644
index 2dc91e85408..00000000000
--- a/lang/mono/patches/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/09/25 16:05:21 recht Exp $
-
---- mono/mini/mini-x86.c.orig 2003-08-05 12:32:07.000000000 +0200
-+++ mono/mini/mini-x86.c 2003-09-25 01:55:36.000000000 +0200
-@@ -7,6 +7,10 @@
- *
- * (C) 2003 Ximian, Inc.
- */
-+
-+#include <sys/types.h>
-+#include <sys/mman.h>
-+
- #include "mini.h"
- #include <string.h>
- #include <math.h>
-@@ -19,6 +23,13 @@
- #include "inssel.h"
- #include "cpu-pentium.h"
-
-+/* XXX OpenBSD port. */
-+extern int OPENBSD__signbitd(double);
-+extern int OPENBSD__signbitf(float);
-+#undef signbit
-+#define signbit(x) (sizeof(x) == sizeof(float) ? \
-+ OPENBSD__signbitf(x) : OPENBSD__signbitd(x))
-+
- const char*
- mono_arch_regname (int reg) {
- switch (reg) {
-@@ -400,7 +411,11 @@
-
- if (have_cpuid) {
- CpuidFunc func = (CpuidFunc)cpuid_impl;
-+ if (mprotect (func, sizeof(cpuid_impl), PROT_EXEC | PROT_READ) == -1)
-+ g_error ("mprotect failed\n");
- func (id, p_eax, p_ebx, p_ecx, p_edx);
-+ /*if (mprotect (func, sizeof(cpuid_impl), PROT_WRITE | PROT_READ) == -1)
-+ g_error ("mprotect failed\n");*/
- /*
- * We use this approach because of issues with gcc and pic code, see:
- * http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gcc&pr=7329
diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af
deleted file mode 100644
index 4ef17f97771..00000000000
--- a/lang/mono/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/10/02 08:41:42 recht Exp $
-
---- mono/mini/Makefile.in.orig 2003-10-01 18:59:02.000000000 +0200
-+++ mono/mini/Makefile.in 2003-10-02 10:25:53.000000000 +0200
-@@ -181,6 +181,7 @@
- mini-x86.c \
- mini-x86.h \
- exceptions-x86.c \
-+ OPENBSD_signbit.c \
- tramp-x86.c
-
-
-@@ -271,7 +272,7 @@
- linear-scan.lo aot.lo graph.lo
- am__objects_2 = mini-ppc.lo exceptions-ppc.lo tramp-ppc.lo
- am__objects_3 = mini-sparc.lo exceptions-sparc.lo tramp-sparc.lo
--am__objects_4 = mini-x86.lo exceptions-x86.lo tramp-x86.lo
-+am__objects_4 = mini-x86.lo exceptions-x86.lo tramp-x86.lo OPENBSD_signbit.lo
- @POWERPC_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_2)
- @SPARC_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_3)
- @X86_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_4)
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
deleted file mode 100644
index 491643126c7..00000000000
--- a/lang/mono/patches/patch-ag
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/09/25 16:05:21 recht Exp $
-
---- /dev/null 2003-09-25 01:52:37.000000000 +0200
-+++ mono/mini/OPENBSD_signbit.c 2003-09-25 01:55:36.000000000 +0200
-@@ -0,0 +1,83 @@
-+/*
-+ * Copyright 2003 Marius Aamodt Eriksen <marius@monkey.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/* XXX this is for little endian machines */
-+
-+#include <sys/types.h>
-+
-+int OPENBSD__signbitd(double);
-+int OPENBSD__signbitf(float);
-+
-+typedef union
-+{
-+ double value;
-+ struct
-+ {
-+ u_int32_t lsw;
-+ u_int32_t msw;
-+ } parts;
-+} ieee_double_shape_type;
-+
-+typedef union
-+{
-+ float value;
-+ u_int32_t word;
-+} ieee_float_shape_type;
-+
-+#define GET_HIGH_WORD(i,d) \
-+do { \
-+ ieee_double_shape_type gh_u; \
-+ gh_u.value = (d); \
-+ (i) = gh_u.parts.msw; \
-+} while (0)
-+
-+#define GET_FLOAT_WORD(i,d) \
-+do { \
-+ ieee_float_shape_type gf_u; \
-+ gf_u.value = (d); \
-+ (i) = gf_u.word; \
-+} while (0)
-+
-+int
-+OPENBSD__signbitd(double d)
-+{
-+ int32_t hw;
-+
-+ GET_HIGH_WORD(hw, d);
-+
-+ return (hw >> 31);
-+}
-+
-+int
-+OPENBSD__signbitf(float f)
-+{
-+ int32_t hw;
-+
-+ GET_FLOAT_WORD(hw, f);
-+
-+ return (hw >> 31);
-+}
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
index bd707abcf79..89ff9c4a7bc 100644
--- a/lang/mono/patches/patch-ah
+++ b/lang/mono/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2003/12/03 00:12:12 recht Exp $
+$NetBSD: patch-ah,v 1.4 2003/12/03 17:08:24 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
diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai
index 2b69aabf599..361e17adda4 100644
--- a/lang/mono/patches/patch-ai
+++ b/lang/mono/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2003/12/03 00:12:12 recht Exp $
+$NetBSD: patch-ai,v 1.2 2003/12/03 17:08:24 recht Exp $
--- configure.orig 2003-11-27 18:35:28.000000000 +0100
+++ configure 2003-11-27 18:39:04.000000000 +0100
diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj
index 8bebb9642c0..534b18139e0 100644
--- a/lang/mono/patches/patch-aj
+++ b/lang/mono/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2003/12/03 00:12:12 recht Exp $
+$NetBSD: patch-aj,v 1.2 2003/12/03 17:08:24 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
diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak
index c473abb5b2d..0e8b31cf4df 100644
--- a/lang/mono/patches/patch-ak
+++ b/lang/mono/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2003/12/03 00:12:12 recht Exp $
+$NetBSD: patch-ak,v 1.2 2003/12/03 17:08:24 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