<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/fb63b816a3d47139ee7bb8dd60dcbea0ef5e8e53">https://github.com/macports/macports-ports/commit/fb63b816a3d47139ee7bb8dd60dcbea0ef5e8e53</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fb63b816a3d47139ee7bb8dd60dcbea0ef5e8e53
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat Nov 30 13:03:20 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> magicspp: update to 4.2.3
</span>---
science/magicspp/Portfile | 51 ++++++++++++++----------
science/magicspp/files/patch-CMakeLists.txt.diff | 6 +--
2 files changed, 34 insertions(+), 23 deletions(-)
<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 10663c8..3f44372 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;'>@@ -11,8 +11,7 @@ if {[variant_isset metview]} {
</span> perl5.branches 5.28
name magicspp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2.3
</span> platforms darwin
maintainers {takeshi @tenomoto}
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +20,9 @@ description ECMWF's Meteorological plotting software
</span> homepage https://confluence.ecmwf.int/display/MAGP/Magics
master_sites https://confluence.ecmwf.int/download/attachments/3473464/
distname Magics-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c4a111be9ffde6fae05830f0280815c44bef0596 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e6e0518f9a0b37a7229790a29e5a153bfc3a064fa54635fc29ef3682070091a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 69354346
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9b8d91a285e768e396e63bb6b8449f69350b0b32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f996ab4a9e86c778e73e55ff95fb156eb74fc921709c3dcd7eb566755fa19d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 61458456
</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;'>@@ -42,8 +41,7 @@ compilers.setup require_fortran -g95
</span> depends_build-append \
port:flex \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libemos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:tiff \
</span> port:libgeotiff \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:ecCodes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,16 +79,15 @@ configure.args-append -DBOOST_ROOT=${prefix} \
</span> -DENABLE_GEOTIFF=ON \
-DENABLE_LARGE_FILE_SUPPORT=ON \
-DENABLE_NETCDF=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_METVIEW=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_METVIEW_NO_QT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_ODB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SPOT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_EFAS=OFF \
</span> -DEXPAT_INCLUDE_DIR=${prefix}/include \
-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
-DECCODES_PATH=${prefix} \
-DGEOTIFF_PATH=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \
</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;'>- -DNETCDF_netcdf.h_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNETCDF_netcdf_LIBRARY_RELEASE=${prefix}/lib/libnetcdf.dylib \
</span> -DPKG_CONFIG_EXECUTABLE=${prefix}/bin/pkg-config \
-DPROJ4_INCLUDE_DIR=${prefix}/lib/proj5/include \
-DPROJ4_LIBRARY=${prefix}/lib/proj5/lib/libproj.dylib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,21 +100,35 @@ post-configure {
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +python38 +metview
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[fortran_variant_isset]} {
configure.args-delete -DENABLE_FORTRAN=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#--- can be remove after 23 March 2020
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Python interface has been separated from the library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://confluence.ecmwf.int/display/MAGP/Installation+Guide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {obsolete variant} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {add support for python27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.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;'>+variant python36 description {add support for python36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.6 \
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 description {obsolete variant} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description {add support for python37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py37-jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.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;'>+variant python38 description {add support for python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py38-jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.8 \
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#---
</span>
variant metview description {Add support for MetView} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_METVIEW=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DENABLE_METVIEW_NO_QT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_METVIEW_NO_QT=ON
</span> }
livecheck.type regex
<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 7242122..ac496f3 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><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-02-15 01:24:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-03-24 11:30:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,7 +254,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-11-28 18:49:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-11-30 12:38:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,7 +286,6 @@
</span> if( HAVE_GEOTIFF )
list( APPEND MAGICS_EXTRA_INCLUDE_DIRS ${GEOTIFF_INCLUDE_DIR} )
list( APPEND MAGICS_EXTRA_LIBRARIES ${GEOTIFF_LIBRARY} )
</pre><pre style='margin:0'>
</pre>