certbot, certbot-apache, certbot-nginx: add Python 3.6 support

macports · Jun 10, 2018 · f77eedb · f77eedb
1 parent f886f98
commit f77eedb
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 4 deletions.
diff --git a/security/certbot-apache/Portfile b/security/certbot-apache/Portfile
@@ -1,6 +1,7 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 PortGroup           python 1.0
 
 name                certbot-apache
@@ -14,7 +15,7 @@ platforms           darwin
 homepage            https://pypi.python.org/pypi/certbot-apache
 master_sites        pypi:c/certbot-apache
 
-python.versions     27
+python.versions     27 36
 
 checksums           rmd160  42b882d74cd9db6207b71251fc427e4947c4cded \
                     sha256  ca660d10e1945a78e0a00fd2be330be5acef97f215d3b03cb72cb0a996d63a64 \
@@ -27,3 +28,17 @@ depends_lib-append  port:certbot \
                     port:py${python.version}-zopecomponent \
                     port:py${python.version}-zopeinterface \
                     port:py${python.version}-mock
+
+variant python27 conflicts python36 description {Use Python 2.7} {
+    python.default_version     27
+    require_active_variants    certbot python27
+}
+
+variant python36 conflicts python27 description {Use Python 3.6} {
+    python.default_version     36
+    require_active_variants    certbot python36
+}
+
+if {![variant_isset python36]} {
+    default_variants +python27
+}
diff --git a/security/certbot-nginx/Portfile b/security/certbot-nginx/Portfile
@@ -1,6 +1,7 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 PortGroup           python 1.0
 
 name                certbot-nginx
@@ -14,7 +15,7 @@ platforms           darwin
 homepage            https://pypi.python.org/pypi/certbot-nginx
 master_sites        pypi:c/certbot-nginx
 
-python.versions     27
+python.versions     27 36
 
 checksums           rmd160  8b77fbb83d24e56e7bfdcedd6f6a13a0cadf181f \
                     sha256  0848642c28f3fad9759309f3e78652d8dd68062e068844a74f828155d2fda416 \
@@ -27,3 +28,17 @@ depends_lib-append  port:certbot \
                     port:py${python.version}-setuptools \
                     port:py${python.version}-zopeinterface \
                     port:py${python.version}-mock
+
+variant python27 conflicts python36 description {Use Python 2.7} {
+    python.default_version     27
+    require_active_variants    certbot python27
+}
+
+variant python36 conflicts python27 description {Use Python 3.6} {
+    python.default_version     36
+    require_active_variants    certbot python36
+}
+
+if {![variant_isset python36]} {
+    default_variants +python27
+}
diff --git a/security/certbot/Portfile b/security/certbot/Portfile
@@ -18,7 +18,7 @@ checksums           rmd160  caa8aa7e282bf133cd5b63248e914f466727511d \
                     sha256  49a7139bb5ca457bc8eef56fcc0c9eeea2106ee01685b23cd4f01003999171a9 \
                     size    1163752
 
-python.versions     27
+python.versions     27 36
 
 depends_lib         port:py${python.version}-acme \
                     port:py${python.version}-configargparse \
@@ -29,7 +29,6 @@ depends_lib         port:py${python.version}-acme \
                     port:py${python.version}-openssl \
                     port:py${python.version}-parsedatetime \
                     port:py${python.version}-psutil \
-                    port:py${python.version}-python2-pythondialog \
                     port:py${python.version}-pyrfc3339 \
                     port:py${python.version}-six \
                     port:py${python.version}-tz \
@@ -39,3 +38,17 @@ post-patch {
     reinplace "s|/etc/|${prefix}/etc/|" ${worksrcpath}/certbot/constants.py
     reinplace "s|/var/lib/|${prefix}/var/db/|" ${worksrcpath}/certbot/constants.py
 }
+
+variant python27 conflicts python36 description {Use Python 2.7} {
+    python.default_version 27
+
+    depends_lib-append  port:py${python.version}-python2-pythondialog
+}
+
+variant python36 conflicts python27 description {Use Python 3.6} {
+    python.default_version 36
+}
+
+if {![variant_isset python36]} {
+    default_variants +python27
+}