aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortmclaugh <tmclaugh@FreeBSD.org>2006-04-24 03:57:11 +0800
committertmclaugh <tmclaugh@FreeBSD.org>2006-04-24 03:57:11 +0800
commit7f6fe2dce2faecdd5c50a8668d1c104016d90bce (patch)
treeb026900cdc17c79f51033024f4ed349ecf938f0d
parent60743c5866c52af44a92691c913197e47f82cd8c (diff)
downloadfreebsd-ports-gnome-7f6fe2dce2faecdd5c50a8668d1c104016d90bce.tar.gz
freebsd-ports-gnome-7f6fe2dce2faecdd5c50a8668d1c104016d90bce.tar.zst
freebsd-ports-gnome-7f6fe2dce2faecdd5c50a8668d1c104016d90bce.zip
- Update to 1.1.13.6
Changelog: http://go-mono.com/archive/1.1.13.5/ - Fix my MASTER_SITE_SUBDIR - Fix pthread usage when running unit tests. - portlint I had said on the BSD# mailing list that I would probably enable amd64 in the port but I'm holding off on that until some EM64T issues are tracked down. [1] http://forge.novell.com/pipermail/bsd-sharp-list/2006-April/000813.html [2] http://forge.novell.com/pipermail/bsd-sharp-list/2006-April/000815.html
Diffstat
-rw-r--r--lang/mono/Makefile12
-rw-r--r--lang/mono/bsd.mono.mk2
-rw-r--r--lang/mono/distinfo6
-rw-r--r--lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs11
-rw-r--r--lang/mono/files/patch-mono_mini_mini-amd64.c14
-rw-r--r--lang/mono/pkg-plist9
6 files changed, 33 insertions, 21 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 630910e38db0..2773a79353ba 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,16 +3,16 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.55 2006/02/05 03:04:28 tmclau02 Exp $
+# $Id: Makefile,v 1.58 2006/04/15 02:00:25 tmclau02 Exp $
#
PORTNAME= mono
-PORTVERSION= 1.1.13.2
+PORTVERSION= 1.1.13.6
PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://www.go-mono.com/sources/mono-1.1/ \
${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= tmclaugh
+MASTER_SITE_SUBDIR= tmclaugh/mono
MAINTAINER= bsd-sharp-list@forge.novell.com
COMMENT= An open source implementation of .NET Development Framework
@@ -51,7 +51,7 @@ pre-everything::
@${CAT} ${PKGMESSAGE}
.if ${OSVERSION} < 503000
-IGNORE= Does not work on 4.X and 5.X before 503000
+IGNORE= does not work on 4.X and 5.X before 503000
.endif
# ttyname_r(3) patch
@@ -68,6 +68,10 @@ post-patch:
${WRKSRC}/mono/metadata/assembly.c
@${REINPLACE_CMD} -e 's|.so.0|.so|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
+ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
+ ${WRKSRC}/mcs/tools/mkbundle/mkbundle.cs
+
.if ${OSVERSION} >= 700000
@${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \
${WRKSRC}/configure ${WRKSRC}/libgc/configure
diff --git a/lang/mono/bsd.mono.mk b/lang/mono/bsd.mono.mk
index 32fc8ee0b2d2..5c0f24f58281 100644
--- a/lang/mono/bsd.mono.mk
+++ b/lang/mono/bsd.mono.mk
@@ -6,7 +6,7 @@
# the FreeBSD ports system.
#
# $FreeBSD$
-# $Id: bsd.mono.mk,v 1.10 2006/02/16 00:37:15 tmclau02 Exp $
+# $Id: bsd.mono.mk,v 1.12 2006/04/05 02:38:44 tmclau02 Exp $
#
# Set the location of the .wapi directory so we write to a location we
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index df202c8f1388..4bbacf66ebda 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,3 @@
-MD5 (mono-1.1.13.2.tar.gz) = 3542a83b2743b189b3422b9f40266258
-SHA256 (mono-1.1.13.2.tar.gz) = 00cbb15edf1f7d5bfa96a9a30a564d555420a955ed7da777b786ebd362d8239c
-SIZE (mono-1.1.13.2.tar.gz) = 18043178
+MD5 (mono-1.1.13.6.tar.gz) = 330cc66c6a44525950daf10c4f17c10e
+SHA256 (mono-1.1.13.6.tar.gz) = ec60e3b670752c3453dfe8b76af0c1a17d60e81c842b375af7d3966d84329ea6
+SIZE (mono-1.1.13.6.tar.gz) = 18217583
diff --git a/lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs b/lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs
new file mode 100644
index 000000000000..7a597455fb0a
--- /dev/null
+++ b/lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs
@@ -0,0 +1,11 @@
+--- mcs/tools/mkbundle/mkbundle.cs.orig Mon Mar 13 17:58:04 2006
++++ mcs/tools/mkbundle/mkbundle.cs Mon Apr 17 23:02:10 2006
+@@ -337,7 +337,7 @@
+ smonolib = "`pkg-config --variable=libdir mono`/libmono.a ";
+ else
+ smonolib = "-Wl,-Bstatic -lmono -Wl,-Bdynamic ";
+- cmd = String.Format ("cc -o {2} -Wall `pkg-config --cflags mono` {0} {3}" +
++ cmd = String.Format ("%%CC%% -o {2} %%PTHREAD_LIBS%% -Wall `pkg-config --cflags mono` {0} {3}" +
+ "`pkg-config --libs-only-L mono` " + smonolib +
+ "`pkg-config --libs-only-l mono | sed -e \"s/\\-lmono //\"` {1}",
+ temp_c, temp_o, output, zlib);
diff --git a/lang/mono/files/patch-mono_mini_mini-amd64.c b/lang/mono/files/patch-mono_mini_mini-amd64.c
index 4981363a8f90..f1c43609d4b8 100644
--- a/lang/mono/files/patch-mono_mini_mini-amd64.c
+++ b/lang/mono/files/patch-mono_mini_mini-amd64.c
@@ -1,14 +1,14 @@
---- mono/mini/mini-amd64.c.orig Sun Oct 30 14:33:12 2005
-+++ mono/mini/mini-amd64.c Sun Nov 13 18:39:16 2005
-@@ -13,6 +13,7 @@
- #include "mini.h"
+--- mono/mini/mini-amd64.c.orig Mon Mar 13 17:57:59 2006
++++ mono/mini/mini-amd64.c Tue Apr 4 21:21:37 2006
+@@ -14,6 +14,7 @@
#include <string.h>
#include <math.h>
+ #include <unistd.h>
+#include <ucontext.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/debug-helpers.h>
-@@ -49,6 +49,10 @@
+@@ -57,6 +58,10 @@
#define ARGS_OFFSET 16
#define GP_SCRATCH_REG AMD64_R11
@@ -19,7 +19,7 @@
/*
* AMD64 register usage:
* - callee saved registers are used for global register allocation
-@@ -4639,6 +4643,7 @@
+@@ -4717,6 +4722,7 @@
#define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
@@ -27,7 +27,7 @@
static int reg_to_ucontext_reg [] = {
REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,
REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15,
-@@ -4650,27 +4655,37 @@
+@@ -4728,27 +4734,37 @@
* integer overflow.
*/
gboolean
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 7e213a199734..94b1ef14e048 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -92,7 +92,6 @@ include/mono/metadata/image.h
include/mono/metadata/loader.h
include/mono/metadata/mempool.h
include/mono/metadata/metadata.h
-include/mono/metadata/mono-debug-debugger.h
include/mono/metadata/mono-debug.h
include/mono/metadata/mono-gc.h
include/mono/metadata/object.h
@@ -103,7 +102,6 @@ include/mono/metadata/row-indexes.h
include/mono/metadata/threads.h
include/mono/metadata/tokentype.h
include/mono/metadata/verify.h
-include/mono/private/libgc-mono-debugger.h
include/mono/utils/mono-codeman.h
include/mono/utils/mono-digest.h
include/mono/utils/mono-hash.h
@@ -409,8 +407,8 @@ lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
-lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll
-lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll.mdb
+lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd/Mono.C5.dll
+lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd/Mono.C5.dll.mdb
lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
@@ -695,7 +693,7 @@ share/jay/skeleton.cs
@dirrm lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Cairo
-@dirrm lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd
+@dirrm lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd
@dirrm lib/mono/gac/Mono.C5
@dirrm lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a
@@ -760,7 +758,6 @@ share/jay/skeleton.cs
@dirrmtry lib/mono/1.0
@dirrmtry lib/mono
@dirrm include/mono/utils
-@dirrm include/mono/private
@dirrm include/mono/metadata
@dirrm include/mono/jit
@dirrm include/mono/io-layer
generated by cgit (git 2.34.1) at 2025-02-19 06:46:55 +0800