<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/f725eb4b83933dfa97f3376872390eddec4dbcb9">https://github.com/macports/macports-ports/commit/f725eb4b83933dfa97f3376872390eddec4dbcb9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f725eb4b83933dfa97f3376872390eddec4dbcb9
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sun Mar 24 11:44:11 2019 +0900

<span style='display:block; white-space:pre;color:#404040;'>    magicspp: update to 4.0.0
</span>---
 science/magicspp/Portfile                        | 44 ++++++------------------
 science/magicspp/files/patch-CMakeLists.txt.diff |  7 ++--
 2 files changed, 13 insertions(+), 38 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 5497ffd..ac5beca 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.26
 
 name                magicspp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.0.0
</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  c7a9972689ebf32ca257aa9ae39570f441a28063 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  728d6eaabdd87979dd0d8da2cf7247d8fa73bc470eda5757263176a40f712199 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    69401085
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  345cc236c55e747640d8f68e8afede392a28e45d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  3628063666859737948ed463de8e03300432b6f68a16e616a0c5e4c3387da5ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    69351265
</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;'>@@ -72,10 +71,6 @@ require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
</span> 
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants-append +python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles          patch-CMakeLists.txt.diff
 
 configure.args-append   -DBOOST_ROOT=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,37 +102,18 @@ post-configure {
</span> 
 cmake.out_of_source     yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset python27] || [variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/${pyver}/lib/python${pyver}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        file rename ${destroot}${prefix}/lib/python${pyver}/site-packages/Magics ${destroot}${frameworks_dir}/Python.framework/Versions/${pyver}/lib/python${pyver}/site-packages
</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;'>-
</span> if {[fortran_variant_isset]} {
     configure.args-delete   -DENABLE_FORTRAN=OFF
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set pyver 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set pyver 3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#--- can be remove after 23 March 2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python interface has been separated from the library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://confluence.ecmwf.int/display/MAGP/Installation+Guide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {obsolete variant} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27] || [variant_isset python36]} {
</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;'>-    configure.args-append   -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver}
</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 conflicts python36 description {Add support for python27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:py27-numpy port:py27-jinja2
</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 python36 conflicts python27 description {Add support for python36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:py36-numpy port:py36-jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 description {obsolete variant} {
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#---
</span> 
 variant metview description {Add support for MetView} {
     configure.args-append   -DENABLE_METVIEW=ON
<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 e018f8c..7242122 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,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig    2018-10-20 11:58:08.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-10-20 11:58:13.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,7 +226,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2019-02-15 01:24:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-03-24 11:30:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,7 +254,6 @@
</span>  if( HAVE_GEOTIFF )
        list( APPEND MAGICS_EXTRA_INCLUDE_DIRS  ${GEOTIFF_INCLUDE_DIR} )
        list( APPEND MAGICS_EXTRA_LIBRARIES  ${GEOTIFF_LIBRARY} )
 -  list( APPEND MAGICS_EXTRA_DEFINITIONS HAVE_GEOTIFF )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#  list( APPEND MAGICS_EXTRA_DEFINITIONS HAVE_GEOTIFF )
</span>  endif()
  
  list( APPEND MAGICS_EXTRA_LIBRARIES     ${CMAKE_THREAD_LIBS_INIT} )
</pre><pre style='margin:0'>

</pre>