[110831] trunk/dports/math/qrupdate/Portfile

[mojca at macports.org]

Revision: 110831
          https://trac.macports.org/changeset/110831
Author:   mojca at macports.org
Date:     2013-09-07 00:49:56 -0700 (Sat, 07 Sep 2013)
Log Message:
-----------
qrupdate: remove obsolete no_atlas, add gcc49, make gcc48 default (its dependency octave defaults to gcc48)

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

Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile	2013-09-07 07:22:42 UTC (rev 110830)
+++ trunk/dports/math/qrupdate/Portfile	2013-09-07 07:49:56 UTC (rev 110831)
@@ -1,7 +1,7 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem			1.0
+PortSystem          1.0
 PortGroup           muniversal 1.0
 
 name                qrupdate
@@ -13,8 +13,7 @@
 license             GPL-3+
 maintainers         nomaintainer
 description         library for fast updates of QR and Cholesky decompositions
-long_description \
-    a Fortran library for fast updates of QR and Cholesky decompositions
+long_description    a Fortran library for fast updates of QR and Cholesky decompositions
 homepage            http://sourceforge.net/projects/${name}/
 platforms           darwin
 master_sites        sourceforge:project/qrupdate/qrupdate/${branch}
@@ -64,9 +63,6 @@
     }
 }
 
-
-variant no_atlas description {Legacy compatibility variant} {}
-
 variant atlas description {build with atlas instead of Accelerate framework} {
     depends_lib-append      port:atlas
     build.args-append       BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack"
@@ -79,14 +75,14 @@
     test.args-append        BLAS="-framework Accelerate" LAPACK="-framework Accelerate"
 }
 
-if {[variant_isset g95] || [variant_isset no_atlas]} {
+if {[variant_isset g95]} {
     default_variants -atlas
 } else {
     default_variants +atlas
 }
 
 
-variant g95 conflicts gcc45 gcc46 gcc47 gcc48 universal description {build with g95} {
+variant g95 conflicts gcc45 gcc46 gcc47 gcc48 gcc49 universal description {build with g95} {
     depends_build-append    port:g95
     post-patch {
         reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
@@ -94,7 +90,7 @@
     }
 }
 
-variant gcc45 conflicts g95 gcc46 gcc47 gcc48 universal description {build with gcc45 fortran} {
+variant gcc45 conflicts g95 gcc46 gcc47 gcc48 gcc49 universal description {build with gcc45 fortran} {
     depends_lib-append    path:lib/libgcc/libgcc_s.1.dylib:libgcc
     depends_build-append  port:gcc45
     post-patch {
@@ -102,7 +98,7 @@
     }
 }
 
-variant gcc46 conflicts g95 gcc45 gcc47 gcc48 description {build with gcc46 fortran} {
+variant gcc46 conflicts g95 gcc45 gcc47 gcc48 gcc49 description {build with gcc46 fortran} {
     depends_lib-append    path:lib/libgcc/libgcc_s.1.dylib:libgcc
     depends_build-append  port:gcc46
     post-patch {
@@ -110,7 +106,7 @@
     }
 }
 
-variant gcc47 conflicts g95 gcc45 gcc46 gcc48 description {build with gcc47 fortran} {
+variant gcc47 conflicts g95 gcc45 gcc46 gcc48 gcc49 description {build with gcc47 fortran} {
     depends_lib-append    path:lib/libgcc/libgcc_s.1.dylib:libgcc
     depends_build-append  port:gcc47
     post-patch {
@@ -118,7 +114,7 @@
     }
 }
 
-variant gcc48 conflicts g95 gcc45 gcc46 gcc47 description {build with gcc48 fortran} {
+variant gcc48 conflicts g95 gcc45 gcc46 gcc47 gcc49 description {build with gcc48 fortran} {
     depends_lib-append    path:lib/libgcc/libgcc_s.1.dylib:libgcc
     depends_build-append  port:gcc48
     post-patch {
@@ -126,10 +122,18 @@
     }
 }
 
-if {![variant_isset gcc45] && ![variant_isset gcc46] \
-        && ![variant_isset g95] && ![variant_isset gcc48]} {
-	default_variants +gcc47
+variant gcc49 conflicts g95 gcc45 gcc46 gcc47 gcc48 description {build with gcc49 fortran} {
+    depends_lib-append    path:lib/libgcc/libgcc_s.1.dylib:libgcc
+    depends_build-append  port:gcc49
+    post-patch {
+        reinplace "s|gfortran|gfortran-mp-4.9|" ${worksrcpath}/Makeconf
+    }
 }
 
+if {![variant_isset g95]   && ![variant_isset gcc45] && \
+    ![variant_isset gcc46] && ![variant_isset gcc47] && \
+    ![variant_isset gcc48] && ![variant_isset gcc49]} {
+    default_variants-append +gcc48
+}
 
 test.run yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130907/dab55c40/attachment.html>