<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141069] trunk/dports/science/ldas-tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141069">141069</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-10-09 07:55:44 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ldas-tools: update to 2.4.2 and enable python27 variant by default (#48991; maintainer)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceldastoolsPortfile">trunk/dports/science/ldas-tools/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/ldas-tools/files/</li>
<li><a href="#trunkdportsscienceldastoolsfilespatchlibrariesldastoolsalsrcAtExitccdiff">trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff</a></li>
<li><a href="#trunkdportsscienceldastoolsfilespatchlibrariesldastoolsalsrcTaskThreadccdiff">trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceldastoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ldas-tools/Portfile (141068 => 141069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ldas-tools/Portfile 2015-10-09 14:25:55 UTC (rev 141068)
+++ trunk/dports/science/ldas-tools/Portfile 2015-10-09 14:55:44 UTC (rev 141069)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name ldas-tools
</span><del>-version 2.4.0
</del><ins>+version 2.4.2
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ligo.org:ed.maros
</span><span class="lines">@@ -15,9 +15,12 @@
</span><span class="cx"> homepage http://www.ldas-sw.ligo.caltech.edu
</span><span class="cx"> master_sites http://software.ligo.org/lscsoft/source/
</span><span class="cx">
</span><del>-checksums rmd160 9b250e836b502379ff24124d1bf67e2c3e164feb \
- sha256 d49438554a9628ff320e889e55fb3a60a6596c4ab581eb089b4356e9e5e51b86
</del><ins>+checksums rmd160 54dec09d6d9d3e55c881af7574226f2d640a5e96 \
+ sha256 17b9514c8aa2092f70f7d8c7315a7d46008a285d47b730ad2d7a8eb2c89e9a36
</ins><span class="cx">
</span><ins>+patchfiles patch-libraries-ldastoolsal-src-AtExit.cc.diff \
+ patch-libraries-ldastoolsal-src-TaskThread.cc.diff
+
</ins><span class="cx"> configure.args --disable-silent-rules \
</span><span class="cx"> --with-optimization=high \
</span><span class="cx"> --disable-tcl \
</span><span class="lines">@@ -50,14 +53,14 @@
</span><span class="cx"> #------------------------------------------------------------------------
</span><span class="cx"> # Python variants
</span><span class="cx"> #------------------------------------------------------------------------
</span><del>-set pythons_suffixes {27 34}
</del><ins>+set pythons_versions { 27 34 }
</ins><span class="cx">
</span><span class="cx"> set pythons_ports {}
</span><del>-foreach s ${pythons_suffixes} {
</del><ins>+foreach s ${pythons_versions} {
</ins><span class="cx"> lappend pythons_ports python${s}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-foreach s ${pythons_suffixes} {
</del><ins>+foreach s ${pythons_versions} {
</ins><span class="cx"> set p python${s}
</span><span class="cx"> set v [string index ${s} 0].[string index ${s} 1]
</span><span class="cx"> set i [lsearch -exact ${pythons_ports} ${p}]
</span><span class="lines">@@ -68,13 +71,18 @@
</span><span class="cx">
</span><span class="cx"> depends_build-append port:swig-python
</span><span class="cx"> depends_lib-append port:${p} port:py${s}-numpy
</span><del>- configure.args-strsed s/--disable-python/--enable-python/
</del><ins>+ configure.python ${prefix}/bin/python${v}
+ configure.args-replace --disable-python --enable-python
</ins><span class="cx"> destroot.args-append pythondir="${d}" pyexecdir="${d}"
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }]
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {![variant_isset python34]} {
+ default_variants +python27
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex {ldas-tools-(\d+(?:\.\d+)*).tar.gz}
</span></span></pre></div>
<a id="trunkdportsscienceldastoolsfilespatchlibrariesldastoolsalsrcAtExitccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff (0 => 141069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff (rev 0)
+++ trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff 2015-10-09 14:55:44 UTC (rev 141069)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- libraries/ldastoolsal/src/AtExit.cc.orig
++++ libraries/ldastoolsal/src/AtExit.cc
+@@ -10,6 +10,11 @@
+ #include "ldastoolsal/mutexlock.hh"
+ #include "ldastoolsal/ReadWriteLock.hh"
+
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++
+ namespace anonymous
+ {
+ void exit_handler( );
+@@ -322,3 +327,5 @@ namespace LDASTools
+ }
+ } // namespace - AL
+ } // namespace - LDASTools
++#pragma GCC diagnostic pop
++#pragma clang diagnostic pop
</ins></span></pre></div>
<a id="trunkdportsscienceldastoolsfilespatchlibrariesldastoolsalsrcTaskThreadccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff (0 => 141069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff (rev 0)
+++ trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff 2015-10-09 14:55:44 UTC (rev 141069)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- libraries/ldastoolsal/src/TaskThread.cc.orig
++++ libraries/ldastoolsal/src/TaskThread.cc
+@@ -266,7 +266,8 @@ namespace LDASTools
+ {
+ m_cancel_method = t->CancelMethod( );
+ m_cancel_signal = t->CancelSignal( );
+- m_task_type_name = typeid( *t ).name( );
++ const Task& tname = *t;
++ m_task_type_name = typeid( tname ).name( );
+ }
+
+ sigset_t old_signal_set;
</ins></span></pre>
</div>
</div>
</body>
</html>