[151366] trunk/dports/science
ram at macports.org
ram at macports.org
Sat Aug 13 08:36:28 PDT 2016
Revision: 151366
https://trac.macports.org/changeset/151366
Author: ram at macports.org
Date: 2016-08-13 08:36:28 -0700 (Sat, 13 Aug 2016)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/dports/science/lal/Portfile
trunk/dports/science/lalapps/Portfile
trunk/dports/science/lalburst/Portfile
trunk/dports/science/laldetchar/Portfile
trunk/dports/science/lalframe/Portfile
trunk/dports/science/lalinference/Portfile
trunk/dports/science/lalinspiral/Portfile
trunk/dports/science/lalmetaio/Portfile
trunk/dports/science/lalpulsar/Portfile
trunk/dports/science/lalsimulation/Portfile
trunk/dports/science/lalstochastic/Portfile
trunk/dports/science/lalxml/Portfile
trunk/dports/science/pylal/Portfile
Added Paths:
-----------
trunk/dports/science/laldetchar/files/
trunk/dports/science/laldetchar/files/0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch
trunk/dports/science/lalinference/files/
trunk/dports/science/lalinference/files/patch-python_tiger_Makefile.am.diff
Removed Paths:
-------------
trunk/dports/science/lal/files/9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff
Modified: trunk/dports/science/lal/Portfile
===================================================================
--- 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)
@@ -3,11 +3,10 @@
PortSystem 1.0
name lal
-version 6.15.2
-revision 1
+version 6.16.1
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library
@@ -17,43 +16,75 @@
homepage https://wiki.ligo.org/DASWG/LALSuite
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 ebe0e18eab2edfdf6b77d8bf4d5b02e1b43d93d3 \
- sha256 769722c047992eba2e5b0bebb182cb9a99584fac91def3009fc9676c4e670700
+checksums rmd160 cf19860022072ee59e3097a393464517f603d393 \
+ sha256 18697e764e26f729f939ce7dea114ae9f3724e0f961f8bd0851a4425384ff298
-patchfiles 9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff
-patch.pre_args -p2
-
depends_build-append port:pkgconfig
-depends_lib port:python27 \
- port:gsl \
+depends_lib port:gsl \
port:fftw-3 \
port:fftw-3-single
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lal-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lal-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Deleted: trunk/dports/science/lal/files/9f725309cc54c73ed03e5bfe2502e89217ee7dae.diff
===================================================================
--- 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)
@@ -1,172 +0,0 @@
-From 9f725309cc54c73ed03e5bfe2502e89217ee7dae Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette at 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
-
Modified: trunk/dports/science/lalapps/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalapps
-version 6.17.2
+version 6.19.0
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library Applications
@@ -17,14 +16,15 @@
homepage https://wiki.ligo.org/DASWG/LALSuite
master_sites http://software.ligo.org/lscsoft/source/lalsuite/
+use_xz yes
-checksums rmd160 5db01bd6b03fa49723dff368cb26630dcdd15ef6 \
- sha256 1f654d64cfc97ac6dc2479b00507c865284621b33efb35ab3c9138777aeb2bbb
+checksums rmd160 0c679757a72314f0f66a1b77f6dadfc4f0bd4bbf \
+ sha256 03200dbcf4e51187bbbe045eca967d5185499b28b966bab8ff7003cb17cff485
depends_build port:pkgconfig
-depends_lib port:python27 \
- port:gsl \
+depends_lib port:gsl \
+ port:libomp \
port:fftw-3 \
port:fftw-3-single \
port:libframe \
@@ -42,21 +42,19 @@
port:lalstochastic \
port:glue
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
use_parallel_build yes
-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}"
-
# lalxml is currently enabled by default but may change in the future
#variant lalxml description {Build with LALXML support} {
# require_active_variants lalpulsar lalxml
@@ -69,4 +67,28 @@
livecheck.type regex
livecheck.url ${master_sites}
-livecheck.regex {lalapps-(\d+(?:\.\d+)*).tar.gz}
+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}"
Modified: trunk/dports/science/lalburst/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalburst
-version 1.4.0
+version 1.4.2
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - Burst
@@ -17,45 +16,77 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 1a415e6b0ef718655d82505ec11fa72efb5ec3a1 \
- sha256 2c2b2d08ed8a7003d00aaf1dfa3ee25261affaed0a832de68d2b757a2215ffde
+checksums rmd160 a07161b063463f1b3ea108e80f650c95a3fd06ab \
+ sha256 0a10f43e6ea4948163484cfcd8f8c80c7de6785ce1d65e2976b99e6d720760ad
-depends_build-append port:pkgconfig
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
+depends_lib port:lal \
port:lalmetaio \
port:lalsimulation \
port:gsl \
port:metaio
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalburst-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalburst-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/laldetchar/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name laldetchar
-version 0.3.1
+version 0.3.3
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - DetChar
@@ -17,14 +16,18 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 a704e7b146358e2c7bbe639436f588f570af66b7 \
- sha256 0238a3b78d7594c1453525b166fe4a0378cb1783c5472fbe55a33d5514d6c515
+checksums rmd160 a56bc7509952a9b24545acb1657811851ddd0c10 \
+ sha256 bc39ffb69d702a36b543f20b0764845f023ac471543cea7464fa40978f23c67a
-depends_build-append port:pkgconfig
+# See https://bugs.ligo.org/redmine/issues/4508
+patchfiles 0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch
+use_autoreconf yes
-depends_lib port:python27 \
- port:lal \
+depends_build port:pkgconfig
+
+depends_lib port:lal \
port:lalframe \
port:lalmetaio \
port:lalsimulation \
@@ -34,34 +37,64 @@
port:metaio \
path:lib/pkgconfig/glib-2.0.pc:glib2
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {laldetchar-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {laldetchar-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Added: trunk/dports/science/laldetchar/files/0001-Make-laldetchar-idq-append-file-to-cache-a-Python-on.patch
===================================================================
--- 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)
@@ -0,0 +1,13 @@
+--- 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 \
Modified: trunk/dports/science/lalframe/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalframe
-version 1.3.0
+version 1.4.1
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - Frame
@@ -17,41 +16,75 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 f07afc91cf08250fc258dbc024fe71b8c30d1cca \
- sha256 388080d5451fad54f14802470d15d0f5bfff3dbe0859bffe36a1f039625aeb2a
+checksums rmd160 009d2128e67ba8352a8f63cb2549332976d77d44 \
+ sha256 ec2e70357e982cdcc023a82ba9b3f6dac7c7ac0194059771e5528a50086b970f
-depends_build-append port:pkgconfig
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
+depends_lib port:lal \
port:libframe \
- port:ldas-tools
+ port:ldas-tools-framecpp
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalframe-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalframe-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/lalinference/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
PortGroup active_variants 1.1
name lalinference
-version 1.5.2
+version 1.7.0
categories science
platforms darwin
maintainers ram aronnax
@@ -17,16 +17,20 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 4f00cde6f1ae2ff23623709d17a3eefb92d6a36d \
- sha256 7907425009f68f84afeb9f7bb06a9c2944c77de8d9b3f60ec80b88f1ff2388ef
+checksums rmd160 c2e41deac545cd4c1b8700b2fc1255627001798e \
+ sha256 5d8568279cf31698b1615e1a9cfac25b828853414d461cdedc6dc8e5579f198f
-depends_build-append port:pkgconfig \
- port:python27
+# Add missing HAVE_PYTHON conditional.
+# Fixed on master; remove upon next release of LALSuite.
+use_autoreconf yes
+patchfiles patch-python_tiger_Makefile.am.diff
-depends_run port:py27-healpy
+depends_build port:pkgconfig
depends_lib port:gsl \
+ port:libomp \
port:metaio \
port:libxml2 \
port:lal \
@@ -34,26 +38,25 @@
port:lalmetaio \
port:lalxml \
port:lalsimulation \
+ port:lalburst \
port:lalinspiral \
port:lalpulsar \
port:healpix-c \
port:ligo-lvalert
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
use_parallel_build yes
-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}"
-
pre-activate {
# lalinference now contains files that used to be provided by lalapps
if {![catch {set installed [lindex [registry_active lalapps] 0]}]} {
@@ -73,20 +76,53 @@
# configure.args-append --enable-lalxml
#}
-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
-}
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalinference-(\d+(?:\.\d+)*).tar.xz}
-default_variants +swig_python
+# 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"
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalinference-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Added: trunk/dports/science/lalinference/files/patch-python_tiger_Makefile.am.diff
===================================================================
--- 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)
@@ -0,0 +1,17 @@
+--- 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
Modified: trunk/dports/science/lalinspiral/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalinspiral
-version 1.7.3
+version 1.7.5
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - Inspiral
@@ -17,47 +16,78 @@
homepage https://wiki.ligo.org/DASWG/LALSuite
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 9711e617e315f688bca2979f3669688e8225c9c1 \
- sha256 26879b979fde6ec6298ce300bc73b70e629dff5f43458ec7f8a04dff33d90164
+checksums rmd160 fc82fa51a3585b3218525f5f68bb8631b2e902f6 \
+ sha256 33a6d87d525c0881be77732ed9f74e4ce73921f952abdfcd4c8f36efd0d0a5c6
-depends_build-append port:pkgconfig \
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
+depends_lib port:lal \
port:lalframe \
port:lalmetaio \
port:lalsimulation \
port:gsl \
port:metaio
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalinspiral-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalinspiral-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/lalmetaio/Portfile
===================================================================
--- 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)
@@ -1,14 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalmetaio
-version 1.2.6
-revision 1
+version 1.2.8
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - MetaIO
@@ -18,40 +16,74 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 9d83f405eb8230a416b0ad20f25b54671a266527 \
- sha256 77710b48f7489268d6537939a7876645fa89f634a19b348d0a4e763478f8aadd
+checksums rmd160 42314e9e189bf9f4761ef2473dae457d938b1107 \
+ sha256 1e8d14affe06d9885c62d95a60e71926fdcb54a4759d198ed45c72bff399487c
-depends_build-append port:pkgconfig
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
+depends_lib port:lal \
port:metaio
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalmetaio-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalmetaio-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/lalpulsar/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalpulsar
-version 1.12.0
+version 1.14.0
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - Pulsar
@@ -17,33 +16,32 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 29ca48fed3385bcff9e1bb4195b5c86d5fe4143e \
- sha256 597fb0590017030db3feae838b1516a0563f7feb78222b64aa303b94a28268c0
+checksums rmd160 f04d9e533f8988f0ce689210b555631f0c93f245 \
+ sha256 f79f10b4052ac74fcbaab73d68e5cd3083b7d56862bed1ecd2978f23c704d274
-depends_build-append port:pkgconfig
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:gsl \
+depends_lib port:gsl \
+ port:libomp \
port:libxml2 \
port:lal \
port:lalxml
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
use_parallel_build yes
-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}"
-
# lalxml is currently enabled by default but may change in the future
#variant lalxml description {Build with LALXML support} {
# if {[variant_isset swig_python]} {
@@ -54,15 +52,52 @@
# configure.args-append --enable-lalxml
#}
-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
-}
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalpulsar-(\d+(?:\.\d+)*).tar.xz}
-default_variants +swig_python
+# 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"
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalpulsar-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/lalsimulation/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalsimulation
-version 1.4.1
+version 1.6.0
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - Simulation
@@ -17,40 +16,76 @@
homepage https://wiki.ligo.org/DASWG/LALSuite
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 8c34e49453851e1977d69e5c0607f813db9d25e1 \
- sha256 746c99788cf8c523eb7e9515918d8f3d157c409d5722f9eacbab56ae1cb2a838
+checksums rmd160 e51d1da82092c9c823fb8110a3fde08e2f8aae6b \
+ sha256 364efaab2ef622890e318a1d8f6bf9bca20a549b79d550bbe0e377b58f06f593
-depends_build-append port:pkgconfig \
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
- port:gsl
+depends_lib port:lal \
+ port:gsl \
+ port:libomp
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ --enable-openmp \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalsimulation-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalsimulation-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/lalstochastic/Portfile
===================================================================
--- 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)
@@ -1,14 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalstochastic
-version 1.1.16
-revision 1
+version 1.1.18
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - Stochastic
@@ -19,42 +17,75 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 402407d451a438a8d10afd538c136e898f390286 \
- sha256 90de172dc5c08378df7f1fb6032fa18817f313c16d17b8f05f46e466ecd49f43
+checksums rmd160 58678e9827fde0c653eb5ba446630dc2ec29cfaf \
+ sha256 6ae2cc9cd727b6ac1b17c65dc1b99f0f68cb6cadf880f653bcd766f4e2f05683
-depends_build-append port:pkgconfig
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
+depends_lib port:lal \
port:lalmetaio \
port:metaio
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalstochastic-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalstochastic-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/lalxml/Portfile
===================================================================
--- 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)
@@ -1,13 +1,12 @@
# $Id$
PortSystem 1.0
-PortGroup active_variants 1.1
name lalxml
-version 1.2.0
+version 1.2.2
categories science
platforms darwin
-maintainers ram
+maintainers ram aronnax
license GPL-2+
description LSC Algorithm Library - XML
@@ -17,41 +16,75 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/lalsuite
+use_xz yes
-checksums rmd160 09ff1a3e713d9fc5baba66025ed4367173979bb4 \
- sha256 c05e5c40570779dd6861a28dd421cbe9cf17af32ca5b8d07c86675ceb5d078bd
+checksums rmd160 b359019a0853e5783f663454f6134722e7a3ce50 \
+ sha256 aa79f7ae1925a2f1dfd3226171117f228678c86457328d060f3fafe6b2f641f5
-depends_build-append port:pkgconfig
+depends_build port:pkgconfig
-depends_lib port:python27 \
- port:lal \
+depends_lib port:lal \
port:libxml2 \
port:gsl
-configure.python ${prefix}/bin/python2.7
+# 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
+
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
--disable-gcc-flags \
- --disable-debug
+ --disable-debug \
+ PYTHON=false
use_parallel_build yes
-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}"
+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {lalxml-(\d+(?:\.\d+)*).tar.xz}
-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
-}
+# 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"
-default_variants +swig_python
+ categories-prepend python
+ description Python ${pythonversion} bindings for ${description}
+ long_description ${long_description} This package provides Python \
+ ${pythonversion} bindings, modules, and scripts.
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {lalxml-(\d+(?:\.\d+)*).tar.gz}
+ 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
+ }
+}
Modified: trunk/dports/science/pylal/Portfile
===================================================================
--- 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)
@@ -4,10 +4,10 @@
PortGroup python 1.0
name pylal
-version 0.9.0
+version 0.10.0
categories science
platforms darwin
-maintainers ram
+maintainers ram arronax
license GPL-2+
description Python LSC Algorithm Library
@@ -29,8 +29,8 @@
homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/pylal.html
master_sites http://software.ligo.org/lscsoft/source/
-checksums rmd160 7d6980adeeef2ce2ad6456da6c5a4fa38bb95b2d \
- sha256 b04a94fabdbf72cff24affac40270eedaf11e388d0d446b603f39d5d3f7e2b5f
+checksums rmd160 d4d973f33c2026bec77a32efa546a8783f14aaf9 \
+ sha256 4c957fe4a81302c3bc024792e4b04a92e099526314b5c7415300cebb6674d791
python.default_version 27
@@ -40,13 +40,17 @@
port:py${python.version}-scipy \
port:py${python.version}-matplotlib \
port:glue \
- port:lal \
- port:lalframe \
- port:lalmetaio \
- port:lalsimulation \
- port:lalburst \
- port:lalinspiral
+ 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
+# 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
+
# py-scipy is not universal
universal_variant no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160813/f87f9b40/attachment-0001.html>
More information about the macports-changes
mailing list