<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/967e586876ab0973e81ef474c4b0931357640c29">https://github.com/macports/macports-ports/commit/967e586876ab0973e81ef474c4b0931357640c29</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 967e586876a certbot: merge variant blocks
</span>967e586876a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 967e586876ab0973e81ef474c4b0931357640c29
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Jul 22 06:10:22 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    certbot: merge variant blocks
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/60887
</span>---
 security/certbot/Portfile | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 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 5e1716877a4..b3d6b1116ab 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;'>@@ -19,14 +19,25 @@ checksums           rmd160  f0a151703cd744e0b1257260b3057a503ff40e9d \
</span>                     sha256  b0cc6b1b96fba25763515bce60c76f79abb50007a8d2c9d42d948bef44c0a086 \
                     size    3797835
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 python37 python38 description {Use Python 2.7} {
</span>     python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:py${python.version}-python2-pythondialog
</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;'>+variant python36 conflicts python27 python37 python38 description {Use Python 3.6} {
</span>     python.default_version 36
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python37]} {
</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;'>+variant python37 conflicts python27 python36 python38 description {Use Python 3.7} {
</span>     python.default_version 37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    python.default_version 38
</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;'>+variant python38 conflicts python27 python36 python37 description {Use Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     python.default_version 38
</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;'>+if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants +python38
</span> }
 
 depends_build       port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,20 +71,6 @@ post-patch {
</span>     reinplace "s|/var/log/|${prefix}/var/log/|" ${worksrcpath}/certbot/certbot/compat/misc.py
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python36 python37 python38 description {Use Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:py${python.version}-python2-pythondialog
</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 python36 conflicts python27 python37 python38 description {Use Python 3.6} {}
</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 description {Use Python 3.7} {}
</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 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants +python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #
 # integration with local webservers
 # for use with "http-01 challenge"
</pre><pre style='margin:0'>

</pre>