Date: Tue, 28 Jul 2009 23:17:25 +0200 (CEST) From: Romain Tartiere <mono@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137223: [maintainer-update] lang/mono version 2.4.2.2 to 2.4.2.3 Message-ID: <20090728211725.6D46A5C322@marvin.blogreen.org> Resent-Message-ID: <200907282120.n6SLK2GR037906@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137223 >Category: ports >Synopsis: [maintainer-update] lang/mono version 2.4.2.2 to 2.4.2.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 28 21:20:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Romain Tartiere >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: System: FreeBSD marvin.blogreen.org 7.2-STABLE FreeBSD 7.2-STABLE #6 r195737M: Fri Jul 17 14:15:17 CEST 2009 root@marvin.blogreen.org:/usr/obj/usr/src/sys/MARVIN i386 >Description: Update to latest 2.4.2.3: This release fixes issues with precompiled MVC applications. While there, remove useless REINPLACE_CMD in the Makefile, drop a patch that is not required anymore (patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs) and another that used to fix build on amd64 but makes XSP fail and seems completely useless nowadays (patch-mono_metadata_filewatcher.c). The port has been tinderbuilt on i386 and I have been using it the whole day without problem. >How-To-Repeat: >Fix: --- mono.diff begins here --- diff -ruN /var/cache/portshaker/freebsd/lang/mono/Makefile /tmp/mono/Makefile --- /var/cache/portshaker/freebsd/lang/mono/Makefile 2009-07-17 14:33:53.000000000 +0200 +++ /tmp/mono/Makefile 2009-07-28 23:10:28.874057000 +0200 @@ -7,7 +7,7 @@ # PORTNAME= mono -PORTVERSION= 2.4.2.2 +PORTVERSION= 2.4.2.3 PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/ @@ -59,7 +59,6 @@ .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 @@ -74,16 +73,7 @@ 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' \ @@ -94,23 +84,6 @@ ${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" diff -ruN /var/cache/portshaker/freebsd/lang/mono/distinfo /tmp/mono/distinfo --- /var/cache/portshaker/freebsd/lang/mono/distinfo 2009-07-17 12:32:21.000000000 +0200 +++ /tmp/mono/distinfo 2009-07-28 23:10:28.874057000 +0200 @@ -1,3 +1,3 @@ -MD5 (mono-2.4.2.2.tar.bz2) = 54aac9b914c5a4dc81c2bfd058df1c93 -SHA256 (mono-2.4.2.2.tar.bz2) = e3b965c56a669c3012856dcc17b7400d28505dd4bb8a3c6eb3e653bb41b5e6ba -SIZE (mono-2.4.2.2.tar.bz2) = 24813167 +MD5 (mono-2.4.2.3.tar.bz2) = 696f25afc8453cd0d1c78de6e905dcf2 +SHA256 (mono-2.4.2.3.tar.bz2) = 1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae +SIZE (mono-2.4.2.3.tar.bz2) = 24815426 diff -ruN /var/cache/portshaker/freebsd/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs /tmp/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs --- /var/cache/portshaker/freebsd/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs 2007-03-17 04:48:02.000000000 +0100 +++ /tmp/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ ---- 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; diff -ruN /var/cache/portshaker/freebsd/lang/mono/files/patch-mono_metadata_filewatcher.c /tmp/mono/files/patch-mono_metadata_filewatcher.c --- /var/cache/portshaker/freebsd/lang/mono/files/patch-mono_metadata_filewatcher.c 2007-03-17 04:48:02.000000000 +0100 +++ /tmp/mono/files/patch-mono_metadata_filewatcher.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ ---- 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 - } - --- mono.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090728211725.6D46A5C322>