certbot-apache, certbot-nginx: fix dependencies

See: e91b3d5

security/certbot-apache/Portfile

@@ -5,7 +5,7 @@ PortGroup           active_variants 1.1
 PortGroup           python 1.0
 
 name                certbot-apache
-version             0.33.1
+version             0.33.0
 revision            0
 categories          security
 license             Apache-2
@@ -18,9 +18,17 @@ master_sites        pypi:c/certbot-apache
 
 python.versions     27 36 37
 
-checksums           rmd160  e03727bc160bf2ffd2bf15a1927b65dc3150ea3c \
-                    sha256  659db7335d919fee52ae707567994e13c31ed25109c94b246c60c97d21c46f3a \
-                    size    182811
+checksums           rmd160  dee97fe0d089e33270cc71a2896c217e65285d5c \
+                    sha256  406764e0b31f7c764ac721a3e308902aefe169fc2ed229c06141fafc2173059d \
+                    size    178115
+
+if {[variant_isset python37]} {
+    python.default_version 37
+} elseif {[variant_isset python36]} {
+    python.default_version 36
+} else {
+    python.default_version 27
+}
 
 depends_lib-append  port:certbot \
                     port:py${python.version}-acme \
@@ -31,19 +39,12 @@ depends_lib-append  port:certbot \
                     port:py${python.version}-mock
 
 variant python27 conflicts python36 python37 description {Use Python 2.7} {
-    python.default_version     27
-    require_active_variants    certbot python27
+    depends_lib-append  port:py${python.version}-python2-pythondialog
 }
 
-variant python36 conflicts python27 python37 description {Use Python 3.6} {
-    python.default_version     36
-    require_active_variants    certbot python36
-}
+variant python36 conflicts python27 python37 description {Use Python 3.6} {}
 
-variant python37 conflicts python27 python36 description {Use Python 3.7} {
-    python.default_version     37
-    require_active_variants    certbot python37
-}
+variant python37 conflicts python27 python36 description {Use Python 3.7} {}
 
 if {![variant_isset python36] && ![variant_isset python37]} {
     default_variants +python27

security/certbot-nginx/Portfile

@@ -5,7 +5,7 @@ PortGroup           active_variants 1.1
 PortGroup           python 1.0
 
 name                certbot-nginx
-version             0.33.1
+version             0.33.0
 revision            0
 categories          security
 license             Apache-2
@@ -18,9 +18,17 @@ master_sites        pypi:c/certbot-nginx
 
 python.versions     27 36 37
 
-checksums           rmd160  7a4838b7d8e6717ea77431ffc6794b9660a1ec16 \
-                    sha256  b3201eee03be74fc743c21c721d3b5586c3323db63e78b68583a6250ad680cff \
-                    size    75629
+checksums           rmd160  c28d82490808239864ee665ca05342b21d3b9f31 \
+                    sha256  1469539412dfc06b8009ca3f509256cada5793694f3146b2e634a520361d42d5 \
+                    size    75872
+
+if {[variant_isset python37]} {
+    python.default_version 37
+} elseif {[variant_isset python36]} {
+    python.default_version 36
+} else {
+    python.default_version 27
+}
 
 depends_lib-append  port:certbot \
                     port:py${python.version}-acme \
@@ -35,19 +43,12 @@ post-patch {
 }
 
 variant python27 conflicts python36 python37 description {Use Python 2.7} {
-    python.default_version     27
-    require_active_variants    certbot python27
+    depends_lib-append  port:py${python.version}-python2-pythondialog
 }
 
-variant python36 conflicts python27 python37 description {Use Python 3.6} {
-    python.default_version     36
-    require_active_variants    certbot python36
-}
+variant python36 conflicts python27 python37 description {Use Python 3.6} {}
 
-variant python37 conflicts python27 python36 description {Use Python 3.7} {
-    python.default_version     37
-    require_active_variants    certbot python37
-}
+variant python37 conflicts python27 python36 description {Use Python 3.7} {}
 
 if {![variant_isset python36] && ![variant_isset python37]} {
     default_variants +python27