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

[ram at macports.org]

Revision: 101475
          https://trac.macports.org/changeset/101475
Author:   ram at macports.org
Date:     2013-01-11 09:40:04 -0800 (Fri, 11 Jan 2013)
Log Message:
-----------
math/octave: revert r101472 and r101467, needs more testing

Revision Links:
--------------
    https://trac.macports.org/changeset/101472
    https://trac.macports.org/changeset/101467

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

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2013-01-11 17:34:02 UTC (rev 101474)
+++ trunk/dports/math/octave/Portfile	2013-01-11 17:40:04 UTC (rev 101475)
@@ -109,40 +109,30 @@
     }
 }
 
-variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc44 gcc45 gcc46 gcc47 g95 {
+variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc44 gcc45 g95 {
     depends_build-append    port:gcc43
     configure.compiler      macports-gcc-4.3
 }
 
-variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc43 gcc45 gcc46 gcc47 g95 {
+variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc43 gcc45 g95 {
     depends_build-append    port:gcc44
     configure.compiler      macports-gcc-4.4
 }
 
-variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc43 gcc44 gcc46 gcc47 g95 {
+variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc43 gcc44 g95 {
     depends_build-append    port:gcc45
     configure.compiler      macports-gcc-4.5
 }
 
-variant gcc46 description {build with the macports gcc45 toolchain} conflicts gcc43 gcc44 gcc45 gcc47 g95 {
-    depends_build-append    port:gcc46
-    configure.compiler      macports-gcc-4.6
-}
-
-variant gcc47 description {build with the macports gcc45 toolchain} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
-    depends_build-append    port:gcc47
-    configure.compiler      macports-gcc-4.7
-}
-
-variant g95 description {build with g95} requires accelerate conflicts atlas gcc43 gcc44 gcc45 gcc46 gcc47 {
+variant g95 description {build with g95} requires accelerate conflicts atlas gcc43 gcc44 gcc45 {
     depends_build-append    port:g95
     configure.f77       "${prefix}/bin/g95"
 }
 
-if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset g95] } {
+if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95] } {
     default_variants +gcc45
 }
-if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset g95]} {
+if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset g95]} {
     pre-fetch {
         return -code error "You must use one of the compiler variants."
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130111/b5280f00/attachment.html>