[54116] trunk/dports/math/octave/Portfile

[alakazam at macports.org]

Revision: 54116
          http://trac.macports.org/changeset/54116
Author:   alakazam at macports.org
Date:     2009-07-21 09:40:44 -0700 (Tue, 21 Jul 2009)
Log Message:
-----------
#20103 : Use a common default gcc variant in scientific packages ; use gcc43 as default variant for octave

Modified Paths:
--------------
    trunk/dports/math/octave/Portfile

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2009-07-21 16:11:32 UTC (rev 54115)
+++ trunk/dports/math/octave/Portfile	2009-07-21 16:40:44 UTC (rev 54116)
@@ -73,21 +73,25 @@
 test.run            yes
 test.target         check
 
-variant gcc43 description {builds with the macports gcc43 toolchain} {
-    depends_lib-append  port:gcc43
-    configure.compiler  macports-gcc-4.3
+variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc44 g95 {
+    depends_build-append    port:gcc43
+    configure.compiler      macports-gcc-4.3
 }
 
-variant gcc44 description {builds with the macports gcc44 toolchain} {
-    depends_lib-append  port:gcc44
-    configure.compiler  macports-gcc-4.4
+variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc43 g95 {
+    depends_build-append    port:gcc44
+    configure.compiler      macports-gcc-4.4
 }
 
-if {![variant_isset gcc43] && ![variant_isset gcc44]} {
-    depends_lib-append  port:g95
+variant g95 description {build with g95} conflicts gcc43 gcc44 {
+    depends_build-append    port:g95
     configure.f77       "${prefix}/bin/g95"
 }
 
+if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95] } {
+    default_variants +gcc43
+}
+
 post-patch {
     reinplace "s|-lcholmod|-lcholmod -lmetis|g" ${worksrcpath}/configure
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090721/2413ec61/attachment.html>