[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [macports-ports] branch master updated: Updated to latest package version Addressed comments Fixes:
From: Ed Maros <ed.maros () ligo ! org>
Date: 2018-01-31 21:58:07
Message-ID: 20180131215817.6026.90965 () braeburn ! macports ! org
[Download RAW message or body]
<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cb9a335ef7df55e354cd99e0 \
1e2a39727c8b1c75">https://github.com/macports/macports-ports/commit/cb9a335ef7df55e354cd99e01e2a39727c8b1c75</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 cb9a335 Updated to latest package version \
Addressed comments Fixes: https://trac.macports.org/ticket/55769 </span>cb9a335 is \
described below
<span style='display:block; white-space:pre;color:#808000;'>commit \
cb9a335ef7df55e354cd99e01e2a39727c8b1c75 </span>Author: Ed Maros \
<ed.maros@ligo.org>
AuthorDate: Wed Jan 31 12:37:19 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> Updated to latest \
package version </span><span style='display:block; white-space:pre;color:#404040;'> \
Addressed comments </span><span style='display:block; \
white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/55769 \
</span>--- science/gds/Portfile | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 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 3b50c96..874adc5 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;'>@@ -6,7 +6,7 @@ PortGroup active_variants \
1.1 </span> PortGroup python 1.0
name gds
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version \
2.18.3 </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+version 2.18.5 </span> categories \
science platforms darwin
maintainers ligo.org:ed.maros
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +20,11 @@ \
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 1bc9d3388b5d0672a4486b4070419400df67c7a9 \ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- sha256 \
25e28755ea6af84a5d0dcb5d0d0207f61111b9ef00d7491a0de6fa07fb6d538a </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 \
05d3ccf9e77e95b12008510099e0352584e69582 \ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ sha256 \
47015eba574e9b31ae78ca8e73936204a419c803b256200460a0651995a0a273 </span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
patch-Monitors-PulsarMon-PulsarMon.cc.diff </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>- </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig \ \
</span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+depends_build-append \ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ \
port:pkgconfig \ </span> port:swig \
port:swig-python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,14 +37,10 @@ \
depends_lib port:python27 \ </span> port:hdf5 \
port:jsoncpp \
port:ldas-tools-framecpp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- \
port:root5 \ </span> port:metaio
<span style='display:block; \
white-space:pre;background:#ffe0e0;'>-require_active_variants port:root5 python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-#------------------------------------------------------------------------
</span> # Fix things after PortGroup python
<span style='display:block; \
white-space:pre;background:#ffe0e0;'>-#------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure yes
use_parallel_build yes
build.cmd make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +52,14 @@ \
destroot.args " " </span> destroot.pre_args ${destroot.target}
destroot.post_args ${destroot.destdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use the \
--without-sasl option since the macports version of sasl2 </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+# leads to a 5 minute \
latency for each socket connection. </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ </span> configure.python \
${prefix}/bin/python2.7 <span style='display:block; \
white-space:pre;background:#ffe0e0;'>-configure.args --enable-online \ </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>- \
--enable-dtt \ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+configure.args --enable-dtt \ </span> \
--enable-python \
--enable-root-objects \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
--without-sasl \ </span> --with-jsoncpp=${prefix}
destroot.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,10 +68,21 @@ \
destroot.args-append \ </span> pkgpythondir="${python.pkgd}/${name}" \
pkgpyexecdir="${python.pkgd}/${name}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The \
macports version of sasl2 leads to a 5 minute latency for each </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>-# socket connection. \
</span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-conflicts_build cyrus-sasl2 </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+# Use root 6 for High \
Sierra and beyond else root 5 </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && \
${os.major} >= 17 } { </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ configure.env \
CXXFLAGS='-std=c++1z' </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:root6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ require_active_variants root6 python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
configure.env CXXFLAGS='-std=c++11' </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:root5 </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
root5 python27 </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+} </span>
livecheck.type regex
livecheck.url ${master_sites}
</pre><pre style='margin:0'>
</pre>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic