Attachment #98345 for bug #137223

View | Details | Raw Unified | Return to bug 137223
Collapse All | Expand All




#

PORTNAME=	mono
PORTVERSION=	2.4.2.3
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64"
USE_FAM=	yes
MAKE_ARGS+=	MONO_GENERIC_SHARING=none #https://bugzilla.novell.com/show_bug.cgi?id=434457
.endif


pre-everything::
	@${CAT} ${PKGMESSAGE}

.if exists(${LOCALBASE}/lib/libfam.so)
USE_FAM=	yes
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
		${WRKSRC}/configure ${WRKSRC}/libgc/configure
	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
		${WRKSRC}/mcs/tools/mkbundle/mkbundle.cs
	@${REINPLACE_CMD} -e 's|libgamin-1.so.0|libgamin-1.so.1|g' \
		${WRKSRC}/mcs/class/System/System.IO/FAMWatcher.cs
	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/bin/sh|g' \

		${WRKSRC}/mcs/class/Mono.Cairo/Samples/png/compile.sh \
		${WRKSRC}/mcs/class/Mono.Cairo/Samples/win32/compile.sh \
		${WRKSRC}/mcs/class/Mono.Cairo/Samples/x11/compile.sh
	@${REINPLACE_CMD} -e 's|^#!/bin/perl|#!/usr/bin/env perl|g' \
		${WRKSRC}/mcs/errors/do-tests.pl \
		${WRKSRC}/mcs/tools/scan-tests.pl \
		${WRKSRC}/msvc/create-windef.pl \
		${WRKSRC}/mono/benchmark/test-driver \
		${WRKSRC}/mono/cil/make-opcodes-def.pl \
		${WRKSRC}/mono/metadata/make-bundle.pl \
		${WRKSRC}/mono/mini/genmdesc.pl \
		${WRKSRC}/mono/tests/stress-runner.pl

.if ${OSVERSION} >= 700000 && ${OSVERSION} < 800000
	@${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \
		${WRKSRC}/configure ${WRKSRC}/libgc/configure
.elif ${OSVERSION} >= 800000
	@${REINPLACE_CMD} -e 's|freebsd6|freebsd8|g' \
		${WRKSRC}/configure ${WRKSRC}/libgc/configure
.endif

tests: build
	@${ECHO_MSG} "===> Running mono regression tests"

Lines 1-3 Link Here

(-)/tmp/mono/distinfo (-3 / +3 lines)
1	MD5 (mono-2.4.2.2.tar.bz2) = 54aac9b914c5a4dc81c2bfd058df1c93	1	MD5 (mono-2.4.2.3.tar.bz2) = 696f25afc8453cd0d1c78de6e905dcf2
2	SHA256 (mono-2.4.2.2.tar.bz2) = e3b965c56a669c3012856dcc17b7400d28505dd4bb8a3c6eb3e653bb41b5e6ba	2	SHA256 (mono-2.4.2.3.tar.bz2) = 1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
3	SIZE (mono-2.4.2.2.tar.bz2) = 24813167	3	SIZE (mono-2.4.2.3.tar.bz2) = 24815426




--- mcs/class/System.Web/System.Web.Compilation/AspParser.cs.orig	Fri Dec 29 22:13:43 2006
+++ mcs/class/System.Web/System.Web.Compilation/AspParser.cs	Fri Dec 29 22:14:41 2006
@@ -454,8 +454,12 @@
 			tokenizer.Verbatim = false;
 			id = inside_tags;
 			attributes = null;
-			tagtype = (databinding ? TagType.DataBinding :
-				  (varname ? TagType.CodeRenderExpression : TagType.CodeRender));
+			if (databinding)
+				tagtype = TagType.DataBinding;
+			else if (varname)
+				tagtype = TagType.CodeRenderExpression;
+			else
+				tagtype = TagType.CodeRender;
 		}
 
 		public event ParseErrorHandler Error;




--- mono/metadata/filewatcher.c.orig	Fri Dec 29 19:52:48 2006
+++ mono/metadata/filewatcher.c	Fri Dec 29 20:25:18 2006
@@ -44,9 +44,6 @@
 gint
 ves_icall_System_IO_FSW_SupportsFSW (void)
 {
-#if HAVE_KQUEUE
-	return 3;
-#else
 	MonoDl *fam_module;
 	gchar *filename;
 	int lib_used = 4; /* gamin */
@@ -76,14 +73,20 @@
 	}
 
 	if (fam_module == NULL)
-		return 0;
+		goto nofam;
 
 	err = mono_dl_symbol (fam_module, "FAMNextEvent", (gpointer *) &FAMNextEvent);
 	g_free (err);
 	if (FAMNextEvent == NULL)
-		return 0;
+		goto nofam;
 
 	return lib_used;
+
+ nofam:
+#if HAVE_KQUEUE
+	return 3;
+#else
+	return 0;
 #endif
 }
 

Return to bug 137223

Lines 7-13 Link Here

