Revision: 145072 https://trac.macports.org/changeset/145072 Author: dstrubbe@macports.org Date: 2016-01-25 07:58:37 -0800 (Mon, 25 Jan 2016) Log Message: ----------- wgrib2: use the compilers portgroup more fully and be simpler. (Maintainer timeout, ticket #50374) Modified Paths: -------------- trunk/dports/science/wgrib2/Portfile Modified: trunk/dports/science/wgrib2/Portfile =================================================================== --- trunk/dports/science/wgrib2/Portfile 2016-01-25 15:56:12 UTC (rev 145071) +++ trunk/dports/science/wgrib2/Portfile 2016-01-25 15:58:37 UTC (rev 145072) @@ -62,39 +62,31 @@ build.args "-f makefile \ zlib=\"\" plib=\"\" jlib=\"\" h5lib=\"\" n4lib=\"\" " -set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9} -set fsymbol "" -if {[fortran_variant_isset]} { - set iip "-I${ip}" - set libs "${lg2c} ${lgctpc} ${lipolate}" - build.args-append USE_IPOLATES=1 - if {[variant_isset g95]} { - set fsymbol -DG95 - configure.fc ${prefix}/bin/g95 - set libs "${libs} -lf95" - } else { - set fsymbol -DGFORTRAN - build.args-append USE_OPENMP=1 - foreach ver ${gcc_versions} { - set ver_no_dot [join [split ${ver} "."] ""] - if {[variant_isset gcc${ver_no_dot}]} { - configure.fc ${prefix}/bin/gfortran-mp-${ver} - set libs "${libs} -L${prefix}/lib/gcc${ver_no_dot} -lgfortran" - } +pre-build { + set fsymbol "" + if {[fortran_variant_isset]} { + set iip "-I${ip}" + set libs "${lg2c} ${lgctpc} ${lipolate} ${compilers.libfortran}" + build.args-append USE_IPOLATES=1 + if {[variant_isset g95]} { + set fsymbol -DG95 + } else { + set fsymbol -DGFORTRAN + build.args-append USE_OPENMP=1 } + build.env FC=\"${configure.fc}\" \ + F90=\"${configure.fc}\" \ + FFLAGS=\"${configure.fflags}\" + } else { + set iip "" + set libs "${lg2c} ${lgctpc}" } - build.env FC=\"${configure.fc}\" \ - F90=\"${configure.fc}\" \ - FFLAGS=\"${configure.fflags}\" -} else { - set iip "" - set libs "${lg2c} ${lgctpc}" + build.env-append LDFLAGS=\"${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\" \ + CC=\"${configure.cc}\" \ + CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \ + CFLAGS=\"${cflags}\" + build.args-append iip=\"${iip}\" } -build.env-append LDFLAGS=\"${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\" \ - CC=\"${configure.cc}\" \ - CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \ - CFLAGS=\"${cflags}\" -build.args-append iip=\"${iip}\" destroot { xinstall -m 644 ${g2c}/grib2.h ${destroot}${prefix}/include