Ticket #53302: Portfile.diff

Portfile

@@ -175 +175 @@
 
     if {[variant_isset python27]} {
         set PYTHON_VERSION_WITH_DOT "2.7"
-    } else {
+    } elseif {[variant_isset python34]} {
         set PYTHON_VERSION_WITH_DOT "3.4"
+    } elseif {[variant_isset python35]} {
+        set PYTHON_VERSION_WITH_DOT "3.5"
+    } else {
+        set PYTHON_VERSION_WITH_DOT "3.6"
     }
     reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
 }
@@ -276 +280 @@
         --sphinx-html
 }
 
-variant python27 conflicts python34 requires docs description {Build documentation using Sphinx from Python 2.7} {
+variant python27 conflicts python34 python35 python36 requires docs description {Build documentation using Sphinx from Python 2.7} {
     depends_build-append port:py27-sphinx
     configure.args-append \
         --sphinx-build=${prefix}/bin/sphinx-build-2.7
 }
 
-variant python34 conflicts python27 requires docs description {Build documentation using Sphinx from Python 3.4} {
+variant python34 conflicts python27 python35 python36 requires docs description {Build documentation using Sphinx from Python 3.4} {
     depends_build-append port:py34-sphinx
     configure.args-append \
         --sphinx-build=${prefix}/bin/sphinx-build-3.4
 }
 
+variant python35 conflicts python27 python34 python36 requires docs description {Build documentation using Sphinx from Python 3.5} {
+    depends_build-append port:py35-sphinx
+    configure.args-append \
+        --sphinx-build=${prefix}/bin/sphinx-build-3.5
+}
+
+variant python36 conflicts python27 python34 python35 requires docs description {Build documentation using Sphinx from Python 3.6} {
+    depends_build-append port:py36-sphinx
+    configure.args-append \
+        --sphinx-build=${prefix}/bin/sphinx-build-3.6
+}
+
 if {[variant_isset docs]} {
-    if {![variant_isset python27] && ![variant_isset python34]} {
+    if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
         default_variants +python27
     }
 
-    if {![variant_isset python27] && ![variant_isset python34]} {
-        ui_error "\n\nYou must select either the +python27 or +python34 variant when using variant +docs.\n"
+    if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
+        ui_error "\n\nYou must select either the +python27, +python34, +python35, or +python36 variant when using variant +docs.\n"
         return -code error "Invalid variant selection"
     }
 }