Index: Portfile
===================================================================
--- Portfile	(revision 115639)
+++ Portfile	(working copy)
@@ -46,7 +46,7 @@
     depends_extract     bin:svn:subversion
     depends_skip_archcheck-append ld64 subversion
 
-    default_variants    +analyzer
+    default_variants-append    +analyzer
 }
 
 #fetch.type              svn
@@ -256,6 +256,33 @@
     }
 }
 
+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants-append +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set pythonver 25
+    set pythonverdot 2.5
+    configure.args-append --with-python=${prefix}/bin/python2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set pythonver 26
+    set pythonverdot 2.6
+    configure.args-append --with-python=${prefix}/bin/python2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set pythonver 27
+    set pythonverdot 2.7
+    configure.args-append --with-python=${prefix}/bin/python2.7
+}
+
+
+
 if {${subport} == "llvm-${llvm_version}"} {
     variant ocaml description {Enable generation of OCaml binding} {
         depends_lib-append   port:ocaml
@@ -268,31 +295,6 @@
 } elseif {${subport} == "clang-${llvm_version}"} {
     variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
 
-    set pythonver ""
-    set pythonverdot ""
-
-    if {![variant_isset python25] && ![variant_isset python26]} {
-        default_variants +python27
-    }
-
-    variant python25 conflicts python26 python27 description {Use python 2.5} {
-        set pythonver 25
-        set pythonverdot 2.5
-        configure.args-append --with-python=${prefix}/bin/python2.5
-    }
-
-    variant python26 conflicts python25 python27 description {Use python 2.6} {
-        set pythonver 26
-        set pythonverdot 2.6
-        configure.args-append --with-python=${prefix}/bin/python2.6
-    }
-
-    variant python27 conflicts python25 python26 description {Use python 2.7} {
-        set pythonver 27
-        set pythonverdot 2.7
-        configure.args-append --with-python=${prefix}/bin/python2.7
-    }
-
     variant analyzer description {Install clang static analyzer} {
         if {[string equal "${pythonver}" ""]} {
             ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"