<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/526ce1f1c6ab912a64e8b75017dd40680f4cf82d">https://github.com/macports/macports-ports/commit/526ce1f1c6ab912a64e8b75017dd40680f4cf82d</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 526ce1f Modifications needed for gds-2.18.3
</span>526ce1f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 526ce1f1c6ab912a64e8b75017dd40680f4cf82d
</span>Author: Edward Maros <ed.maros@ligo.org>
AuthorDate: Mon Nov 27 13:45:29 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> Modifications needed for gds-2.18.3
</span>---
science/gds/Portfile | 18 +++++++++++-------
.../files/patch-Monitors-PulsarMon-PulsarMon.cc.diff | 17 +++++++++++++++++
2 files changed, 28 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gds/Portfile b/science/gds/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a81fa4..3b50c96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup conflicts_build 1.0
PortGroup active_variants 1.1
PortGroup python 1.0
name gds
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.17.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.18.3
</span> categories science
platforms darwin
maintainers ligo.org:ed.maros
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,21 +20,24 @@ long_description \
</span> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f0adb880b4b7f347e482c724aba7f7302c2af553 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed35be0f76b3efd18322fe5a0c9f5880479dd03e286922642960935c7c8c43e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1bc9d3388b5d0672a4486b4070419400df67c7a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25e28755ea6af84a5d0dcb5d0d0207f61111b9ef00d7491a0de6fa07fb6d538a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Monitors-PulsarMon-PulsarMon.cc.diff
</span>
depends_build-append port:pkgconfig \
port:swig \
port:swig-python
depends_lib port:python27 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-numpy \
</span> port:curl \
port:expat \
port:fftw-3 \
port:fftw-3-single \
port:hdf5 \
port:jsoncpp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ldas-tools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ldas-tools-framecpp \
</span> port:root5 \
port:metaio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +61,8 @@ configure.python ${prefix}/bin/python2.7
</span> configure.args --enable-online \
--enable-dtt \
--enable-python \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-root-objects \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jsoncpp=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-root-objects \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jsoncpp=${prefix}
</span>
destroot.args-append \
pythondir="${python.pkgd}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gds/files/patch-Monitors-PulsarMon-PulsarMon.cc.diff b/science/gds/files/patch-Monitors-PulsarMon-PulsarMon.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..61b6957
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gds/files/patch-Monitors-PulsarMon-PulsarMon.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -u a/Monitors/PulsarMon/PulsarMon.cc b/Monitors/PulsarMon/PulsarMon.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Monitors/PulsarMon/PulsarMon.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Monitors/PulsarMon/PulsarMon.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,11 +261,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE* tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mOutput.error_log) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = freopen(mOutput.error_file_name.c_str(), "w", stderr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (tmp < 0) perror("Unable to divert stderr");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (tmp == (FILE*)NULL) perror("Unable to divert stderr");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mOutput.write_log) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = freopen(mOutput.log_file_name.c_str(), "w", stdout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (tmp < 0) perror("Unable to divert stdout");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (tmp == (FILE*)NULL) perror("Unable to divert stdout");
</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;'>+ //---------- Set up array that will hold data for DMTViewer history
</span></pre><pre style='margin:0'>
</pre>