<!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>[151366] trunk/dports/science</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/151366">151366</a></dd>
<dt>Author</dt> <dd>ram@macports.org</dd>
<dt>Date</dt> <dd>2016-08-13 08:36:28 -0700 (Sat, 13 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>science/*lal*: latest science run release
switch python bindings to subports
support multiple python versions
compile using an OpenMP enabled compiler
add aronnax as co-maintainer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencelalPortfile">trunk/dports/science/lal/Portfile</a></li>
<li><a href="#trunkdportssciencelalappsPortfile">trunk/dports/science/lalapps/Portfile</a></li>
<li><a href="#trunkdportssciencelalburstPortfile">trunk/dports/science/lalburst/Portfile</a></li>
<li><a href="#trunkdportssciencelaldetcharPortfile">trunk/dports/science/laldetchar/Portfile</a></li>
<li><a href="#trunkdportssciencelalframePortfile">trunk/dports/science/lalframe/Portfile</a></li>
<li><a href="#trunkdportssciencelalinferencePortfile">trunk/dports/science/lalinference/Portfile</a></li>
<li><a href="#trunkdportssciencelalinspiralPortfile">trunk/dports/science/lalinspiral/Portfile</a></li>
<li><a href="#trunkdportssciencelalmetaioPortfile">trunk/dports/science/lalmetaio/Portfile</a></li>
<li><a href="#trunkdportssciencelalpulsarPortfile">trunk/dports/science/lalpulsar/Portfile</a></li>
<li><a href="#trunkdportssciencelalsimulationPortfile">trunk/dports/science/lalsimulation/Portfile</a></li>
<li><a href="#trunkdportssciencelalstochasticPortfile">trunk/dports/science/lalstochastic/Portfile</a></li>
<li><a href="#trunkdportssciencelalxmlPortfile">trunk/dports/science/lalxml/Portfile</a></li>
<li><a href="#trunkdportssciencepylalPortfile">trunk/dports/science/pylal/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/laldetchar/files/</li>
<li><a href="#trunkdportssciencelaldetcharfiles0001MakelaldetcharidqappendfiletocacheaPythononpatch">trunk/dports/science/laldetchar/files/0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch</a></li>
<li>trunk/dports/science/lalinference/files/</li>
<li><a href="#trunkdportssciencelalinferencefilespatchpython_tiger_Makefileamdiff">trunk/dports/science/lalinference/files/patch-python_tiger_Makefile.am.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencelalfiles9f725309cc54c73ed03e5bfe2502e89217ee7daediff">trunk/dports/science/lal/files/9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencelalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lal/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lal/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lal/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -3,11 +3,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name lal
</span><del>-version 6.15.2
-revision 1
</del><ins>+version 6.16.1
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library
</span><span class="lines">@@ -17,43 +16,75 @@
</span><span class="cx">
</span><span class="cx"> homepage https://wiki.ligo.org/DASWG/LALSuite
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 ebe0e18eab2edfdf6b77d8bf4d5b02e1b43d93d3 \
- sha256 769722c047992eba2e5b0bebb182cb9a99584fac91def3009fc9676c4e670700
</del><ins>+checksums rmd160 cf19860022072ee59e3097a393464517f603d393 \
+ sha256 18697e764e26f729f939ce7dea114ae9f3724e0f961f8bd0851a4425384ff298
</ins><span class="cx">
</span><del>-patchfiles 9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff
-patch.pre_args -p2
-
</del><span class="cx"> depends_build-append port:pkgconfig
</span><span class="cx">
</span><del>-depends_lib port:python27 \
- port:gsl \
</del><ins>+depends_lib port:gsl \
</ins><span class="cx"> port:fftw-3 \
</span><span class="cx"> port:fftw-3-single
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lal-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lal-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalfiles9f725309cc54c73ed03e5bfe2502e89217ee7daediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/lal/files/9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lal/files/9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lal/files/9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,172 +0,0 @@
</span><del>-From 9f725309cc54c73ed03e5bfe2502e89217ee7dae Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette@ligo.org>
-Date: Thu, 24 Mar 2016 01:45:37 +0100
-Subject: VectorMath: rename local replacements for AVX2 intrinsics
-
-- On systems (e.g. Macs, of course) avx2intrin.h is always included
- by immintrin.h regardless of __AVX2__, i.e. one cannot assume AVX2
- intrinsics are not defined if __AVX2__ is not defined.
-- Work around by renaming local replacements for AVX2 intrinsics
- by prefixing with "_mathfun". When __AVX2__ is defined, these
- are #defined to the system-supplied AVX2 intrinsics, otherwise
- they are replaced by local non-AVX2 implementations.
----
- lal/src/vectorops/VectorMath_avx_mathfun.h | 49 ++++++++++++++++++------------
- 1 file changed, 30 insertions(+), 19 deletions(-)
-
-diff --git a/lal/src/vectorops/VectorMath_avx_mathfun.h b/lal/src/vectorops/VectorMath_avx_mathfun.h
-index 0563440..7958ac1 100644
---- a/lal/src/vectorops/VectorMath_avx_mathfun.h
-+++ b/lal/src/vectorops/VectorMath_avx_mathfun.h
-@@ -116,7 +116,18 @@ _PS256_CONST(cephes_log_p8, + 3.3333331174E-1);
- _PS256_CONST(cephes_log_q1, -2.12194440e-4);
- _PS256_CONST(cephes_log_q2, 0.693359375);
-
--#ifndef __AVX2__
-+#ifdef __AVX2__
-+
-+#define _mathfun_mm256_slli_epi32 _mm256_slli_epi32
-+#define _mathfun_mm256_srli_epi32 _mm256_srli_epi32
-+
-+#define _mathfun_mm256_and_si128 _mm256_and_si128
-+#define _mathfun_mm256_andnot_si128 _mm256_andnot_si128
-+#define _mathfun_mm256_cmpeq_epi32 _mm256_cmpeq_epi32
-+#define _mathfun_mm256_sub_epi32 _mm256_sub_epi32
-+#define _mathfun_mm256_add_epi32 _mm256_add_epi32
-+
-+#else
-
- typedef union imm_xmm_union {
- v8si imm;
-@@ -138,7 +149,7 @@ typedef union imm_xmm_union {
-
-
- #define AVX2_BITOP_USING_SSE2(fn) \
--static inline v8si _mm256_##fn(v8si x, int a) \
-+static inline v8si _mathfun_mm256_##fn(v8si x, int a) \
- { \
- /* use SSE2 instruction to perform the bitop AVX2 */ \
- v4sii x1, x2; \
-@@ -154,7 +165,7 @@ AVX2_BITOP_USING_SSE2(slli_epi32)
- AVX2_BITOP_USING_SSE2(srli_epi32)
-
- #define AVX2_INTOP_USING_SSE2(fn) \
--static inline v8si _mm256_##fn(v8si x, v8si y) \
-+static inline v8si _mathfun_mm256_##fn(v8si x, v8si y) \
- { \
- /* use SSE2 instructions to perform the AVX2 integer operation */ \
- v4sii x1, x2; \
-@@ -190,14 +201,14 @@ v8sf log256_ps(v8sf x) {
- x = _mm256_max_ps(x, _ps256_min_norm_pos.v); /* cut off denormalized stuff */
-
- // can be done with AVX2
-- imm0 = _mm256_srli_epi32(_mm256_castps_si256(x), 23);
-+ imm0 = _mathfun_mm256_srli_epi32(_mm256_castps_si256(x), 23);
-
- /* keep only the fractional part */
- x = _mm256_and_ps(x, _ps256_inv_mant_mask.v);
- x = _mm256_or_ps(x, _ps256_0p5.v);
-
- // this is again another AVX2 instruction
-- imm0 = _mm256_sub_epi32(imm0, _pi32_256_0x7f.vi);
-+ imm0 = _mathfun_mm256_sub_epi32(imm0, _pi32_256_0x7f.vi);
- v8sf e = _mm256_cvtepi32_ps(imm0);
-
- e = _mm256_add_ps(e, one);
-@@ -315,8 +326,8 @@ v8sf exp256_ps(v8sf x) {
- /* build 2^n */
- imm0 = _mm256_cvttps_epi32(fx);
- // another two AVX2 instructions
-- imm0 = _mm256_add_epi32(imm0, _pi32_256_0x7f.vi);
-- imm0 = _mm256_slli_epi32(imm0, 23);
-+ imm0 = _mathfun_mm256_add_epi32(imm0, _pi32_256_0x7f.vi);
-+ imm0 = _mathfun_mm256_slli_epi32(imm0, 23);
- v8sf pow2n = _mm256_castsi256_ps(imm0);
- y = _mm256_mul_ps(y, pow2n);
- return y;
-@@ -375,13 +386,13 @@ v8sf sin256_ps(v8sf x) { // any x
- imm2 = _mm256_cvttps_epi32(y);
- /* j=(j+1) & (~1) (see the cephes sources) */
- // another two AVX2 instruction
-- imm2 = _mm256_add_epi32(imm2, _pi32_256_1.vi);
-+ imm2 = _mathfun_mm256_add_epi32(imm2, _pi32_256_1.vi);
- imm2 = _mm256_and_si256(imm2, _pi32_256_inv1.vi);
- y = _mm256_cvtepi32_ps(imm2);
-
- /* get the swap sign flag */
- imm0 = _mm256_and_si256(imm2, _pi32_256_4.vi);
-- imm0 = _mm256_slli_epi32(imm0, 29);
-+ imm0 = _mathfun_mm256_slli_epi32(imm0, 29);
- /* get the polynom selection mask
- there is one polynom for 0 <= x <= Pi/4
- and another one for Pi/4<x<=Pi/2
-@@ -389,7 +400,7 @@ v8sf sin256_ps(v8sf x) { // any x
- Both branches will be computed.
- */
- imm2 = _mm256_and_si256(imm2, _pi32_256_2.vi);
-- imm2 = _mm256_cmpeq_epi32(imm2,_pi32_256_0.vi);
-+ imm2 = _mathfun_mm256_cmpeq_epi32(imm2,_pi32_256_0.vi);
- #else
- /* we use SSE2 routines to perform the integer ops */
- COPY_IMM_TO_XMM(_mm256_cvttps_epi32(y),imm2_1,imm2_2);
-@@ -492,17 +503,17 @@ v8sf cos256_ps(v8sf x) { // any x
- /* store the integer part of y in mm0 */
- imm2 = _mm256_cvttps_epi32(y);
- /* j=(j+1) & (~1) (see the cephes sources) */
-- imm2 = _mm256_add_epi32(imm2, _pi32_256_1.vi);
-+ imm2 = _mathfun_mm256_add_epi32(imm2, _pi32_256_1.vi);
- imm2 = _mm256_and_si256(imm2, _pi32_256_inv1.vi);
- y = _mm256_cvtepi32_ps(imm2);
-- imm2 = _mm256_sub_epi32(imm2, _pi32_256_2.vi);
-+ imm2 = _mathfun_mm256_sub_epi32(imm2, _pi32_256_2.vi);
-
- /* get the swap sign flag */
- imm0 = _mm256_andnot_si256(imm2, _pi32_256_4.vi);
-- imm0 = _mm256_slli_epi32(imm0, 29);
-+ imm0 = _mathfun_mm256_slli_epi32(imm0, 29);
- /* get the polynom selection mask */
- imm2 = _mm256_and_si256(imm2, _pi32_256_2.vi);
-- imm2 = _mm256_cmpeq_epi32(imm2, _pi32_256_0.vi);
-+ imm2 = _mathfun_mm256_cmpeq_epi32(imm2, _pi32_256_0.vi);
- #else
-
- /* we use SSE2 routines to perform the integer ops */
-@@ -615,7 +626,7 @@ void sincos256_ps(v8sf x, v8sf *s, v8sf *c) {
- imm2 = _mm256_cvttps_epi32(y);
-
- /* j=(j+1) & (~1) (see the cephes sources) */
-- imm2 = _mm256_add_epi32(imm2, _pi32_256_1.vi);
-+ imm2 = _mathfun_mm256_add_epi32(imm2, _pi32_256_1.vi);
- imm2 = _mm256_and_si256(imm2, _pi32_256_inv1.vi);
-
- y = _mm256_cvtepi32_ps(imm2);
-@@ -623,12 +634,12 @@ void sincos256_ps(v8sf x, v8sf *s, v8sf *c) {
-
- /* get the swap sign flag for the sine */
- imm0 = _mm256_and_si256(imm2, _pi32_256_4.vi);
-- imm0 = _mm256_slli_epi32(imm0, 29);
-+ imm0 = _mathfun_mm256_slli_epi32(imm0, 29);
- //v8sf swap_sign_bit_sin = _mm256_castsi256_ps(imm0);
-
- /* get the polynom selection mask for the sine*/
- imm2 = _mm256_and_si256(imm2, _pi32_256_2.vi);
-- imm2 = _mm256_cmpeq_epi32(imm2, _pi32_256_0.vi);
-+ imm2 = _mathfun_mm256_cmpeq_epi32(imm2, _pi32_256_0.vi);
- //v8sf poly_mask = _mm256_castsi256_ps(imm2);
- #else
- /* we use SSE2 routines to perform the integer ops */
-@@ -678,9 +689,9 @@ void sincos256_ps(v8sf x, v8sf *s, v8sf *c) {
- x = _mm256_add_ps(x, xmm3);
-
- #ifdef __AVX2__
-- imm4 = _mm256_sub_epi32(imm4, _pi32_256_2.vi);
-+ imm4 = _mathfun_mm256_sub_epi32(imm4, _pi32_256_2.vi);
- imm4 = _mm256_andnot_si256(imm4, _pi32_256_4.vi);
-- imm4 = _mm256_slli_epi32(imm4, 29);
-+ imm4 = _mathfun_mm256_slli_epi32(imm4, 29);
- #else
- imm4_1 = _mm_sub_epi32(imm4_1, _pi32avx_2.v4i);
- imm4_2 = _mm_sub_epi32(imm4_2, _pi32avx_2.v4i);
---
-cgit v0.11.2
-
</del></span></pre></div>
<a id="trunkdportssciencelalappsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalapps/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalapps/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalapps/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalapps
</span><del>-version 6.17.2
</del><ins>+version 6.19.0
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library Applications
</span><span class="lines">@@ -17,14 +16,15 @@
</span><span class="cx">
</span><span class="cx"> homepage https://wiki.ligo.org/DASWG/LALSuite
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite/
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 5db01bd6b03fa49723dff368cb26630dcdd15ef6 \
- sha256 1f654d64cfc97ac6dc2479b00507c865284621b33efb35ab3c9138777aeb2bbb
</del><ins>+checksums rmd160 0c679757a72314f0f66a1b77f6dadfc4f0bd4bbf \
+ sha256 03200dbcf4e51187bbbe045eca967d5185499b28b966bab8ff7003cb17cff485
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-depends_lib port:python27 \
- port:gsl \
</del><ins>+depends_lib port:gsl \
+ port:libomp \
</ins><span class="cx"> port:fftw-3 \
</span><span class="cx"> port:fftw-3-single \
</span><span class="cx"> port:libframe \
</span><span class="lines">@@ -42,21 +42,19 @@
</span><span class="cx"> port:lalstochastic \
</span><span class="cx"> port:glue
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
-
</del><span class="cx"> # lalxml is currently enabled by default but may change in the future
</span><span class="cx"> #variant lalxml description {Build with LALXML support} {
</span><span class="cx"> # require_active_variants lalpulsar lalxml
</span><span class="lines">@@ -69,4 +67,28 @@
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><del>-livecheck.regex {lalapps-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+livecheck.regex {lalapps-(\d+(?:\.\d+)*).tar.xz}
+
+set v 27
+set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
+
+categories-prepend python
+description Python ${pythonversion} bindings for ${description}
+long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
+
+depends_build-append port:swig-python
+depends_lib-strsed g/port:lal/port:py${v}-lal/
+depends_lib-prepend port:python${v} port:py${v}-numpy
+
+configure.args-delete PYTHON=false
+configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}"
</ins></span></pre></div>
<a id="trunkdportssciencelalburstPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalburst/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalburst/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalburst/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalburst
</span><del>-version 1.4.0
</del><ins>+version 1.4.2
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - Burst
</span><span class="lines">@@ -17,45 +16,77 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 1a415e6b0ef718655d82505ec11fa72efb5ec3a1 \
- sha256 2c2b2d08ed8a7003d00aaf1dfa3ee25261affaed0a832de68d2b757a2215ffde
</del><ins>+checksums rmd160 a07161b063463f1b3ea108e80f650c95a3fd06ab \
+ sha256 0a10f43e6ea4948163484cfcd8f8c80c7de6785ce1d65e2976b99e6d720760ad
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_lib port:lal \
</ins><span class="cx"> port:lalmetaio \
</span><span class="cx"> port:lalsimulation \
</span><span class="cx"> port:gsl \
</span><span class="cx"> port:metaio
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalburst-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- require_active_variants lalmetaio swig_python
- require_active_variants lalsimulation swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalburst-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelaldetcharPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/laldetchar/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/laldetchar/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/laldetchar/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name laldetchar
</span><del>-version 0.3.1
</del><ins>+version 0.3.3
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - DetChar
</span><span class="lines">@@ -17,14 +16,18 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 a704e7b146358e2c7bbe639436f588f570af66b7 \
- sha256 0238a3b78d7594c1453525b166fe4a0378cb1783c5472fbe55a33d5514d6c515
</del><ins>+checksums rmd160 a56bc7509952a9b24545acb1657811851ddd0c10 \
+ sha256 bc39ffb69d702a36b543f20b0764845f023ac471543cea7464fa40978f23c67a
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+# See https://bugs.ligo.org/redmine/issues/4508
+patchfiles 0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch
+use_autoreconf yes
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_build port:pkgconfig
+
+depends_lib port:lal \
</ins><span class="cx"> port:lalframe \
</span><span class="cx"> port:lalmetaio \
</span><span class="cx"> port:lalsimulation \
</span><span class="lines">@@ -34,34 +37,64 @@
</span><span class="cx"> port:metaio \
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {laldetchar-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- require_active_variants lalframe swig_python
- require_active_variants lalmetaio swig_python
- require_active_variants lalsimulaton swig_python
- require_active_variants lalburst swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {laldetchar-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelaldetcharfiles0001MakelaldetcharidqappendfiletocacheaPythononpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/science/laldetchar/files/0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch (0 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/laldetchar/files/0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch (rev 0)
+++ trunk/dports/science/laldetchar/files/0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- python/Makefile.am.orig
++++ python/Makefile.am
+@@ -5,9 +5,9 @@ include $(top_srcdir)/gnuscripts/lalsuite_python.am
+
+ SUBDIRS = laldetchar
+
++if HAVE_PYTHON
+ dist_bin_SCRIPTS = \
+ laldetchar-idq-append-file-to-cache
+-if HAVE_PYTHON
+
+ pybin_scripts = \
+ laldetchar-hveto \
</ins></span></pre></div>
<a id="trunkdportssciencelalframePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalframe/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalframe/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalframe/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalframe
</span><del>-version 1.3.0
</del><ins>+version 1.4.1
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - Frame
</span><span class="lines">@@ -17,41 +16,75 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 f07afc91cf08250fc258dbc024fe71b8c30d1cca \
- sha256 388080d5451fad54f14802470d15d0f5bfff3dbe0859bffe36a1f039625aeb2a
</del><ins>+checksums rmd160 009d2128e67ba8352a8f63cb2549332976d77d44 \
+ sha256 ec2e70357e982cdcc023a82ba9b3f6dac7c7ac0194059771e5528a50086b970f
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_lib port:lal \
</ins><span class="cx"> port:libframe \
</span><del>- port:ldas-tools
</del><ins>+ port:ldas-tools-framecpp
</ins><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalframe-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalframe-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalinferencePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalinference/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalinference/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalinference/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="cx"> name lalinference
</span><del>-version 1.5.2
</del><ins>+version 1.7.0
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ram aronnax
</span><span class="lines">@@ -17,16 +17,20 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 4f00cde6f1ae2ff23623709d17a3eefb92d6a36d \
- sha256 7907425009f68f84afeb9f7bb06a9c2944c77de8d9b3f60ec80b88f1ff2388ef
</del><ins>+checksums rmd160 c2e41deac545cd4c1b8700b2fc1255627001798e \
+ sha256 5d8568279cf31698b1615e1a9cfac25b828853414d461cdedc6dc8e5579f198f
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig \
- port:python27
</del><ins>+# Add missing HAVE_PYTHON conditional.
+# Fixed on master; remove upon next release of LALSuite.
+use_autoreconf yes
+patchfiles patch-python_tiger_Makefile.am.diff
</ins><span class="cx">
</span><del>-depends_run port:py27-healpy
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gsl \
</span><ins>+ port:libomp \
</ins><span class="cx"> port:metaio \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:lal \
</span><span class="lines">@@ -34,26 +38,25 @@
</span><span class="cx"> port:lalmetaio \
</span><span class="cx"> port:lalxml \
</span><span class="cx"> port:lalsimulation \
</span><ins>+ port:lalburst \
</ins><span class="cx"> port:lalinspiral \
</span><span class="cx"> port:lalpulsar \
</span><span class="cx"> port:healpix-c \
</span><span class="cx"> port:ligo-lvalert
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
-
</del><span class="cx"> pre-activate {
</span><span class="cx"> # lalinference now contains files that used to be provided by lalapps
</span><span class="cx"> if {![catch {set installed [lindex [registry_active lalapps] 0]}]} {
</span><span class="lines">@@ -73,20 +76,53 @@
</span><span class="cx"> # configure.args-append --enable-lalxml
</span><span class="cx"> #}
</span><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- require_active_variants lalframe swig_python
- require_active_variants lalmetaio swig_python
- require_active_variants lalsimulation swig_python
- require_active_variants lalinspiral swig_python
- require_active_variants lalpulsar swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalinference-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalinference-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
+
+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+ depends_run-append port:py${v}-healpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalinferencefilespatchpython_tiger_Makefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/lalinference/files/patch-python_tiger_Makefile.am.diff (0 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalinference/files/patch-python_tiger_Makefile.am.diff (rev 0)
+++ trunk/dports/science/lalinference/files/patch-python_tiger_Makefile.am.diff 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- python/tiger/Makefile.am.orig 2016-07-08 14:28:39.000000000 -0400
++++ python/tiger/Makefile.am 2016-07-08 14:28:55.000000000 -0400
+@@ -3,6 +3,8 @@
+ # as errors) flag, for just targets declared in this file.
+ CFLAGS += -Wno-error
+
++if HAVE_PYTHON
++
+ tigerdir = $(pkgpythondir)/tiger
+
+ tiger_PYTHON = \
+@@ -10,3 +12,5 @@
+ make_injtimes.py \
+ postproc.py \
+ omegascans_dag.py
++
++endif
</ins></span></pre></div>
<a id="trunkdportssciencelalinspiralPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalinspiral/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalinspiral/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalinspiral/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalinspiral
</span><del>-version 1.7.3
</del><ins>+version 1.7.5
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - Inspiral
</span><span class="lines">@@ -17,47 +16,78 @@
</span><span class="cx">
</span><span class="cx"> homepage https://wiki.ligo.org/DASWG/LALSuite
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 9711e617e315f688bca2979f3669688e8225c9c1 \
- sha256 26879b979fde6ec6298ce300bc73b70e629dff5f43458ec7f8a04dff33d90164
</del><ins>+checksums rmd160 fc82fa51a3585b3218525f5f68bb8631b2e902f6 \
+ sha256 33a6d87d525c0881be77732ed9f74e4ce73921f952abdfcd4c8f36efd0d0a5c6
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig \
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_lib port:lal \
</ins><span class="cx"> port:lalframe \
</span><span class="cx"> port:lalmetaio \
</span><span class="cx"> port:lalsimulation \
</span><span class="cx"> port:gsl \
</span><span class="cx"> port:metaio
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalinspiral-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- require_active_variants lalframe swig_python
- require_active_variants lalmetaio swig_python
- require_active_variants lalsimulation swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalinspiral-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalmetaioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalmetaio/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalmetaio/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalmetaio/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,14 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalmetaio
</span><del>-version 1.2.6
-revision 1
</del><ins>+version 1.2.8
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - MetaIO
</span><span class="lines">@@ -18,40 +16,74 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 9d83f405eb8230a416b0ad20f25b54671a266527 \
- sha256 77710b48f7489268d6537939a7876645fa89f634a19b348d0a4e763478f8aadd
</del><ins>+checksums rmd160 42314e9e189bf9f4761ef2473dae457d938b1107 \
+ sha256 1e8d14affe06d9885c62d95a60e71926fdcb54a4759d198ed45c72bff399487c
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_lib port:lal \
</ins><span class="cx"> port:metaio
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalmetaio-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalmetaio-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalpulsarPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalpulsar/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalpulsar/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalpulsar/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalpulsar
</span><del>-version 1.12.0
</del><ins>+version 1.14.0
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - Pulsar
</span><span class="lines">@@ -17,33 +16,32 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 29ca48fed3385bcff9e1bb4195b5c86d5fe4143e \
- sha256 597fb0590017030db3feae838b1516a0563f7feb78222b64aa303b94a28268c0
</del><ins>+checksums rmd160 f04d9e533f8988f0ce689210b555631f0c93f245 \
+ sha256 f79f10b4052ac74fcbaab73d68e5cd3083b7d56862bed1ecd2978f23c704d274
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:gsl \
</del><ins>+depends_lib port:gsl \
+ port:libomp \
</ins><span class="cx"> port:libxml2 \
</span><span class="cx"> port:lal \
</span><span class="cx"> port:lalxml
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
-
</del><span class="cx"> # lalxml is currently enabled by default but may change in the future
</span><span class="cx"> #variant lalxml description {Build with LALXML support} {
</span><span class="cx"> # if {[variant_isset swig_python]} {
</span><span class="lines">@@ -54,15 +52,52 @@
</span><span class="cx"> # configure.args-append --enable-lalxml
</span><span class="cx"> #}
</span><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalpulsar-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalpulsar-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
+
+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalsimulationPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalsimulation/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalsimulation/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalsimulation/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalsimulation
</span><del>-version 1.4.1
</del><ins>+version 1.6.0
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - Simulation
</span><span class="lines">@@ -17,40 +16,76 @@
</span><span class="cx">
</span><span class="cx"> homepage https://wiki.ligo.org/DASWG/LALSuite
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 8c34e49453851e1977d69e5c0607f813db9d25e1 \
- sha256 746c99788cf8c523eb7e9515918d8f3d157c409d5722f9eacbab56ae1cb2a838
</del><ins>+checksums rmd160 e51d1da82092c9c823fb8110a3fde08e2f8aae6b \
+ sha256 364efaab2ef622890e318a1d8f6bf9bca20a549b79d550bbe0e377b58f06f593
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig \
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
- port:gsl
</del><ins>+depends_lib port:lal \
+ port:gsl \
+ port:libomp
</ins><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalsimulation-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalsimulation-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalstochasticPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalstochastic/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalstochastic/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalstochastic/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,14 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalstochastic
</span><del>-version 1.1.16
-revision 1
</del><ins>+version 1.1.18
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - Stochastic
</span><span class="lines">@@ -19,42 +17,75 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 402407d451a438a8d10afd538c136e898f390286 \
- sha256 90de172dc5c08378df7f1fb6032fa18817f313c16d17b8f05f46e466ecd49f43
</del><ins>+checksums rmd160 58678e9827fde0c653eb5ba446630dc2ec29cfaf \
+ sha256 6ae2cc9cd727b6ac1b17c65dc1b99f0f68cb6cadf880f653bcd766f4e2f05683
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_lib port:lal \
</ins><span class="cx"> port:lalmetaio \
</span><span class="cx"> port:metaio
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalstochastic-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- require_active_variants lalmetaio swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalstochastic-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencelalxmlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lalxml/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lalxml/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/lalxml/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -1,13 +1,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name lalxml
</span><del>-version 1.2.0
</del><ins>+version 1.2.2
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram aronnax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description LSC Algorithm Library - XML
</span><span class="lines">@@ -17,41 +16,75 @@
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><ins>+use_xz yes
</ins><span class="cx">
</span><del>-checksums rmd160 09ff1a3e713d9fc5baba66025ed4367173979bb4 \
- sha256 c05e5c40570779dd6861a28dd421cbe9cf17af32ca5b8d07c86675ceb5d078bd
</del><ins>+checksums rmd160 b359019a0853e5783f663454f6134722e7a3ce50 \
+ sha256 aa79f7ae1925a2f1dfd3226171117f228678c86457328d060f3fafe6b2f641f5
</ins><span class="cx">
</span><del>-depends_build-append port:pkgconfig
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib port:python27 \
- port:lal \
</del><ins>+depends_lib port:lal \
</ins><span class="cx"> port:libxml2 \
</span><span class="cx"> port:gsl
</span><span class="cx">
</span><del>-configure.python ${prefix}/bin/python2.7
</del><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-gcc-flags \
</span><del>- --disable-debug
</del><ins>+ --disable-debug \
+ PYTHON=false
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-set pythondir "${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages"
-destroot.args-append \
- pythondir="${pythondir}" \
- pyexecdir="${pythondir}" \
- pkgpythondir="${pythondir}/${name}" \
- pkgpyexecdir="${pythondir}/${name}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalxml-(\d+(?:\.\d+)*).tar.xz}
</ins><span class="cx">
</span><del>-variant swig_python description {Build python SWIG bindings} {
- require_active_variants lal swig_python
- depends_build-append port:swig-python
- depends_lib-append port:py27-numpy
- configure.args-append --enable-swig-python
-}
</del><ins>+# Create subports for each supported Python version
+foreach v {27 34 35} {
+ subport py${v}-${name} {
+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
+ set pythonhome \
+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</ins><span class="cx">
</span><del>-default_variants +swig_python
</del><ins>+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
</ins><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalxml-(\d+(?:\.\d+)*).tar.gz}
</del><ins>+ depends_build-append port:swig-python
+ depends_lib-strsed g/port:lal/port:py${v}-lal/
+ depends_lib-append port:${name}
+ depends_lib-prepend port:python${v} port:py${v}-numpy
+
+ configure.args-delete PYTHON=false
+ configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
+ configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
+
+ destroot.args-append pythondir="${pythondir}" \
+ pyexecdir="${pythondir}" \
+ pkgpythondir="${pythondir}/${name}" \
+ pkgpyexecdir="${pythondir}/${name}" \
+ prefix="${pythonhome}"
+
+ # Only install SWIG bindings, Python libraries, and Python scripts
+ destroot {
+ command_exec destroot "" "-C swig"
+ command_exec destroot "" "-C python"
+ }
+
+ post-destroot {
+ if {${subport} eq "py27-${name}"} {
+ foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
+ file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
+ }
+ }
+ }
+
+ livecheck.type none
+ }
+}
</ins></span></pre></div>
<a id="trunkdportssciencepylalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/pylal/Portfile (151365 => 151366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/pylal/Portfile 2016-08-13 15:36:20 UTC (rev 151365)
+++ trunk/dports/science/pylal/Portfile 2016-08-13 15:36:28 UTC (rev 151366)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><span class="cx"> name pylal
</span><del>-version 0.9.0
</del><ins>+version 0.10.0
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><del>-maintainers ram
</del><ins>+maintainers ram arronax
</ins><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> description Python LSC Algorithm Library
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/pylal.html
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/
</span><span class="cx">
</span><del>-checksums rmd160 7d6980adeeef2ce2ad6456da6c5a4fa38bb95b2d \
- sha256 b04a94fabdbf72cff24affac40270eedaf11e388d0d446b603f39d5d3f7e2b5f
</del><ins>+checksums rmd160 d4d973f33c2026bec77a32efa546a8783f14aaf9 \
+ sha256 4c957fe4a81302c3bc024792e4b04a92e099526314b5c7415300cebb6674d791
</ins><span class="cx">
</span><span class="cx"> python.default_version 27
</span><span class="cx">
</span><span class="lines">@@ -40,13 +40,17 @@
</span><span class="cx"> port:py${python.version}-scipy \
</span><span class="cx"> port:py${python.version}-matplotlib \
</span><span class="cx"> port:glue \
</span><del>- port:lal \
- port:lalframe \
- port:lalmetaio \
- port:lalsimulation \
- port:lalburst \
- port:lalinspiral
</del><ins>+ port:py${python.version}-lal \
+ port:py${python.version}-lalframe \
+ port:py${python.version}-lalmetaio \
+ port:py${python.version}-lalsimulation \
+ port:py${python.version}-lalburst \
+ port:py${python.version}-lalinspiral
</ins><span class="cx">
</span><ins>+# Choose a compiler that supports OpenMP.
+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
+compiler.fallback macports-clang-3.8
+
</ins><span class="cx"> # py-scipy is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>