Wed Sep 30 19:50:14 2020 UTC ()
mono6: Update to 6.10.0.104

Changelog:
Mono 6.10.0 Release Notes

Release date: 19 May 2020

Highlights

    Various bugfixes

In Depth
Runtime
WebAssembly

We continue to work on making our WebAssembly support better. Various sets of issues have been resolved in this release and general performance and feature work is happening as well.
Community improvements for AIX/PASE and Haiku

The ports for these systems received a bunch of improvements from community contributor Calvin Buckley (@NattyNarwhal).
Class Libraries
CoreFX integration

We continued to replace some of our classes with the implementation from CoreFX to improve performance and compatibility with .NET.
Tools
Resolved Issues

    15808 - dladdr shim for gmodule; try to enable crash reporter on AIX
    15894 - Move MonoError from managed wrappers to native wrappers.
    16461 - [interp] Non-recursive interpreter
    16746 - Clean up map.c /map.h
    16785 - Modify run-jenkins.sh to adapt wasm build for the OSX CI lane
    16816 - [wasm][tests] WASM Safari browser tests
    16832 - Replace embedded libgc with Unity fork of recent Boehm (bdwgc)
    16855 - [runtime] Add portable cached array creation functions and replace gcc-specific impl.
    16949 - [netcore] Propagate ALCs through reflection functions
    16954 - [llvm] Use explicit null checks with LLVM.
    16982 - Replace mono_assembly_name_free use with mono_assembly_name_free_internal.
    16992 - [Coop] Unconvert Microsoft.Win32.NativeMethods.
    17116 - [llvm] Use -place-safepoints in JIT mode too
    17119 - Inline TLS access.
    17131 - Update MERP event type to MonoAppCrash
    17160 - Enable more hw intrinsics for AOT
    17162 - Now IsExpired property for FormsAuthenticationTicket compares two dates with same kind (UTC)
    17163 - [WinForms] Fix Recalculate in ScrollableControl
    17173 - [sgen] Optimize LOS for better locality and parallelization.
    17195 - Fixes #17190: SerializationException on ListViewItemCount
    17212 - [offsets-tool] Update the README.
    17214 - [master] Update dependencies from dotnet/arcade
    17219 - [mini] Fix check for FastAllocateString that used old name
    17222 - Fix check in fix_libc_name to trigger only for libc, not libcups or other names 窶ｦ
    17223 - Enable GSS on Linux
    17225 - [Mono.Posix] Add support for memfd_create() and file sealing
    17226 - [interp] Kill more instructions
    17227 - Incorrect constrained virtual call in method using gsharedvt for reference type.
    17228 - Running 窶兎nable-msvc-only didn窶冲 find jay.vcxproj.
    17229 - [interp] Small cleanups
    17230 - [netcore] Disable some SafeWaitHandle tests everywhere, not just Linux
    17231 - [man] Update MONO_IOMAP docs as it no longer works with corefx System.IO
    17233 - Revert mono_runtime_set_main_args in 44ff0597b835d0af62f526169dba3b365c9c3411.
    17236 - [sgen] Fix invalid value passed to write barrier
    17237 - [netcore] Implement System.IO.HasOverriddenBeginEndRead(Write) icalls
    17238 - Add drawing type converters to mobile profiles
    17243 - [netcore] Port CoreCLR implementation of Exception.SetCurrentStackTrace
    17249 - [mini] print inserted instruction in verbose logging
    17251 - [mini] trace snippet should restore return value
    17252 - [System.Net.Http] Clean up HttpMessageHandler setup
    17254 - Remove varargs from g_assert and g_assert_not_reachable (save 200+ bytes per frame in wasm interp).
    17255 - [tests] Disable tests that crash on android sdks
    17261 - [sdks] Android runner: properly shutdown runtime for Mono.Debugger.Soft test app
    17262 - [eglib] Add newline for failure check prints
    17263 - Fix g_assert_not_reached message regression.
    17266 - [wasm] Continue loading app even when .pdb files are not found
    17269 - Upgrade MSVC native runtime build to VS2019.
    17270 - Add null check around sslStream when trying to dispose in MonoTlsStream
    17272 - Update Linker. This fixes a Xamarin.Android breakage
    17275 - Bump corefx to get Azure testhost change
    17279 - Generate LLVM IR for OP_XEQUAL that is recognized by LLVM窶冱 vector pattern recognizers.
    17294 - [loader] Fix gnu/lib-names.h define
    17297 - Mirror changes from mono/coreclr
    17298 - [coop] Use bitfields for coop state machine state representation
    17302 - Fix C++ WebAssembly build.
    17305 - Fix msvc build warning, empty source main-core.c.
    17307 - Bumps corefx to mono/corefx@8e3b279
    17312 - Update dotnet sdk version
    17313 - [ci] Use Xcode11.1 for XI/XM Mono SDK builds
    17315 - [loader] Add an explicit define DISABLE_DLLMAP to control dllmap usage
    17318 - [netcore] Avoid suspending threads in Environment.Exit, it can hang process
    17321 - [GTK] Bump bockbuild for GtkViewport autoscrolling patch.
    17322 - [bcl] Update BCL Linked Size
    17326 - [interp] Add constant propagation of integers
    17328 - [wasm][http] WasmHttpMessageHandler StreamingEnabled default to false
    17330 - Fix SafeHandle marshalling in ref/in/out parameters
    17331 - Initial telemetry for netcore builds
    17336 - [bcl] add WriteLine(string) override to CStreamWriter needed due to corefx import
    17338 - [jit] Fix is_reference checks for intrinsics with byref parameters.
    17340 - [wasm] Bump emscripten. Remove generated python cache files.
    17341 - [bcl][jit] implement Interlocked.Exchange in terms of object
    17344 - [wasm] Add a 窶渡ative-lib option to the packager to allow linking additional native libraries.
    17345 - [cxx][x86] int/ptr casts.
    17346 - [cxx][x86] ifndef DISABLE_JIT around mono_arch_emit_prolog.
    17347 - [cxx][x86][amd64] Remove unused STORE_MEM_IMM.
    17348 - [cxx][netcore] Goto around init.
    17349 - [ci] Improve netcore build telemetry by running nupkg and tests through build.sh
    17350 - Use functions instead of macros for is_in/is_out.
    17351 - [wasm][xunit tests] Disable System.IO.Compression.Tests.BrotliEncoderTests
    17355 - [master] Update dependencies from dotnet/core-setup dotnet/corefx
    17358 - Removing execution of network tests from WatchOs.
    17361 - [netcore] Fix build for Windows with cygwin
    17362 - [interp] Constant folding for integers
    17366 - [netcore] Remove Gader] Unmanaged library refactoring and NativeLibrary implementation
    17370 - [bcl] Remove CompareExchange_T
    17377 - [cxx] Int vs. enum, static for efficiency, cleanup, fix typo.
    17379 - [cxx] [wasm] m2n-gen int/ptr casts.
    17380 - [jit][x86ieldAwaitable struct readonly
    17387 - [netcore] Managed ThreadPool implementation
    17388 - [interp][wasm] Remove more varargs to conserve stack.
    17391 - Remove the Legacy TLS Provider.
    17393 - Cleaning up SslStream, MobileAuthenticatedStrea
    17537 - [merp] Introduce a new 窶賄ump mode窶� that allows different signal behavior when dumping
    17538 - [interp] fix code length for JitInfo
    17551 - [mini] Initial tiered compilation work
    17553 - Mirror changes from mono/corefx,corert
    17554 - [runtime] Make mono_thread_manage external only
    17558 - [cxx] Compile mini-llvm.c as C++ if configure -enable-cxx.
    17559 - [wasm] Propagate exit code from Main in the test runner.
    17565 - Mirror changes from mono/coreclr,corert,corefx
    17566 - [runtime] Unbalanced GC Unsafe transitions before shutdown
    17570 - [cxx][x86] int/ptr casts
    17571 - Mirror changes from mono/coreclr
    17577 - [master] Update dependencies from dotnet/arcade dotnet/core-setup dotnet/corefx
    17579 - Fix #16206: Change HotkeyPrefix default value in TabControlPainter.cs
    17583 - [dim][regression] Explicit interface override
    17589 - [embed] Assert when call mono_runtime_object_init
    17590 - Bump CoreFX to pickup corefx #367 to fix #17133.
    17592 - [eglib] Handle dli.dli_sname being NULL in g_module_address ().
    17595 - [interp] fix signature mismatch between jit<>interp for string constructor
    17596 - [wasm] Fix build problems.
    17600 - [wasm] Print a useful error message instead of a signature mismatch error on missing icalls.
    17602 - Avoid caching of System.dll image and types as they may be unloaded w窶ｦ
    17607 - Implement GC.GetGCMemoryInfo
    17608 - Fix #12337: Refact selected indexes in TabControl.Remove
    17609 - Mirror changes from mono/coreclr,corefx
    17611 - [runtime] Add a 窶兎nable-minimal=threads configure option to disable threading support. Use it on wasm.
    17612 - Remove some unused icalls.
    17615 - [mini] Fix Coverity CID 1455161 & 1455162
    17616 - [netcore] Report errors on Windows CI
    17623 - [interp] Optimize call path
    17625 - [interp] Avoid emitting MINT_SAFEPOINT for every single call
    17628 - [System.Net.Http]: Bring HttpClient from CoreFX on monotouch and xammac.
    17631 - Bump mono/corefx@6e65509
    17636 - [interp] Fix interp logging
    17639 - [wasm] Fix xunit test ninja errors.
    17641 - [interp] Handle remoting field access same as jit
    17642 - [threadpool] cache processor count
    17646 - Mono NetCore Windows only build/test.
    17648 - [llvm] Fix a case where we treated the dreg of a store_membase instruction as a dreg, its actually the base reg.
    17650 - [interp] s/MONO_API_ERROR_INIT/error_init_reuse/g
    17653 - [WinForms] Returns real installed input languages on Windows
    17654 - [interp] Use GetType instrinsic also on net4x
    17660 - [WinForms] Fix #10559 In MaskedTextBox wrong Lines value when Mask se窶ｦ
    17661 - [netcore] Cleanups.
    17662 - [WinForms] Fix #12249 scroll orientation was not defined in ScrollEventArgs
    17664 - [iOS] Match changes done in xamarin-macios in the SDK runtime.
    17666 - [netcore] Improve default constructor lookup,
    17667 - [jit] Call mono_class_setup_fields () before accessing field->offset. Fixes https://github.com/mono/mono/issues/17665.
    17669 - [WinForms]: Fix #16632 special values (-1 and -2) of ListView Column 窶ｦ
    17670 - [WinForms] Fix TabPage position when enabling MultiLine
    17672 - Allow runtime to be built with C++ on AIX
    17673 - [netcore] Improve Array.CreateInstance
    17676 - [WinForms] Fix #13777 DrawToBitmap() did not draw children controls
    17680 - [mono] Fix ProcessExit handler argument.
    17681 - Remove handles from ves_icall_System_Array_InternalCreate.
    17683 - [interp] use mask instead of bool expression
    17688 - Intrinsify Activator.CreateInstance for value types with no ctor
    17690 - [master] Update dependencies from dotnet/arcade dotnet/core-setup dotnet/corefx
    17691 - Explicit update/init only LLVM BTLS repro on external MSVC build.
    17692 - [jit] Allow Unsafe.As<TFrom, TTo> on gsharedvt types.
    17694 - Bump Corefx
    17695 - Mirror changes from mono/coreclr
    17698 - [wasm] Build the tests with 窶渡o-native-strip.
    17701 - [loader] Skip the full pinvoke resolution process for __Internal
    17706 - Fix MSVC intellisense for LLVM sources.
    17708 - Remove handles from ves_icall_System_Array_CanChangePrimitive.
    17711 - Handles reduction 窶� 4 MERP functions.
    17712 - error_init reduction.
    17713 - Remove handles from System.Diagnostics.Debugger.
    17719 - [netcore] Complete Monitor.LockContentionCount implementation
    17723 - [merp] Remove extraneous waitpid invocation
    17727 - [debugger] Assert when async debug a generic method
    17730 - Switch away from Start-Process, Wait-Process in build.ps1.
    17731 - [WinForms][UIA] Add to the PropertyGrid new internal event to track grid items expanded state update
    17732 - [Wasm] Enabled 窶菟reload-files without AOT
    17738 - [runtime] Fix locking in mono_get_seq_points ().
    17739 - [aot] Improve the aot mangler a bit, handle bool/char as a primitive type and avoid emitting a System prefix.
    17740 - [profiler] Fix log profiling of native to managed wrappers
    17744 - [sdks] Add xunit to iOS test runner and add results reporting
    17748 - [wasm] Bump emscripten.
    17749 - [LLVM] Change llvm submodule to dotnet-org fork of official LLVM git repo
    17751 - [Mono.Security] Do not decode data beyond detected length in ASN1 parser
    17753 - [netcore] Run individual CoreCLR test suites
    17755 - [WinForms] Fix #16557 DefaultCellStyle was not cloned deeply in DataG窶ｦ
    17757 - [netcore] Fix RuntimePropertyInfo.GetValue() in FullAOT scenarios
    17758 - Bump corefx to pick up https://github.com/mono/corefx/pull/370
    17761 - Mirror changes from mono/corefx,coreclr,corert
    17772 - Delete some LLVM test cases from make dist
    17773 - [wasm] Change netcore support to use a prebuilt corefx runtime.
    17777 - Mirror changes from mono/corefx,coreclr
    17778 - [llvm] use multiple cores to build llvm if ninja7782 - [interp] Add some missing netcore intrinsics.
    17784 - [interp] Add some inline checks from the JIT.
    17785 - [MacSDK] Bump xamarin-gtk-theme.py to latest revision from private bockbuild
    17789 - [Wasm] Forced filesystem creation
    17795ULL pointer crash in mono_decompose_vtype_opts().
    17803 - Mirror changes from mono/runtime
    17806 - Remove handles/MonoError from Mono.RuntimeGPtrArrayHandle.
    17816 - [Wasm] Update emscripten to 1.39.3
    17827 - [llvm] Add support for LLVM JInt is a generic valuetype.
    18577 - [2019-12] Bump msbuild to track mono-2019-10
    18591 - [2019-12] [runtime] Disable lldb backtrace display on osx, it hangs on attaching in lldb.
    18595 - [2019-12] configure.ac: remove AC_SEARCH_LIBS for libintl
    18611 - [2019-12] [merp] MONO_DEBUG=no-gdb-stacktrace shouldn窶冲 disable MERP
    18620 - [2019-12] [corlib] Split corlib xunit tests even more for iOS
    18682 - [2019-12] [aot] Avoid inflating gparams with byreflike types during generic sharing.
    18705 - Update deprecated query parameter to header
    18723 - [2019-12] [merp] Add an exception type for managed exceptions
    18733 - [2019-12] [NUnitLite] Bump nunitlite submodule.
    18744 - [2019-12] [iOS] Replace removed dsymutil -t switch with -num-threads
    18786 - [2019-12] Allow users to switch to MonoWebRequestHandler on Android via UI
    18792 - [2019-12] Bump msbuild to track mono-2019-10
    18830 - [2019-12] Move offsets-tool into mono/tools
    18833 - [2019-12] Make MonoWebRequestHandler linker friendly
    18839 - [2019-12] [merp] Increase buffer size for state dump
    18862 - [2019-12] Bump msbuild to track mono-2019-10
    18889 - [2019-12] Move TestEnvVarSwitchForInnerHttpHandler to nunit (from xunit)
    18908 - [2019-12] [bcl] Default XmlSerializer stream serialize to UTF8 Encoding
    18911 - Bump bockbuild to bring in Gtk# regression fix
    18921 - [2019-12] [merp] Capture Environment.FailFast message in crash report
    18946 - [2019-12] [sgen] Disable managed allocator when using nursery-canaries
    18956 - [2019-12] Remove TestEnvVarSwitchForInnerHttpHandler test
    18964 - [2019-12] [merp] Produce hashes for unmanaged thread stacks also
    18984 - [2019-12] Added some parenthesis and a cast to control order of operations.
    18986 - [2019-12] Bump msbuild to track mono-2019-10
    19018 - [2019-12][runtime] Improve handling crashing signals
    19050 - [2019-12] [debugger] Enable reading embedded ppdb
    19078 - [2019-12] Bump msbuild to track mono-2019-12
    19119 - [2019-12] [merp] Create a signal (窶�source窶�) breadcrumb for the crash dump process
    19205 - [2019-12] Bump msbuild to track mono-2019-12
    19208 - [2019-12] [corlib] Capture the ExceptionDispatchInfo when rethrowing from TaskContinuation
    19243 - [2019-12] [merp] Add breadcrumb for StackHash
    19368 - [2019-12] [amd64] align application stack pointer in signal handler
    19423 - [2019-12] Force Python 3.x from env in shebang lines
    19428 - [mono-2019-12] Bump corefx to get https://github.com/mono/corefx/pull/396
    19622 - [2019-12] Bump msbuild to track mono-2019-12
    19641 - [2019-12] [System.Runtime.Serialization] Work around specified cast is not valid
    19662 - [2019-12] Bump msbuild to track mono-2019-12


(ryoon)
diff -r1.20 -r1.21 pkgsrc/lang/mono6/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/mono6/PLIST
diff -r1.10 -r1.11 pkgsrc/lang/mono6/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/patch-acceptance-tests_Makefile.in
diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/patch-mono_eglib_giconv.c
diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in
diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/patch-scripts_submodules_versions.mk
diff -r1.1 -r0 pkgsrc/lang/mono6/patches/patch-libgc_pthread__stop__world.c
diff -r1.1 -r0 pkgsrc/lang/mono6/patches/patch-libgc_pthread__support.c
diff -r1.2 -r1.3 pkgsrc/lang/mono6/patches/patch-mono_metadata_icall.c
cvs diff -r1.20 -r1.21 pkgsrc/lang/mono6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/Makefile 2020/08/31 18:09:51 1.20
+++ pkgsrc/lang/mono6/Attic/Makefile 2020/09/30 19:50:14 1.21
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.20 2020/08/31 18:09:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2020/09/30 19:50:14 ryoon Exp $
2 2
3DISTNAME= mono-6.8.0.105 3DISTNAME= mono-6.10.0.104
4PKGREVISION= 6 
5CATEGORIES= lang 4CATEGORIES= lang
6MASTER_SITES= https://download.mono-project.com/sources/mono/ 5MASTER_SITES= https://download.mono-project.com/sources/mono/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.mono-project.com/ 9HOMEPAGE= https://www.mono-project.com/
11COMMENT= Open source implementation of the .NET Development Framework 10COMMENT= Open source implementation of the .NET Development Framework
12LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0 11LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
13 12
14WRKSRC= ${WRKDIR}/${DISTNAME} 13WRKSRC= ${WRKDIR}/${DISTNAME}
15 14
16TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 15TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
17CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]* 16CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
@@ -107,35 +106,29 @@ TEST_TARGET= check @@ -107,35 +106,29 @@ TEST_TARGET= check
107SUBST_CLASSES+= fix-prefix 106SUBST_CLASSES+= fix-prefix
108SUBST_STAGE.fix-prefix= pre-configure 107SUBST_STAGE.fix-prefix= pre-configure
109SUBST_MESSAGE.fix-prefix= Fixing relative prefix 108SUBST_MESSAGE.fix-prefix= Fixing relative prefix
110SUBST_FILES.fix-prefix= ${PKGCONFIG_OVERRIDE} 109SUBST_FILES.fix-prefix= ${PKGCONFIG_OVERRIDE}
111SUBST_SED.fix-prefix= -e 's,$${pcfiledir}/../..,\@prefix\@,g' 110SUBST_SED.fix-prefix= -e 's,$${pcfiledir}/../..,\@prefix\@,g'
112SUBST_NOOP_OK.fix-prefix= yes 111SUBST_NOOP_OK.fix-prefix= yes
113 112
114SUBST_CLASSES+= fix-cfgdir 113SUBST_CLASSES+= fix-cfgdir
115SUBST_STAGE.fix-cfgdir= pre-configure 114SUBST_STAGE.fix-cfgdir= pre-configure
116SUBST_MESSAGE.fix-cfgdir= Fixing configuration files install dir 115SUBST_MESSAGE.fix-cfgdir= Fixing configuration files install dir
117SUBST_FILES.fix-cfgdir= mcs/tools/mconfig/Makefile 116SUBST_FILES.fix-cfgdir= mcs/tools/mconfig/Makefile
118SUBST_SED.fix-cfgdir= -e 's,$$(sysconfdir)/mono,${EGDIR},g' 117SUBST_SED.fix-cfgdir= -e 's,$$(sysconfdir)/mono,${EGDIR},g'
119 118
120SUBST_CLASSES+= fix-python 
121SUBST_STAGE.fix-python= pre-configure 
122SUBST_MESSAGE.fix-python= Fixing python binary name 
123SUBST_FILES.fix-python+= mono/mini/Makefile.am.in 
124SUBST_FILES.fix-python+= mono/tests/Makefile.am 
125SUBST_SED.fix-python= -e 's,python,${PYTHONBIN},' 
126 
127# Uses [[ ... ]], not needed during the build. 119# Uses [[ ... ]], not needed during the build.
128CHECK_PORTABILITY_SKIP+= acceptance-tests/microbench-perf.sh.in 120CHECK_PORTABILITY_SKIP+= acceptance-tests/microbench-perf.sh.in
 121CHECK_PORTABILITY_SKIP+= external/llvm-project/polly/lib/External/isl/configure
