<pre style='margin:0'>
Leo Singer (lpsinger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf5c734e0222269aa235d92d949b9a6eb24973af">https://github.com/macports/macports-ports/commit/bf5c734e0222269aa235d92d949b9a6eb24973af</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bf5c734e022 lalsuite: bulk update
</span>bf5c734e022 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bf5c734e0222269aa235d92d949b9a6eb24973af
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Mon Aug 17 11:05:49 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> lalsuite: bulk update
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * lal: update to 7.0.0
</span><span style='display:block; white-space:pre;color:#404040;'> * lalapps: update to 6.26.0
</span><span style='display:block; white-space:pre;color:#404040;'> * lalburst: update to 1.5.5
</span><span style='display:block; white-space:pre;color:#404040;'> * lalframe: update to 1.5.1
</span><span style='display:block; white-space:pre;color:#404040;'> * lalinference: update to 2.0.3
</span><span style='display:block; white-space:pre;color:#404040;'> * lalinspiral: update to 1.10.1
</span><span style='display:block; white-space:pre;color:#404040;'> * lalmetaio: update to 1.6.1
</span><span style='display:block; white-space:pre;color:#404040;'> * lalpulsar: update to 2.0.0
</span><span style='display:block; white-space:pre;color:#404040;'> * lalsimulation: update to 2.2.0
</span>---
science/lal/Portfile | 15 +-
science/lal/files/patch-configure.diff | 11 --
science/lalapps/Portfile | 49 +++---
science/lalburst/Portfile | 15 +-
...ould-not-depend-on-Numpy-if-Python-is-not.patch | 54 -------
science/lalburst/files/patch-configure.diff | 11 --
science/lalburst/files/swig-deps.patch | 171 ---------------------
science/lalframe/Portfile | 15 +-
science/lalframe/files/patch-configure.diff | 11 --
science/lalinference/Portfile | 10 +-
science/lalinference/files/patch-configure.diff | 11 --
science/lalinspiral/Portfile | 15 +-
science/lalinspiral/files/patch-configure.diff | 11 --
science/lalmetaio/Portfile | 15 +-
science/lalmetaio/files/patch-configure.diff | 11 --
science/lalpulsar/Portfile | 14 +-
science/lalpulsar/files/patch-configure.diff | 11 --
science/lalsimulation/Portfile | 13 +-
science/lalsimulation/files/patch-configure.diff | 11 --
19 files changed, 63 insertions(+), 411 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lal/Portfile b/science/lal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94949d0134a..52c7b4e9c77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
name lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.19.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library
long_description \
LIGO Scientific Collaboration Algorithm Library containing core \
routines for gravitational wave data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8740da3afb0518f9143c5575c6d8558345c9a0da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 360544a6372b279b88fde55550730985dca49c1fe7e8daaa3c6cd16a82cfcc37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1653152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9f5d23c4d2171ffa533af204b5cdcd3d12068c43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83a92377285ca0a2e6e48ae5ef8ad96a15dde62dc919f85ae93512dc942f860f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1713536
</span>
depends_lib port:gsl \
port:fftw-3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,11 @@ if {[string match "py*" ${subport}]} {
</span> # python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-dateutil port:py${v}-scipy port:py${v}-six \
port:py${v}-ligo-segments port:py${v}-lscsoft-glue
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span> }
# add Octave dependencies for octave subports
if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,9 +135,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lal/files/patch-configure.diff b/science/lal/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 855fce1f226..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lal/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30237,7 +30237,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalapps/Portfile b/science/lalapps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd51c5cf2e1..d891a47155f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalapps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalapps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
name lalapps
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.26.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories science python
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,27 +25,27 @@ long_description \
</span> LALApps is a set of codes for gravitational wave data analysis, \
against the LSC Algorithm Library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts lalxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- py27-lalxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lalstochastic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- py27-lalstochastic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- laldetchar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- py27-laldetchar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://wiki.ligo.org/Computing/DASWG/LALSuite
master_sites https://software.igwn.org/lscsoft/source/lalsuite/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9ffeace155f7bf095ccc2a70fffcb3f4f9dae23e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 606430004b0df55c01cbad9321163ec93eb74d99f729a5409c333e4f5d3c46a8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5457900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0f6f40d072e54a06c68658e0bc241d83a0a047cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 656e9f6386ecfa639fcba81f937c756838a95f3a33439445a61262084a7ab27b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11077712
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set v 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set v 38
</span> 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"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts lalxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${v}-lalxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lalstochastic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${v}-lalstochastic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ laldetchar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${v}-laldetchar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig
# port:help2man
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,18 +62,18 @@ depends_lib port:openmpi-${clangver} \
</span> port:fftw-3-single \
port:libframe \
port:metaio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lal port:py27-lal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalframe port:py27-lalframe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalmetaio port:py27-lalmetaio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalsimulation port:py27-lalsimulation \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalburst port:py27-lalburst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalinspiral port:py27-lalinspiral \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalpulsar port:py27-lalpulsar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lalinference port:py27-lalinference \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-lscsoft-glue \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-h5py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lal port:py${v}-lal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalframe port:py${v}-lalframe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalmetaio port:py${v}-lalmetaio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalsimulation port:py${v}-lalsimulation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalburst port:py${v}-lalburst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalinspiral port:py${v}-lalinspiral \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalpulsar port:py${v}-lalpulsar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lalinference port:py${v}-lalinference \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-lscsoft-glue \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${v}-h5py
</span>
configure.args --mandir=${prefix}/share/man \
--disable-silent-rules \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalburst/Portfile b/science/lalburst/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 219f88ffef2..5c02e1e9f97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalburst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalburst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
name lalburst
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library - Burst
long_description \
LIGO Scientific Collaboration Algorithm Library - Burst, containing \
routines for burst gravitational wave data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 498a8604b115e2212166522876ad6a39fe7d67ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2918c61c8c767bfa1fc2d439e9b7ca15e0e7a186ec045a6b563f9dcb6c1a1ca2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 865204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0c2acd5914cdd71da424ceaa5bf01ef48540ca0d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8784e9aefd780ae130a1f99c7d2c7f678970ab72fc096eb8636e1c04089e813f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 408932
</span>
depends_lib port:lal \
port:lalmetaio \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,12 @@ if {[string match "py*" ${subport}]} {
</span> # python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-lal port:py${v}-lalmetaio port:py${v}-lalsimulation \
port:py${v}-scipy port:py${v}-lscsoft-glue
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span> }
# add Octave dependencies for octave subports
if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal port:octave-lalmetaio port:octave-lalsimulation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,9 +137,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalburst/files/0001-lalburst-should-not-depend-on-Numpy-if-Python-is-not.patch b/science/lalburst/files/0001-lalburst-should-not-depend-on-Numpy-if-Python-is-not.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8df65083944..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalburst/files/0001-lalburst-should-not-depend-on-Numpy-if-Python-is-not.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7852aae1d265f466198e15e9781ab325a5172a4c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Leo Singer <leo.singer@ligo.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 30 May 2017 05:12:54 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] lalburst should not depend on Numpy if Python is not enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use the Numpy compiler and linker flags detected for the SWIG build,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-as is done in lalinference/python/lalinference/bayestar/Makefile.am.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lalburst/configure.ac | 11 -----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lalburst/python/lalburst/Makefile.am | 7 +++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 3 insertions(+), 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lalburst/configure.ac b/lalburst/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34717b6e6e..461169127e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lalburst/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lalburst/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,17 +116,6 @@ AC_CHECK_LIB([m],[main],,[AC_MSG_ERROR([could not find the math library])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LALSUITE_CHECK_PYTHON([2.6])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AX_PYTHON_DEVEL()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# check for NumPy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AX_PYTHON_MODULE(numpy, fatal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--NUMPY_CFLAGS=-I`$PYTHON -c "import numpy;print (numpy.get_include());"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--old_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS="$CFLAGS ${PYTHON_CPPFLAGS} ${NUMPY_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CHECK_HEADER([numpy/arrayobject.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [PYTHON_CPPFLAGS="${PYTHON_CPPFLAGS} ${NUMPY_CFLAGS}"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_MSG_ERROR([Numpy extension header not found])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [#include "Python.h"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS="$old_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for gsl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CHECK_MODULES([GSL],[gsl],[true],[false])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LALSUITE_ADD_FLAGS([C],[${GSL_CFLAGS}],[${GSL_LIBS}])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lalburst/python/lalburst/Makefile.am b/lalburst/python/lalburst/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c4a1b1c098..1769494d77 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lalburst/python/lalburst/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lalburst/python/lalburst/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,9 +31,8 @@ pymodule_PYTHON = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkgpython_LTLIBRARIES = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cs_gamma.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cs_gamma_la_SOURCES = cs_gamma.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cs_gamma_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cs_gamma_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(GSL_CFLAGS) $(LAL_CFLAGS) -Wno-cast-qual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cs_gamma_la_LIBADD = $(top_builddir)/src/liblalburst.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cs_gamma_la_LDFLAGS = $(AM_LDFLAGS) $(LIBS) $(GSL_LIBS) $(LAL_LIBS) $(PYTHON_LIBS) -module -avoid-version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cs_gamma_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cs_gamma_la_CFLAGS = $(AM_CFLAGS) $(SWIG_PYTHON_CFLAGS) $(GSL_CFLAGS) $(LAL_CFLAGS) -Wno-cast-qual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cs_gamma_la_LDFLAGS = $(top_builddir)/src/liblalburst.la $(AM_LDFLAGS) $(LIBS) $(GSL_LIBS) $(LAL_LIBS) $(PYTHON_LIBS) -module -avoid-version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalburst/files/patch-configure.diff b/science/lalburst/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 06cf520c85f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalburst/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27456,7 +27456,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalburst/files/swig-deps.patch b/science/lalburst/files/swig-deps.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b081278f4a5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalburst/files/swig-deps.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,171 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/a/gnuscripts/lalsuite_swig.am b/b/gnuscripts/lalsuite_swig.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 68c8157165..4270cebfe1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/a/gnuscripts/lalsuite_swig.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/b/gnuscripts/lalsuite_swig.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,8 @@ include $(top_srcdir)/gnuscripts/lalsuite_test.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: force-swig-rule-execution
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: swig-clean-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.PHONY: swig-distclean-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.PHONY: swig-dummy-depfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: swig-octave-all-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: swig-octave-clean-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: swig-octave-install-hook
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +35,23 @@ pkginclude_HEADERS += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SWIG$(PACKAGE_NAME)Test.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(END_OF_LIST)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_depfiles =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig-dummy-depfiles: $(swig_depfiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if AMDEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(swig_depfiles):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @$(MKDIR_P) $(SWIG_DEPDIR) && echo '# generated by swig-dummy-depfiles' > $@.tmp && mv -f $@.tmp $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+distclean-local: swig-distclean-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig-distclean-local:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -rm -rf $(SWIG_DEPDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if AMDEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_deps_if =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_deps_if = : swig-deps-false-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if SWIG_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILT_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,12 +68,6 @@ swig_libtoolflags = --tag=disable-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- swig_ifacedir = $(pkgincludedir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_swig_iface_HEADERS = $(swig_iface)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if AMDEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--swig_deps_if =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--swig_deps_if = : no-deps-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header-links-local:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_at)rm -f $(top_builddir)/include/lal/$(swig_iface) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LN_S) $(abs_builddir)/$(swig_iface) $(top_builddir)/include/lal/$(swig_iface)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,8 +87,9 @@ swiglal_header_list.txt: force-swig-rule-execution
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if AMDEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@am__include@ @am__quote@./$(DEPDIR)/swiglal.deps@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--swig_preproc_flags += -MF ./$(DEPDIR)/swiglal.deps.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@swig__depfile_include_pre@$(SWIG_DEPDIR)/swiglal.deps@swig__depfile_include_post@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_depfiles += $(SWIG_DEPDIR)/swiglal.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_preproc_flags += -MF $(SWIG_DEPDIR)/swiglal.deps.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(swig_iface): Makefile swiglal_header_list.txt $(srcdir)/generate_swig_iface.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,9 +119,9 @@ $(swig_iface): Makefile swiglal_header_list.txt $(srcdir)/generate_swig_iface.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "%import \"$${stddeffile}\"" >>$@_preproc.i; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%%include <lal/%s>\n" `cat swiglal_header_list.txt` >>$@_preproc.i; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $(SWIG) $(swig_preproc_flags) -o $@_preproc.xml $@_preproc.i; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(swig_deps_if)mv -f ./$(DEPDIR)/swiglal.deps.tmp ./$(DEPDIR)/swiglal.deps; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(swig_deps_if)mv -f $(SWIG_DEPDIR)/swiglal.deps.tmp $(SWIG_DEPDIR)/swiglal.deps; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(swig_deps_if)rm -f ./$(DEPDIR)/swiglal.deps.tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(swig_deps_if)rm -f $(SWIG_DEPDIR)/swiglal.deps.tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $@; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,16 +151,17 @@ swiglal_octave_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_OCTAVE_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- swiglal_octave_la_LIBTOOLFLAGS = $(swig_libtoolflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if AMDEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@am__include@ @am__quote@./$(DEPDIR)/swiglal_octave.deps@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--swig_octave_flags += -MF ./$(DEPDIR)/swiglal_octave.deps.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@swig__depfile_include_pre@$(SWIG_DEPDIR)/swiglal_octave.deps@swig__depfile_include_post@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_depfiles += $(SWIG_DEPDIR)/swiglal_octave.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_octave_flags += -MF $(SWIG_DEPDIR)/swiglal_octave.deps.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(nodist_swiglal_octave_la_SOURCES): $(swig_iface) swiglal_config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_GEN)$(MKDIR_P) swiglal_octave/ && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $(SWIG) $(swig_octave_flags) -o $@ $<; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(swig_deps_if)mv -f ./$(DEPDIR)/swiglal_octave.deps.tmp ./$(DEPDIR)/swiglal_octave.deps; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(swig_deps_if)mv -f $(SWIG_DEPDIR)/swiglal_octave.deps.tmp $(SWIG_DEPDIR)/swiglal_octave.deps; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(swig_deps_if)rm -f ./$(DEPDIR)/swiglal_octave.deps.tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(swig_deps_if)rm -f $(SWIG_DEPDIR)/swiglal_octave.deps.tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $@; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -192,16 +207,17 @@ swiglal_python_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_PYTHON_LDFLAGS) $(EX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- swiglal_python_la_LIBTOOLFLAGS = $(swig_libtoolflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if AMDEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@am__include@ @am__quote@./$(DEPDIR)/swiglal_python.deps@am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--swig_python_flags += -MF ./$(DEPDIR)/swiglal_python.deps.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@swig__depfile_include_pre@$(SWIG_DEPDIR)/swiglal_python.deps@swig__depfile_include_post@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_depfiles += $(SWIG_DEPDIR)/swiglal_python.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+swig_python_flags += -MF $(SWIG_DEPDIR)/swiglal_python.deps.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(nodist_swiglal_python_la_SOURCES): $(swig_iface) swiglal_config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_GEN)$(MKDIR_P) swiglal_python/ && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $(SWIG) $(swig_python_flags) -o $@ $<; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(swig_deps_if)mv -f ./$(DEPDIR)/swiglal_python.deps.tmp ./$(DEPDIR)/swiglal_python.deps; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(swig_deps_if)mv -f $(SWIG_DEPDIR)/swiglal_python.deps.tmp $(SWIG_DEPDIR)/swiglal_python.deps; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(swig_deps_if)rm -f ./$(DEPDIR)/swiglal_python.deps.tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(swig_deps_if)rm -f $(SWIG_DEPDIR)/swiglal_python.deps.tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $@; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/a/gnuscripts/lalsuite_swig.m4 b/b/gnuscripts/lalsuite_swig.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4817f4b9d4..9813b7667b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/a/gnuscripts/lalsuite_swig.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/b/gnuscripts/lalsuite_swig.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,16 @@ AC_DEFUN([_LALSUITE_CHECK_SWIG_VERSION],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # end $0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_DEFUN([_LALSUITE_SWIG_OUTPUT_DEPENDENCY_COMMANDS],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # $0: create dummy SWIG dependency files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS_IF([test -d swig && test -f swig/Makefile],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # create dummy SWIG dependency files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _AS_ECHO_LOG([cd swig && ${SED} -e '/^include /d' Makefile | ${MAKE} -f - swig-dummy-depfiles])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ( cd swig && ${SED} -e '/^include /d' Makefile | ${MAKE} -f - swig-dummy-depfiles )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # end $0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFUN([LALSUITE_ENABLE_SWIG],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $0: enable SWIG bindings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +72,32 @@ AC_DEFUN([LALSUITE_ENABLE_SWIG],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python is required to run generate_swig_iface.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LALSUITE_REQUIRE_PYTHON([2.6])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CONFIG_COMMANDS_PRE([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # used to include SWIG dependency files into lalsuite_swig.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # - cannot use 'include' directly as it is interpreted by Automake, so instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # use low-level @am__include@ and @am__quote@ set by AM_MAKE_INCLUDE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_SUBST([SWIG_DEPDIR],["./.swigdeps"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS_IF([test "x${am__include+set}" != xset],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([could not determine how to include SWIG dependency files])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS_IF([test "x${am__quote+set}" != xset],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([could not determine how to quote SWIG dependency files])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_SUBST([swig__depfile_include_pre],["${am__include} ${am__quote}"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_SUBST([swig__depfile_include_post],["${am__quote}"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _AC_CONFIG_COMMANDS_INIT([MAKE="${MAKE-make}"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m4_ifdef([_AM_OUTPUT_DEPENDENCY_COMMANDS],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m4_rename([_AM_OUTPUT_DEPENDENCY_COMMANDS],[lalsuite_swig__AM_OUTPUT_DEPENDENCY_COMMANDS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _LALSUITE_SWIG_OUTPUT_DEPENDENCY_COMMANDS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lalsuite_swig__AM_OUTPUT_DEPENDENCY_COMMANDS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m4_fatal([could not link SWIG automatic dependency tracking into Automake])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # end $0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalframe/Portfile b/science/lalframe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59a2f97dcf3..1a705c650b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalframe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalframe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
name lalframe
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library - Frame
long_description \
LIGO Scientific Collaboration Algorithm Library - Frame, containing \
routines for reading and writing frame files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 18bcca506efe38a8c6e553d04af36fdcf7988ff3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 518016915e4189fabf2a247ebe227eb8733afc4a1daa6e7ae6b30a1d87c61707 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7393884
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1d41648600f49255a9774c0411cb78b685393aad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 39604c2e012babf0a67322e71b91119206c41dd35eff8aaa0644aac932abe73d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7341480
</span>
depends_lib port:lal \
port:libframe \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +25,12 @@ if {[string match "py*" ${subport}]} {
</span> set v [lindex ${numbers} 0]
# python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span> }
# add Octave dependencies for octave subports
if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,9 +134,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalframe/files/patch-configure.diff b/science/lalframe/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdfe6a6c48a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalframe/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26570,7 +26570,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 0aab72b14fc..c55af2e350a 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name lalinference
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.3
</span> revision 0
description LSC Algorithm Library - Inference
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,9 @@ long_description \
</span> LIGO Scientific Collaboration Algorithm Library - Inference containing \
routines for Bayesian inference data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fe8f4211e9712b8c634bd36ef2ce3364a648d7ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a915c47deb17978266a22983bb512b903de1aa9f0262c6fccb781539da471330 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1107568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b4d51bbdc47dfd736b2bf465363c128d449ceab0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 73d7a7e60f0cb030eef205f61dcc7a1850dcb42e2750b70ea3993fab2c170678 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 989548
</span>
#depends_build port:help2man
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,6 @@ if {[string match "py*" ${subport}]} {
</span> port:py${v}-matplotlib \
port:py${v}-h5py \
port:py${v}-shapely
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span> }
# add Octave dependencies for octave subports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +55,6 @@ if {[string match "octave-*" ${subport}]} {
</span> # octave, and C-library port are automatically added below
depends_lib port:octave-lal port:octave-lalmetaio port:octave-lalsimulation \
port:octave-lalburst port:lalinspiral port:lalpulsar
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span> }
configure.args --enable-openmp \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinference/files/patch-configure.diff b/science/lalinference/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ce1ab5a218..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinference/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31281,7 +31281,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinspiral/Portfile b/science/lalinspiral/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ae5c7db6ff..d161b4ff2ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinspiral/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalinspiral/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
name lalinspiral
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library - Inspiral
long_description \
LIGO Scientific Collaboration Algorithm Library - Inspiral, containing \
routines for compact binary gravitational wave data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 550819ffcb0813d9c8e131387b9e77467b7d5f66 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c031d878e7c06bf2c0b8ab56f6cf3a29ced4a6e85e3daab42a4101d27999b2ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 919300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 57156e869edbf7b5c0adc3606cfda78830df80fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c6391d829e96d6cf5f21eb278d192f95a6ddd09150dd77fb659aadd0afe0a088 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 816680
</span>
depends_lib port:lal \
port:lalframe \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,6 @@ if {[string match "py*" ${subport}]} {
</span> # python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-lal port:py${v}-lalmetaio port:py${v}-lalsimulation \
port:py${v}-lalframe port:py${v}-lalburst port:py${v}-lscsoft-glue
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span> }
# add Octave dependencies for octave subports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +36,6 @@ if {[string match "octave-*" ${subport}]} {
</span> # octave, and C-library port are automatically added below
depends_lib port:octave-lal port:octave-lalframe port:octave-lalmetaio \
port:octave-lalsimulation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,9 +139,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinspiral/files/patch-configure.diff b/science/lalinspiral/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c2c175ba0cf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinspiral/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28362,7 +28362,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalmetaio/Portfile b/science/lalmetaio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9925a75475a..b6093615f01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalmetaio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalmetaio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,17 @@
</span> PortSystem 1.0
name lalmetaio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library - MetaIO
long_description \
LIGO Scientific Collaboration Algorithm Library - MetaIO containing \
routines for reading/writing LIGO_LW XML files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d2baa495c6b446f42cbe66ab5aa23c07823a7cab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da06bc6a023e3edcc409d303ef576948d0a3c5103afaaaa748f33346b74daaa8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 343108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2823123d56c6f536d39645a1b76df03d59b21433 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b33a98343a40841f5da12b0b0d3df941654800e7e84f11be1db3a6f0e404412 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 352760
</span>
depends_lib port:lal \
port:metaio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,14 +24,12 @@ if {[string match "py*" ${subport}]} {
</span> set v [lindex ${numbers} 0]
# python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span> }
# add Octave dependencies for octave subports
if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,9 +133,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalmetaio/files/patch-configure.diff b/science/lalmetaio/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1700a2c83b2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalmetaio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-09-25 16:43:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-21 09:28:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25478,7 +25478,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalpulsar/Portfile b/science/lalpulsar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4880b92ed23..cd2a11b9e07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalpulsar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalpulsar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,16 +3,17 @@
</span> PortSystem 1.0
name lalpulsar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.17.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library - Pulsar
long_description \
LIGO Scientific Collaboration Algorithm Library - Pulsar containing \
routines for continuous wave gravitational data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2df5eb8115270963f0ef12e3c5fbc72ac3b13068 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 548da87dad8272ca8fb5015da9b41ef6e1897976c4d44ce5593812aa4601e225 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 91482368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dc9f5daaef1b48cb2954a840403b2074330d7722 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb9e1217eca7302baa5631c8510223bb6fcd7b0f755d5bed2a965130a4ff1a46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 91533396
</span>
depends_lib port:cfitsio \
port:fftw-3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,14 +31,12 @@ if {[string match "py*" ${subport}]} {
</span> set v [lindex ${numbers} 0]
# python, C-library port, and numpy are automatically added below
depends_lib-append port:py${v}-lal port:py${v}-astropy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span> }
# add Octave dependencies for octave subports
if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,9 +140,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalpulsar/files/patch-configure.diff b/science/lalpulsar/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3130d3f7491..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalpulsar/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29638,7 +29638,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalsimulation/Portfile b/science/lalsimulation/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 758e9b6d016..e73f9d6b05c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalsimulation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalsimulation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name lalsimulation
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.0
</span> revision 0
description LSC Algorithm Library - Simulation
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,9 @@ long_description \
</span> LIGO Scientific Collaboration Algorithm Library - Simulation containing \
routines for simulation gravitational-wave waveforms and noise sources.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1d1457614c3ee2057d7d7f24e0bc8628457be153 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 92092e32166cb5f455272d8c051886164c2b313d1369473a9283e0f9f3f084ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6781716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2a9ea3ca3c0659123dd302cfa379a6c3b7eea3fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d14b48d22eb631e37f058459a8b694e799689a2015e46a03c3165e1d58134635 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7290688
</span>
depends_build port:help2man
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,14 +29,12 @@ if {[string match "py*" ${subport}]} {
</span> set v [lindex ${numbers} 0]
# python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span> }
# add Octave dependencies for octave subports
if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span> }
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,9 +138,6 @@ subport octave-${name} {
</span> depends_build-append port:swig-octave
depends_lib-prepend port:octave port:${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not prepend ${prefix} to Octave directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --disable-swig-octave --enable-swig-octave
# Only install SWIG bindings, Python libraries, and Python scripts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalsimulation/files/patch-configure.diff b/science/lalsimulation/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d00957ca489..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalsimulation/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-01-08 01:23:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-08-20 17:31:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26160,7 +26160,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "could not build relative path from \"${octexecdir}\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octexecdir='${prefix}'/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octexecdir=/"${octexecdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${octexecdir}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "${octexecdir}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>