Date: Fri, 31 Jul 2009 17:10:09 +0200 From: Romain =?iso-8859-1?Q?Tarti=E8re?= <romain@blogreen.org> To: edwin@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org, mono@FreeBSD.org Subject: Re: ports/137223: [maintainer-update] lang/mono version 2.4.2.2 to 2.4.2.3 Message-ID: <20090731151009.GA66350@blogreen.org> In-Reply-To: <200907282120.n6SLKHet039254@freefall.freebsd.org> References: <200907282120.n6SLKHet039254@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--MfFXiAuoTsnnDAfZ Content-Type: multipart/mixed; boundary="W/nzBZO5zC0uMSeA" Content-Disposition: inline --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable New version with extra patches for resurecting NUnit :-) --=20 Romain Tarti=E8re <romain@blogreen.org> http://romain.blogreen.org/ pgp: 8DAB A124 0DA4 7024 F82A E748 D8E9 A33F FF56 FF43 (ID: 0xFF56FF43) (plain text =3Dnon-HTML=3D PGP/GPG encrypted/signed e-mail much appreciated) --W/nzBZO5zC0uMSeA Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="mono.diff" Content-Transfer-Encoding: quoted-printable diff -ruN /var/cache/portshaker/freebsd/lang/mono/Makefile /tmp/mono/Makefi= le --- /var/cache/portshaker/freebsd/lang/mono/Makefile 2009-07-17 14:33:53.00= 0000000 +0200 +++ /tmp/mono/Makefile 2009-07-28 23:10:28.874057000 +0200 @@ -7,7 +7,7 @@ # =20 PORTNAME=3D mono -PORTVERSION=3D 2.4.2.2 +PORTVERSION=3D 2.4.2.3 PORTREVISION=3D 1 CATEGORIES=3D lang MASTER_SITES=3D http://ftp.novell.com/pub/mono/sources/${PORTNAME}/ @@ -59,7 +59,6 @@ .include <bsd.port.pre.mk> =20 .if ${ARCH} =3D=3D "amd64" -USE_FAM=3D yes MAKE_ARGS+=3D MONO_GENERIC_SHARING=3Dnone #https://bugzilla.novell.com/sho= w_bug.cgi?id=3D434457 .endif =20 @@ -74,16 +73,7 @@ pre-everything:: @${CAT} ${PKGMESSAGE} =20 -.if exists(${LOCALBASE}/lib/libfam.so) -USE_FAM=3D 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} >=3D 700000 && ${OSVERSION} < 800000 - @${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \ - ${WRKSRC}/configure ${WRKSRC}/libgc/configure -.elif ${OSVERSION} >=3D 800000 - @${REINPLACE_CMD} -e 's|freebsd6|freebsd8|g' \ - ${WRKSRC}/configure ${WRKSRC}/libgc/configure -.endif =20 tests: build @${ECHO_MSG} "=3D=3D=3D> Running mono regression tests" diff -ruN /var/cache/portshaker/freebsd/lang/mono/distinfo /tmp/mono/distin= fo --- /var/cache/portshaker/freebsd/lang/mono/distinfo 2009-07-17 12:32:21.00= 0000000 +0200 +++ /tmp/mono/distinfo 2009-07-28 23:10:28.874057000 +0200 @@ -1,3 +1,3 @@ -MD5 (mono-2.4.2.2.tar.bz2) =3D 54aac9b914c5a4dc81c2bfd058df1c93 -SHA256 (mono-2.4.2.2.tar.bz2) =3D e3b965c56a669c3012856dcc17b7400d28505dd4= bb8a3c6eb3e653bb41b5e6ba -SIZE (mono-2.4.2.2.tar.bz2) =3D 24813167 +MD5 (mono-2.4.2.3.tar.bz2) =3D 696f25afc8453cd0d1c78de6e905dcf2 +SHA256 (mono-2.4.2.3.tar.bz2) =3D 1bab0d4e2906c88736ff5e242f2905f4c3535ccf= c05bb5c427b72adf0e9236ae +SIZE (mono-2.4.2.3.tar.bz2) =3D 24815426 diff -ruN /var/cache/portshaker/freebsd/lang/mono/files/patch-mcs_class_Sys= tem.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.We= b_System.Web.Compilation_AspParser.cs 2007-03-17 04:48:02.000000000 +0100 +++ /tmp/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspPa= rser.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 =3D false; - id =3D inside_tags; - attributes =3D null; -- tagtype =3D (databinding ? TagType.DataBinding : -- (varname ? TagType.CodeRenderExpression : TagType.CodeRender)); -+ if (databinding) -+ tagtype =3D TagType.DataBinding; -+ else if (varname) -+ tagtype =3D TagType.CodeRenderExpression; -+ else -+ tagtype =3D TagType.CodeRender; - } -=20 - public event ParseErrorHandler Error; diff -ruN /var/cache/portshaker/freebsd/lang/mono/files/patch-mono_io-layer= _processes.c /tmp/mono/files/patch-mono_io-layer_processes.c --- /var/cache/portshaker/freebsd/lang/mono/files/patch-mono_io-layer_proce= sses.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/mono/files/patch-mono_io-layer_processes.c 2009-07-31 17:07:10.774= 197000 +0200 @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- mono/io-layer/processes.c.orig ++++ mono/io-layer/processes.c +@@ -1950,7 +1950,7 @@ + { + mods =3D load_modules (); + #else +- filename =3D g_strdup_printf ("/proc/%d/maps", pid); ++ filename =3D g_strdup_printf ("/proc/%d/map", pid); + if ((fp =3D fopen (filename, "r")) =3D=3D NULL) { + /* No /proc/<pid>/maps so just return the main module + * shortcut for now +@@ -2111,7 +2111,7 @@ + { + mods =3D load_modules (); + #else +- filename =3D g_strdup_printf ("/proc/%d/maps", pid); ++ filename =3D g_strdup_printf ("/proc/%d/map", pid); + if ((fp =3D fopen (filename, "r")) =3D=3D NULL) { + if (errno =3D=3D EACCES && module =3D=3D NULL && base =3D=3D TRUE) { + procname_ext =3D get_process_name_from_proc (pid); +@@ -2266,7 +2266,7 @@ + mods =3D load_modules (); + #else + /* Look up the address in /proc/<pid>/maps */ +- filename =3D g_strdup_printf ("/proc/%d/maps", pid); ++ filename =3D g_strdup_printf ("/proc/%d/map", pid); + if ((fp =3D fopen (filename, "r")) =3D=3D NULL) { + /* No /proc/<pid>/maps, so just return failure + * for now 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_filew= atcher.c 2007-03-17 04:48:02.000000000 +0100 +++ /tmp/mono/files/patch-mono_metadata_filewatcher.c 1970-01-01 01:00:00.0= 00000000 +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 =3D 4; /* gamin */ -@@ -76,14 +73,20 @@ - } -=20 - if (fam_module =3D=3D NULL) -- return 0; -+ goto nofam; -=20 - err =3D mono_dl_symbol (fam_module, "FAMNextEvent", (gpointer *) &FAMNex= tEvent); - g_free (err); - if (FAMNextEvent =3D=3D NULL) -- return 0; -+ goto nofam; -=20 - return lib_used; -+ -+ nofam: -+#if HAVE_KQUEUE -+ return 3; -+#else -+ return 0; - #endif - } -=20 diff -ruN /var/cache/portshaker/freebsd/lang/mono/pkg-message /tmp/mono/pkg= -message --- /var/cache/portshaker/freebsd/lang/mono/pkg-message 2009-07-17 12:32:22= .000000000 +0200 +++ /tmp/mono/pkg-message 2009-07-31 17:07:10.774197000 +0200 @@ -26,4 +26,8 @@ You can rely on the security.jail.sysvipc_allowed sysctl to check this status. The following enables this feature on the host system: # echo "jail_sysvipc_allow=3D\"YES\"" >> /etc/rc.conf + +* Some process information are acceded through /proc (e.g. when using + NUnit) and procfs(5) has to be mounted for these features to work: + # echo "proc /proc procfs rw 0 0" >> /etc/fstab ************************************************************************ --W/nzBZO5zC0uMSeA-- --MfFXiAuoTsnnDAfZ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iEYEARECAAYFAkpzCVEACgkQ2OmjP/9W/0MNMACgiIKJVjjxl0RXzpjXarMJTKzH ptEAn2HtOq7QU70k3r2ctcWFlYPrUW+R =eZ7k -----END PGP SIGNATURE----- --MfFXiAuoTsnnDAfZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090731151009.GA66350>