<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e652088b400a90e046e00897769e3a0c59f1848">https://github.com/macports/macports-ports/commit/7e652088b400a90e046e00897769e3a0c59f1848</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 7e65208 esmf: update to 7.1.0r. add gfortran variant.
</span>7e65208 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e652088b400a90e046e00897769e3a0c59f1848
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat Mar 10 16:31:31 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> esmf: update to 7.1.0r. add gfortran variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55991
</span>---
science/esmf/Portfile | 15 +++----
science/esmf/files/patch-build-common.mk.diff | 47 ----------------------
...astructure-Mesh-src-Moab-io-ReadABAQUS.cpp.diff | 11 -----
3 files changed, 6 insertions(+), 67 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 5e93cc6..3b88106 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;'>@@ -5,13 +5,12 @@ PortGroup mpi 1.0
</span> PortGroup active_variants 1.1
compilers.choose f90 cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.setup require_fortran -dragonegg -clang -llvm -gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.setup require_fortran -dragonegg -clang -llvm
</span> mpi.setup
mpi.enforce_variant netcdf-fortran
name esmf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6_3_0rp1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7_1_0r
</span> categories science devel
platforms darwin
license UoI-NCSA
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +22,8 @@ long_description The ESMF defines an architecture for composing complex, coup
</span> homepage http://esmf-cu.colorado.edu
master_sites http://www.earthsystemmodeling.org/esmf_releases/public/ESMF_${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3bc0363dcf4e809d287a9bfc26aed9734a592b5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 89d9466fec099f375ec2182efd80af79e2ef6d486cdd51d5e18e9ab77b98dc1f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d0f4cdeacf572dccef6615131036ff262d82611a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae9a5edb8d40ae97a35cbd4bd00b77061f995c77c43d36334dbb95c18b00a889
</span>
depends_build bin:ranlib:cctools \
bin:install_name_tool:cctools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +33,6 @@ depends_lib port:netcdf-fortran \
</span> distname ${name}_${version}_src
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-Infrastructure-Mesh-src-Moab-io-ReadABAQUS.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
if {[variant_isset openmpi]} {
foreach c {g95 gfortran gfortranclang} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,9 +80,9 @@ pre-build {
</span> build.env-append ESMF_COMPILER=g95
} else {
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append ESMF_COMPILER=gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append ESMF_COMPILER=gfortranclang
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append ESMF_COMPILER=gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append ESMF_COMPILER=gfortran
</span> }
}
if {[variant_isset mpich] || [variant_isset mpich_devel]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/files/patch-build-common.mk.diff b/science/esmf/files/patch-build-common.mk.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d39126d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/files/patch-build-common.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/common.mk.orig 2014-07-11 14:28:19.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/common.mk 2014-11-15 13:37:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1897,7 +1897,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build_apps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build_apps: reqfile_libesmf reqdir_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build_apps: reqfile_libesmf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd $(ESMF_DIR)/src/apps; $(MAKE) ACTION=tree_build_apps tree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "ESMF apps built successfully."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Notice: the cd into "$(ESMF_DIR)/src/apps" before the tree target above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1969,7 +1969,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build_system_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build_system_tests: reqfile_libesmf reqdir_lib chkdir_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build_system_tests: reqfile_libesmf chkdir_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ -d $(ESMF_STDIR) ] ; then cd $(ESMF_STDIR) ; fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! $(SYSTEM_TEST)foo = foo ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -d $(SYSTEM_TEST) ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2246,7 +2246,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build_use_test_cases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build_use_test_cases: reqfile_libesmf reqdir_lib chkdir_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build_use_test_cases: reqfile_libesmf chkdir_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ -d $(ESMF_UTCDIR) ] ; then cd $(ESMF_UTCDIR) ; fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! $(USE_TEST_CASE)foo = foo ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -d $(USE_TEST_CASE) ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2445,7 +2445,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build_unit_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build_unit_tests: reqfile_libesmf reqdir_lib chkdir_tests verify_exhaustive_flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build_unit_tests: reqfile_libesmf chkdir_tests verify_exhaustive_flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) config_unit_tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) ACTION=tree_build_unit_tests tree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "ESMF unit tests built successfully."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2815,7 +2815,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build_examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--build_examples: reqfile_libesmf reqdir_lib chkdir_examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build_examples: reqfile_libesmf chkdir_examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) config_examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) ACTION=tree_build_examples tree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "ESMF examples built successfully."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/files/patch-src-Infrastructure-Mesh-src-Moab-io-ReadABAQUS.cpp.diff b/science/esmf/files/patch-src-Infrastructure-Mesh-src-Moab-io-ReadABAQUS.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71419c4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/files/patch-src-Infrastructure-Mesh-src-Moab-io-ReadABAQUS.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Infrastructure/Mesh/src/Moab/io/ReadABAQUS.cpp.orig 2014-07-11 14:28:19.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Infrastructure/Mesh/src/Moab/io/ReadABAQUS.cpp 2016-10-26 15:24:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReadABAQUS::~ReadABAQUS()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mdbImpl->release_interface(readMeshIface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NULL != abFile)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (abFile)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abFile.close();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>