[110168] trunk/dports

jeremyhu at macports.org jeremyhu at macports.org
Tue Aug 27 12:41:46 PDT 2013


Revision: 110168
          https://trac.macports.org/changeset/110168
Author:   jeremyhu at macports.org
Date:     2013-08-27 12:41:46 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
multiple: Update python recipe to fix conflicts

Modified Paths:
--------------
    trunk/dports/math/blitz/Portfile
    trunk/dports/math/blitz-devel/Portfile
    trunk/dports/math/fftw/Portfile
    trunk/dports/math/fftw-3/Portfile
    trunk/dports/math/fftw-single/Portfile
    trunk/dports/math/octave/Portfile
    trunk/dports/math/shogun/Portfile
    trunk/dports/python/py26-ngl/Portfile
    trunk/dports/python/py26-nio/Portfile
    trunk/dports/science/ast/Portfile
    trunk/dports/science/bali-phy/Portfile
    trunk/dports/science/jags/Portfile
    trunk/dports/science/mpich/Portfile
    trunk/dports/science/ncarg/Portfile
    trunk/dports/science/openmpi/Portfile
    trunk/dports/science/pdb2pqr/Portfile
    trunk/dports/science/scotch/Portfile

Modified: trunk/dports/math/blitz/Portfile
===================================================================
--- trunk/dports/math/blitz/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/blitz/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -37,24 +37,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -62,7 +65,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/math/blitz-devel/Portfile
===================================================================
--- trunk/dports/math/blitz-devel/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/blitz-devel/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -54,24 +54,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -79,7 +82,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/math/fftw/Portfile
===================================================================
--- trunk/dports/math/fftw/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/fftw/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -52,24 +52,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -77,7 +80,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/fftw-3/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -180,24 +180,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -205,7 +208,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/math/fftw-single/Portfile
===================================================================
--- trunk/dports/math/fftw-single/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/fftw-single/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -62,24 +62,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -87,7 +90,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/octave/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -157,24 +157,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -182,7 +185,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/math/shogun/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -72,7 +72,7 @@
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
@@ -80,9 +80,12 @@
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""

Modified: trunk/dports/python/py26-ngl/Portfile
===================================================================
--- trunk/dports/python/py26-ngl/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/python/py26-ngl/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -49,24 +49,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -74,7 +77,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/python/py26-nio/Portfile
===================================================================
--- trunk/dports/python/py26-nio/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/python/py26-nio/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -53,24 +53,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -78,7 +81,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/science/ast/Portfile
===================================================================
--- trunk/dports/science/ast/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/ast/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -29,7 +29,7 @@
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
@@ -37,9 +37,12 @@
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""

Modified: trunk/dports/science/bali-phy/Portfile
===================================================================
--- trunk/dports/science/bali-phy/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/bali-phy/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -71,7 +71,7 @@
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
@@ -79,9 +79,12 @@
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""

Modified: trunk/dports/science/jags/Portfile
===================================================================
--- trunk/dports/science/jags/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/jags/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -35,7 +35,7 @@
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
@@ -43,9 +43,12 @@
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""

Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/mpich/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -111,24 +111,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -136,7 +139,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/ncarg/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -223,24 +223,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -248,7 +251,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/science/openmpi/Portfile
===================================================================
--- trunk/dports/science/openmpi/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/openmpi/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -86,24 +86,27 @@
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
-
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
             continue
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
@@ -111,7 +114,7 @@
     }
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {
     if {${default_fortran_variant} != "+g95"} {

Modified: trunk/dports/science/pdb2pqr/Portfile
===================================================================
--- trunk/dports/science/pdb2pqr/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/pdb2pqr/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -58,7 +58,7 @@
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
@@ -66,9 +66,12 @@
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""

Modified: trunk/dports/science/scotch/Portfile
===================================================================
--- trunk/dports/science/scotch/Portfile	2013-08-27 19:34:26 UTC (rev 110167)
+++ trunk/dports/science/scotch/Portfile	2013-08-27 19:41:46 UTC (rev 110168)
@@ -49,7 +49,7 @@
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
     foreach over ${gcc_versions} {
         if {${ver} == ${over}} {
@@ -57,9 +57,12 @@
         }
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+        append variant_line " conflicts gcc${over_no_dot}"
     }
+    append variant_line { {}}
 
+    eval $variant_line
+
     if {[variant_isset gcc${ver_no_dot}]} {
         if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
             set default_fortran_variant ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/c1753f38/attachment-0001.html>


More information about the macports-changes mailing list