[126034] trunk/dports/science/cdf

[ryandesign at macports.org]

Revision: 126034
          https://trac.macports.org/changeset/126034
Author:   ryandesign at macports.org
Date:     2014-10-02 06:01:30 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
cdf: update to 3.5.0.2; switch gcc variants to fortran recipe; add gcc49 variant and make it the default

Modified Paths:
--------------
    trunk/dports/science/cdf/Portfile

Removed Paths:
-------------
    trunk/dports/science/cdf/files/

Modified: trunk/dports/science/cdf/Portfile
===================================================================
--- trunk/dports/science/cdf/Portfile	2014-10-02 12:45:46 UTC (rev 126033)
+++ trunk/dports/science/cdf/Portfile	2014-10-02 13:01:30 UTC (rev 126034)
@@ -5,7 +5,7 @@
 
 name                    cdf
 epoch                   1
-version                 3.5.0.1
+version                 3.5.0.2
 set my_branch           [join [lrange [split ${version} .] 0 1] ""]
 set my_version          ${my_branch}_[join [lrange [split ${version} .] 2 end] "_"]
 set my_short_version    ${my_branch}_[lindex [split ${version} .] 2]
@@ -22,17 +22,16 @@
                         discipline independent fashion.
 
 homepage                http://cdf.gsfc.nasa.gov/
-master_sites            http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/${name}${my_short_version}/unix/
+master_sites            http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/${name}${my_version}/unix/
 
-# The 3.5.0.1 distfile is named to look like 3.5.0; not sure if this is going to be a trend.
 dist_subdir             ${name}/${version}_0
 
 fetch.use_epsv          no
 distname                ${name}${my_short_version}-dist
 extract.suffix          -all${extract.suffix}
 
-checksums               rmd160  8722b0aaca47ba82026439ab81ac35f0bf237d58 \
-                        sha256  68c871c07fe56405e3ec9720d446b5902f21a1901a288249039c7935b2a12c16
+checksums               rmd160  114bb5fa7847d73d2089ca88826c9d799fc0f578 \
+                        sha256  af55e6e69ecdc0d89151a3bb61d7d01d6a9393a998970dd3eeea3a6b642d61b6
 
 depends_lib             port:ncurses
 
@@ -98,28 +97,48 @@
     move ${destroot}${prefix}/CDFLeapSeconds.txt ${docdir}
 }
 
-variant gcc44 conflicts gcc45 gcc46 gcc47 gcc48 description {Use gcc44} {
-    configure.compiler  macports-gcc-4.4
-}
+set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9}
+set default_fortran_variant +gcc49
 
-variant gcc45 conflicts gcc44 gcc46 gcc47 gcc48 description {Use gcc45} {
-    configure.compiler  macports-gcc-4.5
-}
+foreach ver ${gcc_versions} {
+    set ver_no_dot [join [split ${ver} "."] ""]
 
-variant gcc46 conflicts gcc44 gcc45 gcc47 gcc48 description {Use gcc46} {
-    configure.compiler  macports-gcc-4.6
-}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
 
-variant gcc47 conflicts gcc44 gcc45 gcc46 gcc48 description {Use gcc47} {
-    configure.compiler  macports-gcc-4.7
+    foreach over ${gcc_versions} {
+        if {${ver} == ${over}} {
+            continue
+        }
+
+        set over_no_dot [join [split ${over} "."] ""]
+        append variant_line " conflicts gcc${over_no_dot}"
+    }
+    append variant_line { {}}
+
+    eval $variant_line
+
+    if {[variant_isset gcc${ver_no_dot}]} {
+        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+            set default_fortran_variant ""
+        }
+    }
 }
 
-variant gcc48 conflicts gcc44 gcc45 gcc46 gcc47 description {Use gcc48} {
-    configure.compiler  macports-gcc-4.8
+if {${default_fortran_variant} != ""} {
+    default_variants-append "${default_fortran_variant}"
 }
 
-if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48]} {
-    default_variants    +gcc48
+foreach ver ${gcc_versions} {
+    set ver_no_dot [join [split ${ver} "."] ""]
+
+    if {[variant_isset gcc${ver_no_dot}]} {
+        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+        depends_build-append port:gcc${ver_no_dot}
+
+        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
+        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+    }
 }
 
 livecheck.type          regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141002/9ac83bdc/attachment.html>