<!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>[117158] trunk/dports/science/laldetchar</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/117158">117158</a></dd>
<dt>Author</dt> <dd>ram@macports.org</dd>
<dt>Date</dt> <dd>2014-02-17 16:04:16 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>science/laldetchar: update to 0.1.0
non zero revision due to being in a testing repository prior to commit</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencelaldetcharPortfile">trunk/dports/science/laldetchar/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencelaldetcharfilespatchswigbindingsfixdiff">trunk/dports/science/laldetchar/files/patch-swig-bindings-fix.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencelaldetcharPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/laldetchar/Portfile (117157 => 117158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/laldetchar/Portfile 2014-02-18 00:04:12 UTC (rev 117157)
+++ trunk/dports/science/laldetchar/Portfile 2014-02-18 00:04:16 UTC (rev 117158)
</span><span class="lines">@@ -2,10 +2,11 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup active_variants 1.1
</span><ins>+PortGroup conflicts_build 1.0
</ins><span class="cx">
</span><span class="cx"> name laldetchar
</span><del>-version 0.0.4
-revision 3
</del><ins>+version 0.1.0
+revision 2
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ram
</span><span class="lines">@@ -19,14 +20,9 @@
</span><span class="cx"> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
</span><span class="cx"> master_sites http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
</span><span class="cx">
</span><del>-checksums rmd160 a0c9f63dd947260c0c518b936326fc80f1dbab08 \
- sha256 4e9d0c763f6e354ef55f18b31e56447b714caa0d17460cbc966a254e8da6514b
</del><ins>+checksums rmd160 fac4a4dae17496a38a05cb6c38c9110b7643bec0 \
+ sha256 e98ffe3f44ee02d1a0ff5ac754a179a90a6ae03a2d560f5c74efce28bf3c4763
</ins><span class="cx">
</span><del>-# upstream fix for swig bindings
-patchfiles patch-swig-bindings-fix.diff
-patch.pre_args -p1
-use_autoreconf yes
-
</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">@@ -54,6 +50,9 @@
</span><span class="cx"> pkgpythondir="${pythondir}/${name}" \
</span><span class="cx"> pkgpyexecdir="${pythondir}/${name}"
</span><span class="cx">
</span><ins>+# FIXME: fails to build if previous version active
+conflicts_build ${name}
+
</ins><span class="cx"> variant swig_python description {Build python SWIG bindings} {
</span><span class="cx"> require_active_variants lal swig_python
</span><span class="cx"> require_active_variants lalframe swig_python
</span></span></pre></div>
<a id="trunkdportssciencelaldetcharfilespatchswigbindingsfixdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/laldetchar/files/patch-swig-bindings-fix.diff (117157 => 117158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/laldetchar/files/patch-swig-bindings-fix.diff 2014-02-18 00:04:12 UTC (rev 117157)
+++ trunk/dports/science/laldetchar/files/patch-swig-bindings-fix.diff 2014-02-18 00:04:16 UTC (rev 117158)
</span><span class="lines">@@ -1,192 +0,0 @@
</span><del>-From c8df7e705a905f906d031d11172c46e2cc77757f Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette@ligo.org>
-Date: Tue, 20 Aug 2013 11:10:32 +0200
-Subject: [PATCH 1/3] SWIG: fix include path
-
-* -I flags should all be in SWIG_CPPFLAGS, to share between SWIG and C compiler
----
- gnuscripts/lalsuite_swig.m4 | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/gnuscripts/lalsuite_swig.m4 b/gnuscripts/lalsuite_swig.m4
-index 7fe5f47..7fe3e9d 100644
---- a/gnuscripts/lalsuite_swig.m4
-+++ b/gnuscripts/lalsuite_swig.m4
-@@ -1,7 +1,7 @@
- # SWIG configuration
- # Author: Karl Wette, 2011, 2012
- #
--# serial 38
-+# serial 39
-
- # enable SWIG wrapping modules
- AC_DEFUN([LALSUITE_ENABLE_SWIG],[
-@@ -143,15 +143,12 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
- SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -MP"
- ])
-
-- # look here for interfaces and LAL headers
-- SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -I\$(abs_top_builddir)/include"
--
- # send language-specific SWIG output files to libtool directory
- AC_SUBST(SWIG_OUTDIR,["\$(abs_builddir)/${objdir}"])
- SWIG_SWIGFLAGS="${SWIG_SWIGFLAGS} -outdir \$(SWIG_OUTDIR)"
-
- # flags for generating/compiling SWIG wrapping module sources
-- AC_SUBST(SWIG_CPPFLAGS,[])
-+ AC_SUBST(SWIG_CPPFLAGS,["-I\$(abs_top_builddir)/include"])
- for flag in ${swig_save_CPPFLAGS}; do
- AS_CASE([${flag}],
- [-I*],[SWIG_CPPFLAGS="${SWIG_CPPFLAGS} ${flag} `echo ${flag} | ${SED} 's|/include$|/swig|'`"],
---
-1.8.3.4
-
-From a855c2ec06e92773e5d16257bddc5412aa3f9ff0 Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette@ligo.org>
-Date: Tue, 20 Aug 2013 11:29:25 +0200
-Subject: [PATCH 2/3] SWIG: revised SWIG binary checking code
-
-- mostly cosmetic changes to which log messages get printed
----
- gnuscripts/lalsuite_swig.m4 | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
-
-diff --git a/gnuscripts/lalsuite_swig.m4 b/gnuscripts/lalsuite_swig.m4
-index 7fe3e9d..e9ac7ea 100644
---- a/gnuscripts/lalsuite_swig.m4
-+++ b/gnuscripts/lalsuite_swig.m4
-@@ -1,7 +1,7 @@
- # SWIG configuration
- # Author: Karl Wette, 2011, 2012
- #
--# serial 39
-+# serial 40
-
- # enable SWIG wrapping modules
- AC_DEFUN([LALSUITE_ENABLE_SWIG],[
-@@ -63,19 +63,18 @@ AC_DEFUN([LALSUITE_ENABLE_SWIG_LANGUAGE],[
- m4_popdef([lowercase])
- ])
-
--# check the version of ${SWIG}, and store it in ${SWIG_VERSION}
-+# check the version of ${SWIG}, and store it in ${swig_version}
-+# return swig_version=0.0 if ${SWIG} is not an executable
- AC_DEFUN([_LALSUITE_CHECK_SWIG_VERSION],[
-- AC_MSG_CHECKING([${SWIG} version])
-- SWIG_VERSION=0.0
-+ swig_version=0.0
- swig_version_output=[`${SWIG} -version 2>/dev/null`]
- AS_IF([test $? -eq 0],[
- swig_version_regex=['s|^ *SWIG [Vv]ersion \([0-9.][0-9.]*\)|\1|p;d']
-- SWIG_VERSION=[`echo "${swig_version_output}" | ${SED} "${swig_version_regex}"`]
-- AS_IF([test "x${SWIG_VERSION}" = x],[
-+ swig_version=[`echo "${swig_version_output}" | ${SED} "${swig_version_regex}"`]
-+ AS_IF([test "x${swig_version}" = x],[
- AC_MSG_ERROR([could not determine version of ${SWIG}])
- ])
- ])
-- AC_MSG_RESULT([${SWIG_VERSION}])
- ])
-
- # configure SWIG wrapping modules
-@@ -110,27 +109,30 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
- AM_CONDITIONAL(SWIG_BUILD,[test "${swig_build_any}" = true])
- AM_COND_IF(SWIG_BUILD,[
-
-- # check for SWIG binary: use value of ${SWIG} first,
-- # then check for common SWIG binary names
-+ # check for SWIG binary with version >= ${swig_min_version}; use
-+ ## value of ${SWIG} if set, otherwise check common SWIG binary names
- AS_IF([test "x${SWIG}" != x],[
-+ AC_MSG_CHECKING([${SWIG} version])
- _LALSUITE_CHECK_SWIG_VERSION
-- AS_VERSION_COMPARE([${SWIG_VERSION}],[${swig_min_version}],[
-+ AS_VERSION_COMPARE([${swig_version}],[${swig_min_version}],[
- AC_MSG_ERROR([require ${SWIG} version >= ${swig_min_version}])
- ])
-+ AC_MSG_RESULT([${swig_version}])
- ],[
-+ AC_MSG_CHECKING([for SWIG with version >= ${swig_min_version}])
- for SWIG in swig swig2.0; do
- _LALSUITE_CHECK_SWIG_VERSION
-- AS_VERSION_COMPARE([${SWIG_VERSION}],[${swig_min_version}],[],[break],[break])
-+ AS_VERSION_COMPARE([${swig_version}],[${swig_min_version}],[],[break],[break])
- SWIG=
- done
-+ AS_IF([test "x${SWIG}" = x],[
-+ AC_MSG_ERROR([could not find SWIG with version >= ${swig_min_version}])
-+ ])
-+ AC_MSG_RESULT([${SWIG} (version ${swig_version})])
- ])
-
-- # if a SWIG binary was found, get its full path and print its version, otherwise fail
-- AS_IF([test "x${SWIG}" != x],[
-- AC_PATH_PROG(SWIG,["${SWIG}"])
-- ],[
-- AC_MSG_ERROR([could not find SWIG with version >= ${swig_min_version}])
-- ])
-+ # get full path of SWIG binary
-+ AC_PATH_PROG(SWIG,["${SWIG}"])
-
- # symbol prefixes for this LAL library
- AC_SUBST(SWIG_SYMBOL_PREFIXES,["$1"])
---
-1.8.3.4
-
-From 3d5852184dce91962be1343a83c992f18d0e6f47 Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette@ligo.org>
-Date: Tue, 20 Aug 2013 12:23:12 +0200
-Subject: [PATCH 3/3] SWIG: fix include path, take 2
-
-- flag -I\$(abs_top_builddir)/include needs to be in both SWIG_SWIGFLAGS
- and SWIG_CPPFLAGS, for interface preprocessing/generation and compilation
-- remove extraneous -I\$(top_builddir)/include from end of SWIG_CPPFLAGS
----
- gnuscripts/lalsuite_swig.m4 | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/gnuscripts/lalsuite_swig.m4 b/gnuscripts/lalsuite_swig.m4
-index e9ac7ea..b28e80d 100644
---- a/gnuscripts/lalsuite_swig.m4
-+++ b/gnuscripts/lalsuite_swig.m4
-@@ -1,7 +1,7 @@
- # SWIG configuration
- # Author: Karl Wette, 2011, 2012
- #
--# serial 40
-+# serial 41
-
- # enable SWIG wrapping modules
- AC_DEFUN([LALSUITE_ENABLE_SWIG],[
-@@ -137,8 +137,8 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
- # symbol prefixes for this LAL library
- AC_SUBST(SWIG_SYMBOL_PREFIXES,["$1"])
-
-- # flags for generating SWIG wrapping module sources
-- AC_SUBST(SWIG_SWIGFLAGS,["-Wextra -Werror"])
-+ # flags for preprocessing/generating SWIG wrapping module sources
-+ AC_SUBST(SWIG_SWIGFLAGS,["-Wextra -Werror -I\$(abs_top_builddir)/include"])
-
- # add -MP option if SWIG is greater than version 2.0.9
- AS_VERSION_COMPARE([${swig_version}],[2.0.9],[],[],[
-@@ -157,6 +157,7 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
- [*],[SWIG_CPPFLAGS="${SWIG_CPPFLAGS} ${flag}"]
- )
- done
-+ SWIG_CPPFLAGS="${SWIG_CPPFLAGS} -I/usr/include"
-
- # are we (not) in debugging mode?
- AS_IF([test "x${enable_debug}" = xno],[
-@@ -170,9 +171,6 @@ AC_DEFUN([LALSUITE_USE_SWIG],[
- SWIG_CPPFLAGS="${SWIG_CPPFLAGS} -DHAVE_LIBGSL"
- ])
-
-- # look here for interfaces and LAL headers (but not for preprocessing)
-- SWIG_CPPFLAGS="${SWIG_CPPFLAGS} -I\$(top_builddir)/include -I/usr/include"
--
- # flags for compiling SWIG wrapping module sources
- AC_SUBST(SWIG_CFLAGS,[])
- for arg in ${swig_save_CFLAGS}; do
---
-1.8.3.4
-
</del></span></pre>
</div>
</div>
</body>
</html>