129 122
130.include "../../mk/bsd.prefs.mk" 123.include "../../mk/bsd.prefs.mk"
131 124
132# We patched makefiles, regen 125# We patched makefiles, regen
133pre-configure: 126pre-configure:
134 ${RUN} cd ${WRKSRC} && NOCONFIGURE=1 ${SH} ./autogen.sh 127 ${RUN} cd ${WRKSRC} && NOCONFIGURE=1 ${SH} ./autogen.sh
135 128
136.if ${OPSYS} == "SunOS" 129.if ${OPSYS} == "SunOS"
137CFLAGS+= -D_XOPEN_SOURCE=600 130CFLAGS+= -D_XOPEN_SOURCE=600
138# Conflicts with the above settings 131# Conflicts with the above settings
139CONFIGURE_ENV+= ac_cv_func_madvise=no 132CONFIGURE_ENV+= ac_cv_func_madvise=no
140CONFIGURE_ARGS+= --with-mcs-docs=no 133CONFIGURE_ARGS+= --with-mcs-docs=no
141CONFIGURE_ARGS+= --enable-dtrace=no 134CONFIGURE_ARGS+= --enable-dtrace=no
cvs diff -r1.5 -r1.6 pkgsrc/lang/mono6/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/PLIST 2020/06/28 17:20:43 1.5
+++ pkgsrc/lang/mono6/Attic/PLIST 2020/09/30 19:50:14 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2020/06/28 17:20:43 nia Exp $ 1@comment $NetBSD: PLIST,v 1.6 2020/09/30 19:50:14 ryoon Exp $
2bin/al 2bin/al
3bin/al2 3bin/al2
4bin/aprofutil 4bin/aprofutil
5bin/caspol 5bin/caspol
6bin/cccheck 6bin/cccheck
7bin/ccrewrite 7bin/ccrewrite
8bin/cert-sync 8bin/cert-sync
9bin/cert2spc 9bin/cert2spc
10bin/certmgr 10bin/certmgr
11bin/chktrust 11bin/chktrust
12bin/crlupdate 12bin/crlupdate
13bin/csc 13bin/csc
14bin/csharp 14bin/csharp
@@ -3383,52 +3383,20 @@ share/examples/mono/2.0/web.config @@ -3383,52 +3383,20 @@ share/examples/mono/2.0/web.config
3383share/examples/mono/4.0/Browsers/Compat.browser 3383share/examples/mono/4.0/Browsers/Compat.browser
3384share/examples/mono/4.0/DefaultWsdlHelpGenerator.aspx 3384share/examples/mono/4.0/DefaultWsdlHelpGenerator.aspx
3385share/examples/mono/4.0/machine.config 3385share/examples/mono/4.0/machine.config
3386share/examples/mono/4.0/settings.map 3386share/examples/mono/4.0/settings.map
3387share/examples/mono/4.0/web.config 3387share/examples/mono/4.0/web.config
3388share/examples/mono/4.5/Browsers/Compat.browser 3388share/examples/mono/4.5/Browsers/Compat.browser
3389share/examples/mono/4.5/DefaultWsdlHelpGenerator.aspx 3389share/examples/mono/4.5/DefaultWsdlHelpGenerator.aspx
3390share/examples/mono/4.5/machine.config 3390share/examples/mono/4.5/machine.config
3391share/examples/mono/4.5/settings.map 3391share/examples/mono/4.5/settings.map
3392share/examples/mono/4.5/web.config 3392share/examples/mono/4.5/web.config
3393share/examples/mono/browscap.ini 3393share/examples/mono/browscap.ini
3394share/examples/mono/config 3394share/examples/mono/config
3395share/examples/mono/mconfig/config.xml 3395share/examples/mono/mconfig/config.xml
3396${PLIST.boehm}share/libgc-mono/README 
3397${PLIST.boehm}share/libgc-mono/README.DGUX386 
3398${PLIST.boehm}share/libgc-mono/README.Mac 
3399${PLIST.boehm}share/libgc-mono/README.MacOSX 
3400${PLIST.boehm}share/libgc-mono/README.OS2 
3401${PLIST.boehm}share/libgc-mono/README.amiga 
3402${PLIST.boehm}share/libgc-mono/README.arm.cross 
3403${PLIST.boehm}share/libgc-mono/README.autoconf 
3404${PLIST.boehm}share/libgc-mono/README.changes 
3405${PLIST.boehm}share/libgc-mono/README.contributors 
3406${PLIST.boehm}share/libgc-mono/README.cords 
3407${PLIST.boehm}share/libgc-mono/README.darwin 
3408${PLIST.boehm}share/libgc-mono/README.dj 
3409${PLIST.boehm}share/libgc-mono/README.environment 
3410${PLIST.boehm}share/libgc-mono/README.ews4800 
3411${PLIST.boehm}share/libgc-mono/README.hp 
3412${PLIST.boehm}share/libgc-mono/README.linux 
3413${PLIST.boehm}share/libgc-mono/README.macros 
3414${PLIST.boehm}share/libgc-mono/README.rs6000 
3415${PLIST.boehm}share/libgc-mono/README.sgi 
3416${PLIST.boehm}share/libgc-mono/README.solaris2 
3417${PLIST.boehm}share/libgc-mono/README.uts 
3418${PLIST.boehm}share/libgc-mono/README.win32 
3419${PLIST.boehm}share/libgc-mono/barrett_diagram 
3420${PLIST.boehm}share/libgc-mono/debugging.html 
3421${PLIST.boehm}share/libgc-mono/gc.man 
3422${PLIST.boehm}share/libgc-mono/gcdescr.html 
3423${PLIST.boehm}share/libgc-mono/gcinterface.html 
3424${PLIST.boehm}share/libgc-mono/leak.html 
3425${PLIST.boehm}share/libgc-mono/scale.html 
3426${PLIST.boehm}share/libgc-mono/simple_example.html 
3427${PLIST.boehm}share/libgc-mono/tree.html 
3428share/locale/de/LC_MESSAGES/mcs.mo 3396share/locale/de/LC_MESSAGES/mcs.mo
3429share/locale/es/LC_MESSAGES/mcs.mo 3397share/locale/es/LC_MESSAGES/mcs.mo
3430share/locale/ja/LC_MESSAGES/mcs.mo 3398share/locale/ja/LC_MESSAGES/mcs.mo
3431share/locale/pt_BR/LC_MESSAGES/mcs.mo 3399share/locale/pt_BR/LC_MESSAGES/mcs.mo
3432share/mono-2.0/mono/cil/cil-opcodes.xml 3400share/mono-2.0/mono/cil/cil-opcodes.xml
3433share/mono-2.0/mono/eglib/eglib-config.h 3401share/mono-2.0/mono/eglib/eglib-config.h
3434share/mono-2.0/mono/profiler/mono-profiler-coverage.suppression 3402share/mono-2.0/mono/profiler/mono-profiler-coverage.suppression
cvs diff -r1.10 -r1.11 pkgsrc/lang/mono6/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/distinfo 2020/05/23 20:30:20 1.10
+++ pkgsrc/lang/mono6/Attic/distinfo 2020/09/30 19:50:14 1.11
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1$NetBSD: distinfo,v 1.10 2020/05/23 20:30:20 rillig Exp $ 1$NetBSD: distinfo,v 1.11 2020/09/30 19:50:14 ryoon Exp $
2 2
3SHA1 (mono-6.8.0.105.tar.xz) = e39aa0ac15b3b73ecf0767462798a5acde0aed79 3SHA1 (mono-6.10.0.104.tar.xz) = 9bc9297fe857dcaa8f8e0b8a535805d804217117
4RMD160 (mono-6.8.0.105.tar.xz) = 5a84c75f941d5a2a645999e13da8458fc87d3bac 4RMD160 (mono-6.10.0.104.tar.xz) = 8285b273ddcc00840bba17df4da11b8b668ed804
5SHA512 (mono-6.8.0.105.tar.xz) = 8207082f6c538037a17dba5e22576d8e9b0aac946df270ff34daad0857e7b1cfd71c8cf4851e74dd5338397c9587540f11b23e71776bca6dc2a1b89dbed2fd7e 5SHA512 (mono-6.10.0.104.tar.xz) = 73b853e9fc9af2e1bf5e45f7accb8893dd7e48f9723f74b03d99ea11cf565e2c5bb2d6ae4c81c7e7be0cdfa489016da909ed7b12808c8f84d9d25e33e1cb9874
6Size (mono-6.8.0.105.tar.xz) = 243441900 bytes 6Size (mono-6.10.0.104.tar.xz) = 292616252 bytes
7SHA1 (patch-acceptance-tests_Makefile.in) = 66866b180ccce299a0d492add5330351611ec5f2 7SHA1 (patch-acceptance-tests_Makefile.in) = b2edf3ed54d3669c5651c6d63bb8fb04fae0fec0
8SHA1 (patch-acceptance-tests_microbench-perf_sh_in) = d46118c1685e3e48a5b8594bf7f77acd2bebaf94 8SHA1 (patch-acceptance-tests_microbench-perf_sh_in) = d46118c1685e3e48a5b8594bf7f77acd2bebaf94
9SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246 9SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
10SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9 10SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
11SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee 11SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
12SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883 12SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883
13SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606 13SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606
14SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01 14SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
15SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4 15SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
16SHA1 (patch-external_corert_src_Native_gc_env_gcenv.structs.h) = 91b37d93c1c3aadcdb383c443142fe28f50ad8e6 16SHA1 (patch-external_corert_src_Native_gc_env_gcenv.structs.h) = 91b37d93c1c3aadcdb383c443142fe28f50ad8e6
17SHA1 (patch-libgc_pthread__stop__world.c) = f5a12dc3f453136dabc0b93d57caa155a420ab0d 17SHA1 (patch-mono_eglib_giconv.c) = 5c2ca5788b93d371d1aa30f296a447516b622a4e
18SHA1 (patch-libgc_pthread__support.c) = b4fcf5ab1f5d5d06739891c1614ff870b8e4a4c5 18SHA1 (patch-mono_metadata_icall.c) = 9c0ec3d4d3263943a7351a76065ef80ce312396a
19SHA1 (patch-mono_eglib_giconv.c) = 04d2559d3868605194efd6267da010870f53d961 
20SHA1 (patch-mono_metadata_icall.c) = b326c16e9aa8f9ee154d937128e5e09fd31b235a 
21SHA1 (patch-mono_metadata_w32mutex-unix.c) = c3d424fe4ae1079c9c664c876a087fb0134f2e22 19SHA1 (patch-mono_metadata_w32mutex-unix.c) = c3d424fe4ae1079c9c664c876a087fb0134f2e22
22SHA1 (patch-mono_mini_Makefile.am.in) = 7f4555b53e74646d96c847862999e4eceaa86164 20SHA1 (patch-mono_mini_Makefile.am.in) = 7f4555b53e74646d96c847862999e4eceaa86164
23SHA1 (patch-mono_mini_Makefile.in) = c8a96e8d9139b5f1c751abc2256af45c219e504e 21SHA1 (patch-mono_mini_Makefile.in) = c8a96e8d9139b5f1c751abc2256af45c219e504e
24SHA1 (patch-mono_tests_Makefile.am) = ddeab885c28be53dc457261c63af53b3de754052 22SHA1 (patch-mono_tests_Makefile.am) = ddeab885c28be53dc457261c63af53b3de754052
25SHA1 (patch-mono_tests_Makefile.in) = cf6a670e94b52f41d30ae6262f2f4ed5c0da4c05 23SHA1 (patch-mono_tests_Makefile.in) = cf6a670e94b52f41d30ae6262f2f4ed5c0da4c05
26SHA1 (patch-mono_utils_jemalloc_Makefile.in) = 37a31f4c1fc40330a95c1c421dfc88359fbb4ef1 24SHA1 (patch-mono_utils_jemalloc_Makefile.in) = bb20a6f72c88632bf2e75c83174b4255788ad4ff
27SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca 25SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
28SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f 26SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f
29SHA1 (patch-mono_utils_mono-threads-posix.c) = 3111d6a47fa104d964b34fdb5f7eca8643559ea3 27SHA1 (patch-mono_utils_mono-threads-posix.c) = 3111d6a47fa104d964b34fdb5f7eca8643559ea3
30SHA1 (patch-mono_utils_mono-utils-debug.c) = 39f099969040b3a52101b611be723b25674ea68b 28SHA1 (patch-mono_utils_mono-utils-debug.c) = 39f099969040b3a52101b611be723b25674ea68b
31SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e 29SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e
32SHA1 (patch-scripts_submodules_versions.mk) = 65f7ee0b8503f10d20f07127e6ca7021b44077de 30SHA1 (patch-scripts_submodules_versions.mk) = ca45d582a09af1bb3a1031a689c188605dea91b8
33SHA1 (patch-support_minizip_ioapi.c) = 605c86916c957c31a8b3048d7703482f8f545463 31SHA1 (patch-support_minizip_ioapi.c) = 605c86916c957c31a8b3048d7703482f8f545463
cvs diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/Attic/patch-acceptance-tests_Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/mono6/patches/Attic/patch-acceptance-tests_Makefile.in 2020/03/29 01:07:01 1.1
+++ pkgsrc/lang/mono6/patches/Attic/patch-acceptance-tests_Makefile.in 2020/09/30 19:50:14 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-acceptance-tests_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $ 1$NetBSD: patch-acceptance-tests_Makefile.in,v 1.2 2020/09/30 19:50:14 ryoon Exp $
2 2
3--- acceptance-tests/Makefile.in.orig 2020-03-27 23:40:55.976678079 +0000 3--- acceptance-tests/Makefile.in.orig 2020-04-30 07:53:12.000000000 +0000
4+++ acceptance-tests/Makefile.in 4+++ acceptance-tests/Makefile.in
5@@ -5846,7 +5846,7 @@ __bump-version-%: 5@@ -5853,7 +5853,7 @@ __bump-version-%:
6  6
7 __bump-branch-%: 7 __bump-branch-%:
8 @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 8 @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
9- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 9- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
10+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 10+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
11 python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH) 11 $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
12 python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH) 12 $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
13 @if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi 13 @if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
cvs diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/Attic/patch-mono_eglib_giconv.c (expand / switch to unified diff)

