<!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>[129186] trunk/dports/science/lal</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/129186">129186</a></dd>
<dt>Author</dt> <dd>ram@macports.org</dd>
<dt>Date</dt> <dd>2014-12-08 14:24:27 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>science/lal: update to 6.13.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencelalPortfile">trunk/dports/science/lal/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencelalfiles0001SWIGmakewrappingscompatiblewithSWIGv300patch">trunk/dports/science/lal/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencelalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/lal/Portfile (129185 => 129186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lal/Portfile 2014-12-08 22:07:59 UTC (rev 129185)
+++ trunk/dports/science/lal/Portfile 2014-12-08 22:24:27 UTC (rev 129186)
</span><span class="lines">@@ -1,11 +1,9 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup conflicts_build 1.0
</del><span class="cx">
</span><span class="cx"> name lal
</span><del>-version 6.12.0
-revision 3
</del><ins>+version 6.13.4
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ram
</span><span class="lines">@@ -17,14 +15,11 @@
</span><span class="cx"> routines for gravitational wave data analysis.
</span><span class="cx">
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><del>-master_sites http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
</del><ins>+master_sites http://software.ligo.org/lscsoft/source/lalsuite
</ins><span class="cx">
</span><del>-checksums rmd160 426102023e57cfb4c4d35369711db728b0ec1e5c \
- sha256 d7f345cb4a903e6bded4b008b25fee41a9bff3328b98cf0a6157215ec43eeff1
</del><ins>+checksums rmd160 5732feb004f06916e2f68ab19891db627bb5225c \
+ sha256 8f8f929647b99e1cb11955ab34aba323595d145ab97cb97846d8bb441a287df2
</ins><span class="cx">
</span><del>-patchfiles 0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch
-patch.pre_args -p2
-
</del><span class="cx"> depends_build-append port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib port:python27 \
</span><span class="lines">@@ -47,9 +42,6 @@
</span><span class="cx"> pkgpythondir="${pythondir}/${name}" \
</span><span class="cx"> pkgpyexecdir="${pythondir}/${name}"
</span><span class="cx">
</span><del>-# FIXME: fails to build if previous version active
-conflicts_build ${name}
-
</del><span class="cx"> variant swig_python description {Build python SWIG bindings} {
</span><span class="cx"> depends_build-append port:swig-python
</span><span class="cx"> depends_lib-append port:py27-numpy
</span></span></pre></div>
<a id="trunkdportssciencelalfiles0001SWIGmakewrappingscompatiblewithSWIGv300patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/lal/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch (129185 => 129186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/lal/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch 2014-12-08 22:07:59 UTC (rev 129185)
+++ trunk/dports/science/lal/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch 2014-12-08 22:24:27 UTC (rev 129186)
</span><span class="lines">@@ -1,99 +0,0 @@
</span><del>-From 20d0cb2d0c60c0feeb5f6ff5518b9d3b41574e2b Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette@ligo.org>
-Date: Sun, 30 Mar 2014 00:20:56 +0100
-Subject: [PATCH] SWIG: make wrappings compatible with SWIG v3.0.0
-
-- %typemaps_string_alloc() has an extra argument
-- structs containing pointer-to-const members now
- need SWIGLAL(IMMUTABLE_MEMBERS(...))
-
-(cherry picked from commit 4558d05958962d8240e19651c72dc1699fa63807)
----
- lal/packages/date/include/Date.h | 3 +++
- lal/packages/std/include/swiglal_common.i | 7 +++++++
- lal/packages/tools/include/DetResponse.h | 3 +++
- lal/packages/tools/include/EllipsoidOverlapTools.h | 3 +++
- lal/packages/tools/include/Units.h | 3 +++
- 5 files changed, 19 insertions(+)
-
-diff --git a/lal/packages/date/include/Date.h b/lal/packages/date/include/Date.h
-index 1edf9ec..e450136 100644
---- a/lal/packages/date/include/Date.h
-+++ b/lal/packages/date/include/Date.h
-@@ -94,6 +94,9 @@ extern "C"
- * ::LIGOTimeGPS. Its sole purpose is to aggregate these
- * structures for passing to functions.
- */
-+#ifdef SWIG /* SWIG interface directives */
-+SWIGLAL(IMMUTABLE_MEMBERS(tagLALPlaceAndGPS, p_detector));
-+#endif /* SWIG */
- typedef struct
- tagLALPlaceAndGPS
- {
-diff --git a/lal/packages/std/include/swiglal_common.i b/lal/packages/std/include/swiglal_common.i
-index 03aa466..fb405b6 100644
---- a/lal/packages/std/include/swiglal_common.i
-+++ b/lal/packages/std/include/swiglal_common.i
-@@ -1020,10 +1020,17 @@ if (swiglal_release_parent(PTR)) {
- return SWIG_AsLALcharPtrAndSize(obj, pstr, 0, &alloc);
- }
- }
-+#if SWIG_VERSION >= 0x030000
-+%typemaps_string_alloc(%checkcode(STRING), %checkcode(char), char, LALchar,
-+ SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize,
-+ strlen, SWIG_strnlen, %swiglal_new_copy_array, XLALFree,
-+ "<limits.h>", CHAR_MIN, CHAR_MAX);
-+#else
- %typemaps_string_alloc(%checkcode(STRING), %checkcode(char), char, LALchar,
- SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize,
- strlen, %swiglal_new_copy_array, XLALFree,
- "<limits.h>", CHAR_MIN, CHAR_MAX);
-+#endif
-
- // Typemaps for string pointers. By default, treat arguments of type char**
- // as output-only arguments, which do not require a scripting-language input
-diff --git a/lal/packages/tools/include/DetResponse.h b/lal/packages/tools/include/DetResponse.h
-index ccd9510..926261f 100644
---- a/lal/packages/tools/include/DetResponse.h
-+++ b/lal/packages/tools/include/DetResponse.h
-@@ -119,6 +119,9 @@ LALSource;
- * LALComputeDetAMResponse() and
- * LALComputeDetAMResponseSeries().
- */
-+#ifdef SWIG /* SWIG interface directives */
-+SWIGLAL(IMMUTABLE_MEMBERS(tagLALDetAndSource, pDetector));
-+#endif /* SWIG */
- typedef struct
- tagLALDetAndSource
- {
-diff --git a/lal/packages/tools/include/EllipsoidOverlapTools.h b/lal/packages/tools/include/EllipsoidOverlapTools.h
-index fc6a4e3..c0bf9ac 100644
---- a/lal/packages/tools/include/EllipsoidOverlapTools.h
-+++ b/lal/packages/tools/include/EllipsoidOverlapTools.h
-@@ -52,6 +52,9 @@ Author: Robinson, C. A. and Sengupta, A. S.
- extern "C" {
- #endif
-
-+#ifdef SWIG /* SWIG interface directives */
-+SWIGLAL(IMMUTABLE_MEMBERS(tagfContactWorkSpace, invQ1, invQ2));
-+#endif /* SWIG */
- typedef struct tagfContactWorkSpace
- {
- /* Dimension of the matrices & vectors */
-diff --git a/lal/packages/tools/include/Units.h b/lal/packages/tools/include/Units.h
-index c8e7e1c..15f53dd 100644
---- a/lal/packages/tools/include/Units.h
-+++ b/lal/packages/tools/include/Units.h
-@@ -164,6 +164,9 @@ tagRAT4
- * Consists of a pair of unit structures; used as an input structure for
- * the LALUnitCompare() and LALUnitMultiply() functions.
- */
-+#ifdef SWIG /* SWIG interface directives */
-+SWIGLAL(IMMUTABLE_MEMBERS(tagLALUnitPair, unitOne, unitTwo));
-+#endif /* SWIG */
- typedef struct
- tagLALUnitPair
- {
---
-1.9.1
-
</del></span></pre>
</div>
</div>
</body>
</html>