<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/927d8bbcca94aaa1b52e4d292df1cf50c91ff7f4">https://github.com/macports/macports-ports/commit/927d8bbcca94aaa1b52e4d292df1cf50c91ff7f4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 927d8bbcca94aaa1b52e4d292df1cf50c91ff7f4
</span>Author: Adam Mercer <ram@macports.org>
AuthorDate: Wed Nov 2 14:01:58 2016 -0500

<span style='display:block; white-space:pre;color:#404040;'>    science/lalapps: update to 6.20.0
</span>---
 science/lalapps/Portfile                           | 83 +++++++++++-----------
 .../files/0001-Make-help2man-optional.patch        | 41 +++++++++++
 2 files changed, 81 insertions(+), 43 deletions(-)

<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 e0456f9..2a5e913 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;'>@@ -3,8 +3,8 @@
</span> PortSystem    1.0
 
 name          lalapps
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version       6.19.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories    science
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version       6.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories    science python
</span> platforms     darwin
 maintainers   ram aronnax
 license       GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,10 +18,25 @@ homepage      https://wiki.ligo.org/DASWG/LALSuite
</span> master_sites  http://software.ligo.org/lscsoft/source/lalsuite/
 use_xz        yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums     rmd160 0c679757a72314f0f66a1b77f6dadfc4f0bd4bbf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              sha256 03200dbcf4e51187bbbe045eca967d5185499b28b966bab8ff7003cb17cff485
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums     rmd160 d236800d8d72ef7aff8af7284f9dd3eea5eb2630 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 6a35e47c5f21e3f0f96c27eb9a65f9ebbbbda00fcc17f3dc6b7ee79c8786f77b
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set v                 27
</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;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:help2man
</span> 
 depends_lib   port:gsl \
               port:libomp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +45,19 @@ depends_lib   port:gsl \
</span>               port:libframe \
               port:metaio \
               port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalframe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalmetaio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalsimulation \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalburst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalinspiral \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalpulsar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalinference \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:lalstochastic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              port:glue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lal port:py27-lal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalframe port:py27-lalframe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalmetaio port:py27-lalmetaio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalxml port:py27-lalxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalsimulation port:py27-lalsimulation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalburst port:py27-lalburst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalinspiral port:py27-lalinspiral \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalpulsar port:py27-lalpulsar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalinference port:py27-lalinference \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:lalstochastic port:py27-lalstochastic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:glue \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              port:py27-numpy
</span> 
 # Choose a compiler that supports OpenMP.
 compiler.whitelist macports-clang-3.8 macports-clang-3.7 macports-clang-3.9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,44 +68,24 @@ configure.args   --mandir=${prefix}/share/man \
</span>                  --disable-gcc-flags \
                  --disable-debug \
                  --enable-openmp \
<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;'>+                 --disable-help2man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 PYTHON=${pythonhome}/bin/python${pythonversion}
</span> 
 # lalxml is currently enabled by default but may change in the future
 #variant lalxml description {Build with LALXML support} {
 #  require_active_variants lalpulsar lalxml
 #  require_active_variants lalinference lalxml
 #  depends_lib-append    port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#                        port:lalxml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#                        port:py27-lalxml
</span> #  configure.args-append --enable-lalxml
 #}
 #default_variants +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  {lalapps-(\d+(?:\.\d+)*).tar.xz}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set v                 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythonversion     [string range ${v} 0 end-1].[string index ${v} end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythonhome \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-prepend    python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description           Python ${pythonversion} bindings for ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description      ${long_description} This package provides Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                      ${pythonversion} bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append  port:swig-python
</span><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-prepend   port:python${v} port:py${v}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span> destroot.args-append  pythondir="${pythondir}" \
                       pyexecdir="${pythondir}" \
                       pkgpythondir="${pythondir}/${name}" \
                       pkgpyexecdir="${pythondir}/${name}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;color:#808080;'>diff --git a/science/lalapps/files/0001-Make-help2man-optional.patch b/science/lalapps/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/lalapps/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></pre><pre style='margin:0'>

</pre>