--- pkgsrc/lang/mono6/patches/Attic/patch-mono_eglib_giconv.c 2020/02/12 13:43:31 1.1
+++ pkgsrc/lang/mono6/patches/Attic/patch-mono_eglib_giconv.c 2020/09/30 19:50:14 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-mono_eglib_giconv.c,v 1.1 2020/02/12 13:43:31 kamil Exp $ 1$NetBSD: patch-mono_eglib_giconv.c,v 1.2 2020/09/30 19:50:14 ryoon Exp $
2 2
3Support POSIX iconv(3) on modern NetBSD. 3Support POSIX iconv(3) on modern NetBSD.
4 4
5--- mono/eglib/giconv.c.orig 2019-12-10 07:50:32.000000000 +0000 5--- mono/eglib/giconv.c.orig 2020-04-30 07:46:10.000000000 +0000
6+++ mono/eglib/giconv.c 6+++ mono/eglib/giconv.c
7@@ -37,6 +37,14 @@ 7@@ -37,6 +37,14 @@
8 #define FORCE_INLINE(RET_TYPE) inline RET_TYPE __attribute__((always_inline)) 8 #define FORCE_INLINE(RET_TYPE) inline RET_TYPE __attribute__((always_inline))
9 #endif 9 #endif
10  10
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+#include <sys/param.h> 12+#include <sys/param.h>
13+#if __NetBSD_Prereq__(9,99,17) 13+#if __NetBSD_Prereq__(9,99,17)
14+#define NETBSD_POSIX_ICONV 1 14+#define NETBSD_POSIX_ICONV 1
15+#else 15+#else
16+#define NETBSD_POSIX_ICONV 0 16+#define NETBSD_POSIX_ICONV 0
17+#endif 17+#endif
18+#endif 18+#endif
19  19
20 #define UNROLL_DECODE_UTF8 0 20 #define UNROLL_DECODE_UTF8 0
21 #define UNROLL_ENCODE_UTF8 0 21 #define UNROLL_ENCODE_UTF8 0
22@@ -196,7 +204,7 @@ g_iconv (GIConv cd, gchar **inbytes, gsi 22@@ -197,7 +205,7 @@ g_iconv (GIConv cd, gchar **inbytes, gsi
23 } else { 
24 outleftptr = NULL; 23 outleftptr = NULL;
25 } 24 }
26-#if defined(__NetBSD__) 25 // AIX needs this for C++ and GNU iconv
27+#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV 26-#if defined(__NetBSD__) || defined(_AIX)
 27+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(_AIX)
