<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/a08b9676b9659367223a7224d7260a141c1875e5">https://github.com/macports/macports-ports/commit/a08b9676b9659367223a7224d7260a141c1875e5</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 a08b9676b96 metview: use gnutar to archive UserDir. Use MacPorts bison
</span>a08b9676b96 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a08b9676b9659367223a7224d7260a141c1875e5
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Wed Aug 19 16:25:53 2020 +0900

<span style='display:block; white-space:pre;color:#404040;'>    metview: use gnutar to archive UserDir. Use MacPorts bison
</span>---
 science/metview/Portfile                                    | 11 +++++++----
 science/metview/files/patch-eckit-src-eckit-sql-sqly.y.diff | 13 +++++++++++++
 .../patch-metview-src-Flextra-flexpartTrajectory.cc.diff    | 10 ----------
 3 files changed, 20 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/Portfile b/science/metview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11bb5a23791..f2b13a4ff3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup mpi       1.0
</span> 
 name                metview
 version             5.9.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> platforms           darwin
 maintainers         {takeshi @tenomoto}
 license             Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,7 @@ compilers.enforce_fortran \
</span> 
 depends_extract     bin:gnutar:gnutar
 depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:bison \
</span>                     port:ImageMagick \
                     port:xdpyinfo
 depends_lib-append  port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +77,7 @@ cmake.install_prefix    ${prefix}/lib/${name}
</span> configure.cppflags-append \
                     -I${prefix}/lib/proj6/include
 configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DBISON_EXECUTABLE=/usr/bin/bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DBISON_EXECUTABLE=${prefix}/bin/bison \
</span>                     -DCMAKE_BUILD_TYPE=RelWithDebinfo \
                     -DENABLE_EXPOSE_SUBPACKAGES=ON \
                     -DECBUILD_GIT=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,6 +103,8 @@ configure.args-append \
</span>                     -DWITH_PLOTTING=ON \
                     -DMAGICS_PATH=${prefix} \
                     -DECCODES_PATH=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-eckit-src-eckit-sql-sqly.y.diff
</span> pre-configure {
     file copy ${filespath}/FindAEC.cmake ${worksrcpath}/eckit/cmake/
     file copy ${filespath}/FindProj4.cmake ${worksrcpath}/atlas/cmake/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,13 +112,13 @@ pre-configure {
</span> # Avoid activate error due to hidden files (._*)
 post-destroot {
     system -W ${destroot}${prefix}/lib/metview/share/metview/app-defaults \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "tar zcvf UserDir.tar.gz UserDir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   "gnutar zcvf UserDir.tar.gz UserDir"
</span>     file delete -force ${destroot}${prefix}/lib/metview/share/metview/app-defaults/UserDir
 }
 
 notes "
     Binaries are installed in ${prefix}/lib/${name}/bin.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    ${prefix}/lib/metview/share/metview/app-defaults/UserDir is archived as UserDir.tar.gz.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    Manually unpack ${prefix}/lib/metview/share/metview/app-defaults/UserDir.tar.gz.
</span> "
 
 livecheck.type      regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/patch-eckit-src-eckit-sql-sqly.y.diff b/science/metview/files/patch-eckit-src-eckit-sql-sqly.y.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03be20727cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/files/patch-eckit-src-eckit-sql-sqly.y.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- eckit/src/eckit/sql/sqly.y.orig        2020-07-22 22:45:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ eckit/src/eckit/sql/sqly.y     2020-08-19 16:08:52.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%pure-parser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%lex-param {yyscan_t scanner}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%define api.pure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%lex-param {void *scanner}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %lex-param {eckit::sql::SQLSession* session}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%parse-param {yyscan_t scanner}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%parse-param {void *scanner}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %parse-param {eckit::sql::SQLSession* session}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %{
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/patch-metview-src-Flextra-flexpartTrajectory.cc.diff b/science/metview/files/patch-metview-src-Flextra-flexpartTrajectory.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9984f9577f0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/files/patch-metview-src-Flextra-flexpartTrajectory.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- metview/src/Flextra/flexpartTrajectory.cc.orig 2019-12-06 19:40:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ metview/src/Flextra/flexpartTrajectory.cc      2019-12-07 17:34:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iomanip>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span></pre><pre style='margin:0'>

</pre>