<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/5dc46f96e103f111be51d556671fcebb0c0d5b8c">https://github.com/macports/macports-ports/commit/5dc46f96e103f111be51d556671fcebb0c0d5b8c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5dc46f96e103f111be51d556671fcebb0c0d5b8c
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat Nov 7 11:45:04 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> metview: update to 5.10.0
</span>---
science/metview/Portfile | 26 +++------------
science/metview/files/FindAEC.cmake | 39 ----------------------
.../files/patch-eckit-src-eckit-sql-sqly.y.diff | 13 --------
3 files changed, 5 insertions(+), 73 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 72355a840b5..2a55a58a511 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;'>@@ -5,8 +5,8 @@ PortGroup cmake 1.1
</span> PortGroup mpi 1.0
name metview
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
maintainers {takeshi @tenomoto}
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,9 @@ description meteorological workstation application
</span> homepage https://confluence.ecmwf.int/display/METV/
master_sites https://confluence.ecmwf.int/download/attachments/3964985/
distname Metview-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 364ee692ee4c6c62a80dc14c00c0ebe4b7d72869 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f01f72555181f27ef7f4116dd8e074472a006290db1da49d38dd90749870a08d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 44941918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b03b6dcb13818ecad88bfe25b202c65a36e7b53c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7adc282710f87077ff167b624f21f261ceee17ec041ac5d6c9b94806575c805a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 45719589
</span> long_description \
Metview is a meteorological workstation application designed to be \
a complete working environment for both the operational and research meteorologist. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,6 @@ depends_lib-append port:boost \
</span> port:curl \
port:expat \
port:fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span> port:freetype \
port:gdbm \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,14 +84,12 @@ configure.args-append \
</span> -DAEC_PATH=${prefix}/lib/libaec \
-DENABLE_ARMADILLO=OFF \
-DENABLE_EIGEN=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FFTW3=ON \
</span> -DENABLE_CUDA=OFF \
-DENABLE_GRIDTOOLS_STORAGE=OFF \
-DENABLE_LAPACK=OFF \
-DENABLE_MARS=OFF \
-DENABLE_MKL=OFF \
-DENABLE_MPI=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MIR_TOOLS=OFF \
</span> -DENABLE_MIR_DOWNLOAD_MASKS=OFF \
-DENABLE_PNG=ON \
-DENABLE_PROJ=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,22 +101,9 @@ configure.args-append \
</span> -DMAGICS_PATH=${prefix} \
-DECCODES_PATH=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-eckit-src-eckit-sql-sqly.y.diff
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${filespath}/FindAEC.cmake ${worksrcpath}/eckit/cmake/
</span> file copy ${filespath}/FindProj4.cmake ${worksrcpath}/atlas/cmake/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Avoid activate error due to hidden files (._*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib/metview/share/metview/app-defaults \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "gnutar zcvf UserDir.tar.gz UserDir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/lib/metview/share/metview/app-defaults/UserDir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Binaries are installed in ${prefix}/lib/${name}/bin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Manually unpack ${prefix}/lib/metview/share/metview/app-defaults/UserDir.tar.gz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span>
livecheck.type regex
livecheck.url ${homepage}/Releases
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/FindAEC.cmake b/science/metview/files/FindAEC.cmake
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ae1d7ffad36..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/files/FindAEC.cmake
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (C) Copyright 2011- ECMWF.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This software is licensed under the terms of the Apache Licence Version 2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# In applying this licence, ECMWF does not waive the privileges and immunities
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# granted to it by virtue of its status as an intergovernmental organisation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# nor does it submit to any jurisdiction.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - Try to find AEC (Adaptive Entropy Coding library)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://www.dkrz.de/redmine/projects/aec/wiki
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Once done this will define
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AEC_FOUND - System has AEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AEC_INCLUDE_DIRS - The AEC include directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AEC_LIBRARIES - The libraries needed to use AEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The following paths will be searched with priority if set in CMake or env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AEC_DIR - prefix path of the AEC installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AEC_PATH - prefix path of the AEC installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_path( AEC_INCLUDE_DIR szlib.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATHS ${AEC_DIR} ${AEC_PATH} ENV AEC_DIR ENV AEC_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH_SUFFIXES include include/aec NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_path( AEC_INCLUDE_DIR szlib.h PATH_SUFFIXES include include/aec )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_library( AEC_LIBRARY NAMES aec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATHS ${AEC_DIR} ${AEC_PATH} ENV AEC_DIR ENV AEC_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH_SUFFIXES lib lib64 lib/aec lib64/aec NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_library( AEC_LIBRARY NAMES aec PATH_SUFFIXES lib lib64 lib/aec lib64/aec )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set( AEC_LIBRARIES ${AEC_LIBRARY} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set( AEC_INCLUDE_DIRS ${AEC_INCLUDE_DIR} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_package_handle_standard_args(AEC DEFAULT_MSG AEC_LIBRARY AEC_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mark_as_advanced(AEC_INCLUDE_DIR AEC_LIBRARY )
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03be20727cc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/files/patch-eckit-src-eckit-sql-sqly.y.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- eckit/src/eckit/sql/sqly.y.orig 2020-07-22 22:45:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ eckit/src/eckit/sql/sqly.y 2020-08-19 16:08:52.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%pure-parser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%lex-param {yyscan_t scanner}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%define api.pure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%lex-param {void *scanner}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %lex-param {eckit::sql::SQLSession* session}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%parse-param {yyscan_t scanner}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%parse-param {void *scanner}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %parse-param {eckit::sql::SQLSession* session}
</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>