Revision: 108597 https://trac.macports.org/changeset/108597 Author: takeshi@macports.org Date: 2013-07-27 04:33:27 -0700 (Sat, 27 Jul 2013) Log Message: ----------- wgrib2: updated for 1.9.8. added gcc48 variant Modified Paths: -------------- trunk/dports/science/wgrib2/Portfile trunk/dports/science/wgrib2/files/patch-makefile.diff Modified: trunk/dports/science/wgrib2/Portfile =================================================================== --- trunk/dports/science/wgrib2/Portfile 2013-07-27 08:47:58 UTC (rev 108596) +++ trunk/dports/science/wgrib2/Portfile 2013-07-27 11:33:27 UTC (rev 108597) @@ -4,8 +4,7 @@ PortSystem 1.0 name wgrib2 -version 1.9.6a -revision 6 +version 1.9.8 platforms darwin maintainers takeshi license public-domain @@ -16,11 +15,11 @@ distname ${name}_nolib.tgz.v${version} extract.suffix set version_iplib 2012 -set version_g2clib 1.2.1 -checksums md5 c9d383552210070c5df3115a806c0f66 \ - sha1 7ce6f34677b73d32f1504f86fac31184c6c611e9 \ - rmd160 e7627292152c74251e684d2529adbe382a8c138e -homepage http://www.cpc.noaa.gov/products/wesley/wgrib2/ +set version_g2clib 1.4.0 +checksums md5 6341cee894656ef41c8d964a53af2070 \ + sha1 ff845f3b6996e7e6449e422153d47c1495274eb7 \ + rmd160 af24bf99e2dc703419d48cc7bbb681a9655b0a58 +homepage http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/ long_description \ wgrib2 is a swiss army knife for grib2 files. \ GRIB-2 has arrived and has begun replacing the the older standard GRIB-1. \ @@ -33,9 +32,7 @@ worksrcdir grib2 -patchfiles patch-dec_png.c.diff \ - patch-enc_png.c.diff \ - patch-makefile.diff +patchfiles patch-makefile.diff use_configure no use_parallel_build no @@ -54,12 +51,12 @@ set gctpc ${worksrcpath}/gctpc set lgeo ${gctpc}/source/libgeo.a set fsymbol "" -if {[variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47]} { +if {[variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} { set fsymbol -DGFORTRAN } elseif {[variant_isset g95]} { set fsymbol -DG95 } -if {[variant_isset g95] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47]} { +if {[variant_isset g95] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} { set iip "-I${ip}" set libs "${lg2c} ${lgeo} ${lipolate}" } else { @@ -81,6 +78,9 @@ } elseif {[variant_isset gcc47]} { set libs "${libs} -L${prefix}/lib/gcc47 -lgfortran" configure.fc ${prefix}/bin/gcc-mp-4.7 +} elseif {[variant_isset gcc48]} { + set libs "${libs} -L${prefix}/lib/gcc48 -lgfortran" + configure.fc ${prefix}/bin/gcc-mp-4.8 } build.env LDFLAGS=\"${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\" \ @@ -90,13 +90,13 @@ build.args "-f makefile \ zlib=\"\" plib=\"\" jlib=\"\" h5lib=\"\" n4lib=\"\" \ iip=\"${iip}\" " -if {[variant_isset g95] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47]} { +if {[variant_isset g95] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} { build.args-append USE_IPOLATES=1 build.env-append FC=\"${configure.fc}\" \ F90=\"${configure.fc}\" \ FFLAGS=\"${configure.fflags}\" } -if {[variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47]} { +if {[variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} { build.args-append USE_OPENMP=1 } @@ -116,22 +116,26 @@ } } -variant g95 conflicts gcc44 gcc45 gcc46 gcc47 description {build iplib with g95 (alpha)} { +variant g95 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 description {build iplib with g95 (alpha)} { depends_build-append port:g95 } -variant gcc44 conflicts g95 gcc45 gcc46 gcc47 description {build iplib with gcc44 (alpha)} { +variant gcc44 conflicts g95 gcc45 gcc46 gcc47 gcc48 description {build iplib with gcc44 (alpha)} { depends_build-append port:gcc44 } -variant gcc45 conflicts g95 gcc44 gcc46 gcc47 description {build iplib with gcc45 (alpha)} { +variant gcc45 conflicts g95 gcc44 gcc46 gcc47 gcc48 description {build iplib with gcc45 (alpha)} { depends_build-append port:gcc45 } -variant gcc46 conflicts g95 gcc44 gcc45 gcc47 description {build iplib with gcc45 (alpha)} { +variant gcc46 conflicts g95 gcc44 gcc45 gcc47 gcc48 description {build iplib with gcc46 (alpha)} { depends_build-append port:gcc46 } -variant gcc47 conflicts g95 gcc44 gcc45 gcc46 description {build iplib with gcc45 (alpha)} { +variant gcc47 conflicts g95 gcc44 gcc45 gcc46 gcc48 description {build iplib with gcc47 (alpha)} { depends_build-append port:gcc47 } + +variant gcc48 conflicts g95 gcc44 gcc45 gcc46 gcc47 gcc48 description {build iplib with gcc48 (alpha)} { + depends_build-append port:gcc48 +} Modified: trunk/dports/science/wgrib2/files/patch-makefile.diff =================================================================== --- trunk/dports/science/wgrib2/files/patch-makefile.diff 2013-07-27 08:47:58 UTC (rev 108596) +++ trunk/dports/science/wgrib2/files/patch-makefile.diff 2013-07-27 11:33:27 UTC (rev 108597) @@ -1,6 +1,6 @@ ---- makefile.orig 2012-05-15 23:52:15.000000000 +0900 -+++ makefile 2012-12-23 16:53:14.000000000 +0900 -@@ -76,8 +76,8 @@ +--- makefile.orig 2013-07-27 15:43:19.000000000 +0900 ++++ makefile 2013-07-27 15:44:32.000000000 +0900 +@@ -83,8 +83,8 @@ # # Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one @@ -11,7 +11,7 @@ USE_REGEX=1 USE_TIGGE=1 USE_MYSQL=0 -@@ -94,11 +94,11 @@ +@@ -101,11 +101,11 @@ endif endif @@ -28,47 +28,46 @@ ifeq ($(USE_IPOLATES),1) ifeq ($(FC),) -@@ -346,8 +346,8 @@ - all: ${prog} aux_progs/gmerge aux_progs/smallest_grib2 aux_progs/smallest_4 +@@ -382,9 +382,8 @@ + all: ${prog} aux_progs/gmerge aux_progs/smallest_grib2 aux_progs/smallest_4 aux_progs/grib_split --${prog}: $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} -- cd $w && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} +- +-${prog}: $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib} +- cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} +${prog}: $w/*.c $w/*.h ${glib} ${iplib} ${gctpclib} -+ cd $w && ${MAKE} CPPFLAGS="-I${g} -I${gctpc}/source ${iip} ${CPPFLAGS}" ++ cd "$w" && ${MAKE} CPPFLAGS="-I${g} -I${gctpc}/source ${iip} ${CPPFLAGS}" - fast: $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} - cd $w && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} -@@ -378,10 +378,11 @@ - cd $z && export CFLAGS="${wCPPFLAGS}" && ./configure && ${MAKE} + fast: $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib} + cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} fast +@@ -415,7 +414,7 @@ + cd "$z" && export CFLAGS="${wCPPFLAGS}" && ./configure && ${MAKE} -${glib}: ${jlib} ${plib} ${zlib} +${glib}: touch ${glib} rm ${glib} -- cd $g && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} -+ cd $g && ${MAKE} CPPFLAGS="-I${g} ${CPPFLAGS}" -+ ranlib ${glib} - - ${gctpclib}: - cp gctpc20.tar.Z tmpgctpc.tar.Z -@@ -389,7 +390,8 @@ + cd "$g" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} +@@ -425,8 +424,10 @@ + gunzip -n -f tmpgctpc.tar.Z tar -xvf tmpgctpc.tar rm tmpgctpc.tar - cp makefile.gctpc proj.h ${gctpc}/source/ -- cd ${gctpc}/source && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} -f makefile.gctpc -+ cd ${gctpc}/source && ${MAKE} -f makefile.gctpc CPPFLAGS="-I${gctpc}/source ${CPPFLAGS}" +- cp makefile.gctpc proj.h cproj.c ${gctpc}/source/ +- cd "${gctpc}/source" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} -f makefile.gctpc ++ cp makefile.gctpc proj.h ${gctpc}/source/ ++ cd "${gctpc}/source" && ${MAKE} -f makefile.gctpc CPPFLAGS="-I${gctpc}/source ${CPPFLAGS}" + ranlib ${gctpclib} ++ - ${nlib}: - cp netcdf.tar.gz tmpn.tar.gz -@@ -423,7 +425,7 @@ - cd ${h5} && export CPPFLAGS="${CPPFLAGS}" && ./configure --disable-shared --disable-fortran --with-zlib=$z && ${MAKE} && ${MAKE} + ${proj4lib}: + rm -rf ${proj4} ${proj4src} +@@ -469,7 +470,7 @@ + cd "${h5}" && export CPPFLAGS="${CPPFLAGS}" && ./configure --disable-shared --disable-fortran --with-zlib=$z && ${MAKE} && ${MAKE} ${iplib}: -- cd ${ip} && export F90=${F90} && export FFLAGS="${wFFLAGS}" && ${MAKE} -+ cd ${ip} && ${MAKE} +- cd "${ip}" && export FFLAGS="${wFFLAGS}" && ${MAKE} ++ cd "${ip}" && ${MAKE} aux_progs/gmerge: aux_progs/gmerge.c cd aux_progs && ${MAKE} -f gmerge.make