<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5c0b89ecbccb563b571c0aa5ad7bcd59bf8d0706">https://github.com/macports/macports-ports/commit/5c0b89ecbccb563b571c0aa5ad7bcd59bf8d0706</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5c0b89e mono: update version 6.4.0.198->6.6.0.161
</span>5c0b89e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c0b89ecbccb563b571c0aa5ad7bcd59bf8d0706
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Dec 25 12:07:50 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> mono: update version 6.4.0.198->6.6.0.161
</span>---
devel/mono/Portfile | 12 ++++--------
devel/mono/files/patch-aot-compiler.c.diff | 8 ++++----
devel/mono/files/patch-odbc32.diff | 10 ----------
devel/msbuild/Portfile | 20 ++++++++++----------
4 files changed, 18 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/Portfile b/devel/mono/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3bdd7f..67b06a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mono/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup legacysupport 1.0
</span>
name mono
# please update msbuild when updating mono
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.0.198
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.6.0.161
</span> revision 0
epoch 1
categories devel lang mono
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ master_sites https://download.mono-project.com/sources/mono/
</span> use_xz yes
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8045bcbe15ee51f3c12b2b99844ad697927d22fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d00852822525e36f9f8b3e0f537d3a41c7a718cac22d06fc63ea64988877c2ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 230056560
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 36f11f69fe7530ccf2c745fee787e48c6e737f32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 778badcf2f201df7efa5e031d01802ea8c29818de66e5e7e9f85212c2277d85f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 241179396
</span>
patchfiles-append patch-aot-compiler.c.diff
if {!${configure.ccache}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,9 +82,5 @@ post-destroot {
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant unixodbc description {map unixodbc instead of libiodbc to odbc32.dll} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-odbc32.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.url https://www.mono-project.com/download/stable/
livecheck.regex "Stable \\((\\d+(?:\\.\\d+)+)\\)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/patch-aot-compiler.c.diff b/devel/mono/files/patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b6280e..aefebf6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/files/patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mono/files/patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRigh
</span> Ensure we always use -m32/-m64 and -arch for all architectures.
--- mono/mini/aot-compiler.c.orig 2019-01-17 00:45:20.000000000 -0700
+++ mono/mini/aot-compiler.c 2019-02-18 05:59:15.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11876,6 +11876,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11886,6 +11886,8 @@
</span> #define AS_OPTIONS "-xarch=v9"
#elif defined(TARGET_X86) && defined(TARGET_MACH)
#define AS_OPTIONS "-arch i386"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> #elif defined(TARGET_X86) && !defined(TARGET_MACH)
#define AS_OPTIONS "--32"
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11883,7 +11885,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11893,7 +11895,7 @@
</span> #endif
#if defined(TARGET_OSX)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> #elif defined(TARGET_WIN32_MSVC)
#define AS_NAME "clang.exe"
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11900,11 +11902,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11910,11 +11912,14 @@
</span> #define LD_NAME "ld"
#define LD_OPTIONS "-shared -G"
#elif defined(__ppc__) && defined(TARGET_MACH)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> #elif defined(TARGET_WIN32_MSVC)
#define LD_NAME "link.exe"
#define LD_OPTIONS "/DLL /MACHINE:X64 /NOLOGO /INCREMENTAL:NO"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11913,7 +11918,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11923,7 +11928,7 @@
</span> #define LD_NAME "gcc"
#define LD_OPTIONS "-shared"
#elif defined(TARGET_X86) && defined(TARGET_MACH)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/patch-odbc32.diff b/devel/mono/files/patch-odbc32.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6a45d9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/files/patch-odbc32.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/config.in.orig 2019-01-17 00:45:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/config.in 2019-02-23 20:55:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="libintl" target="@INTL@" os="!windows"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="i:libxslt.dll" target="libxslt@libsuffix@" os="!windows"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="i:odbc32.dll" target="libodbc@libsuffix@" os="!windows"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/msbuild/Portfile b/devel/msbuild/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d008523..b35e55e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/msbuild/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/msbuild/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup github 1.0
</span>
# mono_version is the version of port Mono
# see https://github.com/mono/mono/blob/mono-${mono_version}/packaging/MacSDK/msbuild.py for version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mono msbuild 560b1caa659dea7c4d51cf566b50ac9735bfb05b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20190918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mono msbuild 619cbd0171a356dfbf5a526b8bee62071e22e9e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20191127
</span> revision 0
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,20 +17,20 @@ long_description The Microsoft Build Engine is a platform for building ap
</span>
# see msbuild_download_url in file eng/cibuild_bootstrapped_msbuild.sh
# see global.json
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set bootstrap_msbuild mono_msbuild_xplat-master-8f608e49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bootstrap_msbuild mono_msbuild_6.4.0.208
</span>
# msbuild requires msbuild to build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites-append https://github.com/mono/msbuild/releases/download/0.07/:bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites-append https://github.com/mono/msbuild/releases/download/0.08/:bootstrap
</span> distfiles-append ${bootstrap_msbuild}.zip:bootstrap
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 89eef72a21af9c59d4b5191dccde68416ff5abbf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dc1fd30b7e83536fdb12bdf54c4f57672ad9ed8f688e0da9323550fd4ca11dc0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9140548 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 06d430beb32a17ff90317690b4bf6722ce719bcf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0dcd096152e11902ad121de2edfa18d7406523cf14b9ce0ac0d353e95e30e13b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9018039 \
</span> ${bootstrap_msbuild}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f9c7d680c4922f05546ab5359c5567d6575e5dc7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 183a079e20b0a4b5f85197fe8d531482ede9c6579da99f2252021b95a61bb8cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20677346
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 28f672523376c34880fe5f4f32b3f60e0b4a06b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b38fda1acf3e3abaa82ef4660dfdb7b07bc2165bed547c1c7c4e678ba40e3d71 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21799773
</span>
extract.only ${distname}${extract.suffix}
</pre><pre style='margin:0'>
</pre>