28 return iconv (cd->cd, (const gchar **)inbytes, inleftptr, outbytes, outleftptr); 28 return iconv (cd->cd, (const gchar **)inbytes, inleftptr, outbytes, outleftptr);
29 #else 29 #else
30 return iconv (cd->cd, inbytes, inleftptr, outbytes, outleftptr); 30 return iconv (cd->cd, inbytes, inleftptr, outbytes, outleftptr);
cvs diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/Attic/patch-mono_utils_jemalloc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/mono6/patches/Attic/patch-mono_utils_jemalloc_Makefile.in 2020/03/29 01:07:01 1.1
+++ pkgsrc/lang/mono6/patches/Attic/patch-mono_utils_jemalloc_Makefile.in 2020/09/30 19:50:14 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-mono_utils_jemalloc_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $ 1$NetBSD: patch-mono_utils_jemalloc_Makefile.in,v 1.2 2020/09/30 19:50:14 ryoon Exp $
2 2
3--- mono/utils/jemalloc/Makefile.in.orig 2020-03-27 23:41:16.834591125 +0000 3--- mono/utils/jemalloc/Makefile.in.orig 2020-04-30 07:53:15.000000000 +0000
4+++ mono/utils/jemalloc/Makefile.in 4+++ mono/utils/jemalloc/Makefile.in
5@@ -736,7 +736,7 @@ __bump-version-%: 5@@ -743,7 +743,7 @@ __bump-version-%:
6  6
7 __bump-branch-%: 7 __bump-branch-%:
8 @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 8 @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
9- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 9- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
10+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 10+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
11 python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH) 11 $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
12 python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH) 12 $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
13 @if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi 13 @if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
cvs diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/Attic/patch-scripts_submodules_versions.mk (expand / switch to unified diff)

