Modified: trunk/dports/science/uhd/Portfile (139906 => 139907)

--- trunk/dports/science/uhd/Portfile	2015-09-01 16:04:11 UTC (rev 139906)
+++ trunk/dports/science/uhd/Portfile	2015-09-01 16:14:57 UTC (rev 139907)
@@ -121,69 +121,36 @@
 
 default_variants +docs +examples +libusb +manual +test +manpages
 
-set PythonVersionNoDot ""
+# select Python to use; default to 2.7
 
-if {${subport} eq "uhd"} {
+variant python27 conflicts python34 description {Build using Python 2.7} {}
+variant python34 conflicts python27 description {Build using Python 3.4} {}
 
-    # for release until 3.8.5+:
-    #
-    # 1) keep +orc around. it has been
-    # deprecated and removed as of 2015-07-01, commit 41812aa2.
+if {![variant_isset python27] && ![variant_isset python34]} {
+    default_variants +python27
+}
 
-    default_variants +orc
+if {![variant_isset python27] && ![variant_isset python34]} {
+    ui_error "\n\nYou must select either the +python27 or +python34 variant.\n"
+    return -code error "Invalid variant selection"
+}
 
-    variant orc description {enable ORC support} {
-        depends_lib-append port:orc
-        configure.args-append -DENABLE_ORC=ON
-    }
-
-    if {![variant_isset orc]} {
-        configure.args-append -DENABLE_ORC=OFF
-    }
-
-    # 2) use Python 2.7 only, and cheetah for templates
-
+set PythonVersionNoDot ""
+if {[variant_isset python27]} {
     set PythonVersionNoDot "27"
-    depends_lib-append \
-        port:py27-cheetah
-
 } else {
-
-    # as of 2015-07-14, commit 4b1034b2: uhd-devel uses mako for
-    # templates, which means it can use Python 2.7 or 3.4.
-
-    variant python27 conflicts python34 description {Build using Python 2.7} {}
-    variant python34 conflicts python27 description {Build using Python 3.4} {}
-
-    if {![variant_isset python27] && ![variant_isset python34]} {
-        default_variants +python27
-    }
-
-    if {![variant_isset python27] && ![variant_isset python34]} {
-        ui_error "\n\nYou must select either the +python27 or +python34 variant.\n"
-        return -code error "Invalid variant selection"
-    }
-
-    if {[variant_isset python27]} {
-        set PythonVersionNoDot "27"
-    } else {
-        set PythonVersionNoDot "34"
-    }
-
-    depends_lib-append \
-        port:py${PythonVersionNoDot}-mako
-
+    set PythonVersionNoDot "34"
 }
-
 set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
 
 # required Python
 
 depends_lib-append \
     port:python${PythonVersionNoDot} \
-    port:py${PythonVersionNoDot}-requests
+    port:py${PythonVersionNoDot}-requests \
+    port:py${PythonVersionNoDot}-mako
 
-# specify that Python version to use
+# specify the Python version to use
 
 set PythonExe "${prefix}/bin/python${PythonVersionWithDot}"