<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/6f6f8eb8aacc88b6f5301fe3492a7a8689a7ef2a">https://github.com/macports/macports-ports/commit/6f6f8eb8aacc88b6f5301fe3492a7a8689a7ef2a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6f6f8eb8aacc88b6f5301fe3492a7a8689a7ef2a
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Thu Aug 16 13:25:58 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> magicspp: update to 3.1.0. add support for python 3.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that [Hello World](https://confluence.ecmwf.int/display/MAGP/Hello+World) does not work
</span><span style='display:block; white-space:pre;color:#404040;'> and `ps.ps` is not created if py-ipython is installed.
</span><span style='display:block; white-space:pre;color:#404040;'> A workaround is to call `_plot()` instead of `plot()`.
</span>---
science/magicspp/Portfile | 52 +++++++++++-----------
science/magicspp/files/patch-CMakeLists.txt.diff | 6 +--
.../files/patch-cmake-FindPangoCairo.cmake.diff | 11 -----
3 files changed, 28 insertions(+), 41 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 b794842..7604bca 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;'>@@ -9,8 +9,7 @@ PortGroup qt4 1.0
</span> perl5.branches 5.26
name magicspp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.34.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.0
</span> platforms darwin
maintainers {takeshi @tenomoto}
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +18,9 @@ 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 61cf8e0f7256e6f48457213da967de06298a1eae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 38487562e83c0470f94d9c7fb9418cbadf92f1e643033237baba2abdc77e6238
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4fe509c7f7689414addd886ad7a9f487cf5ba87c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5c1cf1d1c06982927a40b61245b656ea8cadabe00201418bc69ccbe4156d658 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 71574282
</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;'>@@ -38,8 +38,7 @@ compilers.setup require_fortran -g95
</span>
depends_build-append \
port:flex \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span> depends_lib port:libemos \
port:tiff \
port:libgeotiff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,39 +69,32 @@ require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-cmake-FindPangoCairo.cmake.diff excludes -Wl,-framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-FindPangoCairo.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff
</span>
configure.args-append -DBOOST_ROOT=${prefix} \
-DCMAKE_Fortran_COMPILER=${configure.fc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_BUFR=ON \
</span> -DENABLE_CAIRO=ON \
-DENABLE_FORTRAN=OFF \
-DENABLE_GEOTIFF=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GRIB=ON \
</span> -DENABLE_LARGE_FILE_SUPPORT=ON \
-DENABLE_NETCDF=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PYTHON=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PYTHON=OFF \
</span> -DEXPAT_INCLUDE_DIR=${prefix}/include \
-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
-DECCODES_PATH=${prefix} \
-DGEOTIFF_PATH=${prefix} \
-DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHDF5_C_INCLUDE_DIR=${prefix}/include \
</span> -DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \
-DNETCDF_CONFIG_EXECUTABLE=${prefix}/bin/nc-config \
-DNETCDF_netcdf.h_INCLUDE_DIR=${prefix}/include \
-DNETCDF_netcdf_LIBRARY_RELEASE=${prefix}/lib/libnetcdf.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNETCDF_netcdf_c++_LIBRARY_RELEASE=${prefix}/lib/libnetcdf_c++.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNETCDF_netcdfcpp.h_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPERL_EXECUTABLE=${perl5.bin} \
</span> -DPKG_CONFIG_EXECUTABLE=${prefix}/bin/pkg-config \
-DPROJ4_INCLUDE_DIR=${prefix}/lib/proj5/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_LIBRARY=${prefix}/lib/proj5/lib/libproj.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSWIG_EXECUTABLE=${prefix}/bin/swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_LIBRARY=${prefix}/lib/proj5/lib/libproj.dylib
</span> configure.ldflags-append \
-ltiff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,9 +104,8 @@ post-configure {
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python27] || [variant_isset python36]} {
</span> 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;background:#e0e0e0;'>@@ -122,20 +113,27 @@ post-destroot {
</span>
if {[fortran_variant_isset]} {
configure.args-delete -DENABLE_FORTRAN=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DGFORTRAN_EXECUTABLE=${configure.fc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGFORTRAN_LIB=${prefix}/lib/[fortran_variant_name]/libgfortran.dylib
</span> }
if {[variant_isset python27]} {
set pyver 2.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyver 3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python27] || [variant_isset python36]} {
</span> configure.args-delete -DENABLE_PYTHON=OFF
configure.args-append -DENABLE_PYTHON=ON
<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;'>- -DPYTHON_CONFIG=${prefix}/bin/python${pyver}-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver}
</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 python27 conflicts python36 description {Add support for python27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-numpy port:py27-jinja2
</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:#e0ffe0;'>+variant python36 conflicts python27 description {Add support for python36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-numpy port:py36-jinja2
</span> }
variant metview description {Add support for MetView} {
<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 4023f3b..1685e73 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 2016-08-02 22:12:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2016-08-19 13:13:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-06-19 21:57:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-08-16 11:07:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +222,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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e65df13..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/magicspp/files/patch-cmake-FindPangoCairo.cmake.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;'>---- cmake/FindPangoCairo.cmake.orig 2017-01-30 19:21:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindPangoCairo.cmake 2017-11-28 09:46:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: capitalisation of the package name must be the same as in file name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package_handle_standard_args( PangoCairo DEFAULT_MSG PC_LIBPANGOCAIRO_LIBRARIES PC_LIBPANGOCAIRO_INCLUDE_DIRS )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( PANGOCAIRO_VERSION ${PC_LIBPANGOCAIRO_VERSION} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set( PANGOCAIRO_LIBRARIES "${PC_LIBPANGOCAIRO_LDFLAGS} ${PC_LIBPANGOCAIRO_LDFLAGS_OTHER}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set( PANGOCAIRO_LIBRARIES ${PC_LIBPANGOCAIRO_LDFLAGS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( PANGOCAIRO_INCLUDE_DIRS ${PC_LIBPANGOCAIRO_INCLUDE_DIRS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span></pre><pre style='margin:0'>
</pre>