<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/748ed8adda05fdd4aa0d9524e03723f6456f5dc0">https://github.com/macports/macports-ports/commit/748ed8adda05fdd4aa0d9524e03723f6456f5dc0</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 748ed8adda0 helm: fix distname handling
</span>748ed8adda0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 748ed8adda05fdd4aa0d9524e03723f6456f5dc0
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sun Mar 27 00:46:32 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> helm: fix distname handling
</span>---
sysutils/helm/Portfile | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/helm/Portfile b/sysutils/helm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d1693c0ea1..acd5c5438e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/helm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/helm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,22 +24,27 @@ proc helmVersion {} {
</span> return ${baseVersion}.${patchNumber}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc helmDistBase {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return helm-v[helmVersion]-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc helmDistBase {arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return helm-v[helmVersion]-darwin-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc helmDistName {arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global extract.suffix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [helmDistBase ${arch}]${extract.suffix}
</span> }
subport helm-3.8 {
set baseVersion 3.8
set patchNumber 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
set armAvailable yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums [helmDistBase]-arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [helmDistName arm64] \
</span> rmd160 bb47265d1b1275cc895f680be65acd06c394e88d \
sha256 5f0fea586781fb867b92c10133786949ab6a447f297d5c12e1e8f5dd3a9ed712 \
size 14082964 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [helmDistBase]-amd64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [helmDistName amd64] \
</span> rmd160 d295fd8debbc4793b510490419e271275b3dfab8 \
sha256 3b6d87d360a51bf0f2344edd54e3580a8e8de2c4a4fd92eccef3e811f7e81bb3 \
size 14318363
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,16 +53,16 @@ subport helm-3.8 {
</span> subport helm-3.7 {
set baseVersion 3.7
set patchNumber 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
set armAvailable yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums [helmDistBase]-arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [helmDistName arm64] \
</span> rmd160 903cf44fa466a1901aaa21a1b40c595041d153c6 \
sha256 260d4b8bffcebc6562ea344dfe88efe252cf9511dd6da3cccebf783773d42aec \
size 13978034 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [helmDistBase]-amd64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [helmDistName amd64] \
</span> rmd160 51cfcf1a0bffeba102afffe8333bebd875a11e94 \
sha256 5a0738afb1e194853aab00258453be8624e0a1d34fcc3c779989ac8dbcd59436 \
size 14529117
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,15 +71,15 @@ subport helm-3.7 {
</span> subport helm-3.6 {
set baseVersion 3.6
set patchNumber 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
set armAvailable yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums [helmDistBase]-arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [helmDistName arm64] \
</span> rmd160 695a17118869a5aced451048907ed27cc59a3cdd \
sha256 a50b499dbd0bbec90761d50974bf1e67cc6d503ea20d03b4a1275884065b7e9e \
size 13810693 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [helmDistBase]-amd64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [helmDistName amd64] \
</span> rmd160 8082929fd4afea08cc40d11fcb9cf1f33347f2ef \
sha256 84a1ff17dd03340652d96e8be5172a921c97825fd278a2113c8233a4e8db5236 \
size 14356954
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,13 +239,13 @@ if {${subport} == ${name}} {
</span> complex Kubernetes application.
master_sites https://get.helm.sh/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname [helmDistBase]-amd64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname [helmDistBase amd64]
</span>
if ${armAvailable} {
supported_archs arm64 x86_64
if {${build_arch} eq "arm64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname [helmDistBase]-arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname [helmDistBase arm64]
</span> }
}
</pre><pre style='margin:0'>
</pre>