Hi, The diff below updates lang/mono to 5.20.1.34. It includes a fix for duplicate directory separators in relative paths. The bug fix has been submitted for review with upstream:
https://github.com/mono/mono/issues/15407 I tested with most consumers; no new issues found. Here the summary of my testing: Build and runtime tested and working: games/fnaify, games/alephone/weland, games/depotdownloader, devel/nuget, games/openra, games/spacetrader, lang/eagle, lang/fsharp, Only build tested (no binary; or no good way to test): audio/mono-taglib, x11/gnome/mono-gnome, devel/dbus-sharp, devel/dbus-sharp-glib, devel/mono-addins, devel/mono-gdata, devel/mono-notify, sysutils/ndesk-dbus-glib, sysutils/ndesk-dbus, Errors noted (both are already there in the current mono 5.20.1.19): graphics/pinta (see https://thfr.info/pub/mono-5.20.1.34-testing.txt) www/mono-xsp (see https://thfr.info/pub/mono-5.20.1.34-testing.txt) Skipped (because of large gnome/KDE dependencies): devel/hyena, graphics/pdfmod, x11/kde4/qyoto, x11/kde4/kimono ok? I can separate out the bugfix and the update commits if desired. Index: Makefile =================================================================== RCS file: /cvs/ports/lang/mono/Makefile,v retrieving revision 1.131 diff -u -p -r1.131 Makefile --- Makefile 12 Jul 2019 20:47:20 -0000 1.131 +++ Makefile 18 Sep 2019 20:49:29 -0000 @@ -4,10 +4,9 @@ USE_WXNEEDED= Yes COMMENT= cross platform, open source .NET developement framework -V= 5.20.1.19 +V= 5.20.1.34 DISTNAME= mono-${V} -REVISION= 0 CATEGORIES= lang devel Index: distinfo =================================================================== RCS file: /cvs/ports/lang/mono/distinfo,v retrieving revision 1.34 diff -u -p -r1.34 distinfo --- distinfo 8 May 2019 12:34:00 -0000 1.34 +++ distinfo 18 Sep 2019 20:49:29 -0000 @@ -1,2 +1,2 @@ -SHA256 (mono-5.20.1.19.tar.bz2) = BXS2Hvub/DNkIR0D2HoSyR3HsD6NYkLNTY2VPvFF1Gg= -SIZE (mono-5.20.1.19.tar.bz2) = 246790204 +SHA256 (mono-5.20.1.34.tar.bz2) = zZHUTPYlFXlrqQ39wnS7M0ccJaLxomJomjvcCmcrfIs= +SIZE (mono-5.20.1.34.tar.bz2) = 246845984 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/lang/mono/patches/patch-configure_ac,v retrieving revision 1.8 diff -u -p -r1.8 patch-configure_ac --- patches/patch-configure_ac 31 Mar 2019 18:28:39 -0000 1.8 +++ patches/patch-configure_ac 18 Sep 2019 20:49:29 -0000 @@ -5,7 +5,7 @@ enable cooperative suspend by default Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -1163,7 +1163,7 @@ with_unreal_default=no +@@ -1137,7 +1137,7 @@ with_unreal_default=no with_wasm_default=no with_bitcode_default=no @@ -14,7 +14,7 @@ Index: configure.ac enable_hybrid_suspend_default=no INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000 -@@ -5039,7 +5039,7 @@ fi +@@ -5035,7 +5035,7 @@ fi dnl Now check if there were flags overriding the defaults AC_ARG_WITH(cooperative_gc, [ --with-cooperative-gc=yes|no Enable cooperative stop-the-world garbage collection (sgen only) (defaults to no)], [AC_MSG_WARN([--with-cooperative-gc is deprecated, use --enable-cooperative-suspend instead])], [with_cooperative_gc=default]) @@ -23,7 +23,7 @@ Index: configure.ac if test x$enable_cooperative_suspend = xdefault -a x$with_cooperative_gc != xdefault; then enable_cooperative_suspend=$with_cooperative_gc -@@ -5053,7 +5053,7 @@ if test x$enable_cooperative_suspend != xno; then +@@ -5049,7 +5049,7 @@ if test x$enable_cooperative_suspend != xno; then AC_DEFINE(ENABLE_COOP_SUSPEND,1,[Enable cooperative stop-the-world garbage collection.]) fi Index: patches/patch-external_corefx_src_Native_Unix_System_Native_pal_io_c =================================================================== RCS file: /cvs/ports/lang/mono/patches/patch-external_corefx_src_Native_Unix_System_Native_pal_io_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-external_corefx_src_Native_Unix_System_Native_pal_io_c --- patches/patch-external_corefx_src_Native_Unix_System_Native_pal_io_c 31 Mar 2019 18:28:39 -0000 1.1 +++ patches/patch-external_corefx_src_Native_Unix_System_Native_pal_io_c 18 Sep 2019 20:49:29 -0000 @@ -25,7 +25,7 @@ Index: external/corefx/src/Native/Unix/S #endif // Validate that our Lock enum value are correct for the platform -@@ -1413,7 +1415,7 @@ int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* +@@ -1416,7 +1418,7 @@ int32_t SystemNative_GetPeerID(intptr_t socket, uid_t* socklen_t len = sizeof(creds); if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) == 0) { @@ -34,7 +34,7 @@ Index: external/corefx/src/Native/Unix/S return 0; } return -1; -@@ -1442,11 +1444,7 @@ int32_t SystemNative_LockFileRegion(intptr_t fd, int64 +@@ -1445,11 +1447,7 @@ int32_t SystemNative_LockFileRegion(intptr_t fd, int64 return -1; } Index: patches/patch-mcs_class_corlib_System_IO_Path_cs =================================================================== RCS file: patches/patch-mcs_class_corlib_System_IO_Path_cs diff -N patches/patch-mcs_class_corlib_System_IO_Path_cs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-mcs_class_corlib_System_IO_Path_cs 18 Sep 2019 20:49:29 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +fix dealing with double directory separators in relative paths +https://github.com/mono/mono/issues/15407 + +Index: mcs/class/corlib/System.IO/Path.cs +--- mcs/class/corlib/System.IO/Path.cs.orig ++++ mcs/class/corlib/System.IO/Path.cs +@@ -403,6 +403,7 @@ namespace System.IO { + path = cwd + path; + else + path = cwd + DirectorySeparatorChar + path; ++ path = path.Replace(@"//", @"/"); + } else if (DirectorySeparatorChar == '\\' && + path.Length >= 2 && + IsDirectorySeparator (path [0]) && Index: patches/patch-mono_mini_main_c =================================================================== RCS file: /cvs/ports/lang/mono/patches/patch-mono_mini_main_c,v retrieving revision 1.8 diff -u -p -r1.8 patch-mono_mini_main_c --- patches/patch-mono_mini_main_c 31 Mar 2019 18:28:39 -0000 1.8 +++ patches/patch-mono_mini_main_c 18 Sep 2019 20:49:29 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-mono_mini_main_c,v 1.8 2 Index: mono/mini/main.c --- mono/mini/main.c.orig +++ mono/mini/main.c -@@ -395,10 +395,14 @@ main (void) +@@ -396,10 +396,14 @@ main (void) } #else Index: patches/patch-mono_utils_mono-threads-coop_c =================================================================== RCS file: /cvs/ports/lang/mono/patches/patch-mono_utils_mono-threads-coop_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-mono_utils_mono-threads-coop_c --- patches/patch-mono_utils_mono-threads-coop_c 31 Mar 2019 18:28:39 -0000 1.3 +++ patches/patch-mono_utils_mono-threads-coop_c 18 Sep 2019 20:49:29 -0000 @@ -6,11 +6,11 @@ Index: mono/utils/mono-threads-coop.c --- mono/utils/mono-threads-coop.c.orig +++ mono/utils/mono-threads-coop.c @@ -511,7 +511,7 @@ mono_threads_assert_gc_unsafe_region (void) - static MonoThreadsSuspendPolicy + static int threads_suspend_policy_default (void) { -#if defined (ENABLE_COOP_SUSPEND) +#if !defined (DISABLE_COOP_SUSPEND) return MONO_THREADS_SUSPEND_FULL_COOP; - #else - #if defined (ENABLE_HYBRID_SUSPEND) + #elif defined (ENABLE_HYBRID_SUSPEND) + return MONO_THREADS_SUSPEND_HYBRID; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/mono/pkg/PLIST,v retrieving revision 1.35 diff -u -p -r1.35 PLIST --- pkg/PLIST 8 May 2019 12:34:00 -0000 1.35 +++ pkg/PLIST 18 Sep 2019 20:49:30 -0000 @@ -3323,31 +3323,31 @@ lib/mono/mono-configuration-crypto/4.5/m lib/mono/monodoc/ lib/mono/monodoc/monodoc.dll lib/mono/msbuild/ -lib/mono/msbuild/15.0/ -lib/mono/msbuild/15.0/bin/ -lib/mono/msbuild/15.0/bin/Roslyn/ -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.Scripting.dll -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.dll -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.Managed.Core.targets -lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.VisualBasic.Core.targets -lib/mono/msbuild/15.0/bin/Roslyn/System.Collections.Immutable.dll -lib/mono/msbuild/15.0/bin/Roslyn/System.Reflection.Metadata.dll -lib/mono/msbuild/15.0/bin/Roslyn/VBCSCompiler.exe -lib/mono/msbuild/15.0/bin/Roslyn/VBCSCompiler.exe.config -lib/mono/msbuild/15.0/bin/Roslyn/csc.exe -lib/mono/msbuild/15.0/bin/Roslyn/csc.exe.config -lib/mono/msbuild/15.0/bin/Roslyn/csc.rsp -lib/mono/msbuild/15.0/bin/Roslyn/csi.exe -lib/mono/msbuild/15.0/bin/Roslyn/csi.exe.config -lib/mono/msbuild/15.0/bin/Roslyn/csi.rsp -lib/mono/msbuild/15.0/bin/Roslyn/vbc.exe -lib/mono/msbuild/15.0/bin/Roslyn/vbc.exe.config -lib/mono/msbuild/15.0/bin/Roslyn/vbc.rsp +lib/mono/msbuild/Current/ +lib/mono/msbuild/Current/bin/ +lib/mono/msbuild/Current/bin/Roslyn/ +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.CSharp.Core.targets +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.CodeAnalysis.Scripting.dll +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.CodeAnalysis.dll +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.Managed.Core.targets +lib/mono/msbuild/Current/bin/Roslyn/Microsoft.VisualBasic.Core.targets +lib/mono/msbuild/Current/bin/Roslyn/System.Collections.Immutable.dll +lib/mono/msbuild/Current/bin/Roslyn/System.Reflection.Metadata.dll +lib/mono/msbuild/Current/bin/Roslyn/VBCSCompiler.exe +lib/mono/msbuild/Current/bin/Roslyn/VBCSCompiler.exe.config +lib/mono/msbuild/Current/bin/Roslyn/csc.exe +lib/mono/msbuild/Current/bin/Roslyn/csc.exe.config +lib/mono/msbuild/Current/bin/Roslyn/csc.rsp +lib/mono/msbuild/Current/bin/Roslyn/csi.exe +lib/mono/msbuild/Current/bin/Roslyn/csi.exe.config +lib/mono/msbuild/Current/bin/Roslyn/csi.rsp +lib/mono/msbuild/Current/bin/Roslyn/vbc.exe +lib/mono/msbuild/Current/bin/Roslyn/vbc.exe.config +lib/mono/msbuild/Current/bin/Roslyn/vbc.rsp lib/mono/xbuild/ lib/mono/xbuild-frameworks/ lib/mono/xbuild-frameworks/.NETFramework/ @@ -3450,14 +3450,14 @@ lib/mono/xbuild/14.0/bin/xbuild.exe lib/mono/xbuild/14.0/bin/xbuild.exe.config lib/mono/xbuild/14.0/bin/xbuild.pdb lib/mono/xbuild/14.0/bin/xbuild.rsp -lib/mono/xbuild/15.0/ -lib/mono/xbuild/15.0/Imports/ -lib/mono/xbuild/15.0/Imports/Microsoft.Common.props/ -lib/mono/xbuild/15.0/Imports/Microsoft.Common.props/ImportBefore/ -lib/mono/xbuild/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props -lib/mono/xbuild/15.0/Microsoft.Common.targets/ -lib/mono/xbuild/15.0/Microsoft.Common.targets/ImportAfter/ -lib/mono/xbuild/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets +lib/mono/xbuild/Current/ +lib/mono/xbuild/Current/Imports/ +lib/mono/xbuild/Current/Imports/Microsoft.Common.props/ +lib/mono/xbuild/Current/Imports/Microsoft.Common.props/ImportBefore/ +lib/mono/xbuild/Current/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props +lib/mono/xbuild/Current/Microsoft.Common.targets/ +lib/mono/xbuild/Current/Microsoft.Common.targets/ImportAfter/ +lib/mono/xbuild/Current/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets lib/mono/xbuild/Microsoft/ lib/mono/xbuild/Microsoft/NuGet/ lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.Build.Tasks.dll @@ -3499,6 +3499,9 @@ lib/mono/xbuild/Microsoft/VisualStudio/v lib/mono/xbuild/Microsoft/VisualStudio/v15.0/ lib/mono/xbuild/Microsoft/VisualStudio/v15.0/WebApplications/ lib/mono/xbuild/Microsoft/VisualStudio/v15.0/WebApplications/Microsoft.WebApplication.targets +lib/mono/xbuild/Microsoft/VisualStudio/v16.0/ +lib/mono/xbuild/Microsoft/VisualStudio/v16.0/WebApplications/ +lib/mono/xbuild/Microsoft/VisualStudio/v16.0/WebApplications/Microsoft.WebApplication.targets lib/mono/xbuild/Microsoft/VisualStudio/v9.0/ lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/ lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
