<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a89ddb994c814d859493a05d92a0034f99c2e060">https://github.com/macports/macports-ports/commit/a89ddb994c814d859493a05d92a0034f99c2e060</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a89ddb994c814d859493a05d92a0034f99c2e060
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Thu Oct 5 14:00:20 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> stack: update to 2.13.1, enable arm64
</span>---
_resources/port1.0/group/haskell_stack-1.0.tcl | 4 +--
lang/stack/Portfile | 37 +++++++++++++++++++-------
2 files changed, 29 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/haskell_stack-1.0.tcl b/_resources/port1.0/group/haskell_stack-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 849fb99f46f..26ab96da42a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/haskell_stack-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/haskell_stack-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,8 +70,8 @@ post-extract {
</span> xinstall -m 0755 -d "[option haskell_stack.stack_root]"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# stack builds x86_64 binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# stack builds arm64 and x86_64 binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs arm64 x86_64
</span>
# libHSbase shipped with GHC links against system libiconv, which provides the
# 'iconv' symbol, but not the 'libiconv' symbol. Because the compilation
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stack/Portfile b/lang/stack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a68b75ce254..f8abc3bf851 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/stack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup gpg_verify 1.0
</span> PortGroup haskell_stack 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup commercialhaskell stack 2.9.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup commercialhaskell stack 2.13.1 v
</span> revision 0
name stack
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,11 @@ homepage https://haskellstack.org
</span> variant prebuilt \
description {Do not bootstrap stack; install the pre-built binary.} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${github.version}-osx-x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${github.version}-osx-x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${github.version}-osx-aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
worksrcdir ${name}-${github.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,16 +44,27 @@ distfiles ${distname}-bin:release \
</span>
extract.only ${github.tag_prefix}${github.version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}-bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1bef40f79e2ce2981fed55cd360adbb367f66c4d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b338fba3c679d9e4d3b3a8cd1ac6a9e55916755da22165554005f79fc7be3e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32626208 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${github.tag_prefix}${github.version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ca4cd87ce2e03a65840747efc56286b8e662ce17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 512d0188c195073d7c452f4b54ca005005ce7b865052a4856dc9975140051d9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 767680 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${github.tag_prefix}${github.version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f85b9e6f33bb18bca9969be4a303f39c54eab53a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 00333782b1bda3bda02ca0c1bbc6becdd86e5a39f6448b0df788b634e1bde692 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 905625
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}-bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d1129562844cfe67e0aa721af7ffae294ef1e33a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 99eb8d15420af85aa2df9636851b98edd426dcfcd870908d3dc21fd7a0ddb21e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34298144 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}-bin.asc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}-bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 39e4a3b868ed9b2883a5e20c00b032795905f001 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 894b3daf7fb4bfe3d01edc966c2eabe4cfb2503973c1f62e7336f00a7068d13f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 103493328 \
</span> ${distname}-bin.asc \
size 488
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,5 +132,7 @@ if { [variant_isset "prebuilt"] } {
</span> ${workpath}/bin/${name}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set haskell_stack.bin ${workpath}/bin/stack
}
</pre><pre style='margin:0'>
</pre>