(-)/tmp/mono/Makefile (-28 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= mono	9	PORTNAME= mono
10	PORTVERSION= 2.4.2.2	10	PORTVERSION= 2.4.2.3
11	PORTREVISION= 1	11	PORTREVISION= 1
12	CATEGORIES= lang	12	CATEGORIES= lang
13	MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/	13	MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
Lines 59-65 Link Here
59	.include <bsd.port.pre.mk>	59	.include <bsd.port.pre.mk>
60		60
61	.if ${ARCH} == "amd64"	61	.if ${ARCH} == "amd64"
62	USE_FAM= yes
63	MAKE_ARGS+= MONO_GENERIC_SHARING=none #https://bugzilla.novell.com/show_bug.cgi?id=434457	62	MAKE_ARGS+= MONO_GENERIC_SHARING=none #https://bugzilla.novell.com/show_bug.cgi?id=434457
64	.endif	63	.endif
65		64
Lines 74-89 Link Here
74	pre-everything::	73	pre-everything::
75	@${CAT} ${PKGMESSAGE}	74	@${CAT} ${PKGMESSAGE}
76		75
77	.if exists(${LOCALBASE}/lib/libfam.so)
78	USE_FAM= yes
79	.endif
80
81	post-patch:	76	post-patch:
82	@${REINPLACE_CMD} -e 's\|-pthread\|${PTHREAD_LIBS}\|g' \
83	${WRKSRC}/configure ${WRKSRC}/libgc/configure
84	@${REINPLACE_CMD} -e 's\|%%CC%%\|${CC}\|g ; \
85	s\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|g' \
86	${WRKSRC}/mcs/tools/mkbundle/mkbundle.cs
87	@${REINPLACE_CMD} -e 's\|libgamin-1.so.0\|libgamin-1.so.1\|g' \	77	@${REINPLACE_CMD} -e 's\|libgamin-1.so.0\|libgamin-1.so.1\|g' \
88	${WRKSRC}/mcs/class/System/System.IO/FAMWatcher.cs	78	${WRKSRC}/mcs/class/System/System.IO/FAMWatcher.cs
89	@${REINPLACE_CMD} -e 's\|^#!/bin/bash\|#!/bin/sh\|g' \	79	@${REINPLACE_CMD} -e 's\|^#!/bin/bash\|#!/bin/sh\|g' \
Lines 94-116 Link Here
94	${WRKSRC}/mcs/class/Mono.Cairo/Samples/png/compile.sh \	84	${WRKSRC}/mcs/class/Mono.Cairo/Samples/png/compile.sh \
95	${WRKSRC}/mcs/class/Mono.Cairo/Samples/win32/compile.sh \	85	${WRKSRC}/mcs/class/Mono.Cairo/Samples/win32/compile.sh \
96	${WRKSRC}/mcs/class/Mono.Cairo/Samples/x11/compile.sh	86	${WRKSRC}/mcs/class/Mono.Cairo/Samples/x11/compile.sh
97	@${REINPLACE_CMD} -e 's\|^#!/bin/perl\|#!/usr/bin/env perl\|g' \
98	${WRKSRC}/mcs/errors/do-tests.pl \
99	${WRKSRC}/mcs/tools/scan-tests.pl \
100	${WRKSRC}/msvc/create-windef.pl \
101	${WRKSRC}/mono/benchmark/test-driver \
102	${WRKSRC}/mono/cil/make-opcodes-def.pl \
103	${WRKSRC}/mono/metadata/make-bundle.pl \
104	${WRKSRC}/mono/mini/genmdesc.pl \
105	${WRKSRC}/mono/tests/stress-runner.pl
106
107	.if ${OSVERSION} >= 700000 && ${OSVERSION} < 800000
108	@${REINPLACE_CMD} -e 's\|freebsd6\|freebsd7\|g' \
109	${WRKSRC}/configure ${WRKSRC}/libgc/configure
110	.elif ${OSVERSION} >= 800000
111	@${REINPLACE_CMD} -e 's\|freebsd6\|freebsd8\|g' \
112	${WRKSRC}/configure ${WRKSRC}/libgc/configure
113	.endif
114		87
115	tests: build	88	tests: build
116	@${ECHO_MSG} "===> Running mono regression tests"	89	@${ECHO_MSG} "===> Running mono regression tests"

Lines 1-17 Link Here

(-)/tmp/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs (-17 lines)
1	--- mcs/class/System.Web/System.Web.Compilation/AspParser.cs.orig Fri Dec 29 22:13:43 2006
2	+++ mcs/class/System.Web/System.Web.Compilation/AspParser.cs Fri Dec 29 22:14:41 2006
3	@@ -454,8 +454,12 @@
4	tokenizer.Verbatim = false;
5	id = inside_tags;
6	attributes = null;
7	- tagtype = (databinding ? TagType.DataBinding :
8	- (varname ? TagType.CodeRenderExpression : TagType.CodeRender));
9	+ if (databinding)
10	+ tagtype = TagType.DataBinding;
11	+ else if (varname)
12	+ tagtype = TagType.CodeRenderExpression;
13	+ else
14	+ tagtype = TagType.CodeRender;
15	}
16
17	public event ParseErrorHandler Error;

Lines 1-35 Link Here

(-)/tmp/mono/files/patch-mono_metadata_filewatcher.c (-35 lines)
1	--- mono/metadata/filewatcher.c.orig Fri Dec 29 19:52:48 2006
2	+++ mono/metadata/filewatcher.c Fri Dec 29 20:25:18 2006
3	@@ -44,9 +44,6 @@
4	gint
5	ves_icall_System_IO_FSW_SupportsFSW (void)
6	{
7	-#if HAVE_KQUEUE
8	- return 3;
9	-#else
10	MonoDl *fam_module;
11	gchar *filename;
12	int lib_used = 4; /* gamin */
13	@@ -76,14 +73,20 @@
14	}
15
16	if (fam_module == NULL)
17	- return 0;
18	+ goto nofam;
19
20	err = mono_dl_symbol (fam_module, "FAMNextEvent", (gpointer *) &FAMNextEvent);
21	g_free (err);
22	if (FAMNextEvent == NULL)
23	- return 0;
24	+ goto nofam;
25
26	return lib_used;
27	+
28	+ nofam:
29	+#if HAVE_KQUEUE
30	+ return 3;
31	+#else
32	+ return 0;
33	#endif
34	}
35