<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/92b1bd3039c85f0df525339b0ce41c3ac603b541">https://github.com/macports/macports-ports/commit/92b1bd3039c85f0df525339b0ce41c3ac603b541</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 92b1bd3 replace grib_api by eCcodes
</span>92b1bd3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92b1bd3039c85f0df525339b0ce41c3ac603b541
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Tue Nov 28 15:52:11 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> replace grib_api by eCcodes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ecCodes: add to MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'> gnudatalanguage: update to 0.9.7. use gsshg-bin-*.zip
</span><span style='display:block; white-space:pre;color:#404040;'> py-pygrib: add support for python-3.6
</span><span style='display:block; white-space:pre;color:#404040;'> cdo: make +eccodes default
</span><span style='display:block; white-space:pre;color:#404040;'> libemos: update to 4.5.1. add patch to avoid conflict of bufr_filter with ecCodes
</span><span style='display:block; white-space:pre;color:#404040;'> magicspp: update to 2.34.3. use perl 5.26. add patch to stop adding -Wl,-framework to CAIRO_LIBRARIES
</span><span style='display:block; white-space:pre;color:#404040;'> metview: update to 4.9.1
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52233
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55138
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55208
</span>---
math/gnudatalanguage/Portfile | 38 ++++------
.../files/patch-CMakeModules-FindGrib.cmake.diff | 11 +++
math/gnudatalanguage/files/patch-src-mpi.cpp.diff | 11 ---
python/py-pygrib/Portfile | 7 +-
python/py-pygrib/files/patch-setup.py.diff | 11 +++
science/cdo/Portfile | 19 ++---
science/{grib_api => ecCodes}/Portfile | 51 ++++++++-----
science/grib_api/Portfile | 88 +---------------------
.../files/patch-src-grib_jasper_encode.c.diff | 11 ---
science/libemos/Portfile | 15 ++--
.../files/patch-libemos-dp-CMakeLists.txt.diff | 2 +-
.../patch-tools-bufrtools_wmo-CMakeLists.txt.diff | 18 +++++
science/magicspp/Portfile | 29 ++++---
science/magicspp/files/patch-CMakeLists.txt.diff | 2 +-
.../files/patch-cmake-FindPangoCairo.cmake.diff | 11 +++
science/metview/Portfile | 15 ++--
science/metview/files/patch-CMakeLists.txt.diff | 2 +-
17 files changed, 149 insertions(+), 192 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/Portfile b/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2ad936..45c3c45 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup conflicts_build 1.0
</span> PortGroup mpi 1.0
name gnudatalanguage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.7
</span> epoch 2
compilers.choose cc cxx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,18 +22,16 @@ long_description \
</span> incremental compiler (i.e. runs IDL programs).
homepage http://gnudatalanguage.sourceforge.net/
master_sites sourceforge:${name}:gdl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.soest.hawaii.edu/pwessel/gshhs:gshhs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gdlsrc gdl-${version}v2.tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set srcversion 1.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set dataversion 2.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gshhssrc gshhs_${srcversion}_src.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gshhsdata gshhs_${dataversion}.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.soest.hawaii.edu/pwessel/gshhg:gshhs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gdlsrc gdl-${version}.tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dataversion 2.3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gshhsdata gshhg-bin-${dataversion}.zip
</span> distfiles ${gdlsrc}:gdl
worksrcdir gdl-${version}
checksums ${gdlsrc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a9216338b8fd89938078172bc57ac387616a0c0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cfb005ee1d9c843b26cc474618225ce68a1f0bfaeddcd45bf63a0a8fb62eedb4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ad8382265146592e23bbae42e339d871d9e3a983 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2b5945d06e4d95f01cb70a3c432ac2fa4c81e1b3ac7c02687a6704ab042a7e21
</span>
depends_build-append port:pkgconfig
depends_lib port:zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +42,7 @@ depends_lib port:zlib \
</span> port:netcdf-cxx \
port:hdf4 \
port:hdf5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:grib_api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ecCodes \
</span> port:libproj4 \
port:GraphicsMagick \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +55,8 @@ depends_lib port:zlib \
</span> port:gettext
conflicts_build antlr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-mpi.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeModules-FindGrib.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# Avoid using heimdal's broken fnmatch.h
reinplace "s|<\\(fnmatch\.h\\)>|\"/usr/include/\\1\"|" ${worksrcpath}/src/file.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,22 +175,16 @@ if {[gcc_variant_isset]} {
</span> }
variant gshhs description {build with support for GSHHS} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append ${gshhssrc}:gshhs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gshhsdata}:gshhs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${gshhsdata}:gshhs
</span> checksums-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gshhssrc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 714b729d90381a3b1b1df70b78b05f6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 7cfb92dafd86b197c65ad6f6aaf797f6cd0ce55a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a397b3cc50d9e3a0a9736044deabd567059698b5 \
</span> ${gshhsdata} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 30d336f86228e2e2861a2ba91efa0857 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 fe14a1dcc7b863fb59ea00d9975b2499b669bd79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f4ecd162cd4e60f3b03d02d22ab143184d026f34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1022a97fa324eaa4e5e4617fea25c8aaf1bec95c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 28600e8f7a08645aab43079326df6504212ec5ccb2b4bcf3b5f4f12ed60e82bc
</span> extract.only ${gdlsrc}
post-extract {
system "cd ${workpath}; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- unzip ${distpath}/${gshhssrc} gshhs/gshhs.h; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unzip ${distpath}/${gshhsdata}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir gshhs; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unzip ${distpath}/${gshhsdata} -d gshhs"
</span> }
configure.args-delete -DGSHHS=OFF
configure.args-append -DGSHHS=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/files/patch-CMakeModules-FindGrib.cmake.diff b/math/gnudatalanguage/files/patch-CMakeModules-FindGrib.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5e300ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gnudatalanguage/files/patch-CMakeModules-FindGrib.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeModules/FindGrib.cmake.orig 2017-01-21 17:17:12.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeModules/FindGrib.cmake 2017-11-25 14:34:41.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_library(GRIB_LIBRARIES NAMES grib_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_library(GRIB_LIBRARIES NAMES eccodes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_path(GRIB_INCLUDE_DIR NAMES grib_api.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # since there's no grib_api.pc let's check if this installation of grib required jasper and jpeg
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/files/patch-src-mpi.cpp.diff b/math/gnudatalanguage/files/patch-src-mpi.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9fc01f3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/files/patch-src-mpi.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/mpi.cpp.orig 2009-10-19 05:58:53.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mpi.cpp 2016-08-03 09:43:53.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +163,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nElem = p0->N_Elements();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // determine the reduction operation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int mpi_op = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MPI_Op mpi_op = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int opSumIx = e->KeywordIx("SUM");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( e->KeywordSet( opSumIx)) mpi_op = MPI_SUM;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygrib/Portfile b/python/py-pygrib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49b5eda..8f747fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygrib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygrib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup python 1.0
</span>
name py-pygrib
version 2.0.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append science
license MIT
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,13 +23,15 @@ checksums rmd160 54316925506319f5a1dc6049bceccc5659f3d24d \
</span> sha256 82eb5e6037217f7ef200521ffc90c59c1db6008ca10d84a5e8ae80008b94ae00
python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 34 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 26 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-setup.py.diff
</span>
if {${name} ne ${subport}} {
depends_lib-append \
port:py${python.version}-pyproj \
port:py${python.version}-numpy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:grib_api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ecCodes
</span> build.env-append \
GRIBAPI_DIR=${prefix} \
PNG_DIR=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygrib/files/patch-setup.py.diff b/python/py-pygrib/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..15efce9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygrib/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2016-11-19 04:23:03.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-11-25 15:24:22.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man_dir = config.getq(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "directories", "man_dir", environ.get('MAN_DIR'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ grib_api_libname = config.getq(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "files", "grib_api_libname", 'grib_api')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "files", "grib_api_libname", 'eccodes')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdirs=[]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incdirs=[numpy.get_include()]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdo/Portfile b/science/cdo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6cb4e8..64725bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,28 +60,25 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[gcc_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +eccodes
</span>
if {[clang_variant_isset]} {
configure.args-delete --disable-openmp
configure.args-append --enable-openmp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset magicspp]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +grib_api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant grib2 description {obsoleted by grib_api variant} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +eccodes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant grib2 description {obsoleted by grib_api variant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +grib_api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant grib_api description {obsoleted by eccodes variant} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +eccodes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant grib_api description {enable grib2 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:grib_api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant eccodes description {enable grib2 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ecCodes
</span> configure.args-append --with-jasper=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-grib_api=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-eccodes=${prefix}
</span> configure.ldflags-append -lpng -lopenjpeg
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grib_api/Portfile b/science/ecCodes/Portfile
</span>similarity index 62%
copy from science/grib_api/Portfile
copy to science/ecCodes/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 93d8f30..eac49ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grib_api/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ecCodes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,24 +4,24 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name grib_api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.19.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ecCodes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5.0
</span> platforms darwin
maintainers takeshi
license Apache-2
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description GRIB decoder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://software.ecmwf.int/wiki/display/GRIB/Home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://software.ecmwf.int/wiki/download/attachments/3473437
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description API and tools for decoding and encoding GRIB, BUFR and GTS formats
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://software.ecmwf.int/wiki/display/ECC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://software.ecmwf.int/wiki/download/attachments/45757960
</span> distname ${name}-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 693270232ec5f22d6f736190eb8679627af0a659 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 caec66c2d54331de9830dde853195262a1859bab36d5d03b4d44ac55784d921d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ad174cc2fc6fc5dd527325fbeed1ac0da53288ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18ab44bc444168fd324d07f7dea94f89e056f5c5cd973e818c8783f952702e4e
</span> long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- The ECMWF GRIB API is an application program interface accessible \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from C and FORTRAN programs developed for encoding and decoding \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WMO FM-92 GRIB edition 1 and edition 2 messages. A useful set of \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command line tools is also provided to give quick access to grib messages.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ecCodes is a package developed by ECMWF which provides an application programming interface and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a set of tools for decoding and encoding messages in the following formats: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WMO FM-92 GRIB edition 1 and edition 2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WMO FM-94 BUFR edition 3 and edition 4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WMO GTS abbreviated header (only decoding).
</span>
if [fortran_variant_isset] {
compilers.choose fc f77 f90
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,10 +42,8 @@ depends_lib port:jasper \
</span> fetch.ignore_sslcert yes
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-grib_jasper_encode.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![fortran_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +gcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +gcc7
</span> }
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +64,27 @@ if {[variant_isset g95]} {
</span> configure.args-append -DBUILD_SHARED_LIBS=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Delete the following line. See #52233
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# include( "/opt/local/bin/python2.7-config" OPTIONAL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {2d} ${workpath}/build/eccodes-config.cmake.tpls
</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;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 {*}[glob ${worksrcpath}/html/*.html] \
${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sp ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${sp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach p {gribapi eccodes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${sp}/${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 {*}[glob ${workpath}/build/python/${p}/*.py] ${sp}/${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 {*}[glob ${workpath}/build/python/gribapi/*.so] ${sp}/gribapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[fortran_variant_isset]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,13 +97,13 @@ variant python27 description {Add support for python27} {
</span> configure.args-delete -DENABLE_PYTHON=OFF
configure.args-append -DENABLE_PYTHON=ON \
-DPYTHON_CONFIG=${prefix}/bin/python2.7-config \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span> }
variant openmp description {Add support for OpenMP} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GRIB_OMP_THREADS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_ECCODES_OMP_THREADS=ON
</span> }
livecheck.type regex
livecheck.url ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "GRIB API version (\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "ecCodes version (\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grib_api/Portfile b/science/grib_api/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 93d8f30..a2d53fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grib_api/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grib_api/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,94 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This port can be removed on 24 November, 2018.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by ecCodes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name grib_api
version 1.19.0
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers takeshi
</span> license Apache-2
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description GRIB decoder
</span> homepage https://software.ecmwf.int/wiki/display/GRIB/Home
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://software.ecmwf.int/wiki/download/attachments/3473437
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}-Source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 693270232ec5f22d6f736190eb8679627af0a659 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 caec66c2d54331de9830dde853195262a1859bab36d5d03b4d44ac55784d921d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The ECMWF GRIB API is an application program interface accessible \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from C and FORTRAN programs developed for encoding and decoding \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WMO FM-92 GRIB edition 1 and edition 2 messages. A useful set of \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command line tools is also provided to give quick access to grib messages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [fortran_variant_isset] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers.choose fc f77 f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.setup -clang -dragonegg -gfortran -llvm -gcc44 -gcc45 -gcc46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:bison:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:flex:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:netcdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.ignore_sslcert yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-grib_jasper_encode.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![fortran_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +gcc6
</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;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_NETCDF=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PNG=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY_RELEASE=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNETCDF_CONFIG_EXECUTABLE=${prefix}/bin/nc-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOPENJPEG_INCLUDE_DIR=${prefix}/include/openjpeg-1.5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOPENJPEG_LIBRARY=${prefix}/lib/libopenjpeg.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_LIBRARY=${prefix}/lib/libz.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset g95]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBUILD_SHARED_LIBS=OFF
</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;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${worksrcpath}/html/*.html] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}
</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;'>-if {[fortran_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_FORTRAN=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_FORTRAN=ON
</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;'>-variant python27 description {Add support for python27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_PYTHON=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_PYTHON=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${prefix}/bin/python2.7-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</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;'>-variant openmp description {Add support for OpenMP} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GRIB_OMP_THREADS=ON
</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;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "GRIB API version (\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grib_api/files/patch-src-grib_jasper_encode.c.diff b/science/grib_api/files/patch-src-grib_jasper_encode.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd00d98..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grib_api/files/patch-src-grib_jasper_encode.c.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/grib_jasper_encoding.c.orig 2016-04-25 23:43:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/grib_jasper_encoding.c 2016-11-15 16:29:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.maxcmpts_ = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.clrspc_ = JAS_CLRSPC_SGRAY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image.cmprof_ = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- image.inmem_ = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// image.inmem_ = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmpt.tlx_ = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmpt.tly_ = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libemos/Portfile b/science/libemos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38119fd..237eac5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libemos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libemos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup compilers 1.0
</span> PortGroup cmake 1.0
name libemos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.5.1
</span> platforms darwin
maintainers takeshi
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +14,8 @@ description Interpolation library
</span> homepage https://software.ecmwf.int/wiki/display/EMOS
master_sites https://software.ecmwf.int/wiki/download/attachments/3473472
distname ${name}-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 56a937b31cfd49e349d37031f1ac7764ebe731bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 604f71f5fb1270d37178c5ec61509f0f9b5a687481ab7bab5a5966648e579973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1b23b9da418fa7116ec811a5e5367312511318e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c982d9fd7dcd15c3a4d1e1115b90430928b660e17f73f7d4e360dd9f87f68c46
</span>
long_description \
The Interpolation library (EMOSLIB) includes Interpolation software \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +26,11 @@ compilers.setup -clang -dragonegg -g95 -llvm
</span> cmake.out_of_source yes
patchfiles patch-libemos-dp-CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libemos-sp-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libemos-sp-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tools-bufrtools_wmo-CMakeLists.txt.diff
</span>
depends_lib port:fftw-3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:grib_api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ecCodes \
</span> port:jasper \
port:libpng \
port:openjpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,10 +40,11 @@ compilers.enforce_fortran \
</span> port:fftw-3
if {![fortran_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +gcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +gcc7
</span> }
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_ECCODES=ON \
</span> -DFFTW_ROOT=${prefix}
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff b/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 62e7503..0573c7a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- libemos-dp/CMakeLists.txt.orig 2015-10-27 23:05:24.000000000 +0900
+++ libemos-dp/CMakeLists.txt 2016-01-30 12:49:59.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span> # install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
# libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
#else()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libemos/files/patch-tools-bufrtools_wmo-CMakeLists.txt.diff b/science/libemos/files/patch-tools-bufrtools_wmo-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..000da79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libemos/files/patch-tools-bufrtools_wmo-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/bufrtools_wmo/CMakeLists.txt.orig 2017-08-08 00:30:11.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/bufrtools_wmo/CMakeLists.txt 2017-11-26 13:03:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,15 +114,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS my_exit emos )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif( ENABLE_FORTRAN90 )
</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;background:#e0ffe0;'>+-################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# bufr_filter script (See EMOS-242)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/bufr_filter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${INSTALL_BIN_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GROUP_EXECUTE GROUP_READ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORLD_EXECUTE WORLD_READ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/magicspp/Portfile b/science/magicspp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f7d383..acd0853 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/magicspp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/magicspp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,10 @@ PortGroup compilers 1.0
</span> PortGroup perl5 1.0
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.26
</span>
name magicspp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.29.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.34.3
</span> platforms darwin
maintainers takeshi
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +18,8 @@ description ECMWF's Meteorological plotting software
</span> homepage http://software.ecmwf.int/wiki/display/MAGP/Magics
master_sites https://software.ecmwf.int/wiki/download/attachments/3473464/
distname Magics-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 82c7a98b2a083985ab29bb33743067fbb94c9e74 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 82bdb4f7e38776776d2155a82d0acaa017402365a043731708345ac4ac00198f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 61cf8e0f7256e6f48457213da967de06298a1eae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 38487562e83c0470f94d9c7fb9418cbadf92f1e643033237baba2abdc77e6238
</span> long_description \
Magics++ is the latest generation of the ECMWF's Meteorological plotting \
software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +43,7 @@ depends_lib port:libemos \
</span> port:tiff \
port:libgeotiff \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:grib_api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ecCodes \
</span> port:netcdf \
port:netcdf-cxx \
port:mesa \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +71,8 @@ universal_variant no
</span>
default_variants-append +python27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-FindPangoCairo.cmake.diff # exclude -Wl,-framework
</span>
configure.args-append -DBOOST_ROOT=${prefix} \
-DCMAKE_Fortran_COMPILER=${configure.fc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,8 @@ configure.args-append -DBOOST_ROOT=${prefix} \
</span> -DENABLE_PYTHON=ON \
-DEXPAT_INCLUDE_DIR=${prefix}/include \
-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGRIB_API_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DECCODES_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGEOTIFF_PATH=${prefix} \
</span> -DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
-DHDF5_C_INCLUDE_DIR=${prefix}/include \
-DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,19 +101,17 @@ configure.args-append -DBOOST_ROOT=${prefix} \
</span> -DPROJ4_INCLUDE_DIR=${prefix}/include \
-DPROJ4_LIBRARY=${prefix}/lib/libproj.dylib \
-DSWIG_EXECUTABLE=${prefix}/bin/swig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ltiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d {"" Single Double} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lcairo|-lcairo -lX11 -ltiff|" ${workpath}/build/src/CMakeFiles/MagPlus${d}.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d {bufr grib} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${configure.fc}|${configure.cxx}|" ${workpath}/build/test/CMakeFiles/${d}_fortran.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${worksrcpath}/src/boost
</span> }
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/share/templates ${destroot}${prefix}/share/magics
</span> if {[variant_isset python27]} {
file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/${pyver}/lib/python${pyver}/site-packages
file rename ${destroot}${prefix}/lib/python${pyver}/site-packages/Magics ${destroot}${frameworks_dir}/Python.framework/Versions/${pyver}/lib/python${pyver}/site-packages
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/magicspp/files/patch-CMakeLists.txt.diff b/science/magicspp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cda2d8..4023f3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/magicspp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/magicspp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig 2016-08-02 22:12:55.000000000 +0900
+++ CMakeLists.txt 2016-08-19 13:13:45.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -278,7 +278,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,7 +286,7 @@
</span> if( HAVE_GEOTIFF )
list( APPEND MAGICS_EXTRA_INCLUDE_DIRS ${GEOTIFF_INCLUDE_DIR} )
list( APPEND MAGICS_EXTRA_LIBRARIES ${GEOTIFF_LIBRARY} )
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/magicspp/files/patch-cmake-FindPangoCairo.cmake.diff b/science/magicspp/files/patch-cmake-FindPangoCairo.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e65df13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/magicspp/files/patch-cmake-FindPangoCairo.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindPangoCairo.cmake.orig 2017-01-30 19:21:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindPangoCairo.cmake 2017-11-28 09:46:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: capitalisation of the package name must be the same as in file name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package_handle_standard_args( PangoCairo DEFAULT_MSG PC_LIBPANGOCAIRO_LIBRARIES PC_LIBPANGOCAIRO_INCLUDE_DIRS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( PANGOCAIRO_VERSION ${PC_LIBPANGOCAIRO_VERSION} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set( PANGOCAIRO_LIBRARIES "${PC_LIBPANGOCAIRO_LDFLAGS} ${PC_LIBPANGOCAIRO_LDFLAGS_OTHER}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set( PANGOCAIRO_LIBRARIES ${PC_LIBPANGOCAIRO_LDFLAGS} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( PANGOCAIRO_INCLUDE_DIRS ${PC_LIBPANGOCAIRO_INCLUDE_DIRS} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><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 c295615..52df66b 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,8 +6,7 @@ PortGroup compilers 1.0
</span> PortGroup qt4 1.0
name metview
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.9.1
</span> platforms darwin
maintainers takeshi
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +15,8 @@ description meteorological workstation application
</span> homepage http://software.ecmwf.int/wiki/display/METV/Metview
master_sites https://software.ecmwf.int/wiki/download/attachments/3964985/
distname Metview-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 abc6af4b775046aa4730b18fabae866643903161 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 274b6a9089546afa96e64dd96d8b0c62bf83ef537b8c95367b15626a00809dce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 69b536fb3e911540273e2729d2d4d582170f2482 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 30adcd1ced59f19755ccb594bee725756633b9137f5e5c0890e408550da37cd5
</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;'>@@ -29,7 +28,8 @@ compilers.choose fc
</span> compilers.setup require_fortran -g95
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ImageMagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xdpyinfo
</span> depends_lib-append port:boost \
path:lib/pkgconfig/cairo.pc:cairo \
port:curl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ depends_lib-append port:boost \
</span> port:freetype \
port:gdbm \
port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:grib_api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ecCodes \
</span> port:hdf5 \
port:jasper \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,8 @@ configure.args-append \
</span> -DENABLE_QT5=OFF \
-DMETVIEW_INSTALL_EXE_BIN_DIR=lib/${name}/bin \
-DWITH_PLOTTING=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMAGICS_PATH=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMAGICS_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DECCODES_PATH=${prefix}
</span>
if {[fortran_variant_isset]} {
configure.args-delete -DENABLE_FORTRAN=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/patch-CMakeLists.txt.diff b/science/metview/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cd57431..e2c5b6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig 2015-12-01 17:52:00.000000000 +0900
+++ CMakeLists.txt 2016-02-28 20:36:55.000000000 +0900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -845,7 +845,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -886,7 +886,7 @@
</span>
# install the metview.desktop file
install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/metview.desktop
</pre><pre style='margin:0'>
</pre>