<!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>[154006] trunk/dports/science/Gyoto</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/154006">154006</a></dd>
<dt>Author</dt> <dd>thibaut@macports.org</dd>
<dt>Date</dt> <dd>2016-10-17 15:24:33 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Gyoto: new version 1.1.0.
Build and ship the LORENE plug-in in the Gyoto subport.
Build and ship the Python plug-ins in the respective py??-gyoto subports.
Provide compiler variants for the same compilers as Boost.
Add python35 to the list of supported Python versions.
Install the examples.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceGyotoPortfile">trunk/dports/science/Gyoto/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/science/Gyoto/files/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceGyotoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/Gyoto/Portfile (154005 => 154006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/Gyoto/Portfile 2016-10-17 21:33:36 UTC (rev 154005)
+++ trunk/dports/science/Gyoto/Portfile 2016-10-17 22:24:33 UTC (rev 154006)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup active_variants 1.1
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx">
</span><del>-github.setup gyoto Gyoto 1.0.1
-revision 4
</del><ins>+github.setup gyoto Gyoto 1.1.0
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories science yorick
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -19,9 +19,11 @@
</span><span class="cx"> language. Gyoto can be extended with plug-ins.
</span><span class="cx"> homepage http://gyoto.obspm.fr
</span><span class="cx">
</span><del>-checksums rmd160 773c9fe40ea2a17b5fad0b75a0f1376d28927d94 \
- sha256 643c1955fdef5ec8747cd42a4fe075ddaeb822e924f9f49ba895a6f0d8832cb1
</del><ins>+checksums rmd160 28458c6dc0827b2f859f8cb05906f36835775b09 \
+ sha256 dfa04cc9ccffc2b20c51784af097b574c844837440d4563d10b3f45e5a4798bf
</ins><span class="cx">
</span><ins>+depends_build port:LORENE
+
</ins><span class="cx"> depends_lib port:cfitsio \
</span><span class="cx"> port:xercesc3 \
</span><span class="cx"> port:udunits2 \
</span><span class="lines">@@ -33,25 +35,26 @@
</span><span class="cx"> # yorick is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-patchfiles patch-include-GyotoScreen.h.diff
-patch.pre_args -p1
-
</del><span class="cx"> configure.args --with-yorick=${prefix}/bin/yorick \
</span><del>- --without-lorene \
</del><ins>+ --with-lorene=${prefix}/lib/lorene \
</ins><span class="cx"> --with-xerces \
</span><span class="cx"> --disable-doc \
</span><span class="cx"> --with-cfitsio \
</span><span class="cx"> --with-udunits-inc=${prefix}/include/udunits2/ \
</span><span class="cx"> --with-udunits-lib=-L${prefix}/lib/ \
</span><span class="cx"> --enable-release \
</span><del>- --without-mpi
</del><ins>+ --without-mpi \
+ --without-python
</ins><span class="cx">
</span><del>-build.args-append Y_CFLAGS="${configure.cxxflags}" Y_CPPFLAGS="${configure.cppflags}" CC="${configure.cc}" COPT_DEFAULT="" Y_LDFLAGS="${configure.ldflags}"
</del><ins>+build.args-append Y_CFLAGS="${configure.cxxflags}" Y_CPPFLAGS="${configure.cppflags}" CC="${configure.cc}" COPT_DEFAULT="" Y_LDFLAGS="${configure.ldflags}"
</ins><span class="cx">
</span><del>-test.target check
-test.run yes
</del><span class="cx">
</span><ins>+test.target check check-lorene
+test.run yes
</ins><span class="cx">
</span><ins>+compilers.setup -gcc -dragonegg
+compilers.enforce_c lorene
+
</ins><span class="cx"> if {![catch {set result [active_variants boost openmpi {}]}]} {
</span><span class="cx"> if {$result} {
</span><span class="cx"> default_variants +openmpi
</span><span class="lines">@@ -62,44 +65,103 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-foreach nodot [list 27 33 34] wdot [list 2.7 3.3 3.4] {
</del><ins>+foreach nodot [list 27 33 34 35] wdot [list 2.7 3.3 3.4 3.5] {
</ins><span class="cx"> subport py${nodot}-gyoto {
</span><span class="cx"> depends_build-append port:doxygen port:swig-python
</span><span class="cx"> depends_lib-append port:python${nodot} port:py${nodot}-numpy \
</span><span class="cx"> port:Gyoto
</span><ins>+ compilers.enforce_c Gyoto
</ins><span class="cx"> categories python science
</span><ins>+ configure.args-delete --without-python
</ins><span class="cx"> configure.args-append PYTHON=${prefix}/bin/python${wdot}
</span><span class="cx"> use_parallel_build no
</span><del>- build.args -C python
</del><ins>+ build.target python plugins/python
+ destroot.cmd PYTHONPATH=${frameworks_dir}/Python.framework/Versions/${wdot}:\$PYHTONPATH make
</ins><span class="cx"> destroot.args -C python INSTALL_DATA=true prefix=${frameworks_dir}/Python.framework/Versions/${wdot}
</span><ins>+ post-destroot {
+ xinstall -d ${destroot}${prefix}/lib/gyoto/5_0_0
+ exec -ignorestderr gmake -C ${worksrcpath}/plugins/python install \
+ DESTDIR=${destroot}
+ xinstall -d ${destroot}/${prefix}/share/doc/${subport}/examples
+ xinstall {*}[glob ${worksrcpath}/plugins/python/doc/examples/*] \
+ ${destroot}/${prefix}/share/doc/${subport}/examples/
+ xinstall {*}[glob ${worksrcpath}/python/example*.py] \
+ ${destroot}/${prefix}/share/doc/${subport}/examples/
+ }
</ins><span class="cx"> test.run no
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport Gyoto {
</span><span class="cx"> post-destroot {
</span><del>- xinstall -W ${worksrcpath}/python gyoto.i gyoto_std.i gyoto_lorene.i numpy.i ${destroot}/${prefix}/include/Gyoto/
</del><ins>+ xinstall -W ${worksrcpath}/python \
+ gyoto.i gyoto_std.i gyoto_lorene.i numpy.i \
+ ${destroot}/${prefix}/include/Gyoto/
+ xinstall -d ${destroot}/${prefix}/share/doc/${subport}/examples
+ xinstall {*}[glob ${worksrcpath}/doc/examples/*] \
+ ${destroot}/${prefix}/share/doc/${subport}/examples/
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[string match libc++ ${configure.cxx_stdlib}]} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:boost
</span><del>-
</del><ins>+ compilers.enforce_c boost
+
</ins><span class="cx"> variant openmpi conflicts mpich \
</span><span class="cx"> description {Add MPI parallelization using OpenMPI} {
</span><ins>+ set c_variant [c_variant_name]
+ if {${c_variant} == ""} {
+ set mpi_port openmpi
+ set mpi_suffix mp
+ } {
+ set mpi_port openmpi-${c_variant}
+ set mpi_suffix ${c_variant}
+ }
</ins><span class="cx"> require_active_variants boost openmpi {}
</span><del>- depends_lib-append port:openmpi
</del><ins>+ depends_lib-append port:${mpi_port}
</ins><span class="cx"> configure.args-delete --without-mpi
</span><del>- configure.args-append --with-mpi MPICC=mpicc-openmpi-mp MPICXX=mpicxx-openmpi-mp
</del><ins>+ configure.args-append --with-mpi \
+ MPICC="mpicc-openmpi-${mpi_suffix}" \
+ MPICXX="mpicxx-openmpi-${mpi_suffix}" \
+ CC="mpicc-openmpi-${mpi_suffix}" \
+ CXX="mpicxx-openmpi-${mpi_suffix}"
+ build.args-delete CC="${configure.cc}"
+ build.args-append CC="mpicc-openmpi-${mpi_suffix}"
+ notes "
++-- Gyoto Usage note ------------------------------------------------------
+| For multi-processing, wrap gyoto in mpirun-openmpi-${mpi_suffix}, e.g.:
+| $ mpirun-openmpi-${mpi_suffix} gyoto -P4 in.xml out.fits
++--------------------------------------------------------------------------
+"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mpich conflicts openmpi \
</span><span class="cx"> description {Add MPI parallelization using MPICH} {
</span><ins>+ set c_variant [c_variant_name]
+ if {${c_variant} == ""} {
+ set mpi_port mpich
+ set mpi_suffix mp
+ } {
+ set mpi_port mpich-${c_variant}
+ set mpi_suffix ${c_variant}
+ }
</ins><span class="cx"> require_active_variants boost mpich {}
</span><del>- depends_lib-append port:mpich
</del><ins>+ depends_lib-append port:${mpi_port}
</ins><span class="cx"> configure.args-delete --without-mpi
</span><del>- configure.args-append --with-mpi MPICC=mpicc-mpich-mp MPICXX=mpicxx-mpich-mp
</del><ins>+ configure.args-append --with-mpi \
+ MPICC="mpicc-mpich-${mpi_suffix}" \
+ MPICXX="mpicxx-mpich-${mpi_suffix}" \
+ CC="mpicc-mpich-${mpi_suffix}" \
+ CXX="mpicxx-mpich-${mpi_suffix}"
+ build.args-delete CC="${configure.cc}"
+ build.args-append CC="mpicc-mpich-${mpi_suffix}"
+ notes "
++-- Gyoto Usage note ------------------------------------------------------
+| For multi-processing, wrap gyoto in mpirun-mpich-${mpi_suffix}, e.g.:
+| $ mpirun-mpich-${mpi_suffix} gyoto -P4 in.xml out.fits
++--------------------------------------------------------------------------
+"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>