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

[sean at macports.org]

Revision: 121949
          https://trac.macports.org/changeset/121949
Author:   sean at macports.org
Date:     2014-07-11 22:24:36 -0700 (Fri, 11 Jul 2014)
Log Message:
-----------
octave: use compilers port group

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

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2014-07-12 01:57:57 UTC (rev 121948)
+++ trunk/dports/math/octave/Portfile	2014-07-12 05:24:36 UTC (rev 121949)
@@ -4,7 +4,11 @@
 PortSystem          1.0
 PortGroup           active_variants 1.1
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           compilers 1.0
 
+compilers.choose    fc f77 f90
+compilers.setup     require_fortran
+
 name                octave
 
 version             3.6.4
@@ -134,93 +138,10 @@
     }
 }
 
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set gcc_default "4.8"
-
-# create g95 variant, with full conflicts of GCC versions
-
-set gcc_conflicts ""
-foreach ver ${gcc_versions} {
-    set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
-    set gcc_conflicts "${gcc_conflicts} ${gcc_ver_no_dot}"
+if {![fortran_variant_isset]} {
+    default_variants-append +gcc48
 }
 
-eval [subst {
-    variant g95 conflicts ${gcc_conflicts} requires accelerate \
-        description "Build with MacPorts g95 as the Fortran Compiler" {
-            depends_lib-append port:g95
-            configure.fc ${prefix}/bin/g95
-            configure.f77 ${prefix}/bin/g95
-            configure.f90 ${prefix}/bin/g95
-        }
-}]
-
-# create GCC variants, with partial conflicts of other GCC versions
-
-foreach ver1 ${gcc_versions} {
-
-    set gcc_ver1_no_dot gcc[join [split ${ver1} "."] ""]
-
-    set gcc_conflicts "conflicts g95"
-    foreach ver2 ${gcc_versions} {
-        if {${ver1} eq ${ver2}} {
-            continue
-        }
-        set gcc_ver2_no_dot gcc[join [split ${ver2} "."] ""]
-        set gcc_conflicts "${gcc_conflicts} ${gcc_ver2_no_dot}"
-    }
-
-    eval [subst {
-        variant ${gcc_ver1_no_dot} ${gcc_conflicts} \
-            description "Build with the MacPorts ${gcc_ver1_no_dot} as the Fortran Compiler" {
-                depends_lib-append port:${gcc_ver1_no_dot}
-                configure.fc  ${prefix}/bin/gfortran-mp-${ver1}
-                configure.f77 ${prefix}/bin/gfortran-mp-${ver1}
-                configure.f90 ${prefix}/bin/gfortran-mp-${ver1}
-            }
-    }]
-}
-
-# check for setting the default variant
-
-set var_selection ""
-if {[variant_isset g95]} {
-    set var_selection "g95"
-} else {
-    foreach ver ${gcc_versions} {
-        set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
-        if {[variant_isset ${gcc_ver_no_dot}]} {
-            set var_selection "${gcc_ver_no_dot}"
-        }
-    }
-}
-
-# check for need for default variant
-
-set gcc_default_no_dot gcc[join [split ${gcc_default} "."] ""]
-if {"${var_selection}" eq ""} {
-    default_variants +${gcc_default_no_dot}
-}
-
-# check if the user disabled just the default variant
-
-set var_selection ""
-if {[variant_isset g95]} {
-    set var_selection "g95"
-} else {
-    foreach ver ${gcc_versions} {
-        set gcc_ver_no_dot gcc[join [split ${ver} "."] ""]
-        if {[variant_isset ${gcc_ver_no_dot}]} {
-            set var_selection "${gcc_ver_no_dot}"
-        }
-    }
-}
-
-if {"${var_selection}" eq ""} {
-    ui_error "\n\nYou cannot use the -${gcc_default_no_dot} variant alone; a Fortran compiler is required.\n"
-    return -code error "Invalid variant selection"
-}
-
 # atlas does not work with g95, so always conflict with it
 
 variant atlas description {use BLAS from MacPorts' atlas port} \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140711/424138d9/attachment-0001.html>