Revision: 74449 http://trac.macports.org/changeset/74449 Author: takeshi@macports.org Date: 2010-12-17 16:59:58 -0800 (Fri, 17 Dec 2010) Log Message: ----------- wgrib2: fixed builds w/o a variant. added conflicts to variants Modified Paths: -------------- trunk/dports/science/wgrib2/Portfile Modified: trunk/dports/science/wgrib2/Portfile =================================================================== --- trunk/dports/science/wgrib2/Portfile 2010-12-18 00:50:52 UTC (rev 74448) +++ trunk/dports/science/wgrib2/Portfile 2010-12-18 00:59:58 UTC (rev 74449) @@ -57,27 +57,30 @@ make \ F90=${prefix}/bin/g95; FFLAGS=${configure.fflags}" - set fsymbol -DG95 + set fsymbol DEFS=-DG95 set flibs "-L../iplib -lipolate -lf95" } elseif {[variant_isset gcc44]} { system "cd ${workpath}/grib2/iplib; \ make \ F90=${prefix}/bin/gfortran-mp-4.4; FFLAGS=${configure.fflags}" - set fsymbol -DGFORTRAN + set fsymbol DEFS=-DGFORTRAN set flibs "-L../iplib -lipolate -L${prefix}/lib/gcc45 -lgfortran" } elseif {[variant_isset gcc45]} { system "cd ${workpath}/grib2/iplib; \ make \ F90=${prefix}/bin/gfortran-mp-4.5; FFLAGS=${configure.fflags}" - set fsymbol -DGFORTRAN + set fsymbol DEFS=-DGFORTRAN set flibs "-L../iplib -lipolate -L${prefix}/lib/gcc45 -lgfortran" + } else { + set fsymbol "" + set flibs "" } system "cd ${workpath}/grib2/${name}; \ make -f makefile ${name} \ CC=\"${configure.cc}\" \ - DEFS=\"${fsymbol}\" \ + ${fsymbol} \ CFLAGS=\"-I../g2clib-${version_g2clib} -I${prefix}/include ${cppflags} ${cflags}\" \ LDFLAGS=\"-L../g2clib-${version_g2clib} -L${prefix}/lib ${ldflags} \ -lgrib2c -ljasper -lpng -lnetcdf -lhdf5_hl -lhdf5 -lz -lsz -lcurl -lidn -lssl -lcrypto ${flibs}\" " @@ -89,14 +92,14 @@ xinstall -m 755 ${worksrcpath}/../${name}/${name} ${destroot}${prefix}/bin } -variant g95 description {build iplib with g95 (alpha)} { +variant g95 conflicts gcc44 gcc45 description {build iplib with g95 (alpha)} { depends_build-append port:g95 } -variant gcc44 description {build iplib with gcc44 (alpha)} { +variant gcc44 conflicts g95 gcc45 description {build iplib with gcc44 (alpha)} { depends_build-append port:gcc44 } -variant gcc45 description {build iplib with gcc45 (alpha)} { +variant gcc45 conflicts g95 gcc44 description {build iplib with gcc45 (alpha)} { depends_build-append port:gcc45 }