[51055] trunk/dports/science/plplot/Portfile

[takeshi at macports.org]

Revision: 51055
          http://trac.macports.org/changeset/51055
Author:   takeshi at macports.org
Date:     2009-05-16 19:15:12 -0700 (Sat, 16 May 2009)
Log Message:
-----------
plplot: updated handling of conflicts with universal of g95 and gcc43 variants

Modified Paths:
--------------
    trunk/dports/science/plplot/Portfile

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2009-05-17 01:55:48 UTC (rev 51054)
+++ trunk/dports/science/plplot/Portfile	2009-05-17 02:15:12 UTC (rev 51055)
@@ -122,14 +122,11 @@
 if {![variant_isset g95] && ![variant_isset universal]} {
     default_variants +gcc43
 }
-if {[variant_isset g95] || [variant_isset gcc43]} {
-  universal_variant no
-}
-variant gcc43 conflicts g95 description {Build using gcc43 (default)} {
+variant gcc43 conflicts g95 conflicts universal description {Build using gcc43 (default)} {
     depends_lib-append      port:gcc43
     configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.3\"
 }
-variant g95 conflicts gcc43 description {Build using g95} {
+variant g95 conflicts gcc43 conflicts universal description {Build using g95} {
     depends_lib-append      port:g95
     configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/g95\"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090516/75f76c33/attachment.html>