[103536] trunk/dports/math/octave-devel/Portfile

[michaelld at macports.org]

Revision: 103536
          https://trac.macports.org/changeset/103536
Author:   michaelld at macports.org
Date:     2013-02-28 07:17:04 -0800 (Thu, 28 Feb 2013)
Log Message:
-----------
octave-devel :
* add license;
* add +gcc48, and related conflicts and checks;
* fix typos, whitespace;
* change default to +gcc47.

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

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2013-02-28 15:00:02 UTC (rev 103535)
+++ trunk/dports/math/octave-devel/Portfile	2013-02-28 15:17:04 UTC (rev 103536)
@@ -9,7 +9,9 @@
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
+license             GPL-3
 platforms           darwin
+
 description         a Matlab-like environment for numerical analysis
 long_description    Octave provides a convenient command line interface \
                     for solving linear and nonlinear problems numerically, \
@@ -114,17 +116,19 @@
 }
 
 
-variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc47 gcc46 gcc45 gcc44 g95 {}
+variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc48 gcc47 gcc46 gcc45 gcc44 g95 {}
 
-variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc47 gcc46 gcc45 gcc43 g95 {}
+variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc48 gcc47 gcc46 gcc45 gcc43 g95 {}
 
-variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc47 gcc46 gcc44 gcc43 g95 {}
+variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc48 gcc47 gcc46 gcc44 gcc43 g95 {}
 
-variant gcc46 description {build with the macports gcc45 toolchain} conflicts gcc47 gcc45 gcc44 gcc43 g95 {}
+variant gcc46 description {build with the macports gcc46 toolchain} conflicts gcc48 gcc47 gcc45 gcc44 gcc43 g95 {}
 
-variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc45 gcc46 gcc44 gcc43 g95 {}
+variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc48 gcc46 gcc45 gcc44 gcc43 g95 {}
 
-variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 {
+variant gcc48 description {build with the macports gcc48 toolchain} conflicts gcc47 gcc46 gcc45 gcc44 gcc43 g95 {}
+
+variant g95 description {build with g95} conflicts gcc48 gcc47 gcc46 gcc45 gcc44 gcc43 {
     depends_build-append    port:g95
     configure.f77           "${prefix}/bin/g95"
 }
@@ -148,16 +152,21 @@
 # check for GCC / G95 variants.  The default here must match the
 # default found in the 'atlas' port (but, this is not checked for).
 
-# check for setting the default variant (gcc44)
-if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
-         ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset g95] } {
-    default_variants +gcc45
+# check for setting the default variant (gcc47)
+
+if {     ![variant_isset gcc43] && ![variant_isset gcc44] && \
+         ![variant_isset gcc45] && ![variant_isset gcc46] && \
+         ![variant_isset gcc47] && ![variant_isset gcc48] && \
+         ![variant_isset g95] } {
+    default_variants +gcc47
 }
 
-# check if the user disabled just the default variant: -gcc44
-if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
+# check if the user disabled just the default variant: -gcc47
+
+if {     ![variant_isset gcc43] && ![variant_isset gcc44] && \
          ![variant_isset gcc45] && ![variant_isset gcc46] && \
-         ![variant_isset gcc47] && ![variant_isset g95] } {
+         ![variant_isset gcc47] && ![variant_isset gcc48] && \
+         ![variant_isset g95] } {
     pre-fetch {
         error "You must select one of the compiler variants."
     }
@@ -174,6 +183,8 @@
     set gcc_version "4.6"
 } elseif {[variant_isset gcc47]} {
     set gcc_version "4.7"
+} elseif {[variant_isset gcc48]} {
+    set gcc_version "4.8"
 }
 
 if {${gcc_version} != ""} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130228/054c0824/attachment.html>