[111452] trunk/dports/science/ncarg/Portfile

[takeshi at macports.org]

Revision: 111452
          https://trac.macports.org/changeset/111452
Author:   takeshi at macports.org
Date:     2013-09-22 13:34:55 -0700 (Sun, 22 Sep 2013)
Log Message:
-----------
ncarg: use macports-gcc-4.x to fix a problem to link against lgfortran, closing #40549

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

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2013-09-22 20:26:45 UTC (rev 111451)
+++ trunk/dports/science/ncarg/Portfile	2013-09-22 20:34:55 UTC (rev 111452)
@@ -6,7 +6,7 @@
 
 name                        ncarg
 version                     6.1.2
-revision                    4
+revision                    5
 categories                  science
 maintainers                 takeshi
 license                     {UCAR-Unidata public-domain BSD LGPL-3 GPL-3}
@@ -94,13 +94,10 @@
     if {$build_arch eq "x86_64" || $build_arch eq "ppc64"} {
         reinplace "s|-DUSE_PNG$|-DUSE_PNG -D__64BIT__|" ${workpath}/${g2clib_worksrcdir}/makefile
     }
-    if {[variant_isset g95]} {
-        set fortranlib -lf95
-    } else {
-        set fortranlib  "-L${prefix}/lib/libgcc -lgfortran"
-    } 
     foreach f {Darwin Darwin_Intel} {
-        reinplace "s|-lgfortran|${fortranlib}|" ${worksrcpath}/config/${f}
+        if {[variant_isset g95]} {
+            reinplace "s|-lgfortran|-lf95|" ${worksrcpath}/config/${f}
+        }
         reinplace "s| gfortran$| ${configure.fc}|" ${worksrcpath}/config/${f} 
         reinplace "s|gcc$|${configure.cc}|" ${worksrcpath}/config/${f}
         reinplace "/CcOptions/d" ${worksrcpath}/config/${f}
@@ -270,9 +267,7 @@
         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}
+        configure.compiler macports-gcc-${ver}
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130922/6a523858/attachment-0001.html>