--- pkgsrc/lang/mono6/patches/Attic/patch-scripts_submodules_versions.mk 2020/03/29 01:07:01 1.1
+++ pkgsrc/lang/mono6/patches/Attic/patch-scripts_submodules_versions.mk 2020/09/30 19:50:14 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-scripts_submodules_versions.mk,v 1.1 2020/03/29 01:07:01 joerg Exp $ 1$NetBSD: patch-scripts_submodules_versions.mk,v 1.2 2020/09/30 19:50:14 ryoon Exp $
2 2
3--- scripts/submodules/versions.mk.orig 2020-03-27 23:43:04.070978830 +0000 3--- scripts/submodules/versions.mk.orig 2020-04-30 07:46:10.000000000 +0000
4+++ scripts/submodules/versions.mk 4+++ scripts/submodules/versions.mk
5@@ -111,7 +111,7 @@ __bump-version-%: 5@@ -111,7 +111,7 @@ __bump-version-%:
6  6
7 __bump-branch-%: 7 __bump-branch-%:
8 @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 8 @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
9- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 9- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
10+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi 10+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
11 python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH) 11 $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
12 python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH) 12 $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
13 @if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi 13 @if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
File Deleted: pkgsrc/lang/mono6/patches/Attic/patch-libgc_pthread__stop__world.c
File Deleted: pkgsrc/lang/mono6/patches/Attic/patch-libgc_pthread__support.c
cvs diff -r1.2 -r1.3 pkgsrc/lang/mono6/patches/Attic/patch-mono_metadata_icall.c (expand / switch to unified diff)

