<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9599959c17dac22e57ae56b4d177e9d0a357f430">https://github.com/macports/macports-ports/commit/9599959c17dac22e57ae56b4d177e9d0a357f430</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 9599959c17d certbot: fix dependencies
</span>9599959c17d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9599959c17dac22e57ae56b4d177e9d0a357f430
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Dec 12 13:28:15 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> certbot: fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The python.default_version option has to be set before using
</span><span style='display:block; white-space:pre;color:#404040;'> ${python.version} in the depspecs. Variant bodies are executed after
</span><span style='display:block; white-space:pre;color:#404040;'> the rest of the Portfile has been parsed, so setting it there is too
</span><span style='display:block; white-space:pre;color:#404040;'> late.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61810
</span>---
security/certbot/Portfile | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/certbot/Portfile b/security/certbot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f56dc27b89c..2c345b551ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/certbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/certbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,33 +20,28 @@ checksums rmd160 45260b8890d43d687d0792801fb917e672226b9c \
</span> size 1416171
variant python27 conflicts python36 python37 python38 python39 description {Use Python 2.7} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 27
</span> depends_lib-append port:py${python.version}-python2-pythondialog
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python37 python38 python39 description {Use Python 3.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python36 python38 python39 description {Use Python 3.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python36 python37 python39 description {Use Python 3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python27 python36 python37 python38 description {Use Python 3.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python37 python38 python39 description {Use Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python36 python38 python39 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python36 python37 python39 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python27 python36 python37 python38 description {Use Python 3.9} {}
</span>
if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python39]} {
default_variants +python38
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv {39 38 37 36 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pv}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version ${pv}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</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;'>+
</span> depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:py${python.version}-acme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:py${python.version}-acme \
</span> port:py${python.version}-configargparse \
port:py${python.version}-configobj \
port:py${python.version}-cryptography \
</pre><pre style='margin:0'>
</pre>