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

[takeshi at macports.org]

Revision: 124290
          https://trac.macports.org/changeset/124290
Author:   takeshi at macports.org
Date:     2014-08-22 00:29:46 -0700 (Fri, 22 Aug 2014)
Log Message:
-----------
ncarg: fix builds when hdf5 is built with a MPI variant, addressing #43426

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

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2014-08-22 07:18:47 UTC (rev 124289)
+++ trunk/dports/science/ncarg/Portfile	2014-08-22 07:29:46 UTC (rev 124290)
@@ -2,11 +2,12 @@
 # $Id$
 
 PortSystem                  1.0
-PortGroup                   conflicts_build 1.0
-PortGroup                   compilers 1.0
+PortGroup                   active_variants 1.1
+PortGroup                   mpi 1.0
 
 compilers.choose            fc f77 f90 cc
 compilers.setup             -clang -dragonegg -gfortran -llvm
+mpi.setup
 
 name                        ncarg
 version                     6.2.0
@@ -62,6 +63,11 @@
 use_parallel_build          no
 universal_variant           no
 
+set v [mpi_active_variant_name port:hdf5]
+if {${v} != "" } { 
+    default_variants +${v}
+}
+
 pre-fetch {
     if {![file exists ${distpath}/${distname}${extract.suffix}]} {
         xinstall -d ${distpath}
@@ -120,8 +126,8 @@
         reinplace "/ArchRecLibSearch/d" ${worksrcpath}/config/${f}
         reinplace "/ArchRecIncSearch/d" ${worksrcpath}/config/${f}
         reinplace "s|-lXext$|-lXext\\
-#define ArchRecLibSearch    -L${prefix}/lib\\
-#define ArchRecIncSearch    -I${prefix}/include\\
+#define ArchRecLibSearch    ${configure.ldflags} \\
+#define ArchRecIncSearch    ${configure.cppflags} \\
 #define CcOptions -fPIC -ansi -D_DARWIN_C_SOURCE \\
 #define COptimizeFlag ${configure.cflags}\\
 #define FOptimizeFlag ${configure.fflags}\\
@@ -242,20 +248,7 @@
     configure.fflags-append -fno-second-underscore
 }
 
-## ncarg fails to build some binaries with xnu-headers installed 
-## See #38687
-# seems it works with xnu-headers installed
-#if {[variant_isset g95]} {
-#    conflicts_build-append xnu-headers
-#}
-
 variant accelerate description {use Accelerate.framework} {
-# use of -ff2c implies -fsecond-underscore and 
-# breaks the linkage between nfp (C) and nfpfort (Fortran).
-# Moreover dotwrp should not require -ff2c
-#    if {![variant_isset g95]} {
-#        configure.fflags-append -ff2c
-#    }
     if {[variant_isset g95] || ([string match *64* $build_arch] && ${os.major} >= 10)} {
         depends_lib-append      port:dotwrp
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140822/e3ab7e03/attachment.html>