--- pkgsrc/lang/mono6/patches/Attic/patch-mono_metadata_icall.c 2019/10/09 22:46:04 1.2
+++ pkgsrc/lang/mono6/patches/Attic/patch-mono_metadata_icall.c 2020/09/30 19:50:14 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-mono_metadata_icall.c,v 1.2 2019/10/09 22:46:04 maya Exp $ 1$NetBSD: patch-mono_metadata_icall.c,v 1.3 2020/09/30 19:50:14 ryoon Exp $
2 2
3NetBSD will side-load <stdbool.h> which must have #define bool _Bool. 3NetBSD will side-load <stdbool.h> which must have #define bool _Bool.
4This causes some problems with the C preprocessor usage here. undef it. 4This causes some problems with the C preprocessor usage here. undef it.
5 5
6--- mono/metadata/icall.c.orig 2019-09-19 07:46:07.000000000 +0000 6--- mono/metadata/icall.c.orig 2020-04-30 07:46:10.000000000 +0000
7+++ mono/metadata/icall.c 7+++ mono/metadata/icall.c
8@@ -120,6 +120,8 @@ 8@@ -120,6 +120,8 @@
9 #include "mono/utils/mono-threads-coop.h" 
10 #include "mono/metadata/icall-signatures.h" 9 #include "mono/metadata/icall-signatures.h"
 10 #include "mono/utils/mono-signal-handler.h"
11  11
12+#undef bool 12+#undef bool
13+ 13+
14 //#define MONO_DEBUG_ICALLARRAY 14 //#define MONO_DEBUG_ICALLARRAY
15  15
16 #ifdef MONO_DEBUG_ICALLARRAY 16 #ifdef MONO_DEBUG_ICALLARRAY