<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/5704bf33be3b47d2a4fc7d1b17f24518fdd1aa1b">https://github.com/macports/macports-ports/commit/5704bf33be3b47d2a4fc7d1b17f24518fdd1aa1b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5704bf33be3b47d2a4fc7d1b17f24518fdd1aa1b
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat Nov 7 10:31:06 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> magicspp: update to 4.5.0
</span>---
science/magicspp/Portfile | 36 +++++++++---------------
science/magicspp/files/patch-CMakeLists.txt.diff | 12 ++++----
2 files changed, 20 insertions(+), 28 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 e5d26659415..b3abfc369d3 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,8 @@ if {[variant_isset qt5]} {
</span> perl5.branches 5.28
name magicspp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.5.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;'>@@ -21,9 +21,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 db1febbedf1db9e56580d4f36fc4cabcdc8d9ed9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 28d3a7ac4c96a9f699fad0b28cd6a3cb9a8dc4f2a40dcafe271552cba3faec37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 31218121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6ef108a925c232db6b92e2316a5d6b8a916b901e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d6f5682772ba7012f845b0c37f7bbaf5e12e6e9cf36da7524b234d8dc073ad2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 104664693
</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;'>@@ -55,7 +55,6 @@ depends_lib port:tiff \
</span> port:gd2 \
path:lib/pkgconfig/pango.pc:pango \
port:ghostscript \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span> port:proj6 \
port:libpng \
port:zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,8 +80,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DBOOST_ROOT=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_BUILD_TYPE=Release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_BUILD_TYPE=Release \
</span> -DCMAKE_Fortran_COMPILER=${configure.fc} \
-DENABLE_CAIRO=ON \
-DENABLE_FORTRAN=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,30 +108,20 @@ post-configure {
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[fortran_variant_isset]} {
configure.args-delete -DENABLE_FORTRAN=OFF
}
<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-jinja2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {deprecated variant} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 description {add support for python36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py36-jinja2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 description {deprecated variant} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 description {add support for python37} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py37-jinja2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description {deprecated variant} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 description {add support for python38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py38-jinja2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description {deprecated variant} {
</span> }
variant metview description {deprecated variant use qt5} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,6 +135,10 @@ variant qt5 description {Add support for MetView GUI} {
</span> -DENABLE_METVIEW=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "Install Python interface from pypi e.g.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pip install --user Magics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url ${homepage}
livecheck.regex {Magics-([0-9]+\.[0-9]+\.[0-9]+)-Source.tar.gz}
<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 25d910e2609..3e18453a06d 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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2020-07-29 19:53:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-08-23 17:09:19.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,7 +191,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-10-15 20:46:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-11-07 10:06:18.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +157,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package( EXPAT REQUIRED ) # for MagML
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package( EXPAT REQUIRED )
</span> if(APPLE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package( zlib REQUIRED ) # dependency of minizip - KMZ support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package( ZLIB REQUIRED ) # dependency of minizip - KMZ support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package( zlib REQUIRED ) # dependency of minizip - KMZ support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package( ZLIB REQUIRED ) # dependency of minizip - KMZ support
</span> endif(APPLE)
###############################################################################
</pre><pre style='margin:0'>
</pre>