<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/acf078fb322e6fb6338de1d4e83234671efb8952">https://github.com/macports/macports-ports/commit/acf078fb322e6fb6338de1d4e83234671efb8952</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 acf078fb322 stack: Use distfiles / master_sites tags
</span>acf078fb322 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit acf078fb322e6fb6338de1d4e83234671efb8952
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jun 13 03:44:43 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> stack: Use distfiles / master_sites tags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use tags to associate distfiles with master_sites so that MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'> doesn't attempt to download a distfile from the wrong URL.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add missing checksums for .asc file.
</span>---
lang/stack/Portfile | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
<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 0351ea876a2..fb6c0e52d22 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;'>@@ -33,33 +33,31 @@ worksrcdir ${name}-${github.version}
</span> set worksrcpath_prebuilt \
${workpath}/${distname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${github.homepage}/releases/download/v${github.version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${github.homepage}/archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.homepage}/releases/download/v${github.version}:release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${github.homepage}/archive:archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v${github.version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}${extract.suffix}:release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v${github.version}${extract.suffix}:archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex ${distfiles} 0]\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span> rmd160 297c7cafd976eb571200ae5394637eb88b5b5bbb \
sha256 73eee7e5f24d11fd0af00cb05f16119e86be5d578c35083250e6b85ed1ca3621 \
size 8739848 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex ${distfiles} 1] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v${github.version}${extract.suffix} \
</span> rmd160 5184c2858e5db161978e5ed48590849a146c5be8 \
sha256 6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 688104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 688104 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}${extract.suffix}.asc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 068caf245858a87f60600b5e16730e6d25b80d94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0df76677cfa986ae3112c32c52fac1083ce693bd1023223e1eea91ad567e22f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 488
</span>
gpg_verify.use_gpg_verification \
yes
if {[option gpg_verify.use_gpg_verification]} {
distfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex ${distfiles} 0].asc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex ${distfiles} end] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}${extract.suffix}.asc:release
</span>
post-checksum {
# check GPG signature: https://docs.haskellstack.org/en/stable/SIGNING_KEY/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,8 +65,8 @@ if {[option gpg_verify.use_gpg_verification]} {
</span>
gpg_verify.verify_gpg_signature \
${filespath}/keyid-${gpg_keyid}.txt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/[lindex ${distfiles} 0].asc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/[lindex ${distfiles} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/${distname}${extract.suffix}.asc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/${distname}${extract.suffix}
</span> }
}
</pre><pre style='margin:0'>
</pre>