<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/443b02dacdc2fc63e98d3c7004940c6b749f32c6">https://github.com/macports/macports-ports/commit/443b02dacdc2fc63e98d3c7004940c6b749f32c6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 443b02dacdc esmf, wgrib2: cleanup MacPorts < 2.6.0 handling
</span>443b02dacdc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 443b02dacdc2fc63e98d3c7004940c6b749f32c6
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Mar 7 17:05:43 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> esmf, wgrib2: cleanup MacPorts < 2.6.0 handling
</span>---
science/esmf/Portfile | 38 --------------------------------------
science/wgrib2/Portfile | 13 -------------
2 files changed, 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/Portfile b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74e067a9029..b741c4441f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,6 @@ if {[variant_isset gcc47] || [variant_isset gcc48] || [variant_isset gcc49] || [
</span>
build.target lib
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env ESMF_DIR=${worksrcpath} \
ESMF_F90=${configure.f90} \
ESMF_F90COMPILEOPTS=${configure.f90flags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,20 +84,6 @@ pre-build {
</span> ESMF_XERCES_INCLUDE=${prefix}/include \
ESMF_XERCESF_LIBPATH=${prefix}/lib \
ESMF_XERCES_LIBS=-lxerces-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env ESMF_DIR=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_F90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_F90COMPILEOPTS="${configure.f90flags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_CXXCOMPILEOPTS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_NETCDF=split \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_NETCDF_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_NETCDF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCES=standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCES_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCESF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCES_LIBS=-lxerces-c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {[variant_isset accelerate]} {
build.env-append ESMF_LAPACK=system \
ESMF_LAPACK_LIBS=-lvecLibFort
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +109,6 @@ pre-build {
</span> }
}
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env ESMF_DIR=${worksrcpath} \
ESMF_F90=${configure.f90} \
ESMF_F90COMPILEOPTS=${configure.f90flags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,28 +129,6 @@ pre-destroot {
</span> ESMF_INSTALL_LIBDIR=${destroot}${prefix}/lib \
ESMF_INSTALL_BINDIR=${destroot}${prefix}/bin \
ESMF_INSTALL_DOCDIR=${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env ESMF_DIR=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_F90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_F90COMPILEOPTS="${configure.f90flags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_F90LINKOPTS="-L${worksrcpath}/lib ${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_CXXCOMPILEOPTS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_CXXLINKOPTS="-L${worksrcpath}/lib ${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_NETCDF=split \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_NETCDF_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_NETCDF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCES=standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCES_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCESF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_XERCES_LIBS=-lxerces-c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_INSTALL_PREFIX=${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_INSTALL_HEADERDIR=${destroot}${prefix}/include/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_INSTALL_MODDIR=${destroot}${prefix}/include/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_INSTALL_LIBDIR=${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_INSTALL_BINDIR=${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESMF_INSTALL_DOCDIR=${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {[variant_isset accelerate]} {
destroot.env-append ESMF_LAPACK=system \
ESMF_LAPACK_LIBS=-lvecLibFort
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/Portfile b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ec3d906618..e3495598baf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,27 +80,14 @@ pre-build {
</span> build.args-append USE_OPENMP=1
configure.fflags-append -fdefault-real-8 -fdefault-double-8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append FC=${configure.fc} \
F90=${configure.fc} \
"FFLAGS=${configure.fflags} ${ompflg}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append FC=\"${configure.fc}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90=\"${configure.fc}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS=\"${configure.fflags} ${ompflg}\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "LDFLAGS=${ldflags} ${ompflg}" \
CC=${configure.cc} \
"CPPFLAGS=${fsymbol} ${configure.cppflags}" \
"CFLAGS=${cflags} ${ompflg}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append LDFLAGS=\"${ldflags} ${ompflg}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=\"${configure.cc}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=\"${cflags} ${ompflg}\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
destroot {
</pre><pre style='margin:0'>
</pre>