<pre style='margin:0'>
Adam Mercer (skymoo) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2401a4174a770f2d96da2fd927c59629b954e08e">https://github.com/macports/macports-ports/commit/2401a4174a770f2d96da2fd927c59629b954e08e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2401a4174a770f2d96da2fd927c59629b954e08e
</span>Author: Adam Mercer <ram@macports.org>
AuthorDate: Wed Nov 2 14:01:11 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> science/lalinference: update to 1.8.0
</span>---
science/lalinference/Portfile | 123 ++++++++++++++-------
.../files/0001-Make-help2man-optional.patch | 41 +++++++
.../files/patch-python_tiger_Makefile.am.diff | 17 ---
3 files changed, 126 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinference/Portfile b/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5cb277..525a4b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,25 +4,17 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name lalinference
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories science
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ram aronnax
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.0
</span>
description LSC Algorithm Library - Inference
long_description \
LIGO Scientific Collaboration Algorithm Library - Inference containing \
routines for Bayesian inference data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7f1effa4e9f26813d7d96482bcff094501148b52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 08a2c69907566fe917eac44582f1febef03840c19a30196e365fe17e8c18b7ed
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c2e41deac545cd4c1b8700b2fc1255627001798e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d8568279cf31698b1615e1a9cfac25b828853414d461cdedc6dc8e5579f198f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#depends_build port:help2man
</span>
depends_lib port:gsl \
port:libomp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,23 +31,13 @@ depends_lib port:gsl \
</span> port:healpix-c \
port:ligo-lvalert
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add missing HAVE_PYTHON conditional.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed on master; remove upon next release of LALSuite.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable help2man support, currently broken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Make-help2man-optional.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span> use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-python_tiger_Makefile.am.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Choose a compiler that supports OpenMP.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback macports-clang-3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gcc-flags \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-help2man
</span>
pre-activate {
# lalinference now contains files that used to be provided by lalapps
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +58,35 @@ pre-activate {
</span> # configure.args-append --enable-lalxml
#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {lalinference-(\d+(?:\.\d+)*).tar.xz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+###############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+### Everything below this line is common to all LALSuite ports. ###############
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+###############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories science
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers ram aronnax
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://wiki.ligo.org/DASWG/LALSuite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://software.ligo.org/lscsoft/source/lalsuite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Choose a compiler that supports OpenMP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback macports-clang-3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gcc-flags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-swig-iface \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span>
# Create subports for each supported Python version
foreach v {27 34 35} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,14 +102,13 @@ foreach v {27 34 35} {
</span> ${pythonversion} bindings, modules, and scripts.
depends_build-append port:swig-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-strsed g/port:lal/port:py${v}-lal/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-prepend port:python${v} port:py${v}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:py${v}-healpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-replace port:python27 port:python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:lal port:py${v}-lal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name} port:py${v}-numpy
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete PYTHON=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append PYTHON=${pythonhome}/bin/python${pythonversion} --enable-swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append SWIG_CPPFLAGS="-I${pythonhome}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace PYTHON=.\* PYTHON=${pythonhome}/bin/python${pythonversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-swig-python
</span>
destroot.args-append pythondir="${pythondir}" \
pyexecdir="${pythondir}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,13 +123,53 @@ foreach v {27 34 35} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove Python include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (duplicate of SWIG headers in ${prefix}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${pythonhome}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create symbolic links in ${prefix}/bin to Python 2.7 scripts
</span> 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}
}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport octave-${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonversion [string range ${v} 0 end-1].[string index ${v} end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonhome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-prepend octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Octave ${pythonversion} bindings for ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${long_description} This package provides Octave \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig-octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:lal port:octave-lal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name} port:octave
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-swig-octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only install SWIG bindings, Python libraries, and Python scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command_exec destroot "" "-C swig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove Octave include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (duplicate of SWIG headers in ${prefix}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/include
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinference/files/0001-Make-help2man-optional.patch b/science/lalinference/files/0001-Make-help2man-optional.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8a2bbaf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalinference/files/0001-Make-help2man-optional.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ef41ac013a5d31c8f298c6c219f6596c7263a3b0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Leo Singer <leo.singer@ligo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 19 Oct 2016 21:54:14 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Make help2man optional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnuscripts/lalsuite_build.m4 | 11 ++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gnuscripts/lalsuite_build.m4 b/gnuscripts/lalsuite_build.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a18c4d..5112e97 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gnuscripts/lalsuite_build.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gnuscripts/lalsuite_build.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- mode: autoconf; -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # lalsuite_build.m4 - top level build macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# serial 130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# serial 131
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # restrict which LALSUITE_... patterns can appearing in output (./configure);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # useful for debugging problems with unexpanded LALSUITE_... Autoconf macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1382,6 +1382,15 @@ AC_DEFUN([LALSUITE_CHECK_PAGER],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFUN([LALSUITE_ENABLE_HELP2MAN],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $0: check for help2man utility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PATH_PROG([HELP2MAN], [help2man])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_ARG_ENABLE(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [help2man],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_HELP_STRING([--enable-help2man],[automatically generate man pages with help2man @<:@default=yes@:>@]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS_CASE([${enableval}],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [yes], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [no], [HELP2MAN=],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([bad value ${enableval} for --enable-help2man])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST([HELP2MAN], ["${HELP2MAN}"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test -n "${HELP2MAN}"], [help2man=true], [help2man=false])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LALSUITE_ENABLE_MODULE([HELP2MAN])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinference/files/patch-python_tiger_Makefile.am.diff b/science/lalinference/files/patch-python_tiger_Makefile.am.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a4d09b0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinference/files/patch-python_tiger_Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- python/tiger/Makefile.am.orig 2016-07-08 14:28:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ python/tiger/Makefile.am 2016-07-08 14:28:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as errors) flag, for just targets declared in this file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -Wno-error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if HAVE_PYTHON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tigerdir = $(pkgpythondir)/tiger
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tiger_PYTHON = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,3 +12,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make_injtimes.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postproc.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- omegascans_dag.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span></pre><pre style='margin:0'>
</pre>