<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121560] trunk/dports/science/magicspp</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121560">121560</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-06-30 00:28:20 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>magicspp: updated for 2.22.6. build with cmake. enabled build on Mavericks, closing #42958</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencemagicsppPortfile">trunk/dports/science/magicspp/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/science/magicspp/files/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencemagicsppPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/magicspp/Portfile (121559 => 121560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/magicspp/Portfile 2014-06-30 01:58:17 UTC (rev 121559)
+++ trunk/dports/science/magicspp/Portfile 2014-06-30 07:28:20 UTC (rev 121560)
</span><span class="lines">@@ -2,10 +2,14 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup cmake 1.0
+PortGroup compilers 1.0
</ins><span class="cx">
</span><ins>+compilers.choose fc
+compilers.setup require_fortran -g95
+
</ins><span class="cx"> name magicspp
</span><del>-version 2.18.15
-revision 6
</del><ins>+version 2.22.6
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi
</span><span class="cx"> license Apache-2
</span><span class="lines">@@ -13,10 +17,10 @@
</span><span class="cx"> description ECMWF's Meteorological plotting software
</span><span class="cx"> homepage http://software.ecmwf.int/wiki/display/MAGP/Magics
</span><span class="cx"> master_sites https://software.ecmwf.int/wiki/download/attachments/3473464/
</span><del>-distname Magics-${version}
-checksums md5 0ca95215415fba244ca49fb51d0b2342 \
- sha1 340683acbd80370a0b9c2f1ec22cf7201abb29db \
- rmd160 aa0bb635b50cfd8cc7ee102696a183fd8f81db7f
</del><ins>+distname Magics-${version}-Source
+checksums md5 99ac8a9b50861f4632ca3b96099dc14b \
+ sha1 c61311413c396f74f04eecda3b51293cdfd9df48 \
+ rmd160 847e8a16fcf17c83410e82bdfe99dafc62d85c08
</ins><span class="cx"> long_description \
</span><span class="cx"> Magics++ is the latest generation of the ECMWF's Meteorological plotting \
</span><span class="cx"> software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
</span><span class="lines">@@ -29,6 +33,8 @@
</span><span class="cx">
</span><span class="cx"> fetch.ignore_sslcert yes
</span><span class="cx">
</span><ins>+depends_build port:cmake \
+ port:flex
</ins><span class="cx"> depends_lib port:emos \
</span><span class="cx"> port:grib_api \
</span><span class="cx"> port:netcdf-cxx \
</span><span class="lines">@@ -42,117 +48,118 @@
</span><span class="cx"> port:boost \
</span><span class="cx"> port:proj47 \
</span><span class="cx"> port:swig-python
</span><ins>+require_active_variants cairo x11
</ins><span class="cx">
</span><del>-platform darwin {
- if {${os.major} >= 13} {
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
-
</del><span class="cx"> use_parallel_build no
</span><span class="cx"> universal_variant no
</span><ins>+
+if {![fortran_variant_isset]} {
+ default_variants-append +gcc48
+}
</ins><span class="cx"> if {![variant_isset python25] && ![variant_isset python26]} {
</span><span class="cx"> default_variants-append +python27
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-src-Makefile.in.diff \
- patch-configure.diff
-post-patch {
- reinplace "s|pdir = \$(libdir)|pdir = ${frameworks_dir}/Python.framework/Versions/\$(PYTHON_VERSION)/lib|" \
- ${worksrcpath}/python/Magics/Makefile.in
</del><ins>+configure.cmd cmake
+configure.dir ${workpath}/build
+configure.args-append -DBOOST_ROOT=${prefix} \
+ -DCMAKE_Fortran_COMPILER=${configure.fc} \
+ -DENABLE_BUFR=ON \
+ -DENABLE_CAIRO=ON \
+ -DENABLE_FORTRAN=OFF \
+ -DENABLE_GRIB=ON \
+ -DENABLE_LARGE_FILE_SUPPORT=ON \
+ -DENABLE_NETCDF=ON \
+ -DENABLE_PYTHON=ON \
+ -DEXPAT_INCLUDE_DIR=${prefix}/include \
+ -DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
+ -DFLEX_EXECUTABLE=${prefix}/bin/flex \
+ -DFLEX_INCLUDE_DIR=${prefix}/include \
+ -DFL_LIBRARY=${prefix}/lib/libfl.a \
+ -DGRIB_API_PATH=${prefix} \
+ -DGRIB_API_INCLUDE_DIR=${prefix}/include \
+ -DGRIB_API_INFO=${prefix}/bin/grib_info \
+ -DGRIB_API_JPG=ON \
+ -DGRIB_API_LIBRARY=${prefix}/lib/libgrib_api.dylib \
+ -DGRIB_API_PNG=ON \
+ -DGS_LIBRARIES=${prefix}/lib/libgs.dylib \
+ -DHDF5_CXX_COMPILER_EXECUTABLE=${prefix}/bin/h5c++ \
+ -DHDF5_CXX_INCLUDE_DIR=${prefix}/include \
+ -DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
+ -DHDF5_C_INCLUDE_DIR=${prefix}/include \
+ -DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \
+ -DHDF5_hdf5_cpp_LIBRARY_RELEASE=${prefix}/lib/libhdf5.dylib \
+ -DHDF5_hdf5_hl_LIBRARY_RELEASE=${prefix}/lib/libhdf5_hl.dylib \
+ -DJASPER_INCLUDE_DIR=${prefix}/include \
+ -DJASPER_LIBRARY_RELEASE=${prefix}/lib/libjasper.dylib \
+ -DJPEG_INCLUDE_DIR=${prefix}/include \
+ -DJPEG_LIBRARY=${prefix}/lib/libjpeg.dylib \
+ -DNETCDF_CONFIG_EXECUTABLE=${prefix}/bin/nc-config \
+ -DNETCDF_netcdf.h_INCLUDE_DIR=${prefix}/include \
+ -DNETCDF_netcdf_LIBRARY_RELEASE=${prefix}/lib/libnetcdf.dylib \
+ -DNETCDF_netcdf_c++_LIBRARY_RELEASE=${prefix}/lib/libnetcdf_c++.dylib \
+ -DNETCDF_netcdfcpp.h_INCLUDE_DIR=${prefix}/include \
+ -DOPENJPEG_INCLUDE_DIR=${prefix}/include \
+ -DOPENJPEG_LIBRARY=${prefix}/lib/libopenjpeg.dylib \
+ -DPERL_EXECUTABLE=${prefix}/bin/perl \
+ -DPKG_CONFIG_EXECUTABLE=${prefix}/bin/pkg-config \
+ -DPNG_LIBRARY_RELEASE=${prefix}/lib/libpng.dylib \
+ -DPNG_PNG_INCLUDE_DIR=${prefix}/include \
+ -DPROJ4_INCLUDE_DIR=${prefix}/include \
+ -DPROJ4_LIBRARY=${prefix}/lib/libproj.dylib \
+ -DSWIG_EXECUTABLE=${prefix}/bin/swig \
+ -DZLIB_INCLUDE_DIR=${prefix}/include \
+ -DZLIB_LIBRARY=${prefix}/lib/libz.dylib
+configure.post_args ../${distname}
+post-configure {
+ reinplace "s|Magics-${version}-Source/python/Magics/Magics.i$|build/python/Magics/Magics.i|g" ${workpath}/build/python/Magics/CMakeFiles/_Magics.dir/build.make
+ reinplace "s|-lcairo|-lcairo -lX11|" ${workpath}/build/src/CMakeFiles/MagPlusShared.dir/link.txt
+ foreach d {bufr grib} {
+ reinplace "s|${configure.fc}|${configure.cxx}|" ${workpath}/build/test/CMakeFiles/${d}_fortran.dir/link.txt
+ reinplace "s|-I/opt/local/include||g" ${workpath}/build/src/magics.pc
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.libs-append -lemosR64 -lX11
-configure.cppflags-append -I${prefix}/include/freetype2
-configure.args-append --disable-dependency-tracking \
- --disable-qt \
- --with-gd=${prefix} \
- --enable-cairo \
- --enable-bufr \
- --disable-python \
- --enable-proj4 \
- --with-proj4=${prefix}/lib/proj47 \
- --with-grib-api=${prefix} \
- --with-netcdf=${prefix} \
- --with-emos-libraries=${prefix}/lib \
- --with-gs-font-dir=${prefix}/share/ghostscript/fonts \
- --with-boost \
- --with-boost-libdir=${prefix}/lib
</del><ins>+build.dir ${workpath}/build
</ins><span class="cx">
</span><del>-# fatal error: 'bits/stream_iterator.h' file not found
-compiler.blacklist *clang*
-
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
-
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
</del><ins>+post-destroot {
+ file rename ${destroot}${prefix}/share/templates ${destroot}${prefix}/share/magics
+ if {[variant_isset python25] || [variant_isset python26] || [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
</ins><span class="cx"> }
</span><del>- append variant_line { {}}
-
- eval $variant_line
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
</del><ins>+if {[fortran_variant_isset]} {
+ configure.args-delete -DENABLE_FORTRAN=OFF
+ configure.args-append -DGFORTRAN_EXECUTABLE=${configure.fc} \
+ -DGFORTRAN_LIB=${prefix}/lib/[fortran_variant_name]/libgfortran.dylib
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- if {[variant_isset gcc${ver_no_dot}]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc${ver_no_dot}
-
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
-
- configure.args-append --with-fortran-libraries=${prefix}/lib/gcc${ver_no_dot}
- }
</del><ins>+if {[variant_isset python25]} {
+ set pyver 2.5
</ins><span class="cx"> }
</span><ins>+if {[variant_isset python26]} {
+ set pyver 2.6
+}
+if {[variant_isset python27]} {
+ set pyver 2.7
+}
+if {[variant_isset python25] || [variant_isset python26] || [variant_isset python27]} {
+ configure.args-delete -DENABLE_PYTHON=OFF
+ configure.args-append -DENABLE_PYTHON=ON
+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver} \
+ -DPYTHON_CONFIG=${prefix}/bin/python${pyver}-config
+}
</ins><span class="cx">
</span><span class="cx"> variant python25 description {Add support for python25} {
</span><span class="cx"> depends_lib-append port:py25-numpy
</span><del>- configure.args-delete --disable-python
- configure.args-append --enable-python
- configure.env-append PYTHON=${prefix}/bin/python2.5 \
- PYTHON_VERSION=2.5
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python26 description {Add support for python26} {
</span><span class="cx"> depends_lib-append port:py26-numpy
</span><del>- configure.args-delete --disable-python
- configure.args-append --enable-python
- configure.env-append PYTHON=${prefix}/bin/python2.6 \
- PYTHON_VERSION=2.6
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python27 description {Add support for python27} {
</span><span class="cx"> depends_lib-append port:py27-numpy
</span><del>- configure.args-delete --disable-python
- configure.args-append --enable-python
- configure.env-append PYTHON=${prefix}/bin/python2.7 \
- PYTHON_VERSION=2.7
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>